537 files changed, 132581 insertions, 77074 deletions

diff --git a/.gitignore b/.gitignore
index ccd80fff4d1..a3c166293d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,6 +64,15 @@ etc/zabbix_agentd.conf
 etc/zabbix_proxy.conf
 etc/zabbix_server.conf
 etc/zabbix_web_service.conf
+etc/zabbix_agent2.d/plugins.d/ceph.conf
+etc/zabbix_agent2.d/plugins.d/docker.conf
+etc/zabbix_agent2.d/plugins.d/memcached.conf
+etc/zabbix_agent2.d/plugins.d/mongodb.conf
+etc/zabbix_agent2.d/plugins.d/mysql.conf
+etc/zabbix_agent2.d/plugins.d/oracle.conf
+etc/zabbix_agent2.d/plugins.d/postgres.conf
+etc/zabbix_agent2.d/plugins.d/redis.conf
+etc/zabbix_agent2.d/plugins.d/smart.conf
 frontend.mo
 include/config.h
 include/config.h.in
@@ -215,6 +224,7 @@ tests/libs/zbxcommon/zbx_tm_sub
 tests/libs/zbxcommon/zbx_tm_round_up
 tests/libs/zbxcommon/zbx_tm_round_down
 tests/libs/zbxtrends/zbx_trends_parse_range
+tests/libs/zbxsysinfo/process_http
 tests/zabbix_server/preprocessor/item_preproc_csv_to_json
 tests/zabbix_server/preprocessor/item_preproc_xpath
 tests/zabbix_server/preprocessor/zbx_item_preproc
diff --git a/ChangeLog b/ChangeLog
index 0dd3cceabe3..cc54133b740 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,58 @@
-Changes for 6.0.0alpha4
+Changes for 6.0.0alpha5
 
 New features:
+A.F....... [ZBXNEXT-6470,ZBXNEXT-6868] implemented complete audit logging of host groups; added strict validation for hostgroup.massadd, hostgroup.massupdate, hostgroup.massremove API methods; changed sortfield used in audit log report to auditid (vmaksimovs)
+.........T [ZBXNEXT-6970] added templates for "MikroTik" Ethernet routers and Switches (mchudinov)
+..F.....S. [ZBXNEXT-6879] implemented new history functions "rate", "bucket_rate_foreach" and "bucket_percentile" and math function "histogram_quantile" (miks, MVekslers)
+A.F....... [ZBXNEXT-6470,ZBXNEXT-6929] implemented audit logging of correlation API object (rlataria, Sasha)
+...G...... [ZBXNEXT-6428] moved plugins config options to separate files (akozlovs, esneiders, kalimulin, MVekslers)
 
 Bug fixes:
+...G...... [ZBXNEXT-6708] fixed 3rd parameter for Zabbix agent 2 web.certificate.get plugin (esneiders)
+........S. [ZBX-20006] fixed Zabbix server must not audit default DB values (akozlovs)
+...G...... [ZBX-20008] removed curl and ldap linkage from agent2 (yurii)
+..F....... [ZBX-19997] fixed too long URL error when performing background page refresh (miks)
+A......... [ZBX-20021] fixed impossibility to import media types of type script with parameters from previous versions (agriscenko)
+........S. [ZBX-19889] fixed server not updating trigger dependencies and other data during linking (arimdjonoks)
+....I..PS. [ZBX-20001] fixed crash and invalid bytecode error being generated on big-sendian systems when javascript is used; upgraded duktape to version 2.6 (vso)
+..F....... [ZBX-19419] fixed not refreshing graph widgets on dashboards (averza)
+
+--------------------------------------------------------------------------------
+Changes for 6.0.0alpha4
+
+New features:
+A.F.....S. [ZBXNEXT-2406] implemented service problem root cause analysis (ashubin, averza, wiper)
+A......... [ZBXNEXT-6470,ZBXNEXT-6885] implemented audit logging of mediatype API object; refactored mediatype.create, mediatype.update and mediatype.delete (agriscenko)
+.........T [ZBXNEXT-6888] added template "InfluxDB by HTTP" (ychukina)
+A.F....... [ZBXNEXT-6470,ZBXNEXT-6914] implemented audit logging of image and iconmap API objects (rlataria)
+A.F....... [ZBXNEXT-6470,ZBXNEXT-6716] implemented API method history.clear - history cleanup for items and web scenarios (rlataria)
+.......PS. [ZBXNEXT-6809] changed behavior of the vmware event log, the 'skip' option of the new item resets the VMware event cache (MVekslers)
+.........T [ZBXNEXT-6822] added Github media type (abiba)
+.......PS. [ZBX-20010] fixed crash in zabbix-proxy-sqlite3 caused by uninitialized pointer in db_version_info struct (yurii)
+A......... [ZBXNEXT-6470,ZBXNEXT-6918] implemented audit logging of script API object (rlataria)
+........S. [ZBXNEXT-6912] implemented audit for server (processing LLD graphs) (akozlovs)
+........S. [ZBXNEXT-6911] implemented audit for server (processing LLD triggers) (akozlovs)
+.......... [ZBXNEXT-6750] added IgnoreURLCertErrors configuration option to web service (yurii)
+A.F....... [ZBXNEXT-6470,ZBXNEXT-6917] implemented audit logging of global macro API object (rlataria)
+A.F....... [ZBXNEXT-6470,ZBXNEXT-6910] implemented audit logging of dashboard and templatedashboard API object (rlataria)
+
+Bug fixes:
+....I..PS. [ZBX-19604] increased storage size of fields item_preproc.params, triggers.description and media_type_message.message for Oracle backend (MVekslers)
+........S. [ZBX-19781] fixed server not linking host prototype inventory mode (arimdjonoks)
+A......... [ZBX-19978] fixed SQL errors when trying to get count of the interfaces (Sasha)
+.........T [ZBX-19774] fixed README examples (abiba)
+.........T [ZBX-19776] fixed README file (abiba)
+.........T [ZBX-19284] added smart.disk.attr.raw item, removed unit for smart.disk.hours item in "SMART by Zabbix agent 2" template (mchudinov)
+..F....... [ZBX-19899] fixed mass update not working across pages (jfreibergs)
+..F....... [ZBX-19584] increased width for Subscriptions section of Scheduled reports to avoid text clipping (jfreibergs)
+..F....... [ZBX-19580] fixed date format mismatch in UI elements that are loaded via JavaScript (jfreibergs)
+..F....... [ZBX-19683] fixed editable UI tags component for discovered host edit form (miks)
+..F....... [ZBX-19883] fixed broken secret text macro button style (miks)
+.......PS. [ZBX-19848] fixed vmware perf counters that return percentage values (MVekslers)
+.........T [ZBX-19939] fixed typo in Clickhouse Template README (abiba)
+........S. [ZBX-20014] fixed server audit to generate CUID during entry creation instead of audit flush (arimdjonoks)
+...G...... [ZBX-20015] fixed Zabbix agent not being able to retrieve active checks configuration on Windows (vso)
+........S. [ZBX-19989] fixed audit flush when used with Oracle (arimdjonoks)
 
 --------------------------------------------------------------------------------
 Changes for 6.0.0alpha3
@@ -95,9 +145,57 @@ Bug fixes:
 .........T [ZBX-19395] changed version in links of the templates and the media (mchudinov)
 
 --------------------------------------------------------------------------------
+Changes for 5.4.7rc1
+
+New features:
+
+Bug fixes:
+
+--------------------------------------------------------------------------------
+Changes for 5.4.6
+
+5.4.6rc1 was released as 5.4.6 without any changes
+
+--------------------------------------------------------------------------------
+Changes for 5.4.6rc1
+
+New features:
+.........T [ZBXNEXT-6888] added template "InfluxDB by HTTP" (ychukina)
+.......PS. [ZBXNEXT-6809] changed behavior of the vmware event log, the 'skip' option of the new item resets the VMware event cache (MVekslers)
+
+Bug fixes:
+..F....... [ZBX-19997] fixed too long URL error when performing background page refresh (miks)
+A......... [ZBX-20021] fixed impossibility to import media types of type script with parameters from previous versions (agriscenko)
+....I..PS. [ZBX-20001] fixed crash and invalid bytecode error being generated on big-sendian systems when javascript is used; upgraded duktape to version 2.6 (vso)
+..F....... [ZBX-19419] fixed not refreshing graph widgets on dashboards (averza)
+A......... [ZBX-19978] fixed SQL errors when trying to get count of the interfaces (Sasha)
+.........T [ZBX-19774] fixed README examples (abiba)
+.........T [ZBX-19776] fixed README file (abiba)
+.........T [ZBX-19284] added smart.disk.attr.raw item, removed unit for smart.disk.hours item in "SMART by Zabbix agent 2" template (mchudinov)
+..F....... [ZBX-19899] fixed mass update not working across pages (jfreibergs)
+..F....... [ZBX-19584] increased width for Subscriptions section of Scheduled reports to avoid text clipping (jfreibergs)
+..F....... [ZBX-19580] fixed date format mismatch in UI elements that are loaded via JavaScript (jfreibergs)
+..F....... [ZBX-19683] fixed editable UI tags component for discovered host edit form (miks)
+.........T [ZBX-19939] fixed typo in Clickhouse README (abiba)
+..F....... [ZBX-19883] fixed broken secret text macro button style (miks)
+.......PS. [ZBX-19848] fixed vmware perf counters that return percentage values (MVekslers)
+
+--------------------------------------------------------------------------------
+Changes for 5.4.5
+
+5.4.5rc2 was released as 5.4.5 without any changes
+
+--------------------------------------------------------------------------------
+Changes for 5.4.5rc2
+
+Bug fixes:
+...G...... [ZBX-20015] fixed Zabbix agent not being able to retrieve active checks configuration on Windows (vso)
+
+--------------------------------------------------------------------------------
 Changes for 5.4.5rc1
 
 New features:
+.......... [ZBXNEXT-6750] added IgnoreURLCertErrors configuration option to web service (yurii)
 ...G...PS. [ZBXNEXT-6840] improved protocol to support Zabbix proxy configuration of size up to 16 GB; improved performance and memory usage by freeing uncompressed data as fast as possible and compressing before connection (vso)
 ...G...... [ZBXNEXT-6784] removed item being unsupported when swap is not configured (dgoloscapov)
 ..F....... [ZBXNEXT-6852] updated localization for Zabbix Support URL (agriscenko)
@@ -105,6 +203,7 @@ New features:
 .........T [ZBXNEXT-6789] added template for Travis CI (abiba)
 
 Bug fixes:
+.......PS. [ZBX-19898] fixed postgresql version decoding (yurii)
 A......... [ZBX-19954] fixed updating of the "subject" and "message" parameters in scheduled reports (Sasha)
 ........S. [ZBX-19814] added ignoring final result in case if fping quits on a signal (dgoloscapov)
 ...G...PS. [ZBX-19952] removed libmodbus linkage from server and proxy (yurii)
@@ -1120,6 +1219,48 @@ A......... [ZBX-17955] fixed "medias" parameter named inconsistency in user.crea
 .......PS. [ZBX-17548] don't store text items with history 0 in proxy history (wiper)
 
 --------------------------------------------------------------------------------
+Changes for 5.0.18rc1
+
+New features:
+
+Bug fixes:
+
+--------------------------------------------------------------------------------
+Changes for 5.0.17
+
+5.0.17rc1 was released as 5.0.17 without any changes
+
+--------------------------------------------------------------------------------
+Changes for 5.0.17rc1
+
+New features:
+.......PS. [ZBXNEXT-6809] changed behavior of the vmware event log, the 'skip' option of the new item resets the VMware event cache (MVekslers)
+
+Bug fixes:
+..F....... [ZBX-19997] fixed too long URL error when performing background page refresh (miks)
+A......... [ZBX-20021] fixed impossibility to import media types of type script with parameters from previous versions (agriscenko)
+...G...... [ZBX-20008] removed curl and ldap linkage from agent2 (yurii)
+....I..PS. [ZBX-20001] fixed crash and invalid bytecode error being generated on big-sendian systems when javascript is used; upgraded duktape to version 2.6 (vso)
+A......... [ZBX-19978] fixed SQL errors when trying to get count of the interfaces (Sasha)
+.........T [ZBX-19774] fixed README examples (abiba)
+.........T [ZBX-19776] fixed README file (abiba)
+.........T [ZBX-19284] added smart.disk.attr.raw item, removed unit for smart.disk.hours item in "SMART by Zabbix agent 2" template (mchudinov)
+..F....... [ZBX-19899] fixed mass update not working across pages for problems monitoring (jfreibergs)
+.........T [ZBX-19939] fixed typo in Clickhouse Template README (abiba)
+........S. [ZBX-19457] fixed failed query when updating application names longer than 255 characters (asestakovs)
+
+--------------------------------------------------------------------------------
+Changes for 5.0.16
+
+5.0.16rc2 was released as 5.0.16 without any changes
+
+--------------------------------------------------------------------------------
+Changes for 5.0.16rc2
+
+Bug fixes:
+...G...... [ZBX-20015] fixed Zabbix agent not being able to retrieve active checks configuration on Windows (vso)
+
+--------------------------------------------------------------------------------
 Changes for 5.0.16rc1
 
 New features:
@@ -3351,6 +3492,34 @@ A.F.I...S. [ZBXNEXT-4853,ZBXNEXT-517] added ability to send email messages in HT
 ..F.....S. [ZBXNEXT-1282,ZBXNEXT-4730] added changes to introduce regex based matching for auto-registration (vasilijs, viktors)
 
 --------------------------------------------------------------------------------
+Changes for 4.0.36rc1
+
+New features:
+
+Bug fixes:
+
+--------------------------------------------------------------------------------
+Changes for 4.0.35
+
+4.0.35rc1 was released as 4.0.35 without any changes
+
+--------------------------------------------------------------------------------
+Changes for 4.0.35rc1
+
+New features:
+.......PS. [ZBXNEXT-6809] changed behavior of the vmware event log, the 'skip' option of the new item resets the VMware event cache (MVekslers)
+
+Bug fixes:
+.......PS. [ZBX-19428] fixed high CPU usage and preprocessing workers exiting with timeout when starting numerous poller, trapper and discoverer processes (vso)
+...G...... [ZBX-19510] fixed re-reading of old Windows events for various Windows event system synchronization problems (MVekslers)
+........S. [ZBX-19457] fixed failed query when updating application names longer than 255 characters (asestakovs)
+
+--------------------------------------------------------------------------------
+Changes for 4.0.34
+
+4.0.34rc1 was released as 4.0.34 without any changes
+
+--------------------------------------------------------------------------------
 Changes for 4.0.34rc1
 
 New features:
diff --git a/ChangeLog.d/bugfix/ZBX-20077 b/ChangeLog.d/bugfix/ZBX-20077
new file mode 100644
index 00000000000..b96b4c0178d
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-20077
@@ -0,0 +1 @@
+........S. [ZBX-20077] fixed possible collision of audit entities for server in json (arimdjonoks)
diff --git a/ChangeLog.d/bugfix/ZBX-20089 b/ChangeLog.d/bugfix/ZBX-20089
new file mode 100644
index 00000000000..0575533bbae
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-20089
@@ -0,0 +1 @@
+........S. [ZBX-20089] fixed server crash during network discovery when default inventory mode is not Disabled (arimdjonoks)
diff --git a/ChangeLog.d/feature/ZBXNEXT-6930 b/ChangeLog.d/feature/ZBXNEXT-6930
new file mode 100644
index 00000000000..7473c525b7e
--- /dev/null
+++ b/ChangeLog.d/feature/ZBXNEXT-6930
@@ -0,0 +1 @@
+..F.I..... [ZBXNEXT-6930] removed Monitoring -> Overview (agriscenko)
diff --git a/build-backend.xml b/build-backend.xml
index 75707929dc3..68558c78354 100644
--- a/build-backend.xml
+++ b/build-backend.xml
@@ -50,6 +50,10 @@
 			<arg line="-I/usr/include"/>
 			<arg line="-I/usr/local/include"/>
 			<arg line="-I./include"/>
+			<!-- Exclude Duktape library from checking -->
+			<arg line="-isrc/libs/zbxembed/duk_config.h"/>
+			<arg line="-isrc/libs/zbxembed/duktape.c"/>
+			<arg line="-isrc/libs/zbxembed/duktape.h"/>
 			<arg line="--suppress=variableScope:*"/>
 			<arg line="--suppress=ConfigurationNotChecked:*"/>
 			<arg line="--inconclusive"/>
diff --git a/build.xml b/build.xml
index 01484c2b87b..3612cbb6ae0 100644
--- a/build.xml
+++ b/build.xml
@@ -57,7 +57,7 @@
 		<replace file="ui/conf/zabbix.conf.php" token="{DBUSER}" value="${dbuser}"/>
 		<replace file="ui/conf/zabbix.conf.php" token="{DBPASSWORD}" value="${dbpassword}"/>
 		<replace file="ui/conf/zabbix.conf.php" token="{PHPUNIT_ERROR_LOG}" value="${phpunit_error_log}"/>
-                <chmod file="ui/conf/zabbix.conf.php" perm="go+w"/>
+		<chmod file="ui/conf/zabbix.conf.php" perm="go+rw"/>
 	</target>
 
 	<target name="create-saml-configs">
@@ -78,6 +78,7 @@
 		<replace file="${SIMPLESAMLPHP_CFG_FILE}" token="{ENTITY_ID}" value="${phpunit_sp_entity_id}"/>
 		<replace file="${SIMPLESAMLPHP_CFG_FILE}" token="{ASSERTION_CONSUMER_SERVICE}" value="${url}index_sso.php?acs"/>
 		<replace file="${SIMPLESAMLPHP_CFG_FILE}" token="{SINGLE_LOGOUT_SERVICE}" value="${url}index_sso.php?sls"/>
+		<chmod file="${SIMPLESAMLPHP_CFG_FILE}" perm="go+r"/>
 	</target>
 
 	<target name="init-integration">
diff --git a/configure.ac b/configure.ac
index a078003793c..ad658c9d5de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ dnl
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([Zabbix],[6.0.0alpha4])
+AC_INIT([Zabbix],[6.0.0alpha5])
 AC_CONFIG_SRCDIR(src/zabbix_server/server.c)
 AM_INIT_AUTOMAKE([subdir-objects filename-length-max=99])
 
@@ -1212,7 +1212,7 @@ if test "x$ARCH" = "xsolaris"; then
 	AC_MSG_RESULT(yes),
 	CFLAGS="$saved_CFLAGS"
 	AC_MSG_RESULT(no))
-	CFLAGS="${CFLAGS} -DDUK_F_OLD_SOLARIS"
+	CFLAGS="${CFLAGS} -DZBX_OLD_SOLARIS"
 fi
 
 if test "x$ARCH" = "xhpux"; then
@@ -1669,6 +1669,9 @@ PROXY_LIBS="$PROXY_LIBS $ZLIB_LIBS $LIBPTHREAD_LIBS"
 AGENT_LDFLAGS="$AGENT_LDFLAGS $ZLIB_LDFLAGS $LIBPTHREAD_LDFLAGS"
 AGENT_LIBS="$AGENT_LIBS $ZLIB_LIBS $LIBPTHREAD_LIBS"
 
+AGENT2_LDFLAGS="$AGENT2_LDFLAGS $ZLIB_LDFLAGS $LIBPTHREAD_LDFLAGS"
+AGENT2_LIBS="$AGENT2_LIBS $ZLIB_LIBS $LIBPTHREAD_LIBS"
+
 ZBXGET_LDFLAGS="$ZBXGET_LDFLAGS $ZLIB_LDFLAGS $LIBPTHREAD_LDFLAGS"
 ZBXGET_LIBS="$ZBXGET_LIBS $ZLIB_LIBS $LIBPTHREAD_LIBS"
 
@@ -1761,6 +1764,9 @@ PROXY_LIBS="$PROXY_LIBS $TLS_LIBS"
 AGENT_LDFLAGS="$AGENT_LDFLAGS $TLS_LDFLAGS"
 AGENT_LIBS="$AGENT_LIBS $TLS_LIBS"
 
+AGENT2_LDFLAGS="$AGENT2_LDFLAGS $TLS_LDFLAGS"
+AGENT2_LIBS="$AGENT2_LIBS $TLS_LIBS"
+
 ZBXGET_LDFLAGS="$ZBXGET_LDFLAGS $TLS_LDFLAGS"
 ZBXGET_LIBS="$ZBXGET_LIBS $TLS_LIBS"
 
@@ -1896,6 +1902,8 @@ SERVER_CONFIG_FILE="${sysconfdir}/zabbix_server.conf"
 PROXY_CONFIG_FILE="${sysconfdir}/zabbix_proxy.conf"
 AGENT_CONFIG_FILE="${sysconfdir}/zabbix_agentd.conf"
 AGENT2_CONFIG_FILE="${sysconfdir}/zabbix_agent2.conf"
+AGENT2_CONFIG_PATH="${sysconfdir}/zabbix_agent2.d"
+AGENT2_CONFIG_PLUGINS_PATH="${AGENT2_CONFIG_PATH}/plugins.d"
 WEBSERVICE_CONFIG_FILE="${sysconfdir}/zabbix_web_service.conf"
 
 EXTERNAL_SCRIPTS_PATH="${datadir}/zabbix/externalscripts"
@@ -1915,6 +1923,9 @@ AC_SUBST(PROXY_LIBS)
 AC_SUBST(AGENT_LDFLAGS)
 AC_SUBST(AGENT_LIBS)
 
+AC_SUBST(AGENT2_LDFLAGS)
+AC_SUBST(AGENT2_LIBS)
+
 if test "x$HAVE_START_GROUP" = "xyes"; then
 	LD_START_GROUP=-Wl,--start-group
 	LD_END_GROUP=-Wl,--end-group
@@ -1922,7 +1933,7 @@ fi
 
 if test "x$agent2" = "xyes"; then
 	CGO_CFLAGS=$TLS_CFLAGS
-	CGO_LDFLAGS="$AGENT_LDFLAGS $LD_START_GROUP \
+	CGO_LDFLAGS="$AGENT2_LDFLAGS $LD_START_GROUP \
 		\${abs_top_builddir}/src/zabbix_agent/logfiles/libzbxlogfiles.a \
 		\${abs_top_builddir}/src/libs/zbxcomms/libzbxcomms.a \
 		\${abs_top_builddir}/src/libs/zbxcommon/libzbxcommon.a \
@@ -1941,7 +1952,7 @@ if test "x$agent2" = "xyes"; then
 		\${abs_top_builddir}/src/libs/zbxexec/libzbxexec.a \
 		\${abs_top_builddir}/src/libs/zbxalgo/libzbxalgo.a \
 		\${abs_top_builddir}/src/libs/zbxjson/libzbxjson.a \
-		$LIBS $AGENT_LIBS $LD_END_GROUP"
+		$LIBS $AGENT2_LIBS $LD_END_GROUP"
 
 	AC_SUBST(CGO_CFLAGS)
 	AC_SUBST(CGO_LDFLAGS)
@@ -1960,6 +1971,8 @@ AC_SUBST(SERVER_CONFIG_FILE)
 AC_SUBST(PROXY_CONFIG_FILE)
 AC_SUBST(AGENT_CONFIG_FILE)
 AC_SUBST(AGENT2_CONFIG_FILE)
+AC_SUBST(AGENT2_CONFIG_PATH)
+AC_SUBST(AGENT2_CONFIG_PLUGINS_PATH)
 AC_SUBST(WEBSERVICE_CONFIG_FILE)
 
 AC_SUBST(EXTERNAL_SCRIPTS_PATH)
@@ -2132,6 +2145,12 @@ AGENT_CONFIG_FILE=`eval echo "${AGENT_CONFIG_FILE}"`
 AGENT2_CONFIG_FILE=`eval echo "${AGENT2_CONFIG_FILE}"`
 AGENT2_CONFIG_FILE=`eval echo "${AGENT2_CONFIG_FILE}"`
 
+AGENT2_CONFIG_PATH=`eval echo "${AGENT2_CONFIG_PATH}"`
+AGENT2_CONFIG_PATH=`eval echo "${AGENT2_CONFIG_PATH}"`
+
+AGENT2_CONFIG_PLUGINS_PATH=`eval echo "${AGENT2_CONFIG_PLUGINS_PATH}"`
+AGENT2_CONFIG_PLUGINS_PATH=`eval echo "${AGENT2_CONFIG_PLUGINS_PATH}"`
+
 WEBSERVICE_CONFIG_FILE=`eval echo "${WEBSERVICE_CONFIG_FILE}"`
 WEBSERVICE_CONFIG_FILE=`eval echo "${WEBSERVICE_CONFIG_FILE}"`
 
diff --git a/create/src/data.tmpl b/create/src/data.tmpl
index 2be33e193a9..8ab90f9eb8a 100644
--- a/create/src/data.tmpl
+++ b/create/src/data.tmpl
@@ -89,6 +89,7 @@ ROW   |28         |4   |VictorOps               |                |           |
 ROW   |29         |4   |Brevis.one              |                |           |                  |         |          |        |      |0     |25       |0            |0               |0               |0                  |           |1          |3          |10s             |1           |var BrevisOne = {&eol;    params: [],&eol;&eol;    addParam: function (name, value) {&eol;        BrevisOne.params.push(name + '=' + encodeURIComponent(value));&eol;    },&eol;&eol;    setProxy: function (HTTPProxy) {&eol;        BrevisOne.HTTPProxy = HTTPProxy;&eol;    },&eol;&eol;    setPayload: function (params) {&eol;        var parts = params.send_to.split(':'),&eol;            defaultValues = {&eol;                ring: 'true',&eol;                flash: 'true',&eol;                telauto: 'false'&eol;            };&eol;&eol;        BrevisOne.addParam('username', params.username);&eol;        BrevisOne.addParam('password', params.password);&eol;        BrevisOne.addParam('text', params.text);&eol;&eol;        if (parts.length > 1) {&eol;            BrevisOne.addParam('mode', parts[0]);&eol;            BrevisOne.addParam('to', parts[1]);&eol;        }&eol;        else {&eol;            BrevisOne.addParam('to', parts[0]);&eol;        }&eol;&eol;        Object.keys(defaultValues)&eol;            .forEach(function (key) {&eol;                if (params[key] && params[key].trim() && params[key].toLowerCase() === defaultValues[key]) {&eol;                    BrevisOne.addParam(key, defaultValues[key]);&eol;                }&eol;            });&eol;    },&eol;&eol;    request: function () {&eol;        var response,&eol;            request = new HttpRequest(),&eol;            data = '?' + BrevisOne.params.join('&');&eol;&eol;        request.addHeader('Content-Type: multipart/form-data');&eol;&eol;        if (typeof BrevisOne.HTTPProxy !== 'undefined' && BrevisOne.HTTPProxy !== '') {&eol;            request.setProxy(BrevisOne.HTTPProxy);&eol;        }&eol;&eol;        Zabbix.log(4, '[ BrevisOne Webhook ] Sending request.');&eol;&eol;        response = request.post(params.endpoint + data);&eol;&eol;        Zabbix.log(4, '[ BrevisOne Webhook ] Received response with status code ' +&eol;            request.getStatus() + '\n' + response);&eol;&eol;        if (request.getStatus() < 200 &pipe;&pipe; request.getStatus() >= 300) {&eol;            var message = 'Request failed with status code ' + request.getStatus();&eol;&eol;            if (response) {&eol;                message += ': ' + response;&eol;            }&eol;&eol;            throw message + '. Check debug log for more information.';&eol;        }&eol;    }&eol;};&eol;&eol;try {&eol;    var params = JSON.parse(value);&eol;&eol;    ['endpoint', 'password', 'username', 'text', 'send_to'].forEach(function (field) {&eol;        if (typeof params !== 'object' &pipe;&pipe; typeof params[field] === 'undefined'&eol;                &pipe;&pipe; !params[field].trim()) {&eol;            throw 'Required parameter is not set: "' + field + '".';&eol;        }&eol;    });&eol;&eol;    if (params.send_to === '{ALERT.SENDTO}') {&eol;        throw 'Required parameter is not set: "send_to".';&eol;    }&eol;&eol;    BrevisOne.setProxy(params.HTTPProxy);&eol;    BrevisOne.setPayload(params);&eol;    BrevisOne.request();&eol;&eol;    return 'OK';&eol;}&eol;catch (error) {&eol;    Zabbix.log(3, '[ BrevisOne Webhook ] ERROR: ' + error);&eol;    throw 'Sending failed: ' + error;&eol;}|30s    |0           |0              |                                      |                                                            |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 ROW   |30         |4   |Express.ms              |                |           |                  |         |          |        |      |0     |25       |0            |0               |0               |0                  |           |1          |3          |10s             |1           |var Express = {&eol;    params: [],&eol;&eol;    setParams: function (params) {&eol;        if (typeof params !== 'object') {&eol;            return;&eol;        }&eol;&eol;        Express.params = params;&eol;&eol;        if (typeof Express.params.url === 'string' && !Express.params.url.endsWith('/')) {&eol;            Express.params.url += '/';&eol;        }&eol;    },&eol;&eol;    setProxy: function (HTTPProxy) {&eol;        Express.HTTPProxy = HTTPProxy;&eol;    },&eol;&eol;    request: function (query, data) {&eol;        var response,&eol;            url = Express.params.url + query,&eol;            request = new HttpRequest();&eol;&eol;        request.addHeader('Content-Type: application/json');&eol;        request.addHeader('Authorization: Bearer ' + Express.params.token);&eol;&eol;        if (typeof Express.HTTPProxy !== 'undefined' && Express.HTTPProxy !== '') {&eol;            request.setProxy(Express.HTTPProxy);&eol;        }&eol;&eol;        if (typeof data !== 'undefined') {&eol;            data = JSON.stringify(data);&eol;        }&eol;&eol;        Zabbix.log(4, '[ Express Webhook ] Sending request: ' + url +&eol;            ((typeof data === 'string') ? ('\n' + data) : ''));&eol;&eol;        response = request.post(url, data);&eol;&eol;        Zabbix.log(4, '[ Express Webhook ] Received response with status code ' +&eol;            request.getStatus() + '\n' + response);&eol;&eol;        if (response !== null) {&eol;            try {&eol;                response = JSON.parse(response);&eol;            }&eol;            catch (error) {&eol;                Zabbix.log(4, '[ Express Webhook ] Failed to parse response received from Express');&eol;                response = {};&eol;            }&eol;        }&eol;&eol;        if (response.status !== 'ok') {&eol;            var message = 'Request failed with status code ' + request.getStatus();&eol;&eol;            if (typeof response.reason !== 'undefined') {&eol;                message += ': ' + JSON.stringify(response.reason);&eol;            }&eol;&eol;            throw message + '. Check debug log for more information.';&eol;        }&eol;&eol;        return response.result;&eol;    },&eol;&eol;    postMessage: function (is_problem) {&eol;        var data,&eol;            url,&eol;            result = {tags: {}},&eol;            response;&eol;&eol;        if (is_problem) {&eol;            data = {&eol;                group_chat_id: Express.params.send_to,&eol;                notification: {&eol;                    status: 'ok',&eol;                    body: Express.params.message&eol;                }&eol;            };&eol;            url = 'api/v3/botx/notification/callback/direct';&eol;        }&eol;        else {&eol;            data = {&eol;                reply: {&eol;                    status: 'ok',&eol;                    body: Express.params.message&eol;                }&eol;            };&eol;            url = 'api/v3/botx/events/reply_event';&eol;&eol;            try {&eol;                var tags = JSON.parse(Express.params.tags);&eol;            }&eol;            catch (error) {&eol;                throw 'Value of "express_tags" is not JSON. Value: ' + Express.params.tags + '.';&eol;            }&eol;&eol;            tags.forEach(function(tag) {&eol;                if (tag.tag === '__zbx_ex_sync_id_' + Express.params.send_to) {&eol;                    data.source_sync_id = tag.value;&eol;                }&eol;            });&eol;&eol;            if (!data.source_sync_id) {&eol;                throw 'Cannot update data. sync_id for the provided sender is unknown.';&eol;            }&eol;        }&eol;&eol;        response = Express.request(url, data);&eol;&eol;        if (is_problem && response.sync_id) {&eol;            result.tags['__zbx_ex_sync_id_' + Express.params.send_to] = response.sync_id;&eol;&eol;            return JSON.stringify(result);&eol;        }&eol;        else {&eol;            return 'OK';&eol;        }&eol;    }&eol;};&eol;&eol;try {&eol;    var params = JSON.parse(value),&eol;        express = {},&eol;        required_params = [&eol;            'express_url', 'express_send_to', 'express_message', 'express_tags', 'express_token',&eol;            'event_source', 'event_value', 'event_update_status'&eol;        ];&eol;&eol;    Object.keys(params)&eol;        .forEach(function (key) {&eol;            if (key.startsWith('express_')) {&eol;                express[key.substring(8)] = params[key];&eol;            }&eol;&eol;            if (required_params.indexOf(key) !== -1&eol;                    && (params[key].trim() === '' &pipe;&pipe; params[key] === '{ALERT.SENDTO}')) {&eol;                throw 'Parameter "' + key + '" can\'t be empty.';&eol;            }&eol;        });&eol;&eol;    if ([0, 1, 2, 3].indexOf(parseInt(params.event_source)) === -1) {&eol;        throw 'Incorrect "event_source" parameter given: ' + params.event_source + '\nMust be 0-3.';&eol;    }&eol;&eol;    // Forcing event_value and event_update_status for non trigger-based events.&eol;    if (params.event_source !== '0' ) {&eol;        params.event_value = '1';&eol;        params.event_update_status = '0';&eol;    }&eol;&eol;    if (params.event_value !== '0' && params.event_value !== '1') {&eol;        throw 'Incorrect "event_value" parameter given: ' + params.event_value + '\nMust be 0 or 1.';&eol;    }&eol;&eol;    // Check {EVENT.UPDATE.STATUS} only for trigger-based events.&eol;    if (params.event_update_status !== '0' && params.event_update_status !== '1' && params.event_source === '0') {&eol;        throw 'Incorrect "event_update_status" parameter given: ' + params.event_update_status + '\nMust be 0 or 1.';&eol;    }&eol;&eol;    Express.setParams(express);&eol;    Express.setProxy(params.HTTPProxy);&eol;&eol;    return Express.postMessage(params.event_value === '1' && params.event_update_status === '0');&eol;}&eol;catch (error) {&eol;    Zabbix.log(3, '[ Express Webhook ] ERROR: ' + error);&eol;    throw 'Sending failed: ' + error;&eol;}|30s    |1           |0              |                                      |                                                            |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 ROW   |31         |4   |ManageEngine ServiceDesk|                |           |                  |         |          |        |      |0     |25       |0            |0               |0               |0                  |           |1          |3          |10s             |1           |var MEngine = {&eol;    params: {},&eol;&eol;    setParams: function (params) {&eol;        if (typeof params !== 'object') {&eol;            return;&eol;        }&eol;&eol;        MEngine.params = params;&eol;        if (typeof MEngine.params.url === 'string') {&eol;            if (!MEngine.params.url.endsWith('/')) {&eol;                MEngine.params.url += '/';&eol;            }&eol;&eol;            MEngine.params.url += 'api/v3/';&eol;        }&eol;&eol;        if (MEngine.params.on_premise.toLowerCase() !== 'true'&eol;                && typeof MEngine.params.on_demand_url_auth === 'string') {&eol;            if (!MEngine.params.on_demand_url_auth.endsWith('/')) {&eol;                MEngine.params.on_demand_url_auth += '/';&eol;            }&eol;&eol;            MEngine.params.on_demand_url_auth += 'oauth/v2/token?';&eol;        }&eol;    },&eol;&eol;    setProxy: function (HTTPProxy) {&eol;        MEngine.HTTPProxy = HTTPProxy;&eol;    },&eol;&eol;    createLink: function (id, url) {&eol;        return url + (url.endsWith('/') ? '' : '/') +&eol;            ((MEngine.params.on_premise.toLowerCase() === 'true')&eol;                ? ('WorkOrder.do?woMode=viewWO&woID=' + id)&eol;                : ('app/itdesk/ui/requests/' + id + '/details')&eol;            );&eol;    },&eol;&eol;    refreshAccessToken: function () {&eol;        [&eol;            'on_demand_url_auth',&eol;            'on_demand_refresh_token',&eol;            'on_demand_client_id',&eol;            'on_demand_client_secret'&eol;        ].forEach(function (field) {&eol;            if (typeof MEngine.params !== 'object' &pipe;&pipe; typeof MEngine.params[field] === 'undefined'&eol;                    &pipe;&pipe; MEngine.params[field].trim() === '' ) {&eol;                throw 'Required MEngine param is not set: "sd_' + field + '".';&eol;            }&eol;        });&eol;&eol;        var response,&eol;            request = new HttpRequest(),&eol;            url = MEngine.params.on_demand_url_auth +&eol;                'refresh_token=' + encodeURIComponent(MEngine.params.on_demand_refresh_token) +&eol;                '&grant_type=refresh_token&client_id=' + encodeURIComponent(MEngine.params.on_demand_client_id) +&eol;                '&client_secret=' + encodeURIComponent(MEngine.params.on_demand_client_secret) +&eol;                '&redirect_uri=https://www.zoho.com&scope=SDPOnDemand.requests.ALL';&eol;&eol;        if (MEngine.HTTPProxy) {&eol;            request.setProxy(MEngine.HTTPProxy);&eol;        }&eol;&eol;        Zabbix.log(4, '[ ManageEngine Webhook ] Refreshing access token. Request: ' + url);&eol;&eol;        response = request.post(url);&eol;&eol;        Zabbix.log(4, '[ ManageEngine Webhook ] Received response with status code ' +&eol;        request.getStatus() + '\n' + response);&eol;&eol;        try {&eol;            response = JSON.parse(response);&eol;        }&eol;        catch (error) {&eol;            Zabbix.log(4, '[ ManageEngine Webhook ] Failed to parse response received from Zoho Accounts');&eol;        }&eol;&eol;        if ((request.getStatus() < 200 &pipe;&pipe; request.getStatus() >= 300) && !response.access_token) {&eol;            throw 'Access token refresh failed with HTTP status code ' + request.getStatus() +&eol;                '. Check debug log for more information.';&eol;        }&eol;        else {&eol;            MEngine.params.on_demand_auth_token = response.access_token;&eol;        }&eol;    },&eol;&eol;    request: function (method, query, data) {&eol;        var response,&eol;            url = MEngine.params.url + query,&eol;            input,&eol;            request = new HttpRequest(),&eol;            message;&eol;&eol;        if (MEngine.params.on_premise.toLowerCase() === 'true') {&eol;            request.addHeader('TECHNICIAN_KEY: ' + MEngine.params.on_premise_auth_token);&eol;        }&eol;        else {&eol;            request.addHeader('Authorization: Zoho-oauthtoken ' + MEngine.params.on_demand_auth_token);&eol;            request.addHeader('Accept: application/v3+json');&eol;        }&eol;&eol;        if (MEngine.HTTPProxy) {&eol;            request.setProxy(MEngine.HTTPProxy);&eol;        }&eol;&eol;        if (typeof data !== 'undefined') {&eol;            data = JSON.stringify(data);&eol;        }&eol;&eol;        input = 'input_data=' + encodeURIComponent(data);&eol;        Zabbix.log(4, '[ ManageEngine Webhook ] Sending request: ' + url + '?' + input);&eol;&eol;        switch (method) {&eol;            case 'post':&eol;                response = request.post(url, input);&eol;                break;&eol;&eol;            case 'put':&eol;                response = request.put(url, input);&eol;                break;&eol;&eol;            default:&eol;                throw 'Unsupported HTTP request method: ' + method;&eol;        }&eol;&eol;        Zabbix.log(4, '[ ManageEngine Webhook ] Received response with status code ' +&eol;            request.getStatus() + '\n' + response);&eol;&eol;        try {&eol;            response = JSON.parse(response);&eol;        }&eol;        catch (error) {&eol;            Zabbix.log(4, '[ ManageEngine Webhook ] Failed to parse response received from ManageEngine');&eol;        }&eol;&eol;        if ((request.getStatus() < 200 &pipe;&pipe; request.getStatus() >= 300)&eol;                && typeof response.response_status !== 'object') {&eol;            throw 'Request failed with HTTP status code ' + request.getStatus() +&eol;                '. Check debug log for more information.';&eol;        }&eol;        else if (typeof response.response_status === 'object' && response.response_status.status === 'failed') {&eol;            message = 'Request failed with status_code ';&eol;&eol;            if (typeof response.response_status.messages === 'object'&eol;                    && response.response_status.messages[0]&eol;                    && response.response_status.messages[0].message) {&eol;                message += response.response_status.messages[0].status_code +&eol;                    '. Message: ' + response.response_status.messages[0].message;&eol;            }&eol;            else {&eol;                message += response.response_status.status_code;&eol;            }&eol;&eol;            message += '. Check debug log for more information.';&eol;            throw message;&eol;        }&eol;        else if (response.request) {&eol;            return response.request.id;&eol;        }&eol;    },&eol;&eol;    createPaylaod: function (fields, isNote) {&eol;        var data = {},&eol;            result;&eol;&eol;        if (isNote) {&eol;            data.description = fields['field_string:description'].replace(/(?:\r\n&pipe;\r&pipe;\n)/g, '<br>');&eol;            result = {request_note: data};&eol;        }&eol;        else {&eol;            Object.keys(fields)&eol;                .forEach(function(field) {&eol;                    if (fields[field].trim() === '') {&eol;                        Zabbix.log(4, '[ ManageEngine Webhook ] Field "' + field +&eol;                            '" can\'t be empty. The field ignored.');&eol;                    }&eol;                    else {&eol;                        try {&eol;                            var prefix = field.split(':')[0],&eol;                                root;&eol;&eol;                            if  (prefix.startsWith('udf_') && !data.udf_fields) {&eol;                                data.udf_fields = {};&eol;                                root = data.udf_fields;&eol;                            }&eol;                            else if (prefix.startsWith('udf_')) {&eol;                                root = data.udf_fields;&eol;                            }&eol;                            else {&eol;                                root = data;&eol;                            }&eol;&eol;                            if (prefix.endsWith('string')) {&eol;                                root[field.substring(field.indexOf(':') + 1)&eol;                                    .toLowerCase()] = fields[field];&eol;                            }&eol;                            else {&eol;                                root[field.substring(field.indexOf(':') + 1)&eol;                                    .toLowerCase()] = {&eol;                                    name: fields[field]&eol;                                };&eol;                            }&eol;                        }&eol;                        catch (error) {&eol;                            Zabbix.log(4, '[ ManageEngine Webhook ] Can\'t parse field "' + field +&eol;                                '". The field ignored.');&eol;                        }&eol;                    }&eol;                });&eol;            if (data.description) {&eol;                data.description = data.description.replace(/(?:\r\n&pipe;\r&pipe;\n)/g, '<br>');&eol;            }&eol;&eol;            result = {request: data};&eol;        }&eol;&eol;        return result;&eol;    }&eol;};&eol;&eol;try {&eol;    var params = JSON.parse(value),&eol;        fields = {},&eol;        sd = {},&eol;        result = {tags: {}},&eol;        required_params = [&eol;            'sd_on_premise', 'field_string:subject', 'field_string:description',&eol;            'event_recovery_value', 'event_source', 'event_value', 'event_update_status'&eol;        ],&eol;        severities = [&eol;            {name: 'not_classified', color: '#97AAB3'},&eol;            {name: 'information', color: '#7499FF'},&eol;            {name: 'warning', color: '#FFC859'},&eol;            {name: 'average', color: '#FFA059'},&eol;            {name: 'high', color: '#E97659'},&eol;            {name: 'disaster', color: '#E45959'},&eol;            {name: 'default', color: '#000000'}&eol;        ];&eol;&eol;    Object.keys(params)&eol;        .forEach(function (key) {&eol;            if (key.startsWith('sd_')) {&eol;                sd[key.substring(3)] = params[key];&eol;            }&eol;            else if (key.startsWith('field_') &pipe;&pipe; key.startsWith('udf_field_')) {&eol;                fields[key] = params[key];&eol;            }&eol;&eol;            if (required_params.indexOf(key) !== -1 && params[key].trim() === '') {&eol;                throw 'Parameter "' + key + '" can\'t be empty.';&eol;            }&eol;        });&eol;&eol;    if ([0, 1, 2, 3].indexOf(parseInt(params.event_source)) === -1) {&eol;        throw 'Incorrect "event_source" parameter given: ' + params.event_source + '\nMust be 0-3.';&eol;    }&eol;&eol;    // Check {EVENT.VALUE} for trigger-based and internal events.&eol;    if (params.event_value !== '0' && params.event_value !== '1'&eol;        && (params.event_source === '0' &pipe;&pipe; params.event_source === '3')) {&eol;        throw 'Incorrect "event_value" parameter given: ' + params.event_value + '\nMust be 0 or 1.';&eol;    }&eol;&eol;    // Check {EVENT.UPDATE.STATUS} only for trigger-based events.&eol;    if (params.event_update_status !== '0' && params.event_update_status !== '1' && params.event_source === '0') {&eol;        throw 'Incorrect "event_update_status" parameter given: ' + params.event_update_status + '\nMust be 0 or 1.';&eol;    }&eol;&eol;    if (params.event_source !== '0' && params.event_recovery_value === '0') {&eol;        throw 'Recovery operations are supported only for trigger-based actions.';&eol;    }&eol;&eol;    if ([0, 1, 2, 3, 4, 5].indexOf(parseInt(params.event_nseverity)) === -1) {&eol;        params.event_nseverity = '6';&eol;    }&eol;&eol;    if (params.event_update_status === '1' && (typeof params.sd_request_id === 'undefined'&eol;            &pipe;&pipe; params.sd_request_id.trim() === ''&eol;            &pipe;&pipe; params.sd_request_id === '{EVENT.TAGS.__zbx_sd_request_id}')) {&eol;        throw 'Parameter "sd_request_id" can\'t be empty for update operation.';&eol;    }&eol;&eol;    MEngine.setParams(sd);&eol;    MEngine.setProxy(params.HTTPProxy);&eol;&eol;    if (MEngine.params.on_premise.toLowerCase() !== 'true') {&eol;        MEngine.refreshAccessToken();&eol;    }&eol;&eol;    // Create issue for non trigger-based events.&eol;    if (params.event_source !== '0' && params.event_recovery_value !== '0') {&eol;        fields['field_object:priority'] = params['priority_' + severities[params.event_nseverity].name]&eol;        &pipe;&pipe; 'Normal';&eol;&eol;        MEngine.request('post', 'requests', MEngine.createPaylaod(fields));&eol;    }&eol;    // Create issue for trigger-based events.&eol;    else if (params.event_value === '1' && params.event_update_status === '0') {&eol;        fields['field_object:priority'] = params['priority_' + severities[params.event_nseverity].name]&eol;        &pipe;&pipe; 'Normal';&eol;&eol;        var id = MEngine.request('post', 'requests', MEngine.createPaylaod(fields));&eol;&eol;        result.tags.__zbx_sd_request_id = id;&eol;        result.tags.__zbx_sd_request_link = MEngine.createLink(id, params.sd_url);&eol;    }&eol;    // Update created issue for trigger-based event.&eol;    else {&eol;        if (params.event_update_status === '1') {&eol;            MEngine.request('post', 'requests/' + params.sd_request_id + '/notes',&eol;                MEngine.createPaylaod(fields, true)&eol;            );&eol;        }&eol;        delete fields['field_string:description'];&eol;        MEngine.request('put', 'requests/' + params.sd_request_id, MEngine.createPaylaod(fields));&eol;    }&eol;&eol;    return JSON.stringify(result);&eol;}&eol;catch (error) {&eol;    Zabbix.log(3, '[ ManageEngine Webhook ] ERROR: ' + error);&eol;    throw 'Sending failed: ' + error;&eol;}|30s    |1           |1              |{EVENT.TAGS.__zbx_sd_request_link}    |ManageEngine: {EVENT.TAGS.__zbx_sd_request_id}              |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+ROW   |32         |4   |Github                  |                |           |                  |         |          |        |      |0     |25       |0            |0               |0               |0                  |           |1          |3          |10s             |1           |var Github = {&eol;    params: {},&eol;&eol;    setParams: function (params) {&eol;        if (typeof params !== 'object') {&eol;            return;&eol;        }&eol;        Github.params = params;&eol;    },&eol;&eol;    setProxy: function (HTTPProxy) {&eol;        Github.HTTPProxy = HTTPProxy;&eol;    },&eol;&eol;    urlCheckFormat: function (url) {&eol;&eol;        if (typeof url === 'string' && !url.endsWith('/')) {&eol;            url += '/';&eol;        }&eol;&eol;        if (url.indexOf('http://') === -1 && url.indexOf('https://') === -1) {&eol;            url = 'https://' + url;&eol;        }&eol;&eol;        return url;&eol;    },&eol;&eol;    createProblemURL: function (zabbix_url, triggerid, eventid, event_source) {&eol;        var problem_url = zabbix_url;&eol;&eol;        if (event_source === '0') {&eol;            problem_url += 'tr_events.php?triggerid=' + triggerid + '&eventid=' + eventid;&eol;        }&eol;&eol;        return problem_url;&eol;    },&eol;&eol;    request: function (method, url, data) {&eol;        ['token', 'user_agent'].forEach(function (field) {&eol;            if (typeof Github.params !== 'object' &pipe;&pipe; typeof Github.params[field] === 'undefined' &pipe;&pipe; Github.params[field] === '') {&eol;                throw 'Required Github param is not set: "' + field + '".';&eol;            }&eol;        });&eol;&eol;        var response,&eol;            request = new HttpRequest();&eol;&eol;        request.addHeader('User-Agent: ' + Github.params.user_agent);&eol;        request.addHeader('Accept: application/vnd.github.v3+json');&eol;        request.addHeader('Authorization: token ' + Github.params.token);&eol;&eol;        if (typeof Github.HTTPProxy !== 'undefined' && Github.HTTPProxy !== '') {&eol;            request.setProxy(Github.HTTPProxy);&eol;        }&eol;&eol;        if (typeof data !== 'undefined') {&eol;            data = JSON.stringify(data);&eol;        }&eol;&eol;        Zabbix.log(4, '[ Github Webhook ] Sending request: ' + url + ((typeof data === 'string')&eol;            ? ('\n' + data)&eol;            : ''));&eol;&eol;        switch (method) {&eol;            case 'post':&eol;                response = request.post(url, data);&eol;                break;&eol;&eol;            case 'patch':&eol;                response = request.patch(url, data);&eol;                break;&eol;&eol;            default:&eol;                throw 'Unsupported HTTP request method: ' + method;&eol;        }&eol;&eol;        Zabbix.log(4, '[ Github Webhook ] Received response with status code ' +&eol;            request.getStatus() + '\n' + response);&eol;&eol;        if (response !== null) {&eol;            try {&eol;                response = JSON.parse(response);&eol;            }&eol;            catch (error) {&eol;                Zabbix.log(4, '[ Github Webhook ] Failed to parse response received from Github');&eol;                response = null;&eol;            }&eol;        }&eol;&eol;        if (typeof response !== 'object') {&eol;            throw 'Failed to process response received from Github. Check debug log for more information.';&eol;        }&eol;&eol;        if (request.getStatus() < 200 &pipe;&pipe; request.getStatus() >= 300) {&eol;            var message = 'Request failed with status code ' + request.getStatus();&eol;&eol;            if (response.message) {&eol;                message += ': ' + response.message;&eol;            }&eol;&eol;            throw message + ' Check debug log for more information.';&eol;        }&eol;&eol;        return response;&eol;    }&eol;};&eol;&eol;try {&eol;    var params = JSON.parse(value),&eol;        github = {},&eol;        url = '',&eol;        data = {},&eol;        comment_data,&eol;        result = { tags: {} },&eol;        required_params = [&eol;            'alert_subject', 'alert_message', 'event_source', 'event_value',&eol;            'event_update_status', 'event_recovery_value', 'event_severity',&eol;            'event_id', 'trigger_id', 'zabbix_url',&eol;            'github_token', 'github_url', 'github_user_agent'&eol;        ],&eol;        method = 'post',&eol;        process_tags = true;&eol;&eol;    Object.keys(params)&eol;        .forEach(function (key) {&eol;            if (key.startsWith('github_')) {&eol;                github[key.substring(7)] = params[key];&eol;            }&eol;            else if (required_params.indexOf(key) !== -1 && params[key] === '') {&eol;                throw 'Parameter "' + key + '" can\'t be empty.';&eol;            }&eol;        });&eol;&eol;    if ([0, 1, 2, 3].indexOf(parseInt(params.event_source)) === -1) {&eol;        throw 'Incorrect "event_source" parameter given: ' + params.event_source + '\nMust be 0-3.';&eol;    }&eol;&eol;    // Check {EVENT.VALUE} for trigger-based and internal events.&eol;    if (params.event_value !== '0' && params.event_value !== '1'&eol;        && (params.event_source === '0' &pipe;&pipe; params.event_source === '3')) {&eol;        throw 'Incorrect "event_value" parameter given: ' + params.event_value + '\nMust be 0 or 1.';&eol;    }&eol;&eol;    // Check {EVENT.UPDATE.STATUS} only for trigger-based events.&eol;    if (params.event_update_status !== '0' && params.event_update_status !== '1' && params.event_source === '0') {&eol;        throw 'Incorrect "event_update_status" parameter given: ' + params.event_update_status + '\nMust be 0 or 1.';&eol;    }&eol;&eol;    if (params.event_source !== '0' && params.event_recovery_value === '0') {&eol;        throw 'Recovery operations are supported only for trigger-based actions.';&eol;    }&eol;&eol;    if (typeof params.zabbix_url !== 'string' &pipe;&pipe; params.zabbix_url.trim() === '' &pipe;&pipe; params.zabbix_url === '{$ZABBIX.URL}') {&eol;        throw 'Field "zabbix_url" cannot be empty.';&eol;    }&eol;&eol;    // Check for backslash in the end of url and schema.&eol;    github.url = Github.urlCheckFormat(github.url);&eol;    params.zabbix_url = Github.urlCheckFormat(params.zabbix_url);&eol;&eol;    // Default url for creating issue&eol;    url = github.url + 'repos/' + github.repo + '/issues';&eol;&eol;    data.title = params.alert_subject;&eol;    data.body = params.alert_message;&eol;    data.labels = [&eol;        { name: "Zabbix" }&eol;    ];&eol;&eol;    // Adding label corresponding to trigger severity in Zabbix.&eol;    if (params.event_severity !== 'undefined' && params.event_source === '0') {&eol;        data.labels.push({ name: params.event_severity });&eol;    }&eol;&eol;    // In case of update or resolve event.&eol;    if (params.event_source === '0' && (params.event_value === '0' &pipe;&pipe; params.event_update_status === '1')) {&eol;        process_tags = false;&eol;        method = 'patch';&eol;        url = github.url + 'repos/' + github.repo + '/issues/' + github.issue_number;&eol;        comment_data = Object.assign({}, data);&eol;        delete data.body;&eol;    } else {&eol;        problem_url = Github.createProblemURL(params.zabbix_url, params.trigger_id, params.event_id, params.event_source);&eol;        data.body += '\nEvent details in Zabbix: [' + problem_url + '](' + problem_url + ')';&eol;    }&eol;&eol;    Github.setParams(github);&eol;    Github.setProxy(params.HTTPProxy);&eol;&eol;    var response = Github.request(method, url, data);&eol;&eol;    // Leave a comment if comment_data present.&eol;    if (typeof comment_data === 'object') {&eol;        url = github.url + 'repos/' + github.repo + '/issues/' + github.issue_number + '/comments';&eol;        Github.request("post", url, comment_data);&eol;    }&eol;&eol;    if (process_tags) {&eol;        result.tags.__zbx_github_issue_number = response.number;&eol;        result.tags.__zbx_github_repo = github.repo;&eol;        result.tags.__zbx_github_link = response.html_url;&eol;    }&eol;&eol;    Zabbix.log(4, '[ Github Webhook ] Result: ' + JSON.stringify(result));&eol;    return JSON.stringify(result);&eol;}&eol;catch (error) {&eol;    Zabbix.log(4, '[ Github Webhook ] ERROR: ' + error);&eol;    throw 'Sending failed: ' + error;&eol;}|30s    |1           |1              |{EVENT.TAGS.__zbx_github_link}        |Github: Issue {EVENT.TAGS.__zbx_github_issue_number}        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 
 TABLE |media_type_param
 FIELDS|mediatype_paramid|mediatypeid|name                                            |value                                                                |
@@ -632,6 +633,21 @@ ROW   |563              |31         |sd_on_premise_auth_token
 ROW   |564              |31         |sd_request_id                                   |{EVENT.TAGS.__zbx_sd_request_id}                                     |
 ROW   |565              |31         |sd_url                                          |<PLACE INSTANCE URL>                                                 |
 ROW   |566              |31         |trigger_description                             |{TRIGGER.DESCRIPTION}                                                |
+ROW   |567              |32         |alert_message                                   |{ALERT.MESSAGE}                                                      |
+ROW   |568              |32         |alert_subject                                   |{ALERT.SUBJECT}                                                      |
+ROW   |569              |32         |event_id                                        |{EVENT.ID}                                                           |
+ROW   |570              |32         |event_recovery_value                            |{EVENT.RECOVERY.VALUE}                                               |
+ROW   |571              |32         |event_severity                                  |{EVENT.SEVERITY}                                                     |
+ROW   |572              |32         |event_source                                    |{EVENT.SOURCE}                                                       |
+ROW   |573              |32         |event_update_status                             |{EVENT.UPDATE.STATUS}                                                |
+ROW   |574              |32         |event_value                                     |{EVENT.VALUE}                                                        |
+ROW   |575              |32         |github_issue_number                             |{EVENT.TAGS.__zbx_github_issue_number}                               |
+ROW   |576              |32         |github_repo                                     |{ALERT.SENDTO}                                                       |
+ROW   |577              |32         |github_token                                    |<PLACE GITHUB TOKEN>                                                 |
+ROW   |578              |32         |github_url                                      |https://api.github.com                                               |
+ROW   |579              |32         |github_user_agent                               |Zabbix/6.0                                                           |
+ROW   |580              |32         |trigger_id                                      |{TRIGGER.ID}                                                         |
+ROW   |581              |32         |zabbix_url                                      |{$ZABBIX.URL}                                                        |
 
 TABLE |media_type_message
 FIELDS|mediatype_messageid|mediatypeid|eventsource|recovery|subject                                                          |message                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
@@ -784,6 +800,11 @@ ROW   |146                |31         |0          |1       |[{EVENT.STATUS}] {EV
 ROW   |147                |31         |0          |2       |[{EVENT.STATUS}] {EVENT.NAME}                                    |{USER.FULLNAME} {EVENT.UPDATE.ACTION} problem at {EVENT.UPDATE.DATE} {EVENT.UPDATE.TIME}.&eol;{EVENT.UPDATE.MESSAGE}&eol;&eol;Current problem status is {EVENT.STATUS}, acknowledged: {EVENT.ACK.STATUS}.                                                                                                                                                                                                                                                                                                         |
 ROW   |148                |31         |1          |0       |Discovery: {DISCOVERY.DEVICE.STATUS} {DISCOVERY.DEVICE.IPADDRESS}|Discovery rule: {DISCOVERY.RULE.NAME}&eol;&eol;Device IP: {DISCOVERY.DEVICE.IPADDRESS}&eol;Device DNS: {DISCOVERY.DEVICE.DNS}&eol;Device status: {DISCOVERY.DEVICE.STATUS}&eol;Device uptime: {DISCOVERY.DEVICE.UPTIME}&eol;&eol;Device service name: {DISCOVERY.SERVICE.NAME}&eol;Device service port: {DISCOVERY.SERVICE.PORT}&eol;Device service status: {DISCOVERY.SERVICE.STATUS}&eol;Device service uptime: {DISCOVERY.SERVICE.UPTIME}                                                                      |
 ROW   |149                |31         |2          |0       |Autoregistration: {HOST.HOST}                                    |Host name: {HOST.HOST}&eol;Host IP: {HOST.IP}&eol;Agent port: {HOST.PORT}                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+ROW   |150                |32         |0          |0       |[{EVENT.STATUS}] {EVENT.NAME}                                    |Problem started at {EVENT.TIME} on {EVENT.DATE}&eol;Problem name: {EVENT.NAME}&eol;Host: {HOST.NAME}&eol;Severity: {EVENT.SEVERITY}&eol;Operational data: {EVENT.OPDATA}&eol;Original problem ID: {EVENT.ID}&eol;{TRIGGER.URL}                                                                                                                                                                                                                                                                                    |
+ROW   |151                |32         |0          |1       |[{EVENT.STATUS}] {EVENT.NAME}                                    |Problem has been resolved in {EVENT.DURATION} at {EVENT.RECOVERY.TIME} on {EVENT.RECOVERY.DATE}&eol;Problem name: {EVENT.NAME}&eol;Host: {HOST.NAME}&eol;Severity: {EVENT.SEVERITY}&eol;Original problem ID: {EVENT.ID}&eol;{TRIGGER.URL}                                                                                                                                                                                                                                                                         |
+ROW   |152                |32         |0          |2       |[{EVENT.STATUS}] {EVENT.NAME}                                    |{USER.FULLNAME} {EVENT.UPDATE.ACTION} problem at {EVENT.UPDATE.DATE} {EVENT.UPDATE.TIME}.&eol;{EVENT.UPDATE.MESSAGE}&eol;&eol;Current problem status is {EVENT.STATUS}, acknowledged: {EVENT.ACK.STATUS}.                                                                                                                                                                                                                                                                                                         |
+ROW   |153                |32         |1          |0       |Discovery: {DISCOVERY.DEVICE.STATUS} {DISCOVERY.DEVICE.IPADDRESS}|Discovery rule: {DISCOVERY.RULE.NAME}&eol;&eol;Device IP: {DISCOVERY.DEVICE.IPADDRESS}&eol;Device DNS: {DISCOVERY.DEVICE.DNS}&eol;Device status: {DISCOVERY.DEVICE.STATUS}&eol;Device uptime: {DISCOVERY.DEVICE.UPTIME}&eol;&eol;Device service name: {DISCOVERY.SERVICE.NAME}&eol;Device service port: {DISCOVERY.SERVICE.PORT}&eol;Device service status: {DISCOVERY.SERVICE.STATUS}&eol;Device service uptime: {DISCOVERY.SERVICE.UPTIME}                                                                      |
+ROW   |154                |32         |2          |0       |Autoregistration: {HOST.HOST}                                    |Host name: {HOST.HOST}&eol;Host IP: {HOST.IP}&eol;Agent port: {HOST.PORT}                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 
 TABLE |usrgrp
 FIELDS|usrgrpid|name                     |gui_access|users_status|debug_mode|
@@ -904,23 +925,26 @@ ROW   |2          |1     |0   |services.read         |1        |         |NULL
 ROW   |3          |1     |0   |services.write        |0        |         |NULL          |NULL           |
 ROW   |4          |1     |0   |modules.default_access|1        |         |NULL          |NULL           |
 ROW   |5          |1     |0   |api.access            |1        |         |NULL          |NULL           |
-ROW   |6          |1     |0   |actions.default_access|1        |         |NULL          |NULL           |
-ROW   |7          |2     |0   |ui.default_access     |1        |         |NULL          |NULL           |
-ROW   |8          |2     |0   |services.read         |1        |         |NULL          |NULL           |
-ROW   |9          |2     |0   |services.write        |1        |         |NULL          |NULL           |
-ROW   |10         |2     |0   |modules.default_access|1        |         |NULL          |NULL           |
-ROW   |11         |2     |0   |api.access            |1        |         |NULL          |NULL           |
-ROW   |12         |2     |0   |actions.default_access|1        |         |NULL          |NULL           |
-ROW   |13         |3     |0   |ui.default_access     |1        |         |NULL          |NULL           |
-ROW   |14         |3     |0   |services.read         |1        |         |NULL          |NULL           |
-ROW   |15         |3     |0   |services.write        |1        |         |NULL          |NULL           |
-ROW   |16         |3     |0   |modules.default_access|1        |         |NULL          |NULL           |
-ROW   |17         |3     |0   |api.access            |1        |         |NULL          |NULL           |
-ROW   |18         |3     |0   |actions.default_access|1        |         |NULL          |NULL           |
-ROW   |19         |4     |0   |ui.default_access     |1        |         |NULL          |NULL           |
-ROW   |20         |4     |0   |services.read         |1        |         |NULL          |NULL           |
-ROW   |21         |4     |0   |services.write        |0        |         |NULL          |NULL           |
-ROW   |22         |4     |0   |modules.default_access|1        |         |NULL          |NULL           |
-ROW   |23         |4     |0   |api.access            |0        |         |NULL          |NULL           |
-ROW   |24         |4     |0   |actions.default_access|0        |         |NULL          |NULL           |
+ROW   |6          |1     |0   |api.mode              |0        |         |NULL          |NULL           |
+ROW   |7          |1     |0   |actions.default_access|1        |         |NULL          |NULL           |
+ROW   |8          |2     |0   |ui.default_access     |1        |         |NULL          |NULL           |
+ROW   |9          |2     |0   |services.read         |1        |         |NULL          |NULL           |
+ROW   |10         |2     |0   |services.write        |1        |         |NULL          |NULL           |
+ROW   |11         |2     |0   |modules.default_access|1        |         |NULL          |NULL           |
+ROW   |12         |2     |0   |api.access            |1        |         |NULL          |NULL           |
+ROW   |13         |2     |0   |api.mode              |0        |         |NULL          |NULL           |
+ROW   |14         |2     |0   |actions.default_access|1        |         |NULL          |NULL           |
+ROW   |15         |3     |0   |ui.default_access     |1        |         |NULL          |NULL           |
+ROW   |16         |3     |0   |services.read         |1        |         |NULL          |NULL           |
+ROW   |17         |3     |0   |services.write        |1        |         |NULL          |NULL           |
+ROW   |18         |3     |0   |modules.default_access|1        |         |NULL          |NULL           |
+ROW   |19         |3     |0   |api.access            |1        |         |NULL          |NULL           |
+ROW   |20         |3     |0   |api.mode              |0        |         |NULL          |NULL           |
+ROW   |21         |3     |0   |actions.default_access|1        |         |NULL          |NULL           |
+ROW   |22         |4     |0   |ui.default_access     |1        |         |NULL          |NULL           |
+ROW   |23         |4     |0   |services.read         |1        |         |NULL          |NULL           |
+ROW   |24         |4     |0   |services.write        |0        |         |NULL          |NULL           |
+ROW   |25         |4     |0   |modules.default_access|1        |         |NULL          |NULL           |
+ROW   |26         |4     |0   |api.access            |0        |         |NULL          |NULL           |
+ROW   |27         |4     |0   |actions.default_access|0        |         |NULL          |NULL           |
 
diff --git a/create/src/schema.tmpl b/create/src/schema.tmpl
index 1228a19ac52..34821449e4e 100644
--- a/create/src/schema.tmpl
+++ b/create/src/schema.tmpl
@@ -332,7 +332,7 @@ FIELD		|mediatypeid	|t_id		|	|NOT NULL	|0			|1|media_type
 FIELD		|eventsource	|t_integer	|	|NOT NULL	|0
 FIELD		|recovery	|t_integer	|	|NOT NULL	|0
 FIELD		|subject	|t_varchar(255)	|''	|NOT NULL	|0
-FIELD		|message	|t_shorttext	|''	|NOT NULL	|0
+FIELD		|message	|t_text		|''	|NOT NULL	|0
 UNIQUE		|1		|mediatypeid,eventsource,recovery
 
 TABLE|usrgrp|usrgrpid|ZBX_DATA
@@ -594,7 +594,7 @@ INDEX		|2		|discovery_groupid
 TABLE|triggers|triggerid|ZBX_TEMPLATE
 FIELD		|triggerid	|t_id		|	|NOT NULL	|0
 FIELD		|expression	|t_varchar(2048)|''	|NOT NULL	|0
-FIELD		|description	|t_varchar(255)	|''	|NOT NULL	|0
+FIELD		|description	|t_shorttext	|''	|NOT NULL	|0
 FIELD		|url		|t_varchar(255)	|''	|NOT NULL	|0
 FIELD		|status		|t_integer	|'0'	|NOT NULL	|0
 FIELD		|value		|t_integer	|'0'	|NOT NULL	|ZBX_NODATA
@@ -1473,7 +1473,7 @@ FIELD		|item_preprocid	|t_id		|	|NOT NULL	|0
 FIELD		|itemid		|t_id		|	|NOT NULL	|ZBX_PROXY			|1|items
 FIELD		|step		|t_integer	|'0'	|NOT NULL	|ZBX_PROXY
 FIELD		|type		|t_integer	|'0'	|NOT NULL	|ZBX_PROXY
-FIELD		|params		|t_shorttext	|''	|NOT NULL	|ZBX_PROXY
+FIELD		|params		|t_text		|''	|NOT NULL	|ZBX_PROXY
 FIELD		|error_handler	|t_integer	|'0'	|NOT NULL	|ZBX_PROXY
 FIELD		|error_handler_params|t_varchar(255)|''	|NOT NULL	|ZBX_PROXY
 INDEX		|1		|itemid,step
@@ -1904,4 +1904,4 @@ INDEX		|2		|status,lastaccess
 TABLE|dbversion||
 FIELD		|mandatory	|t_integer	|'0'	|NOT NULL	|
 FIELD		|optional	|t_integer	|'0'	|NOT NULL	|
-ROW		|5050078	|5050078
+ROW		|5050083	|5050083
diff --git a/create/src/templates.tmpl b/create/src/templates.tmpl
index 9d2d4477e65..0e68c52351e 100644
--- a/create/src/templates.tmpl
+++ b/create/src/templates.tmpl
@@ -193,8 +193,8 @@ ROW   |10379 |NULL        |Jenkins by HTTP
 ROW   |10380 |NULL        |Hikvision camera by HTTP                                   |3     |-1           |2             |             |             |Hikvision camera by HTTP                                   |0    |NULL      |Template tooling version used: 0.38                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |1          |1         |          |           |                |       |             |1            |0       |0                |3fb4020df2984b0ab64dfd8355ff5c65|
 ROW   |10381 |NULL        |Ignite by JMX                                              |3     |-1           |2             |             |             |Ignite by JMX                                              |0    |NULL      |The template to monitor Apache Ignite by Zabbix that work without any external scripts.&eol;  It works with both standalone and cluster instances.&eol;  The metrics are discoverable and collected by JMX.  &eol;  Current JMX tree hierarchy contains classloader by default. Add the following jvm option `-DIGNITE_MBEAN_APPEND_CLASS_LOADER_ID=false`to will exclude one level with Classloader name.&eol;  You can set {$IGNITE.USER} and {$IGNITE.PASSWORD} macros in the template for using on the host level.&eol;&eol;You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/&eol;&eol;Template tooling version used: 0.38                                                                                                                                                                                                                                                                                                                                                         |1          |1         |          |           |                |       |             |1            |0       |0                |ab05dbb15ff047f192782f617f0627ac|
 ROW   |10382 |NULL        |Microsoft SharePoint by HTTP                               |3     |-1           |2             |             |             |Microsoft SharePoint by HTTP                               |0    |NULL      |Overview:&eol;Template receives data via HTTP Agent.&eol;Setup:&eol;Create a new host. &eol;Define macros according to your Sharepoint web portal.&eol;It is recommended to fill in the values of the filter macros to avoid getting redundant data.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |1          |1         |          |           |                |       |             |1            |0       |0                |8d5fe5b4ebb64255a2429b34c7dd3681|
-ROW   |10383 |NULL        |SMART by Zabbix agent 2                                    |3     |-1           |2             |             |             |SMART by Zabbix agent 2                                    |0    |NULL      |The template for monitoring S.M.A.R.T. attributes of physical disk that works without any external scripts. It collects metrics by Zabbix agent 2 version 5.0 and later with Smartmontools version 7.1 and later. Disk discovery LLD rule finds all HDD, SSD, NVMe disks with S.M.A.R.T. enabled. Attribute discovery LLD rule finds all Vendor Specific Attributes for each disk. If you want to skip some attributes, please set regular expressions with disk names in {$SMART.DISK.NAME.MATCHES} and with attribute IDs in {$SMART.ATTRIBUTE.ID.MATCHES} macros on the host level.&eol;&eol;You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/415662-discussion-thread-for-official-zabbix-smart-disk-monitoring&eol;&eol;Template tooling version used: 0.38                                                                                                                                                                                                                       |1          |1         |          |           |                |       |             |1            |0       |0                |7b6c6228b25f4586b42cd1bf37ff8034|
-ROW   |10384 |NULL        |SMART by Zabbix agent active 2                             |3     |-1           |2             |             |             |SMART by Zabbix agent active 2                             |0    |NULL      |The template for monitoring S.M.A.R.T. attributes of physical disk that works without any external scripts. It collects metrics by Zabbix agent active 2 version 5.0 and later with Smartmontools version 7.1 and later. Disk discovery LLD rule finds all HDD, SSD, NVMe disks with S.M.A.R.T. enabled. Attribute discovery LLD rule finds all Vendor Specific Attributes for each disk. If you want to skip some attributes, please set regular expressions with disk names in {$SMART.DISK.NAME.MATCHES} and with attribute IDs in {$SMART.ATTRIBUTE.ID.MATCHES} macros on the host level.&eol;&eol;You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/415662-discussion-thread-for-official-zabbix-smart-disk-monitoring&eol;&eol;Template tooling version used: 0.38                                                                                                                                                                                                                |1          |1         |          |           |                |       |             |1            |0       |0                |e518b1340ce44d7389d2cc7c304a97b4|
+ROW   |10383 |NULL        |SMART by Zabbix agent 2                                    |3     |-1           |2             |             |             |SMART by Zabbix agent 2                                    |0    |NULL      |The template for monitoring S.M.A.R.T. attributes of physical disk that works without any external scripts. It collects metrics by Zabbix agent 2 version 5.0 and later with Smartmontools version 7.1 and later. Disk discovery LLD rule finds all HDD, SSD, NVMe disks with S.M.A.R.T. enabled. Attribute discovery LLD rule finds all Vendor Specific Attributes for each disk. If you want to skip some attributes, please set regular expressions with disk names in {$SMART.DISK.NAME.MATCHES} and with attribute IDs in {$SMART.ATTRIBUTE.ID.MATCHES} macros on the host level.&eol;&eol;You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/415662-discussion-thread-for-official-zabbix-smart-disk-monitoring&eol;&eol;Template tooling version used: 0.39                                                                                                                                                                                                                       |1          |1         |          |           |                |       |             |1            |0       |0                |7b6c6228b25f4586b42cd1bf37ff8034|
+ROW   |10384 |NULL        |SMART by Zabbix agent active 2                             |3     |-1           |2             |             |             |SMART by Zabbix agent active 2                             |0    |NULL      |The template for monitoring S.M.A.R.T. attributes of physical disk that works without any external scripts. It collects metrics by Zabbix agent 2 version 5.0 and later with Smartmontools version 7.1 and later. Disk discovery LLD rule finds all HDD, SSD, NVMe disks with S.M.A.R.T. enabled. Attribute discovery LLD rule finds all Vendor Specific Attributes for each disk. If you want to skip some attributes, please set regular expressions with disk names in {$SMART.DISK.NAME.MATCHES} and with attribute IDs in {$SMART.ATTRIBUTE.ID.MATCHES} macros on the host level.&eol;&eol;You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/415662-discussion-thread-for-official-zabbix-smart-disk-monitoring&eol;&eol;Template tooling version used: 0.39                                                                                                                                                                                                                       |1          |1         |          |           |                |       |             |1            |0       |0                |e518b1340ce44d7389d2cc7c304a97b4|
 ROW   |10385 |NULL        |Huawei OceanStor 5300 V5 SNMP                              |3     |-1           |2             |             |             |Huawei OceanStor 5300 V5 SNMP                              |0    |NULL      |The template to monitor SAN Huawei OceanStor 5300 V5 by Zabbix SNMP agent.&eol;&eol;You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/418855-discussion-thread-for-official-zabbix-template-huawei-oceanstor&eol;&eol;Template tooling version used: 0.38                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |1          |1         |          |           |                |       |             |1            |0       |0                |c5564dd58c394b969d5365cc5de3e7f8|
 ROW   |10386 |NULL        |MongoDB node by Zabbix Agent 2                             |3     |-1           |2             |             |             |MongoDB node by Zabbix Agent 2                             |0    |NULL      |Get MongoDB metrics from plugin for the zabbix-agent2.&eol;  1. Setup and configure zabbix-agent2 compiled with the MongoDB monitoring plugin.&eol;  2. Set the {$MONGODB.CONNSTRING} such as <protocol(host:port)> or named session.&eol;  3. Set the user name and password in host macros ({$MONGODB.USER}, {$MONGODB.PASSWORD}) if you want to override parameters from the Zabbix agent configuration file.&eol;&eol;You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420659-discussion-thread-for-official-zabbix-template-db-mongodb&eol;&eol;Template tooling version used: 0.38                                                                                                                                                                                                                                                                                                                                                                                               |1          |1         |          |           |                |       |             |1            |0       |0                |81aa8c5ab5594f77a2b26fb7f5094048|
 ROW   |10387 |NULL        |MongoDB cluster by Zabbix Agent 2                          |3     |-1           |2             |             |             |MongoDB cluster by Zabbix Agent 2                          |0    |NULL      |Get MongoDB metrics from plugin for the zabbix-agent2.&eol;  1. Setup and configure zabbix-agent2 compiled with the MongoDB monitoring plugin.&eol;  2. Set the {$MONGODB.CONNSTRING} such as <protocol(host:port)> or named session.&eol;  3. Set the user name and password in host macros ({$MONGODB.USER}, {$MONGODB.PASSWORD}) if you want to override parameters from the Zabbix agent configuration file.&eol;&eol;  All sharded Mongodb nodes (mongod) will be discovered with attached template "MongoDB node".&eol;&eol;You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/420659-discussion-thread-for-official-zabbix-template-db-mongodb&eol;&eol;Template tooling version used: 0.38                                                                                                                                                                                                                                                                                       |1          |1         |          |           |                |       |             |1            |0       |0                |d38b271797bd41f2ad8c79d83b9d8d9c|
@@ -258,6 +258,7 @@ ROW   |10444 |NULL        |HPE ProLiant BL920 SNMP
 ROW   |10445 |NULL        |HPE ProLiant DL360 SNMP                                    |3     |-1           |2             |             |             |HPE ProLiant DL360 SNMP                                    |0    |NULL      |Template for HPE ProLiant DL360 servers with HP iLO version 4 and later.&eol;&eol;MIBs used:&eol;CPQHLTH-MIB&eol;SNMPv2-MIB&eol;CPQNIC-MIB&eol;CPQSINFO-MIB&eol;CPQIDA-MIB&eol;&eol;Template tooling version used: 0.38                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |1          |1         |          |           |                |       |             |1            |0       |0                |60cb9ccb922e4fd194a1d9573db10237|
 ROW   |10446 |NULL        |HPE ProLiant DL380 SNMP                                    |3     |-1           |2             |             |             |HPE ProLiant DL380 SNMP                                    |0    |NULL      |Template for HPE ProLiant DL380 servers with HP iLO version 4 and later.&eol;&eol;MIBs used:&eol;CPQHLTH-MIB&eol;SNMPv2-MIB&eol;CPQNIC-MIB&eol;CPQSINFO-MIB&eol;CPQIDA-MIB&eol;&eol;Template tooling version used: 0.38                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |1          |1         |          |           |                |       |             |1            |0       |0                |379aaf7e87574debb4f5c3947a22ec68|
 ROW   |10447 |NULL        |Travis CI by HTTP                                          |3     |-1           |2             |             |             |Travis CI by HTTP                                          |0    |NULL      |Template for monitoring Travis CI https://travis-ci.com&eol;You must set {$TRAVIS.API.TOKEN} and {$TRAVIS.API.URL} macros.&eol;  {$TRAVIS.API.TOKEN} is a Travis API authentication token located in User -> Settings -> API authentication.&eol;  {$TRAVIS.API.URL} could be in 3 different variations:&eol;   - for a private project : api.travis-ci.com&eol;   - for an enterprise projects: api.example.com (where you replace example.com with the domain Travis CI is running on)&eol;&eol;You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/&eol;&eol;Template tooling version used: 0.38                                                                                                                                                                                                                                                                                                                                                                                       |1          |1         |          |           |                |       |             |1            |0       |0                |8cdbe00a2a3046ee962d28d32567968a|
+ROW   |10448 |NULL        |InfluxDB by HTTP                                           |3     |-1           |2             |             |             |InfluxDB by HTTP                                           |0    |NULL      |Get InfluxDB metrics by HTTP agent from Prometheus metrics endpoint.&eol;For organization discovery template need to use Authorization via API token. See docs: https://docs.influxdata.com/influxdb/v2.0/security/tokens/&eol;&eol;Don't forget change macros {$INFLUXDB.URL}, {$INFLUXDB.API.TOKEN}.&eol;Some metrics may not be collected depending on your InfluxDB instance version and configuration.&eol;&eol;You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback&eol;&eol;Template tooling version used: 0.39                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |1          |1         |          |           |                |       |             |1            |0       |0                |a6fe3640b23544e7ae15d438b38ce1cd|
 
 TABLE |group_prototype
 FIELDS|group_prototypeid|hostid|name                                 |groupid|templateid|
@@ -273,12 +274,12 @@ ROW   |35               |10388 |MongoDB sharded cluster/{#REPLICASET}|NULL   |NU
 ROW   |37               |10389 |MongoDB sharded cluster/{#ID}        |NULL   |NULL      |
 ROW   |54               |10334 |{#DATACENTER.NAME}/{#VM.FOLDER} (vm) |NULL   |NULL      |
 ROW   |57               |10368 |{#DATACENTER.NAME}/{#VM.FOLDER} (vm) |NULL   |NULL      |
-ROW   |67               |10333 |                                     |12     |NULL      |
-ROW   |68               |10334 |                                     |12     |NULL      |
-ROW   |69               |10367 |                                     |12     |NULL      |
-ROW   |70               |10368 |                                     |12     |NULL      |
-ROW   |71               |10388 |                                     |13     |NULL      |
-ROW   |72               |10389 |                                     |13     |NULL      |
+ROW   |73               |10333 |                                     |12     |NULL      |
+ROW   |74               |10334 |                                     |12     |NULL      |
+ROW   |75               |10367 |                                     |12     |NULL      |
+ROW   |76               |10368 |                                     |12     |NULL      |
+ROW   |77               |10388 |                                     |13     |NULL      |
+ROW   |78               |10389 |                                     |13     |NULL      |
 
 TABLE |interface
 FIELDS|interfaceid|hostid|main|type|useip|ip       |dns |port |
@@ -845,6 +846,7 @@ ROW   |552       |10446 |CPQIDA-MIB::cpqDaPhyDrvStatus
 ROW   |553       |10446 |CPQNIC-MIB::cpqNicIfPhysAdapterStatus                          |1d312bcad99c43b8931fb128f6250afa|
 ROW   |554       |10446 |CPQSINFO-MIB::status                                           |48e68c2789334818b5536be3f8628f66|
 ROW   |555       |10446 |zabbix.host.available                                          |1b63c6eea5fc42a99501408d603c158b|
+ROW   |556       |10448 |InfluxDB healthcheck                                           |d1b4478bdfc44c6db79a4a262f605d92|
 
 TABLE |items
 FIELDS|itemid|type|snmp_oid                                                                                                                                                                                                                                                                                                                                           |hostid|name                                                                                                    |key_                                                                                                                                                                                        |delay                       |history|trends|status|value_type|trapper_hosts|units             |formula          |logtimefmt         |templateid|valuemapid|params                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |ipmi_sensor     |authtype|username                 |password                 |publickey|privatekey|flags|interfaceid|description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |inventory_link|lifetime|evaltype|jmx_endpoint                                                 |master_itemid|timeout                       |url                                                                                                                 |query_fields                                                                                                                                                                                                                                                                                |posts|status_codes           |follow_redirects|post_type|headers                                                                           |retrieve_mode|request_method|output_format|verify_peer|verify_host|allow_traps|discover|uuid                            |
@@ -5429,6 +5431,9 @@ ROW   |36775 |19  |
 ROW   |36782 |15  |                                                                                                                                                                                                                                                                                                                                                   |10447 |Travis: Repo [{#SLUG}]: Builds passed, %                                                                |travis.repo.builds.passed.pct[{#SLUG}]                                                                                                                                                      |1m                          |7d     |365d  |0     |3         |             |%                 |                 |                   |NULL      |NULL      |last(//travis.repo.builds.passed[{#SLUG}])/last(//travis.repo.builds.total[{#SLUG}])*100                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |                |0       |                         |                         |         |          |2    |NULL       |Percent of passed builds in {#SLUG} repo.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |0             |30d     |0       |                                                             |NULL         |3s                            |                                                                                                                    |                                                                                                                                                                                                                                                                                            |     |200                    |1               |0        |                                                                                  |0            |0             |0            |0          |0          |0          |0       |0d2f2c7b23284836ad52b4ddc98dcfc8|
 ROW   |36783 |19  |                                                                                                                                                                                                                                                                                                                                                   |10447 |Travis: Repo [{#SLUG}]: Get builds                                                                      |travis.repo.get_builds[{#SLUG}]                                                                                                                                                             |1m                          |0      |0     |0     |4         |             |                  |                 |                   |NULL      |NULL      |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                |0       |                         |                         |         |          |2    |NULL       |Getting builds of {#SLUG} using Travis API.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |0             |30d     |0       |                                                             |NULL         |3s                            |https://{$TRAVIS.API.URL}/repo/{#ID}/builds                                                                         |[{"limit":"50"}]                                                                                                                                                                                                                                                                            |     |                       |1               |0        |Travis-API-Version: 3&eol;Authorization: token {$TRAVIS.API.TOKEN}                |0            |0             |0            |0          |0          |0          |0       |ed33292bc0924b9c85cb54443d5aa999|
 ROW   |36784 |19  |                                                                                                                                                                                                                                                                                                                                                   |10447 |Travis: Repo [{#SLUG}]: Get caches                                                                      |travis.repo.get_caches[{#SLUG}]                                                                                                                                                             |1m                          |0      |0     |0     |4         |             |                  |                 |                   |NULL      |NULL      |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                |0       |                         |                         |         |          |2    |NULL       |Getting caches of {#SLUG} using Travis API.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |0             |30d     |0       |                                                             |NULL         |3s                            |https://{$TRAVIS.API.URL}/repo/{#ID}/caches                                                                         |[{"limit":"50"}]                                                                                                                                                                                                                                                                            |     |                       |1               |0        |Travis-API-Version: 3&eol;Authorization: token {$TRAVIS.API.TOKEN}                |0            |0             |0            |0          |0          |0          |0       |2e0c047997624373a50001b8399b3d7c|
+ROW   |36795 |19  |                                                                                                                                                                                                                                                                                                                                                   |10448 |InfluxDB: Get instance metrics                                                                          |influx.get_metrics                                                                                                                                                                          |1m                          |0      |0     |0     |4         |             |                  |                 |                   |NULL      |NULL      |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                |0       |                         |                         |         |          |0    |NULL       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0             |30d     |0       |                                                             |NULL         |3s                            |{$INFLUXDB.URL}/metrics                                                                                             |                                                                                                                                                                                                                                                                                            |     |200                    |1               |0        |                                                                                  |0            |0             |0            |0          |0          |0          |0       |286bb866060e47948c02408ebc841f1f|
+ROW   |36796 |19  |                                                                                                                                                                                                                                                                                                                                                   |10448 |InfluxDB: Instance status                                                                               |influx.healthcheck                                                                                                                                                                          |1m                          |7d     |365d  |0     |3         |             |                  |                 |                   |NULL      |556       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                |0       |                         |                         |         |          |0    |NULL       |Get the health of an instance.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |0             |30d     |0       |                                                             |NULL         |3s                            |{$INFLUXDB.URL}/health                                                                                              |                                                                                                                                                                                                                                                                                            |     |200                    |1               |0        |                                                                                  |0            |0             |0            |0          |0          |0          |0       |f8f514943c9040d7b41f14db92ca6c91|
+ROW   |36813 |19  |                                                                                                                                                                                                                                                                                                                                                   |10448 |Organizations discovery                                                                                 |influxdb.orgs.discovery                                                                                                                                                                     |10m                         |90d    |0     |0     |4         |             |                  |                 |                   |NULL      |NULL      |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                |0       |                         |                         |         |          |1    |NULL       |Discovery of organizations merics.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |0             |30d     |1       |                                                             |NULL         |3s                            |{$INFLUXDB.URL}/api/v2/orgs                                                                                         |                                                                                                                                                                                                                                                                                            |     |200                    |1               |0        |Content-type: application/json&eol;Authorization: Token {$INFLUXDB.API.TOKEN}     |0            |0             |0            |0          |0          |0          |0       |41766fd081804c399c3a7e70dd1fbf03|
 
 TABLE |items
 FIELDS|itemid|type|snmp_oid|hostid|name                                                                                    |key_                                                                             |delay|history|trends|status|value_type|trapper_hosts|units   |formula|logtimefmt|templateid|valuemapid|params|ipmi_sensor|authtype|username|password|publickey|privatekey|flags|interfaceid|description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |inventory_link|lifetime|evaltype|jmx_endpoint|master_itemid|timeout|url |query_fields|posts|status_codes|follow_redirects|post_type|headers|retrieve_mode|request_method|output_format|verify_peer|verify_host|allow_traps|discover|uuid                            |
@@ -7277,7 +7282,7 @@ ROW   |33636 |18  |        |10382 |Sharepoint: Modified ({#SHAREPOINT.LLD.FULL_P
 ROW   |33637 |18  |        |10382 |Sharepoint: Size ({#SHAREPOINT.LLD.FULL_PATH})                                          |sharepoint.size["{#SHAREPOINT.LLD.FULL_PATH}"]                                   |0    |7d     |365d  |0     |3         |             |B       |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Size of:&eol;{#SHAREPOINT.LLD.FULL_PATH}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |0             |30d     |0       |            |33630        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |68c3d2d2b33a494ab85ca6b883398fbb|
 ROW   |33659 |18  |        |10383 |SMART [{#NAME}]: ID {#ID} {#ATTRNAME}                                                   |smart.disk.error[{#NAME},{#ID}]                                                  |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0             |30d     |0       |            |33656        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |2af3d630a99a4989b94e2afd782a3f78|
 ROW   |33660 |18  |        |10383 |SMART [{#NAME}]: Critical warning                                                       |smart.disk.critical_warning[{#NAME}]                                             |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |This field indicates critical warnings for the state of the controller.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |0             |30d     |0       |            |33656        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |c186f7ce1b8d4311997c84fd5c239819|
-ROW   |33661 |18  |        |10383 |SMART [{#NAME}]: Power on hours                                                         |smart.disk.hours[{#NAME}]                                                        |0    |7d     |365d  |0     |3         |             |s       |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Count of hours in power-on state. The raw value of this attribute shows total count of hours (or minutes, or seconds, depending on manufacturer) in power-on state. "By default, the total expected lifetime of a hard disk in perfect condition is defined as 5 years (running every day and night on all days). This is equal to 1825 days in 24/7 mode or 43800 hours." On some pre-2005 drives, this raw value may advance erratically and/or "wrap around" (reset to zero periodically). https://en.wikipedia.org/wiki/S.M.A.R.T.#Known_ATA_S.M.A.R.T._attributes                                                                                                                                                                                                                                                                                                                                          |0             |30d     |0       |            |33656        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |365f9642f2764116923bb3e014eefa22|
+ROW   |33661 |18  |        |10383 |SMART [{#NAME}]: Power on hours                                                         |smart.disk.hours[{#NAME}]                                                        |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Count of hours in power-on state. The raw value of this attribute shows total count of hours (or minutes, or seconds, depending on manufacturer) in power-on state. "By default, the total expected lifetime of a hard disk in perfect condition is defined as 5 years (running every day and night on all days). This is equal to 1825 days in 24/7 mode or 43800 hours." On some pre-2005 drives, this raw value may advance erratically and/or "wrap around" (reset to zero periodically). https://en.wikipedia.org/wiki/S.M.A.R.T.#Known_ATA_S.M.A.R.T._attributes                                                                                                                                                                                                                                                                                                                                          |0             |30d     |0       |            |33656        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |365f9642f2764116923bb3e014eefa22|
 ROW   |33662 |18  |        |10383 |SMART [{#NAME}]: Media errors                                                           |smart.disk.media_errors[{#NAME}]                                                 |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Contains the number of occurrences where the controller detected an unrecovered data integrity error. Errors such as uncorrectable ECC, CRC checksum failure, or LBA tag mismatch are included in this field.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |0             |30d     |0       |            |33656        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |8478d6421fb044339e2118848ac6d56b|
 ROW   |33663 |18  |        |10383 |SMART [{#NAME}]: Device model                                                           |smart.disk.model[{#NAME}]                                                        |0    |7d     |0     |0     |1         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0             |30d     |0       |            |33656        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |b6abf9b52c694600b63fce4a68fc0fbd|
 ROW   |33664 |18  |        |10383 |SMART [{#NAME}]: Percentage used                                                        |smart.disk.percentage_used[{#NAME}]                                              |0    |7d     |365d  |0     |3         |             |%       |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Contains a vendor specific estimate of the percentage of NVM subsystem life used based on the actual usage and the manufacturer’s prediction of NVM life. A value of 100 indicates that the estimated endurance of the NVM in the NVM subsystem has been consumed, but may not indicate an NVM subsystem failure. The value is allowed to exceed 100. Percentages greater than 254 shall be represented as 255. This value shall be updated once per power-on hour (when the controller is not in a sleep state).                                                                                                                                                                                                                                                                                                                                                                                               |0             |30d     |0       |            |33656        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |6ce46d274a694eac9700bd02a936f4be|
@@ -7286,7 +7291,7 @@ ROW   |33666 |18  |        |10383 |SMART [{#NAME}]: Temperature
 ROW   |33667 |18  |        |10383 |SMART [{#NAME}]: Self-test passed                                                       |smart.disk.test[{#NAME}]                                                         |0    |7d     |0     |0     |1         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |The disk is passed the SMART self-test or not.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |0             |30d     |0       |            |33656        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |434b338d88e041dd9b6a0b7aaa403076|
 ROW   |33671 |18  |        |10384 |SMART [{#NAME}]: ID {#ID} {#ATTRNAME}                                                   |smart.disk.error[{#NAME},{#ID}]                                                  |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0             |30d     |0       |            |33668        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |498a4f1b4b7442b5a38c52400646cc47|
 ROW   |33672 |18  |        |10384 |SMART [{#NAME}]: Critical warning                                                       |smart.disk.critical_warning[{#NAME}]                                             |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |This field indicates critical warnings for the state of the controller.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |0             |30d     |0       |            |33668        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |ad6a9f6f7293495c916bb0aac0bc9729|
-ROW   |33673 |18  |        |10384 |SMART [{#NAME}]: Power on hours                                                         |smart.disk.hours[{#NAME}]                                                        |0    |7d     |365d  |0     |3         |             |s       |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Count of hours in power-on state. The raw value of this attribute shows total count of hours (or minutes, or seconds, depending on manufacturer) in power-on state. "By default, the total expected lifetime of a hard disk in perfect condition is defined as 5 years (running every day and night on all days). This is equal to 1825 days in 24/7 mode or 43800 hours." On some pre-2005 drives, this raw value may advance erratically and/or "wrap around" (reset to zero periodically). https://en.wikipedia.org/wiki/S.M.A.R.T.#Known_ATA_S.M.A.R.T._attributes                                                                                                                                                                                                                                                                                                                                          |0             |30d     |0       |            |33668        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |e5bbd606e330469389bf081588b88d17|
+ROW   |33673 |18  |        |10384 |SMART [{#NAME}]: Power on hours                                                         |smart.disk.hours[{#NAME}]                                                        |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Count of hours in power-on state. The raw value of this attribute shows total count of hours (or minutes, or seconds, depending on manufacturer) in power-on state. "By default, the total expected lifetime of a hard disk in perfect condition is defined as 5 years (running every day and night on all days). This is equal to 1825 days in 24/7 mode or 43800 hours." On some pre-2005 drives, this raw value may advance erratically and/or "wrap around" (reset to zero periodically). https://en.wikipedia.org/wiki/S.M.A.R.T.#Known_ATA_S.M.A.R.T._attributes                                                                                                                                                                                                                                                                                                                                          |0             |30d     |0       |            |33668        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |e5bbd606e330469389bf081588b88d17|
 ROW   |33674 |18  |        |10384 |SMART [{#NAME}]: Media errors                                                           |smart.disk.media_errors[{#NAME}]                                                 |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Contains the number of occurrences where the controller detected an unrecovered data integrity error. Errors such as uncorrectable ECC, CRC checksum failure, or LBA tag mismatch are included in this field.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |0             |30d     |0       |            |33668        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |0861b008b09a41799978e085625aaa4a|
 ROW   |33675 |18  |        |10384 |SMART [{#NAME}]: Device model                                                           |smart.disk.model[{#NAME}]                                                        |0    |7d     |0     |0     |1         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0             |30d     |0       |            |33668        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |f48fe3366b194eb4942411cc776c8633|
 ROW   |33676 |18  |        |10384 |SMART [{#NAME}]: Percentage used                                                        |smart.disk.percentage_used[{#NAME}]                                              |0    |7d     |365d  |0     |3         |             |%       |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Contains a vendor specific estimate of the percentage of NVM subsystem life used based on the actual usage and the manufacturer’s prediction of NVM life. A value of 100 indicates that the estimated endurance of the NVM in the NVM subsystem has been consumed, but may not indicate an NVM subsystem failure. The value is allowed to exceed 100. Percentages greater than 254 shall be represented as 255. This value shall be updated once per power-on hour (when the controller is not in a sleep state).                                                                                                                                                                                                                                                                                                                                                                                               |0             |30d     |0       |            |33668        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |d5cef21c49994c3e8e12ef6471d7cdcd|
@@ -7954,6 +7959,30 @@ ROW   |36791 |18  |        |10447 |Travis: Repo [{#SLUG}]: Last build duration
 ROW   |36792 |18  |        |10447 |Travis: Repo [{#SLUG}]: Last build id                                                   |travis.repo.last_build.id[{#SLUG}]                                               |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Last build id in {#SLUG} repo.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |0             |30d     |0       |            |36783        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |fbcb7b4001b949889fc85f2499684aae|
 ROW   |36793 |18  |        |10447 |Travis: Repo [{#SLUG}]: Last build number                                               |travis.repo.last_build.number[{#SLUG}]                                           |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Last build number in {#SLUG} repo.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |0             |30d     |0       |            |36783        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |d9dbe9ffeafa46569fce1ca5ba4897cf|
 ROW   |36794 |18  |        |10447 |Travis: Repo [{#SLUG}]: Last build state                                                |travis.repo.last_build.state[{#SLUG}]                                            |0    |7d     |0     |0     |4         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Last build state in {#SLUG} repo.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |0             |30d     |0       |            |36783        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |a081582913ca40ee93a6e5fb326c5c64|
+ROW   |36797 |18  |        |10448 |InfluxDB: Users, total                                                                  |influxdb.users.total                                                             |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |Number of total users on the server.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |86357d43721f4e6aa6b1dd7e63dd2f47|
+ROW   |36798 |18  |        |10448 |InfluxDB: Uptime                                                                        |influxdb.uptime                                                                  |0    |7d     |365d  |0     |0         |             |s       |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |InfluxDB process uptime in seconds.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |8699e951b7944659993422334a4cddc0|
+ROW   |36799 |18  |        |10448 |InfluxDB: Tokens, total                                                                 |influxdb.tokens.total                                                            |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |Number of total tokens on the server.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |079c1eee7d93484b9126598b23921e9d|
+ROW   |36800 |18  |        |10448 |InfluxDB: Telegraf plugins, total                                                       |influxdb.telegraf_plugins.total                                                  |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |Number of individual telegraf plugins configured.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |23bad615af024a2e9f06d4541cf6f910|
+ROW   |36801 |18  |        |10448 |InfluxDB: Telegrafs, total                                                              |influxdb.telegrafs.total                                                         |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |Number of total telegraf configurations on the server.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |94d98714ecce4847be0bdb7b8802f1ec|
+ROW   |36802 |18  |        |10448 |InfluxDB: Workers busy, pct                                                             |influxdb.task_executor_workers_busy.pct                                          |0    |7d     |365d  |0     |3         |             |%       |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |Percent of total available workers that are currently busy.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |25595754557d49fca7c671df3f6a898c|
+ROW   |36803 |18  |        |10448 |InfluxDB: Workers currently running                                                     |influxdb.task_executor_runs_active.total                                         |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |Total number of workers currently running tasks.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |c3f147a2afb3438d8bacbb41fac6b1d0|
+ROW   |36804 |18  |        |10448 |InfluxDB: Task runs successful, rate                                                    |influxdb.task_executor_complete.successful.rate                                  |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |Total number of runs successful completed across all tasks.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |a0183b6d934c4612b358c027c75eda6e|
+ROW   |36805 |18  |        |10448 |InfluxDB: Task runs failed, rate                                                        |influxdb.task_executor_complete.failed.rate                                      |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |Total number of failure runs across all tasks.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |f77894d5ede9481381a268670bc88766|
+ROW   |36806 |18  |        |10448 |InfluxDB: Scrapers, total                                                               |influxdb.scrapers.total                                                          |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |Number of total scrapers on the server.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |e05aa2c424c140afa3794878ed2c3baa|
+ROW   |36807 |18  |        |10448 |InfluxDB: Organizations, total                                                          |influxdb.organizations.total                                                     |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |Number of total organizations on the server.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |915f00d9dc9847bb8bc8007d034bb80d|
+ROW   |36808 |18  |        |10448 |InfluxDB: Dashboards, total                                                             |influxdb.dashboards.total                                                        |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |Number of total dashboards on the server.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |1c5931f514804a95ac4bfba3ec4a7d82|
+ROW   |36809 |18  |        |10448 |InfluxDB: Buckets, total                                                                |influxdb.buckets.total                                                           |0    |7d     |365d  |0     |3         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |Number of total buckets on the server.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |5d5e26ee272a4af6ac979e69a83de74d|
+ROW   |36810 |18  |        |10448 |InfluxDB: Boltdb writes, rate                                                           |influxdb.boltdb_writes.rate                                                      |0    |7d     |365d  |0     |0         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |Total number of boltdb writes per second.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |7bd505a8abb944c2bed17f8e4e5a8c84|
+ROW   |36811 |18  |        |10448 |InfluxDB: Boltdb reads, rate                                                            |influxdb.boltdb_reads.rate                                                       |0    |7d     |365d  |0     |0         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |Total number of boltdb reads per second.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |56b1a9f2eb454a9b96a0e0a73d5439cf|
+ROW   |36812 |18  |        |10448 |InfluxDB: Version                                                                       |influxdb.version                                                                 |0    |7d     |0     |0     |1         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |0    |NULL       |Version of the InfluxDB instance.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |d31e0d0823af4f6c999cae3d49b3815b|
+ROW   |36814 |18  |        |10448 |InfluxDB: [{#ORG_NAME}] Query response bytes, failed                                    |influxdb.org.http_query_response_bytes.failed.rate["{#ORG_NAME}"]                |0    |7d     |365d  |0     |0         |             |Bps     |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Count of bytes returned with status not 200 per second.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |c84ae278bd7c4387873bc8bbf6d8ba8f|
+ROW   |36815 |18  |        |10448 |InfluxDB: [{#ORG_NAME}] Query response bytes, success                                   |influxdb.org.http_query_response_bytes.success.rate["{#ORG_NAME}"]               |0    |7d     |365d  |0     |0         |             |Bps     |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Count of bytes returned with status 200 per second.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |fb13e133cf054e8783ba6bf5deaf1686|
+ROW   |36816 |18  |        |10448 |InfluxDB: [{#ORG_NAME}] Query requests, failed                                          |influxdb.org.query_request.failed.rate["{#ORG_NAME}"]                            |0    |7d     |365d  |0     |0         |             |Rps     |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Total number of query requests with status not 200 per second.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |9688861c4268455193772389a957264f|
+ROW   |36817 |18  |        |10448 |InfluxDB: [{#ORG_NAME}] Query requests, success                                         |influxdb.org.query_request.success.rate["{#ORG_NAME}"]                           |0    |7d     |365d  |0     |0         |             |Rps     |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Total number of query requests with status 200 per second.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |da53d3185ba744c38fc264993c72b1b9|
+ROW   |36818 |18  |        |10448 |InfluxDB: [{#ORG_NAME}] Query requests bytes, failed                                    |influxdb.org.query_request_bytes.failed.rate["{#ORG_NAME}"]                      |0    |7d     |365d  |0     |0         |             |Bps     |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Count of bytes received with status not 200 per second.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |4f8dbb16f7a842678e4fb4343c88b560|
+ROW   |36819 |18  |        |10448 |InfluxDB: [{#ORG_NAME}] Query requests bytes, success                                   |influxdb.org.query_request_bytes.success.rate["{#ORG_NAME}"]                     |0    |7d     |365d  |0     |0         |             |Bps     |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |Count of bytes received with status 200 per second.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |0             |30d     |0       |            |36795        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |6bbeb22e5c9b46a2bf480dcf41b4eb0e|
+ROW   |36820 |18  |        |10383 |SMART [{#NAME}]: ID {#ID} {#ATTRNAME} raw value                                         |smart.disk.attr.raw[{#NAME},{#ID}]                                               |0    |7d     |0     |0     |1         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0             |30d     |0       |            |33656        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |04718ade5247478da0450f1cd497b782|
+ROW   |36821 |18  |        |10384 |SMART [{#NAME}]: ID {#ID} {#ATTRNAME} raw value                                         |smart.disk.attr.raw[{#NAME},{#ID}]                                               |0    |7d     |0     |0     |1         |             |        |       |          |NULL      |NULL      |      |           |0       |        |        |         |          |2    |NULL       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0             |30d     |0       |            |33668        |3s     |    |            |     |200         |1               |0        |       |0            |0             |0            |0          |0          |0          |0       |5c09ba32ad72321bce5042d5f4dc59d2|
 
 TABLE |items
 FIELDS|itemid|type|snmp_oid|hostid|name                                              |key_                                                            |delay|history|trends|status|value_type|trapper_hosts|units|formula|logtimefmt|templateid|valuemapid|params|ipmi_sensor|authtype|username|password|publickey|privatekey|flags|interfaceid|description                                                                                                                                                                        |inventory_link|lifetime|evaltype|jmx_endpoint|master_itemid|timeout|url |query_fields|posts|status_codes|follow_redirects|post_type|headers|retrieve_mode|request_method|output_format|verify_peer|verify_host|allow_traps|discover|uuid                            |
@@ -12261,6 +12290,11 @@ ROW   |19651    |{25011}=1
 ROW   |19652    |{25012}=0                                                                                                                                                                                                                                          |Travis: Service is unavailable                                                                                                                                                                                                             |    |0     |4       |Travis API is unavailable. Please check if the correct macros are set.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |NULL      |0   |0    |0            |                                                                                                                 |0               |               |1           |                                                                                                               |0       |          |e8398acab5a74505a85ade5d3ca5f590|
 ROW   |19653    |{25013}<{$TRAVIS.BUILDS.SUCCESS.PERCENT}                                                                                                                                                                                                           |Travis: Repo [{#SLUG}]: Percent of successful builds are < {$TRAVIS.BUILDS.SUCCESS.PERCENT}%                                                                                                                                               |    |0     |2       |Low successful builds rate.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |NULL      |0   |2    |0            |                                                                                                                 |0               |               |1           |                                                                                                               |0       |          |8279ce31c4fe4cb7a03baa8a0149a557|
 ROW   |19654    |{25014}=1                                                                                                                                                                                                                                          |Travis: Repo [{#SLUG}]: Last build status is 'errored'                                                                                                                                                                                     |    |0     |2       |Last build status is errored.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |NULL      |0   |2    |0            |                                                                                                                 |0               |               |1           |                                                                                                               |0       |          |9b26f06ae3854aad8d2c0f4623bb1533|
+ROW   |19655    |{25015}=0                                                                                                                                                                                                                                          |InfluxDB: Health check was failed                                                                                                                                                                                                          |    |0     |4       |The InfluxDB instance is not available or unhealthy.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |NULL      |0   |0    |0            |                                                                                                                 |0               |               |0           |                                                                                                               |0       |          |de130833b4514481aa56d3ba06e648fc|
+ROW   |19656    |{25016}>{$INFLUXDB.TASK.RUN.FAIL.MAX.WARN}                                                                                                                                                                                                         |InfluxDB: Too many tasks failure runs (over {$INFLUXDB.TASK.RUN.FAIL.MAX.WARN} for 5m)                                                                                                                                                     |    |0     |2       |"Number of failure runs completed across all tasks is too high."                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |NULL      |0   |0    |0            |                                                                                                                 |0               |               |0           |                                                                                                               |0       |          |f0d2137905bc477f979d035c06111844|
+ROW   |19657    |{25017}<10m                                                                                                                                                                                                                                        |InfluxDB: has been restarted (uptime < 10m)                                                                                                                                                                                                |    |0     |1       |Uptime is less than 10 minutes                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |NULL      |0   |0    |0            |                                                                                                                 |0               |               |1           |                                                                                                               |0       |          |335f27fb002544838f7150b11238d86b|
+ROW   |19658    |{25018}<>{25019} and length({25020})>0                                                                                                                                                                                                             |InfluxDB: Version has changed (new version: {ITEM.VALUE})                                                                                                                                                                                  |    |0     |1       |InfluxDB version has changed. Ack to close.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |NULL      |0   |0    |0            |                                                                                                                 |0               |               |1           |                                                                                                               |0       |          |d2b02cc426c748608968ae08c0823461|
+ROW   |19659    |{25021}>{$INFLUXDB.REQ.FAIL.MAX.WARN}                                                                                                                                                                                                              |InfluxDB: [{#ORG_NAME}]: Too many requests failures (over {$INFLUXDB.REQ.FAIL.MAX.WARN} for 5m)                                                                                                                                            |    |0     |2       |Too many query requests failed.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |NULL      |0   |2    |0            |                                                                                                                 |0               |               |0           |                                                                                                               |0       |          |893fa5755b514c36aa177c4f4e25b254|
 
 TABLE |triggers
 FIELDS|triggerid|expression                                                                                                                                                              |description                                                                                                                                                                          |url |status|priority|comments                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |templateid|type|flags|recovery_mode|recovery_expression                                                                                              |correlation_mode|correlation_tag|manual_close|opdata                                                                                                         |discover|event_name|uuid|
@@ -12793,958 +12827,958 @@ ROW   |18457    |{22239}>{$IF.ERRORS.WARN:"{#IFNAME}"}&eol;or {22240}>{$IF.ERROR
 TABLE |trigger_depends
 FIELDS|triggerdepid|triggerid_down|triggerid_up|
 ROW   |25229       |18761         |18762       |
-ROW   |28760       |17412         |17411       |
-ROW   |28761       |17414         |17413       |
-ROW   |28762       |17416         |17415       |
-ROW   |28763       |15944         |15947       |
-ROW   |28764       |15944         |15943       |
-ROW   |28765       |15943         |15947       |
-ROW   |28766       |16888         |15947       |
-ROW   |28767       |16888         |15943       |
-ROW   |28768       |15948         |15949       |
-ROW   |28769       |15950         |15949       |
-ROW   |28770       |17429         |17428       |
-ROW   |28771       |17431         |17430       |
-ROW   |28772       |17433         |17432       |
-ROW   |28773       |17355         |17354       |
-ROW   |28774       |17358         |17357       |
-ROW   |28775       |18960         |18962       |
-ROW   |28776       |16743         |16744       |
-ROW   |28777       |16784         |16785       |
-ROW   |28778       |16790         |16791       |
-ROW   |28779       |16892         |16900       |
-ROW   |28780       |16894         |16900       |
-ROW   |28781       |17459         |17458       |
-ROW   |28782       |17463         |17458       |
-ROW   |28783       |17471         |17480       |
-ROW   |28784       |17476         |17481       |
-ROW   |28785       |17478         |17480       |
-ROW   |28786       |17479         |17481       |
-ROW   |28787       |17483         |17482       |
-ROW   |28788       |17486         |17485       |
-ROW   |28789       |16646         |16647       |
-ROW   |28790       |18965         |16660       |
-ROW   |28791       |16809         |16810       |
-ROW   |28792       |18966         |16677       |
-ROW   |28793       |16902         |16904       |
-ROW   |28794       |16904         |16905       |
-ROW   |28795       |16909         |16906       |
-ROW   |28796       |16910         |16912       |
-ROW   |28797       |16912         |16913       |
-ROW   |28798       |16917         |16914       |
-ROW   |28799       |17962         |17963       |
-ROW   |28800       |17962         |17958       |
-ROW   |28801       |16752         |16753       |
-ROW   |28802       |15955         |15957       |
-ROW   |28803       |15955         |15954       |
-ROW   |28804       |15954         |15957       |
-ROW   |28805       |15956         |15957       |
-ROW   |28806       |15956         |15954       |
-ROW   |28807       |16678         |15957       |
-ROW   |28808       |16678         |15954       |
-ROW   |28809       |15961         |15960       |
-ROW   |28810       |15962         |15960       |
-ROW   |28811       |16679         |15960       |
-ROW   |28812       |17090         |17096       |
-ROW   |28813       |17093         |17096       |
-ROW   |28814       |17101         |17098       |
-ROW   |28815       |16257         |16255       |
-ROW   |28816       |16257         |16256       |
-ROW   |28817       |16256         |16255       |
-ROW   |28818       |16251         |16255       |
-ROW   |28819       |16251         |16256       |
-ROW   |28820       |16443         |16255       |
-ROW   |28821       |16443         |16256       |
-ROW   |28822       |16270         |16269       |
-ROW   |28823       |16448         |16269       |
-ROW   |28824       |16265         |16269       |
-ROW   |28825       |17503         |17505       |
-ROW   |28826       |17512         |17511       |
-ROW   |28827       |17513         |17505       |
-ROW   |28833       |17516         |17518       |
-ROW   |28834       |17517         |17516       |
-ROW   |28835       |17517         |17518       |
-ROW   |28836       |17517         |17519       |
-ROW   |28837       |17519         |17518       |
-ROW   |28838       |18918         |18917       |
-ROW   |28839       |17973         |17965       |
-ROW   |28840       |17974         |17966       |
-ROW   |28841       |17141         |17151       |
-ROW   |28842       |17142         |17141       |
-ROW   |28843       |17142         |17151       |
-ROW   |28844       |17143         |17151       |
-ROW   |28845       |17144         |17143       |
-ROW   |28846       |17144         |17151       |
-ROW   |28847       |17146         |17145       |
-ROW   |28848       |17147         |17151       |
-ROW   |28849       |17148         |17147       |
-ROW   |28850       |17148         |17151       |
-ROW   |28851       |17150         |17149       |
-ROW   |28852       |17152         |17168       |
-ROW   |28853       |17153         |17152       |
-ROW   |28854       |17153         |17168       |
-ROW   |28855       |17154         |17168       |
-ROW   |28856       |17155         |17154       |
-ROW   |28857       |17155         |17168       |
-ROW   |28858       |17156         |17168       |
-ROW   |28859       |17157         |17156       |
-ROW   |28860       |17157         |17168       |
-ROW   |28861       |17158         |17168       |
-ROW   |28862       |17159         |17158       |
-ROW   |28863       |17159         |17168       |
-ROW   |28864       |17160         |17168       |
-ROW   |28865       |17161         |17160       |
-ROW   |28866       |17161         |17168       |
-ROW   |28867       |17163         |17162       |
-ROW   |28868       |17164         |17168       |
-ROW   |28869       |17165         |17164       |
-ROW   |28870       |17165         |17168       |
-ROW   |28871       |17166         |17168       |
-ROW   |28872       |17167         |17166       |
-ROW   |28873       |17167         |17168       |
-ROW   |28874       |17169         |17168       |
-ROW   |28875       |17170         |17168       |
-ROW   |28876       |17170         |17169       |
-ROW   |28877       |17171         |17168       |
-ROW   |28878       |17172         |17168       |
-ROW   |28879       |17172         |17171       |
-ROW   |28880       |17540         |17541       |
-ROW   |28881       |16833         |16920       |
-ROW   |28882       |16920         |16921       |
-ROW   |28883       |18987         |18986       |
-ROW   |28884       |18989         |18988       |
-ROW   |28885       |18993         |18992       |
-ROW   |28886       |18994         |18992       |
-ROW   |28887       |19009         |19010       |
-ROW   |28888       |17978         |17977       |
-ROW   |28889       |17980         |17979       |
-ROW   |28890       |17984         |17983       |
-ROW   |28891       |17985         |17983       |
-ROW   |28892       |18000         |18001       |
-ROW   |28893       |18225         |18224       |
-ROW   |28894       |18237         |18236       |
-ROW   |28895       |16929         |16928       |
-ROW   |28896       |16940         |17084       |
-ROW   |28897       |18537         |18536       |
-ROW   |28898       |18539         |18538       |
-ROW   |28899       |18541         |18540       |
-ROW   |28900       |16719         |16721       |
-ROW   |28901       |16975         |16723       |
-ROW   |28902       |16729         |16728       |
-ROW   |28903       |16730         |16728       |
-ROW   |28904       |16756         |16758       |
-ROW   |28905       |16979         |16759       |
-ROW   |28906       |16765         |16764       |
-ROW   |28907       |16766         |16764       |
-ROW   |28908       |16734         |16736       |
-ROW   |28909       |16983         |16732       |
-ROW   |28910       |16741         |16740       |
-ROW   |28911       |16742         |16740       |
-ROW   |28912       |17192         |17191       |
-ROW   |28913       |17194         |17195       |
-ROW   |28914       |17199         |17198       |
-ROW   |28915       |17546         |17545       |
-ROW   |28916       |17547         |17548       |
-ROW   |28917       |16997         |16984       |
-ROW   |28918       |17002         |17003       |
-ROW   |28919       |17006         |17005       |
-ROW   |28920       |17011         |17010       |
-ROW   |28921       |17550         |17549       |
-ROW   |28922       |17551         |17552       |
-ROW   |28923       |17391         |17396       |
-ROW   |28924       |17395         |17396       |
-ROW   |28925       |16683         |16687       |
-ROW   |28926       |14252         |14251       |
-ROW   |28927       |14294         |14293       |
-ROW   |28928       |14312         |14311       |
-ROW   |28929       |14328         |14327       |
-ROW   |28930       |14348         |14347       |
-ROW   |28931       |14357         |14356       |
-ROW   |28932       |14390         |14389       |
-ROW   |28933       |14404         |14403       |
-ROW   |28934       |14452         |14451       |
-ROW   |28935       |14469         |14468       |
-ROW   |28936       |14487         |14486       |
-ROW   |28937       |14506         |14505       |
-ROW   |28938       |14535         |14534       |
-ROW   |28939       |14545         |14544       |
-ROW   |28940       |14583         |14582       |
-ROW   |28941       |14599         |14598       |
-ROW   |28942       |14616         |14615       |
-ROW   |28943       |14653         |14652       |
-ROW   |28944       |14674         |14673       |
-ROW   |28945       |14692         |14691       |
-ROW   |28946       |14705         |14704       |
-ROW   |28947       |14718         |14717       |
-ROW   |28948       |14907         |14906       |
-ROW   |28949       |15221         |15220       |
-ROW   |28950       |15702         |15701       |
-ROW   |28951       |15724         |15723       |
-ROW   |28952       |15756         |15755       |
-ROW   |28953       |15820         |15819       |
-ROW   |28954       |15841         |15840       |
-ROW   |28955       |15991         |15990       |
-ROW   |28956       |16018         |16017       |
-ROW   |28957       |16454         |16453       |
-ROW   |28958       |17924         |17923       |
-ROW   |28959       |18178         |18177       |
-ROW   |28960       |14253         |14252       |
-ROW   |28961       |14295         |14294       |
-ROW   |28962       |14313         |14312       |
-ROW   |28963       |14329         |14328       |
-ROW   |28964       |14349         |14348       |
-ROW   |28965       |14358         |14357       |
-ROW   |28966       |14391         |14390       |
-ROW   |28967       |14405         |14404       |
-ROW   |28968       |14453         |14452       |
-ROW   |28969       |14470         |14469       |
-ROW   |28970       |14488         |14487       |
-ROW   |28971       |14507         |14506       |
-ROW   |28972       |14536         |14535       |
-ROW   |28973       |14546         |14545       |
-ROW   |28974       |14584         |14583       |
-ROW   |28975       |14600         |14599       |
-ROW   |28976       |14617         |14616       |
-ROW   |28977       |14654         |14653       |
-ROW   |28978       |14675         |14674       |
-ROW   |28979       |14693         |14692       |
-ROW   |28980       |14706         |14705       |
-ROW   |28981       |14719         |14718       |
-ROW   |28982       |14908         |14907       |
-ROW   |28983       |15222         |15221       |
-ROW   |28984       |15703         |15702       |
-ROW   |28985       |15725         |15724       |
-ROW   |28986       |15757         |15756       |
-ROW   |28987       |15821         |15820       |
-ROW   |28988       |15842         |15841       |
-ROW   |28989       |15992         |15991       |
-ROW   |28990       |16019         |16018       |
-ROW   |28991       |16455         |16454       |
-ROW   |28992       |17925         |17924       |
-ROW   |28993       |18179         |18178       |
-ROW   |28994       |14253         |14251       |
-ROW   |28995       |14295         |14293       |
-ROW   |28996       |14313         |14311       |
-ROW   |28997       |14329         |14327       |
-ROW   |28998       |14349         |14347       |
-ROW   |28999       |14358         |14356       |
-ROW   |29000       |14391         |14389       |
-ROW   |29001       |14405         |14403       |
-ROW   |29002       |14453         |14451       |
-ROW   |29003       |14470         |14468       |
-ROW   |29004       |14488         |14486       |
-ROW   |29005       |14507         |14505       |
-ROW   |29006       |14536         |14534       |
-ROW   |29007       |14546         |14544       |
-ROW   |29008       |14584         |14582       |
-ROW   |29009       |14600         |14598       |
-ROW   |29010       |14617         |14615       |
-ROW   |29011       |14654         |14652       |
-ROW   |29012       |14675         |14673       |
-ROW   |29013       |14693         |14691       |
-ROW   |29014       |14706         |14704       |
-ROW   |29015       |14719         |14717       |
-ROW   |29016       |14908         |14906       |
-ROW   |29017       |15222         |15220       |
-ROW   |29018       |15703         |15701       |
-ROW   |29019       |15725         |15723       |
-ROW   |29020       |15757         |15755       |
-ROW   |29021       |15821         |15819       |
-ROW   |29022       |15842         |15840       |
-ROW   |29023       |15992         |15990       |
-ROW   |29024       |16019         |16017       |
-ROW   |29025       |16455         |16453       |
-ROW   |29026       |17925         |17923       |
-ROW   |29027       |18179         |18177       |
-ROW   |29028       |16287         |16289       |
-ROW   |29029       |16279         |16285       |
-ROW   |29030       |16290         |16348       |
-ROW   |29031       |16291         |16349       |
-ROW   |29032       |16292         |16350       |
-ROW   |29033       |16293         |16351       |
-ROW   |29034       |16294         |16352       |
-ROW   |29035       |16295         |16353       |
-ROW   |29036       |16296         |16354       |
-ROW   |29037       |16297         |16355       |
-ROW   |29038       |16298         |16356       |
-ROW   |29039       |16299         |16357       |
-ROW   |29040       |16300         |16358       |
-ROW   |29041       |16301         |16359       |
-ROW   |29042       |16302         |16360       |
-ROW   |29043       |16303         |16361       |
-ROW   |29044       |16304         |16362       |
-ROW   |29045       |16305         |16363       |
-ROW   |29046       |16306         |16364       |
-ROW   |29047       |16307         |16365       |
-ROW   |29048       |16308         |16366       |
-ROW   |29049       |16309         |16367       |
-ROW   |29050       |16311         |16369       |
-ROW   |29051       |16312         |16370       |
-ROW   |29052       |16313         |16371       |
-ROW   |29053       |16314         |16372       |
-ROW   |29054       |16315         |16373       |
-ROW   |29055       |16316         |16374       |
-ROW   |29056       |16317         |16375       |
-ROW   |29057       |16318         |16376       |
-ROW   |29058       |16457         |16458       |
-ROW   |29059       |17927         |17928       |
-ROW   |29060       |18181         |18182       |
-ROW   |29061       |16289         |14293       |
-ROW   |29062       |16285         |14717       |
-ROW   |29063       |16348         |14311       |
-ROW   |29064       |16349         |14327       |
-ROW   |29065       |16350         |14347       |
-ROW   |29066       |16351         |14356       |
-ROW   |29067       |16352         |14389       |
-ROW   |29068       |16353         |14403       |
-ROW   |29069       |16354         |14451       |
-ROW   |29070       |16355         |14468       |
-ROW   |29071       |16356         |14486       |
-ROW   |29072       |16357         |14505       |
-ROW   |29073       |16358         |14534       |
-ROW   |29074       |16359         |14544       |
-ROW   |29075       |16360         |14582       |
-ROW   |29076       |16361         |14598       |
-ROW   |29077       |16362         |14615       |
-ROW   |29078       |16363         |14652       |
-ROW   |29079       |16364         |14673       |
-ROW   |29080       |16365         |14691       |
-ROW   |29081       |16366         |14704       |
-ROW   |29082       |16367         |14906       |
-ROW   |29083       |16369         |15220       |
-ROW   |29084       |16370         |15701       |
-ROW   |29085       |16371         |15723       |
-ROW   |29086       |16372         |15755       |
-ROW   |29087       |16373         |15819       |
-ROW   |29088       |16374         |15840       |
-ROW   |29089       |16375         |15990       |
-ROW   |29090       |16376         |16017       |
-ROW   |29091       |16458         |16453       |
-ROW   |29092       |17928         |17923       |
-ROW   |29093       |18182         |18177       |
-ROW   |29094       |16631         |16630       |
-ROW   |29095       |16640         |16636       |
-ROW   |29096       |16642         |16638       |
-ROW   |29097       |16643         |16639       |
-ROW   |29098       |15695         |16863       |
-ROW   |29099       |18242         |16863       |
-ROW   |29100       |18243         |16863       |
-ROW   |29101       |15694         |16868       |
-ROW   |29102       |15696         |16864       |
-ROW   |29103       |15697         |16865       |
-ROW   |29104       |18244         |16864       |
-ROW   |29105       |18245         |16865       |
-ROW   |29106       |18246         |16868       |
-ROW   |29107       |18247         |16864       |
-ROW   |29108       |18248         |16865       |
-ROW   |29109       |18249         |16868       |
-ROW   |29110       |15671         |16841       |
-ROW   |29111       |18250         |16841       |
-ROW   |29112       |18251         |16841       |
-ROW   |29113       |15672         |16842       |
-ROW   |29114       |15673         |16843       |
-ROW   |29115       |15674         |16844       |
-ROW   |29116       |15675         |16845       |
-ROW   |29117       |15676         |16846       |
-ROW   |29118       |15677         |16847       |
-ROW   |29119       |15678         |16848       |
-ROW   |29120       |15679         |16849       |
-ROW   |29121       |15680         |16850       |
-ROW   |29122       |15681         |16851       |
-ROW   |29123       |15682         |16852       |
-ROW   |29124       |15683         |16853       |
-ROW   |29125       |15684         |16854       |
-ROW   |29126       |15685         |16855       |
-ROW   |29127       |15686         |16856       |
-ROW   |29128       |15687         |16857       |
-ROW   |29129       |15689         |16858       |
-ROW   |29130       |15691         |16860       |
-ROW   |29131       |15708         |16861       |
-ROW   |29132       |15997         |16862       |
-ROW   |29133       |18252         |16842       |
-ROW   |29134       |18253         |16843       |
-ROW   |29135       |18254         |16844       |
-ROW   |29136       |18255         |16845       |
-ROW   |29137       |18256         |16846       |
-ROW   |29138       |18257         |16847       |
-ROW   |29139       |18258         |16848       |
-ROW   |29140       |18259         |16849       |
-ROW   |29141       |18260         |16850       |
-ROW   |29142       |18261         |16851       |
-ROW   |29143       |18262         |16852       |
-ROW   |29144       |18263         |16853       |
-ROW   |29145       |18264         |16854       |
-ROW   |29146       |18265         |16855       |
-ROW   |29147       |18266         |16856       |
-ROW   |29148       |18267         |16857       |
-ROW   |29149       |18268         |16858       |
-ROW   |29150       |18270         |16860       |
-ROW   |29151       |18271         |16861       |
-ROW   |29152       |18272         |16862       |
-ROW   |29153       |18273         |16842       |
-ROW   |29154       |18274         |16843       |
-ROW   |29155       |18275         |16844       |
-ROW   |29156       |18276         |16845       |
-ROW   |29157       |18277         |16846       |
-ROW   |29158       |18278         |16847       |
-ROW   |29159       |18279         |16848       |
-ROW   |29160       |18280         |16849       |
-ROW   |29161       |18281         |16850       |
-ROW   |29162       |18282         |16851       |
-ROW   |29163       |18283         |16852       |
-ROW   |29164       |18284         |16853       |
-ROW   |29165       |18285         |16854       |
-ROW   |29166       |18286         |16855       |
-ROW   |29167       |18287         |16856       |
-ROW   |29168       |18288         |16857       |
-ROW   |29169       |18289         |16858       |
-ROW   |29170       |18291         |16860       |
-ROW   |29171       |18292         |16861       |
-ROW   |29172       |18293         |16862       |
-ROW   |29173       |15698         |16866       |
-ROW   |29174       |18294         |16866       |
-ROW   |29175       |18295         |16866       |
-ROW   |29176       |16028         |16867       |
-ROW   |29177       |18296         |16867       |
-ROW   |29178       |18297         |16867       |
-ROW   |29179       |18100         |18099       |
-ROW   |29180       |18106         |18105       |
-ROW   |29181       |14318         |14319       |
-ROW   |29182       |17554         |15717       |
-ROW   |29183       |17555         |15717       |
-ROW   |29184       |17555         |17554       |
-ROW   |29185       |17556         |15717       |
-ROW   |29186       |17557         |15717       |
-ROW   |29187       |17557         |17556       |
-ROW   |29188       |17559         |17558       |
-ROW   |29189       |17561         |17560       |
-ROW   |29190       |17563         |17562       |
-ROW   |29191       |17565         |17564       |
-ROW   |29192       |15721         |15720       |
-ROW   |29193       |15394         |15393       |
-ROW   |29194       |15392         |15391       |
-ROW   |29195       |17322         |14339       |
-ROW   |29196       |15382         |15381       |
-ROW   |29197       |15380         |15379       |
-ROW   |29198       |16504         |16505       |
-ROW   |29199       |14372         |14373       |
-ROW   |29200       |15386         |15385       |
-ROW   |29201       |15384         |15383       |
-ROW   |29202       |14380         |14381       |
-ROW   |29203       |18299         |18298       |
-ROW   |29204       |18300         |18299       |
-ROW   |29205       |18300         |18298       |
-ROW   |29206       |18303         |18302       |
-ROW   |29207       |18309         |18308       |
-ROW   |29208       |18311         |18316       |
-ROW   |29209       |18312         |18316       |
-ROW   |29210       |18313         |18316       |
-ROW   |29211       |18314         |18316       |
-ROW   |29212       |18315         |18316       |
-ROW   |29213       |18319         |18318       |
-ROW   |29214       |18321         |18320       |
-ROW   |29215       |18323         |18322       |
-ROW   |29216       |18326         |18325       |
-ROW   |29217       |18327         |18326       |
-ROW   |29218       |18327         |18325       |
-ROW   |29219       |18330         |18329       |
-ROW   |29220       |18336         |18335       |
-ROW   |29221       |18338         |18343       |
-ROW   |29222       |18339         |18343       |
-ROW   |29223       |18340         |18343       |
-ROW   |29224       |18341         |18343       |
-ROW   |29225       |18342         |18343       |
-ROW   |29226       |18346         |18345       |
-ROW   |29227       |18348         |18347       |
-ROW   |29228       |18350         |18349       |
-ROW   |29229       |18353         |18352       |
-ROW   |29230       |18354         |18353       |
-ROW   |29231       |18354         |18352       |
-ROW   |29232       |18357         |18356       |
-ROW   |29233       |18363         |18362       |
-ROW   |29234       |18365         |18370       |
-ROW   |29235       |18366         |18370       |
-ROW   |29236       |18367         |18370       |
-ROW   |29237       |18368         |18370       |
-ROW   |29238       |18369         |18370       |
-ROW   |29239       |18373         |18372       |
-ROW   |29240       |18375         |18374       |
-ROW   |29241       |18377         |18376       |
-ROW   |29242       |18380         |18379       |
-ROW   |29243       |18381         |18380       |
-ROW   |29244       |18381         |18379       |
-ROW   |29245       |18384         |18383       |
-ROW   |29246       |18390         |18389       |
-ROW   |29247       |18392         |18397       |
-ROW   |29248       |18393         |18397       |
-ROW   |29249       |18394         |18397       |
-ROW   |29250       |18395         |18397       |
-ROW   |29251       |18396         |18397       |
-ROW   |29252       |18400         |18399       |
-ROW   |29253       |18402         |18401       |
-ROW   |29254       |18404         |18403       |
-ROW   |29255       |18407         |18406       |
-ROW   |29256       |18408         |18407       |
-ROW   |29257       |18408         |18406       |
-ROW   |29258       |18411         |18410       |
-ROW   |29259       |18417         |18416       |
-ROW   |29260       |18419         |18424       |
-ROW   |29261       |18420         |18424       |
-ROW   |29262       |18421         |18424       |
-ROW   |29263       |18422         |18424       |
-ROW   |29264       |18423         |18424       |
-ROW   |29265       |18427         |18426       |
-ROW   |29266       |18429         |18428       |
-ROW   |29267       |18431         |18430       |
-ROW   |29268       |15347         |15346       |
-ROW   |29269       |15345         |15344       |
-ROW   |29270       |17567         |17566       |
-ROW   |29271       |15363         |15360       |
-ROW   |29272       |15364         |15361       |
-ROW   |29273       |15365         |15362       |
-ROW   |29274       |15357         |15354       |
-ROW   |29275       |15358         |15355       |
-ROW   |29276       |15359         |15356       |
-ROW   |29277       |17571         |17568       |
-ROW   |29278       |17572         |17569       |
-ROW   |29279       |17573         |17570       |
-ROW   |29280       |15334         |15333       |
-ROW   |29281       |15332         |15331       |
-ROW   |29282       |14460         |14461       |
-ROW   |29283       |14476         |14477       |
-ROW   |29284       |14495         |14496       |
-ROW   |29285       |14511         |17574       |
-ROW   |29286       |14551         |14552       |
-ROW   |29287       |15374         |15373       |
-ROW   |29288       |15376         |15375       |
-ROW   |29289       |14914         |14915       |
-ROW   |29290       |14589         |14590       |
-ROW   |29291       |15338         |15337       |
-ROW   |29292       |17333         |17332       |
-ROW   |29293       |14624         |14625       |
-ROW   |29294       |18434         |18433       |
-ROW   |29295       |18435         |18434       |
-ROW   |29296       |18435         |18433       |
-ROW   |29297       |18438         |18439       |
-ROW   |29298       |18439         |18433       |
-ROW   |29299       |18441         |18444       |
-ROW   |29300       |18442         |18444       |
-ROW   |29301       |18443         |18444       |
-ROW   |29302       |18446         |18447       |
-ROW   |29303       |18450         |18449       |
-ROW   |29304       |14664         |14665       |
-ROW   |29305       |17085         |17086       |
-ROW   |29306       |16547         |16546       |
-ROW   |29307       |17576         |17575       |
-ROW   |29308       |17578         |17577       |
-ROW   |29309       |17628         |17626       |
-ROW   |29310       |17629         |17627       |
-ROW   |29311       |17632         |17630       |
-ROW   |29312       |17633         |17631       |
-ROW   |29313       |17635         |17634       |
-ROW   |29314       |17637         |17636       |
-ROW   |29315       |17686         |17684       |
-ROW   |29316       |17687         |17685       |
-ROW   |29317       |17690         |17688       |
-ROW   |29318       |17691         |17689       |
-ROW   |29319       |17693         |17692       |
-ROW   |29320       |17695         |17694       |
-ROW   |29321       |17730         |17728       |
-ROW   |29322       |17731         |17729       |
-ROW   |29323       |17734         |17732       |
-ROW   |29324       |17735         |17733       |
-ROW   |29325       |17737         |17736       |
-ROW   |29326       |17754         |17752       |
-ROW   |29327       |17755         |17753       |
-ROW   |29328       |17757         |17756       |
-ROW   |29329       |17819         |17817       |
-ROW   |29330       |17820         |17818       |
-ROW   |29331       |17823         |17821       |
-ROW   |29332       |17824         |17822       |
-ROW   |29333       |17826         |17825       |
-ROW   |29334       |17860         |17858       |
-ROW   |29335       |17861         |17859       |
-ROW   |29336       |17864         |17862       |
-ROW   |29337       |17865         |17863       |
-ROW   |29338       |17899         |17897       |
-ROW   |29339       |17900         |17898       |
-ROW   |29340       |17903         |17901       |
-ROW   |29341       |17904         |17902       |
-ROW   |29342       |17906         |17905       |
-ROW   |29343       |17908         |17907       |
-ROW   |29344       |17910         |17909       |
-ROW   |29345       |16551         |16552       |
-ROW   |29346       |16031         |16563       |
-ROW   |29347       |16045         |16564       |
-ROW   |29348       |16046         |16565       |
-ROW   |29349       |16039         |16040       |
-ROW   |29350       |16061         |16063       |
-ROW   |29351       |16062         |16064       |
-ROW   |29352       |16042         |16579       |
-ROW   |29353       |16067         |16580       |
-ROW   |29354       |16068         |16581       |
-ROW   |29355       |16041         |16042       |
-ROW   |29356       |16065         |16067       |
-ROW   |29357       |16066         |16068       |
-ROW   |29358       |16041         |16579       |
-ROW   |29359       |16065         |16580       |
-ROW   |29360       |16066         |16581       |
-ROW   |29361       |18132         |18452       |
-ROW   |29362       |18135         |18453       |
-ROW   |29363       |18138         |18454       |
-ROW   |29364       |18130         |18132       |
-ROW   |29365       |18133         |18135       |
-ROW   |29366       |18136         |18138       |
-ROW   |29367       |18130         |18452       |
-ROW   |29368       |18133         |18453       |
-ROW   |29369       |18136         |18454       |
-ROW   |29370       |16070         |16069       |
-ROW   |29371       |16072         |16071       |
-ROW   |29372       |16076         |17024       |
-ROW   |29373       |18455         |17024       |
-ROW   |29374       |16079         |16077       |
-ROW   |29375       |16080         |16078       |
-ROW   |29376       |16083         |16081       |
-ROW   |29377       |16084         |16082       |
-ROW   |29378       |16091         |17026       |
-ROW   |29379       |16092         |17028       |
-ROW   |29380       |18456         |17026       |
-ROW   |29381       |18457         |17028       |
-ROW   |29382       |17244         |17243       |
-ROW   |29383       |17257         |17256       |
-ROW   |29384       |17246         |17240       |
-ROW   |29385       |17259         |17253       |
-ROW   |29386       |17249         |17247       |
-ROW   |29387       |17262         |17260       |
-ROW   |29388       |17251         |17249       |
-ROW   |29389       |17264         |17262       |
-ROW   |29390       |17251         |17247       |
-ROW   |29391       |17264         |17260       |
-ROW   |29392       |18144         |18458       |
-ROW   |29393       |18147         |18459       |
-ROW   |29394       |18142         |18144       |
-ROW   |29395       |18145         |18147       |
-ROW   |29396       |18142         |18458       |
-ROW   |29397       |18145         |18459       |
-ROW   |29398       |17268         |17267       |
-ROW   |29399       |17270         |17269       |
-ROW   |29400       |17271         |17273       |
-ROW   |29401       |18460         |17273       |
-ROW   |29402       |17276         |17275       |
-ROW   |29403       |17278         |17277       |
-ROW   |29404       |17279         |17281       |
-ROW   |29405       |18461         |17281       |
-ROW   |29406       |16141         |16142       |
-ROW   |29407       |16146         |16573       |
-ROW   |29408       |16143         |16584       |
-ROW   |29409       |18152         |18462       |
-ROW   |29410       |18150         |18152       |
-ROW   |29411       |18150         |18462       |
-ROW   |29412       |16152         |16883       |
-ROW   |29413       |16153         |16883       |
-ROW   |29414       |18463         |16883       |
-ROW   |29415       |18464         |16883       |
-ROW   |29416       |16156         |16155       |
-ROW   |29417       |16158         |16157       |
-ROW   |29418       |18157         |18156       |
-ROW   |29419       |18160         |18159       |
-ROW   |29420       |18155         |18157       |
-ROW   |29421       |18158         |18160       |
-ROW   |29422       |18155         |18156       |
-ROW   |29423       |18158         |18159       |
-ROW   |29424       |16009         |16008       |
-ROW   |29425       |16011         |16010       |
-ROW   |29426       |16014         |16013       |
-ROW   |29427       |16016         |16015       |
-ROW   |29428       |16161         |16160       |
-ROW   |29429       |16172         |16171       |
-ROW   |29430       |16162         |16161       |
-ROW   |29431       |16173         |16172       |
-ROW   |29432       |16162         |16160       |
-ROW   |29433       |16173         |16171       |
-ROW   |29434       |16166         |18162       |
-ROW   |29435       |16177         |18164       |
-ROW   |29436       |16167         |18162       |
-ROW   |29437       |16178         |18164       |
-ROW   |29438       |17035         |16160       |
-ROW   |29439       |17037         |16171       |
-ROW   |29440       |18161         |18162       |
-ROW   |29441       |18163         |18164       |
-ROW   |29442       |16183         |16182       |
-ROW   |29443       |17911         |17042       |
-ROW   |29444       |18465         |17042       |
-ROW   |29445       |18466         |17042       |
-ROW   |29446       |17043         |17912       |
-ROW   |29447       |17043         |17913       |
-ROW   |29448       |16190         |16189       |
-ROW   |29449       |17914         |17047       |
-ROW   |29450       |18467         |17047       |
-ROW   |29451       |18468         |17047       |
-ROW   |29452       |17048         |17915       |
-ROW   |29453       |17048         |17916       |
-ROW   |29454       |17285         |17287       |
-ROW   |29455       |17296         |17298       |
-ROW   |29456       |17286         |17285       |
-ROW   |29457       |17297         |17296       |
-ROW   |29458       |17286         |17287       |
-ROW   |29459       |17297         |17298       |
-ROW   |29460       |17291         |18170       |
-ROW   |29461       |17302         |18172       |
-ROW   |29462       |17292         |18170       |
-ROW   |29463       |17303         |18172       |
-ROW   |29464       |17283         |17287       |
-ROW   |29465       |17294         |17298       |
-ROW   |29466       |18169         |18170       |
-ROW   |29467       |18171         |18172       |
-ROW   |29468       |17306         |17305       |
-ROW   |29469       |17917         |17310       |
-ROW   |29470       |18469         |17310       |
-ROW   |29471       |18470         |17310       |
-ROW   |29472       |17311         |17918       |
-ROW   |29473       |17311         |17919       |
-ROW   |29474       |17314         |17313       |
-ROW   |29475       |17920         |17318       |
-ROW   |29476       |18471         |17318       |
-ROW   |29477       |18472         |17318       |
-ROW   |29478       |17319         |17921       |
-ROW   |29479       |17319         |17922       |
-ROW   |29480       |18596         |18597       |
-ROW   |29481       |18629         |18630       |
-ROW   |29482       |18662         |18663       |
-ROW   |29483       |18695         |18696       |
-ROW   |29484       |18728         |18729       |
-ROW   |29485       |18947         |18948       |
-ROW   |29486       |18794         |18795       |
-ROW   |29487       |18495         |18496       |
-ROW   |29488       |18831         |18832       |
-ROW   |29489       |18864         |18865       |
-ROW   |29490       |18897         |18898       |
-ROW   |29491       |16772         |16773       |
-ROW   |29492       |16771         |16772       |
-ROW   |29493       |16771         |16773       |
-ROW   |29494       |16769         |16770       |
-ROW   |29495       |16768         |16769       |
-ROW   |29496       |16768         |16770       |
-ROW   |29497       |19230         |19231       |
-ROW   |29498       |19233         |19232       |
-ROW   |29499       |19235         |19234       |
-ROW   |29500       |19236         |19234       |
-ROW   |29501       |19236         |19235       |
-ROW   |29502       |19238         |19237       |
-ROW   |29503       |19239         |19240       |
-ROW   |29504       |19242         |19243       |
-ROW   |29505       |19245         |19244       |
-ROW   |29506       |19247         |19246       |
-ROW   |29507       |19249         |19250       |
-ROW   |29508       |19249         |19252       |
-ROW   |29509       |19249         |19248       |
-ROW   |29510       |19249         |19254       |
-ROW   |29511       |19251         |19250       |
-ROW   |29512       |19251         |19252       |
-ROW   |29513       |19251         |19248       |
-ROW   |29514       |19251         |19254       |
-ROW   |29515       |19253         |19250       |
-ROW   |29516       |19253         |19252       |
-ROW   |29517       |19253         |19248       |
-ROW   |29518       |19253         |19254       |
-ROW   |29519       |19255         |19250       |
-ROW   |29520       |19255         |19252       |
-ROW   |29521       |19255         |19248       |
-ROW   |29522       |19255         |19254       |
-ROW   |29523       |19258         |19257       |
-ROW   |29524       |16488         |16487       |
-ROW   |29525       |16485         |16484       |
-ROW   |29526       |16486         |16484       |
-ROW   |29527       |16486         |16485       |
-ROW   |29528       |16480         |16479       |
-ROW   |29529       |16482         |16481       |
-ROW   |29530       |16475         |16474       |
-ROW   |29531       |16471         |16472       |
-ROW   |29532       |16468         |16469       |
-ROW   |29533       |16459         |16460       |
-ROW   |29534       |16462         |16463       |
-ROW   |29535       |16465         |16466       |
-ROW   |29536       |16477         |16476       |
-ROW   |29537       |19263         |19262       |
-ROW   |29538       |19266         |19265       |
-ROW   |29539       |19268         |19267       |
-ROW   |29540       |19270         |19269       |
-ROW   |29541       |19272         |19271       |
-ROW   |29542       |19276         |19275       |
-ROW   |29543       |19278         |19277       |
-ROW   |29544       |19280         |19279       |
-ROW   |29545       |19282         |19281       |
-ROW   |29546       |19288         |19287       |
-ROW   |29547       |19293         |19292       |
-ROW   |29548       |19294         |19292       |
-ROW   |29549       |19294         |19293       |
-ROW   |29550       |19295         |19296       |
-ROW   |29551       |19297         |19295       |
-ROW   |29552       |19297         |19296       |
-ROW   |29553       |19299         |19298       |
-ROW   |29554       |19301         |19302       |
-ROW   |29555       |19303         |19302       |
-ROW   |29556       |19305         |19304       |
-ROW   |29557       |19307         |19306       |
-ROW   |29558       |19308         |19306       |
-ROW   |29559       |19308         |19307       |
-ROW   |29560       |19310         |19309       |
-ROW   |29561       |19314         |19313       |
-ROW   |29562       |19317         |19316       |
-ROW   |29563       |19319         |19318       |
-ROW   |29564       |19321         |19320       |
-ROW   |29565       |19323         |19322       |
-ROW   |29566       |19327         |19326       |
-ROW   |29567       |19329         |19328       |
-ROW   |29568       |19331         |19330       |
-ROW   |29569       |19333         |19332       |
-ROW   |29570       |19339         |19338       |
-ROW   |29571       |19344         |19343       |
-ROW   |29572       |19345         |19343       |
-ROW   |29573       |19345         |19344       |
-ROW   |29574       |19346         |19347       |
-ROW   |29575       |19348         |19346       |
-ROW   |29576       |19348         |19347       |
-ROW   |29577       |19350         |19349       |
-ROW   |29578       |19352         |19353       |
-ROW   |29579       |19354         |19353       |
-ROW   |29580       |19356         |19355       |
-ROW   |29581       |19358         |19357       |
-ROW   |29582       |19359         |19357       |
-ROW   |29583       |19359         |19358       |
-ROW   |29584       |19361         |19360       |
-ROW   |29585       |19365         |19364       |
-ROW   |29586       |19368         |19367       |
-ROW   |29587       |19370         |19369       |
-ROW   |29588       |19372         |19371       |
-ROW   |29589       |19374         |19373       |
-ROW   |29590       |19378         |19377       |
-ROW   |29591       |19380         |19379       |
-ROW   |29592       |19382         |19381       |
-ROW   |29593       |19384         |19383       |
-ROW   |29594       |19390         |19389       |
-ROW   |29595       |19395         |19394       |
-ROW   |29596       |19396         |19394       |
-ROW   |29597       |19396         |19395       |
-ROW   |29598       |19397         |19398       |
-ROW   |29599       |19399         |19397       |
-ROW   |29600       |19399         |19398       |
-ROW   |29601       |19401         |19400       |
-ROW   |29602       |19403         |19404       |
-ROW   |29603       |19405         |19404       |
-ROW   |29604       |19407         |19406       |
-ROW   |29605       |19409         |19408       |
-ROW   |29606       |19410         |19408       |
-ROW   |29607       |19410         |19409       |
-ROW   |29608       |19412         |19411       |
-ROW   |29609       |19416         |19415       |
-ROW   |29610       |19419         |19418       |
-ROW   |29611       |19421         |19420       |
-ROW   |29612       |19423         |19422       |
-ROW   |29613       |19425         |19424       |
-ROW   |29614       |19429         |19428       |
-ROW   |29615       |19431         |19430       |
-ROW   |29616       |19433         |19432       |
-ROW   |29617       |19435         |19434       |
-ROW   |29618       |19441         |19440       |
-ROW   |29619       |19446         |19445       |
-ROW   |29620       |19447         |19445       |
-ROW   |29621       |19447         |19446       |
-ROW   |29622       |19448         |19449       |
-ROW   |29623       |19450         |19448       |
-ROW   |29624       |19450         |19449       |
-ROW   |29625       |19452         |19451       |
-ROW   |29626       |19454         |19455       |
-ROW   |29627       |19456         |19455       |
-ROW   |29628       |19458         |19457       |
-ROW   |29629       |19460         |19459       |
-ROW   |29630       |19461         |19459       |
-ROW   |29631       |19461         |19460       |
-ROW   |29632       |19463         |19462       |
-ROW   |29633       |15729         |15728       |
-ROW   |29634       |15730         |15728       |
-ROW   |29635       |15730         |15729       |
-ROW   |29636       |15752         |15754       |
-ROW   |29637       |15753         |15754       |
-ROW   |29638       |15753         |15752       |
-ROW   |29639       |15742         |15741       |
-ROW   |29640       |15750         |15749       |
-ROW   |29641       |15751         |15750       |
-ROW   |29642       |15751         |15749       |
-ROW   |29643       |15746         |15743       |
-ROW   |29644       |15744         |15743       |
-ROW   |29645       |15740         |15739       |
-ROW   |29646       |17946         |17945       |
-ROW   |29647       |17948         |17947       |
-ROW   |29648       |15748         |15747       |
-ROW   |29649       |19467         |19466       |
-ROW   |29650       |19471         |19470       |
-ROW   |29651       |19473         |19472       |
-ROW   |29652       |19474         |19472       |
-ROW   |29653       |19474         |19473       |
-ROW   |29654       |19476         |19475       |
-ROW   |29655       |19478         |19477       |
-ROW   |29656       |19480         |19479       |
-ROW   |29657       |19482         |19483       |
-ROW   |29658       |19484         |19483       |
-ROW   |29659       |19486         |19485       |
-ROW   |29660       |19509         |19508       |
-ROW   |29661       |19513         |19512       |
-ROW   |29662       |19517         |19516       |
-ROW   |29663       |19519         |19518       |
-ROW   |29664       |19520         |19518       |
-ROW   |29665       |19520         |19519       |
-ROW   |29666       |19522         |19521       |
-ROW   |29667       |19524         |19523       |
-ROW   |29668       |19526         |19525       |
-ROW   |29669       |19528         |19529       |
-ROW   |29670       |19530         |19529       |
-ROW   |29671       |19532         |19531       |
-ROW   |29672       |19555         |19554       |
-ROW   |29673       |19559         |19558       |
-ROW   |29674       |19563         |19562       |
-ROW   |29675       |19565         |19564       |
-ROW   |29676       |19566         |19564       |
-ROW   |29677       |19566         |19565       |
-ROW   |29678       |19568         |19567       |
-ROW   |29679       |19570         |19569       |
-ROW   |29680       |19572         |19571       |
-ROW   |29681       |19574         |19575       |
-ROW   |29682       |19576         |19575       |
-ROW   |29683       |19578         |19577       |
-ROW   |29684       |19601         |19600       |
-ROW   |29685       |19605         |19604       |
-ROW   |29686       |19609         |19608       |
-ROW   |29687       |19611         |19610       |
-ROW   |29688       |19612         |19610       |
-ROW   |29689       |19612         |19611       |
-ROW   |29690       |19614         |19613       |
-ROW   |29691       |19616         |19615       |
-ROW   |29692       |19618         |19617       |
-ROW   |29693       |19620         |19621       |
-ROW   |29694       |19622         |19621       |
-ROW   |29695       |19624         |19623       |
-ROW   |29696       |19647         |19646       |
-ROW   |29697       |16440         |16439       |
-ROW   |29698       |18003         |15790       |
-ROW   |29699       |18004         |15787       |
-ROW   |29700       |18005         |15787       |
-ROW   |29701       |18005         |18004       |
-ROW   |29702       |15786         |15785       |
-ROW   |29703       |15784         |15783       |
-ROW   |29704       |15794         |15792       |
-ROW   |29705       |15793         |15792       |
-ROW   |29706       |15782         |15781       |
-ROW   |29707       |15797         |15796       |
-ROW   |29708       |15825         |15824       |
-ROW   |29709       |15826         |15824       |
-ROW   |29710       |15826         |15825       |
-ROW   |29711       |15828         |15829       |
-ROW   |29712       |15831         |15832       |
-ROW   |29713       |15834         |15835       |
-ROW   |29714       |15845         |15846       |
-ROW   |29715       |17223         |17227       |
-ROW   |29716       |17226         |17227       |
+ROW   |29717       |17412         |17411       |
+ROW   |29718       |17414         |17413       |
+ROW   |29719       |17416         |17415       |
+ROW   |29720       |15944         |15947       |
+ROW   |29721       |15944         |15943       |
+ROW   |29722       |15943         |15947       |
+ROW   |29723       |16888         |15947       |
+ROW   |29724       |16888         |15943       |
+ROW   |29725       |15948         |15949       |
+ROW   |29726       |15950         |15949       |
+ROW   |29727       |17429         |17428       |
+ROW   |29728       |17431         |17430       |
+ROW   |29729       |17433         |17432       |
+ROW   |29730       |17355         |17354       |
+ROW   |29731       |17358         |17357       |
+ROW   |29732       |18960         |18962       |
+ROW   |29733       |16743         |16744       |
+ROW   |29734       |16784         |16785       |
+ROW   |29735       |16790         |16791       |
+ROW   |29736       |16892         |16900       |
+ROW   |29737       |16894         |16900       |
+ROW   |29738       |17459         |17458       |
+ROW   |29739       |17463         |17458       |
+ROW   |29740       |17471         |17480       |
+ROW   |29741       |17476         |17481       |
+ROW   |29742       |17478         |17480       |
+ROW   |29743       |17479         |17481       |
+ROW   |29744       |17483         |17482       |
+ROW   |29745       |17486         |17485       |
+ROW   |29746       |16646         |16647       |
+ROW   |29747       |18965         |16660       |
+ROW   |29748       |16809         |16810       |
+ROW   |29749       |18966         |16677       |
+ROW   |29750       |16902         |16904       |
+ROW   |29751       |16904         |16905       |
+ROW   |29752       |16909         |16906       |
+ROW   |29753       |16910         |16912       |
+ROW   |29754       |16912         |16913       |
+ROW   |29755       |16917         |16914       |
+ROW   |29756       |17962         |17963       |
+ROW   |29757       |17962         |17958       |
+ROW   |29758       |16752         |16753       |
+ROW   |29759       |15955         |15957       |
+ROW   |29760       |15955         |15954       |
+ROW   |29761       |15954         |15957       |
+ROW   |29762       |15956         |15957       |
+ROW   |29763       |15956         |15954       |
+ROW   |29764       |16678         |15957       |
+ROW   |29765       |16678         |15954       |
+ROW   |29766       |15961         |15960       |
+ROW   |29767       |15962         |15960       |
+ROW   |29768       |16679         |15960       |
+ROW   |29769       |17090         |17096       |
+ROW   |29770       |17093         |17096       |
+ROW   |29771       |17101         |17098       |
+ROW   |29772       |16257         |16255       |
+ROW   |29773       |16257         |16256       |
+ROW   |29774       |16256         |16255       |
+ROW   |29775       |16251         |16255       |
+ROW   |29776       |16251         |16256       |
+ROW   |29777       |16443         |16255       |
+ROW   |29778       |16443         |16256       |
+ROW   |29779       |16270         |16269       |
+ROW   |29780       |16448         |16269       |
+ROW   |29781       |16265         |16269       |
+ROW   |29782       |17503         |17505       |
+ROW   |29783       |17512         |17511       |
+ROW   |29784       |17513         |17505       |
+ROW   |29790       |17516         |17518       |
+ROW   |29791       |17517         |17516       |
+ROW   |29792       |17517         |17518       |
+ROW   |29793       |17517         |17519       |
+ROW   |29794       |17519         |17518       |
+ROW   |29795       |18918         |18917       |
+ROW   |29796       |17973         |17965       |
+ROW   |29797       |17974         |17966       |
+ROW   |29798       |17141         |17151       |
+ROW   |29799       |17142         |17141       |
+ROW   |29800       |17142         |17151       |
+ROW   |29801       |17143         |17151       |
+ROW   |29802       |17144         |17143       |
+ROW   |29803       |17144         |17151       |
+ROW   |29804       |17146         |17145       |
+ROW   |29805       |17147         |17151       |
+ROW   |29806       |17148         |17147       |
+ROW   |29807       |17148         |17151       |
+ROW   |29808       |17150         |17149       |
+ROW   |29809       |17152         |17168       |
+ROW   |29810       |17153         |17152       |
+ROW   |29811       |17153         |17168       |
+ROW   |29812       |17154         |17168       |
+ROW   |29813       |17155         |17154       |
+ROW   |29814       |17155         |17168       |
+ROW   |29815       |17156         |17168       |
+ROW   |29816       |17157         |17156       |
+ROW   |29817       |17157         |17168       |
+ROW   |29818       |17158         |17168       |
+ROW   |29819       |17159         |17158       |
+ROW   |29820       |17159         |17168       |
+ROW   |29821       |17160         |17168       |
+ROW   |29822       |17161         |17160       |
+ROW   |29823       |17161         |17168       |
+ROW   |29824       |17163         |17162       |
+ROW   |29825       |17164         |17168       |
+ROW   |29826       |17165         |17164       |
+ROW   |29827       |17165         |17168       |
+ROW   |29828       |17166         |17168       |
+ROW   |29829       |17167         |17166       |
+ROW   |29830       |17167         |17168       |
+ROW   |29831       |17169         |17168       |
+ROW   |29832       |17170         |17168       |
+ROW   |29833       |17170         |17169       |
+ROW   |29834       |17171         |17168       |
+ROW   |29835       |17172         |17168       |
+ROW   |29836       |17172         |17171       |
+ROW   |29837       |17540         |17541       |
+ROW   |29838       |16833         |16920       |
+ROW   |29839       |16920         |16921       |
+ROW   |29840       |18987         |18986       |
+ROW   |29841       |18989         |18988       |
+ROW   |29842       |18993         |18992       |
+ROW   |29843       |18994         |18992       |
+ROW   |29844       |19009         |19010       |
+ROW   |29845       |17978         |17977       |
+ROW   |29846       |17980         |17979       |
+ROW   |29847       |17984         |17983       |
+ROW   |29848       |17985         |17983       |
+ROW   |29849       |18000         |18001       |
+ROW   |29850       |18225         |18224       |
+ROW   |29851       |18237         |18236       |
+ROW   |29852       |16929         |16928       |
+ROW   |29853       |16940         |17084       |
+ROW   |29854       |18537         |18536       |
+ROW   |29855       |18539         |18538       |
+ROW   |29856       |18541         |18540       |
+ROW   |29857       |16719         |16721       |
+ROW   |29858       |16975         |16723       |
+ROW   |29859       |16729         |16728       |
+ROW   |29860       |16730         |16728       |
+ROW   |29861       |16756         |16758       |
+ROW   |29862       |16979         |16759       |
+ROW   |29863       |16765         |16764       |
+ROW   |29864       |16766         |16764       |
+ROW   |29865       |16734         |16736       |
+ROW   |29866       |16983         |16732       |
+ROW   |29867       |16741         |16740       |
+ROW   |29868       |16742         |16740       |
+ROW   |29869       |17192         |17191       |
+ROW   |29870       |17194         |17195       |
+ROW   |29871       |17199         |17198       |
+ROW   |29872       |17546         |17545       |
+ROW   |29873       |17547         |17548       |
+ROW   |29874       |16997         |16984       |
+ROW   |29875       |17002         |17003       |
+ROW   |29876       |17006         |17005       |
+ROW   |29877       |17011         |17010       |
+ROW   |29878       |17550         |17549       |
+ROW   |29879       |17551         |17552       |
+ROW   |29880       |17391         |17396       |
+ROW   |29881       |17395         |17396       |
+ROW   |29882       |16683         |16687       |
+ROW   |29883       |14252         |14251       |
+ROW   |29884       |14294         |14293       |
+ROW   |29885       |14312         |14311       |
+ROW   |29886       |14328         |14327       |
+ROW   |29887       |14348         |14347       |
+ROW   |29888       |14357         |14356       |
+ROW   |29889       |14390         |14389       |
+ROW   |29890       |14404         |14403       |
+ROW   |29891       |14452         |14451       |
+ROW   |29892       |14469         |14468       |
+ROW   |29893       |14487         |14486       |
+ROW   |29894       |14506         |14505       |
+ROW   |29895       |14535         |14534       |
+ROW   |29896       |14545         |14544       |
+ROW   |29897       |14583         |14582       |
+ROW   |29898       |14599         |14598       |
+ROW   |29899       |14616         |14615       |
+ROW   |29900       |14653         |14652       |
+ROW   |29901       |14674         |14673       |
+ROW   |29902       |14692         |14691       |
+ROW   |29903       |14705         |14704       |
+ROW   |29904       |14718         |14717       |
+ROW   |29905       |14907         |14906       |
+ROW   |29906       |15221         |15220       |
+ROW   |29907       |15702         |15701       |
+ROW   |29908       |15724         |15723       |
+ROW   |29909       |15756         |15755       |
+ROW   |29910       |15820         |15819       |
+ROW   |29911       |15841         |15840       |
+ROW   |29912       |15991         |15990       |
+ROW   |29913       |16018         |16017       |
+ROW   |29914       |16454         |16453       |
+ROW   |29915       |17924         |17923       |
+ROW   |29916       |18178         |18177       |
+ROW   |29917       |14253         |14252       |
+ROW   |29918       |14295         |14294       |
+ROW   |29919       |14313         |14312       |
+ROW   |29920       |14329         |14328       |
+ROW   |29921       |14349         |14348       |
+ROW   |29922       |14358         |14357       |
+ROW   |29923       |14391         |14390       |
+ROW   |29924       |14405         |14404       |
+ROW   |29925       |14453         |14452       |
+ROW   |29926       |14470         |14469       |
+ROW   |29927       |14488         |14487       |
+ROW   |29928       |14507         |14506       |
+ROW   |29929       |14536         |14535       |
+ROW   |29930       |14546         |14545       |
+ROW   |29931       |14584         |14583       |
+ROW   |29932       |14600         |14599       |
+ROW   |29933       |14617         |14616       |
+ROW   |29934       |14654         |14653       |
+ROW   |29935       |14675         |14674       |
+ROW   |29936       |14693         |14692       |
+ROW   |29937       |14706         |14705       |
+ROW   |29938       |14719         |14718       |
+ROW   |29939       |14908         |14907       |
+ROW   |29940       |15222         |15221       |
+ROW   |29941       |15703         |15702       |
+ROW   |29942       |15725         |15724       |
+ROW   |29943       |15757         |15756       |
+ROW   |29944       |15821         |15820       |
+ROW   |29945       |15842         |15841       |
+ROW   |29946       |15992         |15991       |
+ROW   |29947       |16019         |16018       |
+ROW   |29948       |16455         |16454       |
+ROW   |29949       |17925         |17924       |
+ROW   |29950       |18179         |18178       |
+ROW   |29951       |14253         |14251       |
+ROW   |29952       |14295         |14293       |
+ROW   |29953       |14313         |14311       |
+ROW   |29954       |14329         |14327       |
+ROW   |29955       |14349         |14347       |
+ROW   |29956       |14358         |14356       |
+ROW   |29957       |14391         |14389       |
+ROW   |29958       |14405         |14403       |
+ROW   |29959       |14453         |14451       |
+ROW   |29960       |14470         |14468       |
+ROW   |29961       |14488         |14486       |
+ROW   |29962       |14507         |14505       |
+ROW   |29963       |14536         |14534       |
+ROW   |29964       |14546         |14544       |
+ROW   |29965       |14584         |14582       |
+ROW   |29966       |14600         |14598       |
+ROW   |29967       |14617         |14615       |
+ROW   |29968       |14654         |14652       |
+ROW   |29969       |14675         |14673       |
+ROW   |29970       |14693         |14691       |
+ROW   |29971       |14706         |14704       |
+ROW   |29972       |14719         |14717       |
+ROW   |29973       |14908         |14906       |
+ROW   |29974       |15222         |15220       |
+ROW   |29975       |15703         |15701       |
+ROW   |29976       |15725         |15723       |
+ROW   |29977       |15757         |15755       |
+ROW   |29978       |15821         |15819       |
+ROW   |29979       |15842         |15840       |
+ROW   |29980       |15992         |15990       |
+ROW   |29981       |16019         |16017       |
+ROW   |29982       |16455         |16453       |
+ROW   |29983       |17925         |17923       |
+ROW   |29984       |18179         |18177       |
+ROW   |29985       |16287         |16289       |
+ROW   |29986       |16279         |16285       |
+ROW   |29987       |16290         |16348       |
+ROW   |29988       |16291         |16349       |
+ROW   |29989       |16292         |16350       |
+ROW   |29990       |16293         |16351       |
+ROW   |29991       |16294         |16352       |
+ROW   |29992       |16295         |16353       |
+ROW   |29993       |16296         |16354       |
+ROW   |29994       |16297         |16355       |
+ROW   |29995       |16298         |16356       |
+ROW   |29996       |16299         |16357       |
+ROW   |29997       |16300         |16358       |
+ROW   |29998       |16301         |16359       |
+ROW   |29999       |16302         |16360       |
+ROW   |30000       |16303         |16361       |
+ROW   |30001       |16304         |16362       |
+ROW   |30002       |16305         |16363       |
+ROW   |30003       |16306         |16364       |
+ROW   |30004       |16307         |16365       |
+ROW   |30005       |16308         |16366       |
+ROW   |30006       |16309         |16367       |
+ROW   |30007       |16311         |16369       |
+ROW   |30008       |16312         |16370       |
+ROW   |30009       |16313         |16371       |
+ROW   |30010       |16314         |16372       |
+ROW   |30011       |16315         |16373       |
+ROW   |30012       |16316         |16374       |
+ROW   |30013       |16317         |16375       |
+ROW   |30014       |16318         |16376       |
+ROW   |30015       |16457         |16458       |
+ROW   |30016       |17927         |17928       |
+ROW   |30017       |18181         |18182       |
+ROW   |30018       |16289         |14293       |
+ROW   |30019       |16285         |14717       |
+ROW   |30020       |16348         |14311       |
+ROW   |30021       |16349         |14327       |
+ROW   |30022       |16350         |14347       |
+ROW   |30023       |16351         |14356       |
+ROW   |30024       |16352         |14389       |
+ROW   |30025       |16353         |14403       |
+ROW   |30026       |16354         |14451       |
+ROW   |30027       |16355         |14468       |
+ROW   |30028       |16356         |14486       |
+ROW   |30029       |16357         |14505       |
+ROW   |30030       |16358         |14534       |
+ROW   |30031       |16359         |14544       |
+ROW   |30032       |16360         |14582       |
+ROW   |30033       |16361         |14598       |
+ROW   |30034       |16362         |14615       |
+ROW   |30035       |16363         |14652       |
+ROW   |30036       |16364         |14673       |
+ROW   |30037       |16365         |14691       |
+ROW   |30038       |16366         |14704       |
+ROW   |30039       |16367         |14906       |
+ROW   |30040       |16369         |15220       |
+ROW   |30041       |16370         |15701       |
+ROW   |30042       |16371         |15723       |
+ROW   |30043       |16372         |15755       |
+ROW   |30044       |16373         |15819       |
+ROW   |30045       |16374         |15840       |
+ROW   |30046       |16375         |15990       |
+ROW   |30047       |16376         |16017       |
+ROW   |30048       |16458         |16453       |
+ROW   |30049       |17928         |17923       |
+ROW   |30050       |18182         |18177       |
+ROW   |30051       |16631         |16630       |
+ROW   |30052       |16640         |16636       |
+ROW   |30053       |16642         |16638       |
+ROW   |30054       |16643         |16639       |
+ROW   |30055       |15695         |16863       |
+ROW   |30056       |18242         |16863       |
+ROW   |30057       |18243         |16863       |
+ROW   |30058       |15694         |16868       |
+ROW   |30059       |15696         |16864       |
+ROW   |30060       |15697         |16865       |
+ROW   |30061       |18244         |16864       |
+ROW   |30062       |18245         |16865       |
+ROW   |30063       |18246         |16868       |
+ROW   |30064       |18247         |16864       |
+ROW   |30065       |18248         |16865       |
+ROW   |30066       |18249         |16868       |
+ROW   |30067       |15671         |16841       |
+ROW   |30068       |18250         |16841       |
+ROW   |30069       |18251         |16841       |
+ROW   |30070       |15672         |16842       |
+ROW   |30071       |15673         |16843       |
+ROW   |30072       |15674         |16844       |
+ROW   |30073       |15675         |16845       |
+ROW   |30074       |15676         |16846       |
+ROW   |30075       |15677         |16847       |
+ROW   |30076       |15678         |16848       |
+ROW   |30077       |15679         |16849       |
+ROW   |30078       |15680         |16850       |
+ROW   |30079       |15681         |16851       |
+ROW   |30080       |15682         |16852       |
+ROW   |30081       |15683         |16853       |
+ROW   |30082       |15684         |16854       |
+ROW   |30083       |15685         |16855       |
+ROW   |30084       |15686         |16856       |
+ROW   |30085       |15687         |16857       |
+ROW   |30086       |15689         |16858       |
+ROW   |30087       |15691         |16860       |
+ROW   |30088       |15708         |16861       |
+ROW   |30089       |15997         |16862       |
+ROW   |30090       |18252         |16842       |
+ROW   |30091       |18253         |16843       |
+ROW   |30092       |18254         |16844       |
+ROW   |30093       |18255         |16845       |
+ROW   |30094       |18256         |16846       |
+ROW   |30095       |18257         |16847       |
+ROW   |30096       |18258         |16848       |
+ROW   |30097       |18259         |16849       |
+ROW   |30098       |18260         |16850       |
+ROW   |30099       |18261         |16851       |
+ROW   |30100       |18262         |16852       |
+ROW   |30101       |18263         |16853       |
+ROW   |30102       |18264         |16854       |
+ROW   |30103       |18265         |16855       |
+ROW   |30104       |18266         |16856       |
+ROW   |30105       |18267         |16857       |
+ROW   |30106       |18268         |16858       |
+ROW   |30107       |18270         |16860       |
+ROW   |30108       |18271         |16861       |
+ROW   |30109       |18272         |16862       |
+ROW   |30110       |18273         |16842       |
+ROW   |30111       |18274         |16843       |
+ROW   |30112       |18275         |16844       |
+ROW   |30113       |18276         |16845       |
+ROW   |30114       |18277         |16846       |
+ROW   |30115       |18278         |16847       |
+ROW   |30116       |18279         |16848       |
+ROW   |30117       |18280         |16849       |
+ROW   |30118       |18281         |16850       |
+ROW   |30119       |18282         |16851       |
+ROW   |30120       |18283         |16852       |
+ROW   |30121       |18284         |16853       |
+ROW   |30122       |18285         |16854       |
+ROW   |30123       |18286         |16855       |
+ROW   |30124       |18287         |16856       |
+ROW   |30125       |18288         |16857       |
+ROW   |30126       |18289         |16858       |
+ROW   |30127       |18291         |16860       |
+ROW   |30128       |18292         |16861       |
+ROW   |30129       |18293         |16862       |
+ROW   |30130       |15698         |16866       |
+ROW   |30131       |18294         |16866       |
+ROW   |30132       |18295         |16866       |
+ROW   |30133       |16028         |16867       |
+ROW   |30134       |18296         |16867       |
+ROW   |30135       |18297         |16867       |
+ROW   |30136       |18100         |18099       |
+ROW   |30137       |18106         |18105       |
+ROW   |30138       |14318         |14319       |
+ROW   |30139       |17554         |15717       |
+ROW   |30140       |17555         |15717       |
+ROW   |30141       |17555         |17554       |
+ROW   |30142       |17556         |15717       |
+ROW   |30143       |17557         |15717       |
+ROW   |30144       |17557         |17556       |
+ROW   |30145       |17559         |17558       |
+ROW   |30146       |17561         |17560       |
+ROW   |30147       |17563         |17562       |
+ROW   |30148       |17565         |17564       |
+ROW   |30149       |15721         |15720       |
+ROW   |30150       |15394         |15393       |
+ROW   |30151       |15392         |15391       |
+ROW   |30152       |17322         |14339       |
+ROW   |30153       |15382         |15381       |
+ROW   |30154       |15380         |15379       |
+ROW   |30155       |16504         |16505       |
+ROW   |30156       |14372         |14373       |
+ROW   |30157       |15386         |15385       |
+ROW   |30158       |15384         |15383       |
+ROW   |30159       |14380         |14381       |
+ROW   |30160       |18299         |18298       |
+ROW   |30161       |18300         |18299       |
+ROW   |30162       |18300         |18298       |
+ROW   |30163       |18303         |18302       |
+ROW   |30164       |18309         |18308       |
+ROW   |30165       |18311         |18316       |
+ROW   |30166       |18312         |18316       |
+ROW   |30167       |18313         |18316       |
+ROW   |30168       |18314         |18316       |
+ROW   |30169       |18315         |18316       |
+ROW   |30170       |18319         |18318       |
+ROW   |30171       |18321         |18320       |
+ROW   |30172       |18323         |18322       |
+ROW   |30173       |18326         |18325       |
+ROW   |30174       |18327         |18326       |
+ROW   |30175       |18327         |18325       |
+ROW   |30176       |18330         |18329       |
+ROW   |30177       |18336         |18335       |
+ROW   |30178       |18338         |18343       |
+ROW   |30179       |18339         |18343       |
+ROW   |30180       |18340         |18343       |
+ROW   |30181       |18341         |18343       |
+ROW   |30182       |18342         |18343       |
+ROW   |30183       |18346         |18345       |
+ROW   |30184       |18348         |18347       |
+ROW   |30185       |18350         |18349       |
+ROW   |30186       |18353         |18352       |
+ROW   |30187       |18354         |18353       |
+ROW   |30188       |18354         |18352       |
+ROW   |30189       |18357         |18356       |
+ROW   |30190       |18363         |18362       |
+ROW   |30191       |18365         |18370       |
+ROW   |30192       |18366         |18370       |
+ROW   |30193       |18367         |18370       |
+ROW   |30194       |18368         |18370       |
+ROW   |30195       |18369         |18370       |
+ROW   |30196       |18373         |18372       |
+ROW   |30197       |18375         |18374       |
+ROW   |30198       |18377         |18376       |
+ROW   |30199       |18380         |18379       |
+ROW   |30200       |18381         |18380       |
+ROW   |30201       |18381         |18379       |
+ROW   |30202       |18384         |18383       |
+ROW   |30203       |18390         |18389       |
+ROW   |30204       |18392         |18397       |
+ROW   |30205       |18393         |18397       |
+ROW   |30206       |18394         |18397       |
+ROW   |30207       |18395         |18397       |
+ROW   |30208       |18396         |18397       |
+ROW   |30209       |18400         |18399       |
+ROW   |30210       |18402         |18401       |
+ROW   |30211       |18404         |18403       |
+ROW   |30212       |18407         |18406       |
+ROW   |30213       |18408         |18407       |
+ROW   |30214       |18408         |18406       |
+ROW   |30215       |18411         |18410       |
+ROW   |30216       |18417         |18416       |
+ROW   |30217       |18419         |18424       |
+ROW   |30218       |18420         |18424       |
+ROW   |30219       |18421         |18424       |
+ROW   |30220       |18422         |18424       |
+ROW   |30221       |18423         |18424       |
+ROW   |30222       |18427         |18426       |
+ROW   |30223       |18429         |18428       |
+ROW   |30224       |18431         |18430       |
+ROW   |30225       |15347         |15346       |
+ROW   |30226       |15345         |15344       |
+ROW   |30227       |17567         |17566       |
+ROW   |30228       |15363         |15360       |
+ROW   |30229       |15364         |15361       |
+ROW   |30230       |15365         |15362       |
+ROW   |30231       |15357         |15354       |
+ROW   |30232       |15358         |15355       |
+ROW   |30233       |15359         |15356       |
+ROW   |30234       |17571         |17568       |
+ROW   |30235       |17572         |17569       |
+ROW   |30236       |17573         |17570       |
+ROW   |30237       |15334         |15333       |
+ROW   |30238       |15332         |15331       |
+ROW   |30239       |14460         |14461       |
+ROW   |30240       |14476         |14477       |
+ROW   |30241       |14495         |14496       |
+ROW   |30242       |14511         |17574       |
+ROW   |30243       |14551         |14552       |
+ROW   |30244       |15374         |15373       |
+ROW   |30245       |15376         |15375       |
+ROW   |30246       |14914         |14915       |
+ROW   |30247       |14589         |14590       |
+ROW   |30248       |15338         |15337       |
+ROW   |30249       |17333         |17332       |
+ROW   |30250       |14624         |14625       |
+ROW   |30251       |18434         |18433       |
+ROW   |30252       |18435         |18434       |
+ROW   |30253       |18435         |18433       |
+ROW   |30254       |18438         |18439       |
+ROW   |30255       |18439         |18433       |
+ROW   |30256       |18441         |18444       |
+ROW   |30257       |18442         |18444       |
+ROW   |30258       |18443         |18444       |
+ROW   |30259       |18446         |18447       |
+ROW   |30260       |18450         |18449       |
+ROW   |30261       |14664         |14665       |
+ROW   |30262       |17085         |17086       |
+ROW   |30263       |16547         |16546       |
+ROW   |30264       |17576         |17575       |
+ROW   |30265       |17578         |17577       |
+ROW   |30266       |17628         |17626       |
+ROW   |30267       |17629         |17627       |
+ROW   |30268       |17632         |17630       |
+ROW   |30269       |17633         |17631       |
+ROW   |30270       |17635         |17634       |
+ROW   |30271       |17637         |17636       |
+ROW   |30272       |17686         |17684       |
+ROW   |30273       |17687         |17685       |
+ROW   |30274       |17690         |17688       |
+ROW   |30275       |17691         |17689       |
+ROW   |30276       |17693         |17692       |
+ROW   |30277       |17695         |17694       |
+ROW   |30278       |17730         |17728       |
+ROW   |30279       |17731         |17729       |
+ROW   |30280       |17734         |17732       |
+ROW   |30281       |17735         |17733       |
+ROW   |30282       |17737         |17736       |
+ROW   |30283       |17754         |17752       |
+ROW   |30284       |17755         |17753       |
+ROW   |30285       |17757         |17756       |
+ROW   |30286       |17819         |17817       |
+ROW   |30287       |17820         |17818       |
+ROW   |30288       |17823         |17821       |
+ROW   |30289       |17824         |17822       |
+ROW   |30290       |17826         |17825       |
+ROW   |30291       |17860         |17858       |
+ROW   |30292       |17861         |17859       |
+ROW   |30293       |17864         |17862       |
+ROW   |30294       |17865         |17863       |
+ROW   |30295       |17899         |17897       |
+ROW   |30296       |17900         |17898       |
+ROW   |30297       |17903         |17901       |
+ROW   |30298       |17904         |17902       |
+ROW   |30299       |17906         |17905       |
+ROW   |30300       |17908         |17907       |
+ROW   |30301       |17910         |17909       |
+ROW   |30302       |16551         |16552       |
+ROW   |30303       |16031         |16563       |
+ROW   |30304       |16045         |16564       |
+ROW   |30305       |16046         |16565       |
+ROW   |30306       |16039         |16040       |
+ROW   |30307       |16061         |16063       |
+ROW   |30308       |16062         |16064       |
+ROW   |30309       |16042         |16579       |
+ROW   |30310       |16067         |16580       |
+ROW   |30311       |16068         |16581       |
+ROW   |30312       |16041         |16042       |
+ROW   |30313       |16065         |16067       |
+ROW   |30314       |16066         |16068       |
+ROW   |30315       |16041         |16579       |
+ROW   |30316       |16065         |16580       |
+ROW   |30317       |16066         |16581       |
+ROW   |30318       |18132         |18452       |
+ROW   |30319       |18135         |18453       |
+ROW   |30320       |18138         |18454       |
+ROW   |30321       |18130         |18132       |
+ROW   |30322       |18133         |18135       |
+ROW   |30323       |18136         |18138       |
+ROW   |30324       |18130         |18452       |
+ROW   |30325       |18133         |18453       |
+ROW   |30326       |18136         |18454       |
+ROW   |30327       |16070         |16069       |
+ROW   |30328       |16072         |16071       |
+ROW   |30329       |16076         |17024       |
+ROW   |30330       |18455         |17024       |
+ROW   |30331       |16079         |16077       |
+ROW   |30332       |16080         |16078       |
+ROW   |30333       |16083         |16081       |
+ROW   |30334       |16084         |16082       |
+ROW   |30335       |16091         |17026       |
+ROW   |30336       |16092         |17028       |
+ROW   |30337       |18456         |17026       |
+ROW   |30338       |18457         |17028       |
+ROW   |30339       |17244         |17243       |
+ROW   |30340       |17257         |17256       |
+ROW   |30341       |17246         |17240       |
+ROW   |30342       |17259         |17253       |
+ROW   |30343       |17249         |17247       |
+ROW   |30344       |17262         |17260       |
+ROW   |30345       |17251         |17249       |
+ROW   |30346       |17264         |17262       |
+ROW   |30347       |17251         |17247       |
+ROW   |30348       |17264         |17260       |
+ROW   |30349       |18144         |18458       |
+ROW   |30350       |18147         |18459       |
+ROW   |30351       |18142         |18144       |
+ROW   |30352       |18145         |18147       |
+ROW   |30353       |18142         |18458       |
+ROW   |30354       |18145         |18459       |
+ROW   |30355       |17268         |17267       |
+ROW   |30356       |17270         |17269       |
+ROW   |30357       |17271         |17273       |
+ROW   |30358       |18460         |17273       |
+ROW   |30359       |17276         |17275       |
+ROW   |30360       |17278         |17277       |
+ROW   |30361       |17279         |17281       |
+ROW   |30362       |18461         |17281       |
+ROW   |30363       |16141         |16142       |
+ROW   |30364       |16146         |16573       |
+ROW   |30365       |16143         |16584       |
+ROW   |30366       |18152         |18462       |
+ROW   |30367       |18150         |18152       |
+ROW   |30368       |18150         |18462       |
+ROW   |30369       |16152         |16883       |
+ROW   |30370       |16153         |16883       |
+ROW   |30371       |18463         |16883       |
+ROW   |30372       |18464         |16883       |
+ROW   |30373       |16156         |16155       |
+ROW   |30374       |16158         |16157       |
+ROW   |30375       |18157         |18156       |
+ROW   |30376       |18160         |18159       |
+ROW   |30377       |18155         |18157       |
+ROW   |30378       |18158         |18160       |
+ROW   |30379       |18155         |18156       |
+ROW   |30380       |18158         |18159       |
+ROW   |30381       |16009         |16008       |
+ROW   |30382       |16011         |16010       |
+ROW   |30383       |16014         |16013       |
+ROW   |30384       |16016         |16015       |
+ROW   |30385       |16161         |16160       |
+ROW   |30386       |16172         |16171       |
+ROW   |30387       |16162         |16161       |
+ROW   |30388       |16173         |16172       |
+ROW   |30389       |16162         |16160       |
+ROW   |30390       |16173         |16171       |
+ROW   |30391       |16166         |18162       |
+ROW   |30392       |16177         |18164       |
+ROW   |30393       |16167         |18162       |
+ROW   |30394       |16178         |18164       |
+ROW   |30395       |17035         |16160       |
+ROW   |30396       |17037         |16171       |
+ROW   |30397       |18161         |18162       |
+ROW   |30398       |18163         |18164       |
+ROW   |30399       |16183         |16182       |
+ROW   |30400       |17911         |17042       |
+ROW   |30401       |18465         |17042       |
+ROW   |30402       |18466         |17042       |
+ROW   |30403       |17043         |17912       |
+ROW   |30404       |17043         |17913       |
+ROW   |30405       |16190         |16189       |
+ROW   |30406       |17914         |17047       |
+ROW   |30407       |18467         |17047       |
+ROW   |30408       |18468         |17047       |
+ROW   |30409       |17048         |17915       |
+ROW   |30410       |17048         |17916       |
+ROW   |30411       |17285         |17287       |
+ROW   |30412       |17296         |17298       |
+ROW   |30413       |17286         |17285       |
+ROW   |30414       |17297         |17296       |
+ROW   |30415       |17286         |17287       |
+ROW   |30416       |17297         |17298       |
+ROW   |30417       |17291         |18170       |
+ROW   |30418       |17302         |18172       |
+ROW   |30419       |17292         |18170       |
+ROW   |30420       |17303         |18172       |
+ROW   |30421       |17283         |17287       |
+ROW   |30422       |17294         |17298       |
+ROW   |30423       |18169         |18170       |
+ROW   |30424       |18171         |18172       |
+ROW   |30425       |17306         |17305       |
+ROW   |30426       |17917         |17310       |
+ROW   |30427       |18469         |17310       |
+ROW   |30428       |18470         |17310       |
+ROW   |30429       |17311         |17918       |
+ROW   |30430       |17311         |17919       |
+ROW   |30431       |17314         |17313       |
+ROW   |30432       |17920         |17318       |
+ROW   |30433       |18471         |17318       |
+ROW   |30434       |18472         |17318       |
+ROW   |30435       |17319         |17921       |
+ROW   |30436       |17319         |17922       |
+ROW   |30437       |18596         |18597       |
+ROW   |30438       |18629         |18630       |
+ROW   |30439       |18662         |18663       |
+ROW   |30440       |18695         |18696       |
+ROW   |30441       |18728         |18729       |
+ROW   |30442       |18947         |18948       |
+ROW   |30443       |18794         |18795       |
+ROW   |30444       |18495         |18496       |
+ROW   |30445       |18831         |18832       |
+ROW   |30446       |18864         |18865       |
+ROW   |30447       |18897         |18898       |
+ROW   |30448       |16772         |16773       |
+ROW   |30449       |16771         |16772       |
+ROW   |30450       |16771         |16773       |
+ROW   |30451       |16769         |16770       |
+ROW   |30452       |16768         |16769       |
+ROW   |30453       |16768         |16770       |
+ROW   |30454       |19230         |19231       |
+ROW   |30455       |19233         |19232       |
+ROW   |30456       |19235         |19234       |
+ROW   |30457       |19236         |19234       |
+ROW   |30458       |19236         |19235       |
+ROW   |30459       |19238         |19237       |
+ROW   |30460       |19239         |19240       |
+ROW   |30461       |19242         |19243       |
+ROW   |30462       |19245         |19244       |
+ROW   |30463       |19247         |19246       |
+ROW   |30464       |19249         |19250       |
+ROW   |30465       |19249         |19252       |
+ROW   |30466       |19249         |19248       |
+ROW   |30467       |19249         |19254       |
+ROW   |30468       |19251         |19250       |
+ROW   |30469       |19251         |19252       |
+ROW   |30470       |19251         |19248       |
+ROW   |30471       |19251         |19254       |
+ROW   |30472       |19253         |19250       |
+ROW   |30473       |19253         |19252       |
+ROW   |30474       |19253         |19248       |
+ROW   |30475       |19253         |19254       |
+ROW   |30476       |19255         |19250       |
+ROW   |30477       |19255         |19252       |
+ROW   |30478       |19255         |19248       |
+ROW   |30479       |19255         |19254       |
+ROW   |30480       |19258         |19257       |
+ROW   |30481       |16488         |16487       |
+ROW   |30482       |16485         |16484       |
+ROW   |30483       |16486         |16484       |
+ROW   |30484       |16486         |16485       |
+ROW   |30485       |16480         |16479       |
+ROW   |30486       |16482         |16481       |
+ROW   |30487       |16475         |16474       |
+ROW   |30488       |16471         |16472       |
+ROW   |30489       |16468         |16469       |
+ROW   |30490       |16459         |16460       |
+ROW   |30491       |16462         |16463       |
+ROW   |30492       |16465         |16466       |
+ROW   |30493       |16477         |16476       |
+ROW   |30494       |19263         |19262       |
+ROW   |30495       |19266         |19265       |
+ROW   |30496       |19268         |19267       |
+ROW   |30497       |19270         |19269       |
+ROW   |30498       |19272         |19271       |
+ROW   |30499       |19276         |19275       |
+ROW   |30500       |19278         |19277       |
+ROW   |30501       |19280         |19279       |
+ROW   |30502       |19282         |19281       |
+ROW   |30503       |19288         |19287       |
+ROW   |30504       |19293         |19292       |
+ROW   |30505       |19294         |19292       |
+ROW   |30506       |19294         |19293       |
+ROW   |30507       |19295         |19296       |
+ROW   |30508       |19297         |19295       |
+ROW   |30509       |19297         |19296       |
+ROW   |30510       |19299         |19298       |
+ROW   |30511       |19301         |19302       |
+ROW   |30512       |19303         |19302       |
+ROW   |30513       |19305         |19304       |
+ROW   |30514       |19307         |19306       |
+ROW   |30515       |19308         |19306       |
+ROW   |30516       |19308         |19307       |
+ROW   |30517       |19310         |19309       |
+ROW   |30518       |19314         |19313       |
+ROW   |30519       |19317         |19316       |
+ROW   |30520       |19319         |19318       |
+ROW   |30521       |19321         |19320       |
+ROW   |30522       |19323         |19322       |
+ROW   |30523       |19327         |19326       |
+ROW   |30524       |19329         |19328       |
+ROW   |30525       |19331         |19330       |
+ROW   |30526       |19333         |19332       |
+ROW   |30527       |19339         |19338       |
+ROW   |30528       |19344         |19343       |
+ROW   |30529       |19345         |19343       |
+ROW   |30530       |19345         |19344       |
+ROW   |30531       |19346         |19347       |
+ROW   |30532       |19348         |19346       |
+ROW   |30533       |19348         |19347       |
+ROW   |30534       |19350         |19349       |
+ROW   |30535       |19352         |19353       |
+ROW   |30536       |19354         |19353       |
+ROW   |30537       |19356         |19355       |
+ROW   |30538       |19358         |19357       |
+ROW   |30539       |19359         |19357       |
+ROW   |30540       |19359         |19358       |
+ROW   |30541       |19361         |19360       |
+ROW   |30542       |19365         |19364       |
+ROW   |30543       |19368         |19367       |
+ROW   |30544       |19370         |19369       |
+ROW   |30545       |19372         |19371       |
+ROW   |30546       |19374         |19373       |
+ROW   |30547       |19378         |19377       |
+ROW   |30548       |19380         |19379       |
+ROW   |30549       |19382         |19381       |
+ROW   |30550       |19384         |19383       |
+ROW   |30551       |19390         |19389       |
+ROW   |30552       |19395         |19394       |
+ROW   |30553       |19396         |19394       |
+ROW   |30554       |19396         |19395       |
+ROW   |30555       |19397         |19398       |
+ROW   |30556       |19399         |19397       |
+ROW   |30557       |19399         |19398       |
+ROW   |30558       |19401         |19400       |
+ROW   |30559       |19403         |19404       |
+ROW   |30560       |19405         |19404       |
+ROW   |30561       |19407         |19406       |
+ROW   |30562       |19409         |19408       |
+ROW   |30563       |19410         |19408       |
+ROW   |30564       |19410         |19409       |
+ROW   |30565       |19412         |19411       |
+ROW   |30566       |19416         |19415       |
+ROW   |30567       |19419         |19418       |
+ROW   |30568       |19421         |19420       |
+ROW   |30569       |19423         |19422       |
+ROW   |30570       |19425         |19424       |
+ROW   |30571       |19429         |19428       |
+ROW   |30572       |19431         |19430       |
+ROW   |30573       |19433         |19432       |
+ROW   |30574       |19435         |19434       |
+ROW   |30575       |19441         |19440       |
+ROW   |30576       |19446         |19445       |
+ROW   |30577       |19447         |19445       |
+ROW   |30578       |19447         |19446       |
+ROW   |30579       |19448         |19449       |
+ROW   |30580       |19450         |19448       |
+ROW   |30581       |19450         |19449       |
+ROW   |30582       |19452         |19451       |
+ROW   |30583       |19454         |19455       |
+ROW   |30584       |19456         |19455       |
+ROW   |30585       |19458         |19457       |
+ROW   |30586       |19460         |19459       |
+ROW   |30587       |19461         |19459       |
+ROW   |30588       |19461         |19460       |
+ROW   |30589       |19463         |19462       |
+ROW   |30590       |15729         |15728       |
+ROW   |30591       |15730         |15728       |
+ROW   |30592       |15730         |15729       |
+ROW   |30593       |15752         |15754       |
+ROW   |30594       |15753         |15754       |
+ROW   |30595       |15753         |15752       |
+ROW   |30596       |15742         |15741       |
+ROW   |30597       |15750         |15749       |
+ROW   |30598       |15751         |15750       |
+ROW   |30599       |15751         |15749       |
+ROW   |30600       |15746         |15743       |
+ROW   |30601       |15744         |15743       |
+ROW   |30602       |15740         |15739       |
+ROW   |30603       |17946         |17945       |
+ROW   |30604       |17948         |17947       |
+ROW   |30605       |15748         |15747       |
+ROW   |30606       |19467         |19466       |
+ROW   |30607       |19471         |19470       |
+ROW   |30608       |19473         |19472       |
+ROW   |30609       |19474         |19472       |
+ROW   |30610       |19474         |19473       |
+ROW   |30611       |19476         |19475       |
+ROW   |30612       |19478         |19477       |
+ROW   |30613       |19480         |19479       |
+ROW   |30614       |19482         |19483       |
+ROW   |30615       |19484         |19483       |
+ROW   |30616       |19486         |19485       |
+ROW   |30617       |19509         |19508       |
+ROW   |30618       |19513         |19512       |
+ROW   |30619       |19517         |19516       |
+ROW   |30620       |19519         |19518       |
+ROW   |30621       |19520         |19518       |
+ROW   |30622       |19520         |19519       |
+ROW   |30623       |19522         |19521       |
+ROW   |30624       |19524         |19523       |
+ROW   |30625       |19526         |19525       |
+ROW   |30626       |19528         |19529       |
+ROW   |30627       |19530         |19529       |
+ROW   |30628       |19532         |19531       |
+ROW   |30629       |19555         |19554       |
+ROW   |30630       |19559         |19558       |
+ROW   |30631       |19563         |19562       |
+ROW   |30632       |19565         |19564       |
+ROW   |30633       |19566         |19564       |
+ROW   |30634       |19566         |19565       |
+ROW   |30635       |19568         |19567       |
+ROW   |30636       |19570         |19569       |
+ROW   |30637       |19572         |19571       |
+ROW   |30638       |19574         |19575       |
+ROW   |30639       |19576         |19575       |
+ROW   |30640       |19578         |19577       |
+ROW   |30641       |19601         |19600       |
+ROW   |30642       |19605         |19604       |
+ROW   |30643       |19609         |19608       |
+ROW   |30644       |19611         |19610       |
+ROW   |30645       |19612         |19610       |
+ROW   |30646       |19612         |19611       |
+ROW   |30647       |19614         |19613       |
+ROW   |30648       |19616         |19615       |
+ROW   |30649       |19618         |19617       |
+ROW   |30650       |19620         |19621       |
+ROW   |30651       |19622         |19621       |
+ROW   |30652       |19624         |19623       |
+ROW   |30653       |19647         |19646       |
+ROW   |30654       |16440         |16439       |
+ROW   |30655       |18003         |15790       |
+ROW   |30656       |18004         |15787       |
+ROW   |30657       |18005         |15787       |
+ROW   |30658       |18005         |18004       |
+ROW   |30659       |15786         |15785       |
+ROW   |30660       |15784         |15783       |
+ROW   |30661       |15794         |15792       |
+ROW   |30662       |15793         |15792       |
+ROW   |30663       |15782         |15781       |
+ROW   |30664       |15797         |15796       |
+ROW   |30665       |15825         |15824       |
+ROW   |30666       |15826         |15824       |
+ROW   |30667       |15826         |15825       |
+ROW   |30668       |15828         |15829       |
+ROW   |30669       |15831         |15832       |
+ROW   |30670       |15834         |15835       |
+ROW   |30671       |15845         |15846       |
+ROW   |30672       |17223         |17227       |
+ROW   |30673       |17226         |17227       |
 
 TABLE |functions
 FIELDS|functionid|itemid|triggerid|name     |parameter                                                                    |
@@ -19010,6 +19044,13 @@ ROW   |25011     |36773 |19651    |nodata   |$,30m
 ROW   |25012     |36773 |19652    |last     |$                                                                            |
 ROW   |25013     |36782 |19653    |last     |$                                                                            |
 ROW   |25014     |36794 |19654    |find     |$,,"like","errored"                                                          |
+ROW   |25015     |36796 |19655    |last     |$                                                                            |
+ROW   |25016     |36805 |19656    |min      |$,5m                                                                         |
+ROW   |25017     |36798 |19657    |last     |$                                                                            |
+ROW   |25018     |36812 |19658    |last     |$,#1                                                                         |
+ROW   |25019     |36812 |19658    |last     |$,#2                                                                         |
+ROW   |25020     |36812 |19658    |last     |$                                                                            |
+ROW   |25021     |36816 |19659    |min      |$,5m                                                                         |
 
 TABLE |graphs
 FIELDS|graphid|name                                                                                  |width|height|yaxismin|yaxismax|templateid|show_work_period|show_triggers|graphtype|show_legend|show_3d|percent_left|percent_right|ymin_type|ymax_type|ymin_itemid|ymax_itemid|flags|discover|uuid                            |
@@ -19817,6 +19858,9 @@ ROW   |1803   |ZYXEL XGS-4728F: Nominal "{#ZYXEL.VOLT.NOMINAL}"
 ROW   |1804   |ZYXEL XGS-4728F: CPU utilization                                                      |900  |200   |0       |100     |NULL      |1               |1            |0        |1          |0      |0           |0            |1        |1        |NULL       |NULL       |0    |0       |dfd68fb23bf349068005997de6b0515a|
 ROW   |1805   |Interface {#IFNAME}({#IFALIAS}): Network traffic                                      |900  |200   |0       |100     |NULL      |1               |1            |0        |1          |0      |0           |0            |0        |0        |NULL       |NULL       |2    |0       |d5e5f60602cc41ba8e0b79a63644bf08|
 ROW   |1806   |Travis: Repo [{#SLUG}]: Builds                                                        |900  |200   |0       |100     |NULL      |1               |1            |0        |1          |0      |0           |0            |0        |0        |NULL       |NULL       |2    |0       |b13d986ae110458a80d74f32bb267ed7|
+ROW   |1807   |InfluxDB: [{#ORG_NAME}]: Query requests                                               |900  |200   |0       |100     |NULL      |1               |1            |0        |1          |0      |0           |0            |0        |0        |NULL       |NULL       |2    |0       |925d6b2f79b2479ab031118d795811fb|
+ROW   |1808   |InfluxDB: [{#ORG_NAME}]: Query traffic                                                |900  |200   |0       |100     |NULL      |1               |1            |0        |1          |0      |0           |0            |0        |0        |NULL       |NULL       |2    |0       |01921ee545c540bd8c0d51429bcce11b|
+ROW   |1809   |InfluxDB: Tasks runs                                                                  |900  |200   |0       |100     |NULL      |1               |1            |0        |1          |0      |0           |0            |0        |0        |NULL       |NULL       |0    |0       |dd6b62b969594ddbb82895a8f8fc5623|
 
 TABLE |graphs
 FIELDS|graphid|name                                               |width|height|yaxismin|yaxismax|templateid|show_work_period|show_triggers|graphtype|show_legend|show_3d|percent_left|percent_right|ymin_type|ymax_type|ymin_itemid|ymax_itemid|flags|discover|uuid|
@@ -20384,2261 +20428,2269 @@ ROW   |61428  |1657   |34319 |0       |4        |990099|0        |2       |0   |
 ROW   |61429  |1657   |34318 |0       |5        |EE0000|0        |2       |0   |
 ROW   |61430  |1658   |33025 |0       |0        |C80000|0        |2       |0   |
 ROW   |61431  |1658   |33024 |0       |1        |00C800|0        |2       |0   |
-ROW   |65217  |1397   |32451 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65218  |1397   |32450 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65219  |1398   |32452 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65220  |1398   |32449 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65221  |1399   |32444 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65222  |1399   |32446 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65223  |1399   |32448 |5       |2        |F63100|0        |2       |0   |
-ROW   |65224  |1400   |32460 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65225  |1401   |32458 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65226  |1401   |32457 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65227  |1402   |32461 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65228  |1402   |32456 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65229  |1172   |30918 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65230  |1172   |30919 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65231  |1172   |30920 |0       |2        |F63100|0        |2       |0   |
-ROW   |65232  |1172   |30921 |2       |3        |A54F10|0        |2       |0   |
-ROW   |65233  |1173   |30922 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65234  |835    |28744 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65235  |835    |28745 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65236  |1174   |30913 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65237  |1175   |30906 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65238  |1175   |30908 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65239  |1175   |30915 |0       |2        |F63100|0        |2       |0   |
-ROW   |65240  |1175   |30897 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65241  |1175   |30901 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65242  |1175   |30899 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65243  |1175   |30907 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |65244  |1175   |30905 |0       |7        |611F27|0        |2       |0   |
-ROW   |65245  |1175   |30904 |0       |8        |F230E0|0        |2       |0   |
-ROW   |65246  |1175   |30900 |0       |9        |FFAD40|0        |2       |0   |
-ROW   |65247  |1175   |30898 |0       |10       |40CDFF|0        |2       |0   |
-ROW   |65248  |1176   |30910 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65249  |1176   |30909 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65250  |836    |28798 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65251  |836    |28799 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65252  |836    |28800 |0       |2        |F63100|0        |2       |0   |
-ROW   |65253  |836    |28801 |2       |3        |A54F10|0        |2       |0   |
-ROW   |65254  |837    |28803 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65255  |838    |28793 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65256  |840    |28787 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65257  |840    |28784 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65258  |840    |28782 |0       |2        |F63100|0        |2       |0   |
-ROW   |65259  |840    |28781 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65260  |840    |28780 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65261  |840    |28778 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65262  |840    |28786 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |65263  |840    |28785 |0       |7        |611F27|0        |2       |0   |
-ROW   |65264  |840    |28783 |0       |8        |F230E0|0        |2       |0   |
-ROW   |65265  |840    |28779 |0       |9        |FFAD40|0        |2       |0   |
-ROW   |65266  |840    |28796 |0       |10       |40CDFF|0        |2       |0   |
-ROW   |65267  |839    |28789 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65268  |839    |28788 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65269  |1339   |32172 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65270  |1339   |32173 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65271  |1403   |32511 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65272  |1403   |32514 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65273  |1404   |32512 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65274  |1404   |32515 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65275  |1405   |32507 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65276  |1405   |32508 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65277  |1405   |32513 |0       |2        |F63100|0        |2       |0   |
-ROW   |65278  |1343   |32135 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65279  |1343   |32142 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65280  |1344   |32167 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65281  |1344   |32136 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65282  |1345   |32141 |1       |0        |1A7C11|0        |2       |0   |
-ROW   |65283  |1345   |32138 |1       |1        |2774A4|0        |2       |0   |
-ROW   |65284  |1346   |32156 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |65285  |1346   |32158 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65286  |1346   |32159 |0       |2        |F63100|0        |2       |0   |
-ROW   |65287  |1346   |32154 |2       |3        |A54F10|0        |2       |0   |
-ROW   |65288  |1346   |32155 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65289  |1346   |32146 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65290  |1347   |32150 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |65291  |1347   |32151 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65292  |1347   |32152 |0       |2        |F63100|0        |2       |0   |
-ROW   |65293  |1622   |35078 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65294  |1622   |35091 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65295  |1622   |35098 |0       |2        |F63100|0        |2       |0   |
-ROW   |65296  |1622   |35100 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65297  |1622   |35099 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65298  |1623   |35090 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65299  |1623   |35101 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65300  |1624   |35097 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65301  |1624   |35096 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65302  |1624   |35095 |0       |2        |F63100|0        |2       |0   |
-ROW   |65303  |1625   |35089 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65304  |1625   |35088 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65305  |1625   |35087 |0       |2        |F63100|0        |2       |0   |
-ROW   |65306  |1625   |35086 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65307  |1625   |35085 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65308  |1626   |35079 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65309  |1626   |35082 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65310  |1627   |35080 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65311  |1627   |35102 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65312  |1628   |35093 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65313  |1628   |35092 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65314  |1628   |35081 |0       |2        |F63100|0        |2       |0   |
-ROW   |65315  |1628   |35084 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65316  |1628   |35083 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65317  |1121   |30606 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65318  |1121   |30590 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65319  |1121   |30582 |5       |2        |F63100|0        |2       |0   |
-ROW   |65320  |1122   |30580 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65321  |1122   |30578 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65322  |1123   |30586 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |65323  |1123   |30608 |2       |1        |2774A4|0        |2       |0   |
-ROW   |65324  |1123   |30585 |2       |2        |F63100|0        |2       |0   |
-ROW   |65325  |1123   |30589 |2       |3        |A54F10|0        |2       |0   |
-ROW   |65326  |1123   |30584 |2       |4        |FC6EA3|0        |2       |0   |
-ROW   |65327  |1123   |30588 |2       |5        |6C59DC|0        |2       |0   |
-ROW   |65328  |1124   |30583 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |65329  |1124   |30587 |2       |1        |2774A4|0        |2       |0   |
-ROW   |65330  |1125   |30555 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65331  |1125   |30554 |2       |1        |2774A4|0        |2       |0   |
-ROW   |65332  |1125   |30556 |2       |2        |F63100|0        |2       |0   |
-ROW   |65333  |1125   |30557 |2       |3        |A54F10|0        |2       |0   |
-ROW   |65334  |1126   |30565 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65335  |1127   |30567 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |65336  |1127   |30568 |2       |1        |2774A4|0        |2       |0   |
-ROW   |65337  |1128   |30536 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |65338  |1129   |30566 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |65339  |1129   |30549 |2       |1        |2774A4|0        |2       |0   |
-ROW   |65340  |1129   |30553 |2       |2        |F63100|0        |2       |0   |
-ROW   |65341  |1129   |30570 |2       |3        |A54F10|0        |2       |0   |
-ROW   |65342  |1143   |30714 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65343  |1143   |30716 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65344  |1143   |30717 |0       |2        |F63100|0        |2       |0   |
-ROW   |65345  |1143   |30715 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65346  |1144   |30753 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65347  |1144   |30738 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65348  |1145   |30718 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65349  |1145   |30737 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65350  |1145   |30727 |0       |2        |F63100|0        |2       |0   |
-ROW   |65351  |1145   |30729 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65352  |1146   |30730 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65353  |1146   |30732 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65354  |1146   |30731 |0       |2        |F63100|0        |2       |0   |
-ROW   |65355  |1146   |30733 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65356  |1147   |30734 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65357  |1147   |30736 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65358  |1147   |30735 |0       |2        |F63100|0        |2       |0   |
-ROW   |65359  |1147   |30758 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65360  |1148   |30711 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65361  |1148   |30706 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65362  |1148   |30710 |0       |2        |F63100|0        |2       |0   |
-ROW   |65363  |1148   |30712 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65364  |1148   |30702 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65365  |1148   |30707 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65366  |1148   |30704 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |65367  |1177   |30927 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65368  |1177   |30944 |2       |1        |2774A4|0        |2       |0   |
-ROW   |65369  |1178   |30935 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65370  |1178   |30942 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65371  |1179   |30949 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65372  |1179   |30950 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65373  |1179   |30951 |0       |2        |F63100|0        |2       |0   |
-ROW   |65374  |1180   |30952 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65375  |1180   |30954 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65376  |1180   |30955 |0       |2        |F63100|0        |2       |0   |
-ROW   |65377  |1181   |30936 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65378  |1181   |30940 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65379  |1182   |30930 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65380  |1182   |30929 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65381  |1182   |30928 |0       |2        |F63100|0        |2       |0   |
-ROW   |65382  |1182   |30931 |2       |3        |A54F10|1        |2       |0   |
-ROW   |65383  |1183   |30934 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65384  |1183   |30941 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65385  |1406   |32532 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |65386  |1406   |32535 |0       |1        |2774A4|1        |2       |0   |
-ROW   |65387  |1406   |32533 |0       |2        |F63100|0        |2       |0   |
-ROW   |65388  |1406   |32534 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65389  |1406   |32536 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65390  |1406   |32537 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65391  |1407   |32543 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65392  |1407   |32544 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65393  |1408   |32518 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65394  |1408   |32521 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65395  |1408   |32523 |0       |2        |F63100|0        |2       |0   |
-ROW   |65396  |1408   |32524 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65397  |1409   |32562 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |65398  |1409   |32565 |0       |1        |2774A4|1        |2       |0   |
-ROW   |65399  |1409   |32563 |0       |2        |F63100|0        |2       |0   |
-ROW   |65400  |1409   |32564 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65401  |1409   |32566 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65402  |1409   |32567 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65403  |1410   |32573 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65404  |1410   |32574 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65405  |1411   |32548 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65406  |1411   |32551 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65407  |1411   |32553 |0       |2        |F63100|0        |2       |0   |
-ROW   |65408  |1411   |32554 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65409  |1250   |31527 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65410  |1250   |31529 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65411  |1250   |31499 |0       |2        |F63100|0        |2       |0   |
-ROW   |65412  |1251   |31532 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65413  |1251   |31534 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65414  |1251   |31538 |0       |2        |F63100|0        |2       |0   |
-ROW   |65415  |1251   |31536 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65416  |1251   |31528 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65417  |1251   |31542 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65418  |1252   |31552 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65419  |1252   |31551 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65420  |1252   |31541 |0       |2        |F63100|0        |2       |0   |
-ROW   |65421  |1253   |31513 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65422  |1253   |31526 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65423  |1253   |31525 |0       |2        |F63100|0        |2       |0   |
-ROW   |65424  |1254   |31502 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65425  |1254   |31501 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65426  |1254   |31503 |0       |2        |F63100|0        |2       |0   |
-ROW   |65427  |1255   |31505 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65428  |1255   |31504 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65429  |1255   |31506 |0       |2        |F63100|0        |2       |0   |
-ROW   |65430  |1256   |31508 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65431  |1256   |31507 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65432  |1256   |31509 |0       |2        |F63100|0        |2       |0   |
-ROW   |65433  |1257   |31511 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65434  |1257   |31510 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65435  |1257   |31500 |0       |2        |F63100|0        |2       |0   |
-ROW   |65436  |1258   |31514 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65437  |1258   |31512 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65438  |1258   |31515 |0       |2        |F63100|0        |2       |0   |
-ROW   |65439  |1259   |31516 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65440  |1259   |31517 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65441  |1260   |31523 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65442  |1260   |31522 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65443  |1260   |31524 |0       |2        |F63100|0        |2       |0   |
-ROW   |65444  |1412   |32601 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65445  |1412   |32602 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65446  |1412   |32603 |0       |2        |F63100|0        |2       |0   |
-ROW   |65447  |1412   |32604 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65448  |1412   |32606 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65449  |1412   |32606 |2       |5        |6C59DC|0        |2       |0   |
-ROW   |65450  |1413   |32608 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65451  |1413   |32610 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65452  |1413   |32611 |0       |2        |F63100|0        |2       |0   |
-ROW   |65453  |1414   |32582 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |65454  |1414   |32580 |2       |1        |2774A4|0        |2       |0   |
-ROW   |65455  |1414   |32581 |2       |2        |F63100|0        |2       |0   |
-ROW   |65456  |1414   |32597 |0       |3        |A54F10|1        |2       |0   |
-ROW   |65457  |1414   |32599 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |65458  |1414   |32588 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |65459  |1415   |32583 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65460  |1415   |32584 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65461  |1415   |32585 |0       |2        |F63100|0        |2       |0   |
-ROW   |65462  |1415   |32579 |2       |3        |A54F10|0        |2       |0   |
-ROW   |65463  |1416   |32587 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65464  |1416   |32590 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65465  |1416   |32589 |0       |2        |F63100|0        |2       |0   |
-ROW   |65466  |1417   |32673 |1       |0        |1A7C11|0        |2       |0   |
-ROW   |65467  |1417   |32679 |1       |1        |2774A4|0        |2       |0   |
-ROW   |65468  |1629   |35114 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65469  |1629   |35113 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65470  |1075   |30204 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65471  |1075   |30205 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65472  |1630   |35112 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65473  |1630   |35111 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65474  |1630   |35110 |0       |2        |F63100|0        |2       |0   |
-ROW   |65475  |1630   |35108 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65476  |1630   |35105 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65477  |1076   |30209 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65478  |1076   |30208 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65479  |1077   |30206 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65480  |1077   |30207 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65481  |1078   |30216 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65482  |1078   |30215 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65483  |1079   |30210 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65484  |1079   |30211 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65485  |1079   |30212 |0       |2        |F63100|0        |2       |0   |
-ROW   |65486  |1079   |30213 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65487  |1079   |30214 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65488  |1631   |35127 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65489  |1631   |35126 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65490  |1632   |35124 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65491  |1632   |35123 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65492  |1632   |35122 |0       |2        |F63100|0        |2       |0   |
-ROW   |65493  |1632   |30222 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65494  |1632   |30223 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65495  |1080   |30226 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65496  |1080   |30225 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65497  |1633   |35139 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65498  |1633   |35138 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65499  |1081   |30247 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65500  |1081   |30248 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65501  |1634   |35137 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65502  |1634   |35136 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65503  |1634   |35135 |0       |2        |F63100|0        |2       |0   |
-ROW   |65504  |1634   |35133 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65505  |1634   |35130 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65506  |1082   |30252 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65507  |1082   |30251 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65508  |1083   |30249 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65509  |1083   |30250 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65510  |1084   |30259 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65511  |1084   |30258 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65512  |1085   |30253 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65513  |1085   |30254 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65514  |1085   |30255 |0       |2        |F63100|0        |2       |0   |
-ROW   |65515  |1085   |30256 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65516  |1085   |30257 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65517  |1635   |35152 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65518  |1635   |35151 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65519  |1636   |35149 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65520  |1636   |35148 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65521  |1636   |35147 |0       |2        |F63100|0        |2       |0   |
-ROW   |65522  |1636   |30265 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65523  |1636   |30266 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65524  |1086   |30269 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65525  |1086   |30268 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65526  |1184   |30982 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65527  |1184   |30980 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65528  |1185   |30983 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65529  |1185   |30981 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65530  |1186   |30976 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65531  |1186   |30985 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65532  |1186   |30997 |0       |2        |F63100|0        |2       |0   |
-ROW   |65533  |1186   |30970 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65534  |1186   |30973 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65535  |1186   |30995 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65536  |1186   |30998 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |65537  |1186   |30978 |0       |7        |611F27|0        |2       |0   |
-ROW   |65538  |1187   |31024 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65539  |1187   |31022 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65540  |1188   |31025 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65541  |1188   |31023 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65542  |1189   |31018 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65543  |1189   |31027 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65544  |1189   |31039 |0       |2        |F63100|0        |2       |0   |
-ROW   |65545  |1189   |31012 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65546  |1189   |31015 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65547  |1189   |31037 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65548  |1189   |31040 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |65549  |1189   |31020 |0       |7        |611F27|0        |2       |0   |
-ROW   |65550  |1499   |33478 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65551  |1499   |33467 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65552  |1500   |33468 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65553  |1500   |33479 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65554  |1501   |33442 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65555  |1501   |33441 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65556  |1501   |33440 |0       |2        |F63100|0        |2       |0   |
-ROW   |65557  |1502   |33423 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65558  |1502   |33419 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65559  |1502   |33422 |0       |2        |F63100|0        |2       |0   |
-ROW   |65560  |1502   |33421 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65561  |1502   |33412 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65562  |1418   |32700 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65563  |1418   |32699 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65564  |1419   |32710 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65565  |1419   |32709 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65566  |1420   |32693 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65567  |1420   |32724 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65568  |1421   |32730 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65569  |1421   |32731 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65570  |1421   |32728 |0       |2        |F63100|0        |2       |0   |
-ROW   |65571  |1421   |32729 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65572  |1422   |32705 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65573  |1422   |32706 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65574  |1423   |32702 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65575  |1423   |32703 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65576  |1424   |32708 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65577  |1424   |32722 |2       |1        |2774A4|0        |2       |0   |
-ROW   |65578  |1424   |32695 |0       |2        |F63100|0        |2       |0   |
-ROW   |65579  |1424   |32753 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65580  |1424   |32740 |2       |4        |FC6EA3|0        |2       |0   |
-ROW   |65581  |1424   |32723 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65582  |1424   |32747 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |65583  |1424   |32748 |2       |7        |611F27|0        |2       |0   |
-ROW   |65584  |1424   |32749 |0       |8        |F230E0|0        |2       |0   |
-ROW   |65585  |1424   |32750 |0       |9        |FFAD40|0        |2       |0   |
-ROW   |65586  |1424   |32751 |2       |10       |40CDFF|0        |2       |0   |
-ROW   |65587  |1424   |32752 |0       |11       |40FFA0|0        |2       |0   |
-ROW   |65588  |1425   |32746 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65589  |1425   |32745 |2       |1        |2774A4|0        |2       |0   |
-ROW   |65590  |1425   |32744 |0       |2        |F63100|0        |2       |0   |
-ROW   |65591  |1425   |32743 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65592  |1425   |32743 |2       |4        |FC6EA3|0        |2       |0   |
-ROW   |65593  |1425   |32742 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65594  |1426   |32720 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65595  |1426   |32721 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65596  |1426   |32719 |0       |2        |F63100|0        |2       |0   |
-ROW   |65597  |1426   |32718 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65598  |1130   |30613 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65599  |1130   |30635 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65600  |1130   |30625 |0       |2        |F63100|0        |2       |0   |
-ROW   |65601  |1131   |30632 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65602  |1131   |30633 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65603  |1131   |30629 |5       |2        |F63100|0        |2       |0   |
-ROW   |65604  |1132   |30630 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |65605  |1132   |30628 |2       |1        |2774A4|0        |2       |0   |
-ROW   |65606  |1132   |30631 |2       |2        |F63100|0        |2       |0   |
-ROW   |65607  |1133   |30619 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65608  |1133   |30618 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65609  |1134   |30623 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65610  |1134   |30622 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65611  |1135   |30615 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65612  |841    |28813 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |65613  |841    |28811 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65614  |841    |28812 |0       |2        |F63100|0        |2       |0   |
-ROW   |65615  |841    |28814 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65616  |842    |28817 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65617  |842    |28815 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65618  |842    |28816 |0       |2        |F63100|0        |2       |0   |
-ROW   |65619  |844    |28808 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65620  |844    |28807 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65621  |843    |28818 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65622  |845    |28829 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |65623  |845    |28831 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65624  |845    |28832 |0       |2        |F63100|0        |2       |0   |
-ROW   |65625  |845    |28830 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65626  |846    |28826 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65627  |846    |28828 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65628  |846    |28827 |0       |2        |F63100|0        |2       |0   |
-ROW   |65629  |847    |28825 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65630  |1637   |35187 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65631  |1638   |35189 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65632  |1638   |35188 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65633  |1638   |35190 |5       |2        |F63100|0        |2       |0   |
-ROW   |65634  |1638   |35191 |5       |3        |A54F10|0        |2       |0   |
-ROW   |65635  |1638   |35192 |5       |4        |FC6EA3|0        |2       |0   |
-ROW   |65636  |1639   |35198 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65637  |1640   |35200 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65638  |1640   |35199 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65639  |1640   |35201 |5       |2        |F63100|0        |2       |0   |
-ROW   |65640  |1640   |35202 |5       |3        |A54F10|0        |2       |0   |
-ROW   |65641  |1640   |35203 |5       |4        |FC6EA3|0        |2       |0   |
-ROW   |65642  |1641   |35221 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65643  |1641   |35220 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65644  |1641   |35219 |5       |2        |F63100|0        |2       |0   |
-ROW   |65645  |1642   |35214 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65646  |1642   |35216 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65647  |1642   |35207 |5       |2        |F63100|0        |2       |0   |
-ROW   |65648  |1642   |35213 |5       |3        |A54F10|0        |2       |0   |
-ROW   |65649  |1642   |35212 |5       |4        |FC6EA3|0        |2       |0   |
-ROW   |65650  |1643   |35228 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65651  |1643   |35229 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65652  |1643   |35227 |5       |2        |F63100|0        |2       |0   |
-ROW   |65653  |1644   |35231 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65654  |1644   |35230 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65655  |1644   |35235 |5       |2        |F63100|0        |2       |0   |
-ROW   |65656  |1644   |35233 |5       |3        |A54F10|0        |2       |0   |
-ROW   |65657  |1644   |35232 |5       |4        |FC6EA3|0        |2       |0   |
-ROW   |65658  |1644   |35234 |5       |5        |6C59DC|0        |2       |0   |
-ROW   |65659  |1644   |35236 |5       |6        |AC8C14|0        |2       |0   |
-ROW   |65660  |1644   |35237 |5       |7        |611F27|0        |2       |0   |
-ROW   |65661  |1645   |35243 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65662  |1645   |35244 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65663  |1645   |35245 |5       |2        |F63100|0        |2       |0   |
-ROW   |65664  |1646   |35252 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65665  |1646   |35253 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65666  |1646   |35254 |5       |2        |F63100|0        |2       |0   |
-ROW   |65667  |1647   |35172 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65668  |1647   |35168 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65669  |1647   |35164 |5       |2        |F63100|0        |2       |0   |
-ROW   |65670  |1647   |35163 |5       |3        |A54F10|0        |2       |0   |
-ROW   |65671  |1648   |35170 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65672  |1649   |35167 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65673  |1649   |35166 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65674  |1649   |35165 |5       |2        |F63100|0        |2       |0   |
-ROW   |65675  |1650   |35176 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65676  |1262   |31592 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65677  |1262   |31584 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65678  |1262   |31582 |0       |2        |F63100|0        |2       |0   |
-ROW   |65679  |1262   |31585 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65680  |1263   |31591 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65681  |1263   |31583 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65682  |1263   |31590 |0       |2        |F63100|0        |2       |0   |
-ROW   |65683  |1264   |31602 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65684  |1264   |31597 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65685  |1264   |31601 |0       |2        |F63100|0        |2       |0   |
-ROW   |65686  |1264   |31604 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65687  |1265   |31609 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65688  |1265   |31610 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65689  |1265   |31608 |0       |2        |F63100|0        |2       |0   |
-ROW   |65690  |1001   |29729 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65691  |1001   |29728 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65692  |1001   |29727 |0       |2        |F63100|0        |2       |0   |
-ROW   |65693  |1001   |29725 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65694  |1001   |29723 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65695  |1001   |29733 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65696  |1001   |29737 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |65697  |1001   |29731 |0       |7        |611F27|0        |2       |0   |
-ROW   |65698  |1000   |29720 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65699  |1000   |29730 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65700  |1000   |29721 |0       |2        |F63100|0        |2       |0   |
-ROW   |65701  |1000   |29726 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65702  |1000   |29724 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65703  |1000   |29734 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65704  |1000   |29722 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |65705  |1000   |29732 |0       |7        |611F27|0        |2       |0   |
-ROW   |65706  |1027   |30022 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65707  |1027   |30021 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65708  |1027   |30019 |0       |2        |F63100|0        |2       |0   |
-ROW   |65709  |1008   |29698 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65710  |1008   |29700 |2       |1        |FF0000|0        |2       |0   |
-ROW   |65711  |1007   |29691 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65712  |1013   |29657 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65713  |1013   |29658 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65714  |1009   |29687 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65715  |1009   |29694 |2       |1        |FF0000|0        |2       |0   |
-ROW   |65716  |1029   |30017 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65717  |1029   |30016 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65718  |1029   |30015 |0       |2        |F63100|0        |2       |0   |
-ROW   |65719  |1031   |30007 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65720  |1031   |30013 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65721  |1031   |30011 |0       |2        |F63100|0        |2       |0   |
-ROW   |65722  |1031   |30009 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65723  |1031   |30005 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65724  |1031   |30003 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65725  |1031   |30023 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |65726  |1031   |30001 |0       |7        |611F27|0        |2       |0   |
-ROW   |65727  |1030   |30008 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65728  |1030   |30014 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65729  |1030   |30012 |0       |2        |F63100|0        |2       |0   |
-ROW   |65730  |1030   |30010 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65731  |1030   |30006 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65732  |1030   |30004 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65733  |1030   |30000 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |65734  |1030   |30002 |0       |7        |611F27|0        |2       |0   |
-ROW   |65735  |1011   |29695 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |65736  |1028   |30020 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65737  |1010   |29701 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65738  |1010   |29697 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65739  |1012   |29692 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65740  |1015   |29812 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65741  |1015   |29811 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65742  |1015   |29810 |0       |2        |F63100|0        |2       |0   |
-ROW   |65743  |1015   |29808 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65744  |1015   |29806 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65745  |1015   |29816 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65746  |1015   |29820 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |65747  |1015   |29814 |0       |7        |611F27|0        |2       |0   |
-ROW   |65748  |1014   |29803 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65749  |1014   |29813 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65750  |1014   |29804 |0       |2        |F63100|0        |2       |0   |
-ROW   |65751  |1014   |29809 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65752  |1014   |29807 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65753  |1014   |29817 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65754  |1014   |29805 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |65755  |1014   |29815 |0       |7        |611F27|0        |2       |0   |
-ROW   |65756  |1016   |29768 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65757  |1016   |29767 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65758  |1016   |29765 |0       |2        |F63100|0        |2       |0   |
-ROW   |65759  |1022   |29782 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65760  |1022   |29781 |2       |1        |FF0000|0        |2       |0   |
-ROW   |65761  |1021   |29783 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65762  |1023   |29780 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65763  |1023   |29784 |2       |1        |FF0000|0        |2       |0   |
-ROW   |65764  |1018   |29763 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65765  |1018   |29762 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65766  |1018   |29761 |0       |2        |F63100|0        |2       |0   |
-ROW   |65767  |1020   |29753 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65768  |1020   |29759 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65769  |1020   |29757 |0       |2        |F63100|0        |2       |0   |
-ROW   |65770  |1020   |29755 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65771  |1020   |29751 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65772  |1020   |29749 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65773  |1020   |29769 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |65774  |1020   |29747 |0       |7        |611F27|0        |2       |0   |
-ROW   |65775  |1019   |29754 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65776  |1019   |29760 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65777  |1019   |29758 |0       |2        |F63100|0        |2       |0   |
-ROW   |65778  |1019   |29756 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65779  |1019   |29752 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65780  |1019   |29750 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65781  |1019   |29746 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |65782  |1019   |29748 |0       |7        |611F27|0        |2       |0   |
-ROW   |65783  |1025   |29775 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |65784  |1017   |29766 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65785  |1024   |29776 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65786  |1024   |29777 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65787  |1026   |29772 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65788  |1356   |32276 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65789  |1356   |32275 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65790  |1357   |32281 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65791  |1357   |32267 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65792  |1357   |32279 |0       |2        |F63100|0        |2       |0   |
-ROW   |65793  |1358   |32268 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65794  |1358   |32274 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65795  |1358   |32271 |0       |2        |F63100|0        |2       |0   |
-ROW   |65796  |1359   |32288 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65797  |1359   |32291 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65798  |1360   |32247 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65799  |1360   |32245 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65800  |1360   |32246 |0       |2        |F63100|0        |2       |0   |
-ROW   |65801  |1361   |32248 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65802  |1361   |32249 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65803  |1361   |32250 |0       |2        |F63100|0        |2       |0   |
-ROW   |65804  |1362   |32240 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65805  |1362   |32273 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65806  |1363   |32282 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65807  |1363   |32283 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65808  |1363   |32289 |0       |2        |F63100|0        |2       |0   |
-ROW   |65809  |1363   |32290 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65810  |1363   |32286 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65811  |1363   |32287 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65812  |1363   |32241 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |65813  |1363   |32242 |0       |7        |611F27|0        |2       |0   |
-ROW   |65814  |1363   |32243 |0       |8        |F230E0|0        |2       |0   |
-ROW   |65815  |1363   |32244 |0       |9        |FFAD40|0        |2       |0   |
-ROW   |65816  |1363   |32277 |0       |10       |40CDFF|0        |2       |0   |
-ROW   |65817  |1363   |32278 |0       |11       |40FFA0|0        |2       |0   |
-ROW   |65818  |1427   |32768 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65819  |1427   |32767 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65820  |1428   |32774 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65821  |1428   |32772 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65822  |1428   |32775 |5       |2        |F63100|0        |2       |0   |
-ROW   |65823  |1428   |32773 |5       |3        |A54F10|0        |2       |0   |
-ROW   |65824  |1429   |32779 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65825  |1429   |32777 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65826  |1429   |32778 |5       |2        |F63100|0        |2       |0   |
-ROW   |65827  |1806   |36785 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65828  |1806   |36786 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65829  |1806   |36787 |0       |2        |F63100|0        |2       |0   |
-ROW   |65830  |1430   |32837 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |65831  |1430   |32836 |2       |1        |2774A4|0        |2       |0   |
-ROW   |65832  |1430   |32835 |2       |2        |F63100|0        |2       |0   |
-ROW   |65833  |1431   |32856 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65834  |1432   |32828 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65835  |1433   |32847 |5       |0        |34bdeb|0        |2       |0   |
-ROW   |65836  |1434   |32797 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65837  |1434   |32796 |5       |1        |2774A4|0        |2       |0   |
-ROW   |65838  |1434   |32801 |2       |2        |F63100|0        |2       |0   |
-ROW   |65839  |1435   |32834 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65840  |1436   |32819 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65841  |1437   |32826 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |65842  |1614   |34976 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65843  |1614   |34975 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65844  |1614   |34978 |0       |2        |F63100|0        |2       |0   |
-ROW   |65845  |1614   |34979 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65846  |1614   |34980 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65847  |1615   |34982 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65848  |1615   |34997 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65849  |1615   |35001 |0       |2        |F63100|0        |2       |0   |
-ROW   |65850  |1615   |35000 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65851  |1615   |34998 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65852  |1615   |34996 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65853  |1616   |35015 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65854  |1616   |35014 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65855  |1617   |35012 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65856  |1617   |35013 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65857  |1618   |34951 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |65858  |1618   |34952 |0       |1        |2774A4|0        |2       |0   |
-ROW   |65859  |1618   |34953 |0       |2        |F63100|0        |2       |0   |
-ROW   |65860  |1618   |34954 |0       |3        |A54F10|0        |2       |0   |
-ROW   |65861  |1618   |34956 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |65862  |1618   |34950 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |65863  |1618   |34957 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |65864  |1618   |34959 |0       |7        |611F27|0        |2       |0   |
-ROW   |65865  |1618   |34965 |0       |8        |F230E0|0        |2       |0   |
-ROW   |65866  |1445   |22404 |0       |0        |990099|0        |2       |0   |
-ROW   |65867  |1445   |22399 |0       |1        |990000|0        |2       |0   |
-ROW   |65868  |1445   |22416 |0       |2        |0000EE|0        |2       |0   |
-ROW   |65869  |1445   |25366 |0       |3        |FF33FF|0        |2       |0   |
-ROW   |65870  |1445   |22418 |0       |4        |009600|0        |2       |0   |
-ROW   |65871  |1445   |22402 |0       |5        |003300|0        |2       |0   |
-ROW   |65872  |1445   |22400 |0       |6        |33FFFF|0        |2       |0   |
-ROW   |65873  |1445   |22689 |0       |7        |DD0000|0        |2       |0   |
-ROW   |65874  |1445   |23171 |0       |8        |000099|0        |2       |0   |
-ROW   |65875  |1445   |22401 |0       |9        |00FF00|0        |2       |0   |
-ROW   |65876  |1445   |33023 |0       |10       |5A2B57|0        |2       |0   |
-ROW   |65877  |1651   |22406 |0       |0        |00EE00|0        |2       |0   |
-ROW   |65878  |1651   |25665 |0       |1        |0000EE|0        |2       |0   |
-ROW   |65879  |1651   |25666 |0       |2        |FFAA00|0        |2       |0   |
-ROW   |65880  |1651   |28537 |0       |3        |00EEEE|0        |2       |0   |
-ROW   |65881  |1651   |28535 |0       |4        |990099|0        |2       |0   |
-ROW   |65882  |1652   |22426 |0       |0        |00EE00|0        |2       |0   |
-ROW   |65883  |1652   |22408 |0       |1        |FFAA00|0        |2       |0   |
-ROW   |65884  |1652   |22412 |0       |2        |990099|0        |2       |0   |
-ROW   |65885  |1652   |22414 |0       |3        |FF66FF|0        |2       |0   |
-ROW   |65886  |1652   |23663 |0       |4        |009999|0        |2       |0   |
-ROW   |65887  |1652   |33022 |0       |5        |2B5429|0        |2       |0   |
-ROW   |65888  |1652   |22430 |0       |6        |8048B4|0        |2       |0   |
-ROW   |65889  |1652   |22420 |0       |7        |FD5434|0        |2       |0   |
-ROW   |65890  |1653   |22422 |0       |0        |00EE00|0        |2       |0   |
-ROW   |65891  |1653   |22424 |0       |1        |0000EE|0        |2       |0   |
-ROW   |65892  |1653   |25370 |0       |2        |FFAA00|0        |2       |0   |
-ROW   |65893  |1653   |29822 |0       |3        |00EEEE|0        |2       |0   |
-ROW   |65894  |1653   |34317 |0       |4        |990099|0        |2       |0   |
-ROW   |65895  |1653   |34316 |0       |5        |EE0000|0        |2       |0   |
-ROW   |65896  |1654   |33021 |0       |0        |C80000|0        |2       |0   |
-ROW   |65897  |1654   |33020 |0       |1        |00C800|0        |2       |0   |
-ROW   |65898  |527    |22199 |0       |0        |C80000|0        |2       |0   |
-ROW   |65899  |527    |22196 |0       |1        |00C800|0        |2       |0   |
-ROW   |65900  |410    |22185 |0       |0        |009900|0        |2       |0   |
-ROW   |65901  |410    |22189 |0       |1        |DD0000|0        |2       |0   |
-ROW   |65902  |410    |22396 |0       |2        |00DDDD|0        |2       |0   |
-ROW   |65903  |410    |22183 |0       |3        |3333FF|0        |2       |0   |
-ROW   |65904  |410    |22191 |0       |4        |999900|0        |2       |0   |
-ROW   |65905  |410    |23634 |0       |5        |00FF00|0        |2       |0   |
-ROW   |65906  |404    |22404 |0       |0        |990099|0        |2       |0   |
-ROW   |65907  |404    |22399 |0       |1        |990000|0        |2       |0   |
-ROW   |65908  |404    |22416 |0       |2        |0000EE|0        |2       |0   |
-ROW   |65909  |404    |22430 |0       |3        |FF33FF|0        |2       |0   |
-ROW   |65910  |404    |22418 |0       |4        |009600|0        |2       |0   |
-ROW   |65911  |404    |22402 |0       |5        |003300|0        |2       |0   |
-ROW   |65912  |404    |22420 |0       |6        |CCCC00|0        |2       |0   |
-ROW   |65913  |404    |22400 |0       |7        |33FFFF|0        |2       |0   |
-ROW   |65914  |404    |22689 |0       |8        |DD0000|0        |2       |0   |
-ROW   |65915  |404    |23171 |0       |9        |000099|0        |2       |0   |
-ROW   |65916  |404    |22401 |0       |10       |00FF00|0        |2       |0   |
-ROW   |65917  |404    |33023 |0       |11       |5A2B57|0        |2       |0   |
-ROW   |65918  |406    |22426 |0       |1        |00EE00|0        |2       |0   |
-ROW   |65919  |406    |22422 |0       |2        |0000EE|0        |2       |0   |
-ROW   |65920  |406    |22408 |0       |3        |FFAA00|0        |2       |0   |
-ROW   |65921  |406    |22424 |0       |4        |00EEEE|0        |2       |0   |
-ROW   |65922  |406    |22412 |0       |5        |990099|0        |2       |0   |
-ROW   |65923  |406    |22406 |0       |6        |EE0000|0        |2       |0   |
-ROW   |65924  |406    |22414 |0       |7        |FF66FF|0        |2       |0   |
-ROW   |65925  |406    |23663 |0       |8        |009999|0        |2       |0   |
-ROW   |65926  |406    |25366 |0       |9        |BBBB00|0        |2       |0   |
-ROW   |65927  |406    |25370 |0       |10       |AA0000|0        |2       |0   |
-ROW   |65928  |406    |25665 |0       |11       |990000|0        |2       |0   |
-ROW   |65929  |406    |25666 |0       |12       |008800|0        |2       |0   |
-ROW   |65930  |406    |28535 |0       |13       |80B0E0|0        |2       |0   |
-ROW   |65931  |406    |28537 |0       |14       |4080B0|0        |2       |0   |
-ROW   |65932  |406    |29822 |0       |15       |8000FF|0        |2       |0   |
-ROW   |65933  |406    |33022 |0       |16       |2B5429|0        |2       |0   |
-ROW   |65934  |406    |34317 |0       |17       |8048B4|0        |2       |0   |
-ROW   |65935  |406    |34316 |0       |18       |FD5434|0        |2       |0   |
-ROW   |65936  |406    |35274 |0       |19       |790E1F|0        |2       |0   |
-ROW   |65937  |406    |35272 |0       |20       |87AC4D|0        |2       |0   |
-ROW   |65938  |788    |28248 |0       |0        |008800|0        |2       |0   |
-ROW   |65939  |788    |28533 |0       |1        |EE0000|0        |2       |0   |
-ROW   |65940  |392    |22187 |5       |0        |00C800|0        |2       |0   |
-ROW   |65941  |392    |23251 |0       |1        |F63100|0        |2       |0   |
-ROW   |65942  |1444   |28581 |0       |0        |990099|0        |2       |0   |
-ROW   |65943  |1444   |28574 |0       |1        |990000|0        |2       |0   |
-ROW   |65944  |1444   |28571 |0       |2        |0000EE|0        |2       |0   |
-ROW   |65945  |1444   |28562 |0       |3        |FF33FF|0        |2       |0   |
-ROW   |65946  |1444   |28570 |0       |4        |009600|0        |2       |0   |
-ROW   |65947  |1444   |28569 |0       |5        |003300|0        |2       |0   |
-ROW   |65948  |1444   |28552 |0       |6        |33FFFF|0        |2       |0   |
-ROW   |65949  |1444   |28573 |0       |7        |DD0000|0        |2       |0   |
-ROW   |65950  |1444   |28579 |0       |8        |000099|0        |2       |0   |
-ROW   |65951  |1444   |28559 |0       |9        |00FF00|0        |2       |0   |
-ROW   |65952  |1444   |33017 |0       |10       |5A2B57|0        |2       |0   |
-ROW   |65953  |1659   |28567 |0       |0        |00EE00|0        |2       |0   |
-ROW   |65954  |1659   |28575 |0       |1        |0000EE|0        |2       |0   |
-ROW   |65955  |1659   |28576 |0       |2        |FFAA00|0        |2       |0   |
-ROW   |65956  |1659   |28583 |0       |3        |00EEEE|0        |2       |0   |
-ROW   |65957  |1659   |28582 |0       |4        |990099|0        |2       |0   |
-ROW   |65958  |1660   |28572 |0       |0        |00EE00|0        |2       |0   |
-ROW   |65959  |1660   |28568 |0       |1        |FFAA00|0        |2       |0   |
-ROW   |65960  |1660   |28564 |0       |2        |990099|0        |2       |0   |
-ROW   |65961  |1660   |28578 |0       |3        |FF66FF|0        |2       |0   |
-ROW   |65962  |1660   |28580 |0       |4        |009999|0        |2       |0   |
-ROW   |65963  |1660   |33016 |0       |5        |2B5429|0        |2       |0   |
-ROW   |65964  |1660   |28565 |0       |6        |8048B4|0        |2       |0   |
-ROW   |65965  |1660   |28577 |0       |7        |FD5434|0        |2       |0   |
-ROW   |65966  |1661   |28566 |0       |0        |00EE00|0        |2       |0   |
-ROW   |65967  |1661   |28561 |0       |1        |0000EE|0        |2       |0   |
-ROW   |65968  |1661   |28563 |0       |2        |FFAA00|0        |2       |0   |
-ROW   |65969  |1661   |29821 |0       |3        |00EEEE|0        |2       |0   |
-ROW   |65970  |1661   |34314 |0       |4        |990099|0        |2       |0   |
-ROW   |65971  |1661   |34315 |0       |5        |EE0000|0        |2       |0   |
-ROW   |65972  |1662   |33015 |0       |0        |C80000|0        |2       |0   |
-ROW   |65973  |1662   |33014 |0       |1        |00C800|0        |2       |0   |
-ROW   |65974  |797    |28546 |0       |0        |C80000|0        |2       |0   |
-ROW   |65975  |797    |28545 |0       |1        |00C800|0        |2       |0   |
-ROW   |65976  |798    |28551 |0       |0        |009900|0        |2       |0   |
-ROW   |65977  |798    |28543 |0       |1        |DD0000|0        |2       |0   |
-ROW   |65978  |798    |28542 |0       |2        |00DDDD|0        |2       |0   |
-ROW   |65979  |798    |28549 |0       |3        |3333FF|0        |2       |0   |
-ROW   |65980  |798    |28544 |0       |4        |999900|0        |2       |0   |
-ROW   |65981  |798    |28548 |0       |5        |00FF00|0        |2       |0   |
-ROW   |65982  |799    |28581 |0       |0        |990099|0        |2       |0   |
-ROW   |65983  |799    |28574 |0       |1        |990000|0        |2       |0   |
-ROW   |65984  |799    |28571 |0       |2        |0000EE|0        |2       |0   |
-ROW   |65985  |799    |28565 |0       |3        |FF33FF|0        |2       |0   |
-ROW   |65986  |799    |28570 |0       |4        |009600|0        |2       |0   |
-ROW   |65987  |799    |28569 |0       |5        |003300|0        |2       |0   |
-ROW   |65988  |799    |28577 |0       |6        |CCCC00|0        |2       |0   |
-ROW   |65989  |799    |28552 |0       |7        |33FFFF|0        |2       |0   |
-ROW   |65990  |799    |28573 |0       |8        |DD0000|0        |2       |0   |
-ROW   |65991  |799    |28579 |0       |9        |000099|0        |2       |0   |
-ROW   |65992  |799    |28559 |0       |10       |00FF00|0        |2       |0   |
-ROW   |65993  |799    |33017 |0       |11       |5A2B57|0        |2       |0   |
-ROW   |65994  |800    |28572 |0       |1        |00EE00|0        |2       |0   |
-ROW   |65995  |800    |28566 |0       |2        |0000EE|0        |2       |0   |
-ROW   |65996  |800    |28568 |0       |3        |FFAA00|0        |2       |0   |
-ROW   |65997  |800    |28561 |0       |4        |00EEEE|0        |2       |0   |
-ROW   |65998  |800    |28564 |0       |5        |990099|0        |2       |0   |
-ROW   |65999  |800    |28567 |0       |6        |EE0000|0        |2       |0   |
-ROW   |66000  |800    |28578 |0       |7        |FF66FF|0        |2       |0   |
-ROW   |66001  |800    |28580 |0       |8        |009999|0        |2       |0   |
-ROW   |66002  |800    |28562 |0       |9        |BBBB00|0        |2       |0   |
-ROW   |66003  |800    |28563 |0       |10       |AA0000|0        |2       |0   |
-ROW   |66004  |800    |28575 |0       |11       |990000|0        |2       |0   |
-ROW   |66005  |800    |28576 |0       |12       |008800|0        |2       |0   |
-ROW   |66006  |800    |28582 |0       |13       |80B0E0|0        |2       |0   |
-ROW   |66007  |800    |28583 |0       |14       |4080B0|0        |2       |0   |
-ROW   |66008  |800    |29821 |0       |15       |8000FF|0        |2       |0   |
-ROW   |66009  |800    |33016 |0       |16       |2B5429|0        |2       |0   |
-ROW   |66010  |800    |34314 |0       |17       |8048B4|0        |2       |0   |
-ROW   |66011  |800    |34315 |0       |18       |FD5434|0        |2       |0   |
-ROW   |66012  |800    |35279 |0       |19       |790E1F|0        |2       |0   |
-ROW   |66013  |800    |35278 |0       |20       |87AC4D|0        |2       |0   |
-ROW   |66014  |801    |28560 |0       |0        |008800|0        |2       |0   |
-ROW   |66015  |801    |28584 |0       |1        |EE0000|0        |2       |0   |
-ROW   |66016  |802    |28550 |5       |0        |00C800|0        |2       |0   |
-ROW   |66017  |802    |28540 |0       |1        |F63100|0        |2       |0   |
-ROW   |66018  |1438   |33001 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66019  |1438   |33002 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66020  |1438   |33000 |2       |2        |F63100|0        |2       |0   |
-ROW   |66021  |1439   |33005 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66022  |1439   |33004 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66023  |1440   |32980 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66024  |1440   |32970 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66025  |1441   |32967 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66026  |1441   |32968 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66027  |1441   |32995 |2       |2        |F63100|0        |2       |0   |
-ROW   |66028  |1442   |32997 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66029  |1442   |32984 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66030  |1443   |32973 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66031  |1443   |32971 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66032  |1503   |33518 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66033  |1504   |33501 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66034  |803    |28599 |0       |0        |DD0000|0        |2       |0   |
-ROW   |66035  |803    |28596 |0       |1        |00DDDD|0        |2       |0   |
-ROW   |66036  |803    |28597 |0       |2        |3333FF|0        |2       |0   |
-ROW   |66037  |803    |28598 |0       |3        |00FF00|0        |2       |0   |
-ROW   |66038  |804    |28602 |0       |1        |990099|0        |2       |0   |
-ROW   |66039  |804    |28606 |0       |2        |990000|0        |2       |0   |
-ROW   |66040  |804    |28608 |0       |3        |0000EE|0        |2       |0   |
-ROW   |66041  |804    |28615 |0       |4        |FF33FF|0        |2       |0   |
-ROW   |66042  |804    |28610 |0       |5        |00EE00|0        |2       |0   |
-ROW   |66043  |804    |28611 |0       |6        |003300|0        |2       |0   |
-ROW   |66044  |804    |28616 |0       |7        |33FFFF|0        |2       |0   |
-ROW   |66045  |804    |28607 |0       |8        |DD0000|0        |2       |0   |
-ROW   |66046  |804    |28604 |0       |9        |000099|0        |2       |0   |
-ROW   |66047  |804    |28588 |0       |10       |00FF00|0        |2       |0   |
-ROW   |66048  |804    |33013 |0       |11       |BB2A02|0        |2       |0   |
-ROW   |66049  |805    |28612 |0       |1        |FFAA00|0        |2       |0   |
-ROW   |66050  |805    |28600 |0       |2        |990099|0        |2       |0   |
-ROW   |66051  |805    |28613 |0       |3        |EE0000|0        |2       |0   |
-ROW   |66052  |805    |28605 |0       |4        |FF66FF|0        |2       |0   |
-ROW   |66053  |805    |28614 |0       |5        |960000|0        |2       |0   |
-ROW   |66054  |805    |28601 |0       |6        |009600|0        |2       |0   |
-ROW   |66055  |805    |28603 |0       |7        |009999|0        |2       |0   |
-ROW   |66056  |805    |28609 |0       |8        |BBBB00|0        |2       |0   |
-ROW   |66057  |805    |33012 |0       |9        |F230E0|0        |2       |0   |
-ROW   |66058  |806    |28595 |0       |0        |00C800|0        |2       |0   |
-ROW   |66059  |806    |28586 |0       |1        |C80000|0        |2       |0   |
-ROW   |66060  |529    |23357 |0       |0        |DD0000|0        |2       |0   |
-ROW   |66061  |529    |23341 |0       |1        |00DDDD|0        |2       |0   |
-ROW   |66062  |529    |23342 |0       |2        |3333FF|0        |2       |0   |
-ROW   |66063  |529    |28251 |0       |3        |00FF00|0        |2       |0   |
-ROW   |66064  |530    |23345 |0       |1        |990099|0        |2       |0   |
-ROW   |66065  |530    |23348 |0       |2        |990000|0        |2       |0   |
-ROW   |66066  |530    |23355 |0       |3        |0000EE|0        |2       |0   |
-ROW   |66067  |530    |23352 |0       |4        |FF33FF|0        |2       |0   |
-ROW   |66068  |530    |23356 |0       |5        |007700|0        |2       |0   |
-ROW   |66069  |530    |23354 |0       |6        |003300|0        |2       |0   |
-ROW   |66070  |530    |23346 |0       |7        |33FFFF|0        |2       |0   |
-ROW   |66071  |530    |23349 |0       |8        |DD0000|0        |2       |0   |
-ROW   |66072  |530    |23344 |0       |9        |000099|0        |7       |0   |
-ROW   |66073  |530    |28250 |0       |10       |00FF00|0        |2       |0   |
-ROW   |66074  |530    |33019 |0       |11       |BB2A02|0        |2       |0   |
-ROW   |66075  |531    |23353 |0       |1        |FFAA00|0        |2       |0   |
-ROW   |66076  |531    |23347 |0       |2        |990099|0        |2       |0   |
-ROW   |66077  |531    |23350 |0       |3        |EE0000|0        |2       |0   |
-ROW   |66078  |531    |23343 |0       |4        |FF66FF|0        |2       |0   |
-ROW   |66079  |531    |23351 |0       |5        |0000EE|0        |2       |0   |
-ROW   |66080  |531    |23360 |0       |6        |00EE00|0        |2       |0   |
-ROW   |66081  |531    |25369 |0       |7        |009999|0        |2       |0   |
-ROW   |66082  |531    |25368 |0       |8        |BBBB00|0        |2       |0   |
-ROW   |66083  |531    |28618 |0       |9        |990000|0        |2       |0   |
-ROW   |66084  |531    |28619 |0       |10       |008800|0        |2       |0   |
-ROW   |66085  |531    |33018 |0       |11       |BB2A02|0        |2       |0   |
-ROW   |66086  |807    |28617 |0       |0        |008800|0        |2       |0   |
-ROW   |66087  |532    |23340 |5       |0        |00C800|0        |2       |0   |
-ROW   |66088  |532    |23358 |5       |1        |C80000|1        |2       |0   |
-ROW   |66089  |472    |22945 |5       |0        |00AA00|0        |2       |0   |
-ROW   |66090  |472    |22946 |5       |1        |3333FF|0        |2       |0   |
-ROW   |66091  |473    |22950 |0       |0        |C80000|0        |2       |2   |
-ROW   |66092  |473    |22948 |0       |1        |00C800|0        |2       |0   |
-ROW   |66093  |471    |22924 |0       |0        |009900|0        |2       |0   |
-ROW   |66094  |471    |22920 |0       |1        |000099|0        |2       |0   |
-ROW   |66095  |469    |22922 |0       |0        |009900|0        |2       |0   |
-ROW   |66096  |469    |22923 |0       |1        |000099|0        |2       |0   |
-ROW   |66097  |469    |22921 |0       |2        |990000|0        |2       |0   |
-ROW   |66098  |498    |23109 |0       |0        |009999|0        |2       |0   |
-ROW   |66099  |498    |23112 |0       |1        |990099|0        |2       |0   |
-ROW   |66100  |498    |23115 |0       |2        |999900|0        |2       |0   |
-ROW   |66101  |498    |23113 |0       |3        |990000|0        |2       |0   |
-ROW   |66102  |498    |23114 |0       |4        |000099|0        |2       |0   |
-ROW   |66103  |498    |23110 |0       |5        |009900|0        |2       |0   |
-ROW   |66104  |540    |22942 |5       |0        |00C800|0        |2       |0   |
-ROW   |66105  |492    |23073 |5       |0        |00AA00|0        |2       |0   |
-ROW   |66106  |492    |23074 |5       |1        |3333FF|0        |2       |0   |
-ROW   |66107  |467    |22910 |0       |0        |C80000|0        |2       |2   |
-ROW   |66108  |467    |22908 |0       |1        |00C800|0        |2       |0   |
-ROW   |66109  |465    |22884 |0       |0        |009900|0        |2       |0   |
-ROW   |66110  |465    |22880 |0       |1        |000099|0        |2       |0   |
-ROW   |66111  |463    |22882 |0       |0        |009900|0        |2       |0   |
-ROW   |66112  |463    |22883 |0       |1        |000099|0        |2       |0   |
-ROW   |66113  |463    |22881 |0       |2        |990000|0        |2       |0   |
-ROW   |66114  |462    |22886 |1       |0        |009999|0        |2       |0   |
-ROW   |66115  |462    |22888 |1       |1        |990099|0        |2       |0   |
-ROW   |66116  |462    |22891 |1       |2        |990000|0        |2       |0   |
-ROW   |66117  |462    |22892 |1       |3        |000099|0        |2       |0   |
-ROW   |66118  |462    |22885 |1       |4        |009900|0        |2       |0   |
-ROW   |66119  |541    |22902 |5       |0        |00C800|0        |2       |0   |
-ROW   |66120  |464    |22897 |0       |0        |AA0000|0        |2       |2   |
-ROW   |66121  |464    |22895 |0       |1        |00AA00|0        |2       |0   |
-ROW   |66122  |478    |22985 |5       |0        |00AA00|0        |2       |0   |
-ROW   |66123  |478    |22986 |5       |1        |3333FF|0        |2       |0   |
-ROW   |66124  |479    |22990 |0       |0        |C80000|0        |2       |2   |
-ROW   |66125  |479    |22988 |0       |1        |00C800|0        |2       |0   |
-ROW   |66126  |475    |22962 |0       |0        |009900|0        |2       |0   |
-ROW   |66127  |475    |22963 |0       |1        |000099|0        |2       |0   |
-ROW   |66128  |475    |22961 |0       |2        |990000|0        |2       |0   |
-ROW   |66129  |474    |22968 |1       |0        |990099|0        |2       |0   |
-ROW   |66130  |474    |22971 |1       |1        |990000|0        |2       |0   |
-ROW   |66131  |474    |22972 |1       |2        |000099|0        |2       |0   |
-ROW   |66132  |474    |22965 |1       |3        |009900|0        |2       |0   |
-ROW   |66133  |542    |22982 |5       |0        |00C800|0        |2       |0   |
-ROW   |66134  |491    |23070 |0       |0        |C80000|0        |2       |2   |
-ROW   |66135  |491    |23068 |0       |1        |00C800|0        |2       |0   |
-ROW   |66136  |487    |23042 |0       |0        |009900|0        |2       |0   |
-ROW   |66137  |487    |23043 |0       |1        |000099|0        |2       |0   |
-ROW   |66138  |487    |23041 |0       |2        |990000|0        |2       |0   |
-ROW   |66139  |543    |23062 |5       |0        |00C800|0        |2       |0   |
-ROW   |66140  |494    |23077 |5       |0        |00AA00|0        |2       |0   |
-ROW   |66141  |494    |23078 |5       |1        |3333FF|0        |2       |0   |
-ROW   |66142  |493    |23075 |5       |0        |00AA00|0        |2       |0   |
-ROW   |66143  |493    |23076 |5       |1        |3333FF|0        |2       |0   |
-ROW   |66144  |461    |22870 |0       |0        |C80000|0        |2       |2   |
-ROW   |66145  |461    |22868 |0       |1        |00C800|0        |2       |0   |
-ROW   |66146  |459    |22844 |0       |0        |009900|0        |2       |0   |
-ROW   |66147  |459    |22840 |0       |1        |000099|0        |2       |0   |
-ROW   |66148  |457    |22842 |0       |0        |009900|0        |2       |0   |
-ROW   |66149  |457    |22843 |0       |1        |000099|0        |2       |0   |
-ROW   |66150  |457    |22841 |0       |2        |990000|0        |2       |0   |
-ROW   |66151  |456    |22846 |1       |0        |009999|0        |2       |0   |
-ROW   |66152  |456    |22848 |1       |1        |990099|0        |2       |0   |
-ROW   |66153  |456    |22851 |1       |2        |990000|0        |2       |0   |
-ROW   |66154  |456    |22852 |1       |3        |000099|0        |2       |0   |
-ROW   |66155  |456    |22845 |1       |4        |009900|0        |2       |0   |
-ROW   |66156  |544    |22862 |5       |0        |00C800|0        |2       |0   |
-ROW   |66157  |458    |22857 |0       |0        |AA0000|0        |2       |2   |
-ROW   |66158  |458    |22855 |0       |1        |00AA00|0        |2       |0   |
-ROW   |66159  |484    |23025 |5       |0        |00AA00|0        |2       |0   |
-ROW   |66160  |484    |23026 |5       |1        |3333FF|0        |2       |0   |
-ROW   |66161  |485    |23030 |0       |0        |C80000|0        |2       |2   |
-ROW   |66162  |485    |23028 |0       |1        |00C800|0        |2       |0   |
-ROW   |66163  |483    |23004 |0       |0        |009900|0        |2       |0   |
-ROW   |66164  |483    |23000 |0       |1        |000099|0        |2       |0   |
-ROW   |66165  |481    |23002 |0       |0        |009900|0        |2       |0   |
-ROW   |66166  |481    |23003 |0       |1        |000099|0        |2       |0   |
-ROW   |66167  |481    |23001 |0       |2        |990000|0        |2       |0   |
-ROW   |66168  |480    |23007 |1       |0        |999900|0        |2       |0   |
-ROW   |66169  |480    |23011 |1       |1        |990000|0        |2       |0   |
-ROW   |66170  |480    |23012 |1       |2        |000099|0        |2       |0   |
-ROW   |66171  |480    |23005 |1       |3        |009900|0        |2       |0   |
-ROW   |66172  |545    |23022 |5       |0        |00C800|0        |2       |0   |
-ROW   |66173  |482    |23017 |0       |0        |AA0000|0        |2       |2   |
-ROW   |66174  |482    |23015 |0       |1        |00AA00|0        |2       |0   |
-ROW   |66175  |651    |26928 |5       |0        |EE0000|0        |2       |0   |
-ROW   |66176  |651    |26927 |0       |1        |000000|1        |2       |0   |
-ROW   |66177  |652    |26925 |2       |0        |880000|0        |2       |0   |
-ROW   |66178  |652    |26932 |0       |1        |009900|0        |2       |0   |
-ROW   |66179  |652    |26930 |0       |2        |00CCCC|0        |2       |0   |
-ROW   |66180  |652    |26931 |0       |3        |000000|0        |2       |0   |
-ROW   |66181  |652    |26929 |0       |4        |3333FF|0        |2       |0   |
-ROW   |66182  |652    |26926 |0       |5        |777700|0        |2       |0   |
-ROW   |66183  |653    |26933 |2       |0        |EE0000|0        |2       |0   |
-ROW   |66184  |653    |26943 |2       |1        |EE00EE|0        |2       |0   |
-ROW   |66185  |653    |26935 |0       |2        |000000|1        |2       |0   |
-ROW   |66186  |653    |26936 |4       |3        |000000|1        |2       |0   |
-ROW   |66187  |654    |26934 |2       |0        |880000|0        |2       |0   |
-ROW   |66188  |654    |26939 |0       |1        |009900|0        |2       |0   |
-ROW   |66189  |654    |26942 |0       |2        |00CCCC|0        |2       |0   |
-ROW   |66190  |654    |26938 |0       |3        |000000|0        |2       |0   |
-ROW   |66191  |654    |26937 |0       |4        |3333FF|0        |2       |0   |
-ROW   |66192  |1447   |33113 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66193  |1447   |33112 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66194  |1447   |33099 |0       |2        |F63100|0        |2       |0   |
-ROW   |66195  |1447   |33098 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66196  |1448   |33125 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66197  |1448   |33110 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66198  |1449   |33080 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66199  |1449   |33081 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66200  |1450   |33089 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66201  |1450   |33085 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66202  |1451   |33082 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66203  |1451   |33086 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66204  |1451   |33083 |0       |2        |F63100|0        |2       |0   |
-ROW   |66205  |1451   |33084 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66206  |1451   |33087 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66207  |1451   |33088 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66208  |1452   |33093 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66209  |1452   |33092 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66210  |1453   |33077 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66211  |1453   |33063 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66212  |1454   |33094 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66213  |1454   |33059 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66214  |1455   |33066 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66215  |1455   |33071 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66216  |1455   |33067 |0       |2        |F63100|0        |2       |0   |
-ROW   |66217  |1455   |33068 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66218  |1455   |33072 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66219  |1455   |33073 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66220  |1159   |30886 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66221  |1159   |30887 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66222  |1160   |30888 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66223  |1160   |30882 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66224  |1160   |30890 |0       |2        |F63100|0        |2       |0   |
-ROW   |66225  |1160   |30881 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66226  |1160   |30889 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66227  |1161   |30847 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66228  |1161   |30872 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66229  |1162   |30853 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66230  |1162   |30849 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66231  |1162   |30852 |2       |2        |F63100|0        |2       |0   |
-ROW   |66232  |1162   |30851 |2       |3        |A54F10|0        |2       |0   |
-ROW   |66233  |1162   |30848 |2       |4        |FC6EA3|0        |2       |0   |
-ROW   |66234  |1163   |30856 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66235  |1163   |30855 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66236  |1163   |30854 |2       |2        |F63100|1        |2       |0   |
-ROW   |66237  |1164   |30859 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66238  |1164   |30870 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66239  |1165   |30860 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66240  |1165   |30871 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66241  |1166   |30868 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66242  |1166   |30869 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66243  |1166   |30867 |0       |2        |F63100|0        |2       |0   |
-ROW   |66244  |1166   |30866 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66245  |1166   |30865 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66246  |1167   |30850 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66247  |1167   |30863 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66248  |1167   |30861 |5       |2        |F63100|0        |2       |0   |
-ROW   |66249  |1168   |30833 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66250  |1168   |30841 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66251  |1168   |30857 |2       |2        |F63100|0        |2       |0   |
-ROW   |66252  |1169   |30834 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66253  |1169   |30831 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66254  |1170   |30846 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66255  |1576   |34320 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66256  |1576   |30845 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66257  |1576   |30842 |0       |2        |F63100|0        |2       |0   |
-ROW   |66258  |1576   |30873 |2       |3        |A54F10|1        |2       |0   |
-ROW   |66259  |1663   |35291 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66260  |1663   |35300 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66261  |1664   |35295 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66262  |1664   |35296 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66263  |1665   |35301 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66264  |1665   |35306 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66265  |1665   |35304 |0       |2        |F63100|0        |2       |0   |
-ROW   |66266  |1665   |35302 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66267  |1666   |35308 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66268  |1666   |35310 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66269  |1666   |35309 |0       |2        |F63100|0        |2       |0   |
-ROW   |66270  |1667   |35322 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66271  |1667   |35320 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66272  |1668   |35329 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66273  |1668   |35330 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66274  |1669   |35332 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66275  |1669   |35334 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66276  |1670   |35335 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66277  |1670   |35333 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66278  |1671   |35338 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66279  |1671   |35341 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66280  |1671   |35339 |0       |2        |F63100|0        |2       |0   |
-ROW   |66281  |1671   |35340 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66282  |1672   |35347 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66283  |1672   |35346 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66284  |1672   |35345 |0       |2        |F63100|0        |2       |0   |
-ROW   |66285  |1673   |35350 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66286  |1673   |35351 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66287  |1674   |35349 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66288  |1674   |35352 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66289  |1674   |35353 |0       |2        |F63100|0        |2       |0   |
-ROW   |66290  |1675   |35355 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66291  |1675   |35356 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66292  |1505   |33553 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66293  |1505   |33562 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66294  |1506   |33557 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66295  |1506   |33558 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66296  |1507   |33563 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66297  |1507   |33568 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66298  |1507   |33566 |0       |2        |F63100|0        |2       |0   |
-ROW   |66299  |1507   |33564 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66300  |1508   |33570 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66301  |1508   |33572 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66302  |1508   |33571 |0       |2        |F63100|0        |2       |0   |
-ROW   |66303  |1509   |33584 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66304  |1509   |33582 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66305  |1510   |33591 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66306  |1510   |33592 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66307  |1511   |33594 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66308  |1511   |33596 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66309  |1512   |33597 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66310  |1512   |33595 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66311  |1513   |33600 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66312  |1513   |33603 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66313  |1513   |33601 |0       |2        |F63100|0        |2       |0   |
-ROW   |66314  |1513   |33602 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66315  |1514   |33609 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66316  |1514   |33608 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66317  |1514   |33607 |0       |2        |F63100|0        |2       |0   |
-ROW   |66318  |1515   |33612 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66319  |1515   |33613 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66320  |1516   |33611 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66321  |1516   |33614 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66322  |1516   |33615 |0       |2        |F63100|0        |2       |0   |
-ROW   |66323  |1517   |33617 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66324  |1517   |33618 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66325  |1527   |33819 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66326  |1527   |33839 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66327  |1528   |33820 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66328  |1528   |33816 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66329  |1529   |33826 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66330  |1529   |33831 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66331  |1529   |33829 |0       |2        |F63100|0        |2       |0   |
-ROW   |66332  |1529   |33821 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66333  |1529   |33825 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66334  |1529   |33833 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66335  |1529   |33823 |2       |6        |AC8C14|0        |2       |0   |
-ROW   |66336  |1530   |33828 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66337  |1530   |33832 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66338  |1530   |33830 |0       |2        |F63100|0        |2       |0   |
-ROW   |66339  |1530   |33822 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66340  |1530   |33815 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66341  |1530   |33834 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66342  |1530   |33824 |2       |6        |AC8C14|0        |2       |0   |
-ROW   |66343  |1531   |33840 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66344  |1531   |33845 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66345  |1532   |33844 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66346  |1532   |33847 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66347  |1532   |33843 |0       |2        |F63100|0        |2       |0   |
-ROW   |66348  |1532   |33841 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66349  |1533   |33863 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66350  |1534   |33792 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66351  |1534   |33791 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66352  |1534   |33793 |0       |2        |F63100|0        |2       |0   |
-ROW   |66353  |1535   |33802 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66354  |1535   |33770 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66355  |1536   |33800 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66356  |1536   |33799 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66357  |1536   |33801 |0       |2        |F63100|0        |2       |0   |
-ROW   |66358  |1537   |33798 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66359  |1537   |33806 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66360  |1537   |33774 |0       |2        |F63100|0        |2       |0   |
-ROW   |66361  |1538   |33769 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66362  |1538   |33787 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66363  |1538   |33789 |0       |2        |F63100|0        |2       |0   |
-ROW   |66364  |1538   |33790 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66365  |1539   |33785 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66366  |1539   |33772 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66367  |1539   |33773 |0       |2        |F63100|0        |2       |0   |
-ROW   |66368  |1539   |33771 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66369  |1540   |33776 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66370  |1540   |33775 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66371  |1541   |33782 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66372  |1541   |33781 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66373  |1541   |33780 |0       |2        |F63100|0        |2       |0   |
-ROW   |66374  |1541   |33783 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66375  |1541   |33777 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66376  |1541   |33778 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66377  |1542   |33804 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66378  |1542   |33803 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66379  |1542   |33805 |2       |2        |F63100|0        |2       |0   |
-ROW   |66380  |1543   |33937 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66381  |1543   |33940 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66382  |1543   |33936 |0       |2        |F63100|0        |2       |0   |
-ROW   |66383  |1543   |33934 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66384  |1544   |33915 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66385  |1544   |33911 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66386  |1544   |33912 |0       |2        |F63100|0        |2       |0   |
-ROW   |66387  |1544   |33910 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66388  |1544   |33914 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66389  |1545   |33918 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66390  |1545   |33905 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66391  |1545   |33917 |0       |2        |F63100|0        |2       |0   |
-ROW   |66392  |1545   |33916 |2       |3        |A54F10|1        |2       |0   |
-ROW   |66393  |1546   |33908 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66394  |1546   |33909 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66395  |1546   |33902 |0       |2        |F63100|0        |2       |0   |
-ROW   |66396  |1547   |33893 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66397  |1547   |33892 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66398  |1548   |33899 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66399  |1548   |33898 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66400  |1548   |33895 |2       |2        |F63100|0        |2       |0   |
-ROW   |66401  |1548   |33900 |2       |3        |A54F10|0        |2       |0   |
-ROW   |66402  |1548   |33896 |2       |4        |FC6EA3|0        |2       |0   |
-ROW   |66403  |1548   |33891 |2       |5        |6C59DC|0        |2       |0   |
-ROW   |66404  |1190   |31140 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66405  |1190   |31141 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66406  |1261   |31145 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66407  |1261   |31146 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66408  |1261   |31147 |0       |2        |F63100|0        |2       |0   |
-ROW   |66409  |1191   |31138 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66410  |1192   |31157 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66411  |1192   |31158 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66412  |1193   |31092 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66413  |1193   |31108 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66414  |1193   |31110 |0       |2        |F63100|0        |2       |0   |
-ROW   |66415  |1193   |31067 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66416  |1193   |31086 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66417  |1193   |31087 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66418  |1194   |31120 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66419  |1194   |31105 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66420  |1194   |31071 |0       |2        |F63100|0        |2       |0   |
-ROW   |66421  |1194   |31081 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66422  |1195   |31098 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66423  |1195   |31099 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66424  |1196   |31072 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66425  |1196   |31072 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66426  |1197   |31103 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66427  |1197   |31074 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66428  |1198   |31104 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66429  |1198   |31063 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66430  |1198   |31111 |0       |2        |F63100|0        |2       |0   |
-ROW   |66431  |1198   |31112 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66432  |1198   |31084 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66433  |1199   |31115 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66434  |1199   |31116 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66435  |1199   |31062 |0       |2        |F63100|0        |2       |0   |
-ROW   |66436  |1199   |31118 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66437  |1199   |31056 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66438  |1200   |31107 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66439  |1200   |31090 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66440  |1201   |31097 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66441  |1201   |31096 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66442  |1202   |31089 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66443  |1202   |31061 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66444  |1203   |31064 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66445  |1204   |31065 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66446  |1204   |31066 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66447  |1204   |31068 |0       |2        |F63100|0        |2       |0   |
-ROW   |66448  |1204   |31070 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66449  |1204   |31101 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66450  |1204   |31106 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66451  |1204   |31114 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |66452  |1205   |31069 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66453  |1206   |31076 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66454  |1206   |31078 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66455  |1206   |31109 |0       |2        |F63100|0        |2       |0   |
-ROW   |66456  |1206   |31075 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66457  |1207   |31080 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66458  |1207   |31095 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66459  |1208   |31113 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66460  |1208   |31118 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66461  |1209   |31058 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66462  |1209   |31077 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66463  |1209   |31056 |0       |2        |F63100|0        |2       |0   |
-ROW   |66464  |1209   |31117 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66465  |1109   |30453 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66466  |1109   |30455 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66467  |1110   |30471 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66468  |1110   |30470 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66469  |1110   |30466 |0       |2        |F63100|0        |2       |0   |
-ROW   |66470  |1110   |30441 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66471  |1111   |30463 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66472  |1111   |30452 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66473  |1111   |30451 |0       |2        |F63100|0        |2       |0   |
-ROW   |66474  |1111   |30437 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66475  |1112   |30456 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66476  |1112   |30457 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66477  |1112   |30458 |0       |2        |F63100|0        |2       |0   |
-ROW   |66478  |1112   |30459 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66479  |1113   |30442 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66480  |1113   |30444 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66481  |1113   |30445 |0       |2        |F63100|0        |2       |0   |
-ROW   |66482  |1114   |30446 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66483  |1114   |30447 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66484  |1114   |31168 |0       |2        |F63100|0        |2       |0   |
-ROW   |66485  |1114   |30449 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66486  |1136   |30659 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66487  |1136   |30661 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66488  |1137   |30677 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66489  |1137   |30676 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66490  |1137   |30672 |0       |2        |F63100|0        |2       |0   |
-ROW   |66491  |1137   |30647 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66492  |1138   |30669 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66493  |1138   |30658 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66494  |1138   |30657 |0       |2        |F63100|0        |2       |0   |
-ROW   |66495  |1138   |30643 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66496  |1139   |30662 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66497  |1139   |30663 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66498  |1139   |30664 |0       |2        |F63100|0        |2       |0   |
-ROW   |66499  |1139   |30665 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66500  |1140   |30648 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66501  |1140   |30650 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66502  |1140   |30651 |0       |2        |F63100|0        |2       |0   |
-ROW   |66503  |1141   |30652 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66504  |1141   |30653 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66505  |1141   |31172 |0       |2        |F63100|0        |2       |0   |
-ROW   |66506  |1141   |30655 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66507  |1115   |30506 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66508  |1115   |30507 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66509  |1116   |30504 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66510  |1116   |30505 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66511  |1116   |30518 |0       |2        |F63100|0        |2       |0   |
-ROW   |66512  |1116   |30492 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66513  |1117   |30493 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66514  |1117   |30500 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66515  |1117   |30486 |0       |2        |F63100|0        |2       |0   |
-ROW   |66516  |1117   |30488 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66517  |1118   |30508 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66518  |1118   |30509 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66519  |1118   |30503 |0       |2        |F63100|0        |2       |0   |
-ROW   |66520  |1118   |30510 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66521  |1119   |30491 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66522  |1119   |30494 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66523  |1119   |30495 |0       |2        |F63100|0        |2       |0   |
-ROW   |66524  |1120   |30496 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66525  |1120   |30497 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66526  |1120   |31176 |0       |2        |F63100|0        |2       |0   |
-ROW   |66527  |1120   |30499 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66528  |1266   |31773 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66529  |1266   |31774 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66530  |1267   |31777 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66531  |1267   |31779 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66532  |1267   |33168 |0       |2        |F63100|0        |2       |0   |
-ROW   |66533  |1268   |31685 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66534  |1268   |31738 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66535  |1269   |31723 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66536  |1269   |31757 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66537  |1269   |31721 |0       |2        |F63100|0        |2       |0   |
-ROW   |66538  |1270   |31728 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66539  |1270   |31759 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66540  |1271   |31745 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66541  |1271   |31727 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66542  |1272   |31687 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66543  |1272   |31710 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66544  |1273   |31705 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66545  |1273   |31703 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66546  |1273   |31706 |0       |2        |F63100|0        |2       |0   |
-ROW   |66547  |1273   |31701 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66548  |1273   |31708 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66549  |1274   |31715 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66550  |1274   |31726 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66551  |1274   |31717 |0       |2        |F63100|0        |2       |0   |
-ROW   |66552  |1274   |31716 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66553  |1274   |31714 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66554  |1274   |31713 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66555  |1210   |31261 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66556  |1210   |31262 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66557  |1211   |31269 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66558  |1211   |31271 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66559  |1211   |33170 |0       |2        |F63100|0        |2       |0   |
-ROW   |66560  |1212   |31233 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66561  |1212   |31234 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66562  |1213   |31216 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66563  |1213   |31237 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66564  |1213   |31214 |0       |2        |F63100|0        |2       |0   |
-ROW   |66565  |1214   |31191 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66566  |1214   |31221 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66567  |1215   |31206 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66568  |1215   |31220 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66569  |1216   |31192 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66570  |1216   |31193 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66571  |1217   |31200 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66572  |1217   |31197 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66573  |1217   |31201 |0       |2        |F63100|0        |2       |0   |
-ROW   |66574  |1217   |31198 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66575  |1217   |31202 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66576  |1218   |31207 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66577  |1218   |31208 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66578  |1218   |31210 |0       |2        |F63100|0        |2       |0   |
-ROW   |66579  |1218   |31209 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66580  |1218   |31219 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66581  |1218   |31205 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66582  |1380   |32423 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66583  |1380   |32421 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66584  |1381   |32405 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66585  |1382   |32426 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66586  |1382   |32408 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66587  |1382   |32422 |0       |2        |F63100|0        |2       |0   |
-ROW   |66588  |1382   |32425 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66589  |1383   |32409 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66590  |1384   |32419 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |66591  |1384   |32416 |0       |1        |2774A4|1        |2       |0   |
-ROW   |66592  |1384   |32413 |0       |2        |F63100|1        |2       |0   |
-ROW   |66593  |1384   |32418 |5       |3        |A54F10|0        |2       |0   |
-ROW   |66594  |1384   |32415 |5       |4        |FC6EA3|0        |2       |0   |
-ROW   |66595  |1384   |32412 |5       |5        |6C59DC|0        |2       |0   |
-ROW   |66596  |1385   |32420 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66597  |1385   |32417 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66598  |1385   |32414 |0       |2        |F63100|0        |2       |0   |
-ROW   |66599  |1386   |32433 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66600  |1386   |32432 |0       |1        |2774A4|1        |2       |0   |
-ROW   |66601  |1387   |32431 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66602  |1387   |32430 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66603  |1387   |32429 |0       |2        |F63100|0        |2       |0   |
-ROW   |66604  |1387   |32428 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66605  |1387   |32427 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66606  |1388   |32386 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |66607  |1388   |32391 |0       |1        |2774A4|1        |2       |0   |
-ROW   |66608  |1388   |32387 |0       |2        |F63100|1        |2       |0   |
-ROW   |66609  |1388   |32390 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66610  |1388   |32395 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66611  |1388   |32389 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66612  |1389   |32393 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66613  |1389   |32392 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66614  |1389   |32394 |0       |2        |F63100|1        |2       |0   |
-ROW   |66615  |1389   |32388 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66616  |1390   |32401 |5       |0        |1A7C11|1        |2       |0   |
-ROW   |66617  |1390   |32402 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66618  |1390   |32397 |0       |2        |F63100|1        |2       |0   |
-ROW   |66619  |1390   |32398 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66620  |1390   |32399 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |66621  |1390   |32400 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |66622  |1390   |32396 |0       |6        |AC8C14|1        |2       |0   |
-ROW   |66623  |1391   |32367 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66624  |1391   |32366 |0       |1        |2774A4|1        |2       |0   |
-ROW   |66625  |1392   |32370 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66626  |1393   |32382 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |66627  |1393   |32381 |0       |1        |2774A4|1        |2       |0   |
-ROW   |66628  |1393   |32383 |0       |2        |F63100|1        |2       |0   |
-ROW   |66629  |1393   |32384 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66630  |1394   |32377 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66631  |1394   |32374 |0       |1        |2774A4|1        |2       |0   |
-ROW   |66632  |1395   |32403 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66633  |1395   |32385 |0       |1        |2774A4|1        |2       |0   |
-ROW   |66634  |1219   |31363 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66635  |1219   |31346 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66636  |1219   |31345 |0       |2        |F63100|0        |2       |0   |
-ROW   |66637  |1219   |31344 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66638  |1219   |31343 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66639  |1219   |31342 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66640  |1219   |31340 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |66641  |1219   |31339 |0       |7        |611F27|0        |2       |0   |
-ROW   |66642  |1219   |31341 |0       |8        |F230E0|0        |2       |0   |
-ROW   |66643  |1219   |31341 |0       |9        |FFAD40|0        |2       |0   |
-ROW   |66644  |1220   |31337 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66645  |1221   |31360 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66646  |1221   |31359 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66647  |1221   |31357 |0       |2        |F63100|0        |2       |0   |
-ROW   |66648  |1221   |31356 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66649  |1221   |31354 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66650  |1221   |31353 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66651  |1221   |31352 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |66652  |1221   |31350 |0       |7        |611F27|0        |2       |0   |
-ROW   |66653  |1221   |31351 |0       |8        |F230E0|0        |2       |0   |
-ROW   |66654  |1221   |31338 |0       |9        |FFAD40|0        |2       |0   |
-ROW   |66655  |1221   |31349 |0       |10       |40CDFF|0        |2       |0   |
-ROW   |66656  |1221   |31348 |0       |11       |40FFA0|0        |2       |0   |
-ROW   |66657  |1221   |31347 |0       |12       |AE4500|0        |2       |0   |
-ROW   |66658  |1222   |31336 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66659  |1456   |33178 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66660  |1456   |33179 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66661  |1456   |33180 |0       |2        |F63100|0        |2       |0   |
-ROW   |66662  |1087   |30346 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66663  |1087   |30345 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66664  |1088   |30350 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66665  |1088   |30349 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66666  |1089   |30396 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66667  |1090   |30398 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66668  |1091   |30322 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66669  |1091   |30277 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66670  |1092   |30284 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66671  |1093   |30313 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66672  |1093   |30314 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66673  |1093   |30315 |5       |2        |F63100|0        |2       |0   |
-ROW   |66674  |1093   |30316 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66675  |1094   |30279 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66676  |1094   |30280 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66677  |1095   |30290 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66678  |1095   |30293 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66679  |1096   |30318 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66680  |1096   |30308 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66681  |1096   |30320 |2       |2        |F63100|0        |2       |0   |
-ROW   |66682  |1097   |30317 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66683  |1098   |30289 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66684  |1098   |30291 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66685  |1099   |30334 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66686  |1099   |30325 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66687  |1100   |30306 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66688  |1101   |30274 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66689  |1102   |30281 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66690  |1577   |34351 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66691  |1577   |34350 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66692  |1578   |34387 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66693  |1578   |34388 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66694  |1579   |34393 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66695  |1579   |34386 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66696  |1580   |34370 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66697  |1580   |34384 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66698  |1580   |34383 |0       |2        |F63100|0        |2       |0   |
-ROW   |66699  |1581   |34438 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66700  |1581   |34413 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66701  |1581   |34427 |0       |2        |F63100|0        |2       |0   |
-ROW   |66702  |1582   |34420 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66703  |1582   |34419 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66704  |1582   |34418 |0       |2        |F63100|0        |2       |0   |
-ROW   |66705  |1060   |30159 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66706  |1065   |30161 |0       |0        |969696|0        |9       |2   |
-ROW   |66707  |1065   |30162 |0       |1        |C80000|0        |9       |0   |
-ROW   |66708  |1070   |30142 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66709  |741    |27084 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66710  |741    |27085 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66711  |741    |27083 |0       |2        |F63100|1        |2       |0   |
-ROW   |66712  |741    |27086 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66713  |741    |27082 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |66714  |741    |27079 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |66715  |745    |27104 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66716  |745    |27105 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66717  |745    |27103 |0       |2        |F63100|1        |2       |0   |
-ROW   |66718  |745    |27106 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66719  |745    |27102 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |66720  |745    |27099 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |66721  |766    |27124 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66722  |766    |27125 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66723  |766    |27123 |0       |2        |F63100|1        |2       |0   |
-ROW   |66724  |766    |27126 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66725  |766    |27122 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |66726  |766    |27119 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |66727  |668    |27208 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66728  |1032   |30088 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66729  |1032   |30087 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66730  |1033   |30089 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66731  |671    |27240 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66732  |1034   |30093 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66733  |675    |27294 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66734  |1035   |30094 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66735  |1676   |35369 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66736  |1677   |35372 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66737  |1678   |35379 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66738  |1678   |35386 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66739  |1678   |35377 |0       |2        |F63100|0        |2       |0   |
-ROW   |66740  |1678   |35384 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66741  |1678   |35376 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66742  |1678   |35383 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66743  |1679   |35387 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66744  |1679   |35380 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66745  |1680   |35378 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66746  |1680   |35385 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66747  |1681   |35403 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66748  |1681   |35404 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66749  |1549   |33966 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66750  |1550   |33971 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66751  |1551   |33974 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66752  |1551   |33977 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66753  |1551   |33976 |0       |2        |F63100|1        |2       |0   |
-ROW   |66754  |1551   |33973 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66755  |1551   |33975 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |66756  |1551   |33972 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |66757  |1552   |34007 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66758  |1553   |34012 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66759  |1554   |34015 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66760  |1554   |34018 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66761  |1554   |34017 |0       |2        |F63100|1        |2       |0   |
-ROW   |66762  |1554   |34014 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66763  |1554   |34016 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |66764  |1554   |34013 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |66765  |1555   |34048 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66766  |1556   |34053 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66767  |1557   |34056 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66768  |1557   |34059 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66769  |1557   |34058 |0       |2        |F63100|1        |2       |0   |
-ROW   |66770  |1557   |34055 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66771  |1557   |34057 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |66772  |1557   |34054 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |66773  |1558   |34089 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66774  |1559   |34094 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66775  |1560   |34097 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66776  |1560   |34100 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66777  |1560   |34099 |0       |2        |F63100|1        |2       |0   |
-ROW   |66778  |1560   |34096 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66779  |1560   |34098 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |66780  |1560   |34095 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |66781  |1561   |34130 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66782  |1562   |34135 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66783  |1563   |34138 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66784  |1563   |34141 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66785  |1563   |34140 |0       |2        |F63100|1        |2       |0   |
-ROW   |66786  |1563   |34137 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66787  |1563   |34139 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |66788  |1563   |34136 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |66789  |1038   |30101 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66790  |786    |28246 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66791  |687    |27417 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66792  |691    |27376 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66793  |694    |27478 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66794  |1042   |30105 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66795  |1043   |30107 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66796  |698    |27511 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66797  |1044   |30108 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66798  |701    |27547 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66799  |1045   |27591 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66800  |1045   |30110 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66801  |1046   |30111 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66802  |704    |27586 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66803  |1682   |35439 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66804  |1683   |35441 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66805  |1684   |35443 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66806  |1685   |35446 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66807  |1686   |35450 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66808  |1686   |35465 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66809  |1686   |35456 |0       |2        |F63100|0        |2       |0   |
-ROW   |66810  |1686   |35447 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66811  |1686   |35468 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66812  |1686   |35471 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66813  |1686   |35459 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |66814  |1687   |35449 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66815  |1687   |35464 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66816  |1687   |35455 |0       |2        |F63100|0        |2       |0   |
-ROW   |66817  |1687   |35461 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66818  |1687   |35467 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66819  |1687   |35470 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66820  |1687   |35457 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |66821  |1688   |35473 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66822  |1688   |35463 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66823  |1688   |35454 |0       |2        |F63100|0        |2       |0   |
-ROW   |66824  |1688   |35472 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66825  |1688   |35466 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66826  |1688   |35469 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66827  |1688   |35458 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |66828  |1689   |35474 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66829  |1690   |35476 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66830  |1691   |35478 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66831  |1691   |35480 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66832  |1692   |35487 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66833  |1692   |35484 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66834  |1693   |35486 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66835  |1693   |35483 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66836  |1694   |35490 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66837  |1694   |35488 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66838  |1694   |35489 |0       |2        |F63100|0        |2       |0   |
-ROW   |66839  |1695   |35497 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66840  |1695   |35493 |0       |1        |2774A4|1        |2       |0   |
-ROW   |66841  |1695   |35503 |0       |2        |F63100|0        |2       |0   |
-ROW   |66842  |1695   |35499 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66843  |1695   |35496 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66844  |1695   |35502 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66845  |1696   |35508 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66846  |1696   |35507 |0       |1        |2774A4|1        |2       |0   |
-ROW   |66847  |1696   |35510 |0       |2        |F63100|0        |2       |0   |
-ROW   |66848  |1696   |35509 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66849  |1697   |35516 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66850  |1697   |35515 |0       |1        |2774A4|1        |2       |0   |
-ROW   |66851  |1697   |35518 |0       |2        |F63100|0        |2       |0   |
-ROW   |66852  |1697   |35517 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66853  |1698   |35524 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66854  |1698   |35523 |0       |1        |2774A4|1        |2       |0   |
-ROW   |66855  |1698   |35526 |0       |2        |F63100|0        |2       |0   |
-ROW   |66856  |1698   |35525 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66857  |1699   |35531 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66858  |1699   |35529 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66859  |1699   |35530 |0       |2        |F63100|0        |2       |0   |
-ROW   |66860  |1700   |35411 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66861  |1700   |35409 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66862  |1700   |35407 |0       |2        |F63100|0        |2       |0   |
-ROW   |66863  |1700   |35413 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66864  |1700   |35412 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66865  |1700   |35410 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66866  |708    |27671 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66867  |1047   |30112 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66868  |1048   |30114 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66869  |1048   |30113 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66870  |1049   |30115 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66871  |775    |28143 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66872  |714    |27753 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66873  |1050   |30116 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66874  |856    |28894 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66875  |1051   |30118 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66876  |1564   |34166 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66877  |1564   |34169 |2       |1        |2774A4|0        |2       |0   |
-ROW   |66878  |1564   |34168 |0       |2        |F63100|1        |2       |0   |
-ROW   |66879  |1564   |34165 |0       |3        |A54F10|1        |2       |0   |
-ROW   |66880  |1564   |34167 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |66881  |1564   |34164 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |66882  |1565   |34174 |0       |0        |969696|0        |9       |2   |
-ROW   |66883  |1565   |34175 |0       |1        |C80000|0        |9       |0   |
-ROW   |66884  |1566   |34178 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66885  |1567   |34154 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66886  |724    |27904 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66887  |1396   |32439 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66888  |1396   |32437 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66889  |1396   |32436 |0       |2        |F63100|0        |2       |0   |
-ROW   |66890  |1396   |32438 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66891  |1052   |27907 |0       |0        |969696|0        |9       |2   |
-ROW   |66892  |1052   |27908 |0       |1        |C80000|0        |9       |0   |
-ROW   |66893  |1053   |30120 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66894  |1457   |33206 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66895  |1457   |33193 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66896  |1458   |33195 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66897  |1458   |33203 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66898  |1458   |33202 |5       |2        |F63100|0        |2       |0   |
-ROW   |66899  |1459   |33200 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66900  |1459   |33194 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66901  |1460   |33187 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66902  |1460   |33186 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66903  |1460   |33204 |5       |2        |F63100|0        |2       |0   |
-ROW   |66904  |1461   |33226 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66905  |1461   |33215 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66906  |1462   |33207 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66907  |1463   |33223 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66908  |1463   |33218 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66909  |1464   |33210 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66910  |1464   |33209 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66911  |1464   |33224 |5       |2        |F63100|0        |2       |0   |
-ROW   |66912  |1465   |33249 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66913  |1465   |33236 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66914  |1466   |33238 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66915  |1466   |33246 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66916  |1466   |33245 |5       |2        |F63100|0        |2       |0   |
-ROW   |66917  |1467   |33243 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66918  |1467   |33237 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66919  |1468   |33230 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66920  |1468   |33229 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66921  |1468   |33247 |5       |2        |F63100|0        |2       |0   |
-ROW   |66922  |1469   |33258 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66923  |1470   |33251 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66924  |1471   |33256 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66925  |1472   |33277 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66926  |1473   |33274 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66927  |1473   |33273 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66928  |1473   |33272 |5       |2        |F63100|0        |2       |0   |
-ROW   |66929  |1474   |33270 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66930  |1475   |33269 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66931  |1476   |33261 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66932  |1476   |33275 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66933  |1477   |33296 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66934  |1478   |33293 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66935  |1478   |33292 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66936  |1478   |33291 |5       |2        |F63100|0        |2       |0   |
-ROW   |66937  |1479   |33289 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66938  |1480   |33288 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66939  |1481   |33280 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66940  |1481   |33294 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66941  |1482   |33312 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66942  |1483   |33313 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66943  |1484   |33314 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66944  |1485   |33319 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66945  |1486   |33320 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66946  |1487   |33304 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66947  |1487   |33305 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66948  |727    |27936 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66949  |1054   |27935 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |66950  |1054   |30122 |5       |1        |2774A4|0        |2       |0   |
-ROW   |66951  |1055   |30123 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66952  |730    |27975 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66953  |1056   |30126 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66954  |733    |28003 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66955  |1057   |30131 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66956  |736    |28031 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66957  |1058   |30136 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66958  |1701   |35553 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66959  |1701   |35556 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66960  |1702   |35558 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66961  |1702   |35561 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66962  |1703   |35562 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66963  |1704   |35563 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66964  |1705   |35592 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66965  |1705   |35584 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66966  |1705   |35594 |0       |2        |F63100|0        |2       |0   |
-ROW   |66967  |1705   |35586 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66968  |1705   |35595 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66969  |1705   |35587 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66970  |1706   |35593 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66971  |1706   |35585 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66972  |1707   |35583 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66973  |1707   |35591 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66974  |1708   |35598 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66975  |1709   |35606 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66976  |1710   |35607 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66977  |1711   |35566 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66978  |1712   |35622 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66979  |1713   |35634 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66980  |1713   |35626 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66981  |1713   |35636 |0       |2        |F63100|0        |2       |0   |
-ROW   |66982  |1713   |35628 |0       |3        |A54F10|0        |2       |0   |
-ROW   |66983  |1713   |35637 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |66984  |1713   |35629 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |66985  |1714   |35635 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66986  |1714   |35627 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66987  |1715   |35625 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66988  |1715   |35633 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66989  |1716   |35640 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66990  |1717   |35641 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66991  |1718   |35610 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |66992  |1719   |35658 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66993  |1720   |35659 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66994  |1721   |35660 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66995  |1722   |35661 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66996  |1723   |35669 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |66997  |1723   |35679 |0       |1        |2774A4|0        |2       |0   |
-ROW   |66998  |1723   |35670 |0       |2        |F63100|0        |2       |0   |
-ROW   |66999  |1723   |35665 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67000  |1723   |35672 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |67001  |1723   |35666 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |67002  |1724   |35663 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67003  |1724   |35664 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67004  |1725   |35686 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67005  |1725   |35693 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67006  |1725   |35684 |0       |2        |F63100|0        |2       |0   |
-ROW   |67007  |1725   |35691 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67008  |1725   |35683 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |67009  |1725   |35690 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |67010  |1726   |35685 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67011  |1726   |35692 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67012  |1727   |35694 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67013  |1727   |35687 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67014  |1728   |35707 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67015  |1729   |35708 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67016  |1730   |35725 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67017  |1731   |35726 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67018  |1732   |35727 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67019  |1733   |35728 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67020  |1734   |35736 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67021  |1734   |35746 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67022  |1734   |35737 |0       |2        |F63100|0        |2       |0   |
-ROW   |67023  |1734   |35732 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67024  |1734   |35739 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |67025  |1734   |35733 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |67026  |1735   |35730 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67027  |1735   |35731 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67028  |1736   |35753 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67029  |1736   |35760 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67030  |1736   |35751 |0       |2        |F63100|0        |2       |0   |
-ROW   |67031  |1736   |35758 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67032  |1736   |35750 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |67033  |1736   |35757 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |67034  |1737   |35752 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67035  |1737   |35759 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67036  |1738   |35761 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67037  |1738   |35754 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67038  |1739   |35774 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67039  |1740   |35775 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67040  |1741   |35791 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67041  |1742   |35799 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67042  |1742   |35802 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67043  |1743   |35804 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67044  |1743   |35807 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67045  |1744   |35808 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67046  |1745   |35809 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67047  |1746   |35834 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67048  |1746   |35826 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67049  |1746   |35836 |0       |2        |F63100|0        |2       |0   |
-ROW   |67050  |1746   |35828 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67051  |1746   |35837 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |67052  |1746   |35829 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |67053  |1747   |35835 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67054  |1747   |35827 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67055  |1748   |35825 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67056  |1748   |35833 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67057  |1749   |35840 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67058  |1750   |35812 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67059  |1751   |35876 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67060  |1751   |35868 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67061  |1751   |35878 |0       |2        |F63100|0        |2       |0   |
-ROW   |67062  |1751   |35870 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67063  |1751   |35879 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |67064  |1751   |35871 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |67065  |1752   |35877 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67066  |1752   |35869 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67067  |1753   |35867 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67068  |1753   |35875 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67069  |1754   |35882 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67070  |1755   |35890 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67071  |1756   |35891 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67072  |1757   |35850 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67073  |1758   |35920 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67074  |1758   |35912 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67075  |1758   |35922 |0       |2        |F63100|0        |2       |0   |
-ROW   |67076  |1758   |35914 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67077  |1758   |35923 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |67078  |1758   |35915 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |67079  |1759   |35921 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67080  |1759   |35913 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67081  |1760   |35911 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67082  |1760   |35919 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67083  |1761   |35926 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67084  |1762   |35934 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67085  |1763   |35935 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67086  |1764   |35894 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67087  |1765   |35952 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67088  |1766   |35964 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67089  |1766   |35956 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67090  |1766   |35966 |0       |2        |F63100|0        |2       |0   |
-ROW   |67091  |1766   |35958 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67092  |1766   |35967 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |67093  |1766   |35959 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |67094  |1767   |35965 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67095  |1767   |35957 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67096  |1768   |35955 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67097  |1768   |35963 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67098  |1769   |35970 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67099  |1770   |35978 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67100  |1771   |35979 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67101  |1772   |35938 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67102  |1773   |35996 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67103  |1774   |36008 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67104  |1774   |36000 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67105  |1774   |36010 |0       |2        |F63100|0        |2       |0   |
-ROW   |67106  |1774   |36002 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67107  |1774   |36011 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |67108  |1774   |36003 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |67109  |1775   |36009 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67110  |1775   |36001 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67111  |1776   |35999 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67112  |1776   |36007 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67113  |1777   |36014 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67114  |1778   |36022 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67115  |1779   |36023 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67116  |1780   |35982 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67117  |1781   |36041 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67118  |1782   |36053 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67119  |1782   |36045 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67120  |1782   |36055 |0       |2        |F63100|0        |2       |0   |
-ROW   |67121  |1782   |36047 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67122  |1782   |36056 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |67123  |1782   |36048 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |67124  |1783   |36054 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67125  |1783   |36046 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67126  |1784   |36044 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67127  |1784   |36052 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67128  |1785   |36059 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67129  |1786   |36067 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67130  |1787   |36068 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67131  |1788   |36026 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67132  |1789   |36086 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67133  |1790   |36098 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67134  |1790   |36090 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67135  |1790   |36100 |0       |2        |F63100|0        |2       |0   |
-ROW   |67136  |1790   |36092 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67137  |1790   |36101 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |67138  |1790   |36093 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |67139  |1791   |36099 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67140  |1791   |36091 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67141  |1792   |36089 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67142  |1792   |36097 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67143  |1793   |36104 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67144  |1794   |36112 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67145  |1795   |36113 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67146  |1796   |36071 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67147  |1797   |36131 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67148  |1798   |36144 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67149  |1798   |36136 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67150  |1798   |36146 |0       |2        |F63100|0        |2       |0   |
-ROW   |67151  |1798   |36138 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67152  |1798   |36147 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |67153  |1798   |36139 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |67154  |1799   |36145 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67155  |1799   |36137 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67156  |1800   |36135 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67157  |1800   |36143 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67158  |1801   |36150 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67159  |1802   |36158 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67160  |1803   |36159 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67161  |1804   |36116 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67162  |1223   |31370 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67163  |1223   |31371 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67164  |1226   |31380 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67165  |1226   |31383 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67166  |1229   |31379 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |67167  |1229   |31382 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67168  |887    |29211 |0       |0        |969696|0        |9       |2   |
-ROW   |67169  |887    |29210 |0       |1        |C80000|0        |9       |0   |
-ROW   |67170  |899    |29216 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67171  |899    |29217 |2       |1        |2774A4|0        |2       |0   |
-ROW   |67172  |899    |29218 |0       |2        |F63100|1        |2       |0   |
-ROW   |67173  |899    |29219 |0       |3        |A54F10|1        |2       |0   |
-ROW   |67174  |899    |29220 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |67175  |899    |29221 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |67176  |911    |29089 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67177  |911    |29102 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67178  |908    |29098 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67179  |908    |29097 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67180  |908    |29095 |0       |2        |F63100|0        |2       |0   |
-ROW   |67181  |908    |29088 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67182  |908    |29094 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |67183  |908    |29093 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |67184  |908    |29092 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |67185  |908    |29091 |0       |7        |611F27|0        |2       |0   |
-ROW   |67186  |908    |29090 |0       |8        |F230E0|0        |2       |0   |
-ROW   |67187  |905    |29198 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67188  |917    |29104 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |67189  |917    |29105 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67190  |914    |31364 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67191  |923    |29118 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67192  |923    |29119 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67193  |923    |29117 |0       |2        |F63100|0        |2       |0   |
-ROW   |67194  |920    |29107 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67195  |920    |29106 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67196  |902    |29096 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67197  |902    |29101 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67198  |902    |29100 |0       |2        |F63100|0        |2       |0   |
-ROW   |67199  |902    |29087 |0       |3        |A54F10|1        |2       |0   |
-ROW   |67200  |1279   |31902 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67201  |1279   |31903 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67202  |1281   |31933 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67203  |1281   |31936 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67204  |1283   |31932 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |67205  |1283   |31935 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67206  |1285   |31907 |0       |0        |969696|0        |9       |2   |
-ROW   |67207  |1285   |31908 |0       |1        |C80000|0        |9       |0   |
-ROW   |67208  |1287   |31911 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67209  |1287   |31914 |2       |1        |2774A4|0        |2       |0   |
-ROW   |67210  |1287   |31913 |0       |2        |F63100|1        |2       |0   |
-ROW   |67211  |1287   |31910 |0       |3        |A54F10|1        |2       |0   |
-ROW   |67212  |1287   |31912 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |67213  |1287   |31909 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |67214  |1289   |31831 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67215  |1289   |31820 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67216  |1291   |31822 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67217  |1291   |31835 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67218  |1291   |31825 |0       |2        |F63100|0        |2       |0   |
-ROW   |67219  |1291   |31826 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67220  |1291   |31823 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |67221  |1291   |31827 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |67222  |1291   |31824 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |67223  |1291   |31828 |0       |7        |611F27|0        |2       |0   |
-ROW   |67224  |1291   |31830 |0       |8        |F230E0|0        |2       |0   |
-ROW   |67225  |1293   |31892 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67226  |1295   |31855 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |67227  |1295   |31853 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67228  |1297   |31893 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67229  |1299   |31838 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67230  |1299   |31839 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67231  |1299   |31837 |0       |2        |F63100|0        |2       |0   |
-ROW   |67232  |1301   |31850 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67233  |1301   |31852 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67234  |1303   |31829 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67235  |1303   |31833 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67236  |1303   |31834 |0       |2        |F63100|0        |2       |0   |
-ROW   |67237  |1303   |31832 |0       |3        |A54F10|1        |2       |0   |
-ROW   |67238  |952    |29436 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67239  |952    |29437 |2       |1        |2774A4|0        |2       |0   |
-ROW   |67240  |952    |29438 |0       |2        |F63100|1        |2       |0   |
-ROW   |67241  |952    |29439 |0       |3        |A54F10|1        |2       |0   |
-ROW   |67242  |952    |29441 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |67243  |952    |29440 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |67244  |955    |29434 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67245  |955    |29435 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67246  |954    |29448 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67247  |954    |29449 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67248  |956    |29452 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |67249  |956    |29453 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67250  |953    |29446 |0       |0        |969696|0        |9       |2   |
-ROW   |67251  |953    |29432 |0       |1        |C80000|0        |9       |0   |
-ROW   |67252  |960    |29405 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67253  |960    |29406 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67254  |959    |29426 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67255  |959    |29413 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67256  |959    |29411 |0       |2        |F63100|0        |2       |0   |
-ROW   |67257  |959    |29410 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67258  |959    |29399 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |67259  |959    |29409 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |67260  |959    |29412 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |67261  |959    |29408 |0       |7        |611F27|0        |2       |0   |
-ROW   |67262  |959    |29407 |0       |8        |F230E0|0        |2       |0   |
-ROW   |67263  |958    |29427 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67264  |962    |29403 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |67265  |962    |29402 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67266  |961    |29396 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67267  |963    |29400 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67268  |963    |29401 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67269  |957    |29420 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67270  |957    |29419 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67271  |957    |29418 |0       |2        |F63100|0        |2       |0   |
-ROW   |67272  |957    |29417 |0       |3        |A54F10|1        |2       |0   |
-ROW   |67273  |866    |29014 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67274  |866    |29015 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67275  |868    |29018 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67276  |868    |29019 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67277  |868    |29022 |0       |2        |F63100|0        |2       |0   |
-ROW   |67278  |868    |29023 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67279  |868    |29020 |0       |4        |FC6EA3|0        |2       |0   |
-ROW   |67280  |868    |29024 |0       |5        |6C59DC|0        |2       |0   |
-ROW   |67281  |868    |29021 |0       |6        |AC8C14|0        |2       |0   |
-ROW   |67282  |868    |29025 |0       |7        |611F27|0        |2       |0   |
-ROW   |67283  |868    |29026 |0       |8        |F230E0|0        |2       |0   |
-ROW   |67284  |870    |29048 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67285  |872    |29028 |0       |0        |969696|0        |9       |2   |
-ROW   |67286  |872    |29027 |0       |1        |C80000|0        |9       |0   |
-ROW   |67287  |882    |28992 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67288  |882    |28991 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67289  |876    |28982 |2       |0        |1A7C11|0        |2       |0   |
-ROW   |67290  |876    |28983 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67291  |874    |28978 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67292  |878    |28985 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67293  |878    |28984 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67294  |880    |28987 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67295  |880    |28988 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67296  |880    |28989 |0       |2        |F63100|0        |2       |0   |
-ROW   |67297  |880    |28990 |0       |3        |A54F10|1        |2       |0   |
-ROW   |67298  |964    |29513 |0       |0        |969696|0        |9       |2   |
-ROW   |67299  |964    |29512 |0       |1        |C80000|0        |9       |0   |
-ROW   |67300  |1238   |31435 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67301  |1238   |31438 |2       |1        |2774A4|0        |2       |0   |
-ROW   |67302  |1238   |31437 |0       |2        |F63100|1        |2       |0   |
-ROW   |67303  |1238   |31434 |0       |3        |A54F10|1        |2       |0   |
-ROW   |67304  |1238   |31436 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |67305  |1238   |31433 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |67306  |1488   |33321 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67307  |1488   |33324 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67308  |1490   |33322 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67309  |1490   |33323 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67310  |1240   |31441 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67311  |1240   |31442 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67312  |1242   |31440 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |67313  |1242   |31439 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67314  |974    |29456 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67315  |974    |29455 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67316  |976    |29458 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67317  |976    |29457 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67318  |972    |29454 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67319  |978    |29462 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67320  |980    |31421 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67321  |980    |29466 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67322  |1305   |32013 |0       |0        |969696|0        |9       |2   |
-ROW   |67323  |1305   |32014 |0       |1        |C80000|0        |9       |0   |
-ROW   |67324  |1307   |32017 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67325  |1307   |32020 |2       |1        |2774A4|0        |2       |0   |
-ROW   |67326  |1307   |32019 |0       |2        |F63100|1        |2       |0   |
-ROW   |67327  |1307   |32016 |0       |3        |A54F10|1        |2       |0   |
-ROW   |67328  |1307   |32018 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |67329  |1307   |32015 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |67330  |1492   |33329 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67331  |1492   |33332 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67332  |1494   |33330 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67333  |1494   |33331 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67334  |1309   |32023 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67335  |1309   |32024 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67336  |1311   |32022 |0       |0        |1A7C11|1        |2       |0   |
-ROW   |67337  |1311   |32021 |5       |1        |2774A4|0        |2       |0   |
-ROW   |67338  |1313   |31952 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67339  |1313   |31949 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67340  |1315   |31951 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67341  |1315   |31950 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67342  |1317   |31954 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67343  |1319   |31973 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67344  |1321   |31969 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67345  |1321   |31970 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67346  |1583   |34451 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67347  |1584   |34465 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67348  |1584   |34463 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67349  |1585   |34466 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67350  |1585   |34462 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67351  |1586   |34499 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67352  |1587   |34513 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67353  |1587   |34511 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67354  |1588   |34514 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67355  |1588   |34510 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67356  |1589   |34547 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67357  |1590   |34561 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67358  |1590   |34559 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67359  |1591   |34562 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67360  |1591   |34558 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67361  |1592   |34595 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67362  |1593   |34609 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67363  |1593   |34607 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67364  |1594   |34610 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67365  |1594   |34606 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67366  |1595   |34643 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67367  |1596   |34657 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67368  |1596   |34655 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67369  |1597   |34658 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67370  |1597   |34654 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67371  |1619   |35016 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67372  |1620   |35030 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67373  |1620   |35028 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67374  |1621   |35031 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67375  |1621   |35027 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67376  |1601   |34739 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67377  |1602   |34753 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67378  |1602   |34751 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67379  |1603   |34754 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67380  |1603   |34750 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67381  |1604   |34787 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67382  |1569   |34192 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67383  |1569   |34180 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67384  |1570   |34194 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67385  |1570   |34190 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67386  |1605   |34793 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67387  |1606   |34807 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67388  |1606   |34805 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67389  |1607   |34808 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67390  |1607   |34804 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67391  |1608   |34841 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67392  |1609   |34855 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67393  |1609   |34853 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67394  |1610   |34856 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67395  |1610   |34852 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67396  |1611   |34889 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67397  |1612   |34903 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67398  |1612   |34901 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67399  |1613   |34904 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67400  |1613   |34900 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67401  |1518   |33705 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67402  |1519   |33724 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67403  |1519   |33722 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67404  |1519   |33726 |0       |2        |F63100|0        |2       |0   |
-ROW   |67405  |1520   |33719 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67406  |1520   |33720 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67407  |1520   |33721 |0       |2        |F63100|0        |2       |0   |
-ROW   |67408  |1521   |33725 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67409  |1521   |33723 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67410  |1521   |33727 |0       |2        |F63100|0        |2       |0   |
-ROW   |67411  |1522   |33730 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67412  |1523   |33734 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67413  |1523   |33732 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67414  |1523   |33736 |0       |2        |F63100|0        |2       |0   |
-ROW   |67415  |1524   |33735 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67416  |1524   |33733 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67417  |1524   |33737 |0       |2        |F63100|0        |2       |0   |
-ROW   |67418  |1525   |33743 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67419  |1525   |33742 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67420  |1525   |33738 |0       |2        |F63100|0        |2       |0   |
-ROW   |67421  |1526   |33692 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67422  |1526   |33693 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67423  |1571   |34269 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67424  |1571   |34270 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67425  |1571   |34271 |0       |2        |F63100|0        |2       |0   |
-ROW   |67426  |1571   |34272 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67427  |1572   |34311 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67428  |1572   |34301 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67429  |1573   |34243 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67430  |1573   |34244 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67431  |1573   |34246 |0       |2        |F63100|0        |2       |0   |
-ROW   |67432  |1573   |34245 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67433  |1574   |34239 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67434  |1574   |34227 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67435  |1574   |34236 |0       |2        |F63100|0        |2       |0   |
-ROW   |67436  |1574   |34237 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67437  |1575   |34253 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67438  |1575   |34252 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67439  |1575   |34249 |0       |2        |F63100|0        |2       |0   |
-ROW   |67440  |1575   |34251 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67441  |1496   |33368 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67442  |1497   |33371 |1       |0        |1A7C11|0        |2       |0   |
-ROW   |67443  |1497   |33371 |1       |1        |2774A4|0        |2       |0   |
-ROW   |67444  |1498   |33379 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67445  |1498   |33382 |2       |1        |2774A4|0        |2       |0   |
-ROW   |67446  |1498   |33381 |0       |2        |F63100|1        |2       |0   |
-ROW   |67447  |1498   |33378 |0       |3        |A54F10|1        |2       |0   |
-ROW   |67448  |1498   |33380 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |67449  |1498   |33377 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |67450  |1142   |30689 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67451  |1805   |36187 |5       |0        |1A7C11|0        |2       |0   |
-ROW   |67452  |1805   |36192 |2       |1        |2774A4|0        |2       |0   |
-ROW   |67453  |1805   |36190 |0       |2        |F63100|1        |2       |0   |
-ROW   |67454  |1805   |36185 |0       |3        |A54F10|1        |2       |0   |
-ROW   |67455  |1805   |36189 |0       |4        |FC6EA3|1        |2       |0   |
-ROW   |67456  |1805   |36184 |0       |5        |6C59DC|1        |2       |0   |
-ROW   |67457  |1275   |31794 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67458  |1275   |31792 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67459  |1275   |31800 |0       |2        |F63100|1        |2       |0   |
-ROW   |67460  |1276   |36771 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67461  |1276   |33390 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67462  |1276   |31799 |0       |2        |F63100|0        |2       |0   |
-ROW   |67463  |1276   |31797 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67464  |1277   |36770 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67465  |1277   |33389 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67466  |1277   |31795 |0       |2        |F63100|0        |2       |0   |
-ROW   |67467  |1278   |36769 |0       |0        |1A7C11|0        |2       |0   |
-ROW   |67468  |1278   |31793 |0       |1        |2774A4|0        |2       |0   |
-ROW   |67469  |1278   |31802 |0       |2        |F63100|0        |2       |0   |
-ROW   |67470  |1278   |31790 |0       |3        |A54F10|0        |2       |0   |
-ROW   |67471  |1278   |31791 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67472  |1397   |32451 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67473  |1397   |32450 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67474  |1398   |32452 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67475  |1398   |32449 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67476  |1399   |32444 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67477  |1399   |32446 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67478  |1399   |32448 |5       |2        |F63100|0        |2       |0   |
+ROW   |67479  |1400   |32460 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67480  |1401   |32458 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67481  |1401   |32457 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67482  |1402   |32461 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67483  |1402   |32456 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67484  |1172   |30918 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67485  |1172   |30919 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67486  |1172   |30920 |0       |2        |F63100|0        |2       |0   |
+ROW   |67487  |1172   |30921 |2       |3        |A54F10|0        |2       |0   |
+ROW   |67488  |1173   |30922 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67489  |835    |28744 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67490  |835    |28745 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67491  |1174   |30913 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67492  |1175   |30906 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67493  |1175   |30908 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67494  |1175   |30915 |0       |2        |F63100|0        |2       |0   |
+ROW   |67495  |1175   |30897 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67496  |1175   |30901 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67497  |1175   |30899 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |67498  |1175   |30907 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |67499  |1175   |30905 |0       |7        |611F27|0        |2       |0   |
+ROW   |67500  |1175   |30904 |0       |8        |F230E0|0        |2       |0   |
+ROW   |67501  |1175   |30900 |0       |9        |FFAD40|0        |2       |0   |
+ROW   |67502  |1175   |30898 |0       |10       |40CDFF|0        |2       |0   |
+ROW   |67503  |1176   |30910 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67504  |1176   |30909 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67505  |836    |28798 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67506  |836    |28799 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67507  |836    |28800 |0       |2        |F63100|0        |2       |0   |
+ROW   |67508  |836    |28801 |2       |3        |A54F10|0        |2       |0   |
+ROW   |67509  |837    |28803 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67510  |838    |28793 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67511  |840    |28787 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67512  |840    |28784 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67513  |840    |28782 |0       |2        |F63100|0        |2       |0   |
+ROW   |67514  |840    |28781 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67515  |840    |28780 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67516  |840    |28778 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |67517  |840    |28786 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |67518  |840    |28785 |0       |7        |611F27|0        |2       |0   |
+ROW   |67519  |840    |28783 |0       |8        |F230E0|0        |2       |0   |
+ROW   |67520  |840    |28779 |0       |9        |FFAD40|0        |2       |0   |
+ROW   |67521  |840    |28796 |0       |10       |40CDFF|0        |2       |0   |
+ROW   |67522  |839    |28789 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67523  |839    |28788 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67524  |1339   |32172 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67525  |1339   |32173 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67526  |1403   |32511 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67527  |1403   |32514 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67528  |1404   |32512 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67529  |1404   |32515 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67530  |1405   |32507 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67531  |1405   |32508 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67532  |1405   |32513 |0       |2        |F63100|0        |2       |0   |
+ROW   |67533  |1343   |32135 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67534  |1343   |32142 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67535  |1344   |32167 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67536  |1344   |32136 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67537  |1345   |32141 |1       |0        |1A7C11|0        |2       |0   |
+ROW   |67538  |1345   |32138 |1       |1        |2774A4|0        |2       |0   |
+ROW   |67539  |1346   |32156 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |67540  |1346   |32158 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67541  |1346   |32159 |0       |2        |F63100|0        |2       |0   |
+ROW   |67542  |1346   |32154 |2       |3        |A54F10|0        |2       |0   |
+ROW   |67543  |1346   |32155 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67544  |1346   |32146 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |67545  |1347   |32150 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |67546  |1347   |32151 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67547  |1347   |32152 |0       |2        |F63100|0        |2       |0   |
+ROW   |67548  |1622   |35078 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67549  |1622   |35091 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67550  |1622   |35098 |0       |2        |F63100|0        |2       |0   |
+ROW   |67551  |1622   |35100 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67552  |1622   |35099 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67553  |1623   |35090 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67554  |1623   |35101 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67555  |1624   |35097 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67556  |1624   |35096 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67557  |1624   |35095 |0       |2        |F63100|0        |2       |0   |
+ROW   |67558  |1625   |35089 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67559  |1625   |35088 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67560  |1625   |35087 |0       |2        |F63100|0        |2       |0   |
+ROW   |67561  |1625   |35086 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67562  |1625   |35085 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67563  |1626   |35079 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67564  |1626   |35082 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67565  |1627   |35080 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67566  |1627   |35102 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67567  |1628   |35093 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67568  |1628   |35092 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67569  |1628   |35081 |0       |2        |F63100|0        |2       |0   |
+ROW   |67570  |1628   |35084 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67571  |1628   |35083 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67572  |1121   |30606 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67573  |1121   |30590 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67574  |1121   |30582 |5       |2        |F63100|0        |2       |0   |
+ROW   |67575  |1122   |30580 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67576  |1122   |30578 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67577  |1123   |30586 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |67578  |1123   |30608 |2       |1        |2774A4|0        |2       |0   |
+ROW   |67579  |1123   |30585 |2       |2        |F63100|0        |2       |0   |
+ROW   |67580  |1123   |30589 |2       |3        |A54F10|0        |2       |0   |
+ROW   |67581  |1123   |30584 |2       |4        |FC6EA3|0        |2       |0   |
+ROW   |67582  |1123   |30588 |2       |5        |6C59DC|0        |2       |0   |
+ROW   |67583  |1124   |30583 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |67584  |1124   |30587 |2       |1        |2774A4|0        |2       |0   |
+ROW   |67585  |1125   |30555 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67586  |1125   |30554 |2       |1        |2774A4|0        |2       |0   |
+ROW   |67587  |1125   |30556 |2       |2        |F63100|0        |2       |0   |
+ROW   |67588  |1125   |30557 |2       |3        |A54F10|0        |2       |0   |
+ROW   |67589  |1126   |30565 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67590  |1127   |30567 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |67591  |1127   |30568 |2       |1        |2774A4|0        |2       |0   |
+ROW   |67592  |1128   |30536 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |67593  |1129   |30566 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |67594  |1129   |30549 |2       |1        |2774A4|0        |2       |0   |
+ROW   |67595  |1129   |30553 |2       |2        |F63100|0        |2       |0   |
+ROW   |67596  |1129   |30570 |2       |3        |A54F10|0        |2       |0   |
+ROW   |67597  |1143   |30714 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67598  |1143   |30716 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67599  |1143   |30717 |0       |2        |F63100|0        |2       |0   |
+ROW   |67600  |1143   |30715 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67601  |1144   |30753 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67602  |1144   |30738 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67603  |1145   |30718 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67604  |1145   |30737 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67605  |1145   |30727 |0       |2        |F63100|0        |2       |0   |
+ROW   |67606  |1145   |30729 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67607  |1146   |30730 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67608  |1146   |30732 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67609  |1146   |30731 |0       |2        |F63100|0        |2       |0   |
+ROW   |67610  |1146   |30733 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67611  |1147   |30734 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67612  |1147   |30736 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67613  |1147   |30735 |0       |2        |F63100|0        |2       |0   |
+ROW   |67614  |1147   |30758 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67615  |1148   |30711 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67616  |1148   |30706 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67617  |1148   |30710 |0       |2        |F63100|0        |2       |0   |
+ROW   |67618  |1148   |30712 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67619  |1148   |30702 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67620  |1148   |30707 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |67621  |1148   |30704 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |67622  |1177   |30927 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67623  |1177   |30944 |2       |1        |2774A4|0        |2       |0   |
+ROW   |67624  |1178   |30935 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67625  |1178   |30942 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67626  |1179   |30949 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67627  |1179   |30950 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67628  |1179   |30951 |0       |2        |F63100|0        |2       |0   |
+ROW   |67629  |1180   |30952 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67630  |1180   |30954 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67631  |1180   |30955 |0       |2        |F63100|0        |2       |0   |
+ROW   |67632  |1181   |30936 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67633  |1181   |30940 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67634  |1182   |30930 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67635  |1182   |30929 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67636  |1182   |30928 |0       |2        |F63100|0        |2       |0   |
+ROW   |67637  |1182   |30931 |2       |3        |A54F10|1        |2       |0   |
+ROW   |67638  |1183   |30934 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67639  |1183   |30941 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67640  |1406   |32532 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |67641  |1406   |32535 |0       |1        |2774A4|1        |2       |0   |
+ROW   |67642  |1406   |32533 |0       |2        |F63100|0        |2       |0   |
+ROW   |67643  |1406   |32534 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67644  |1406   |32536 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67645  |1406   |32537 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |67646  |1407   |32543 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67647  |1407   |32544 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67648  |1408   |32518 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67649  |1408   |32521 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67650  |1408   |32523 |0       |2        |F63100|0        |2       |0   |
+ROW   |67651  |1408   |32524 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67652  |1409   |32562 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |67653  |1409   |32565 |0       |1        |2774A4|1        |2       |0   |
+ROW   |67654  |1409   |32563 |0       |2        |F63100|0        |2       |0   |
+ROW   |67655  |1409   |32564 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67656  |1409   |32566 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67657  |1409   |32567 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |67658  |1410   |32573 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67659  |1410   |32574 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67660  |1411   |32548 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67661  |1411   |32551 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67662  |1411   |32553 |0       |2        |F63100|0        |2       |0   |
+ROW   |67663  |1411   |32554 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67664  |1250   |31527 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67665  |1250   |31529 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67666  |1250   |31499 |0       |2        |F63100|0        |2       |0   |
+ROW   |67667  |1251   |31532 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67668  |1251   |31534 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67669  |1251   |31538 |0       |2        |F63100|0        |2       |0   |
+ROW   |67670  |1251   |31536 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67671  |1251   |31528 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67672  |1251   |31542 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |67673  |1252   |31552 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67674  |1252   |31551 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67675  |1252   |31541 |0       |2        |F63100|0        |2       |0   |
+ROW   |67676  |1253   |31513 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67677  |1253   |31526 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67678  |1253   |31525 |0       |2        |F63100|0        |2       |0   |
+ROW   |67679  |1254   |31502 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67680  |1254   |31501 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67681  |1254   |31503 |0       |2        |F63100|0        |2       |0   |
+ROW   |67682  |1255   |31505 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67683  |1255   |31504 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67684  |1255   |31506 |0       |2        |F63100|0        |2       |0   |
+ROW   |67685  |1256   |31508 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67686  |1256   |31507 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67687  |1256   |31509 |0       |2        |F63100|0        |2       |0   |
+ROW   |67688  |1257   |31511 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67689  |1257   |31510 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67690  |1257   |31500 |0       |2        |F63100|0        |2       |0   |
+ROW   |67691  |1258   |31514 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67692  |1258   |31512 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67693  |1258   |31515 |0       |2        |F63100|0        |2       |0   |
+ROW   |67694  |1259   |31516 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67695  |1259   |31517 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67696  |1260   |31523 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67697  |1260   |31522 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67698  |1260   |31524 |0       |2        |F63100|0        |2       |0   |
+ROW   |67699  |1412   |32601 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67700  |1412   |32602 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67701  |1412   |32603 |0       |2        |F63100|0        |2       |0   |
+ROW   |67702  |1412   |32604 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67703  |1412   |32606 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67704  |1412   |32606 |2       |5        |6C59DC|0        |2       |0   |
+ROW   |67705  |1413   |32608 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67706  |1413   |32610 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67707  |1413   |32611 |0       |2        |F63100|0        |2       |0   |
+ROW   |67708  |1414   |32582 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |67709  |1414   |32580 |2       |1        |2774A4|0        |2       |0   |
+ROW   |67710  |1414   |32581 |2       |2        |F63100|0        |2       |0   |
+ROW   |67711  |1414   |32597 |0       |3        |A54F10|1        |2       |0   |
+ROW   |67712  |1414   |32599 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |67713  |1414   |32588 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |67714  |1415   |32583 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67715  |1415   |32584 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67716  |1415   |32585 |0       |2        |F63100|0        |2       |0   |
+ROW   |67717  |1415   |32579 |2       |3        |A54F10|0        |2       |0   |
+ROW   |67718  |1416   |32587 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67719  |1416   |32590 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67720  |1416   |32589 |0       |2        |F63100|0        |2       |0   |
+ROW   |67721  |1417   |32673 |1       |0        |1A7C11|0        |2       |0   |
+ROW   |67722  |1417   |32679 |1       |1        |2774A4|0        |2       |0   |
+ROW   |67723  |1629   |35114 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67724  |1629   |35113 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67725  |1075   |30204 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67726  |1075   |30205 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67727  |1630   |35112 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67728  |1630   |35111 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67729  |1630   |35110 |0       |2        |F63100|0        |2       |0   |
+ROW   |67730  |1630   |35108 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67731  |1630   |35105 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67732  |1076   |30209 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67733  |1076   |30208 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67734  |1077   |30206 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67735  |1077   |30207 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67736  |1078   |30216 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67737  |1078   |30215 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67738  |1079   |30210 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67739  |1079   |30211 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67740  |1079   |30212 |0       |2        |F63100|0        |2       |0   |
+ROW   |67741  |1079   |30213 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67742  |1079   |30214 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67743  |1631   |35127 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67744  |1631   |35126 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67745  |1632   |35124 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67746  |1632   |35123 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67747  |1632   |35122 |0       |2        |F63100|0        |2       |0   |
+ROW   |67748  |1632   |30222 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67749  |1632   |30223 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67750  |1080   |30226 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67751  |1080   |30225 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67752  |1633   |35139 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67753  |1633   |35138 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67754  |1081   |30247 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67755  |1081   |30248 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67756  |1634   |35137 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67757  |1634   |35136 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67758  |1634   |35135 |0       |2        |F63100|0        |2       |0   |
+ROW   |67759  |1634   |35133 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67760  |1634   |35130 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67761  |1082   |30252 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67762  |1082   |30251 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67763  |1083   |30249 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67764  |1083   |30250 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67765  |1084   |30259 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67766  |1084   |30258 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67767  |1085   |30253 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67768  |1085   |30254 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67769  |1085   |30255 |0       |2        |F63100|0        |2       |0   |
+ROW   |67770  |1085   |30256 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67771  |1085   |30257 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67772  |1635   |35152 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67773  |1635   |35151 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67774  |1636   |35149 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67775  |1636   |35148 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67776  |1636   |35147 |0       |2        |F63100|0        |2       |0   |
+ROW   |67777  |1636   |30265 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67778  |1636   |30266 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67779  |1086   |30269 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67780  |1086   |30268 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67781  |1184   |30982 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67782  |1184   |30980 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67783  |1185   |30983 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67784  |1185   |30981 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67785  |1186   |30976 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67786  |1186   |30985 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67787  |1186   |30997 |0       |2        |F63100|0        |2       |0   |
+ROW   |67788  |1186   |30970 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67789  |1186   |30973 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67790  |1186   |30995 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |67791  |1186   |30998 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |67792  |1186   |30978 |0       |7        |611F27|0        |2       |0   |
+ROW   |67793  |1187   |31024 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67794  |1187   |31022 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67795  |1188   |31025 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67796  |1188   |31023 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67797  |1189   |31018 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67798  |1189   |31027 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67799  |1189   |31039 |0       |2        |F63100|0        |2       |0   |
+ROW   |67800  |1189   |31012 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67801  |1189   |31015 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67802  |1189   |31037 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |67803  |1189   |31040 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |67804  |1189   |31020 |0       |7        |611F27|0        |2       |0   |
+ROW   |67805  |1499   |33478 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67806  |1499   |33467 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67807  |1500   |33468 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67808  |1500   |33479 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67809  |1501   |33442 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67810  |1501   |33441 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67811  |1501   |33440 |0       |2        |F63100|0        |2       |0   |
+ROW   |67812  |1502   |33423 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67813  |1502   |33419 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67814  |1502   |33422 |0       |2        |F63100|0        |2       |0   |
+ROW   |67815  |1502   |33421 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67816  |1502   |33412 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67817  |1418   |32700 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67818  |1418   |32699 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67819  |1419   |32710 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67820  |1419   |32709 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67821  |1420   |32693 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67822  |1420   |32724 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67823  |1421   |32730 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67824  |1421   |32731 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67825  |1421   |32728 |0       |2        |F63100|0        |2       |0   |
+ROW   |67826  |1421   |32729 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67827  |1422   |32705 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67828  |1422   |32706 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67829  |1423   |32702 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67830  |1423   |32703 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67831  |1424   |32708 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67832  |1424   |32722 |2       |1        |2774A4|0        |2       |0   |
+ROW   |67833  |1424   |32695 |0       |2        |F63100|0        |2       |0   |
+ROW   |67834  |1424   |32753 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67835  |1424   |32740 |2       |4        |FC6EA3|0        |2       |0   |
+ROW   |67836  |1424   |32723 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |67837  |1424   |32747 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |67838  |1424   |32748 |2       |7        |611F27|0        |2       |0   |
+ROW   |67839  |1424   |32749 |0       |8        |F230E0|0        |2       |0   |
+ROW   |67840  |1424   |32750 |0       |9        |FFAD40|0        |2       |0   |
+ROW   |67841  |1424   |32751 |2       |10       |40CDFF|0        |2       |0   |
+ROW   |67842  |1424   |32752 |0       |11       |40FFA0|0        |2       |0   |
+ROW   |67843  |1425   |32746 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67844  |1425   |32745 |2       |1        |2774A4|0        |2       |0   |
+ROW   |67845  |1425   |32744 |0       |2        |F63100|0        |2       |0   |
+ROW   |67846  |1425   |32743 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67847  |1425   |32743 |2       |4        |FC6EA3|0        |2       |0   |
+ROW   |67848  |1425   |32742 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |67849  |1426   |32720 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67850  |1426   |32721 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67851  |1426   |32719 |0       |2        |F63100|0        |2       |0   |
+ROW   |67852  |1426   |32718 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67853  |1130   |30613 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67854  |1130   |30635 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67855  |1130   |30625 |0       |2        |F63100|0        |2       |0   |
+ROW   |67856  |1131   |30632 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67857  |1131   |30633 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67858  |1131   |30629 |5       |2        |F63100|0        |2       |0   |
+ROW   |67859  |1132   |30630 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |67860  |1132   |30628 |2       |1        |2774A4|0        |2       |0   |
+ROW   |67861  |1132   |30631 |2       |2        |F63100|0        |2       |0   |
+ROW   |67862  |1133   |30619 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67863  |1133   |30618 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67864  |1134   |30623 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67865  |1134   |30622 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67866  |1135   |30615 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67867  |841    |28813 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |67868  |841    |28811 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67869  |841    |28812 |0       |2        |F63100|0        |2       |0   |
+ROW   |67870  |841    |28814 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67871  |842    |28817 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67872  |842    |28815 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67873  |842    |28816 |0       |2        |F63100|0        |2       |0   |
+ROW   |67874  |844    |28808 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67875  |844    |28807 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67876  |843    |28818 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67877  |845    |28829 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |67878  |845    |28831 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67879  |845    |28832 |0       |2        |F63100|0        |2       |0   |
+ROW   |67880  |845    |28830 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67881  |846    |28826 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67882  |846    |28828 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67883  |846    |28827 |0       |2        |F63100|0        |2       |0   |
+ROW   |67884  |847    |28825 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67885  |1637   |35187 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67886  |1638   |35189 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67887  |1638   |35188 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67888  |1638   |35190 |5       |2        |F63100|0        |2       |0   |
+ROW   |67889  |1638   |35191 |5       |3        |A54F10|0        |2       |0   |
+ROW   |67890  |1638   |35192 |5       |4        |FC6EA3|0        |2       |0   |
+ROW   |67891  |1639   |35198 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67892  |1640   |35200 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67893  |1640   |35199 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67894  |1640   |35201 |5       |2        |F63100|0        |2       |0   |
+ROW   |67895  |1640   |35202 |5       |3        |A54F10|0        |2       |0   |
+ROW   |67896  |1640   |35203 |5       |4        |FC6EA3|0        |2       |0   |
+ROW   |67897  |1641   |35221 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67898  |1641   |35220 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67899  |1641   |35219 |5       |2        |F63100|0        |2       |0   |
+ROW   |67900  |1642   |35214 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67901  |1642   |35216 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67902  |1642   |35207 |5       |2        |F63100|0        |2       |0   |
+ROW   |67903  |1642   |35213 |5       |3        |A54F10|0        |2       |0   |
+ROW   |67904  |1642   |35212 |5       |4        |FC6EA3|0        |2       |0   |
+ROW   |67905  |1643   |35228 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67906  |1643   |35229 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67907  |1643   |35227 |5       |2        |F63100|0        |2       |0   |
+ROW   |67908  |1644   |35231 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67909  |1644   |35230 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67910  |1644   |35235 |5       |2        |F63100|0        |2       |0   |
+ROW   |67911  |1644   |35233 |5       |3        |A54F10|0        |2       |0   |
+ROW   |67912  |1644   |35232 |5       |4        |FC6EA3|0        |2       |0   |
+ROW   |67913  |1644   |35234 |5       |5        |6C59DC|0        |2       |0   |
+ROW   |67914  |1644   |35236 |5       |6        |AC8C14|0        |2       |0   |
+ROW   |67915  |1644   |35237 |5       |7        |611F27|0        |2       |0   |
+ROW   |67916  |1645   |35243 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67917  |1645   |35244 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67918  |1645   |35245 |5       |2        |F63100|0        |2       |0   |
+ROW   |67919  |1646   |35252 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67920  |1646   |35253 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67921  |1646   |35254 |5       |2        |F63100|0        |2       |0   |
+ROW   |67922  |1647   |35172 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67923  |1647   |35168 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67924  |1647   |35164 |5       |2        |F63100|0        |2       |0   |
+ROW   |67925  |1647   |35163 |5       |3        |A54F10|0        |2       |0   |
+ROW   |67926  |1648   |35170 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67927  |1649   |35167 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67928  |1649   |35166 |5       |1        |2774A4|0        |2       |0   |
+ROW   |67929  |1649   |35165 |5       |2        |F63100|0        |2       |0   |
+ROW   |67930  |1650   |35176 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67931  |1262   |31592 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67932  |1262   |31584 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67933  |1262   |31582 |0       |2        |F63100|0        |2       |0   |
+ROW   |67934  |1262   |31585 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67935  |1263   |31591 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67936  |1263   |31583 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67937  |1263   |31590 |0       |2        |F63100|0        |2       |0   |
+ROW   |67938  |1264   |31602 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67939  |1264   |31597 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67940  |1264   |31601 |0       |2        |F63100|0        |2       |0   |
+ROW   |67941  |1264   |31604 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67942  |1265   |31609 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67943  |1265   |31610 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67944  |1265   |31608 |0       |2        |F63100|0        |2       |0   |
+ROW   |67945  |1001   |29729 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67946  |1001   |29728 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67947  |1001   |29727 |0       |2        |F63100|0        |2       |0   |
+ROW   |67948  |1001   |29725 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67949  |1001   |29723 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67950  |1001   |29733 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |67951  |1001   |29737 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |67952  |1001   |29731 |0       |7        |611F27|0        |2       |0   |
+ROW   |67953  |1000   |29720 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67954  |1000   |29730 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67955  |1000   |29721 |0       |2        |F63100|0        |2       |0   |
+ROW   |67956  |1000   |29726 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67957  |1000   |29724 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67958  |1000   |29734 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |67959  |1000   |29722 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |67960  |1000   |29732 |0       |7        |611F27|0        |2       |0   |
+ROW   |67961  |1027   |30022 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67962  |1027   |30021 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67963  |1027   |30019 |0       |2        |F63100|0        |2       |0   |
+ROW   |67964  |1008   |29698 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67965  |1008   |29700 |2       |1        |FF0000|0        |2       |0   |
+ROW   |67966  |1007   |29691 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67967  |1013   |29657 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67968  |1013   |29658 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67969  |1009   |29687 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67970  |1009   |29694 |2       |1        |FF0000|0        |2       |0   |
+ROW   |67971  |1029   |30017 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67972  |1029   |30016 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67973  |1029   |30015 |0       |2        |F63100|0        |2       |0   |
+ROW   |67974  |1031   |30007 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67975  |1031   |30013 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67976  |1031   |30011 |0       |2        |F63100|0        |2       |0   |
+ROW   |67977  |1031   |30009 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67978  |1031   |30005 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67979  |1031   |30003 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |67980  |1031   |30023 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |67981  |1031   |30001 |0       |7        |611F27|0        |2       |0   |
+ROW   |67982  |1030   |30008 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67983  |1030   |30014 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67984  |1030   |30012 |0       |2        |F63100|0        |2       |0   |
+ROW   |67985  |1030   |30010 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67986  |1030   |30006 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |67987  |1030   |30004 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |67988  |1030   |30000 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |67989  |1030   |30002 |0       |7        |611F27|0        |2       |0   |
+ROW   |67990  |1011   |29695 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |67991  |1028   |30020 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67992  |1010   |29701 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |67993  |1010   |29697 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67994  |1012   |29692 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67995  |1015   |29812 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |67996  |1015   |29811 |0       |1        |2774A4|0        |2       |0   |
+ROW   |67997  |1015   |29810 |0       |2        |F63100|0        |2       |0   |
+ROW   |67998  |1015   |29808 |0       |3        |A54F10|0        |2       |0   |
+ROW   |67999  |1015   |29806 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68000  |1015   |29816 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68001  |1015   |29820 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |68002  |1015   |29814 |0       |7        |611F27|0        |2       |0   |
+ROW   |68003  |1014   |29803 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68004  |1014   |29813 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68005  |1014   |29804 |0       |2        |F63100|0        |2       |0   |
+ROW   |68006  |1014   |29809 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68007  |1014   |29807 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68008  |1014   |29817 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68009  |1014   |29805 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |68010  |1014   |29815 |0       |7        |611F27|0        |2       |0   |
+ROW   |68011  |1016   |29768 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68012  |1016   |29767 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68013  |1016   |29765 |0       |2        |F63100|0        |2       |0   |
+ROW   |68014  |1022   |29782 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68015  |1022   |29781 |2       |1        |FF0000|0        |2       |0   |
+ROW   |68016  |1021   |29783 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68017  |1023   |29780 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68018  |1023   |29784 |2       |1        |FF0000|0        |2       |0   |
+ROW   |68019  |1018   |29763 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68020  |1018   |29762 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68021  |1018   |29761 |0       |2        |F63100|0        |2       |0   |
+ROW   |68022  |1020   |29753 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68023  |1020   |29759 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68024  |1020   |29757 |0       |2        |F63100|0        |2       |0   |
+ROW   |68025  |1020   |29755 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68026  |1020   |29751 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68027  |1020   |29749 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68028  |1020   |29769 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |68029  |1020   |29747 |0       |7        |611F27|0        |2       |0   |
+ROW   |68030  |1019   |29754 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68031  |1019   |29760 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68032  |1019   |29758 |0       |2        |F63100|0        |2       |0   |
+ROW   |68033  |1019   |29756 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68034  |1019   |29752 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68035  |1019   |29750 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68036  |1019   |29746 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |68037  |1019   |29748 |0       |7        |611F27|0        |2       |0   |
+ROW   |68038  |1025   |29775 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68039  |1017   |29766 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68040  |1024   |29776 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68041  |1024   |29777 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68042  |1026   |29772 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68043  |1356   |32276 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68044  |1356   |32275 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68045  |1357   |32281 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68046  |1357   |32267 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68047  |1357   |32279 |0       |2        |F63100|0        |2       |0   |
+ROW   |68048  |1358   |32268 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68049  |1358   |32274 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68050  |1358   |32271 |0       |2        |F63100|0        |2       |0   |
+ROW   |68051  |1359   |32288 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68052  |1359   |32291 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68053  |1360   |32247 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68054  |1360   |32245 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68055  |1360   |32246 |0       |2        |F63100|0        |2       |0   |
+ROW   |68056  |1361   |32248 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68057  |1361   |32249 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68058  |1361   |32250 |0       |2        |F63100|0        |2       |0   |
+ROW   |68059  |1362   |32240 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68060  |1362   |32273 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68061  |1363   |32282 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68062  |1363   |32283 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68063  |1363   |32289 |0       |2        |F63100|0        |2       |0   |
+ROW   |68064  |1363   |32290 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68065  |1363   |32286 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68066  |1363   |32287 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68067  |1363   |32241 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |68068  |1363   |32242 |0       |7        |611F27|0        |2       |0   |
+ROW   |68069  |1363   |32243 |0       |8        |F230E0|0        |2       |0   |
+ROW   |68070  |1363   |32244 |0       |9        |FFAD40|0        |2       |0   |
+ROW   |68071  |1363   |32277 |0       |10       |40CDFF|0        |2       |0   |
+ROW   |68072  |1363   |32278 |0       |11       |40FFA0|0        |2       |0   |
+ROW   |68073  |1427   |32768 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68074  |1427   |32767 |5       |1        |2774A4|0        |2       |0   |
+ROW   |68075  |1428   |32774 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68076  |1428   |32772 |5       |1        |2774A4|0        |2       |0   |
+ROW   |68077  |1428   |32775 |5       |2        |F63100|0        |2       |0   |
+ROW   |68078  |1428   |32773 |5       |3        |A54F10|0        |2       |0   |
+ROW   |68079  |1429   |32779 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68080  |1429   |32777 |5       |1        |2774A4|0        |2       |0   |
+ROW   |68081  |1429   |32778 |5       |2        |F63100|0        |2       |0   |
+ROW   |68082  |1806   |36785 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68083  |1806   |36786 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68084  |1806   |36787 |0       |2        |F63100|0        |2       |0   |
+ROW   |68085  |1430   |32837 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68086  |1430   |32836 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68087  |1430   |32835 |2       |2        |F63100|0        |2       |0   |
+ROW   |68088  |1431   |32856 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68089  |1432   |32828 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68090  |1433   |32847 |5       |0        |34bdeb|0        |2       |0   |
+ROW   |68091  |1434   |32797 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68092  |1434   |32796 |5       |1        |2774A4|0        |2       |0   |
+ROW   |68093  |1434   |32801 |2       |2        |F63100|0        |2       |0   |
+ROW   |68094  |1435   |32834 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68095  |1436   |32819 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68096  |1437   |32826 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68097  |1614   |34976 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68098  |1614   |34975 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68099  |1614   |34978 |0       |2        |F63100|0        |2       |0   |
+ROW   |68100  |1614   |34979 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68101  |1614   |34980 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68102  |1615   |34982 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68103  |1615   |34997 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68104  |1615   |35001 |0       |2        |F63100|0        |2       |0   |
+ROW   |68105  |1615   |35000 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68106  |1615   |34998 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68107  |1615   |34996 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68108  |1616   |35015 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68109  |1616   |35014 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68110  |1617   |35012 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68111  |1617   |35013 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68112  |1618   |34951 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68113  |1618   |34952 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68114  |1618   |34953 |0       |2        |F63100|0        |2       |0   |
+ROW   |68115  |1618   |34954 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68116  |1618   |34956 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68117  |1618   |34950 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68118  |1618   |34957 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |68119  |1618   |34959 |0       |7        |611F27|0        |2       |0   |
+ROW   |68120  |1618   |34965 |0       |8        |F230E0|0        |2       |0   |
+ROW   |68121  |1445   |22404 |0       |0        |990099|0        |2       |0   |
+ROW   |68122  |1445   |22399 |0       |1        |990000|0        |2       |0   |
+ROW   |68123  |1445   |22416 |0       |2        |0000EE|0        |2       |0   |
+ROW   |68124  |1445   |25366 |0       |3        |FF33FF|0        |2       |0   |
+ROW   |68125  |1445   |22418 |0       |4        |009600|0        |2       |0   |
+ROW   |68126  |1445   |22402 |0       |5        |003300|0        |2       |0   |
+ROW   |68127  |1445   |22400 |0       |6        |33FFFF|0        |2       |0   |
+ROW   |68128  |1445   |22689 |0       |7        |DD0000|0        |2       |0   |
+ROW   |68129  |1445   |23171 |0       |8        |000099|0        |2       |0   |
+ROW   |68130  |1445   |22401 |0       |9        |00FF00|0        |2       |0   |
+ROW   |68131  |1445   |33023 |0       |10       |5A2B57|0        |2       |0   |
+ROW   |68132  |1651   |22406 |0       |0        |00EE00|0        |2       |0   |
+ROW   |68133  |1651   |25665 |0       |1        |0000EE|0        |2       |0   |
+ROW   |68134  |1651   |25666 |0       |2        |FFAA00|0        |2       |0   |
+ROW   |68135  |1651   |28537 |0       |3        |00EEEE|0        |2       |0   |
+ROW   |68136  |1651   |28535 |0       |4        |990099|0        |2       |0   |
+ROW   |68137  |1652   |22426 |0       |0        |00EE00|0        |2       |0   |
+ROW   |68138  |1652   |22408 |0       |1        |FFAA00|0        |2       |0   |
+ROW   |68139  |1652   |22412 |0       |2        |990099|0        |2       |0   |
+ROW   |68140  |1652   |22414 |0       |3        |FF66FF|0        |2       |0   |
+ROW   |68141  |1652   |23663 |0       |4        |009999|0        |2       |0   |
+ROW   |68142  |1652   |33022 |0       |5        |2B5429|0        |2       |0   |
+ROW   |68143  |1652   |22430 |0       |6        |8048B4|0        |2       |0   |
+ROW   |68144  |1652   |22420 |0       |7        |FD5434|0        |2       |0   |
+ROW   |68145  |1653   |22422 |0       |0        |00EE00|0        |2       |0   |
+ROW   |68146  |1653   |22424 |0       |1        |0000EE|0        |2       |0   |
+ROW   |68147  |1653   |25370 |0       |2        |FFAA00|0        |2       |0   |
+ROW   |68148  |1653   |29822 |0       |3        |00EEEE|0        |2       |0   |
+ROW   |68149  |1653   |34317 |0       |4        |990099|0        |2       |0   |
+ROW   |68150  |1653   |34316 |0       |5        |EE0000|0        |2       |0   |
+ROW   |68151  |1654   |33021 |0       |0        |C80000|0        |2       |0   |
+ROW   |68152  |1654   |33020 |0       |1        |00C800|0        |2       |0   |
+ROW   |68153  |527    |22199 |0       |0        |C80000|0        |2       |0   |
+ROW   |68154  |527    |22196 |0       |1        |00C800|0        |2       |0   |
+ROW   |68155  |410    |22185 |0       |0        |009900|0        |2       |0   |
+ROW   |68156  |410    |22189 |0       |1        |DD0000|0        |2       |0   |
+ROW   |68157  |410    |22396 |0       |2        |00DDDD|0        |2       |0   |
+ROW   |68158  |410    |22183 |0       |3        |3333FF|0        |2       |0   |
+ROW   |68159  |410    |22191 |0       |4        |999900|0        |2       |0   |
+ROW   |68160  |410    |23634 |0       |5        |00FF00|0        |2       |0   |
+ROW   |68161  |404    |22404 |0       |0        |990099|0        |2       |0   |
+ROW   |68162  |404    |22399 |0       |1        |990000|0        |2       |0   |
+ROW   |68163  |404    |22416 |0       |2        |0000EE|0        |2       |0   |
+ROW   |68164  |404    |22430 |0       |3        |FF33FF|0        |2       |0   |
+ROW   |68165  |404    |22418 |0       |4        |009600|0        |2       |0   |
+ROW   |68166  |404    |22402 |0       |5        |003300|0        |2       |0   |
+ROW   |68167  |404    |22420 |0       |6        |CCCC00|0        |2       |0   |
+ROW   |68168  |404    |22400 |0       |7        |33FFFF|0        |2       |0   |
+ROW   |68169  |404    |22689 |0       |8        |DD0000|0        |2       |0   |
+ROW   |68170  |404    |23171 |0       |9        |000099|0        |2       |0   |
+ROW   |68171  |404    |22401 |0       |10       |00FF00|0        |2       |0   |
+ROW   |68172  |404    |33023 |0       |11       |5A2B57|0        |2       |0   |
+ROW   |68173  |406    |22426 |0       |1        |00EE00|0        |2       |0   |
+ROW   |68174  |406    |22422 |0       |2        |0000EE|0        |2       |0   |
+ROW   |68175  |406    |22408 |0       |3        |FFAA00|0        |2       |0   |
+ROW   |68176  |406    |22424 |0       |4        |00EEEE|0        |2       |0   |
+ROW   |68177  |406    |22412 |0       |5        |990099|0        |2       |0   |
+ROW   |68178  |406    |22406 |0       |6        |EE0000|0        |2       |0   |
+ROW   |68179  |406    |22414 |0       |7        |FF66FF|0        |2       |0   |
+ROW   |68180  |406    |23663 |0       |8        |009999|0        |2       |0   |
+ROW   |68181  |406    |25366 |0       |9        |BBBB00|0        |2       |0   |
+ROW   |68182  |406    |25370 |0       |10       |AA0000|0        |2       |0   |
+ROW   |68183  |406    |25665 |0       |11       |990000|0        |2       |0   |
+ROW   |68184  |406    |25666 |0       |12       |008800|0        |2       |0   |
+ROW   |68185  |406    |28535 |0       |13       |80B0E0|0        |2       |0   |
+ROW   |68186  |406    |28537 |0       |14       |4080B0|0        |2       |0   |
+ROW   |68187  |406    |29822 |0       |15       |8000FF|0        |2       |0   |
+ROW   |68188  |406    |33022 |0       |16       |2B5429|0        |2       |0   |
+ROW   |68189  |406    |34317 |0       |17       |8048B4|0        |2       |0   |
+ROW   |68190  |406    |34316 |0       |18       |FD5434|0        |2       |0   |
+ROW   |68191  |406    |35274 |0       |19       |790E1F|0        |2       |0   |
+ROW   |68192  |406    |35272 |0       |20       |87AC4D|0        |2       |0   |
+ROW   |68193  |788    |28248 |0       |0        |008800|0        |2       |0   |
+ROW   |68194  |788    |28533 |0       |1        |EE0000|0        |2       |0   |
+ROW   |68195  |392    |22187 |5       |0        |00C800|0        |2       |0   |
+ROW   |68196  |392    |23251 |0       |1        |F63100|0        |2       |0   |
+ROW   |68197  |1444   |28581 |0       |0        |990099|0        |2       |0   |
+ROW   |68198  |1444   |28574 |0       |1        |990000|0        |2       |0   |
+ROW   |68199  |1444   |28571 |0       |2        |0000EE|0        |2       |0   |
+ROW   |68200  |1444   |28562 |0       |3        |FF33FF|0        |2       |0   |
+ROW   |68201  |1444   |28570 |0       |4        |009600|0        |2       |0   |
+ROW   |68202  |1444   |28569 |0       |5        |003300|0        |2       |0   |
+ROW   |68203  |1444   |28552 |0       |6        |33FFFF|0        |2       |0   |
+ROW   |68204  |1444   |28573 |0       |7        |DD0000|0        |2       |0   |
+ROW   |68205  |1444   |28579 |0       |8        |000099|0        |2       |0   |
+ROW   |68206  |1444   |28559 |0       |9        |00FF00|0        |2       |0   |
+ROW   |68207  |1444   |33017 |0       |10       |5A2B57|0        |2       |0   |
+ROW   |68208  |1659   |28567 |0       |0        |00EE00|0        |2       |0   |
+ROW   |68209  |1659   |28575 |0       |1        |0000EE|0        |2       |0   |
+ROW   |68210  |1659   |28576 |0       |2        |FFAA00|0        |2       |0   |
+ROW   |68211  |1659   |28583 |0       |3        |00EEEE|0        |2       |0   |
+ROW   |68212  |1659   |28582 |0       |4        |990099|0        |2       |0   |
+ROW   |68213  |1660   |28572 |0       |0        |00EE00|0        |2       |0   |
+ROW   |68214  |1660   |28568 |0       |1        |FFAA00|0        |2       |0   |
+ROW   |68215  |1660   |28564 |0       |2        |990099|0        |2       |0   |
+ROW   |68216  |1660   |28578 |0       |3        |FF66FF|0        |2       |0   |
+ROW   |68217  |1660   |28580 |0       |4        |009999|0        |2       |0   |
+ROW   |68218  |1660   |33016 |0       |5        |2B5429|0        |2       |0   |
+ROW   |68219  |1660   |28565 |0       |6        |8048B4|0        |2       |0   |
+ROW   |68220  |1660   |28577 |0       |7        |FD5434|0        |2       |0   |
+ROW   |68221  |1661   |28566 |0       |0        |00EE00|0        |2       |0   |
+ROW   |68222  |1661   |28561 |0       |1        |0000EE|0        |2       |0   |
+ROW   |68223  |1661   |28563 |0       |2        |FFAA00|0        |2       |0   |
+ROW   |68224  |1661   |29821 |0       |3        |00EEEE|0        |2       |0   |
+ROW   |68225  |1661   |34314 |0       |4        |990099|0        |2       |0   |
+ROW   |68226  |1661   |34315 |0       |5        |EE0000|0        |2       |0   |
+ROW   |68227  |1662   |33015 |0       |0        |C80000|0        |2       |0   |
+ROW   |68228  |1662   |33014 |0       |1        |00C800|0        |2       |0   |
+ROW   |68229  |797    |28546 |0       |0        |C80000|0        |2       |0   |
+ROW   |68230  |797    |28545 |0       |1        |00C800|0        |2       |0   |
+ROW   |68231  |798    |28551 |0       |0        |009900|0        |2       |0   |
+ROW   |68232  |798    |28543 |0       |1        |DD0000|0        |2       |0   |
+ROW   |68233  |798    |28542 |0       |2        |00DDDD|0        |2       |0   |
+ROW   |68234  |798    |28549 |0       |3        |3333FF|0        |2       |0   |
+ROW   |68235  |798    |28544 |0       |4        |999900|0        |2       |0   |
+ROW   |68236  |798    |28548 |0       |5        |00FF00|0        |2       |0   |
+ROW   |68237  |799    |28581 |0       |0        |990099|0        |2       |0   |
+ROW   |68238  |799    |28574 |0       |1        |990000|0        |2       |0   |
+ROW   |68239  |799    |28571 |0       |2        |0000EE|0        |2       |0   |
+ROW   |68240  |799    |28565 |0       |3        |FF33FF|0        |2       |0   |
+ROW   |68241  |799    |28570 |0       |4        |009600|0        |2       |0   |
+ROW   |68242  |799    |28569 |0       |5        |003300|0        |2       |0   |
+ROW   |68243  |799    |28577 |0       |6        |CCCC00|0        |2       |0   |
+ROW   |68244  |799    |28552 |0       |7        |33FFFF|0        |2       |0   |
+ROW   |68245  |799    |28573 |0       |8        |DD0000|0        |2       |0   |
+ROW   |68246  |799    |28579 |0       |9        |000099|0        |2       |0   |
+ROW   |68247  |799    |28559 |0       |10       |00FF00|0        |2       |0   |
+ROW   |68248  |799    |33017 |0       |11       |5A2B57|0        |2       |0   |
+ROW   |68249  |800    |28572 |0       |1        |00EE00|0        |2       |0   |
+ROW   |68250  |800    |28566 |0       |2        |0000EE|0        |2       |0   |
+ROW   |68251  |800    |28568 |0       |3        |FFAA00|0        |2       |0   |
+ROW   |68252  |800    |28561 |0       |4        |00EEEE|0        |2       |0   |
+ROW   |68253  |800    |28564 |0       |5        |990099|0        |2       |0   |
+ROW   |68254  |800    |28567 |0       |6        |EE0000|0        |2       |0   |
+ROW   |68255  |800    |28578 |0       |7        |FF66FF|0        |2       |0   |
+ROW   |68256  |800    |28580 |0       |8        |009999|0        |2       |0   |
+ROW   |68257  |800    |28562 |0       |9        |BBBB00|0        |2       |0   |
+ROW   |68258  |800    |28563 |0       |10       |AA0000|0        |2       |0   |
+ROW   |68259  |800    |28575 |0       |11       |990000|0        |2       |0   |
+ROW   |68260  |800    |28576 |0       |12       |008800|0        |2       |0   |
+ROW   |68261  |800    |28582 |0       |13       |80B0E0|0        |2       |0   |
+ROW   |68262  |800    |28583 |0       |14       |4080B0|0        |2       |0   |
+ROW   |68263  |800    |29821 |0       |15       |8000FF|0        |2       |0   |
+ROW   |68264  |800    |33016 |0       |16       |2B5429|0        |2       |0   |
+ROW   |68265  |800    |34314 |0       |17       |8048B4|0        |2       |0   |
+ROW   |68266  |800    |34315 |0       |18       |FD5434|0        |2       |0   |
+ROW   |68267  |800    |35279 |0       |19       |790E1F|0        |2       |0   |
+ROW   |68268  |800    |35278 |0       |20       |87AC4D|0        |2       |0   |
+ROW   |68269  |801    |28560 |0       |0        |008800|0        |2       |0   |
+ROW   |68270  |801    |28584 |0       |1        |EE0000|0        |2       |0   |
+ROW   |68271  |802    |28550 |5       |0        |00C800|0        |2       |0   |
+ROW   |68272  |802    |28540 |0       |1        |F63100|0        |2       |0   |
+ROW   |68273  |1438   |33001 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68274  |1438   |33002 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68275  |1438   |33000 |2       |2        |F63100|0        |2       |0   |
+ROW   |68276  |1439   |33005 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68277  |1439   |33004 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68278  |1440   |32980 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68279  |1440   |32970 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68280  |1441   |32967 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68281  |1441   |32968 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68282  |1441   |32995 |2       |2        |F63100|0        |2       |0   |
+ROW   |68283  |1442   |32997 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68284  |1442   |32984 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68285  |1443   |32973 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68286  |1443   |32971 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68287  |1503   |33518 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68288  |1504   |33501 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68289  |803    |28599 |0       |0        |DD0000|0        |2       |0   |
+ROW   |68290  |803    |28596 |0       |1        |00DDDD|0        |2       |0   |
+ROW   |68291  |803    |28597 |0       |2        |3333FF|0        |2       |0   |
+ROW   |68292  |803    |28598 |0       |3        |00FF00|0        |2       |0   |
+ROW   |68293  |804    |28602 |0       |1        |990099|0        |2       |0   |
+ROW   |68294  |804    |28606 |0       |2        |990000|0        |2       |0   |
+ROW   |68295  |804    |28608 |0       |3        |0000EE|0        |2       |0   |
+ROW   |68296  |804    |28615 |0       |4        |FF33FF|0        |2       |0   |
+ROW   |68297  |804    |28610 |0       |5        |00EE00|0        |2       |0   |
+ROW   |68298  |804    |28611 |0       |6        |003300|0        |2       |0   |
+ROW   |68299  |804    |28616 |0       |7        |33FFFF|0        |2       |0   |
+ROW   |68300  |804    |28607 |0       |8        |DD0000|0        |2       |0   |
+ROW   |68301  |804    |28604 |0       |9        |000099|0        |2       |0   |
+ROW   |68302  |804    |28588 |0       |10       |00FF00|0        |2       |0   |
+ROW   |68303  |804    |33013 |0       |11       |BB2A02|0        |2       |0   |
+ROW   |68304  |805    |28612 |0       |1        |FFAA00|0        |2       |0   |
+ROW   |68305  |805    |28600 |0       |2        |990099|0        |2       |0   |
+ROW   |68306  |805    |28613 |0       |3        |EE0000|0        |2       |0   |
+ROW   |68307  |805    |28605 |0       |4        |FF66FF|0        |2       |0   |
+ROW   |68308  |805    |28614 |0       |5        |960000|0        |2       |0   |
+ROW   |68309  |805    |28601 |0       |6        |009600|0        |2       |0   |
+ROW   |68310  |805    |28603 |0       |7        |009999|0        |2       |0   |
+ROW   |68311  |805    |28609 |0       |8        |BBBB00|0        |2       |0   |
+ROW   |68312  |805    |33012 |0       |9        |F230E0|0        |2       |0   |
+ROW   |68313  |806    |28595 |0       |0        |00C800|0        |2       |0   |
+ROW   |68314  |806    |28586 |0       |1        |C80000|0        |2       |0   |
+ROW   |68315  |529    |23357 |0       |0        |DD0000|0        |2       |0   |
+ROW   |68316  |529    |23341 |0       |1        |00DDDD|0        |2       |0   |
+ROW   |68317  |529    |23342 |0       |2        |3333FF|0        |2       |0   |
+ROW   |68318  |529    |28251 |0       |3        |00FF00|0        |2       |0   |
+ROW   |68319  |530    |23345 |0       |1        |990099|0        |2       |0   |
+ROW   |68320  |530    |23348 |0       |2        |990000|0        |2       |0   |
+ROW   |68321  |530    |23355 |0       |3        |0000EE|0        |2       |0   |
+ROW   |68322  |530    |23352 |0       |4        |FF33FF|0        |2       |0   |
+ROW   |68323  |530    |23356 |0       |5        |007700|0        |2       |0   |
+ROW   |68324  |530    |23354 |0       |6        |003300|0        |2       |0   |
+ROW   |68325  |530    |23346 |0       |7        |33FFFF|0        |2       |0   |
+ROW   |68326  |530    |23349 |0       |8        |DD0000|0        |2       |0   |
+ROW   |68327  |530    |23344 |0       |9        |000099|0        |7       |0   |
+ROW   |68328  |530    |28250 |0       |10       |00FF00|0        |2       |0   |
+ROW   |68329  |530    |33019 |0       |11       |BB2A02|0        |2       |0   |
+ROW   |68330  |531    |23353 |0       |1        |FFAA00|0        |2       |0   |
+ROW   |68331  |531    |23347 |0       |2        |990099|0        |2       |0   |
+ROW   |68332  |531    |23350 |0       |3        |EE0000|0        |2       |0   |
+ROW   |68333  |531    |23343 |0       |4        |FF66FF|0        |2       |0   |
+ROW   |68334  |531    |23351 |0       |5        |0000EE|0        |2       |0   |
+ROW   |68335  |531    |23360 |0       |6        |00EE00|0        |2       |0   |
+ROW   |68336  |531    |25369 |0       |7        |009999|0        |2       |0   |
+ROW   |68337  |531    |25368 |0       |8        |BBBB00|0        |2       |0   |
+ROW   |68338  |531    |28618 |0       |9        |990000|0        |2       |0   |
+ROW   |68339  |531    |28619 |0       |10       |008800|0        |2       |0   |
+ROW   |68340  |531    |33018 |0       |11       |BB2A02|0        |2       |0   |
+ROW   |68341  |807    |28617 |0       |0        |008800|0        |2       |0   |
+ROW   |68342  |532    |23340 |5       |0        |00C800|0        |2       |0   |
+ROW   |68343  |532    |23358 |5       |1        |C80000|1        |2       |0   |
+ROW   |68344  |472    |22945 |5       |0        |00AA00|0        |2       |0   |
+ROW   |68345  |472    |22946 |5       |1        |3333FF|0        |2       |0   |
+ROW   |68346  |473    |22950 |0       |0        |C80000|0        |2       |2   |
+ROW   |68347  |473    |22948 |0       |1        |00C800|0        |2       |0   |
+ROW   |68348  |471    |22924 |0       |0        |009900|0        |2       |0   |
+ROW   |68349  |471    |22920 |0       |1        |000099|0        |2       |0   |
+ROW   |68350  |469    |22922 |0       |0        |009900|0        |2       |0   |
+ROW   |68351  |469    |22923 |0       |1        |000099|0        |2       |0   |
+ROW   |68352  |469    |22921 |0       |2        |990000|0        |2       |0   |
+ROW   |68353  |498    |23109 |0       |0        |009999|0        |2       |0   |
+ROW   |68354  |498    |23112 |0       |1        |990099|0        |2       |0   |
+ROW   |68355  |498    |23115 |0       |2        |999900|0        |2       |0   |
+ROW   |68356  |498    |23113 |0       |3        |990000|0        |2       |0   |
+ROW   |68357  |498    |23114 |0       |4        |000099|0        |2       |0   |
+ROW   |68358  |498    |23110 |0       |5        |009900|0        |2       |0   |
+ROW   |68359  |540    |22942 |5       |0        |00C800|0        |2       |0   |
+ROW   |68360  |492    |23073 |5       |0        |00AA00|0        |2       |0   |
+ROW   |68361  |492    |23074 |5       |1        |3333FF|0        |2       |0   |
+ROW   |68362  |467    |22910 |0       |0        |C80000|0        |2       |2   |
+ROW   |68363  |467    |22908 |0       |1        |00C800|0        |2       |0   |
+ROW   |68364  |465    |22884 |0       |0        |009900|0        |2       |0   |
+ROW   |68365  |465    |22880 |0       |1        |000099|0        |2       |0   |
+ROW   |68366  |463    |22882 |0       |0        |009900|0        |2       |0   |
+ROW   |68367  |463    |22883 |0       |1        |000099|0        |2       |0   |
+ROW   |68368  |463    |22881 |0       |2        |990000|0        |2       |0   |
+ROW   |68369  |462    |22886 |1       |0        |009999|0        |2       |0   |
+ROW   |68370  |462    |22888 |1       |1        |990099|0        |2       |0   |
+ROW   |68371  |462    |22891 |1       |2        |990000|0        |2       |0   |
+ROW   |68372  |462    |22892 |1       |3        |000099|0        |2       |0   |
+ROW   |68373  |462    |22885 |1       |4        |009900|0        |2       |0   |
+ROW   |68374  |541    |22902 |5       |0        |00C800|0        |2       |0   |
+ROW   |68375  |464    |22897 |0       |0        |AA0000|0        |2       |2   |
+ROW   |68376  |464    |22895 |0       |1        |00AA00|0        |2       |0   |
+ROW   |68377  |478    |22985 |5       |0        |00AA00|0        |2       |0   |
+ROW   |68378  |478    |22986 |5       |1        |3333FF|0        |2       |0   |
+ROW   |68379  |479    |22990 |0       |0        |C80000|0        |2       |2   |
+ROW   |68380  |479    |22988 |0       |1        |00C800|0        |2       |0   |
+ROW   |68381  |475    |22962 |0       |0        |009900|0        |2       |0   |
+ROW   |68382  |475    |22963 |0       |1        |000099|0        |2       |0   |
+ROW   |68383  |475    |22961 |0       |2        |990000|0        |2       |0   |
+ROW   |68384  |474    |22968 |1       |0        |990099|0        |2       |0   |
+ROW   |68385  |474    |22971 |1       |1        |990000|0        |2       |0   |
+ROW   |68386  |474    |22972 |1       |2        |000099|0        |2       |0   |
+ROW   |68387  |474    |22965 |1       |3        |009900|0        |2       |0   |
+ROW   |68388  |542    |22982 |5       |0        |00C800|0        |2       |0   |
+ROW   |68389  |491    |23070 |0       |0        |C80000|0        |2       |2   |
+ROW   |68390  |491    |23068 |0       |1        |00C800|0        |2       |0   |
+ROW   |68391  |487    |23042 |0       |0        |009900|0        |2       |0   |
+ROW   |68392  |487    |23043 |0       |1        |000099|0        |2       |0   |
+ROW   |68393  |487    |23041 |0       |2        |990000|0        |2       |0   |
+ROW   |68394  |543    |23062 |5       |0        |00C800|0        |2       |0   |
+ROW   |68395  |494    |23077 |5       |0        |00AA00|0        |2       |0   |
+ROW   |68396  |494    |23078 |5       |1        |3333FF|0        |2       |0   |
+ROW   |68397  |493    |23075 |5       |0        |00AA00|0        |2       |0   |
+ROW   |68398  |493    |23076 |5       |1        |3333FF|0        |2       |0   |
+ROW   |68399  |461    |22870 |0       |0        |C80000|0        |2       |2   |
+ROW   |68400  |461    |22868 |0       |1        |00C800|0        |2       |0   |
+ROW   |68401  |459    |22844 |0       |0        |009900|0        |2       |0   |
+ROW   |68402  |459    |22840 |0       |1        |000099|0        |2       |0   |
+ROW   |68403  |457    |22842 |0       |0        |009900|0        |2       |0   |
+ROW   |68404  |457    |22843 |0       |1        |000099|0        |2       |0   |
+ROW   |68405  |457    |22841 |0       |2        |990000|0        |2       |0   |
+ROW   |68406  |456    |22846 |1       |0        |009999|0        |2       |0   |
+ROW   |68407  |456    |22848 |1       |1        |990099|0        |2       |0   |
+ROW   |68408  |456    |22851 |1       |2        |990000|0        |2       |0   |
+ROW   |68409  |456    |22852 |1       |3        |000099|0        |2       |0   |
+ROW   |68410  |456    |22845 |1       |4        |009900|0        |2       |0   |
+ROW   |68411  |544    |22862 |5       |0        |00C800|0        |2       |0   |
+ROW   |68412  |458    |22857 |0       |0        |AA0000|0        |2       |2   |
+ROW   |68413  |458    |22855 |0       |1        |00AA00|0        |2       |0   |
+ROW   |68414  |484    |23025 |5       |0        |00AA00|0        |2       |0   |
+ROW   |68415  |484    |23026 |5       |1        |3333FF|0        |2       |0   |
+ROW   |68416  |485    |23030 |0       |0        |C80000|0        |2       |2   |
+ROW   |68417  |485    |23028 |0       |1        |00C800|0        |2       |0   |
+ROW   |68418  |483    |23004 |0       |0        |009900|0        |2       |0   |
+ROW   |68419  |483    |23000 |0       |1        |000099|0        |2       |0   |
+ROW   |68420  |481    |23002 |0       |0        |009900|0        |2       |0   |
+ROW   |68421  |481    |23003 |0       |1        |000099|0        |2       |0   |
+ROW   |68422  |481    |23001 |0       |2        |990000|0        |2       |0   |
+ROW   |68423  |480    |23007 |1       |0        |999900|0        |2       |0   |
+ROW   |68424  |480    |23011 |1       |1        |990000|0        |2       |0   |
+ROW   |68425  |480    |23012 |1       |2        |000099|0        |2       |0   |
+ROW   |68426  |480    |23005 |1       |3        |009900|0        |2       |0   |
+ROW   |68427  |545    |23022 |5       |0        |00C800|0        |2       |0   |
+ROW   |68428  |482    |23017 |0       |0        |AA0000|0        |2       |2   |
+ROW   |68429  |482    |23015 |0       |1        |00AA00|0        |2       |0   |
+ROW   |68430  |651    |26928 |5       |0        |EE0000|0        |2       |0   |
+ROW   |68431  |651    |26927 |0       |1        |000000|1        |2       |0   |
+ROW   |68432  |652    |26925 |2       |0        |880000|0        |2       |0   |
+ROW   |68433  |652    |26932 |0       |1        |009900|0        |2       |0   |
+ROW   |68434  |652    |26930 |0       |2        |00CCCC|0        |2       |0   |
+ROW   |68435  |652    |26931 |0       |3        |000000|0        |2       |0   |
+ROW   |68436  |652    |26929 |0       |4        |3333FF|0        |2       |0   |
+ROW   |68437  |652    |26926 |0       |5        |777700|0        |2       |0   |
+ROW   |68438  |653    |26933 |2       |0        |EE0000|0        |2       |0   |
+ROW   |68439  |653    |26943 |2       |1        |EE00EE|0        |2       |0   |
+ROW   |68440  |653    |26935 |0       |2        |000000|1        |2       |0   |
+ROW   |68441  |653    |26936 |4       |3        |000000|1        |2       |0   |
+ROW   |68442  |654    |26934 |2       |0        |880000|0        |2       |0   |
+ROW   |68443  |654    |26939 |0       |1        |009900|0        |2       |0   |
+ROW   |68444  |654    |26942 |0       |2        |00CCCC|0        |2       |0   |
+ROW   |68445  |654    |26938 |0       |3        |000000|0        |2       |0   |
+ROW   |68446  |654    |26937 |0       |4        |3333FF|0        |2       |0   |
+ROW   |68447  |1447   |33113 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68448  |1447   |33112 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68449  |1447   |33099 |0       |2        |F63100|0        |2       |0   |
+ROW   |68450  |1447   |33098 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68451  |1448   |33125 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68452  |1448   |33110 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68453  |1449   |33080 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68454  |1449   |33081 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68455  |1450   |33089 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68456  |1450   |33085 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68457  |1451   |33082 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68458  |1451   |33086 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68459  |1451   |33083 |0       |2        |F63100|0        |2       |0   |
+ROW   |68460  |1451   |33084 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68461  |1451   |33087 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68462  |1451   |33088 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68463  |1452   |33093 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68464  |1452   |33092 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68465  |1453   |33077 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68466  |1453   |33063 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68467  |1454   |33094 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68468  |1454   |33059 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68469  |1455   |33066 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68470  |1455   |33071 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68471  |1455   |33067 |0       |2        |F63100|0        |2       |0   |
+ROW   |68472  |1455   |33068 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68473  |1455   |33072 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68474  |1455   |33073 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68475  |1159   |30886 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68476  |1159   |30887 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68477  |1160   |30888 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68478  |1160   |30882 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68479  |1160   |30890 |0       |2        |F63100|0        |2       |0   |
+ROW   |68480  |1160   |30881 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68481  |1160   |30889 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68482  |1161   |30847 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68483  |1161   |30872 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68484  |1162   |30853 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68485  |1162   |30849 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68486  |1162   |30852 |2       |2        |F63100|0        |2       |0   |
+ROW   |68487  |1162   |30851 |2       |3        |A54F10|0        |2       |0   |
+ROW   |68488  |1162   |30848 |2       |4        |FC6EA3|0        |2       |0   |
+ROW   |68489  |1163   |30856 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68490  |1163   |30855 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68491  |1163   |30854 |2       |2        |F63100|1        |2       |0   |
+ROW   |68492  |1164   |30859 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68493  |1164   |30870 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68494  |1165   |30860 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68495  |1165   |30871 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68496  |1166   |30868 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68497  |1166   |30869 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68498  |1166   |30867 |0       |2        |F63100|0        |2       |0   |
+ROW   |68499  |1166   |30866 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68500  |1166   |30865 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68501  |1167   |30850 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68502  |1167   |30863 |5       |1        |2774A4|0        |2       |0   |
+ROW   |68503  |1167   |30861 |5       |2        |F63100|0        |2       |0   |
+ROW   |68504  |1168   |30833 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68505  |1168   |30841 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68506  |1168   |30857 |2       |2        |F63100|0        |2       |0   |
+ROW   |68507  |1169   |30834 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68508  |1169   |30831 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68509  |1170   |30846 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68510  |1576   |34320 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68511  |1576   |30845 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68512  |1576   |30842 |0       |2        |F63100|0        |2       |0   |
+ROW   |68513  |1576   |30873 |2       |3        |A54F10|1        |2       |0   |
+ROW   |68514  |1663   |35291 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68515  |1663   |35300 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68516  |1664   |35295 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68517  |1664   |35296 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68518  |1665   |35301 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68519  |1665   |35306 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68520  |1665   |35304 |0       |2        |F63100|0        |2       |0   |
+ROW   |68521  |1665   |35302 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68522  |1666   |35308 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68523  |1666   |35310 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68524  |1666   |35309 |0       |2        |F63100|0        |2       |0   |
+ROW   |68525  |1667   |35322 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68526  |1667   |35320 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68527  |1668   |35329 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68528  |1668   |35330 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68529  |1669   |35332 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68530  |1669   |35334 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68531  |1670   |35335 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68532  |1670   |35333 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68533  |1671   |35338 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68534  |1671   |35341 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68535  |1671   |35339 |0       |2        |F63100|0        |2       |0   |
+ROW   |68536  |1671   |35340 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68537  |1672   |35347 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68538  |1672   |35346 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68539  |1672   |35345 |0       |2        |F63100|0        |2       |0   |
+ROW   |68540  |1673   |35350 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68541  |1673   |35351 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68542  |1674   |35349 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68543  |1674   |35352 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68544  |1674   |35353 |0       |2        |F63100|0        |2       |0   |
+ROW   |68545  |1675   |35355 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68546  |1675   |35356 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68547  |1505   |33553 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68548  |1505   |33562 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68549  |1506   |33557 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68550  |1506   |33558 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68551  |1507   |33563 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68552  |1507   |33568 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68553  |1507   |33566 |0       |2        |F63100|0        |2       |0   |
+ROW   |68554  |1507   |33564 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68555  |1508   |33570 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68556  |1508   |33572 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68557  |1508   |33571 |0       |2        |F63100|0        |2       |0   |
+ROW   |68558  |1509   |33584 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68559  |1509   |33582 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68560  |1510   |33591 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68561  |1510   |33592 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68562  |1511   |33594 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68563  |1511   |33596 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68564  |1512   |33597 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68565  |1512   |33595 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68566  |1513   |33600 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68567  |1513   |33603 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68568  |1513   |33601 |0       |2        |F63100|0        |2       |0   |
+ROW   |68569  |1513   |33602 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68570  |1514   |33609 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68571  |1514   |33608 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68572  |1514   |33607 |0       |2        |F63100|0        |2       |0   |
+ROW   |68573  |1515   |33612 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68574  |1515   |33613 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68575  |1516   |33611 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68576  |1516   |33614 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68577  |1516   |33615 |0       |2        |F63100|0        |2       |0   |
+ROW   |68578  |1517   |33617 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68579  |1517   |33618 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68580  |1807   |36817 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68581  |1807   |36816 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68582  |1808   |36815 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68583  |1808   |36814 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68584  |1808   |36818 |0       |2        |F63100|0        |2       |0   |
+ROW   |68585  |1808   |36819 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68586  |1809   |36805 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68587  |1809   |36804 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68588  |1527   |33819 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68589  |1527   |33839 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68590  |1528   |33820 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68591  |1528   |33816 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68592  |1529   |33826 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68593  |1529   |33831 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68594  |1529   |33829 |0       |2        |F63100|0        |2       |0   |
+ROW   |68595  |1529   |33821 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68596  |1529   |33825 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68597  |1529   |33833 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68598  |1529   |33823 |2       |6        |AC8C14|0        |2       |0   |
+ROW   |68599  |1530   |33828 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68600  |1530   |33832 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68601  |1530   |33830 |0       |2        |F63100|0        |2       |0   |
+ROW   |68602  |1530   |33822 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68603  |1530   |33815 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68604  |1530   |33834 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68605  |1530   |33824 |2       |6        |AC8C14|0        |2       |0   |
+ROW   |68606  |1531   |33840 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68607  |1531   |33845 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68608  |1532   |33844 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68609  |1532   |33847 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68610  |1532   |33843 |0       |2        |F63100|0        |2       |0   |
+ROW   |68611  |1532   |33841 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68612  |1533   |33863 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68613  |1534   |33792 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68614  |1534   |33791 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68615  |1534   |33793 |0       |2        |F63100|0        |2       |0   |
+ROW   |68616  |1535   |33802 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68617  |1535   |33770 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68618  |1536   |33800 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68619  |1536   |33799 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68620  |1536   |33801 |0       |2        |F63100|0        |2       |0   |
+ROW   |68621  |1537   |33798 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68622  |1537   |33806 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68623  |1537   |33774 |0       |2        |F63100|0        |2       |0   |
+ROW   |68624  |1538   |33769 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68625  |1538   |33787 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68626  |1538   |33789 |0       |2        |F63100|0        |2       |0   |
+ROW   |68627  |1538   |33790 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68628  |1539   |33785 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68629  |1539   |33772 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68630  |1539   |33773 |0       |2        |F63100|0        |2       |0   |
+ROW   |68631  |1539   |33771 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68632  |1540   |33776 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68633  |1540   |33775 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68634  |1541   |33782 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68635  |1541   |33781 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68636  |1541   |33780 |0       |2        |F63100|0        |2       |0   |
+ROW   |68637  |1541   |33783 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68638  |1541   |33777 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68639  |1541   |33778 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68640  |1542   |33804 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68641  |1542   |33803 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68642  |1542   |33805 |2       |2        |F63100|0        |2       |0   |
+ROW   |68643  |1543   |33937 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68644  |1543   |33940 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68645  |1543   |33936 |0       |2        |F63100|0        |2       |0   |
+ROW   |68646  |1543   |33934 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68647  |1544   |33915 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68648  |1544   |33911 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68649  |1544   |33912 |0       |2        |F63100|0        |2       |0   |
+ROW   |68650  |1544   |33910 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68651  |1544   |33914 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68652  |1545   |33918 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68653  |1545   |33905 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68654  |1545   |33917 |0       |2        |F63100|0        |2       |0   |
+ROW   |68655  |1545   |33916 |2       |3        |A54F10|1        |2       |0   |
+ROW   |68656  |1546   |33908 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68657  |1546   |33909 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68658  |1546   |33902 |0       |2        |F63100|0        |2       |0   |
+ROW   |68659  |1547   |33893 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68660  |1547   |33892 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68661  |1548   |33899 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68662  |1548   |33898 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68663  |1548   |33895 |2       |2        |F63100|0        |2       |0   |
+ROW   |68664  |1548   |33900 |2       |3        |A54F10|0        |2       |0   |
+ROW   |68665  |1548   |33896 |2       |4        |FC6EA3|0        |2       |0   |
+ROW   |68666  |1548   |33891 |2       |5        |6C59DC|0        |2       |0   |
+ROW   |68667  |1190   |31140 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68668  |1190   |31141 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68669  |1261   |31145 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68670  |1261   |31146 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68671  |1261   |31147 |0       |2        |F63100|0        |2       |0   |
+ROW   |68672  |1191   |31138 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68673  |1192   |31157 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68674  |1192   |31158 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68675  |1193   |31092 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68676  |1193   |31108 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68677  |1193   |31110 |0       |2        |F63100|0        |2       |0   |
+ROW   |68678  |1193   |31067 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68679  |1193   |31086 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68680  |1193   |31087 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68681  |1194   |31120 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68682  |1194   |31105 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68683  |1194   |31071 |0       |2        |F63100|0        |2       |0   |
+ROW   |68684  |1194   |31081 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68685  |1195   |31098 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68686  |1195   |31099 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68687  |1196   |31072 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68688  |1196   |31072 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68689  |1197   |31103 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68690  |1197   |31074 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68691  |1198   |31104 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68692  |1198   |31063 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68693  |1198   |31111 |0       |2        |F63100|0        |2       |0   |
+ROW   |68694  |1198   |31112 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68695  |1198   |31084 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68696  |1199   |31115 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68697  |1199   |31116 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68698  |1199   |31062 |0       |2        |F63100|0        |2       |0   |
+ROW   |68699  |1199   |31118 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68700  |1199   |31056 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68701  |1200   |31107 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68702  |1200   |31090 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68703  |1201   |31097 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68704  |1201   |31096 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68705  |1202   |31089 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68706  |1202   |31061 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68707  |1203   |31064 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68708  |1204   |31065 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68709  |1204   |31066 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68710  |1204   |31068 |0       |2        |F63100|0        |2       |0   |
+ROW   |68711  |1204   |31070 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68712  |1204   |31101 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68713  |1204   |31106 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68714  |1204   |31114 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |68715  |1205   |31069 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68716  |1206   |31076 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68717  |1206   |31078 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68718  |1206   |31109 |0       |2        |F63100|0        |2       |0   |
+ROW   |68719  |1206   |31075 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68720  |1207   |31080 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68721  |1207   |31095 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68722  |1208   |31113 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68723  |1208   |31118 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68724  |1209   |31058 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68725  |1209   |31077 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68726  |1209   |31056 |0       |2        |F63100|0        |2       |0   |
+ROW   |68727  |1209   |31117 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68728  |1109   |30453 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68729  |1109   |30455 |5       |1        |2774A4|0        |2       |0   |
+ROW   |68730  |1110   |30471 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68731  |1110   |30470 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68732  |1110   |30466 |0       |2        |F63100|0        |2       |0   |
+ROW   |68733  |1110   |30441 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68734  |1111   |30463 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68735  |1111   |30452 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68736  |1111   |30451 |0       |2        |F63100|0        |2       |0   |
+ROW   |68737  |1111   |30437 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68738  |1112   |30456 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68739  |1112   |30457 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68740  |1112   |30458 |0       |2        |F63100|0        |2       |0   |
+ROW   |68741  |1112   |30459 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68742  |1113   |30442 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68743  |1113   |30444 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68744  |1113   |30445 |0       |2        |F63100|0        |2       |0   |
+ROW   |68745  |1114   |30446 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68746  |1114   |30447 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68747  |1114   |31168 |0       |2        |F63100|0        |2       |0   |
+ROW   |68748  |1114   |30449 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68749  |1136   |30659 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68750  |1136   |30661 |5       |1        |2774A4|0        |2       |0   |
+ROW   |68751  |1137   |30677 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68752  |1137   |30676 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68753  |1137   |30672 |0       |2        |F63100|0        |2       |0   |
+ROW   |68754  |1137   |30647 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68755  |1138   |30669 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68756  |1138   |30658 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68757  |1138   |30657 |0       |2        |F63100|0        |2       |0   |
+ROW   |68758  |1138   |30643 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68759  |1139   |30662 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68760  |1139   |30663 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68761  |1139   |30664 |0       |2        |F63100|0        |2       |0   |
+ROW   |68762  |1139   |30665 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68763  |1140   |30648 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68764  |1140   |30650 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68765  |1140   |30651 |0       |2        |F63100|0        |2       |0   |
+ROW   |68766  |1141   |30652 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68767  |1141   |30653 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68768  |1141   |31172 |0       |2        |F63100|0        |2       |0   |
+ROW   |68769  |1141   |30655 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68770  |1115   |30506 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68771  |1115   |30507 |5       |1        |2774A4|0        |2       |0   |
+ROW   |68772  |1116   |30504 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68773  |1116   |30505 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68774  |1116   |30518 |0       |2        |F63100|0        |2       |0   |
+ROW   |68775  |1116   |30492 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68776  |1117   |30493 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68777  |1117   |30500 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68778  |1117   |30486 |0       |2        |F63100|0        |2       |0   |
+ROW   |68779  |1117   |30488 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68780  |1118   |30508 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68781  |1118   |30509 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68782  |1118   |30503 |0       |2        |F63100|0        |2       |0   |
+ROW   |68783  |1118   |30510 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68784  |1119   |30491 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68785  |1119   |30494 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68786  |1119   |30495 |0       |2        |F63100|0        |2       |0   |
+ROW   |68787  |1120   |30496 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68788  |1120   |30497 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68789  |1120   |31176 |0       |2        |F63100|0        |2       |0   |
+ROW   |68790  |1120   |30499 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68791  |1266   |31773 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68792  |1266   |31774 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68793  |1267   |31777 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68794  |1267   |31779 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68795  |1267   |33168 |0       |2        |F63100|0        |2       |0   |
+ROW   |68796  |1268   |31685 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68797  |1268   |31738 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68798  |1269   |31723 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68799  |1269   |31757 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68800  |1269   |31721 |0       |2        |F63100|0        |2       |0   |
+ROW   |68801  |1270   |31728 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68802  |1270   |31759 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68803  |1271   |31745 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68804  |1271   |31727 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68805  |1272   |31687 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68806  |1272   |31710 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68807  |1273   |31705 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68808  |1273   |31703 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68809  |1273   |31706 |0       |2        |F63100|0        |2       |0   |
+ROW   |68810  |1273   |31701 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68811  |1273   |31708 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68812  |1274   |31715 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68813  |1274   |31726 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68814  |1274   |31717 |0       |2        |F63100|0        |2       |0   |
+ROW   |68815  |1274   |31716 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68816  |1274   |31714 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68817  |1274   |31713 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68818  |1210   |31261 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68819  |1210   |31262 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68820  |1211   |31269 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68821  |1211   |31271 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68822  |1211   |33170 |0       |2        |F63100|0        |2       |0   |
+ROW   |68823  |1212   |31233 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68824  |1212   |31234 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68825  |1213   |31216 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68826  |1213   |31237 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68827  |1213   |31214 |0       |2        |F63100|0        |2       |0   |
+ROW   |68828  |1214   |31191 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68829  |1214   |31221 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68830  |1215   |31206 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68831  |1215   |31220 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68832  |1216   |31192 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68833  |1216   |31193 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68834  |1217   |31200 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68835  |1217   |31197 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68836  |1217   |31201 |0       |2        |F63100|0        |2       |0   |
+ROW   |68837  |1217   |31198 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68838  |1217   |31202 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68839  |1218   |31207 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68840  |1218   |31208 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68841  |1218   |31210 |0       |2        |F63100|0        |2       |0   |
+ROW   |68842  |1218   |31209 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68843  |1218   |31219 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68844  |1218   |31205 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68845  |1380   |32423 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68846  |1380   |32421 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68847  |1381   |32405 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68848  |1382   |32426 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68849  |1382   |32408 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68850  |1382   |32422 |0       |2        |F63100|0        |2       |0   |
+ROW   |68851  |1382   |32425 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68852  |1383   |32409 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68853  |1384   |32419 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |68854  |1384   |32416 |0       |1        |2774A4|1        |2       |0   |
+ROW   |68855  |1384   |32413 |0       |2        |F63100|1        |2       |0   |
+ROW   |68856  |1384   |32418 |5       |3        |A54F10|0        |2       |0   |
+ROW   |68857  |1384   |32415 |5       |4        |FC6EA3|0        |2       |0   |
+ROW   |68858  |1384   |32412 |5       |5        |6C59DC|0        |2       |0   |
+ROW   |68859  |1385   |32420 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68860  |1385   |32417 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68861  |1385   |32414 |0       |2        |F63100|0        |2       |0   |
+ROW   |68862  |1386   |32433 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68863  |1386   |32432 |0       |1        |2774A4|1        |2       |0   |
+ROW   |68864  |1387   |32431 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68865  |1387   |32430 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68866  |1387   |32429 |0       |2        |F63100|0        |2       |0   |
+ROW   |68867  |1387   |32428 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68868  |1387   |32427 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68869  |1388   |32386 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |68870  |1388   |32391 |0       |1        |2774A4|1        |2       |0   |
+ROW   |68871  |1388   |32387 |0       |2        |F63100|1        |2       |0   |
+ROW   |68872  |1388   |32390 |0       |3        |A54F10|1        |2       |0   |
+ROW   |68873  |1388   |32395 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68874  |1388   |32389 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68875  |1389   |32393 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68876  |1389   |32392 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68877  |1389   |32394 |0       |2        |F63100|1        |2       |0   |
+ROW   |68878  |1389   |32388 |0       |3        |A54F10|1        |2       |0   |
+ROW   |68879  |1390   |32401 |5       |0        |1A7C11|1        |2       |0   |
+ROW   |68880  |1390   |32402 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68881  |1390   |32397 |0       |2        |F63100|1        |2       |0   |
+ROW   |68882  |1390   |32398 |0       |3        |A54F10|1        |2       |0   |
+ROW   |68883  |1390   |32399 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |68884  |1390   |32400 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |68885  |1390   |32396 |0       |6        |AC8C14|1        |2       |0   |
+ROW   |68886  |1391   |32367 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68887  |1391   |32366 |0       |1        |2774A4|1        |2       |0   |
+ROW   |68888  |1392   |32370 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68889  |1393   |32382 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |68890  |1393   |32381 |0       |1        |2774A4|1        |2       |0   |
+ROW   |68891  |1393   |32383 |0       |2        |F63100|1        |2       |0   |
+ROW   |68892  |1393   |32384 |0       |3        |A54F10|1        |2       |0   |
+ROW   |68893  |1394   |32377 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68894  |1394   |32374 |0       |1        |2774A4|1        |2       |0   |
+ROW   |68895  |1395   |32403 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68896  |1395   |32385 |0       |1        |2774A4|1        |2       |0   |
+ROW   |68897  |1219   |31363 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68898  |1219   |31346 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68899  |1219   |31345 |0       |2        |F63100|0        |2       |0   |
+ROW   |68900  |1219   |31344 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68901  |1219   |31343 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68902  |1219   |31342 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68903  |1219   |31340 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |68904  |1219   |31339 |0       |7        |611F27|0        |2       |0   |
+ROW   |68905  |1219   |31341 |0       |8        |F230E0|0        |2       |0   |
+ROW   |68906  |1219   |31341 |0       |9        |FFAD40|0        |2       |0   |
+ROW   |68907  |1220   |31337 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68908  |1221   |31360 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68909  |1221   |31359 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68910  |1221   |31357 |0       |2        |F63100|0        |2       |0   |
+ROW   |68911  |1221   |31356 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68912  |1221   |31354 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |68913  |1221   |31353 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |68914  |1221   |31352 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |68915  |1221   |31350 |0       |7        |611F27|0        |2       |0   |
+ROW   |68916  |1221   |31351 |0       |8        |F230E0|0        |2       |0   |
+ROW   |68917  |1221   |31338 |0       |9        |FFAD40|0        |2       |0   |
+ROW   |68918  |1221   |31349 |0       |10       |40CDFF|0        |2       |0   |
+ROW   |68919  |1221   |31348 |0       |11       |40FFA0|0        |2       |0   |
+ROW   |68920  |1221   |31347 |0       |12       |AE4500|0        |2       |0   |
+ROW   |68921  |1222   |31336 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68922  |1456   |33178 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68923  |1456   |33179 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68924  |1456   |33180 |0       |2        |F63100|0        |2       |0   |
+ROW   |68925  |1087   |30346 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68926  |1087   |30345 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68927  |1088   |30350 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68928  |1088   |30349 |5       |1        |2774A4|0        |2       |0   |
+ROW   |68929  |1089   |30396 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68930  |1090   |30398 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68931  |1091   |30322 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68932  |1091   |30277 |5       |1        |2774A4|0        |2       |0   |
+ROW   |68933  |1092   |30284 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68934  |1093   |30313 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68935  |1093   |30314 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68936  |1093   |30315 |5       |2        |F63100|0        |2       |0   |
+ROW   |68937  |1093   |30316 |0       |3        |A54F10|0        |2       |0   |
+ROW   |68938  |1094   |30279 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68939  |1094   |30280 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68940  |1095   |30290 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68941  |1095   |30293 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68942  |1096   |30318 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68943  |1096   |30308 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68944  |1096   |30320 |2       |2        |F63100|0        |2       |0   |
+ROW   |68945  |1097   |30317 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68946  |1098   |30289 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68947  |1098   |30291 |5       |1        |2774A4|0        |2       |0   |
+ROW   |68948  |1099   |30334 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68949  |1099   |30325 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68950  |1100   |30306 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68951  |1101   |30274 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68952  |1102   |30281 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68953  |1577   |34351 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68954  |1577   |34350 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68955  |1578   |34387 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68956  |1578   |34388 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68957  |1579   |34393 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68958  |1579   |34386 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68959  |1580   |34370 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68960  |1580   |34384 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68961  |1580   |34383 |0       |2        |F63100|0        |2       |0   |
+ROW   |68962  |1581   |34438 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68963  |1581   |34413 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68964  |1581   |34427 |0       |2        |F63100|0        |2       |0   |
+ROW   |68965  |1582   |34420 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68966  |1582   |34419 |0       |1        |2774A4|0        |2       |0   |
+ROW   |68967  |1582   |34418 |0       |2        |F63100|0        |2       |0   |
+ROW   |68968  |1060   |30159 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68969  |1065   |30161 |0       |0        |969696|0        |9       |2   |
+ROW   |68970  |1065   |30162 |0       |1        |C80000|0        |9       |0   |
+ROW   |68971  |1070   |30142 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68972  |741    |27084 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68973  |741    |27085 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68974  |741    |27083 |0       |2        |F63100|1        |2       |0   |
+ROW   |68975  |741    |27086 |0       |3        |A54F10|1        |2       |0   |
+ROW   |68976  |741    |27082 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |68977  |741    |27079 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |68978  |745    |27104 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68979  |745    |27105 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68980  |745    |27103 |0       |2        |F63100|1        |2       |0   |
+ROW   |68981  |745    |27106 |0       |3        |A54F10|1        |2       |0   |
+ROW   |68982  |745    |27102 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |68983  |745    |27099 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |68984  |766    |27124 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68985  |766    |27125 |2       |1        |2774A4|0        |2       |0   |
+ROW   |68986  |766    |27123 |0       |2        |F63100|1        |2       |0   |
+ROW   |68987  |766    |27126 |0       |3        |A54F10|1        |2       |0   |
+ROW   |68988  |766    |27122 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |68989  |766    |27119 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |68990  |668    |27208 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68991  |1032   |30088 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |68992  |1032   |30087 |5       |1        |2774A4|0        |2       |0   |
+ROW   |68993  |1033   |30089 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68994  |671    |27240 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68995  |1034   |30093 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68996  |675    |27294 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68997  |1035   |30094 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |68998  |1676   |35369 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |68999  |1677   |35372 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69000  |1678   |35379 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69001  |1678   |35386 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69002  |1678   |35377 |0       |2        |F63100|0        |2       |0   |
+ROW   |69003  |1678   |35384 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69004  |1678   |35376 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69005  |1678   |35383 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69006  |1679   |35387 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69007  |1679   |35380 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69008  |1680   |35378 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69009  |1680   |35385 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69010  |1681   |35403 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69011  |1681   |35404 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69012  |1549   |33966 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69013  |1550   |33971 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69014  |1551   |33974 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69015  |1551   |33977 |2       |1        |2774A4|0        |2       |0   |
+ROW   |69016  |1551   |33976 |0       |2        |F63100|1        |2       |0   |
+ROW   |69017  |1551   |33973 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69018  |1551   |33975 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |69019  |1551   |33972 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |69020  |1552   |34007 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69021  |1553   |34012 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69022  |1554   |34015 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69023  |1554   |34018 |2       |1        |2774A4|0        |2       |0   |
+ROW   |69024  |1554   |34017 |0       |2        |F63100|1        |2       |0   |
+ROW   |69025  |1554   |34014 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69026  |1554   |34016 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |69027  |1554   |34013 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |69028  |1555   |34048 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69029  |1556   |34053 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69030  |1557   |34056 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69031  |1557   |34059 |2       |1        |2774A4|0        |2       |0   |
+ROW   |69032  |1557   |34058 |0       |2        |F63100|1        |2       |0   |
+ROW   |69033  |1557   |34055 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69034  |1557   |34057 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |69035  |1557   |34054 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |69036  |1558   |34089 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69037  |1559   |34094 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69038  |1560   |34097 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69039  |1560   |34100 |2       |1        |2774A4|0        |2       |0   |
+ROW   |69040  |1560   |34099 |0       |2        |F63100|1        |2       |0   |
+ROW   |69041  |1560   |34096 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69042  |1560   |34098 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |69043  |1560   |34095 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |69044  |1561   |34130 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69045  |1562   |34135 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69046  |1563   |34138 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69047  |1563   |34141 |2       |1        |2774A4|0        |2       |0   |
+ROW   |69048  |1563   |34140 |0       |2        |F63100|1        |2       |0   |
+ROW   |69049  |1563   |34137 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69050  |1563   |34139 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |69051  |1563   |34136 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |69052  |1038   |30101 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69053  |786    |28246 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69054  |687    |27417 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69055  |691    |27376 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69056  |694    |27478 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69057  |1042   |30105 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69058  |1043   |30107 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69059  |698    |27511 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69060  |1044   |30108 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69061  |701    |27547 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69062  |1045   |27591 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |69063  |1045   |30110 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69064  |1046   |30111 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69065  |704    |27586 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69066  |1682   |35439 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69067  |1683   |35441 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69068  |1684   |35443 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69069  |1685   |35446 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69070  |1686   |35450 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69071  |1686   |35465 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69072  |1686   |35456 |0       |2        |F63100|0        |2       |0   |
+ROW   |69073  |1686   |35447 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69074  |1686   |35468 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69075  |1686   |35471 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69076  |1686   |35459 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |69077  |1687   |35449 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69078  |1687   |35464 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69079  |1687   |35455 |0       |2        |F63100|0        |2       |0   |
+ROW   |69080  |1687   |35461 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69081  |1687   |35467 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69082  |1687   |35470 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69083  |1687   |35457 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |69084  |1688   |35473 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69085  |1688   |35463 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69086  |1688   |35454 |0       |2        |F63100|0        |2       |0   |
+ROW   |69087  |1688   |35472 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69088  |1688   |35466 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69089  |1688   |35469 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69090  |1688   |35458 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |69091  |1689   |35474 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69092  |1690   |35476 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69093  |1691   |35478 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69094  |1691   |35480 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69095  |1692   |35487 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69096  |1692   |35484 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69097  |1693   |35486 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69098  |1693   |35483 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69099  |1694   |35490 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69100  |1694   |35488 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69101  |1694   |35489 |0       |2        |F63100|0        |2       |0   |
+ROW   |69102  |1695   |35497 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69103  |1695   |35493 |0       |1        |2774A4|1        |2       |0   |
+ROW   |69104  |1695   |35503 |0       |2        |F63100|0        |2       |0   |
+ROW   |69105  |1695   |35499 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69106  |1695   |35496 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69107  |1695   |35502 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69108  |1696   |35508 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69109  |1696   |35507 |0       |1        |2774A4|1        |2       |0   |
+ROW   |69110  |1696   |35510 |0       |2        |F63100|0        |2       |0   |
+ROW   |69111  |1696   |35509 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69112  |1697   |35516 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69113  |1697   |35515 |0       |1        |2774A4|1        |2       |0   |
+ROW   |69114  |1697   |35518 |0       |2        |F63100|0        |2       |0   |
+ROW   |69115  |1697   |35517 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69116  |1698   |35524 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69117  |1698   |35523 |0       |1        |2774A4|1        |2       |0   |
+ROW   |69118  |1698   |35526 |0       |2        |F63100|0        |2       |0   |
+ROW   |69119  |1698   |35525 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69120  |1699   |35531 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69121  |1699   |35529 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69122  |1699   |35530 |0       |2        |F63100|0        |2       |0   |
+ROW   |69123  |1700   |35411 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69124  |1700   |35409 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69125  |1700   |35407 |0       |2        |F63100|0        |2       |0   |
+ROW   |69126  |1700   |35413 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69127  |1700   |35412 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69128  |1700   |35410 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69129  |708    |27671 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69130  |1047   |30112 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69131  |1048   |30114 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |69132  |1048   |30113 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69133  |1049   |30115 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69134  |775    |28143 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69135  |714    |27753 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69136  |1050   |30116 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69137  |856    |28894 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69138  |1051   |30118 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69139  |1564   |34166 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69140  |1564   |34169 |2       |1        |2774A4|0        |2       |0   |
+ROW   |69141  |1564   |34168 |0       |2        |F63100|1        |2       |0   |
+ROW   |69142  |1564   |34165 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69143  |1564   |34167 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |69144  |1564   |34164 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |69145  |1565   |34174 |0       |0        |969696|0        |9       |2   |
+ROW   |69146  |1565   |34175 |0       |1        |C80000|0        |9       |0   |
+ROW   |69147  |1566   |34178 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69148  |1567   |34154 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69149  |724    |27904 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69150  |1396   |32439 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69151  |1396   |32437 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69152  |1396   |32436 |0       |2        |F63100|0        |2       |0   |
+ROW   |69153  |1396   |32438 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69154  |1052   |27907 |0       |0        |969696|0        |9       |2   |
+ROW   |69155  |1052   |27908 |0       |1        |C80000|0        |9       |0   |
+ROW   |69156  |1053   |30120 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69157  |1457   |33206 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69158  |1457   |33193 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69159  |1458   |33195 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69160  |1458   |33203 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69161  |1458   |33202 |5       |2        |F63100|0        |2       |0   |
+ROW   |69162  |1459   |33200 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69163  |1459   |33194 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69164  |1460   |33187 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69165  |1460   |33186 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69166  |1460   |33204 |5       |2        |F63100|0        |2       |0   |
+ROW   |69167  |1461   |33226 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69168  |1461   |33215 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69169  |1462   |33207 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69170  |1463   |33223 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69171  |1463   |33218 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69172  |1464   |33210 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69173  |1464   |33209 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69174  |1464   |33224 |5       |2        |F63100|0        |2       |0   |
+ROW   |69175  |1465   |33249 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69176  |1465   |33236 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69177  |1466   |33238 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69178  |1466   |33246 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69179  |1466   |33245 |5       |2        |F63100|0        |2       |0   |
+ROW   |69180  |1467   |33243 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69181  |1467   |33237 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69182  |1468   |33230 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69183  |1468   |33229 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69184  |1468   |33247 |5       |2        |F63100|0        |2       |0   |
+ROW   |69185  |1469   |33258 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69186  |1470   |33251 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69187  |1471   |33256 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69188  |1472   |33277 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69189  |1473   |33274 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69190  |1473   |33273 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69191  |1473   |33272 |5       |2        |F63100|0        |2       |0   |
+ROW   |69192  |1474   |33270 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69193  |1475   |33269 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69194  |1476   |33261 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69195  |1476   |33275 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69196  |1477   |33296 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69197  |1478   |33293 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69198  |1478   |33292 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69199  |1478   |33291 |5       |2        |F63100|0        |2       |0   |
+ROW   |69200  |1479   |33289 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69201  |1480   |33288 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69202  |1481   |33280 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69203  |1481   |33294 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69204  |1482   |33312 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69205  |1483   |33313 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69206  |1484   |33314 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69207  |1485   |33319 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69208  |1486   |33320 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69209  |1487   |33304 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69210  |1487   |33305 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69211  |727    |27936 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69212  |1054   |27935 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |69213  |1054   |30122 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69214  |1055   |30123 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69215  |730    |27975 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69216  |1056   |30126 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69217  |733    |28003 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69218  |1057   |30131 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69219  |736    |28031 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69220  |1058   |30136 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69221  |1701   |35553 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69222  |1701   |35556 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69223  |1702   |35558 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69224  |1702   |35561 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69225  |1703   |35562 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69226  |1704   |35563 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69227  |1705   |35592 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69228  |1705   |35584 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69229  |1705   |35594 |0       |2        |F63100|0        |2       |0   |
+ROW   |69230  |1705   |35586 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69231  |1705   |35595 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69232  |1705   |35587 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69233  |1706   |35593 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69234  |1706   |35585 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69235  |1707   |35583 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69236  |1707   |35591 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69237  |1708   |35598 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69238  |1709   |35606 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69239  |1710   |35607 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69240  |1711   |35566 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69241  |1712   |35622 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69242  |1713   |35634 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69243  |1713   |35626 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69244  |1713   |35636 |0       |2        |F63100|0        |2       |0   |
+ROW   |69245  |1713   |35628 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69246  |1713   |35637 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69247  |1713   |35629 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69248  |1714   |35635 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69249  |1714   |35627 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69250  |1715   |35625 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69251  |1715   |35633 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69252  |1716   |35640 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69253  |1717   |35641 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69254  |1718   |35610 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69255  |1719   |35658 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69256  |1720   |35659 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69257  |1721   |35660 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69258  |1722   |35661 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69259  |1723   |35669 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69260  |1723   |35679 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69261  |1723   |35670 |0       |2        |F63100|0        |2       |0   |
+ROW   |69262  |1723   |35665 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69263  |1723   |35672 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69264  |1723   |35666 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69265  |1724   |35663 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69266  |1724   |35664 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69267  |1725   |35686 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69268  |1725   |35693 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69269  |1725   |35684 |0       |2        |F63100|0        |2       |0   |
+ROW   |69270  |1725   |35691 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69271  |1725   |35683 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69272  |1725   |35690 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69273  |1726   |35685 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69274  |1726   |35692 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69275  |1727   |35694 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69276  |1727   |35687 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69277  |1728   |35707 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69278  |1729   |35708 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69279  |1730   |35725 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69280  |1731   |35726 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69281  |1732   |35727 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69282  |1733   |35728 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69283  |1734   |35736 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69284  |1734   |35746 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69285  |1734   |35737 |0       |2        |F63100|0        |2       |0   |
+ROW   |69286  |1734   |35732 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69287  |1734   |35739 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69288  |1734   |35733 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69289  |1735   |35730 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69290  |1735   |35731 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69291  |1736   |35753 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69292  |1736   |35760 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69293  |1736   |35751 |0       |2        |F63100|0        |2       |0   |
+ROW   |69294  |1736   |35758 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69295  |1736   |35750 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69296  |1736   |35757 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69297  |1737   |35752 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69298  |1737   |35759 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69299  |1738   |35761 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69300  |1738   |35754 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69301  |1739   |35774 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69302  |1740   |35775 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69303  |1741   |35791 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69304  |1742   |35799 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69305  |1742   |35802 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69306  |1743   |35804 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69307  |1743   |35807 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69308  |1744   |35808 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69309  |1745   |35809 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69310  |1746   |35834 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69311  |1746   |35826 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69312  |1746   |35836 |0       |2        |F63100|0        |2       |0   |
+ROW   |69313  |1746   |35828 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69314  |1746   |35837 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69315  |1746   |35829 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69316  |1747   |35835 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69317  |1747   |35827 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69318  |1748   |35825 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69319  |1748   |35833 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69320  |1749   |35840 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69321  |1750   |35812 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69322  |1751   |35876 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69323  |1751   |35868 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69324  |1751   |35878 |0       |2        |F63100|0        |2       |0   |
+ROW   |69325  |1751   |35870 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69326  |1751   |35879 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69327  |1751   |35871 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69328  |1752   |35877 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69329  |1752   |35869 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69330  |1753   |35867 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69331  |1753   |35875 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69332  |1754   |35882 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69333  |1755   |35890 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69334  |1756   |35891 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69335  |1757   |35850 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69336  |1758   |35920 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69337  |1758   |35912 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69338  |1758   |35922 |0       |2        |F63100|0        |2       |0   |
+ROW   |69339  |1758   |35914 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69340  |1758   |35923 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69341  |1758   |35915 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69342  |1759   |35921 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69343  |1759   |35913 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69344  |1760   |35911 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69345  |1760   |35919 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69346  |1761   |35926 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69347  |1762   |35934 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69348  |1763   |35935 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69349  |1764   |35894 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69350  |1765   |35952 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69351  |1766   |35964 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69352  |1766   |35956 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69353  |1766   |35966 |0       |2        |F63100|0        |2       |0   |
+ROW   |69354  |1766   |35958 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69355  |1766   |35967 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69356  |1766   |35959 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69357  |1767   |35965 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69358  |1767   |35957 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69359  |1768   |35955 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69360  |1768   |35963 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69361  |1769   |35970 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69362  |1770   |35978 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69363  |1771   |35979 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69364  |1772   |35938 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69365  |1773   |35996 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69366  |1774   |36008 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69367  |1774   |36000 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69368  |1774   |36010 |0       |2        |F63100|0        |2       |0   |
+ROW   |69369  |1774   |36002 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69370  |1774   |36011 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69371  |1774   |36003 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69372  |1775   |36009 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69373  |1775   |36001 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69374  |1776   |35999 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69375  |1776   |36007 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69376  |1777   |36014 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69377  |1778   |36022 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69378  |1779   |36023 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69379  |1780   |35982 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69380  |1781   |36041 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69381  |1782   |36053 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69382  |1782   |36045 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69383  |1782   |36055 |0       |2        |F63100|0        |2       |0   |
+ROW   |69384  |1782   |36047 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69385  |1782   |36056 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69386  |1782   |36048 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69387  |1783   |36054 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69388  |1783   |36046 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69389  |1784   |36044 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69390  |1784   |36052 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69391  |1785   |36059 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69392  |1786   |36067 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69393  |1787   |36068 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69394  |1788   |36026 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69395  |1789   |36086 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69396  |1790   |36098 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69397  |1790   |36090 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69398  |1790   |36100 |0       |2        |F63100|0        |2       |0   |
+ROW   |69399  |1790   |36092 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69400  |1790   |36101 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69401  |1790   |36093 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69402  |1791   |36099 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69403  |1791   |36091 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69404  |1792   |36089 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69405  |1792   |36097 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69406  |1793   |36104 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69407  |1794   |36112 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69408  |1795   |36113 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69409  |1796   |36071 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69410  |1797   |36131 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69411  |1798   |36144 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69412  |1798   |36136 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69413  |1798   |36146 |0       |2        |F63100|0        |2       |0   |
+ROW   |69414  |1798   |36138 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69415  |1798   |36147 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69416  |1798   |36139 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69417  |1799   |36145 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69418  |1799   |36137 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69419  |1800   |36135 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69420  |1800   |36143 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69421  |1801   |36150 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69422  |1802   |36158 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69423  |1803   |36159 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69424  |1804   |36116 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69425  |1223   |31370 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69426  |1223   |31371 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69427  |1226   |31380 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69428  |1226   |31383 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69429  |1229   |31379 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |69430  |1229   |31382 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69431  |887    |29211 |0       |0        |969696|0        |9       |2   |
+ROW   |69432  |887    |29210 |0       |1        |C80000|0        |9       |0   |
+ROW   |69433  |899    |29216 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69434  |899    |29217 |2       |1        |2774A4|0        |2       |0   |
+ROW   |69435  |899    |29218 |0       |2        |F63100|1        |2       |0   |
+ROW   |69436  |899    |29219 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69437  |899    |29220 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |69438  |899    |29221 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |69439  |911    |29089 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69440  |911    |29102 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69441  |908    |29098 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69442  |908    |29097 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69443  |908    |29095 |0       |2        |F63100|0        |2       |0   |
+ROW   |69444  |908    |29088 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69445  |908    |29094 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69446  |908    |29093 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69447  |908    |29092 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |69448  |908    |29091 |0       |7        |611F27|0        |2       |0   |
+ROW   |69449  |908    |29090 |0       |8        |F230E0|0        |2       |0   |
+ROW   |69450  |905    |29198 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69451  |917    |29104 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |69452  |917    |29105 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69453  |914    |31364 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69454  |923    |29118 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69455  |923    |29119 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69456  |923    |29117 |0       |2        |F63100|0        |2       |0   |
+ROW   |69457  |920    |29107 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69458  |920    |29106 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69459  |902    |29096 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69460  |902    |29101 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69461  |902    |29100 |0       |2        |F63100|0        |2       |0   |
+ROW   |69462  |902    |29087 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69463  |1279   |31902 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69464  |1279   |31903 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69465  |1281   |31933 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69466  |1281   |31936 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69467  |1283   |31932 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |69468  |1283   |31935 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69469  |1285   |31907 |0       |0        |969696|0        |9       |2   |
+ROW   |69470  |1285   |31908 |0       |1        |C80000|0        |9       |0   |
+ROW   |69471  |1287   |31911 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69472  |1287   |31914 |2       |1        |2774A4|0        |2       |0   |
+ROW   |69473  |1287   |31913 |0       |2        |F63100|1        |2       |0   |
+ROW   |69474  |1287   |31910 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69475  |1287   |31912 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |69476  |1287   |31909 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |69477  |1289   |31831 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69478  |1289   |31820 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69479  |1291   |31822 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69480  |1291   |31835 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69481  |1291   |31825 |0       |2        |F63100|0        |2       |0   |
+ROW   |69482  |1291   |31826 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69483  |1291   |31823 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69484  |1291   |31827 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69485  |1291   |31824 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |69486  |1291   |31828 |0       |7        |611F27|0        |2       |0   |
+ROW   |69487  |1291   |31830 |0       |8        |F230E0|0        |2       |0   |
+ROW   |69488  |1293   |31892 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69489  |1295   |31855 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |69490  |1295   |31853 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69491  |1297   |31893 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69492  |1299   |31838 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69493  |1299   |31839 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69494  |1299   |31837 |0       |2        |F63100|0        |2       |0   |
+ROW   |69495  |1301   |31850 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69496  |1301   |31852 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69497  |1303   |31829 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69498  |1303   |31833 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69499  |1303   |31834 |0       |2        |F63100|0        |2       |0   |
+ROW   |69500  |1303   |31832 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69501  |952    |29436 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69502  |952    |29437 |2       |1        |2774A4|0        |2       |0   |
+ROW   |69503  |952    |29438 |0       |2        |F63100|1        |2       |0   |
+ROW   |69504  |952    |29439 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69505  |952    |29441 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |69506  |952    |29440 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |69507  |955    |29434 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69508  |955    |29435 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69509  |954    |29448 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69510  |954    |29449 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69511  |956    |29452 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |69512  |956    |29453 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69513  |953    |29446 |0       |0        |969696|0        |9       |2   |
+ROW   |69514  |953    |29432 |0       |1        |C80000|0        |9       |0   |
+ROW   |69515  |960    |29405 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69516  |960    |29406 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69517  |959    |29426 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69518  |959    |29413 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69519  |959    |29411 |0       |2        |F63100|0        |2       |0   |
+ROW   |69520  |959    |29410 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69521  |959    |29399 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69522  |959    |29409 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69523  |959    |29412 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |69524  |959    |29408 |0       |7        |611F27|0        |2       |0   |
+ROW   |69525  |959    |29407 |0       |8        |F230E0|0        |2       |0   |
+ROW   |69526  |958    |29427 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69527  |962    |29403 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |69528  |962    |29402 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69529  |961    |29396 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69530  |963    |29400 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69531  |963    |29401 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69532  |957    |29420 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69533  |957    |29419 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69534  |957    |29418 |0       |2        |F63100|0        |2       |0   |
+ROW   |69535  |957    |29417 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69536  |866    |29014 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69537  |866    |29015 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69538  |868    |29018 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69539  |868    |29019 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69540  |868    |29022 |0       |2        |F63100|0        |2       |0   |
+ROW   |69541  |868    |29023 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69542  |868    |29020 |0       |4        |FC6EA3|0        |2       |0   |
+ROW   |69543  |868    |29024 |0       |5        |6C59DC|0        |2       |0   |
+ROW   |69544  |868    |29021 |0       |6        |AC8C14|0        |2       |0   |
+ROW   |69545  |868    |29025 |0       |7        |611F27|0        |2       |0   |
+ROW   |69546  |868    |29026 |0       |8        |F230E0|0        |2       |0   |
+ROW   |69547  |870    |29048 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69548  |872    |29028 |0       |0        |969696|0        |9       |2   |
+ROW   |69549  |872    |29027 |0       |1        |C80000|0        |9       |0   |
+ROW   |69550  |882    |28992 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69551  |882    |28991 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69552  |876    |28982 |2       |0        |1A7C11|0        |2       |0   |
+ROW   |69553  |876    |28983 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69554  |874    |28978 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69555  |878    |28985 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69556  |878    |28984 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69557  |880    |28987 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69558  |880    |28988 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69559  |880    |28989 |0       |2        |F63100|0        |2       |0   |
+ROW   |69560  |880    |28990 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69561  |964    |29513 |0       |0        |969696|0        |9       |2   |
+ROW   |69562  |964    |29512 |0       |1        |C80000|0        |9       |0   |
+ROW   |69563  |1238   |31435 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69564  |1238   |31438 |2       |1        |2774A4|0        |2       |0   |
+ROW   |69565  |1238   |31437 |0       |2        |F63100|1        |2       |0   |
+ROW   |69566  |1238   |31434 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69567  |1238   |31436 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |69568  |1238   |31433 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |69569  |1488   |33321 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69570  |1488   |33324 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69571  |1490   |33322 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69572  |1490   |33323 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69573  |1240   |31441 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69574  |1240   |31442 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69575  |1242   |31440 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |69576  |1242   |31439 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69577  |974    |29456 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69578  |974    |29455 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69579  |976    |29458 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69580  |976    |29457 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69581  |972    |29454 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69582  |978    |29462 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69583  |980    |31421 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69584  |980    |29466 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69585  |1305   |32013 |0       |0        |969696|0        |9       |2   |
+ROW   |69586  |1305   |32014 |0       |1        |C80000|0        |9       |0   |
+ROW   |69587  |1307   |32017 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69588  |1307   |32020 |2       |1        |2774A4|0        |2       |0   |
+ROW   |69589  |1307   |32019 |0       |2        |F63100|1        |2       |0   |
+ROW   |69590  |1307   |32016 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69591  |1307   |32018 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |69592  |1307   |32015 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |69593  |1492   |33329 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69594  |1492   |33332 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69595  |1494   |33330 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69596  |1494   |33331 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69597  |1309   |32023 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69598  |1309   |32024 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69599  |1311   |32022 |0       |0        |1A7C11|1        |2       |0   |
+ROW   |69600  |1311   |32021 |5       |1        |2774A4|0        |2       |0   |
+ROW   |69601  |1313   |31952 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69602  |1313   |31949 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69603  |1315   |31951 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69604  |1315   |31950 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69605  |1317   |31954 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69606  |1319   |31973 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69607  |1321   |31969 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69608  |1321   |31970 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69609  |1583   |34451 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69610  |1584   |34465 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69611  |1584   |34463 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69612  |1585   |34466 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69613  |1585   |34462 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69614  |1586   |34499 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69615  |1587   |34513 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69616  |1587   |34511 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69617  |1588   |34514 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69618  |1588   |34510 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69619  |1589   |34547 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69620  |1590   |34561 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69621  |1590   |34559 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69622  |1591   |34562 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69623  |1591   |34558 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69624  |1592   |34595 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69625  |1593   |34609 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69626  |1593   |34607 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69627  |1594   |34610 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69628  |1594   |34606 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69629  |1595   |34643 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69630  |1596   |34657 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69631  |1596   |34655 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69632  |1597   |34658 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69633  |1597   |34654 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69634  |1619   |35016 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69635  |1620   |35030 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69636  |1620   |35028 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69637  |1621   |35031 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69638  |1621   |35027 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69639  |1601   |34739 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69640  |1602   |34753 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69641  |1602   |34751 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69642  |1603   |34754 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69643  |1603   |34750 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69644  |1604   |34787 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69645  |1569   |34192 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69646  |1569   |34180 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69647  |1570   |34194 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69648  |1570   |34190 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69649  |1605   |34793 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69650  |1606   |34807 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69651  |1606   |34805 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69652  |1607   |34808 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69653  |1607   |34804 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69654  |1608   |34841 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69655  |1609   |34855 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69656  |1609   |34853 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69657  |1610   |34856 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69658  |1610   |34852 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69659  |1611   |34889 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69660  |1612   |34903 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69661  |1612   |34901 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69662  |1613   |34904 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69663  |1613   |34900 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69664  |1518   |33705 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69665  |1519   |33724 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69666  |1519   |33722 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69667  |1519   |33726 |0       |2        |F63100|0        |2       |0   |
+ROW   |69668  |1520   |33719 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69669  |1520   |33720 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69670  |1520   |33721 |0       |2        |F63100|0        |2       |0   |
+ROW   |69671  |1521   |33725 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69672  |1521   |33723 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69673  |1521   |33727 |0       |2        |F63100|0        |2       |0   |
+ROW   |69674  |1522   |33730 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69675  |1523   |33734 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69676  |1523   |33732 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69677  |1523   |33736 |0       |2        |F63100|0        |2       |0   |
+ROW   |69678  |1524   |33735 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69679  |1524   |33733 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69680  |1524   |33737 |0       |2        |F63100|0        |2       |0   |
+ROW   |69681  |1525   |33743 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69682  |1525   |33742 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69683  |1525   |33738 |0       |2        |F63100|0        |2       |0   |
+ROW   |69684  |1526   |33692 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69685  |1526   |33693 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69686  |1571   |34269 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69687  |1571   |34270 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69688  |1571   |34271 |0       |2        |F63100|0        |2       |0   |
+ROW   |69689  |1571   |34272 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69690  |1572   |34311 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69691  |1572   |34301 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69692  |1573   |34243 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69693  |1573   |34244 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69694  |1573   |34246 |0       |2        |F63100|0        |2       |0   |
+ROW   |69695  |1573   |34245 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69696  |1574   |34239 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69697  |1574   |34227 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69698  |1574   |34236 |0       |2        |F63100|0        |2       |0   |
+ROW   |69699  |1574   |34237 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69700  |1575   |34253 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69701  |1575   |34252 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69702  |1575   |34249 |0       |2        |F63100|0        |2       |0   |
+ROW   |69703  |1575   |34251 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69704  |1496   |33368 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69705  |1497   |33371 |1       |0        |1A7C11|0        |2       |0   |
+ROW   |69706  |1497   |33371 |1       |1        |2774A4|0        |2       |0   |
+ROW   |69707  |1498   |33379 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69708  |1498   |33382 |2       |1        |2774A4|0        |2       |0   |
+ROW   |69709  |1498   |33381 |0       |2        |F63100|1        |2       |0   |
+ROW   |69710  |1498   |33378 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69711  |1498   |33380 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |69712  |1498   |33377 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |69713  |1142   |30689 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69714  |1805   |36187 |5       |0        |1A7C11|0        |2       |0   |
+ROW   |69715  |1805   |36192 |2       |1        |2774A4|0        |2       |0   |
+ROW   |69716  |1805   |36190 |0       |2        |F63100|1        |2       |0   |
+ROW   |69717  |1805   |36185 |0       |3        |A54F10|1        |2       |0   |
+ROW   |69718  |1805   |36189 |0       |4        |FC6EA3|1        |2       |0   |
+ROW   |69719  |1805   |36184 |0       |5        |6C59DC|1        |2       |0   |
+ROW   |69720  |1275   |31794 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69721  |1275   |31792 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69722  |1275   |31800 |0       |2        |F63100|1        |2       |0   |
+ROW   |69723  |1276   |36771 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69724  |1276   |33390 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69725  |1276   |31799 |0       |2        |F63100|0        |2       |0   |
+ROW   |69726  |1276   |31797 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69727  |1277   |36770 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69728  |1277   |33389 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69729  |1277   |31795 |0       |2        |F63100|0        |2       |0   |
+ROW   |69730  |1278   |36769 |0       |0        |1A7C11|0        |2       |0   |
+ROW   |69731  |1278   |31793 |0       |1        |2774A4|0        |2       |0   |
+ROW   |69732  |1278   |31802 |0       |2        |F63100|0        |2       |0   |
+ROW   |69733  |1278   |31790 |0       |3        |A54F10|0        |2       |0   |
+ROW   |69734  |1278   |31791 |0       |4        |FC6EA3|0        |2       |0   |
 
 TABLE |hostmacro
 FIELDS|hostmacroid|hostid|macro                                                          |value                                                                                                                                                                                                                                                                                  |description                                                                                                                                                                                                                                                   |type|
@@ -24662,6 +24714,12 @@ ROW   |2787       |10336 |{$AMI.TRUNK_ACTIVE_CHANNELS_TOTAL.MAX.WARN:"SIP"}
 ROW   |2788       |10447 |{$TRAVIS.API.TOKEN}                                            |                                                                                                                                                                                                                                                                                       |Travis API Token                                                                                                                                                                                                                                              |0   |
 ROW   |2789       |10447 |{$TRAVIS.API.URL}                                              |api.travis-ci.com                                                                                                                                                                                                                                                                      |Travis API URL                                                                                                                                                                                                                                                |0   |
 ROW   |2790       |10447 |{$TRAVIS.BUILDS.SUCCESS.PERCENT}                               |80                                                                                                                                                                                                                                                                                     |Percent of successful builds in the repo (for trigger expression)                                                                                                                                                                                             |0   |
+ROW   |2791       |10448 |{$INFLUXDB.API.TOKEN}                                          |                                                                                                                                                                                                                                                                                       |InfluxDB API Authorization Token                                                                                                                                                                                                                              |0   |
+ROW   |2792       |10448 |{$INFLUXDB.ORG_NAME.MATCHES}                                   |.*                                                                                                                                                                                                                                                                                     |Filter of discoverable organizations                                                                                                                                                                                                                          |0   |
+ROW   |2793       |10448 |{$INFLUXDB.ORG_NAME.NOT_MATCHES}                               |CHANGE_IF_NEEDED                                                                                                                                                                                                                                                                       |Filter to exclude discovered organizations                                                                                                                                                                                                                    |0   |
+ROW   |2794       |10448 |{$INFLUXDB.REQ.FAIL.MAX.WARN}                                  |2                                                                                                                                                                                                                                                                                      |Maximum number of query requests failures for trigger expression.                                                                                                                                                                                             |0   |
+ROW   |2795       |10448 |{$INFLUXDB.TASK.RUN.FAIL.MAX.WARN}                             |2                                                                                                                                                                                                                                                                                      |Maximum number of tasks runs failures for trigger expression.                                                                                                                                                                                                 |0   |
+ROW   |2796       |10448 |{$INFLUXDB.URL}                                                |http://localhost:8086                                                                                                                                                                                                                                                                  |InfluxDB instance URL                                                                                                                                                                                                                                         |0   |
 
 TABLE |hosts_groups
 FIELDS|hostgroupid|hostid|groupid|
@@ -24898,6 +24956,7 @@ ROW   |467        |10444 |11     |
 ROW   |468        |10445 |11     |
 ROW   |469        |10446 |11     |
 ROW   |470        |10447 |12     |
+ROW   |471        |10448 |12     |
 
 TABLE |hosts_templates
 FIELDS|hosttemplateid|hostid|templateid|
@@ -31828,6 +31887,8 @@ ROW   |6780              |554       |4    |failed
 ROW   |6781              |555       |0    |not available                                                   |0   |0        |
 ROW   |6782              |555       |1    |available                                                       |0   |1        |
 ROW   |6783              |555       |2    |unknown                                                         |0   |2        |
+ROW   |6784              |556       |0    |Failed                                                          |0   |0        |
+ROW   |6785              |556       |1    |Ok                                                              |0   |1        |
 
 TABLE |sysmaps
 FIELDS|sysmapid|name         |width|height|backgroundid|label_type|label_location|highlight|expandproblem|markelements|show_unack|grid_size|grid_show|grid_align|label_format|label_type_host|label_type_hostgroup|label_type_trigger|label_type_map|label_type_image|label_string_host|label_string_hostgroup|label_string_trigger|label_string_map|label_string_image|iconmapid|expand_macros|severity_min|userid|private|show_suppressed|
@@ -35277,6 +35338,14 @@ ROW   |4838           |36791 |36781        |
 ROW   |4839           |36792 |36781        |
 ROW   |4840           |36793 |36781        |
 ROW   |4841           |36794 |36781        |
+ROW   |4842           |36814 |36813        |
+ROW   |4843           |36815 |36813        |
+ROW   |4844           |36816 |36813        |
+ROW   |4845           |36817 |36813        |
+ROW   |4846           |36818 |36813        |
+ROW   |4847           |36819 |36813        |
+ROW   |4848           |36820 |33657        |
+ROW   |4849           |36821 |33669        |
 
 TABLE |host_discovery
 FIELDS|hostid|parent_hostid|parent_itemid|
@@ -36490,6 +36559,8 @@ ROW   |1680            |36733 |8       |{#SENSOR_LOCALE}           |5
 ROW   |1681            |36734 |8       |{#SENSOR_LOCALE}           |7                                                       |
 ROW   |1682            |36735 |8       |{#SENSOR_LOCALE}           |10                                                      |
 ROW   |1683            |36736 |8       |{#SENSOR_LOCALE}           |3                                                       |
+ROW   |1684            |36813 |9       |{#ORG_NAME}                |{$INFLUXDB.ORG_NAME.NOT_MATCHES}                        |
+ROW   |1685            |36813 |8       |{#ORG_NAME}                |{$INFLUXDB.ORG_NAME.MATCHES}                            |
 
 TABLE |item_rtdata
 FIELDS|itemid|
@@ -44768,6 +44839,60 @@ ROW   |85917         |36793 |1   |12  |$.builds[0].number
 ROW   |85918         |36793 |2   |20  |1h                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |0            |                                              |
 ROW   |85919         |36794 |1   |12  |$.builds[0].state                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |0            |                                              |
 ROW   |85920         |36794 |2   |20  |1h                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |0            |                                              |
+ROW   |85921         |36795 |0   |26  |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |1            |                                              |
+ROW   |85922         |36795 |1   |23  |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0            |                                              |
+ROW   |85923         |36796 |0   |26  |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |2            |{"status":"fail"}]}                           |
+ROW   |85924         |36796 |1   |21  |return JSON.parse(value).status == 'pass' ? 1: 0                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0            |                                              |
+ROW   |85925         |36796 |2   |20  |30m                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |0            |                                              |
+ROW   |85926         |36797 |1   |12  |$[?(@.name=="influxdb_users_total")].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |1            |                                              |
+ROW   |85927         |36797 |2   |20  |30m                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |0            |                                              |
+ROW   |85928         |36798 |1   |12  |$[?(@.name=="influxdb_uptime_seconds")].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |0            |                                              |
+ROW   |85929         |36799 |1   |12  |$[?(@.name=="influxdb_tokens_total")].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |1            |                                              |
+ROW   |85930         |36799 |2   |20  |30m                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |0            |                                              |
+ROW   |85931         |36800 |1   |12  |$[?(@.name=="influxdb_telegraf_plugins_count")].value.sum()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |1            |                                              |
+ROW   |85932         |36800 |2   |20  |30m                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |0            |                                              |
+ROW   |85933         |36801 |1   |12  |$[?(@.name=="influxdb_telegrafs_total")].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |1            |                                              |
+ROW   |85934         |36801 |2   |20  |30m                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |0            |                                              |
+ROW   |85935         |36802 |1   |12  |$[?(@.name=="task_executor_workers_busy")].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |1            |                                              |
+ROW   |85936         |36803 |1   |12  |$[?(@.name=="task_executor_total_runs_active")].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |1            |                                              |
+ROW   |85937         |36804 |1   |12  |$[?(@.name=="task_executor_total_runs_complete" && @.labels.status == "success")].value.sum()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |1            |                                              |
+ROW   |85938         |36804 |2   |10  |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0            |                                              |
+ROW   |85939         |36805 |1   |12  |$[?(@.name=="task_executor_total_runs_complete" && @.labels.status == "failed")].value.sum()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |1            |                                              |
+ROW   |85940         |36805 |2   |10  |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0            |                                              |
+ROW   |85941         |36806 |1   |12  |$[?(@.name=="influxdb_scrapers_total")].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |1            |                                              |
+ROW   |85942         |36806 |2   |20  |30m                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |0            |                                              |
+ROW   |85943         |36807 |1   |12  |$[?(@.name=="influxdb_organizations_total")].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |1            |                                              |
+ROW   |85944         |36807 |2   |20  |30m                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |0            |                                              |
+ROW   |85945         |36808 |1   |12  |$[?(@.name=="influxdb_dashboards_total")].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |1            |                                              |
+ROW   |85946         |36808 |2   |20  |30m                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |0            |                                              |
+ROW   |85947         |36809 |1   |12  |$[?(@.name=="influxdb_buckets_total")].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |1            |                                              |
+ROW   |85948         |36809 |2   |20  |30m                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |0            |                                              |
+ROW   |85949         |36810 |1   |12  |$[?(@.name=="boltdb_writes_total")].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |1            |                                              |
+ROW   |85950         |36810 |2   |10  |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0            |                                              |
+ROW   |85951         |36811 |1   |12  |$[?(@.name=="boltdb_reads_total")].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |1            |                                              |
+ROW   |85952         |36811 |2   |10  |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0            |                                              |
+ROW   |85953         |36812 |1   |12  |$[?(@.name=="influxdb_info")].labels.version.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |0            |                                              |
+ROW   |85954         |36812 |2   |20  |3h                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |0            |                                              |
+ROW   |85955         |36813 |1   |21  |var result = [];&bsn;&bsn;JSON.parse(value).orgs.forEach(function (e) {&bsn;    result.push({&bsn;        "{#ORG_ID}": e.id,&bsn;        "{#ORG_NAME}": e.name,&bsn;        "{#ORG_DESCRIPTION}": e.description&bsn;    });&bsn;});&bsn;&bsn;return JSON.stringify(result)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |0            |                                              |
+ROW   |85956         |36813 |2   |20  |1h                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |0            |                                              |
+ROW   |85957         |36814 |1   |12  |$[?(@.name=="http_query_response_bytes" && @.labels.status != "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |1            |                                              |
+ROW   |85958         |36814 |2   |10  |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0            |                                              |
+ROW   |85959         |36815 |1   |12  |$[?(@.name=="http_query_response_bytes" && @.labels.status == "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |1            |                                              |
+ROW   |85960         |36815 |2   |10  |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0            |                                              |
+ROW   |85961         |36816 |1   |12  |$[?(@.name=="http_query_request_count" && @.labels.status != "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |1            |                                              |
+ROW   |85962         |36816 |2   |10  |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0            |                                              |
+ROW   |85963         |36817 |1   |12  |$[?(@.name=="http_query_request_count" && @.labels.status == "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |1            |                                              |
+ROW   |85964         |36817 |2   |10  |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0            |                                              |
+ROW   |85965         |36818 |1   |12  |$[?(@.name=="http_query_request_bytes" && @.labels.status != "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |1            |                                              |
+ROW   |85966         |36818 |2   |10  |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0            |                                              |
+ROW   |85967         |36819 |1   |12  |$[?(@.name=="http_query_request_bytes" && @.labels.status == "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |1            |                                              |
+ROW   |85968         |36819 |2   |10  |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |0            |                                              |
+ROW   |85969         |33661 |2   |20  |6h                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |0            |                                              |
+ROW   |85970         |36820 |1   |12  |$[?(@.disk_name=='{#NAME}')].ata_smart_attributes.table[?(@.id=={#ID})].raw.string.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |0            |                                              |
+ROW   |85971         |36820 |2   |20  |6h                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |0            |                                              |
+ROW   |85972         |33673 |2   |20  |6h                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |0            |                                              |
+ROW   |85973         |36821 |1   |12  |$[?(@.disk_name=='{#NAME}')].ata_smart_attributes.table[?(@.id=={#ID})].raw.string.first()                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |0            |                                              |
+ROW   |85974         |36821 |2   |20  |6h                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |0            |                                              |
 
 TABLE |sysmap_shape
 FIELDS|sysmap_shapeid|sysmapid|type|x   |y   |width|height|text      |font|font_size|font_color|text_halign|text_valign|border_type|border_width|border_color|background_color|zindex|
@@ -44870,436 +44995,436 @@ TABLE |lld_override
 FIELDS|lld_overrideid|itemid|name                                        |step|evaltype|formula|stop|
 ROW   |195           |34718 |Temp                                        |1   |0       |       |0   |
 ROW   |196           |34719 |Temp                                        |1   |0       |       |0   |
-ROW   |484           |30961 |trigger                                     |1   |0       |       |0   |
-ROW   |485           |30193 |Discard HTTP status codes                   |1   |0       |       |0   |
-ROW   |486           |30194 |Discard HTTP status codes                   |1   |0       |       |0   |
-ROW   |487           |30195 |Discard HTTP status codes                   |1   |0       |       |0   |
-ROW   |488           |30236 |Discard HTTP status codes                   |1   |0       |       |0   |
-ROW   |489           |30237 |Discard HTTP status codes                   |1   |0       |       |0   |
-ROW   |490           |30238 |Discard HTTP status codes                   |1   |0       |       |0   |
-ROW   |491           |33521 |trigger disabled non main channels          |1   |0       |       |0   |
-ROW   |492           |33810 |Primary metrics                             |1   |0       |       |0   |
-ROW   |493           |33810 |Arbiter metrics                             |2   |0       |       |0   |
-ROW   |494           |34346 |Too many missed regions trigger             |1   |0       |       |0   |
-ROW   |495           |34346 |Unresponsive peers trigger                  |2   |0       |       |0   |
-ROW   |496           |34403 |Failed GC-related operations trigger        |1   |0       |       |0   |
-ROW   |497           |34443 |Too many unreachable messages trigger       |1   |0       |       |0   |
-ROW   |498           |33657 |ID filter                                   |1   |0       |       |0   |
-ROW   |499           |33658 |Not NVMe                                    |2   |0       |       |0   |
-ROW   |500           |33658 |Self-test                                   |1   |0       |       |0   |
-ROW   |501           |33669 |ID filter                                   |1   |0       |       |0   |
-ROW   |502           |33670 |Not NVMe                                    |2   |0       |       |0   |
-ROW   |503           |33670 |Self-test                                   |1   |0       |       |0   |
-ROW   |504           |28306 |trigger THRESHOLD_HI_CRIT                   |4   |0       |       |0   |
-ROW   |505           |28306 |trigger THRESHOLD_HI_WARN                   |3   |0       |       |0   |
-ROW   |506           |28306 |trigger THRESHOLD_LO_CRIT                   |2   |0       |       |0   |
-ROW   |507           |28306 |trigger THRESHOLD_LO_WARN                   |1   |0       |       |0   |
-ROW   |508           |28307 |trigger THRESHOLD_HI_CRIT                   |4   |0       |       |0   |
-ROW   |509           |28307 |trigger THRESHOLD_HI_WARN                   |3   |0       |       |0   |
-ROW   |510           |28307 |trigger THRESHOLD_LO_CRIT                   |2   |0       |       |0   |
-ROW   |511           |28307 |trigger THRESHOLD_LO_WARN                   |1   |0       |       |0   |
-ROW   |512           |33182 |trigger THRESHOLD_HI_CRIT                   |4   |0       |       |0   |
-ROW   |513           |33182 |trigger THRESHOLD_HI_WARN                   |3   |0       |       |0   |
-ROW   |514           |33182 |trigger THRESHOLD_LO_CRIT                   |2   |0       |       |0   |
-ROW   |515           |33182 |trigger THRESHOLD_LO_WARN                   |1   |0       |       |0   |
-ROW   |516           |35366 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |517           |35542 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |518           |35543 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |519           |35575 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |520           |35619 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |521           |35653 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |522           |35654 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |523           |35720 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |524           |35721 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |525           |35787 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |526           |35788 |Trigger disabled                            |1   |0       |       |0   |
-ROW   |527           |35788 |Trigger enabled                             |2   |0       |       |0   |
-ROW   |528           |35820 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |529           |35859 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |530           |35903 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |531           |35947 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |532           |35991 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |533           |36036 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |534           |36081 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |535           |36126 |Don't create triggers for matching interface|1   |0       |       |0   |
-ROW   |536           |34478 |Temp                                        |1   |0       |       |0   |
-ROW   |537           |34479 |Temp                                        |1   |0       |       |0   |
-ROW   |538           |34526 |Temp                                        |1   |0       |       |0   |
-ROW   |539           |34527 |Temp                                        |1   |0       |       |0   |
-ROW   |540           |34574 |Temp                                        |1   |0       |       |0   |
-ROW   |541           |34575 |Temp                                        |1   |0       |       |0   |
-ROW   |542           |34622 |Temp                                        |1   |0       |       |0   |
-ROW   |543           |34623 |Temp                                        |1   |0       |       |0   |
-ROW   |544           |34670 |Temp                                        |1   |0       |       |0   |
-ROW   |545           |34671 |Temp                                        |1   |0       |       |0   |
-ROW   |546           |35043 |Temp                                        |1   |0       |       |0   |
-ROW   |547           |35044 |Temp                                        |1   |0       |       |0   |
-ROW   |548           |34766 |Temp                                        |1   |0       |       |0   |
-ROW   |549           |34767 |Temp                                        |1   |0       |       |0   |
-ROW   |550           |34209 |Temp                                        |1   |0       |       |0   |
-ROW   |551           |34210 |Temp                                        |1   |0       |       |0   |
-ROW   |552           |34820 |Temp                                        |1   |0       |       |0   |
-ROW   |553           |34821 |Temp                                        |1   |0       |       |0   |
-ROW   |554           |34868 |Temp                                        |1   |0       |       |0   |
-ROW   |555           |34869 |Temp                                        |1   |0       |       |0   |
-ROW   |556           |34916 |Temp                                        |1   |0       |       |0   |
-ROW   |557           |34917 |Temp                                        |1   |0       |       |0   |
-ROW   |558           |33354 |Do not discover aggregate metrics           |1   |0       |       |0   |
-ROW   |559           |30687 |trigger SENSOR_HI_CRIT                      |5   |0       |       |0   |
-ROW   |560           |30687 |trigger SENSOR_HI_DISAST                    |6   |0       |       |0   |
-ROW   |561           |30687 |trigger SENSOR_HI_WARN                      |4   |0       |       |0   |
-ROW   |562           |30687 |trigger SENSOR_LO_CRIT                      |2   |0       |       |0   |
-ROW   |563           |30687 |trigger SENSOR_LO_DISAST                    |3   |0       |       |0   |
-ROW   |564           |30687 |trigger SENSOR_LO_WARN                      |1   |0       |       |0   |
+ROW   |565           |30961 |trigger                                     |1   |0       |       |0   |
+ROW   |566           |30193 |Discard HTTP status codes                   |1   |0       |       |0   |
+ROW   |567           |30194 |Discard HTTP status codes                   |1   |0       |       |0   |
+ROW   |568           |30195 |Discard HTTP status codes                   |1   |0       |       |0   |
+ROW   |569           |30236 |Discard HTTP status codes                   |1   |0       |       |0   |
+ROW   |570           |30237 |Discard HTTP status codes                   |1   |0       |       |0   |
+ROW   |571           |30238 |Discard HTTP status codes                   |1   |0       |       |0   |
+ROW   |572           |33521 |trigger disabled non main channels          |1   |0       |       |0   |
+ROW   |573           |33810 |Primary metrics                             |1   |0       |       |0   |
+ROW   |574           |33810 |Arbiter metrics                             |2   |0       |       |0   |
+ROW   |575           |34346 |Too many missed regions trigger             |1   |0       |       |0   |
+ROW   |576           |34346 |Unresponsive peers trigger                  |2   |0       |       |0   |
+ROW   |577           |34403 |Failed GC-related operations trigger        |1   |0       |       |0   |
+ROW   |578           |34443 |Too many unreachable messages trigger       |1   |0       |       |0   |
+ROW   |579           |33657 |ID filter                                   |1   |0       |       |0   |
+ROW   |580           |33658 |Not NVMe                                    |2   |0       |       |0   |
+ROW   |581           |33658 |Self-test                                   |1   |0       |       |0   |
+ROW   |582           |33669 |ID filter                                   |1   |0       |       |0   |
+ROW   |583           |33670 |Not NVMe                                    |2   |0       |       |0   |
+ROW   |584           |33670 |Self-test                                   |1   |0       |       |0   |
+ROW   |585           |28306 |trigger THRESHOLD_HI_CRIT                   |4   |0       |       |0   |
+ROW   |586           |28306 |trigger THRESHOLD_HI_WARN                   |3   |0       |       |0   |
+ROW   |587           |28306 |trigger THRESHOLD_LO_CRIT                   |2   |0       |       |0   |
+ROW   |588           |28306 |trigger THRESHOLD_LO_WARN                   |1   |0       |       |0   |
+ROW   |589           |28307 |trigger THRESHOLD_HI_CRIT                   |4   |0       |       |0   |
+ROW   |590           |28307 |trigger THRESHOLD_HI_WARN                   |3   |0       |       |0   |
+ROW   |591           |28307 |trigger THRESHOLD_LO_CRIT                   |2   |0       |       |0   |
+ROW   |592           |28307 |trigger THRESHOLD_LO_WARN                   |1   |0       |       |0   |
+ROW   |593           |33182 |trigger THRESHOLD_HI_CRIT                   |4   |0       |       |0   |
+ROW   |594           |33182 |trigger THRESHOLD_HI_WARN                   |3   |0       |       |0   |
+ROW   |595           |33182 |trigger THRESHOLD_LO_CRIT                   |2   |0       |       |0   |
+ROW   |596           |33182 |trigger THRESHOLD_LO_WARN                   |1   |0       |       |0   |
+ROW   |597           |35366 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |598           |35542 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |599           |35543 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |600           |35575 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |601           |35619 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |602           |35653 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |603           |35654 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |604           |35720 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |605           |35721 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |606           |35787 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |607           |35788 |Trigger disabled                            |1   |0       |       |0   |
+ROW   |608           |35788 |Trigger enabled                             |2   |0       |       |0   |
+ROW   |609           |35820 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |610           |35859 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |611           |35903 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |612           |35947 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |613           |35991 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |614           |36036 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |615           |36081 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |616           |36126 |Don't create triggers for matching interface|1   |0       |       |0   |
+ROW   |617           |34478 |Temp                                        |1   |0       |       |0   |
+ROW   |618           |34479 |Temp                                        |1   |0       |       |0   |
+ROW   |619           |34526 |Temp                                        |1   |0       |       |0   |
+ROW   |620           |34527 |Temp                                        |1   |0       |       |0   |
+ROW   |621           |34574 |Temp                                        |1   |0       |       |0   |
+ROW   |622           |34575 |Temp                                        |1   |0       |       |0   |
+ROW   |623           |34622 |Temp                                        |1   |0       |       |0   |
+ROW   |624           |34623 |Temp                                        |1   |0       |       |0   |
+ROW   |625           |34670 |Temp                                        |1   |0       |       |0   |
+ROW   |626           |34671 |Temp                                        |1   |0       |       |0   |
+ROW   |627           |35043 |Temp                                        |1   |0       |       |0   |
+ROW   |628           |35044 |Temp                                        |1   |0       |       |0   |
+ROW   |629           |34766 |Temp                                        |1   |0       |       |0   |
+ROW   |630           |34767 |Temp                                        |1   |0       |       |0   |
+ROW   |631           |34209 |Temp                                        |1   |0       |       |0   |
+ROW   |632           |34210 |Temp                                        |1   |0       |       |0   |
+ROW   |633           |34820 |Temp                                        |1   |0       |       |0   |
+ROW   |634           |34821 |Temp                                        |1   |0       |       |0   |
+ROW   |635           |34868 |Temp                                        |1   |0       |       |0   |
+ROW   |636           |34869 |Temp                                        |1   |0       |       |0   |
+ROW   |637           |34916 |Temp                                        |1   |0       |       |0   |
+ROW   |638           |34917 |Temp                                        |1   |0       |       |0   |
+ROW   |639           |33354 |Do not discover aggregate metrics           |1   |0       |       |0   |
+ROW   |640           |30687 |trigger SENSOR_HI_CRIT                      |5   |0       |       |0   |
+ROW   |641           |30687 |trigger SENSOR_HI_DISAST                    |6   |0       |       |0   |
+ROW   |642           |30687 |trigger SENSOR_HI_WARN                      |4   |0       |       |0   |
+ROW   |643           |30687 |trigger SENSOR_LO_CRIT                      |2   |0       |       |0   |
+ROW   |644           |30687 |trigger SENSOR_LO_DISAST                    |3   |0       |       |0   |
+ROW   |645           |30687 |trigger SENSOR_LO_WARN                      |1   |0       |       |0   |
 
 TABLE |lld_override_condition
 FIELDS|lld_override_conditionid|lld_overrideid|operator|macro                   |value                                 |
 ROW   |116                     |195           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
 ROW   |117                     |196           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |383                     |484           |8       |{#GRPC.CODE}            |{$ETCD.GRPC_CODE.TRIGGER.MATCHES}     |
-ROW   |384                     |485           |8       |{#MODE}                 |tcp                                   |
-ROW   |385                     |486           |8       |{#MODE}                 |tcp                                   |
-ROW   |386                     |487           |8       |{#MODE}                 |tcp                                   |
-ROW   |387                     |488           |8       |{#MODE}                 |tcp                                   |
-ROW   |388                     |489           |8       |{#MODE}                 |tcp                                   |
-ROW   |389                     |490           |8       |{#MODE}                 |tcp                                   |
-ROW   |390                     |491           |9       |{#CHANNEL_ID}           |{$HIKVISION_MAIN_CHANNEL_ID}          |
-ROW   |391                     |492           |8       |{#NODE_STATE}           |1                                     |
-ROW   |392                     |493           |8       |{#NODE_STATE}           |7                                     |
-ROW   |393                     |494           |8       |{#TYPE}                 |miss_peer_region_count                |
-ROW   |394                     |495           |8       |{#TYPE}                 |down_peer_region_count                |
-ROW   |395                     |496           |8       |{#TYPE}                 |failed                                |
-ROW   |396                     |497           |8       |{#TYPE}                 |unreachable                           |
-ROW   |397                     |498           |8       |{#ID}                   |{$SMART.ATTRIBUTE.ID.MATCHES}         |
-ROW   |398                     |498           |8       |{#NAME}                 |{$SMART.DISK.NAME.MATCHES}            |
-ROW   |399                     |499           |9       |{#DISKTYPE}             |nvme                                  |
-ROW   |400                     |500           |8       |{#DISKTYPE}             |nvme                                  |
-ROW   |401                     |501           |8       |{#ID}                   |{$SMART.ATTRIBUTE.ID.MATCHES}         |
-ROW   |402                     |501           |8       |{#NAME}                 |{$SMART.DISK.NAME.MATCHES}            |
-ROW   |403                     |502           |9       |{#DISKTYPE}             |nvme                                  |
-ROW   |404                     |503           |8       |{#DISKTYPE}             |nvme                                  |
-ROW   |405                     |504           |8       |{#THRESHOLD_HI_CRIT}    |^$                                    |
-ROW   |406                     |505           |8       |{#THRESHOLD_HI_WARN}    |^$                                    |
-ROW   |407                     |506           |8       |{#THRESHOLD_LO_CRIT}    |^$                                    |
-ROW   |408                     |507           |8       |{#THRESHOLD_LO_WARN}    |^$                                    |
-ROW   |409                     |508           |8       |{#THRESHOLD_HI_CRIT}    |^$                                    |
-ROW   |410                     |509           |8       |{#THRESHOLD_HI_WARN}    |^$                                    |
-ROW   |411                     |510           |8       |{#THRESHOLD_LO_CRIT}    |^$                                    |
-ROW   |412                     |511           |8       |{#THRESHOLD_LO_WARN}    |^$                                    |
-ROW   |413                     |512           |8       |{#THRESHOLD_HI_CRIT}    |^$                                    |
-ROW   |414                     |513           |8       |{#THRESHOLD_HI_WARN}    |^$                                    |
-ROW   |415                     |514           |8       |{#THRESHOLD_LO_CRIT}    |^$                                    |
-ROW   |416                     |515           |8       |{#THRESHOLD_LO_WARN}    |^$                                    |
-ROW   |417                     |516           |9       |{#CISCO.IF.NAME}        |{$CISCO.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |418                     |517           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |419                     |518           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |420                     |519           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |421                     |520           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |422                     |521           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |423                     |522           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |424                     |523           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |425                     |524           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |426                     |525           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |427                     |526           |8       |{#ZYXEL.IF.NAME}        |.*                                    |
-ROW   |428                     |527           |8       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |429                     |528           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |430                     |529           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |431                     |530           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |432                     |531           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |433                     |532           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |434                     |533           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |435                     |534           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |436                     |535           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW   |437                     |536           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |438                     |537           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |439                     |538           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |440                     |539           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |441                     |540           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |442                     |541           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |443                     |542           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |444                     |543           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |445                     |544           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |446                     |545           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |447                     |546           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |448                     |547           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |449                     |548           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |450                     |549           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |451                     |550           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |452                     |551           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |453                     |552           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |454                     |553           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |455                     |554           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |456                     |555           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |457                     |556           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
-ROW   |458                     |557           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
-ROW   |459                     |558           |8       |{#FSTYPE}               |3&pipe;4                              |
+ROW   |460                     |565           |8       |{#GRPC.CODE}            |{$ETCD.GRPC_CODE.TRIGGER.MATCHES}     |
+ROW   |461                     |566           |8       |{#MODE}                 |tcp                                   |
+ROW   |462                     |567           |8       |{#MODE}                 |tcp                                   |
+ROW   |463                     |568           |8       |{#MODE}                 |tcp                                   |
+ROW   |464                     |569           |8       |{#MODE}                 |tcp                                   |
+ROW   |465                     |570           |8       |{#MODE}                 |tcp                                   |
+ROW   |466                     |571           |8       |{#MODE}                 |tcp                                   |
+ROW   |467                     |572           |9       |{#CHANNEL_ID}           |{$HIKVISION_MAIN_CHANNEL_ID}          |
+ROW   |468                     |573           |8       |{#NODE_STATE}           |1                                     |
+ROW   |469                     |574           |8       |{#NODE_STATE}           |7                                     |
+ROW   |470                     |575           |8       |{#TYPE}                 |miss_peer_region_count                |
+ROW   |471                     |576           |8       |{#TYPE}                 |down_peer_region_count                |
+ROW   |472                     |577           |8       |{#TYPE}                 |failed                                |
+ROW   |473                     |578           |8       |{#TYPE}                 |unreachable                           |
+ROW   |474                     |579           |8       |{#ID}                   |{$SMART.ATTRIBUTE.ID.MATCHES}         |
+ROW   |475                     |579           |8       |{#NAME}                 |{$SMART.DISK.NAME.MATCHES}            |
+ROW   |476                     |580           |9       |{#DISKTYPE}             |nvme                                  |
+ROW   |477                     |581           |8       |{#DISKTYPE}             |nvme                                  |
+ROW   |478                     |582           |8       |{#ID}                   |{$SMART.ATTRIBUTE.ID.MATCHES}         |
+ROW   |479                     |582           |8       |{#NAME}                 |{$SMART.DISK.NAME.MATCHES}            |
+ROW   |480                     |583           |9       |{#DISKTYPE}             |nvme                                  |
+ROW   |481                     |584           |8       |{#DISKTYPE}             |nvme                                  |
+ROW   |482                     |585           |8       |{#THRESHOLD_HI_CRIT}    |^$                                    |
+ROW   |483                     |586           |8       |{#THRESHOLD_HI_WARN}    |^$                                    |
+ROW   |484                     |587           |8       |{#THRESHOLD_LO_CRIT}    |^$                                    |
+ROW   |485                     |588           |8       |{#THRESHOLD_LO_WARN}    |^$                                    |
+ROW   |486                     |589           |8       |{#THRESHOLD_HI_CRIT}    |^$                                    |
+ROW   |487                     |590           |8       |{#THRESHOLD_HI_WARN}    |^$                                    |
+ROW   |488                     |591           |8       |{#THRESHOLD_LO_CRIT}    |^$                                    |
+ROW   |489                     |592           |8       |{#THRESHOLD_LO_WARN}    |^$                                    |
+ROW   |490                     |593           |8       |{#THRESHOLD_HI_CRIT}    |^$                                    |
+ROW   |491                     |594           |8       |{#THRESHOLD_HI_WARN}    |^$                                    |
+ROW   |492                     |595           |8       |{#THRESHOLD_LO_CRIT}    |^$                                    |
+ROW   |493                     |596           |8       |{#THRESHOLD_LO_WARN}    |^$                                    |
+ROW   |494                     |597           |9       |{#CISCO.IF.NAME}        |{$CISCO.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |495                     |598           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |496                     |599           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |497                     |600           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |498                     |601           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |499                     |602           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |500                     |603           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |501                     |604           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |502                     |605           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |503                     |606           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |504                     |607           |8       |{#ZYXEL.IF.NAME}        |.*                                    |
+ROW   |505                     |608           |8       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |506                     |609           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |507                     |610           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |508                     |611           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |509                     |612           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |510                     |613           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |511                     |614           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |512                     |615           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |513                     |616           |9       |{#ZYXEL.IF.NAME}        |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW   |514                     |617           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |515                     |618           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |516                     |619           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |517                     |620           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |518                     |621           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |519                     |622           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |520                     |623           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |521                     |624           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |522                     |625           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |523                     |626           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |524                     |627           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |525                     |628           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |526                     |629           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |527                     |630           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |528                     |631           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |529                     |632           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |530                     |633           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |531                     |634           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |532                     |635           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |533                     |636           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |534                     |637           |8       |{#EXTERNAL_SENSOR1_NAME}|Temp                                  |
+ROW   |535                     |638           |8       |{#EXTERNAL_SENSOR2_NAME}|Temp                                  |
+ROW   |536                     |639           |8       |{#FSTYPE}               |3&pipe;4                              |
 
 TABLE |lld_override_operation
 FIELDS|lld_override_operationid|lld_overrideid|operationobject|operator|value                                      |
 ROW   |201                     |195           |0              |2       |Humidity                                   |
 ROW   |202                     |196           |0              |2       |Humidity                                   |
-ROW   |502                     |484           |1              |2       |Too many failed gRPC requests              |
-ROW   |503                     |485           |0              |2       |Number of responses with codes             |
-ROW   |504                     |486           |0              |2       |Number of responses with codes             |
-ROW   |505                     |487           |0              |2       |Number of responses with codes             |
-ROW   |506                     |488           |0              |2       |Number of responses with codes             |
-ROW   |507                     |489           |0              |2       |Number of responses with codes             |
-ROW   |508                     |490           |0              |2       |Number of responses with codes             |
-ROW   |509                     |491           |1              |2       |Invalid video stream resolution parameters |
-ROW   |510                     |492           |0              |2       |Number of replicas                         |
-ROW   |511                     |492           |0              |2       |Unhealthy replicas                         |
-ROW   |512                     |492           |0              |2       |Number of unhealthy replicas               |
-ROW   |513                     |492           |0              |2       |Replication lag                            |
-ROW   |514                     |493           |0              |2       |Replication lag                            |
-ROW   |515                     |494           |1              |2       |Too many missed regions                    |
-ROW   |516                     |495           |1              |2       |There are unresponsive peers               |
-ROW   |517                     |496           |1              |2       |Too many failed GC-related operations      |
-ROW   |518                     |497           |1              |2       |Too many failure messages                  |
-ROW   |519                     |498           |0              |8       |                                           |
-ROW   |520                     |499           |0              |8       |Media&pipe;Percentage&pipe;Critical        |
-ROW   |521                     |500           |0              |2       |Self-test                                  |
-ROW   |522                     |501           |0              |8       |                                           |
-ROW   |523                     |502           |0              |8       |Media&pipe;Percentage&pipe;Critical        |
-ROW   |524                     |503           |0              |2       |Self-test                                  |
-ROW   |525                     |504           |1              |8       |Temperature is above the critical threshold|
-ROW   |526                     |505           |1              |8       |Temperature is above the warning threshold |
-ROW   |527                     |506           |1              |8       |Temperature is below the critical threshold|
-ROW   |528                     |507           |1              |8       |Temperature is below the warning threshold |
-ROW   |529                     |508           |1              |8       |Fan speed is above the critical threshold  |
-ROW   |530                     |509           |1              |8       |Fan speed is above the warning threshold   |
-ROW   |531                     |510           |1              |8       |Fan speed is below the critical threshold  |
-ROW   |532                     |511           |1              |8       |Fan speed is below the warning threshold   |
-ROW   |533                     |512           |1              |8       |Voltage is above the critical threshold    |
-ROW   |534                     |513           |1              |8       |Voltage is above the warning threshold     |
-ROW   |535                     |514           |1              |8       |Voltage is below the critical threshold    |
-ROW   |536                     |515           |1              |8       |Voltage is below the warning threshold     |
-ROW   |537                     |516           |1              |8       |.*                                         |
-ROW   |538                     |517           |1              |8       |.*                                         |
-ROW   |539                     |518           |1              |8       |.*                                         |
-ROW   |540                     |519           |1              |8       |.*                                         |
-ROW   |541                     |520           |1              |8       |.*                                         |
-ROW   |542                     |521           |1              |8       |.*                                         |
-ROW   |543                     |522           |1              |8       |.*                                         |
-ROW   |544                     |523           |1              |8       |.*                                         |
-ROW   |545                     |524           |1              |8       |.*                                         |
-ROW   |546                     |525           |1              |8       |.*                                         |
-ROW   |547                     |526           |1              |8       |.*                                         |
-ROW   |548                     |527           |1              |8       |.*                                         |
-ROW   |549                     |528           |1              |8       |.*                                         |
-ROW   |550                     |529           |1              |8       |.*                                         |
-ROW   |551                     |530           |1              |8       |.*                                         |
-ROW   |552                     |531           |1              |8       |.*                                         |
-ROW   |553                     |532           |1              |8       |.*                                         |
-ROW   |554                     |533           |1              |8       |.*                                         |
-ROW   |555                     |534           |1              |8       |.*                                         |
-ROW   |556                     |535           |1              |8       |.*                                         |
-ROW   |557                     |536           |0              |2       |Humidity                                   |
-ROW   |558                     |537           |0              |2       |Humidity                                   |
-ROW   |559                     |538           |0              |2       |Humidity                                   |
-ROW   |560                     |539           |0              |2       |Humidity                                   |
-ROW   |561                     |540           |0              |2       |Humidity                                   |
-ROW   |562                     |541           |0              |2       |Humidity                                   |
-ROW   |563                     |542           |0              |2       |Humidity                                   |
-ROW   |564                     |543           |0              |2       |Humidity                                   |
-ROW   |565                     |544           |0              |2       |Humidity                                   |
-ROW   |566                     |545           |0              |2       |Humidity                                   |
-ROW   |567                     |546           |0              |2       |Humidity                                   |
-ROW   |568                     |547           |0              |2       |Humidity                                   |
-ROW   |569                     |548           |0              |2       |Humidity                                   |
-ROW   |570                     |549           |0              |2       |Humidity                                   |
-ROW   |571                     |550           |0              |2       |Humidity                                   |
-ROW   |572                     |551           |0              |2       |Humidity                                   |
-ROW   |573                     |552           |0              |2       |Humidity                                   |
-ROW   |574                     |553           |0              |2       |Humidity                                   |
-ROW   |575                     |554           |0              |2       |Humidity                                   |
-ROW   |576                     |555           |0              |2       |Humidity                                   |
-ROW   |577                     |556           |0              |2       |Humidity                                   |
-ROW   |578                     |557           |0              |2       |Humidity                                   |
-ROW   |579                     |558           |0              |2       |Saved                                      |
-ROW   |580                     |559           |1              |2       |{#SENSOR_HI_CRIT}                          |
-ROW   |581                     |560           |1              |2       |{#SENSOR_HI_DISAST}                        |
-ROW   |582                     |561           |1              |2       |{#SENSOR_HI_WARN}                          |
-ROW   |583                     |562           |1              |2       |{#SENSOR_LO_CRIT}                          |
-ROW   |584                     |563           |1              |2       |{#SENSOR_LO_DISAST}                        |
-ROW   |585                     |564           |1              |2       |{#SENSOR_LO_WARN}                          |
+ROW   |586                     |565           |1              |2       |Too many failed gRPC requests              |
+ROW   |587                     |566           |0              |2       |Number of responses with codes             |
+ROW   |588                     |567           |0              |2       |Number of responses with codes             |
+ROW   |589                     |568           |0              |2       |Number of responses with codes             |
+ROW   |590                     |569           |0              |2       |Number of responses with codes             |
+ROW   |591                     |570           |0              |2       |Number of responses with codes             |
+ROW   |592                     |571           |0              |2       |Number of responses with codes             |
+ROW   |593                     |572           |1              |2       |Invalid video stream resolution parameters |
+ROW   |594                     |573           |0              |2       |Number of replicas                         |
+ROW   |595                     |573           |0              |2       |Unhealthy replicas                         |
+ROW   |596                     |573           |0              |2       |Number of unhealthy replicas               |
+ROW   |597                     |573           |0              |2       |Replication lag                            |
+ROW   |598                     |574           |0              |2       |Replication lag                            |
+ROW   |599                     |575           |1              |2       |Too many missed regions                    |
+ROW   |600                     |576           |1              |2       |There are unresponsive peers               |
+ROW   |601                     |577           |1              |2       |Too many failed GC-related operations      |
+ROW   |602                     |578           |1              |2       |Too many failure messages                  |
+ROW   |603                     |579           |0              |8       |                                           |
+ROW   |604                     |580           |0              |8       |Media&pipe;Percentage&pipe;Critical        |
+ROW   |605                     |581           |0              |2       |Self-test                                  |
+ROW   |606                     |582           |0              |8       |                                           |
+ROW   |607                     |583           |0              |8       |Media&pipe;Percentage&pipe;Critical        |
+ROW   |608                     |584           |0              |2       |Self-test                                  |
+ROW   |609                     |585           |1              |8       |Temperature is above the critical threshold|
+ROW   |610                     |586           |1              |8       |Temperature is above the warning threshold |
+ROW   |611                     |587           |1              |8       |Temperature is below the critical threshold|
+ROW   |612                     |588           |1              |8       |Temperature is below the warning threshold |
+ROW   |613                     |589           |1              |8       |Fan speed is above the critical threshold  |
+ROW   |614                     |590           |1              |8       |Fan speed is above the warning threshold   |
+ROW   |615                     |591           |1              |8       |Fan speed is below the critical threshold  |
+ROW   |616                     |592           |1              |8       |Fan speed is below the warning threshold   |
+ROW   |617                     |593           |1              |8       |Voltage is above the critical threshold    |
+ROW   |618                     |594           |1              |8       |Voltage is above the warning threshold     |
+ROW   |619                     |595           |1              |8       |Voltage is below the critical threshold    |
+ROW   |620                     |596           |1              |8       |Voltage is below the warning threshold     |
+ROW   |621                     |597           |1              |8       |.*                                         |
+ROW   |622                     |598           |1              |8       |.*                                         |
+ROW   |623                     |599           |1              |8       |.*                                         |
+ROW   |624                     |600           |1              |8       |.*                                         |
+ROW   |625                     |601           |1              |8       |.*                                         |
+ROW   |626                     |602           |1              |8       |.*                                         |
+ROW   |627                     |603           |1              |8       |.*                                         |
+ROW   |628                     |604           |1              |8       |.*                                         |
+ROW   |629                     |605           |1              |8       |.*                                         |
+ROW   |630                     |606           |1              |8       |.*                                         |
+ROW   |631                     |607           |1              |8       |.*                                         |
+ROW   |632                     |608           |1              |8       |.*                                         |
+ROW   |633                     |609           |1              |8       |.*                                         |
+ROW   |634                     |610           |1              |8       |.*                                         |
+ROW   |635                     |611           |1              |8       |.*                                         |
+ROW   |636                     |612           |1              |8       |.*                                         |
+ROW   |637                     |613           |1              |8       |.*                                         |
+ROW   |638                     |614           |1              |8       |.*                                         |
+ROW   |639                     |615           |1              |8       |.*                                         |
+ROW   |640                     |616           |1              |8       |.*                                         |
+ROW   |641                     |617           |0              |2       |Humidity                                   |
+ROW   |642                     |618           |0              |2       |Humidity                                   |
+ROW   |643                     |619           |0              |2       |Humidity                                   |
+ROW   |644                     |620           |0              |2       |Humidity                                   |
+ROW   |645                     |621           |0              |2       |Humidity                                   |
+ROW   |646                     |622           |0              |2       |Humidity                                   |
+ROW   |647                     |623           |0              |2       |Humidity                                   |
+ROW   |648                     |624           |0              |2       |Humidity                                   |
+ROW   |649                     |625           |0              |2       |Humidity                                   |
+ROW   |650                     |626           |0              |2       |Humidity                                   |
+ROW   |651                     |627           |0              |2       |Humidity                                   |
+ROW   |652                     |628           |0              |2       |Humidity                                   |
+ROW   |653                     |629           |0              |2       |Humidity                                   |
+ROW   |654                     |630           |0              |2       |Humidity                                   |
+ROW   |655                     |631           |0              |2       |Humidity                                   |
+ROW   |656                     |632           |0              |2       |Humidity                                   |
+ROW   |657                     |633           |0              |2       |Humidity                                   |
+ROW   |658                     |634           |0              |2       |Humidity                                   |
+ROW   |659                     |635           |0              |2       |Humidity                                   |
+ROW   |660                     |636           |0              |2       |Humidity                                   |
+ROW   |661                     |637           |0              |2       |Humidity                                   |
+ROW   |662                     |638           |0              |2       |Humidity                                   |
+ROW   |663                     |639           |0              |2       |Saved                                      |
+ROW   |664                     |640           |1              |2       |{#SENSOR_HI_CRIT}                          |
+ROW   |665                     |641           |1              |2       |{#SENSOR_HI_DISAST}                        |
+ROW   |666                     |642           |1              |2       |{#SENSOR_HI_WARN}                          |
+ROW   |667                     |643           |1              |2       |{#SENSOR_LO_CRIT}                          |
+ROW   |668                     |644           |1              |2       |{#SENSOR_LO_DISAST}                        |
+ROW   |669                     |645           |1              |2       |{#SENSOR_LO_WARN}                          |
 
 TABLE |lld_override_opstatus
 FIELDS|lld_override_operationid|status|
 ROW   |201                     |0     |
 ROW   |202                     |0     |
-ROW   |502                     |0     |
-ROW   |503                     |0     |
-ROW   |504                     |0     |
-ROW   |505                     |0     |
-ROW   |506                     |0     |
-ROW   |507                     |0     |
-ROW   |508                     |0     |
-ROW   |509                     |0     |
-ROW   |510                     |0     |
-ROW   |511                     |0     |
-ROW   |512                     |0     |
-ROW   |513                     |0     |
-ROW   |514                     |0     |
-ROW   |515                     |0     |
-ROW   |516                     |0     |
-ROW   |517                     |0     |
-ROW   |518                     |0     |
-ROW   |519                     |0     |
-ROW   |520                     |0     |
-ROW   |521                     |0     |
-ROW   |522                     |0     |
-ROW   |523                     |0     |
-ROW   |524                     |0     |
-ROW   |525                     |0     |
-ROW   |526                     |0     |
-ROW   |527                     |0     |
-ROW   |528                     |0     |
-ROW   |529                     |0     |
-ROW   |530                     |0     |
-ROW   |531                     |0     |
-ROW   |532                     |0     |
-ROW   |533                     |0     |
-ROW   |534                     |0     |
-ROW   |535                     |0     |
-ROW   |536                     |0     |
-ROW   |537                     |0     |
-ROW   |538                     |0     |
-ROW   |539                     |0     |
-ROW   |540                     |0     |
-ROW   |541                     |0     |
-ROW   |542                     |0     |
-ROW   |543                     |0     |
-ROW   |544                     |0     |
-ROW   |545                     |0     |
-ROW   |546                     |0     |
-ROW   |547                     |0     |
-ROW   |548                     |0     |
-ROW   |549                     |0     |
-ROW   |550                     |0     |
-ROW   |551                     |0     |
-ROW   |552                     |0     |
-ROW   |553                     |0     |
-ROW   |554                     |0     |
-ROW   |555                     |0     |
-ROW   |556                     |0     |
-ROW   |557                     |0     |
-ROW   |558                     |0     |
-ROW   |559                     |0     |
-ROW   |560                     |0     |
-ROW   |561                     |0     |
-ROW   |562                     |0     |
-ROW   |563                     |0     |
-ROW   |564                     |0     |
-ROW   |565                     |0     |
-ROW   |566                     |0     |
-ROW   |567                     |0     |
-ROW   |568                     |0     |
-ROW   |569                     |0     |
-ROW   |570                     |0     |
-ROW   |571                     |0     |
-ROW   |572                     |0     |
-ROW   |573                     |0     |
-ROW   |574                     |0     |
-ROW   |575                     |0     |
-ROW   |576                     |0     |
-ROW   |577                     |0     |
-ROW   |578                     |0     |
-ROW   |579                     |0     |
-ROW   |580                     |0     |
-ROW   |581                     |0     |
-ROW   |582                     |0     |
-ROW   |583                     |0     |
-ROW   |584                     |0     |
-ROW   |585                     |0     |
+ROW   |586                     |0     |
+ROW   |587                     |0     |
+ROW   |588                     |0     |
+ROW   |589                     |0     |
+ROW   |590                     |0     |
+ROW   |591                     |0     |
+ROW   |592                     |0     |
+ROW   |593                     |0     |
+ROW   |594                     |0     |
+ROW   |595                     |0     |
+ROW   |596                     |0     |
+ROW   |597                     |0     |
+ROW   |598                     |0     |
+ROW   |599                     |0     |
+ROW   |600                     |0     |
+ROW   |601                     |0     |
+ROW   |602                     |0     |
+ROW   |603                     |0     |
+ROW   |604                     |0     |
+ROW   |605                     |0     |
+ROW   |606                     |0     |
+ROW   |607                     |0     |
+ROW   |608                     |0     |
+ROW   |609                     |0     |
+ROW   |610                     |0     |
+ROW   |611                     |0     |
+ROW   |612                     |0     |
+ROW   |613                     |0     |
+ROW   |614                     |0     |
+ROW   |615                     |0     |
+ROW   |616                     |0     |
+ROW   |617                     |0     |
+ROW   |618                     |0     |
+ROW   |619                     |0     |
+ROW   |620                     |0     |
+ROW   |621                     |0     |
+ROW   |622                     |0     |
+ROW   |623                     |0     |
+ROW   |624                     |0     |
+ROW   |625                     |0     |
+ROW   |626                     |0     |
+ROW   |627                     |0     |
+ROW   |628                     |0     |
+ROW   |629                     |0     |
+ROW   |630                     |0     |
+ROW   |631                     |0     |
+ROW   |632                     |0     |
+ROW   |633                     |0     |
+ROW   |634                     |0     |
+ROW   |635                     |0     |
+ROW   |636                     |0     |
+ROW   |637                     |0     |
+ROW   |638                     |0     |
+ROW   |639                     |0     |
+ROW   |640                     |0     |
+ROW   |641                     |0     |
+ROW   |642                     |0     |
+ROW   |643                     |0     |
+ROW   |644                     |0     |
+ROW   |645                     |0     |
+ROW   |646                     |0     |
+ROW   |647                     |0     |
+ROW   |648                     |0     |
+ROW   |649                     |0     |
+ROW   |650                     |0     |
+ROW   |651                     |0     |
+ROW   |652                     |0     |
+ROW   |653                     |0     |
+ROW   |654                     |0     |
+ROW   |655                     |0     |
+ROW   |656                     |0     |
+ROW   |657                     |0     |
+ROW   |658                     |0     |
+ROW   |659                     |0     |
+ROW   |660                     |0     |
+ROW   |661                     |0     |
+ROW   |662                     |0     |
+ROW   |663                     |0     |
+ROW   |664                     |0     |
+ROW   |665                     |0     |
+ROW   |666                     |0     |
+ROW   |667                     |0     |
+ROW   |668                     |0     |
+ROW   |669                     |0     |
 
 TABLE |lld_override_opdiscover
 FIELDS|lld_override_operationid|discover|
 ROW   |201                     |1       |
 ROW   |202                     |1       |
-ROW   |502                     |0       |
-ROW   |503                     |1       |
-ROW   |504                     |1       |
-ROW   |505                     |1       |
-ROW   |506                     |1       |
-ROW   |507                     |1       |
-ROW   |508                     |1       |
-ROW   |509                     |1       |
-ROW   |510                     |0       |
-ROW   |511                     |0       |
-ROW   |512                     |0       |
-ROW   |513                     |1       |
-ROW   |514                     |1       |
-ROW   |515                     |0       |
-ROW   |516                     |0       |
-ROW   |517                     |0       |
-ROW   |518                     |0       |
-ROW   |519                     |1       |
-ROW   |520                     |1       |
-ROW   |521                     |1       |
-ROW   |522                     |1       |
-ROW   |523                     |1       |
-ROW   |524                     |1       |
-ROW   |525                     |1       |
-ROW   |526                     |1       |
-ROW   |527                     |1       |
-ROW   |528                     |1       |
-ROW   |529                     |1       |
-ROW   |530                     |1       |
-ROW   |531                     |1       |
-ROW   |532                     |1       |
-ROW   |533                     |1       |
-ROW   |534                     |1       |
-ROW   |535                     |1       |
-ROW   |536                     |1       |
-ROW   |537                     |1       |
-ROW   |538                     |1       |
-ROW   |539                     |1       |
-ROW   |540                     |1       |
-ROW   |541                     |1       |
-ROW   |542                     |1       |
-ROW   |543                     |1       |
-ROW   |544                     |1       |
-ROW   |545                     |1       |
-ROW   |546                     |1       |
-ROW   |547                     |1       |
-ROW   |548                     |0       |
-ROW   |549                     |1       |
-ROW   |550                     |1       |
-ROW   |551                     |1       |
-ROW   |552                     |1       |
-ROW   |553                     |1       |
-ROW   |554                     |1       |
-ROW   |555                     |1       |
-ROW   |556                     |1       |
-ROW   |557                     |1       |
-ROW   |558                     |1       |
-ROW   |559                     |1       |
-ROW   |560                     |1       |
-ROW   |561                     |1       |
-ROW   |562                     |1       |
-ROW   |563                     |1       |
-ROW   |564                     |1       |
-ROW   |565                     |1       |
-ROW   |566                     |1       |
-ROW   |567                     |1       |
-ROW   |568                     |1       |
-ROW   |569                     |1       |
-ROW   |570                     |1       |
-ROW   |571                     |1       |
-ROW   |572                     |1       |
-ROW   |573                     |1       |
-ROW   |574                     |1       |
-ROW   |575                     |1       |
-ROW   |576                     |1       |
-ROW   |577                     |1       |
-ROW   |578                     |1       |
-ROW   |579                     |1       |
-ROW   |580                     |1       |
-ROW   |581                     |1       |
-ROW   |582                     |1       |
-ROW   |583                     |1       |
-ROW   |584                     |1       |
-ROW   |585                     |1       |
+ROW   |586                     |0       |
+ROW   |587                     |1       |
+ROW   |588                     |1       |
+ROW   |589                     |1       |
+ROW   |590                     |1       |
+ROW   |591                     |1       |
+ROW   |592                     |1       |
+ROW   |593                     |1       |
+ROW   |594                     |0       |
+ROW   |595                     |0       |
+ROW   |596                     |0       |
+ROW   |597                     |1       |
+ROW   |598                     |1       |
+ROW   |599                     |0       |
+ROW   |600                     |0       |
+ROW   |601                     |0       |
+ROW   |602                     |0       |
+ROW   |603                     |1       |
+ROW   |604                     |1       |
+ROW   |605                     |1       |
+ROW   |606                     |1       |
+ROW   |607                     |1       |
+ROW   |608                     |1       |
+ROW   |609                     |1       |
+ROW   |610                     |1       |
+ROW   |611                     |1       |
+ROW   |612                     |1       |
+ROW   |613                     |1       |
+ROW   |614                     |1       |
+ROW   |615                     |1       |
+ROW   |616                     |1       |
+ROW   |617                     |1       |
+ROW   |618                     |1       |
+ROW   |619                     |1       |
+ROW   |620                     |1       |
+ROW   |621                     |1       |
+ROW   |622                     |1       |
+ROW   |623                     |1       |
+ROW   |624                     |1       |
+ROW   |625                     |1       |
+ROW   |626                     |1       |
+ROW   |627                     |1       |
+ROW   |628                     |1       |
+ROW   |629                     |1       |
+ROW   |630                     |1       |
+ROW   |631                     |1       |
+ROW   |632                     |0       |
+ROW   |633                     |1       |
+ROW   |634                     |1       |
+ROW   |635                     |1       |
+ROW   |636                     |1       |
+ROW   |637                     |1       |
+ROW   |638                     |1       |
+ROW   |639                     |1       |
+ROW   |640                     |1       |
+ROW   |641                     |1       |
+ROW   |642                     |1       |
+ROW   |643                     |1       |
+ROW   |644                     |1       |
+ROW   |645                     |1       |
+ROW   |646                     |1       |
+ROW   |647                     |1       |
+ROW   |648                     |1       |
+ROW   |649                     |1       |
+ROW   |650                     |1       |
+ROW   |651                     |1       |
+ROW   |652                     |1       |
+ROW   |653                     |1       |
+ROW   |654                     |1       |
+ROW   |655                     |1       |
+ROW   |656                     |1       |
+ROW   |657                     |1       |
+ROW   |658                     |1       |
+ROW   |659                     |1       |
+ROW   |660                     |1       |
+ROW   |661                     |1       |
+ROW   |662                     |1       |
+ROW   |663                     |1       |
+ROW   |664                     |1       |
+ROW   |665                     |1       |
+ROW   |666                     |1       |
+ROW   |667                     |1       |
+ROW   |668                     |1       |
+ROW   |669                     |1       |
 
 TABLE |item_parameter
 FIELDS|item_parameterid|itemid|name        |value                   |
@@ -45325,8227 +45450,8329 @@ ROW   |19              |35077 |zone        |{$CLOUDFLARE.ZONE_ID}   |
 ROW   |20              |35077 |api_endpoint|{$CLOUDFLARE.API.URL}   |
 
 TABLE |item_tag
-FIELDS|itemtagid|itemid|tag        |value                                                          |
-ROW   |1        |29124 |Application|CPU                                                            |
-ROW   |2        |29125 |Application|CPU                                                            |
-ROW   |3        |29126 |Application|CPU                                                            |
-ROW   |4        |29127 |Application|CPU                                                            |
-ROW   |5        |29128 |Application|CPU                                                            |
-ROW   |6        |29129 |Application|CPU                                                            |
-ROW   |7        |29130 |Application|CPU                                                            |
-ROW   |8        |29131 |Application|CPU                                                            |
-ROW   |9        |29132 |Application|CPU                                                            |
-ROW   |10       |29133 |Application|CPU                                                            |
-ROW   |11       |29134 |Application|CPU                                                            |
-ROW   |12       |29135 |Application|CPU                                                            |
-ROW   |13       |29136 |Application|CPU                                                            |
-ROW   |14       |29137 |Application|CPU                                                            |
-ROW   |15       |29138 |Application|CPU                                                            |
-ROW   |16       |29139 |Application|CPU                                                            |
-ROW   |17       |29199 |Application|CPU                                                            |
-ROW   |18       |29148 |Application|General                                                        |
-ROW   |19       |29149 |Application|General                                                        |
-ROW   |20       |29150 |Application|General                                                        |
-ROW   |21       |29151 |Application|General                                                        |
-ROW   |22       |29152 |Application|General                                                        |
-ROW   |23       |29153 |Application|General                                                        |
-ROW   |24       |29154 |Application|General                                                        |
-ROW   |25       |29155 |Application|General                                                        |
-ROW   |26       |29156 |Application|General                                                        |
-ROW   |27       |29158 |Application|Inventory                                                      |
-ROW   |28       |29159 |Application|Inventory                                                      |
-ROW   |29       |29160 |Application|Inventory                                                      |
-ROW   |30       |29140 |Application|Memory                                                         |
-ROW   |31       |29141 |Application|Memory                                                         |
-ROW   |32       |29142 |Application|Memory                                                         |
-ROW   |33       |29143 |Application|Memory                                                         |
-ROW   |34       |29144 |Application|Memory                                                         |
-ROW   |35       |29145 |Application|Memory                                                         |
-ROW   |36       |31365 |Application|Memory                                                         |
-ROW   |37       |10020 |Application|Monitoring agent                                               |
-ROW   |38       |10059 |Application|Monitoring agent                                               |
-ROW   |39       |23319 |Application|Monitoring agent                                               |
-ROW   |40       |29157 |Application|Security                                                       |
-ROW   |41       |29147 |Application|Status                                                         |
-ROW   |42       |29548 |Application|Status                                                         |
-ROW   |43       |31375 |Application|Zabbix raw items                                               |
-ROW   |44       |31387 |Application|Zabbix raw items                                               |
-ROW   |45       |31390 |Application|Zabbix raw items                                               |
-ROW   |46       |10061 |Application|Zabbix server                                                  |
-ROW   |47       |10062 |Application|Zabbix server                                                  |
-ROW   |48       |10063 |Application|Zabbix server                                                  |
-ROW   |49       |10064 |Application|Zabbix server                                                  |
-ROW   |50       |10065 |Application|Zabbix server                                                  |
-ROW   |51       |10066 |Application|Zabbix server                                                  |
-ROW   |52       |22183 |Application|Zabbix server                                                  |
-ROW   |53       |22185 |Application|Zabbix server                                                  |
-ROW   |54       |22187 |Application|Zabbix server                                                  |
-ROW   |55       |22189 |Application|Zabbix server                                                  |
-ROW   |56       |22191 |Application|Zabbix server                                                  |
-ROW   |57       |22196 |Application|Zabbix server                                                  |
-ROW   |58       |22199 |Application|Zabbix server                                                  |
-ROW   |59       |22219 |Application|Zabbix server                                                  |
-ROW   |60       |22396 |Application|Zabbix server                                                  |
-ROW   |61       |22399 |Application|Zabbix server                                                  |
-ROW   |62       |22400 |Application|Zabbix server                                                  |
-ROW   |63       |22401 |Application|Zabbix server                                                  |
-ROW   |64       |22402 |Application|Zabbix server                                                  |
-ROW   |65       |22404 |Application|Zabbix server                                                  |
-ROW   |66       |22406 |Application|Zabbix server                                                  |
-ROW   |67       |22408 |Application|Zabbix server                                                  |
-ROW   |68       |22412 |Application|Zabbix server                                                  |
-ROW   |69       |22414 |Application|Zabbix server                                                  |
-ROW   |70       |22416 |Application|Zabbix server                                                  |
-ROW   |71       |22418 |Application|Zabbix server                                                  |
-ROW   |72       |22420 |Application|Zabbix server                                                  |
-ROW   |73       |22422 |Application|Zabbix server                                                  |
-ROW   |74       |22424 |Application|Zabbix server                                                  |
-ROW   |75       |22426 |Application|Zabbix server                                                  |
-ROW   |76       |22430 |Application|Zabbix server                                                  |
-ROW   |77       |22689 |Application|Zabbix server                                                  |
-ROW   |78       |23171 |Application|Zabbix server                                                  |
-ROW   |79       |23251 |Application|Zabbix server                                                  |
-ROW   |80       |23634 |Application|Zabbix server                                                  |
-ROW   |81       |23661 |Application|Zabbix server                                                  |
-ROW   |82       |23663 |Application|Zabbix server                                                  |
-ROW   |83       |25366 |Application|Zabbix server                                                  |
-ROW   |84       |25370 |Application|Zabbix server                                                  |
-ROW   |85       |25665 |Application|Zabbix server                                                  |
-ROW   |86       |25666 |Application|Zabbix server                                                  |
-ROW   |87       |28248 |Application|Zabbix server                                                  |
-ROW   |88       |28533 |Application|Zabbix server                                                  |
-ROW   |89       |28535 |Application|Zabbix server                                                  |
-ROW   |90       |28537 |Application|Zabbix server                                                  |
-ROW   |91       |29822 |Application|Zabbix server                                                  |
-ROW   |92       |33020 |Application|Zabbix server                                                  |
-ROW   |93       |33021 |Application|Zabbix server                                                  |
-ROW   |94       |33022 |Application|Zabbix server                                                  |
-ROW   |95       |33023 |Application|Zabbix server                                                  |
-ROW   |96       |10067 |Application|Zabbix proxy                                                   |
-ROW   |97       |10068 |Application|Zabbix proxy                                                   |
-ROW   |98       |10069 |Application|Zabbix proxy                                                   |
-ROW   |99       |10070 |Application|Zabbix proxy                                                   |
-ROW   |100      |10071 |Application|Zabbix proxy                                                   |
-ROW   |101      |10072 |Application|Zabbix proxy                                                   |
-ROW   |102      |23340 |Application|Zabbix proxy                                                   |
-ROW   |103      |23341 |Application|Zabbix proxy                                                   |
-ROW   |104      |23342 |Application|Zabbix proxy                                                   |
-ROW   |105      |23343 |Application|Zabbix proxy                                                   |
-ROW   |106      |23344 |Application|Zabbix proxy                                                   |
-ROW   |107      |23345 |Application|Zabbix proxy                                                   |
-ROW   |108      |23346 |Application|Zabbix proxy                                                   |
-ROW   |109      |23347 |Application|Zabbix proxy                                                   |
-ROW   |110      |23348 |Application|Zabbix proxy                                                   |
-ROW   |111      |23349 |Application|Zabbix proxy                                                   |
-ROW   |112      |23350 |Application|Zabbix proxy                                                   |
-ROW   |113      |23351 |Application|Zabbix proxy                                                   |
-ROW   |114      |23352 |Application|Zabbix proxy                                                   |
-ROW   |115      |23353 |Application|Zabbix proxy                                                   |
-ROW   |116      |23354 |Application|Zabbix proxy                                                   |
-ROW   |117      |23355 |Application|Zabbix proxy                                                   |
-ROW   |118      |23356 |Application|Zabbix proxy                                                   |
-ROW   |119      |23357 |Application|Zabbix proxy                                                   |
-ROW   |120      |23358 |Application|Zabbix proxy                                                   |
-ROW   |121      |23359 |Application|Zabbix proxy                                                   |
-ROW   |122      |23360 |Application|Zabbix proxy                                                   |
-ROW   |123      |25368 |Application|Zabbix proxy                                                   |
-ROW   |124      |25369 |Application|Zabbix proxy                                                   |
-ROW   |125      |28250 |Application|Zabbix proxy                                                   |
-ROW   |126      |28251 |Application|Zabbix proxy                                                   |
-ROW   |127      |28617 |Application|Zabbix proxy                                                   |
-ROW   |128      |28618 |Application|Zabbix proxy                                                   |
-ROW   |129      |28619 |Application|Zabbix proxy                                                   |
-ROW   |130      |33018 |Application|Zabbix proxy                                                   |
-ROW   |131      |33019 |Application|Zabbix proxy                                                   |
-ROW   |132      |22231 |Application|Monitoring agent                                               |
-ROW   |133      |22232 |Application|Monitoring agent                                               |
-ROW   |134      |23318 |Application|Monitoring agent                                               |
-ROW   |135      |29544 |Application|Status                                                         |
-ROW   |136      |22840 |Application|CPU                                                            |
-ROW   |137      |22841 |Application|CPU                                                            |
-ROW   |138      |22842 |Application|CPU                                                            |
-ROW   |139      |22843 |Application|CPU                                                            |
-ROW   |140      |22844 |Application|CPU                                                            |
-ROW   |141      |22845 |Application|CPU                                                            |
-ROW   |142      |22846 |Application|CPU                                                            |
-ROW   |143      |22848 |Application|CPU                                                            |
-ROW   |144      |22851 |Application|CPU                                                            |
-ROW   |145      |22852 |Application|CPU                                                            |
-ROW   |146      |22868 |Application|Filesystems                                                    |
-ROW   |147      |22869 |Application|Filesystems                                                    |
-ROW   |148      |22870 |Application|Filesystems                                                    |
-ROW   |149      |22871 |Application|Filesystems                                                    |
-ROW   |150      |22872 |Application|Filesystems                                                    |
-ROW   |151      |22839 |Application|General                                                        |
-ROW   |152      |22853 |Application|General                                                        |
-ROW   |153      |22854 |Application|General                                                        |
-ROW   |154      |22858 |Application|General                                                        |
-ROW   |155      |22859 |Application|General                                                        |
-ROW   |156      |22855 |Application|Memory                                                         |
-ROW   |157      |22856 |Application|Memory                                                         |
-ROW   |158      |22857 |Application|Memory                                                         |
-ROW   |159      |22862 |Application|Memory                                                         |
-ROW   |160      |22863 |Application|Memory                                                         |
-ROW   |161      |22833 |Application|Monitoring agent                                               |
-ROW   |162      |22834 |Application|Monitoring agent                                               |
-ROW   |163      |23320 |Application|Monitoring agent                                               |
-ROW   |164      |23075 |Application|Network interfaces                                             |
-ROW   |165      |23076 |Application|Network interfaces                                             |
-ROW   |166      |22835 |Application|OS                                                             |
-ROW   |167      |22836 |Application|OS                                                             |
-ROW   |168      |22839 |Application|OS                                                             |
-ROW   |169      |22853 |Application|OS                                                             |
-ROW   |170      |22854 |Application|OS                                                             |
-ROW   |171      |22858 |Application|OS                                                             |
-ROW   |172      |22859 |Application|OS                                                             |
-ROW   |173      |22860 |Application|OS                                                             |
-ROW   |174      |22840 |Application|Performance                                                    |
-ROW   |175      |22841 |Application|Performance                                                    |
-ROW   |176      |22842 |Application|Performance                                                    |
-ROW   |177      |22843 |Application|Performance                                                    |
-ROW   |178      |22844 |Application|Performance                                                    |
-ROW   |179      |22845 |Application|Performance                                                    |
-ROW   |180      |22846 |Application|Performance                                                    |
-ROW   |181      |22848 |Application|Performance                                                    |
-ROW   |182      |22851 |Application|Performance                                                    |
-ROW   |183      |22852 |Application|Performance                                                    |
-ROW   |184      |22837 |Application|Processes                                                      |
-ROW   |185      |22838 |Application|Processes                                                      |
-ROW   |186      |22860 |Application|Security                                                       |
-ROW   |187      |22861 |Application|Security                                                       |
-ROW   |188      |29549 |Application|Status                                                         |
-ROW   |189      |22880 |Application|CPU                                                            |
-ROW   |190      |22881 |Application|CPU                                                            |
-ROW   |191      |22882 |Application|CPU                                                            |
-ROW   |192      |22883 |Application|CPU                                                            |
-ROW   |193      |22884 |Application|CPU                                                            |
-ROW   |194      |22885 |Application|CPU                                                            |
-ROW   |195      |22886 |Application|CPU                                                            |
-ROW   |196      |22888 |Application|CPU                                                            |
-ROW   |197      |22891 |Application|CPU                                                            |
-ROW   |198      |22892 |Application|CPU                                                            |
-ROW   |199      |22908 |Application|Filesystems                                                    |
-ROW   |200      |22909 |Application|Filesystems                                                    |
-ROW   |201      |22910 |Application|Filesystems                                                    |
-ROW   |202      |22911 |Application|Filesystems                                                    |
-ROW   |203      |22912 |Application|Filesystems                                                    |
-ROW   |204      |22879 |Application|General                                                        |
-ROW   |205      |22893 |Application|General                                                        |
-ROW   |206      |22894 |Application|General                                                        |
-ROW   |207      |22898 |Application|General                                                        |
-ROW   |208      |22899 |Application|General                                                        |
-ROW   |209      |22895 |Application|Memory                                                         |
-ROW   |210      |22896 |Application|Memory                                                         |
-ROW   |211      |22897 |Application|Memory                                                         |
-ROW   |212      |22902 |Application|Memory                                                         |
-ROW   |213      |22903 |Application|Memory                                                         |
-ROW   |214      |22873 |Application|Monitoring agent                                               |
-ROW   |215      |22874 |Application|Monitoring agent                                               |
-ROW   |216      |23321 |Application|Monitoring agent                                               |
-ROW   |217      |23073 |Application|Network interfaces                                             |
-ROW   |218      |23074 |Application|Network interfaces                                             |
-ROW   |219      |22875 |Application|OS                                                             |
-ROW   |220      |22876 |Application|OS                                                             |
-ROW   |221      |22879 |Application|OS                                                             |
-ROW   |222      |22893 |Application|OS                                                             |
-ROW   |223      |22894 |Application|OS                                                             |
-ROW   |224      |22898 |Application|OS                                                             |
-ROW   |225      |22899 |Application|OS                                                             |
-ROW   |226      |22900 |Application|OS                                                             |
-ROW   |227      |22880 |Application|Performance                                                    |
-ROW   |228      |22881 |Application|Performance                                                    |
-ROW   |229      |22882 |Application|Performance                                                    |
-ROW   |230      |22883 |Application|Performance                                                    |
-ROW   |231      |22884 |Application|Performance                                                    |
-ROW   |232      |22885 |Application|Performance                                                    |
-ROW   |233      |22886 |Application|Performance                                                    |
-ROW   |234      |22888 |Application|Performance                                                    |
-ROW   |235      |22891 |Application|Performance                                                    |
-ROW   |236      |22892 |Application|Performance                                                    |
-ROW   |237      |22877 |Application|Processes                                                      |
-ROW   |238      |22878 |Application|Processes                                                      |
-ROW   |239      |22900 |Application|Security                                                       |
-ROW   |240      |22901 |Application|Security                                                       |
-ROW   |241      |29550 |Application|Status                                                         |
-ROW   |242      |22920 |Application|CPU                                                            |
-ROW   |243      |22921 |Application|CPU                                                            |
-ROW   |244      |22922 |Application|CPU                                                            |
-ROW   |245      |22923 |Application|CPU                                                            |
-ROW   |246      |22924 |Application|CPU                                                            |
-ROW   |247      |23108 |Application|CPU                                                            |
-ROW   |248      |23109 |Application|CPU                                                            |
-ROW   |249      |23110 |Application|CPU                                                            |
-ROW   |250      |23111 |Application|CPU                                                            |
-ROW   |251      |23112 |Application|CPU                                                            |
-ROW   |252      |23113 |Application|CPU                                                            |
-ROW   |253      |23114 |Application|CPU                                                            |
-ROW   |254      |23115 |Application|CPU                                                            |
-ROW   |255      |23118 |Application|CPU                                                            |
-ROW   |256      |23119 |Application|CPU                                                            |
-ROW   |257      |23120 |Application|CPU                                                            |
-ROW   |258      |23121 |Application|CPU                                                            |
-ROW   |259      |23123 |Application|CPU                                                            |
-ROW   |260      |22948 |Application|Filesystems                                                    |
-ROW   |261      |22949 |Application|Filesystems                                                    |
-ROW   |262      |22950 |Application|Filesystems                                                    |
-ROW   |263      |22951 |Application|Filesystems                                                    |
-ROW   |264      |22952 |Application|Filesystems                                                    |
-ROW   |265      |23116 |Application|Filesystems                                                    |
-ROW   |266      |23117 |Application|Filesystems                                                    |
-ROW   |267      |22933 |Application|General                                                        |
-ROW   |268      |22934 |Application|General                                                        |
-ROW   |269      |22938 |Application|General                                                        |
-ROW   |270      |22939 |Application|General                                                        |
-ROW   |271      |23108 |Application|Logical partitions                                             |
-ROW   |272      |23109 |Application|Logical partitions                                             |
-ROW   |273      |23111 |Application|Logical partitions                                             |
-ROW   |274      |23112 |Application|Logical partitions                                             |
-ROW   |275      |23118 |Application|Logical partitions                                             |
-ROW   |276      |22942 |Application|Memory                                                         |
-ROW   |277      |22943 |Application|Memory                                                         |
-ROW   |278      |23122 |Application|Memory                                                         |
-ROW   |279      |23124 |Application|Memory                                                         |
-ROW   |280      |23125 |Application|Memory                                                         |
-ROW   |281      |23126 |Application|Memory                                                         |
-ROW   |282      |23127 |Application|Memory                                                         |
-ROW   |283      |23128 |Application|Memory                                                         |
-ROW   |284      |23129 |Application|Memory                                                         |
-ROW   |285      |23130 |Application|Memory                                                         |
-ROW   |286      |23131 |Application|Memory                                                         |
-ROW   |287      |22913 |Application|Monitoring agent                                               |
-ROW   |288      |22914 |Application|Monitoring agent                                               |
-ROW   |289      |23322 |Application|Monitoring agent                                               |
-ROW   |290      |22945 |Application|Network interfaces                                             |
-ROW   |291      |22946 |Application|Network interfaces                                             |
-ROW   |292      |22933 |Application|OS                                                             |
-ROW   |293      |22934 |Application|OS                                                             |
-ROW   |294      |22938 |Application|OS                                                             |
-ROW   |295      |22939 |Application|OS                                                             |
-ROW   |296      |22940 |Application|OS                                                             |
-ROW   |297      |22920 |Application|Performance                                                    |
-ROW   |298      |22921 |Application|Performance                                                    |
-ROW   |299      |22922 |Application|Performance                                                    |
-ROW   |300      |22923 |Application|Performance                                                    |
-ROW   |301      |22924 |Application|Performance                                                    |
-ROW   |302      |23108 |Application|Performance                                                    |
-ROW   |303      |23109 |Application|Performance                                                    |
-ROW   |304      |23110 |Application|Performance                                                    |
-ROW   |305      |23111 |Application|Performance                                                    |
-ROW   |306      |23112 |Application|Performance                                                    |
-ROW   |307      |23113 |Application|Performance                                                    |
-ROW   |308      |23114 |Application|Performance                                                    |
-ROW   |309      |23115 |Application|Performance                                                    |
-ROW   |310      |23116 |Application|Performance                                                    |
-ROW   |311      |23117 |Application|Performance                                                    |
-ROW   |312      |23119 |Application|Performance                                                    |
-ROW   |313      |23120 |Application|Performance                                                    |
-ROW   |314      |23121 |Application|Performance                                                    |
-ROW   |315      |23122 |Application|Performance                                                    |
-ROW   |316      |23123 |Application|Performance                                                    |
-ROW   |317      |22917 |Application|Processes                                                      |
-ROW   |318      |22918 |Application|Processes                                                      |
-ROW   |319      |22940 |Application|Security                                                       |
-ROW   |320      |22941 |Application|Security                                                       |
-ROW   |321      |29551 |Application|Status                                                         |
-ROW   |322      |22961 |Application|CPU                                                            |
-ROW   |323      |22962 |Application|CPU                                                            |
-ROW   |324      |22963 |Application|CPU                                                            |
-ROW   |325      |22965 |Application|CPU                                                            |
-ROW   |326      |22968 |Application|CPU                                                            |
-ROW   |327      |22971 |Application|CPU                                                            |
-ROW   |328      |22972 |Application|CPU                                                            |
-ROW   |329      |22988 |Application|Filesystems                                                    |
-ROW   |330      |22989 |Application|Filesystems                                                    |
-ROW   |331      |22990 |Application|Filesystems                                                    |
-ROW   |332      |22991 |Application|Filesystems                                                    |
-ROW   |333      |22992 |Application|Filesystems                                                    |
-ROW   |334      |22973 |Application|General                                                        |
-ROW   |335      |22974 |Application|General                                                        |
-ROW   |336      |22978 |Application|General                                                        |
-ROW   |337      |22982 |Application|Memory                                                         |
-ROW   |338      |22983 |Application|Memory                                                         |
-ROW   |339      |22953 |Application|Monitoring agent                                               |
-ROW   |340      |22954 |Application|Monitoring agent                                               |
-ROW   |341      |23323 |Application|Monitoring agent                                               |
-ROW   |342      |22985 |Application|Network interfaces                                             |
-ROW   |343      |22986 |Application|Network interfaces                                             |
-ROW   |344      |22973 |Application|OS                                                             |
-ROW   |345      |22974 |Application|OS                                                             |
-ROW   |346      |22978 |Application|OS                                                             |
-ROW   |347      |22980 |Application|OS                                                             |
-ROW   |348      |22961 |Application|Performance                                                    |
-ROW   |349      |22962 |Application|Performance                                                    |
-ROW   |350      |22963 |Application|Performance                                                    |
-ROW   |351      |22965 |Application|Performance                                                    |
-ROW   |352      |22968 |Application|Performance                                                    |
-ROW   |353      |22971 |Application|Performance                                                    |
-ROW   |354      |22972 |Application|Performance                                                    |
-ROW   |355      |22980 |Application|Security                                                       |
-ROW   |356      |22981 |Application|Security                                                       |
-ROW   |357      |29552 |Application|Status                                                         |
-ROW   |358      |23000 |Application|CPU                                                            |
-ROW   |359      |23001 |Application|CPU                                                            |
-ROW   |360      |23002 |Application|CPU                                                            |
-ROW   |361      |23003 |Application|CPU                                                            |
-ROW   |362      |23004 |Application|CPU                                                            |
-ROW   |363      |23005 |Application|CPU                                                            |
-ROW   |364      |23007 |Application|CPU                                                            |
-ROW   |365      |23011 |Application|CPU                                                            |
-ROW   |366      |23012 |Application|CPU                                                            |
-ROW   |367      |23028 |Application|Filesystems                                                    |
-ROW   |368      |23029 |Application|Filesystems                                                    |
-ROW   |369      |23030 |Application|Filesystems                                                    |
-ROW   |370      |23031 |Application|Filesystems                                                    |
-ROW   |371      |23032 |Application|Filesystems                                                    |
-ROW   |372      |22999 |Application|General                                                        |
-ROW   |373      |23013 |Application|General                                                        |
-ROW   |374      |23014 |Application|General                                                        |
-ROW   |375      |23018 |Application|General                                                        |
-ROW   |376      |23019 |Application|General                                                        |
-ROW   |377      |23015 |Application|Memory                                                         |
-ROW   |378      |23016 |Application|Memory                                                         |
-ROW   |379      |23017 |Application|Memory                                                         |
-ROW   |380      |23022 |Application|Memory                                                         |
-ROW   |381      |23023 |Application|Memory                                                         |
-ROW   |382      |22993 |Application|Monitoring agent                                               |
-ROW   |383      |22994 |Application|Monitoring agent                                               |
-ROW   |384      |23324 |Application|Monitoring agent                                               |
-ROW   |385      |23025 |Application|Network interfaces                                             |
-ROW   |386      |23026 |Application|Network interfaces                                             |
-ROW   |387      |22996 |Application|OS                                                             |
-ROW   |388      |22999 |Application|OS                                                             |
-ROW   |389      |23013 |Application|OS                                                             |
-ROW   |390      |23014 |Application|OS                                                             |
-ROW   |391      |23018 |Application|OS                                                             |
-ROW   |392      |23019 |Application|OS                                                             |
-ROW   |393      |23020 |Application|OS                                                             |
-ROW   |394      |23000 |Application|Performance                                                    |
-ROW   |395      |23001 |Application|Performance                                                    |
-ROW   |396      |23002 |Application|Performance                                                    |
-ROW   |397      |23003 |Application|Performance                                                    |
-ROW   |398      |23004 |Application|Performance                                                    |
-ROW   |399      |23005 |Application|Performance                                                    |
-ROW   |400      |23007 |Application|Performance                                                    |
-ROW   |401      |23011 |Application|Performance                                                    |
-ROW   |402      |23012 |Application|Performance                                                    |
-ROW   |403      |22997 |Application|Processes                                                      |
-ROW   |404      |22998 |Application|Processes                                                      |
-ROW   |405      |23020 |Application|Security                                                       |
-ROW   |406      |23021 |Application|Security                                                       |
-ROW   |407      |29553 |Application|Status                                                         |
-ROW   |408      |23041 |Application|CPU                                                            |
-ROW   |409      |23042 |Application|CPU                                                            |
-ROW   |410      |23043 |Application|CPU                                                            |
-ROW   |411      |23068 |Application|Filesystems                                                    |
-ROW   |412      |23069 |Application|Filesystems                                                    |
-ROW   |413      |23070 |Application|Filesystems                                                    |
-ROW   |414      |23071 |Application|Filesystems                                                    |
-ROW   |415      |23072 |Application|Filesystems                                                    |
-ROW   |416      |23039 |Application|General                                                        |
-ROW   |417      |23053 |Application|General                                                        |
-ROW   |418      |23054 |Application|General                                                        |
-ROW   |419      |23058 |Application|General                                                        |
-ROW   |420      |23059 |Application|General                                                        |
-ROW   |421      |23062 |Application|Memory                                                         |
-ROW   |422      |23063 |Application|Memory                                                         |
-ROW   |423      |23033 |Application|Monitoring agent                                               |
-ROW   |424      |23034 |Application|Monitoring agent                                               |
-ROW   |425      |23325 |Application|Monitoring agent                                               |
-ROW   |426      |23077 |Application|Network interfaces                                             |
-ROW   |427      |23078 |Application|Network interfaces                                             |
-ROW   |428      |23035 |Application|OS                                                             |
-ROW   |429      |23036 |Application|OS                                                             |
-ROW   |430      |23039 |Application|OS                                                             |
-ROW   |431      |23053 |Application|OS                                                             |
-ROW   |432      |23054 |Application|OS                                                             |
-ROW   |433      |23058 |Application|OS                                                             |
-ROW   |434      |23059 |Application|OS                                                             |
-ROW   |435      |23060 |Application|OS                                                             |
-ROW   |436      |23041 |Application|Performance                                                    |
-ROW   |437      |23042 |Application|Performance                                                    |
-ROW   |438      |23043 |Application|Performance                                                    |
-ROW   |439      |23060 |Application|Security                                                       |
-ROW   |440      |23061 |Application|Security                                                       |
-ROW   |441      |29554 |Application|Status                                                         |
-ROW   |442      |29480 |Application|CPU                                                            |
-ROW   |443      |29481 |Application|CPU                                                            |
-ROW   |444      |29482 |Application|CPU                                                            |
-ROW   |445      |29483 |Application|CPU                                                            |
-ROW   |446      |29484 |Application|CPU                                                            |
-ROW   |447      |29485 |Application|CPU                                                            |
-ROW   |448      |30138 |Application|CPU                                                            |
-ROW   |449      |31423 |Application|CPU                                                            |
-ROW   |450      |29499 |Application|General                                                        |
-ROW   |451      |29500 |Application|General                                                        |
-ROW   |452      |29501 |Application|General                                                        |
-ROW   |453      |29502 |Application|General                                                        |
-ROW   |454      |29503 |Application|General                                                        |
-ROW   |455      |29504 |Application|Inventory                                                      |
-ROW   |456      |29486 |Application|Memory                                                         |
-ROW   |457      |29487 |Application|Memory                                                         |
-ROW   |458      |29488 |Application|Memory                                                         |
-ROW   |459      |29489 |Application|Memory                                                         |
-ROW   |460      |29492 |Application|Memory                                                         |
-ROW   |461      |29493 |Application|Memory                                                         |
-ROW   |462      |29494 |Application|Memory                                                         |
-ROW   |463      |29495 |Application|Memory                                                         |
-ROW   |464      |29496 |Application|Memory                                                         |
-ROW   |465      |31424 |Application|Memory                                                         |
-ROW   |466      |31425 |Application|Memory                                                         |
-ROW   |467      |31428 |Application|Memory                                                         |
-ROW   |468      |23160 |Application|Monitoring agent                                               |
-ROW   |469      |23161 |Application|Monitoring agent                                               |
-ROW   |470      |23326 |Application|Monitoring agent                                               |
-ROW   |471      |30426 |Application|Services                                                       |
-ROW   |472      |29498 |Application|Status                                                         |
-ROW   |473      |29555 |Application|Status                                                         |
-ROW   |474      |31426 |Application|Zabbix raw items                                               |
-ROW   |475      |29161 |Application|CPU                                                            |
-ROW   |476      |29162 |Application|CPU                                                            |
-ROW   |477      |29163 |Application|CPU                                                            |
-ROW   |478      |29164 |Application|CPU                                                            |
-ROW   |479      |29165 |Application|CPU                                                            |
-ROW   |480      |29166 |Application|CPU                                                            |
-ROW   |481      |29167 |Application|CPU                                                            |
-ROW   |482      |29168 |Application|CPU                                                            |
-ROW   |483      |29169 |Application|CPU                                                            |
-ROW   |484      |29170 |Application|CPU                                                            |
-ROW   |485      |29171 |Application|CPU                                                            |
-ROW   |486      |29172 |Application|CPU                                                            |
-ROW   |487      |29173 |Application|CPU                                                            |
-ROW   |488      |29174 |Application|CPU                                                            |
-ROW   |489      |29175 |Application|CPU                                                            |
-ROW   |490      |29176 |Application|CPU                                                            |
-ROW   |491      |29200 |Application|CPU                                                            |
-ROW   |492      |29185 |Application|General                                                        |
-ROW   |493      |29186 |Application|General                                                        |
-ROW   |494      |29187 |Application|General                                                        |
-ROW   |495      |29188 |Application|General                                                        |
-ROW   |496      |29189 |Application|General                                                        |
-ROW   |497      |29190 |Application|General                                                        |
-ROW   |498      |29191 |Application|General                                                        |
-ROW   |499      |29192 |Application|General                                                        |
-ROW   |500      |29193 |Application|General                                                        |
-ROW   |501      |29195 |Application|Inventory                                                      |
-ROW   |502      |29196 |Application|Inventory                                                      |
-ROW   |503      |29197 |Application|Inventory                                                      |
-ROW   |504      |29177 |Application|Memory                                                         |
-ROW   |505      |29178 |Application|Memory                                                         |
-ROW   |506      |29179 |Application|Memory                                                         |
-ROW   |507      |29180 |Application|Memory                                                         |
-ROW   |508      |29181 |Application|Memory                                                         |
-ROW   |509      |29182 |Application|Memory                                                         |
-ROW   |510      |31366 |Application|Memory                                                         |
-ROW   |511      |23287 |Application|Monitoring agent                                               |
-ROW   |512      |23288 |Application|Monitoring agent                                               |
-ROW   |513      |23327 |Application|Monitoring agent                                               |
-ROW   |514      |29194 |Application|Security                                                       |
-ROW   |515      |29184 |Application|Status                                                         |
-ROW   |516      |29557 |Application|Status                                                         |
-ROW   |517      |31378 |Application|Zabbix raw items                                               |
-ROW   |518      |31393 |Application|Zabbix raw items                                               |
-ROW   |519      |31396 |Application|Zabbix raw items                                               |
-ROW   |520      |10073 |Application|Zabbix server                                                  |
-ROW   |521      |10074 |Application|Zabbix server                                                  |
-ROW   |522      |10075 |Application|Zabbix server                                                  |
-ROW   |523      |10076 |Application|Zabbix server                                                  |
-ROW   |524      |10077 |Application|Zabbix server                                                  |
-ROW   |525      |10078 |Application|Zabbix server                                                  |
-ROW   |526      |23252 |Application|Zabbix server                                                  |
-ROW   |527      |23253 |Application|Zabbix server                                                  |
-ROW   |528      |23255 |Application|Zabbix server                                                  |
-ROW   |529      |23256 |Application|Zabbix server                                                  |
-ROW   |530      |23257 |Application|Zabbix server                                                  |
-ROW   |531      |23258 |Application|Zabbix server                                                  |
-ROW   |532      |23259 |Application|Zabbix server                                                  |
-ROW   |533      |23260 |Application|Zabbix server                                                  |
-ROW   |534      |23261 |Application|Zabbix server                                                  |
-ROW   |535      |23262 |Application|Zabbix server                                                  |
-ROW   |536      |23264 |Application|Zabbix server                                                  |
-ROW   |537      |23265 |Application|Zabbix server                                                  |
-ROW   |538      |23266 |Application|Zabbix server                                                  |
-ROW   |539      |23267 |Application|Zabbix server                                                  |
-ROW   |540      |23268 |Application|Zabbix server                                                  |
-ROW   |541      |23269 |Application|Zabbix server                                                  |
-ROW   |542      |23270 |Application|Zabbix server                                                  |
-ROW   |543      |23271 |Application|Zabbix server                                                  |
-ROW   |544      |23272 |Application|Zabbix server                                                  |
-ROW   |545      |23273 |Application|Zabbix server                                                  |
-ROW   |546      |23274 |Application|Zabbix server                                                  |
-ROW   |547      |23275 |Application|Zabbix server                                                  |
-ROW   |548      |23276 |Application|Zabbix server                                                  |
-ROW   |549      |23277 |Application|Zabbix server                                                  |
-ROW   |550      |23328 |Application|Zabbix server                                                  |
-ROW   |551      |23620 |Application|Zabbix server                                                  |
-ROW   |552      |23625 |Application|Zabbix server                                                  |
-ROW   |553      |23628 |Application|Zabbix server                                                  |
-ROW   |554      |23635 |Application|Zabbix server                                                  |
-ROW   |555      |23662 |Application|Zabbix server                                                  |
-ROW   |556      |23664 |Application|Zabbix server                                                  |
-ROW   |557      |25367 |Application|Zabbix server                                                  |
-ROW   |558      |25371 |Application|Zabbix server                                                  |
-ROW   |559      |25667 |Application|Zabbix server                                                  |
-ROW   |560      |25668 |Application|Zabbix server                                                  |
-ROW   |561      |28249 |Application|Zabbix server                                                  |
-ROW   |562      |28534 |Application|Zabbix server                                                  |
-ROW   |563      |28536 |Application|Zabbix server                                                  |
-ROW   |564      |28538 |Application|Zabbix server                                                  |
-ROW   |565      |29823 |Application|Zabbix server                                                  |
-ROW   |566      |33024 |Application|Zabbix server                                                  |
-ROW   |567      |33025 |Application|Zabbix server                                                  |
-ROW   |568      |33026 |Application|Zabbix server                                                  |
-ROW   |569      |33027 |Application|Zabbix server                                                  |
-ROW   |570      |23644 |Application|FTP service                                                    |
-ROW   |571      |23645 |Application|HTTP service                                                   |
-ROW   |572      |23646 |Application|HTTPS service                                                  |
-ROW   |573      |23647 |Application|IMAP service                                                   |
-ROW   |574      |23648 |Application|LDAP service                                                   |
-ROW   |575      |23649 |Application|NNTP service                                                   |
-ROW   |576      |23650 |Application|NTP service                                                    |
-ROW   |577      |23651 |Application|POP service                                                    |
-ROW   |578      |23652 |Application|SMTP service                                                   |
-ROW   |579      |23653 |Application|SSH service                                                    |
-ROW   |580      |23654 |Application|Telnet service                                                 |
-ROW   |581      |31499 |Application|JMX                                                            |
-ROW   |582      |31500 |Application|JMX                                                            |
-ROW   |583      |31501 |Application|JMX                                                            |
-ROW   |584      |31502 |Application|JMX                                                            |
-ROW   |585      |31503 |Application|JMX                                                            |
-ROW   |586      |31504 |Application|JMX                                                            |
-ROW   |587      |31505 |Application|JMX                                                            |
-ROW   |588      |31506 |Application|JMX                                                            |
-ROW   |589      |31507 |Application|JMX                                                            |
-ROW   |590      |31508 |Application|JMX                                                            |
-ROW   |591      |31509 |Application|JMX                                                            |
-ROW   |592      |31510 |Application|JMX                                                            |
-ROW   |593      |31511 |Application|JMX                                                            |
-ROW   |594      |31512 |Application|JMX                                                            |
-ROW   |595      |31513 |Application|JMX                                                            |
-ROW   |596      |31514 |Application|JMX                                                            |
-ROW   |597      |31515 |Application|JMX                                                            |
-ROW   |598      |31516 |Application|JMX                                                            |
-ROW   |599      |31517 |Application|JMX                                                            |
-ROW   |600      |31518 |Application|JMX                                                            |
-ROW   |601      |31519 |Application|JMX                                                            |
-ROW   |602      |31520 |Application|JMX                                                            |
-ROW   |603      |31521 |Application|JMX                                                            |
-ROW   |604      |31522 |Application|JMX                                                            |
-ROW   |605      |31523 |Application|JMX                                                            |
-ROW   |606      |31524 |Application|JMX                                                            |
-ROW   |607      |31525 |Application|JMX                                                            |
-ROW   |608      |31526 |Application|JMX                                                            |
-ROW   |609      |31527 |Application|JMX                                                            |
-ROW   |610      |31528 |Application|JMX                                                            |
-ROW   |611      |31529 |Application|JMX                                                            |
-ROW   |612      |31530 |Application|JMX                                                            |
-ROW   |613      |31531 |Application|JMX                                                            |
-ROW   |614      |31532 |Application|JMX                                                            |
-ROW   |615      |31533 |Application|JMX                                                            |
-ROW   |616      |31534 |Application|JMX                                                            |
-ROW   |617      |31535 |Application|JMX                                                            |
-ROW   |618      |31536 |Application|JMX                                                            |
-ROW   |619      |31537 |Application|JMX                                                            |
-ROW   |620      |31538 |Application|JMX                                                            |
-ROW   |621      |31539 |Application|JMX                                                            |
-ROW   |622      |31540 |Application|JMX                                                            |
-ROW   |623      |31541 |Application|JMX                                                            |
-ROW   |624      |31542 |Application|JMX                                                            |
-ROW   |625      |31543 |Application|JMX                                                            |
-ROW   |626      |31544 |Application|JMX                                                            |
-ROW   |627      |31545 |Application|JMX                                                            |
-ROW   |628      |31546 |Application|JMX                                                            |
-ROW   |629      |31547 |Application|JMX                                                            |
-ROW   |630      |31548 |Application|JMX                                                            |
-ROW   |631      |31549 |Application|JMX                                                            |
-ROW   |632      |31550 |Application|JMX                                                            |
-ROW   |633      |31551 |Application|JMX                                                            |
-ROW   |634      |31552 |Application|JMX                                                            |
-ROW   |635      |31553 |Application|JMX                                                            |
-ROW   |636      |26927 |Application|Fans                                                           |
-ROW   |637      |26928 |Application|Temperature                                                    |
-ROW   |638      |26925 |Application|Voltage                                                        |
-ROW   |639      |26926 |Application|Voltage                                                        |
-ROW   |640      |26929 |Application|Voltage                                                        |
-ROW   |641      |26930 |Application|Voltage                                                        |
-ROW   |642      |26931 |Application|Voltage                                                        |
-ROW   |643      |26932 |Application|Voltage                                                        |
-ROW   |644      |26935 |Application|Fans                                                           |
-ROW   |645      |26936 |Application|Fans                                                           |
-ROW   |646      |26933 |Application|Temperature                                                    |
-ROW   |647      |26943 |Application|Temperature                                                    |
-ROW   |648      |26934 |Application|Voltage                                                        |
-ROW   |649      |26937 |Application|Voltage                                                        |
-ROW   |650      |26938 |Application|Voltage                                                        |
-ROW   |651      |26939 |Application|Voltage                                                        |
-ROW   |652      |26940 |Application|Voltage                                                        |
-ROW   |653      |26941 |Application|Voltage                                                        |
-ROW   |654      |26942 |Application|Voltage                                                        |
-ROW   |655      |31612 |Application|VMware                                                         |
-ROW   |656      |31613 |Application|VMware                                                         |
-ROW   |657      |31614 |Application|VMware                                                         |
-ROW   |658      |31663 |Application|VMware                                                         |
-ROW   |659      |31664 |Application|VMware                                                         |
-ROW   |660      |31665 |Application|VMware                                                         |
-ROW   |661      |31666 |Application|VMware                                                         |
-ROW   |662      |31667 |Application|VMware                                                         |
-ROW   |663      |32890 |Application|VMware                                                         |
-ROW   |664      |32891 |Application|VMware                                                         |
-ROW   |665      |32892 |Application|VMware                                                         |
-ROW   |666      |32893 |Application|VMware                                                         |
-ROW   |667      |32894 |Application|VMware                                                         |
-ROW   |668      |32895 |Application|VMware                                                         |
-ROW   |669      |32896 |Application|VMware                                                         |
-ROW   |670      |32897 |Application|VMware                                                         |
-ROW   |671      |32898 |Application|VMware                                                         |
-ROW   |672      |32899 |Application|VMware                                                         |
-ROW   |673      |32900 |Application|VMware                                                         |
-ROW   |674      |32901 |Application|VMware                                                         |
-ROW   |675      |32902 |Application|VMware                                                         |
-ROW   |676      |32903 |Application|VMware                                                         |
-ROW   |677      |32904 |Application|VMware                                                         |
-ROW   |678      |32905 |Application|VMware                                                         |
-ROW   |679      |32906 |Application|VMware                                                         |
-ROW   |680      |32907 |Application|VMware                                                         |
-ROW   |681      |32908 |Application|VMware                                                         |
-ROW   |682      |32935 |Application|VMware                                                         |
-ROW   |683      |32936 |Application|VMware                                                         |
-ROW   |684      |32937 |Application|VMware                                                         |
-ROW   |685      |32938 |Application|VMware                                                         |
-ROW   |686      |32939 |Application|VMware                                                         |
-ROW   |687      |32940 |Application|VMware                                                         |
-ROW   |688      |32941 |Application|VMware                                                         |
-ROW   |689      |32942 |Application|VMware                                                         |
-ROW   |690      |32943 |Application|VMware                                                         |
-ROW   |691      |32944 |Application|VMware                                                         |
-ROW   |692      |32945 |Application|VMware                                                         |
-ROW   |693      |32946 |Application|VMware                                                         |
-ROW   |694      |33638 |Application|VMware                                                         |
-ROW   |695      |33639 |Application|VMware                                                         |
-ROW   |696      |33640 |Application|VMware                                                         |
-ROW   |697      |33641 |Application|VMware                                                         |
-ROW   |698      |33642 |Application|VMware                                                         |
-ROW   |699      |33643 |Application|VMware                                                         |
-ROW   |700      |33644 |Application|VMware                                                         |
-ROW   |701      |33645 |Application|VMware                                                         |
-ROW   |702      |33650 |Application|VMware                                                         |
-ROW   |703      |33651 |Application|VMware                                                         |
-ROW   |704      |33652 |Application|VMware                                                         |
-ROW   |705      |33653 |Application|VMware                                                         |
-ROW   |706      |33654 |Application|VMware                                                         |
-ROW   |707      |32909 |Application|VMware                                                         |
-ROW   |708      |32910 |Application|VMware                                                         |
-ROW   |709      |32911 |Application|VMware                                                         |
-ROW   |710      |32912 |Application|VMware                                                         |
-ROW   |711      |32913 |Application|VMware                                                         |
-ROW   |712      |32914 |Application|VMware                                                         |
-ROW   |713      |32915 |Application|VMware                                                         |
-ROW   |714      |32916 |Application|VMware                                                         |
-ROW   |715      |32917 |Application|VMware                                                         |
-ROW   |716      |32918 |Application|VMware                                                         |
-ROW   |717      |32919 |Application|VMware                                                         |
-ROW   |718      |32920 |Application|VMware                                                         |
-ROW   |719      |32921 |Application|VMware                                                         |
-ROW   |720      |32922 |Application|VMware                                                         |
-ROW   |721      |32923 |Application|VMware                                                         |
-ROW   |722      |32924 |Application|VMware                                                         |
-ROW   |723      |32925 |Application|VMware                                                         |
-ROW   |724      |32926 |Application|VMware                                                         |
-ROW   |725      |32927 |Application|VMware                                                         |
-ROW   |726      |32928 |Application|VMware                                                         |
-ROW   |727      |32929 |Application|VMware                                                         |
-ROW   |728      |32930 |Application|VMware                                                         |
-ROW   |729      |32947 |Application|VMware                                                         |
-ROW   |730      |32948 |Application|VMware                                                         |
-ROW   |731      |32949 |Application|VMware                                                         |
-ROW   |732      |32950 |Application|VMware                                                         |
-ROW   |733      |33646 |Application|VMware                                                         |
-ROW   |734      |33647 |Application|VMware                                                         |
-ROW   |735      |33648 |Application|VMware                                                         |
-ROW   |736      |33649 |Application|VMware                                                         |
-ROW   |737      |33655 |Application|VMware                                                         |
-ROW   |738      |30143 |Application|CPU                                                            |
-ROW   |739      |30163 |Application|Memory                                                         |
-ROW   |740      |30164 |Application|Memory                                                         |
-ROW   |741      |30165 |Application|Memory                                                         |
-ROW   |742      |27065 |Application|Status                                                         |
-ROW   |743      |27066 |Application|Status                                                         |
-ROW   |744      |27067 |Application|Status                                                         |
-ROW   |745      |27152 |Application|General                                                        |
-ROW   |746      |27157 |Application|General                                                        |
-ROW   |747      |29845 |Application|General                                                        |
-ROW   |748      |29846 |Application|General                                                        |
-ROW   |749      |29847 |Application|General                                                        |
-ROW   |750      |29848 |Application|General                                                        |
-ROW   |751      |27149 |Application|Status                                                         |
-ROW   |752      |27150 |Application|Status                                                         |
-ROW   |753      |27151 |Application|Status                                                         |
-ROW   |754      |27154 |Application|Status                                                         |
-ROW   |755      |29844 |Application|Status                                                         |
-ROW   |756      |27208 |Application|CPU                                                            |
-ROW   |757      |27213 |Application|Fans                                                           |
-ROW   |758      |27195 |Application|General                                                        |
-ROW   |759      |27199 |Application|General                                                        |
-ROW   |760      |29850 |Application|General                                                        |
-ROW   |761      |29851 |Application|General                                                        |
-ROW   |762      |29852 |Application|General                                                        |
-ROW   |763      |29853 |Application|General                                                        |
-ROW   |764      |27203 |Application|Inventory                                                      |
-ROW   |765      |27214 |Application|Inventory                                                      |
-ROW   |766      |30086 |Application|Inventory                                                      |
-ROW   |767      |27207 |Application|Memory                                                         |
-ROW   |768      |30087 |Application|Memory                                                         |
-ROW   |769      |30088 |Application|Memory                                                         |
-ROW   |770      |30089 |Application|Memory                                                         |
-ROW   |771      |30091 |Application|Power supply                                                   |
-ROW   |772      |30092 |Application|Power supply                                                   |
-ROW   |773      |27192 |Application|Status                                                         |
-ROW   |774      |27193 |Application|Status                                                         |
-ROW   |775      |27194 |Application|Status                                                         |
-ROW   |776      |27202 |Application|Status                                                         |
-ROW   |777      |29849 |Application|Status                                                         |
-ROW   |778      |27212 |Application|Temperature                                                    |
-ROW   |779      |27240 |Application|CPU                                                            |
-ROW   |780      |27249 |Application|Fans                                                           |
-ROW   |781      |27250 |Application|Fans                                                           |
-ROW   |782      |27228 |Application|General                                                        |
-ROW   |783      |27232 |Application|General                                                        |
-ROW   |784      |29855 |Application|General                                                        |
-ROW   |785      |29856 |Application|General                                                        |
-ROW   |786      |29857 |Application|General                                                        |
-ROW   |787      |29858 |Application|General                                                        |
-ROW   |788      |27236 |Application|Inventory                                                      |
-ROW   |789      |27237 |Application|Inventory                                                      |
-ROW   |790      |30093 |Application|Memory                                                         |
-ROW   |791      |27248 |Application|Power supply                                                   |
-ROW   |792      |27225 |Application|Status                                                         |
-ROW   |793      |27226 |Application|Status                                                         |
-ROW   |794      |27227 |Application|Status                                                         |
-ROW   |795      |27235 |Application|Status                                                         |
-ROW   |796      |27238 |Application|Status                                                         |
-ROW   |797      |29854 |Application|Status                                                         |
-ROW   |798      |27246 |Application|Temperature                                                    |
-ROW   |799      |27247 |Application|Temperature                                                    |
-ROW   |800      |27294 |Application|CPU                                                            |
-ROW   |801      |30094 |Application|Memory                                                         |
-ROW   |802      |27299 |Application|CPU                                                            |
-ROW   |803      |27313 |Application|Fans                                                           |
-ROW   |804      |27264 |Application|General                                                        |
-ROW   |805      |27268 |Application|General                                                        |
-ROW   |806      |29860 |Application|General                                                        |
-ROW   |807      |29861 |Application|General                                                        |
-ROW   |808      |29862 |Application|General                                                        |
-ROW   |809      |29863 |Application|General                                                        |
-ROW   |810      |27295 |Application|Inventory                                                      |
-ROW   |811      |27296 |Application|Inventory                                                      |
-ROW   |812      |30095 |Application|Memory                                                         |
-ROW   |813      |27312 |Application|Power supply                                                   |
-ROW   |814      |27261 |Application|Status                                                         |
-ROW   |815      |27262 |Application|Status                                                         |
-ROW   |816      |27263 |Application|Status                                                         |
-ROW   |817      |27271 |Application|Status                                                         |
-ROW   |818      |29859 |Application|Status                                                         |
-ROW   |819      |27314 |Application|Temperature                                                    |
-ROW   |820      |27315 |Application|Temperature                                                    |
-ROW   |821      |27301 |Application|CPU                                                            |
-ROW   |822      |27317 |Application|Fans                                                           |
-ROW   |823      |27285 |Application|General                                                        |
-ROW   |824      |27289 |Application|General                                                        |
-ROW   |825      |29865 |Application|General                                                        |
-ROW   |826      |29866 |Application|General                                                        |
-ROW   |827      |29867 |Application|General                                                        |
-ROW   |828      |29868 |Application|General                                                        |
-ROW   |829      |27297 |Application|Inventory                                                      |
-ROW   |830      |27319 |Application|Inventory                                                      |
-ROW   |831      |27320 |Application|Inventory                                                      |
-ROW   |832      |30096 |Application|Memory                                                         |
-ROW   |833      |27316 |Application|Power supply                                                   |
-ROW   |834      |27282 |Application|Status                                                         |
-ROW   |835      |27283 |Application|Status                                                         |
-ROW   |836      |27284 |Application|Status                                                         |
-ROW   |837      |27292 |Application|Status                                                         |
-ROW   |838      |29864 |Application|Status                                                         |
-ROW   |839      |27318 |Application|Temperature                                                    |
-ROW   |840      |27415 |Application|Memory                                                         |
-ROW   |841      |27416 |Application|Memory                                                         |
-ROW   |842      |30101 |Application|Memory                                                         |
-ROW   |843      |27417 |Application|CPU                                                            |
-ROW   |844      |27376 |Application|CPU                                                            |
-ROW   |845      |27378 |Application|Inventory                                                      |
-ROW   |846      |27379 |Application|Inventory                                                      |
-ROW   |847      |27419 |Application|Inventory                                                      |
-ROW   |848      |30097 |Application|Inventory                                                      |
-ROW   |849      |27423 |Application|Fans                                                           |
-ROW   |850      |27422 |Application|Power supply                                                   |
-ROW   |851      |27420 |Application|Temperature                                                    |
-ROW   |852      |27421 |Application|Temperature                                                    |
-ROW   |853      |27427 |Application|CPU                                                            |
-ROW   |854      |27432 |Application|Fans                                                           |
-ROW   |855      |27336 |Application|General                                                        |
-ROW   |856      |27340 |Application|General                                                        |
-ROW   |857      |29870 |Application|General                                                        |
-ROW   |858      |29871 |Application|General                                                        |
-ROW   |859      |29872 |Application|General                                                        |
-ROW   |860      |29873 |Application|General                                                        |
-ROW   |861      |27385 |Application|Inventory                                                      |
-ROW   |862      |27386 |Application|Inventory                                                      |
-ROW   |863      |27428 |Application|Inventory                                                      |
-ROW   |864      |30098 |Application|Inventory                                                      |
-ROW   |865      |27425 |Application|Memory                                                         |
-ROW   |866      |27426 |Application|Memory                                                         |
-ROW   |867      |30102 |Application|Memory                                                         |
-ROW   |868      |27431 |Application|Power supply                                                   |
-ROW   |869      |27333 |Application|Status                                                         |
-ROW   |870      |27334 |Application|Status                                                         |
-ROW   |871      |27335 |Application|Status                                                         |
-ROW   |872      |27343 |Application|Status                                                         |
-ROW   |873      |29869 |Application|Status                                                         |
-ROW   |874      |27429 |Application|Temperature                                                    |
-ROW   |875      |27430 |Application|Temperature                                                    |
-ROW   |876      |27380 |Application|CPU                                                            |
-ROW   |877      |27449 |Application|Fans                                                           |
-ROW   |878      |27368 |Application|General                                                        |
-ROW   |879      |27372 |Application|General                                                        |
-ROW   |880      |29875 |Application|General                                                        |
-ROW   |881      |29876 |Application|General                                                        |
-ROW   |882      |29877 |Application|General                                                        |
-ROW   |883      |29878 |Application|General                                                        |
-ROW   |884      |27382 |Application|Inventory                                                      |
-ROW   |885      |27383 |Application|Inventory                                                      |
-ROW   |886      |27445 |Application|Inventory                                                      |
-ROW   |887      |30099 |Application|Inventory                                                      |
-ROW   |888      |27443 |Application|Memory                                                         |
-ROW   |889      |27444 |Application|Memory                                                         |
-ROW   |890      |30103 |Application|Memory                                                         |
-ROW   |891      |27448 |Application|Power supply                                                   |
-ROW   |892      |27365 |Application|Status                                                         |
-ROW   |893      |27366 |Application|Status                                                         |
-ROW   |894      |27367 |Application|Status                                                         |
-ROW   |895      |27375 |Application|Status                                                         |
-ROW   |896      |29874 |Application|Status                                                         |
-ROW   |897      |27446 |Application|Temperature                                                    |
-ROW   |898      |27447 |Application|Temperature                                                    |
-ROW   |899      |27478 |Application|CPU                                                            |
-ROW   |900      |27480 |Application|Fans                                                           |
-ROW   |901      |27465 |Application|General                                                        |
-ROW   |902      |27469 |Application|General                                                        |
-ROW   |903      |29880 |Application|General                                                        |
-ROW   |904      |29881 |Application|General                                                        |
-ROW   |905      |29882 |Application|General                                                        |
-ROW   |906      |29883 |Application|General                                                        |
-ROW   |907      |27481 |Application|Inventory                                                      |
-ROW   |908      |27482 |Application|Inventory                                                      |
-ROW   |909      |27483 |Application|Inventory                                                      |
-ROW   |910      |27484 |Application|Inventory                                                      |
-ROW   |911      |30105 |Application|Memory                                                         |
-ROW   |912      |27479 |Application|Power supply                                                   |
-ROW   |913      |27462 |Application|Status                                                         |
-ROW   |914      |27463 |Application|Status                                                         |
-ROW   |915      |27464 |Application|Status                                                         |
-ROW   |916      |27472 |Application|Status                                                         |
-ROW   |917      |29879 |Application|Status                                                         |
-ROW   |918      |27485 |Application|Temperature                                                    |
-ROW   |919      |27511 |Application|CPU                                                            |
-ROW   |920      |27519 |Application|Fans                                                           |
-ROW   |921      |27499 |Application|General                                                        |
-ROW   |922      |27503 |Application|General                                                        |
-ROW   |923      |29885 |Application|General                                                        |
-ROW   |924      |29886 |Application|General                                                        |
-ROW   |925      |29887 |Application|General                                                        |
-ROW   |926      |29888 |Application|General                                                        |
-ROW   |927      |27508 |Application|Inventory                                                      |
-ROW   |928      |27509 |Application|Inventory                                                      |
-ROW   |929      |27510 |Application|Inventory                                                      |
-ROW   |930      |30106 |Application|Inventory                                                      |
-ROW   |931      |30107 |Application|Memory                                                         |
-ROW   |932      |27518 |Application|Power supply                                                   |
-ROW   |933      |27496 |Application|Status                                                         |
-ROW   |934      |27497 |Application|Status                                                         |
-ROW   |935      |27498 |Application|Status                                                         |
-ROW   |936      |27506 |Application|Status                                                         |
-ROW   |937      |29884 |Application|Status                                                         |
-ROW   |938      |27517 |Application|Temperature                                                    |
-ROW   |939      |27547 |Application|CPU                                                            |
-ROW   |940      |27555 |Application|Fans                                                           |
-ROW   |941      |27535 |Application|General                                                        |
-ROW   |942      |27539 |Application|General                                                        |
-ROW   |943      |29890 |Application|General                                                        |
-ROW   |944      |29891 |Application|General                                                        |
-ROW   |945      |29892 |Application|General                                                        |
-ROW   |946      |29893 |Application|General                                                        |
-ROW   |947      |27543 |Application|Inventory                                                      |
-ROW   |948      |27544 |Application|Inventory                                                      |
-ROW   |949      |27545 |Application|Inventory                                                      |
-ROW   |950      |27546 |Application|Inventory                                                      |
-ROW   |951      |30108 |Application|Memory                                                         |
-ROW   |952      |27554 |Application|Power supply                                                   |
-ROW   |953      |27532 |Application|Status                                                         |
-ROW   |954      |27533 |Application|Status                                                         |
-ROW   |955      |27534 |Application|Status                                                         |
-ROW   |956      |27542 |Application|Status                                                         |
-ROW   |957      |29889 |Application|Status                                                         |
-ROW   |958      |27553 |Application|Temperature                                                    |
-ROW   |959      |27586 |Application|CPU                                                            |
-ROW   |960      |27594 |Application|Fans                                                           |
-ROW   |961      |27595 |Application|Fans                                                           |
-ROW   |962      |27571 |Application|General                                                        |
-ROW   |963      |27575 |Application|General                                                        |
-ROW   |964      |29895 |Application|General                                                        |
-ROW   |965      |29896 |Application|General                                                        |
-ROW   |966      |29897 |Application|General                                                        |
-ROW   |967      |29898 |Application|General                                                        |
-ROW   |968      |27579 |Application|Inventory                                                      |
-ROW   |969      |27580 |Application|Inventory                                                      |
-ROW   |970      |27582 |Application|Inventory                                                      |
-ROW   |971      |27583 |Application|Inventory                                                      |
-ROW   |972      |30109 |Application|Inventory                                                      |
-ROW   |973      |27591 |Application|Memory                                                         |
-ROW   |974      |30110 |Application|Memory                                                         |
-ROW   |975      |30111 |Application|Memory                                                         |
-ROW   |976      |27593 |Application|Power supply                                                   |
-ROW   |977      |27568 |Application|Status                                                         |
-ROW   |978      |27569 |Application|Status                                                         |
-ROW   |979      |27570 |Application|Status                                                         |
-ROW   |980      |27578 |Application|Status                                                         |
-ROW   |981      |29894 |Application|Status                                                         |
-ROW   |982      |27584 |Application|Temperature                                                    |
-ROW   |983      |27585 |Application|Temperature                                                    |
-ROW   |984      |27634 |Application|General                                                        |
-ROW   |985      |27638 |Application|General                                                        |
-ROW   |986      |29900 |Application|General                                                        |
-ROW   |987      |29901 |Application|General                                                        |
-ROW   |988      |29902 |Application|General                                                        |
-ROW   |989      |29903 |Application|General                                                        |
-ROW   |990      |27631 |Application|Status                                                         |
-ROW   |991      |27632 |Application|Status                                                         |
-ROW   |992      |27633 |Application|Status                                                         |
-ROW   |993      |27641 |Application|Status                                                         |
-ROW   |994      |29899 |Application|Status                                                         |
-ROW   |995      |27671 |Application|CPU                                                            |
-ROW   |996      |27673 |Application|Fans                                                           |
-ROW   |997      |27657 |Application|General                                                        |
-ROW   |998      |27661 |Application|General                                                        |
-ROW   |999      |29905 |Application|General                                                        |
-ROW   |1000     |29906 |Application|General                                                        |
-ROW   |1001     |29907 |Application|General                                                        |
-ROW   |1002     |29908 |Application|General                                                        |
-ROW   |1003     |27675 |Application|Inventory                                                      |
-ROW   |1004     |27676 |Application|Inventory                                                      |
-ROW   |1005     |27677 |Application|Inventory                                                      |
-ROW   |1006     |27678 |Application|Inventory                                                      |
-ROW   |1007     |27679 |Application|Inventory                                                      |
-ROW   |1008     |30112 |Application|Memory                                                         |
-ROW   |1009     |27674 |Application|Power supply                                                   |
-ROW   |1010     |27654 |Application|Status                                                         |
-ROW   |1011     |27655 |Application|Status                                                         |
-ROW   |1012     |27656 |Application|Status                                                         |
-ROW   |1013     |27664 |Application|Status                                                         |
-ROW   |1014     |29904 |Application|Status                                                         |
-ROW   |1015     |27672 |Application|Temperature                                                    |
-ROW   |1016     |27753 |Application|CPU                                                            |
-ROW   |1017     |27755 |Application|Fans                                                           |
-ROW   |1018     |27737 |Application|General                                                        |
-ROW   |1019     |27741 |Application|General                                                        |
-ROW   |1020     |29910 |Application|General                                                        |
-ROW   |1021     |29911 |Application|General                                                        |
-ROW   |1022     |29912 |Application|General                                                        |
-ROW   |1023     |29913 |Application|General                                                        |
-ROW   |1024     |27748 |Application|Inventory                                                      |
-ROW   |1025     |27749 |Application|Inventory                                                      |
-ROW   |1026     |27750 |Application|Inventory                                                      |
-ROW   |1027     |27754 |Application|Inventory                                                      |
-ROW   |1028     |30116 |Application|Memory                                                         |
-ROW   |1029     |27734 |Application|Status                                                         |
-ROW   |1030     |27735 |Application|Status                                                         |
-ROW   |1031     |27736 |Application|Status                                                         |
-ROW   |1032     |27744 |Application|Status                                                         |
-ROW   |1033     |29909 |Application|Status                                                         |
-ROW   |1034     |27751 |Application|Temperature                                                    |
-ROW   |1035     |27787 |Application|Fans                                                           |
-ROW   |1036     |27769 |Application|General                                                        |
-ROW   |1037     |27773 |Application|General                                                        |
-ROW   |1038     |29915 |Application|General                                                        |
-ROW   |1039     |29916 |Application|General                                                        |
-ROW   |1040     |29917 |Application|General                                                        |
-ROW   |1041     |29918 |Application|General                                                        |
-ROW   |1042     |27777 |Application|Inventory                                                      |
-ROW   |1043     |27778 |Application|Inventory                                                      |
-ROW   |1044     |27785 |Application|Inventory                                                      |
-ROW   |1045     |27786 |Application|Power supply                                                   |
-ROW   |1046     |27766 |Application|Status                                                         |
-ROW   |1047     |27767 |Application|Status                                                         |
-ROW   |1048     |27768 |Application|Status                                                         |
-ROW   |1049     |27776 |Application|Status                                                         |
-ROW   |1050     |29914 |Application|Status                                                         |
-ROW   |1051     |27783 |Application|Temperature                                                    |
-ROW   |1052     |27784 |Application|Temperature                                                    |
-ROW   |1053     |28894 |Application|CPU                                                            |
-ROW   |1054     |27822 |Application|Fans                                                           |
-ROW   |1055     |27803 |Application|General                                                        |
-ROW   |1056     |27807 |Application|General                                                        |
-ROW   |1057     |29920 |Application|General                                                        |
-ROW   |1058     |29921 |Application|General                                                        |
-ROW   |1059     |29922 |Application|General                                                        |
-ROW   |1060     |29923 |Application|General                                                        |
-ROW   |1061     |27812 |Application|Inventory                                                      |
-ROW   |1062     |27813 |Application|Inventory                                                      |
-ROW   |1063     |30117 |Application|Inventory                                                      |
-ROW   |1064     |30118 |Application|Memory                                                         |
-ROW   |1065     |27823 |Application|Power supply                                                   |
-ROW   |1066     |27800 |Application|Status                                                         |
-ROW   |1067     |27801 |Application|Status                                                         |
-ROW   |1068     |27802 |Application|Status                                                         |
-ROW   |1069     |27810 |Application|Status                                                         |
-ROW   |1070     |27814 |Application|Status                                                         |
-ROW   |1071     |29919 |Application|Status                                                         |
-ROW   |1072     |27821 |Application|Temperature                                                    |
-ROW   |1073     |27904 |Application|CPU                                                            |
-ROW   |1074     |27885 |Application|General                                                        |
-ROW   |1075     |27889 |Application|General                                                        |
-ROW   |1076     |29925 |Application|General                                                        |
-ROW   |1077     |29926 |Application|General                                                        |
-ROW   |1078     |29927 |Application|General                                                        |
-ROW   |1079     |29928 |Application|General                                                        |
-ROW   |1080     |27893 |Application|Inventory                                                      |
-ROW   |1081     |27894 |Application|Inventory                                                      |
-ROW   |1082     |27895 |Application|Inventory                                                      |
-ROW   |1083     |30119 |Application|Inventory                                                      |
-ROW   |1084     |27898 |Application|Memory                                                         |
-ROW   |1085     |27900 |Application|Memory                                                         |
-ROW   |1086     |30120 |Application|Memory                                                         |
-ROW   |1087     |27882 |Application|Status                                                         |
-ROW   |1088     |27883 |Application|Status                                                         |
-ROW   |1089     |27884 |Application|Status                                                         |
-ROW   |1090     |27892 |Application|Status                                                         |
-ROW   |1091     |29924 |Application|Status                                                         |
-ROW   |1092     |27906 |Application|Storage                                                        |
-ROW   |1093     |27907 |Application|Storage                                                        |
-ROW   |1094     |27908 |Application|Storage                                                        |
-ROW   |1095     |27905 |Application|Temperature                                                    |
-ROW   |1096     |31560 |Application|Temperature                                                    |
-ROW   |1097     |27936 |Application|CPU                                                            |
-ROW   |1098     |27942 |Application|Fans                                                           |
-ROW   |1099     |27922 |Application|General                                                        |
-ROW   |1100     |27926 |Application|General                                                        |
-ROW   |1101     |29930 |Application|General                                                        |
-ROW   |1102     |29931 |Application|General                                                        |
-ROW   |1103     |29932 |Application|General                                                        |
-ROW   |1104     |29933 |Application|General                                                        |
-ROW   |1105     |27930 |Application|Inventory                                                      |
-ROW   |1106     |27931 |Application|Inventory                                                      |
-ROW   |1107     |30121 |Application|Inventory                                                      |
-ROW   |1108     |27935 |Application|Memory                                                         |
-ROW   |1109     |30122 |Application|Memory                                                         |
-ROW   |1110     |30123 |Application|Memory                                                         |
-ROW   |1111     |27943 |Application|Power supply                                                   |
-ROW   |1112     |27919 |Application|Status                                                         |
-ROW   |1113     |27920 |Application|Status                                                         |
-ROW   |1114     |27921 |Application|Status                                                         |
-ROW   |1115     |27929 |Application|Status                                                         |
-ROW   |1116     |29929 |Application|Status                                                         |
-ROW   |1117     |27940 |Application|Temperature                                                    |
-ROW   |1118     |27941 |Application|Temperature                                                    |
-ROW   |1119     |27975 |Application|CPU                                                            |
-ROW   |1120     |30129 |Application|Fans                                                           |
-ROW   |1121     |27959 |Application|General                                                        |
-ROW   |1122     |27963 |Application|General                                                        |
-ROW   |1123     |29935 |Application|General                                                        |
-ROW   |1124     |29936 |Application|General                                                        |
-ROW   |1125     |29937 |Application|General                                                        |
-ROW   |1126     |29938 |Application|General                                                        |
-ROW   |1127     |27967 |Application|Inventory                                                      |
-ROW   |1128     |27968 |Application|Inventory                                                      |
-ROW   |1129     |27970 |Application|Inventory                                                      |
-ROW   |1130     |27971 |Application|Inventory                                                      |
-ROW   |1131     |30125 |Application|Inventory                                                      |
-ROW   |1132     |27972 |Application|Memory                                                         |
-ROW   |1133     |27973 |Application|Memory                                                         |
-ROW   |1134     |30126 |Application|Memory                                                         |
-ROW   |1135     |30130 |Application|Power supply                                                   |
-ROW   |1136     |27956 |Application|Status                                                         |
-ROW   |1137     |27957 |Application|Status                                                         |
-ROW   |1138     |27958 |Application|Status                                                         |
-ROW   |1139     |27966 |Application|Status                                                         |
-ROW   |1140     |29934 |Application|Status                                                         |
-ROW   |1141     |30124 |Application|Temperature                                                    |
-ROW   |1142     |28003 |Application|CPU                                                            |
-ROW   |1143     |27989 |Application|General                                                        |
-ROW   |1144     |27993 |Application|General                                                        |
-ROW   |1145     |29940 |Application|General                                                        |
-ROW   |1146     |29941 |Application|General                                                        |
-ROW   |1147     |29942 |Application|General                                                        |
-ROW   |1148     |29943 |Application|General                                                        |
-ROW   |1149     |27997 |Application|Inventory                                                      |
-ROW   |1150     |27998 |Application|Inventory                                                      |
-ROW   |1151     |27999 |Application|Inventory                                                      |
-ROW   |1152     |28000 |Application|Inventory                                                      |
-ROW   |1153     |30131 |Application|Memory                                                         |
-ROW   |1154     |27986 |Application|Status                                                         |
-ROW   |1155     |27987 |Application|Status                                                         |
-ROW   |1156     |27988 |Application|Status                                                         |
-ROW   |1157     |27996 |Application|Status                                                         |
-ROW   |1158     |29939 |Application|Status                                                         |
-ROW   |1159     |28031 |Application|CPU                                                            |
-ROW   |1160     |28018 |Application|General                                                        |
-ROW   |1161     |28022 |Application|General                                                        |
-ROW   |1162     |29835 |Application|General                                                        |
-ROW   |1163     |29836 |Application|General                                                        |
-ROW   |1164     |29837 |Application|General                                                        |
-ROW   |1165     |29838 |Application|General                                                        |
-ROW   |1166     |28026 |Application|Inventory                                                      |
-ROW   |1167     |28027 |Application|Inventory                                                      |
-ROW   |1168     |30132 |Application|Memory                                                         |
-ROW   |1169     |30133 |Application|Memory                                                         |
-ROW   |1170     |30134 |Application|Memory                                                         |
-ROW   |1171     |30135 |Application|Memory                                                         |
-ROW   |1172     |30136 |Application|Memory                                                         |
-ROW   |1173     |28015 |Application|Status                                                         |
-ROW   |1174     |28016 |Application|Status                                                         |
-ROW   |1175     |28017 |Application|Status                                                         |
-ROW   |1176     |28025 |Application|Status                                                         |
-ROW   |1177     |29834 |Application|Status                                                         |
-ROW   |1178     |29002 |Application|CPU                                                            |
-ROW   |1179     |29003 |Application|CPU                                                            |
-ROW   |1180     |29004 |Application|CPU                                                            |
-ROW   |1181     |29005 |Application|CPU                                                            |
-ROW   |1182     |29006 |Application|CPU                                                            |
-ROW   |1183     |29007 |Application|CPU                                                            |
-ROW   |1184     |29034 |Application|CPU                                                            |
-ROW   |1185     |29035 |Application|CPU                                                            |
-ROW   |1186     |29036 |Application|CPU                                                            |
-ROW   |1187     |29037 |Application|CPU                                                            |
-ROW   |1188     |29038 |Application|CPU                                                            |
-ROW   |1189     |29039 |Application|CPU                                                            |
-ROW   |1190     |29040 |Application|CPU                                                            |
-ROW   |1191     |29041 |Application|CPU                                                            |
-ROW   |1192     |29042 |Application|CPU                                                            |
-ROW   |1193     |29043 |Application|CPU                                                            |
-ROW   |1194     |29049 |Application|CPU                                                            |
-ROW   |1195     |28960 |Application|General                                                        |
-ROW   |1196     |28964 |Application|General                                                        |
-ROW   |1197     |29985 |Application|General                                                        |
-ROW   |1198     |29986 |Application|General                                                        |
-ROW   |1199     |29987 |Application|General                                                        |
-ROW   |1200     |29988 |Application|General                                                        |
-ROW   |1201     |28993 |Application|Memory                                                         |
-ROW   |1202     |28994 |Application|Memory                                                         |
-ROW   |1203     |28995 |Application|Memory                                                         |
-ROW   |1204     |28996 |Application|Memory                                                         |
-ROW   |1205     |28997 |Application|Memory                                                         |
-ROW   |1206     |28998 |Application|Memory                                                         |
-ROW   |1207     |28999 |Application|Memory                                                         |
-ROW   |1208     |29000 |Application|Memory                                                         |
-ROW   |1209     |29001 |Application|Memory                                                         |
-ROW   |1210     |28957 |Application|Status                                                         |
-ROW   |1211     |28958 |Application|Status                                                         |
-ROW   |1212     |28959 |Application|Status                                                         |
-ROW   |1213     |28967 |Application|Status                                                         |
-ROW   |1214     |29984 |Application|Status                                                         |
-ROW   |1215     |30145 |Application|CPU                                                            |
-ROW   |1216     |29053 |Application|General                                                        |
-ROW   |1217     |29057 |Application|General                                                        |
-ROW   |1218     |29990 |Application|General                                                        |
-ROW   |1219     |29991 |Application|General                                                        |
-ROW   |1220     |29992 |Application|General                                                        |
-ROW   |1221     |29993 |Application|General                                                        |
-ROW   |1222     |30175 |Application|Memory                                                         |
-ROW   |1223     |30176 |Application|Memory                                                         |
-ROW   |1224     |30177 |Application|Memory                                                         |
-ROW   |1225     |29050 |Application|Status                                                         |
-ROW   |1226     |29051 |Application|Status                                                         |
-ROW   |1227     |29052 |Application|Status                                                         |
-ROW   |1228     |29060 |Application|Status                                                         |
-ROW   |1229     |29989 |Application|Status                                                         |
-ROW   |1230     |28143 |Application|CPU                                                            |
-ROW   |1231     |28154 |Application|Fans                                                           |
-ROW   |1232     |28133 |Application|General                                                        |
-ROW   |1233     |28137 |Application|General                                                        |
-ROW   |1234     |29945 |Application|General                                                        |
-ROW   |1235     |29946 |Application|General                                                        |
-ROW   |1236     |29947 |Application|General                                                        |
-ROW   |1237     |29948 |Application|General                                                        |
-ROW   |1238     |28141 |Application|Inventory                                                      |
-ROW   |1239     |28142 |Application|Inventory                                                      |
-ROW   |1240     |28157 |Application|Inventory                                                      |
-ROW   |1241     |28158 |Application|Inventory                                                      |
-ROW   |1242     |28153 |Application|Memory                                                         |
-ROW   |1243     |30113 |Application|Memory                                                         |
-ROW   |1244     |30114 |Application|Memory                                                         |
-ROW   |1245     |30115 |Application|Memory                                                         |
-ROW   |1246     |28155 |Application|Power supply                                                   |
-ROW   |1247     |28130 |Application|Status                                                         |
-ROW   |1248     |28131 |Application|Status                                                         |
-ROW   |1249     |28132 |Application|Status                                                         |
-ROW   |1250     |28140 |Application|Status                                                         |
-ROW   |1251     |29944 |Application|Status                                                         |
-ROW   |1252     |28150 |Application|Temperature                                                    |
-ROW   |1253     |28156 |Application|Temperature                                                    |
-ROW   |1254     |34154 |Application|CPU                                                            |
-ROW   |1255     |28202 |Application|Fans                                                           |
-ROW   |1256     |28203 |Application|Fans                                                           |
-ROW   |1257     |34152 |Application|General                                                        |
-ROW   |1258     |34153 |Application|General                                                        |
-ROW   |1259     |34155 |Application|General                                                        |
-ROW   |1260     |34156 |Application|General                                                        |
-ROW   |1261     |34157 |Application|General                                                        |
-ROW   |1262     |34158 |Application|General                                                        |
-ROW   |1263     |28204 |Application|Inventory                                                      |
-ROW   |1264     |28205 |Application|Inventory                                                      |
-ROW   |1265     |34176 |Application|Memory                                                         |
-ROW   |1266     |34177 |Application|Memory                                                         |
-ROW   |1267     |34178 |Application|Memory                                                         |
-ROW   |1268     |28206 |Application|Power supply                                                   |
-ROW   |1269     |34149 |Application|Status                                                         |
-ROW   |1270     |34150 |Application|Status                                                         |
-ROW   |1271     |34151 |Application|Status                                                         |
-ROW   |1272     |34159 |Application|Status                                                         |
-ROW   |1273     |34160 |Application|Status                                                         |
-ROW   |1274     |28200 |Application|Temperature                                                    |
-ROW   |1275     |28201 |Application|Temperature                                                    |
-ROW   |1276     |28246 |Application|CPU                                                            |
-ROW   |1277     |28247 |Application|CPU                                                            |
-ROW   |1278     |28215 |Application|Fans                                                           |
-ROW   |1279     |28236 |Application|General                                                        |
-ROW   |1280     |28240 |Application|General                                                        |
-ROW   |1281     |29955 |Application|General                                                        |
-ROW   |1282     |29956 |Application|General                                                        |
-ROW   |1283     |29957 |Application|General                                                        |
-ROW   |1284     |29958 |Application|General                                                        |
-ROW   |1285     |28208 |Application|Inventory                                                      |
-ROW   |1286     |28209 |Application|Inventory                                                      |
-ROW   |1287     |28210 |Application|Inventory                                                      |
-ROW   |1288     |30100 |Application|Inventory                                                      |
-ROW   |1289     |28220 |Application|Memory                                                         |
-ROW   |1290     |28222 |Application|Memory                                                         |
-ROW   |1291     |30104 |Application|Memory                                                         |
-ROW   |1292     |28216 |Application|Power supply                                                   |
-ROW   |1293     |28233 |Application|Status                                                         |
-ROW   |1294     |28234 |Application|Status                                                         |
-ROW   |1295     |28235 |Application|Status                                                         |
-ROW   |1296     |28243 |Application|Status                                                         |
-ROW   |1297     |29954 |Application|Status                                                         |
-ROW   |1298     |28217 |Application|Temperature                                                    |
-ROW   |1299     |28218 |Application|Temperature                                                    |
-ROW   |1300     |30146 |Application|CPU                                                            |
-ROW   |1301     |28325 |Application|Fans                                                           |
-ROW   |1302     |28326 |Application|Fans                                                           |
-ROW   |1303     |28285 |Application|General                                                        |
-ROW   |1304     |28289 |Application|General                                                        |
-ROW   |1305     |29960 |Application|General                                                        |
-ROW   |1306     |29961 |Application|General                                                        |
-ROW   |1307     |29962 |Application|General                                                        |
-ROW   |1308     |29963 |Application|General                                                        |
-ROW   |1309     |28327 |Application|Inventory                                                      |
-ROW   |1310     |28328 |Application|Inventory                                                      |
-ROW   |1311     |30181 |Application|Memory                                                         |
-ROW   |1312     |30182 |Application|Memory                                                         |
-ROW   |1313     |30183 |Application|Memory                                                         |
-ROW   |1314     |28329 |Application|Power supply                                                   |
-ROW   |1315     |28282 |Application|Status                                                         |
-ROW   |1316     |28283 |Application|Status                                                         |
-ROW   |1317     |28284 |Application|Status                                                         |
-ROW   |1318     |28292 |Application|Status                                                         |
-ROW   |1319     |29959 |Application|Status                                                         |
-ROW   |1320     |28323 |Application|Temperature                                                    |
-ROW   |1321     |28324 |Application|Temperature                                                    |
-ROW   |1322     |33183 |Application|Voltage                                                        |
-ROW   |1323     |33181 |Application|Zabbix raw items                                               |
-ROW   |1324     |28374 |Application|Disk arrays                                                    |
-ROW   |1325     |28375 |Application|Disk arrays                                                    |
-ROW   |1326     |28376 |Application|Disk arrays                                                    |
-ROW   |1327     |28359 |Application|Fans                                                           |
-ROW   |1328     |28360 |Application|Fans                                                           |
-ROW   |1329     |28333 |Application|General                                                        |
-ROW   |1330     |28337 |Application|General                                                        |
-ROW   |1331     |29965 |Application|General                                                        |
-ROW   |1332     |29966 |Application|General                                                        |
-ROW   |1333     |29967 |Application|General                                                        |
-ROW   |1334     |29968 |Application|General                                                        |
-ROW   |1335     |28342 |Application|Inventory                                                      |
-ROW   |1336     |28344 |Application|Inventory                                                      |
-ROW   |1337     |28345 |Application|Inventory                                                      |
-ROW   |1338     |30141 |Application|Inventory                                                      |
-ROW   |1339     |28361 |Application|Physical disks                                                 |
-ROW   |1340     |28362 |Application|Physical disks                                                 |
-ROW   |1341     |28363 |Application|Physical disks                                                 |
-ROW   |1342     |28364 |Application|Physical disks                                                 |
-ROW   |1343     |28365 |Application|Physical disks                                                 |
-ROW   |1344     |28366 |Application|Physical disks                                                 |
-ROW   |1345     |28367 |Application|Physical disks                                                 |
-ROW   |1346     |28358 |Application|Power supply                                                   |
-ROW   |1347     |28330 |Application|Status                                                         |
-ROW   |1348     |28331 |Application|Status                                                         |
-ROW   |1349     |28332 |Application|Status                                                         |
-ROW   |1350     |28340 |Application|Status                                                         |
-ROW   |1351     |28341 |Application|Status                                                         |
-ROW   |1352     |29964 |Application|Status                                                         |
-ROW   |1353     |28354 |Application|Temperature                                                    |
-ROW   |1354     |28355 |Application|Temperature                                                    |
-ROW   |1355     |28356 |Application|Temperature                                                    |
-ROW   |1356     |28357 |Application|Temperature                                                    |
-ROW   |1357     |28368 |Application|Virtual disks                                                  |
-ROW   |1358     |28369 |Application|Virtual disks                                                  |
-ROW   |1359     |28370 |Application|Virtual disks                                                  |
-ROW   |1360     |28371 |Application|Virtual disks                                                  |
-ROW   |1361     |28372 |Application|Virtual disks                                                  |
-ROW   |1362     |28373 |Application|Virtual disks                                                  |
-ROW   |1363     |28413 |Application|Disk arrays                                                    |
-ROW   |1364     |28414 |Application|Disk arrays                                                    |
-ROW   |1365     |28415 |Application|Disk arrays                                                    |
-ROW   |1366     |28416 |Application|Disk arrays                                                    |
-ROW   |1367     |28412 |Application|Fans                                                           |
-ROW   |1368     |28380 |Application|General                                                        |
-ROW   |1369     |28384 |Application|General                                                        |
-ROW   |1370     |29970 |Application|General                                                        |
-ROW   |1371     |29971 |Application|General                                                        |
-ROW   |1372     |29972 |Application|General                                                        |
-ROW   |1373     |29973 |Application|General                                                        |
-ROW   |1374     |28390 |Application|Inventory                                                      |
-ROW   |1375     |28391 |Application|Inventory                                                      |
-ROW   |1376     |28417 |Application|Physical disks                                                 |
-ROW   |1377     |28418 |Application|Physical disks                                                 |
-ROW   |1378     |28419 |Application|Physical disks                                                 |
-ROW   |1379     |28420 |Application|Physical disks                                                 |
-ROW   |1380     |28421 |Application|Physical disks                                                 |
-ROW   |1381     |28422 |Application|Physical disks                                                 |
-ROW   |1382     |28411 |Application|Power supply                                                   |
-ROW   |1383     |28377 |Application|Status                                                         |
-ROW   |1384     |28378 |Application|Status                                                         |
-ROW   |1385     |28379 |Application|Status                                                         |
-ROW   |1386     |28387 |Application|Status                                                         |
-ROW   |1387     |29969 |Application|Status                                                         |
-ROW   |1388     |29994 |Application|Status                                                         |
-ROW   |1389     |28388 |Application|Temperature                                                    |
-ROW   |1390     |28404 |Application|Temperature                                                    |
-ROW   |1391     |28405 |Application|Temperature                                                    |
-ROW   |1392     |28406 |Application|Temperature                                                    |
-ROW   |1393     |28407 |Application|Temperature                                                    |
-ROW   |1394     |28408 |Application|Temperature                                                    |
-ROW   |1395     |28409 |Application|Temperature                                                    |
-ROW   |1396     |33621 |Application|Temperature                                                    |
-ROW   |1397     |33622 |Application|Temperature                                                    |
-ROW   |1398     |33623 |Application|Temperature                                                    |
-ROW   |1399     |33624 |Application|Temperature                                                    |
-ROW   |1400     |33625 |Application|Temperature                                                    |
-ROW   |1401     |33626 |Application|Temperature                                                    |
-ROW   |1402     |33627 |Application|Temperature                                                    |
-ROW   |1403     |33628 |Application|Temperature                                                    |
-ROW   |1404     |33629 |Application|Temperature                                                    |
-ROW   |1405     |28423 |Application|Virtual disks                                                  |
-ROW   |1406     |28424 |Application|Virtual disks                                                  |
-ROW   |1407     |28425 |Application|Virtual disks                                                  |
-ROW   |1408     |28478 |Application|Fans                                                           |
-ROW   |1409     |28479 |Application|Fans                                                           |
-ROW   |1410     |28457 |Application|General                                                        |
-ROW   |1411     |28461 |Application|General                                                        |
-ROW   |1412     |29975 |Application|General                                                        |
-ROW   |1413     |29976 |Application|General                                                        |
-ROW   |1414     |29977 |Application|General                                                        |
-ROW   |1415     |29978 |Application|General                                                        |
-ROW   |1416     |28466 |Application|Inventory                                                      |
-ROW   |1417     |28467 |Application|Inventory                                                      |
-ROW   |1418     |28480 |Application|Physical disks                                                 |
-ROW   |1419     |28481 |Application|Physical disks                                                 |
-ROW   |1420     |28477 |Application|Power supply                                                   |
-ROW   |1421     |28454 |Application|Status                                                         |
-ROW   |1422     |28455 |Application|Status                                                         |
-ROW   |1423     |28456 |Application|Status                                                         |
-ROW   |1424     |28464 |Application|Status                                                         |
-ROW   |1425     |28465 |Application|Status                                                         |
-ROW   |1426     |29974 |Application|Status                                                         |
-ROW   |1427     |28474 |Application|Temperature                                                    |
-ROW   |1428     |28475 |Application|Temperature                                                    |
-ROW   |1429     |28476 |Application|Temperature                                                    |
-ROW   |1430     |28496 |Application|Fans                                                           |
-ROW   |1431     |28485 |Application|General                                                        |
-ROW   |1432     |28489 |Application|General                                                        |
-ROW   |1433     |29980 |Application|General                                                        |
-ROW   |1434     |29981 |Application|General                                                        |
-ROW   |1435     |29982 |Application|General                                                        |
-ROW   |1436     |29983 |Application|General                                                        |
-ROW   |1437     |28482 |Application|Status                                                         |
-ROW   |1438     |28483 |Application|Status                                                         |
-ROW   |1439     |28484 |Application|Status                                                         |
-ROW   |1440     |28492 |Application|Status                                                         |
-ROW   |1441     |29979 |Application|Status                                                         |
-ROW   |1442     |28495 |Application|Temperature                                                    |
-ROW   |1443     |28511 |Application|Tomcat                                                         |
-ROW   |1445     |28540 |Application|Zabbix server                                                  |
-ROW   |1446     |28541 |Application|Zabbix server                                                  |
-ROW   |1447     |28542 |Application|Zabbix server                                                  |
-ROW   |1448     |28543 |Application|Zabbix server                                                  |
-ROW   |1449     |28544 |Application|Zabbix server                                                  |
-ROW   |1450     |28545 |Application|Zabbix server                                                  |
-ROW   |1451     |28546 |Application|Zabbix server                                                  |
-ROW   |1452     |28547 |Application|Zabbix server                                                  |
-ROW   |1453     |28548 |Application|Zabbix server                                                  |
-ROW   |1454     |28549 |Application|Zabbix server                                                  |
-ROW   |1455     |28550 |Application|Zabbix server                                                  |
-ROW   |1456     |28551 |Application|Zabbix server                                                  |
-ROW   |1457     |28552 |Application|Zabbix server                                                  |
-ROW   |1458     |28553 |Application|Zabbix server                                                  |
-ROW   |1459     |28554 |Application|Zabbix server                                                  |
-ROW   |1460     |28555 |Application|Zabbix server                                                  |
-ROW   |1461     |28556 |Application|Zabbix server                                                  |
-ROW   |1462     |28557 |Application|Zabbix server                                                  |
-ROW   |1463     |28558 |Application|Zabbix server                                                  |
-ROW   |1464     |28559 |Application|Zabbix server                                                  |
-ROW   |1465     |28560 |Application|Zabbix server                                                  |
-ROW   |1466     |28561 |Application|Zabbix server                                                  |
-ROW   |1467     |28562 |Application|Zabbix server                                                  |
-ROW   |1468     |28563 |Application|Zabbix server                                                  |
-ROW   |1469     |28564 |Application|Zabbix server                                                  |
-ROW   |1470     |28565 |Application|Zabbix server                                                  |
-ROW   |1471     |28566 |Application|Zabbix server                                                  |
-ROW   |1472     |28567 |Application|Zabbix server                                                  |
-ROW   |1473     |28568 |Application|Zabbix server                                                  |
-ROW   |1474     |28569 |Application|Zabbix server                                                  |
-ROW   |1475     |28570 |Application|Zabbix server                                                  |
-ROW   |1476     |28571 |Application|Zabbix server                                                  |
-ROW   |1477     |28572 |Application|Zabbix server                                                  |
-ROW   |1478     |28573 |Application|Zabbix server                                                  |
-ROW   |1479     |28574 |Application|Zabbix server                                                  |
-ROW   |1480     |28575 |Application|Zabbix server                                                  |
-ROW   |1481     |28576 |Application|Zabbix server                                                  |
-ROW   |1482     |28577 |Application|Zabbix server                                                  |
-ROW   |1483     |28578 |Application|Zabbix server                                                  |
-ROW   |1484     |28579 |Application|Zabbix server                                                  |
-ROW   |1485     |28580 |Application|Zabbix server                                                  |
-ROW   |1486     |28581 |Application|Zabbix server                                                  |
-ROW   |1487     |28582 |Application|Zabbix server                                                  |
-ROW   |1488     |28583 |Application|Zabbix server                                                  |
-ROW   |1489     |28584 |Application|Zabbix server                                                  |
-ROW   |1490     |29821 |Application|Zabbix server                                                  |
-ROW   |1491     |31053 |Application|Zabbix server                                                  |
-ROW   |1492     |33014 |Application|Zabbix server                                                  |
-ROW   |1493     |33015 |Application|Zabbix server                                                  |
-ROW   |1494     |33016 |Application|Zabbix server                                                  |
-ROW   |1495     |33017 |Application|Zabbix server                                                  |
-ROW   |1496     |28585 |Application|Zabbix proxy                                                   |
-ROW   |1497     |28586 |Application|Zabbix proxy                                                   |
-ROW   |1498     |28587 |Application|Zabbix proxy                                                   |
-ROW   |1499     |28588 |Application|Zabbix proxy                                                   |
-ROW   |1500     |28589 |Application|Zabbix proxy                                                   |
-ROW   |1501     |28590 |Application|Zabbix proxy                                                   |
-ROW   |1502     |28591 |Application|Zabbix proxy                                                   |
-ROW   |1503     |28592 |Application|Zabbix proxy                                                   |
-ROW   |1504     |28593 |Application|Zabbix proxy                                                   |
-ROW   |1505     |28594 |Application|Zabbix proxy                                                   |
-ROW   |1506     |28595 |Application|Zabbix proxy                                                   |
-ROW   |1507     |28596 |Application|Zabbix proxy                                                   |
-ROW   |1508     |28597 |Application|Zabbix proxy                                                   |
-ROW   |1509     |28598 |Application|Zabbix proxy                                                   |
-ROW   |1510     |28599 |Application|Zabbix proxy                                                   |
-ROW   |1511     |28600 |Application|Zabbix proxy                                                   |
-ROW   |1512     |28601 |Application|Zabbix proxy                                                   |
-ROW   |1513     |28602 |Application|Zabbix proxy                                                   |
-ROW   |1514     |28603 |Application|Zabbix proxy                                                   |
-ROW   |1515     |28604 |Application|Zabbix proxy                                                   |
-ROW   |1516     |28605 |Application|Zabbix proxy                                                   |
-ROW   |1517     |28606 |Application|Zabbix proxy                                                   |
-ROW   |1518     |28607 |Application|Zabbix proxy                                                   |
-ROW   |1519     |28608 |Application|Zabbix proxy                                                   |
-ROW   |1520     |28609 |Application|Zabbix proxy                                                   |
-ROW   |1521     |28610 |Application|Zabbix proxy                                                   |
-ROW   |1522     |28611 |Application|Zabbix proxy                                                   |
-ROW   |1523     |28612 |Application|Zabbix proxy                                                   |
-ROW   |1524     |28613 |Application|Zabbix proxy                                                   |
-ROW   |1525     |28614 |Application|Zabbix proxy                                                   |
-ROW   |1526     |28615 |Application|Zabbix proxy                                                   |
-ROW   |1527     |28616 |Application|Zabbix proxy                                                   |
-ROW   |1528     |31052 |Application|Zabbix proxy                                                   |
-ROW   |1529     |33012 |Application|Zabbix proxy                                                   |
-ROW   |1530     |33013 |Application|Zabbix proxy                                                   |
-ROW   |1531     |28743 |Application|Apache                                                         |
-ROW   |1532     |28744 |Application|Apache                                                         |
-ROW   |1533     |28745 |Application|Apache                                                         |
-ROW   |1534     |28746 |Application|Apache                                                         |
-ROW   |1535     |28747 |Application|Apache                                                         |
-ROW   |1536     |28748 |Application|Apache                                                         |
-ROW   |1537     |30897 |Application|Apache                                                         |
-ROW   |1538     |30898 |Application|Apache                                                         |
-ROW   |1539     |30899 |Application|Apache                                                         |
-ROW   |1540     |30900 |Application|Apache                                                         |
-ROW   |1541     |30901 |Application|Apache                                                         |
-ROW   |1542     |30902 |Application|Apache                                                         |
-ROW   |1543     |30903 |Application|Apache                                                         |
-ROW   |1544     |30904 |Application|Apache                                                         |
-ROW   |1545     |30905 |Application|Apache                                                         |
-ROW   |1546     |30906 |Application|Apache                                                         |
-ROW   |1547     |30907 |Application|Apache                                                         |
-ROW   |1548     |30908 |Application|Apache                                                         |
-ROW   |1549     |30909 |Application|Apache                                                         |
-ROW   |1550     |30910 |Application|Apache                                                         |
-ROW   |1551     |30911 |Application|Apache                                                         |
-ROW   |1552     |30912 |Application|Apache                                                         |
-ROW   |1553     |30913 |Application|Apache                                                         |
-ROW   |1554     |30914 |Application|Apache                                                         |
-ROW   |1555     |30915 |Application|Apache                                                         |
-ROW   |1556     |30917 |Application|Apache                                                         |
-ROW   |1557     |30918 |Application|Apache                                                         |
-ROW   |1558     |30919 |Application|Apache                                                         |
-ROW   |1559     |30920 |Application|Apache                                                         |
-ROW   |1560     |30921 |Application|Apache                                                         |
-ROW   |1561     |30922 |Application|Apache                                                         |
-ROW   |1562     |30896 |Application|Zabbix raw items                                               |
-ROW   |1563     |28776 |Application|Apache                                                         |
-ROW   |1564     |28777 |Application|Apache                                                         |
-ROW   |1565     |28778 |Application|Apache                                                         |
-ROW   |1566     |28779 |Application|Apache                                                         |
-ROW   |1567     |28780 |Application|Apache                                                         |
-ROW   |1568     |28781 |Application|Apache                                                         |
-ROW   |1569     |28782 |Application|Apache                                                         |
-ROW   |1570     |28783 |Application|Apache                                                         |
-ROW   |1571     |28784 |Application|Apache                                                         |
-ROW   |1572     |28785 |Application|Apache                                                         |
-ROW   |1573     |28786 |Application|Apache                                                         |
-ROW   |1574     |28787 |Application|Apache                                                         |
-ROW   |1575     |28788 |Application|Apache                                                         |
-ROW   |1576     |28789 |Application|Apache                                                         |
-ROW   |1577     |28790 |Application|Apache                                                         |
-ROW   |1578     |28791 |Application|Apache                                                         |
-ROW   |1579     |28792 |Application|Apache                                                         |
-ROW   |1580     |28793 |Application|Apache                                                         |
-ROW   |1581     |28794 |Application|Apache                                                         |
-ROW   |1582     |28795 |Application|Apache                                                         |
-ROW   |1583     |28796 |Application|Apache                                                         |
-ROW   |1584     |28798 |Application|Apache                                                         |
-ROW   |1585     |28799 |Application|Apache                                                         |
-ROW   |1586     |28800 |Application|Apache                                                         |
-ROW   |1587     |28801 |Application|Apache                                                         |
-ROW   |1588     |28802 |Application|Apache                                                         |
-ROW   |1589     |28803 |Application|Apache                                                         |
-ROW   |1590     |28775 |Application|Zabbix raw items                                               |
-ROW   |1591     |28805 |Application|Nginx                                                          |
-ROW   |1592     |28806 |Application|Nginx                                                          |
-ROW   |1593     |28807 |Application|Nginx                                                          |
-ROW   |1594     |28808 |Application|Nginx                                                          |
-ROW   |1595     |28809 |Application|Nginx                                                          |
-ROW   |1596     |28810 |Application|Nginx                                                          |
-ROW   |1597     |28811 |Application|Nginx                                                          |
-ROW   |1598     |28812 |Application|Nginx                                                          |
-ROW   |1599     |28813 |Application|Nginx                                                          |
-ROW   |1600     |28814 |Application|Nginx                                                          |
-ROW   |1601     |28815 |Application|Nginx                                                          |
-ROW   |1602     |28816 |Application|Nginx                                                          |
-ROW   |1603     |28817 |Application|Nginx                                                          |
-ROW   |1604     |28818 |Application|Nginx                                                          |
-ROW   |1605     |28819 |Application|Nginx                                                          |
-ROW   |1606     |28820 |Application|Nginx                                                          |
-ROW   |1607     |28804 |Application|Zabbix raw items                                               |
-ROW   |1608     |28822 |Application|Nginx                                                          |
-ROW   |1609     |28823 |Application|Nginx                                                          |
-ROW   |1610     |28824 |Application|Nginx                                                          |
-ROW   |1611     |28825 |Application|Nginx                                                          |
-ROW   |1612     |28826 |Application|Nginx                                                          |
-ROW   |1613     |28827 |Application|Nginx                                                          |
-ROW   |1614     |28828 |Application|Nginx                                                          |
-ROW   |1615     |28829 |Application|Nginx                                                          |
-ROW   |1616     |28830 |Application|Nginx                                                          |
-ROW   |1617     |28831 |Application|Nginx                                                          |
-ROW   |1618     |28832 |Application|Nginx                                                          |
-ROW   |1619     |28833 |Application|Nginx                                                          |
-ROW   |1620     |28821 |Application|Zabbix raw items                                               |
-ROW   |1621     |28978 |Application|Memory                                                         |
-ROW   |1622     |28979 |Application|Memory                                                         |
-ROW   |1623     |28980 |Application|Memory                                                         |
-ROW   |1624     |28981 |Application|Memory                                                         |
-ROW   |1625     |28982 |Application|Memory                                                         |
-ROW   |1626     |28983 |Application|Memory                                                         |
-ROW   |1627     |28984 |Application|Memory                                                         |
-ROW   |1628     |28985 |Application|Memory                                                         |
-ROW   |1629     |28986 |Application|Memory                                                         |
-ROW   |1630     |28987 |Application|CPU                                                            |
-ROW   |1631     |28988 |Application|CPU                                                            |
-ROW   |1632     |28989 |Application|CPU                                                            |
-ROW   |1633     |28990 |Application|CPU                                                            |
-ROW   |1634     |28991 |Application|CPU                                                            |
-ROW   |1635     |28992 |Application|CPU                                                            |
-ROW   |1636     |29017 |Application|CPU                                                            |
-ROW   |1637     |29018 |Application|CPU                                                            |
-ROW   |1638     |29019 |Application|CPU                                                            |
-ROW   |1639     |29020 |Application|CPU                                                            |
-ROW   |1640     |29021 |Application|CPU                                                            |
-ROW   |1641     |29022 |Application|CPU                                                            |
-ROW   |1642     |29023 |Application|CPU                                                            |
-ROW   |1643     |29024 |Application|CPU                                                            |
-ROW   |1644     |29025 |Application|CPU                                                            |
-ROW   |1645     |29026 |Application|CPU                                                            |
-ROW   |1646     |29048 |Application|CPU                                                            |
-ROW   |1647     |29087 |Application|CPU                                                            |
-ROW   |1648     |29088 |Application|CPU                                                            |
-ROW   |1649     |29089 |Application|CPU                                                            |
-ROW   |1650     |29090 |Application|CPU                                                            |
-ROW   |1651     |29091 |Application|CPU                                                            |
-ROW   |1652     |29092 |Application|CPU                                                            |
-ROW   |1653     |29093 |Application|CPU                                                            |
-ROW   |1654     |29094 |Application|CPU                                                            |
-ROW   |1655     |29095 |Application|CPU                                                            |
-ROW   |1656     |29096 |Application|CPU                                                            |
-ROW   |1657     |29097 |Application|CPU                                                            |
-ROW   |1658     |29098 |Application|CPU                                                            |
-ROW   |1659     |29099 |Application|CPU                                                            |
-ROW   |1660     |29100 |Application|CPU                                                            |
-ROW   |1661     |29101 |Application|CPU                                                            |
-ROW   |1662     |29102 |Application|CPU                                                            |
-ROW   |1663     |29198 |Application|CPU                                                            |
-ROW   |1664     |29103 |Application|Memory                                                         |
-ROW   |1665     |29104 |Application|Memory                                                         |
-ROW   |1666     |29105 |Application|Memory                                                         |
-ROW   |1667     |29106 |Application|Memory                                                         |
-ROW   |1668     |29107 |Application|Memory                                                         |
-ROW   |1669     |29108 |Application|Memory                                                         |
-ROW   |1670     |31364 |Application|Memory                                                         |
-ROW   |1671     |31372 |Application|Zabbix raw items                                               |
-ROW   |1672     |31381 |Application|Zabbix raw items                                               |
-ROW   |1673     |31384 |Application|Zabbix raw items                                               |
-ROW   |1674     |29111 |Application|General                                                        |
-ROW   |1675     |29112 |Application|General                                                        |
-ROW   |1676     |29113 |Application|General                                                        |
-ROW   |1677     |29114 |Application|General                                                        |
-ROW   |1678     |29115 |Application|General                                                        |
-ROW   |1679     |29116 |Application|General                                                        |
-ROW   |1680     |29117 |Application|General                                                        |
-ROW   |1681     |29118 |Application|General                                                        |
-ROW   |1682     |29119 |Application|General                                                        |
-ROW   |1683     |29121 |Application|Inventory                                                      |
-ROW   |1684     |29122 |Application|Inventory                                                      |
-ROW   |1685     |29123 |Application|Inventory                                                      |
-ROW   |1686     |29120 |Application|Security                                                       |
-ROW   |1687     |29110 |Application|Status                                                         |
-ROW   |1688     |29399 |Application|CPU                                                            |
-ROW   |1689     |29405 |Application|CPU                                                            |
-ROW   |1690     |29406 |Application|CPU                                                            |
-ROW   |1691     |29407 |Application|CPU                                                            |
-ROW   |1692     |29408 |Application|CPU                                                            |
-ROW   |1693     |29409 |Application|CPU                                                            |
-ROW   |1694     |29410 |Application|CPU                                                            |
-ROW   |1695     |29411 |Application|CPU                                                            |
-ROW   |1696     |29412 |Application|CPU                                                            |
-ROW   |1697     |29413 |Application|CPU                                                            |
-ROW   |1698     |29416 |Application|CPU                                                            |
-ROW   |1699     |29417 |Application|CPU                                                            |
-ROW   |1700     |29418 |Application|CPU                                                            |
-ROW   |1701     |29419 |Application|CPU                                                            |
-ROW   |1702     |29420 |Application|CPU                                                            |
-ROW   |1703     |29426 |Application|CPU                                                            |
-ROW   |1704     |29427 |Application|CPU                                                            |
-ROW   |1705     |29398 |Application|General                                                        |
-ROW   |1706     |29404 |Application|General                                                        |
-ROW   |1707     |29414 |Application|General                                                        |
-ROW   |1708     |29423 |Application|General                                                        |
-ROW   |1709     |29424 |Application|General                                                        |
-ROW   |1710     |29425 |Application|General                                                        |
-ROW   |1711     |29422 |Application|Inventory                                                      |
-ROW   |1712     |29428 |Application|Inventory                                                      |
-ROW   |1713     |29396 |Application|Memory                                                         |
-ROW   |1714     |29397 |Application|Memory                                                         |
-ROW   |1715     |29400 |Application|Memory                                                         |
-ROW   |1716     |29401 |Application|Memory                                                         |
-ROW   |1717     |29402 |Application|Memory                                                         |
-ROW   |1718     |29403 |Application|Memory                                                         |
-ROW   |1719     |29415 |Application|Monitoring agent                                               |
-ROW   |1720     |29421 |Application|Status                                                         |
-ROW   |1721     |29395 |Application|Zabbix raw items                                               |
-ROW   |1722     |29450 |Application|Zabbix raw items                                               |
-ROW   |1723     |29451 |Application|Zabbix raw items                                               |
-ROW   |1724     |29454 |Application|CPU                                                            |
-ROW   |1725     |29455 |Application|CPU                                                            |
-ROW   |1726     |29456 |Application|CPU                                                            |
-ROW   |1727     |29457 |Application|CPU                                                            |
-ROW   |1728     |29458 |Application|CPU                                                            |
-ROW   |1729     |29459 |Application|CPU                                                            |
-ROW   |1730     |30137 |Application|CPU                                                            |
-ROW   |1731     |31419 |Application|CPU                                                            |
-ROW   |1732     |29460 |Application|Memory                                                         |
-ROW   |1733     |29461 |Application|Memory                                                         |
-ROW   |1734     |29462 |Application|Memory                                                         |
-ROW   |1735     |29463 |Application|Memory                                                         |
-ROW   |1736     |29466 |Application|Memory                                                         |
-ROW   |1737     |29467 |Application|Memory                                                         |
-ROW   |1738     |29468 |Application|Memory                                                         |
-ROW   |1739     |29469 |Application|Memory                                                         |
-ROW   |1740     |29470 |Application|Memory                                                         |
-ROW   |1741     |31420 |Application|Memory                                                         |
-ROW   |1742     |31421 |Application|Memory                                                         |
-ROW   |1743     |31427 |Application|Memory                                                         |
-ROW   |1744     |29473 |Application|General                                                        |
-ROW   |1745     |29474 |Application|General                                                        |
-ROW   |1746     |29475 |Application|General                                                        |
-ROW   |1747     |29476 |Application|General                                                        |
-ROW   |1748     |29477 |Application|General                                                        |
-ROW   |1749     |29478 |Application|Inventory                                                      |
-ROW   |1750     |29472 |Application|Status                                                         |
-ROW   |1751     |31422 |Application|Zabbix raw items                                               |
-ROW   |1752     |29545 |Application|Monitoring agent                                               |
-ROW   |1753     |29546 |Application|Monitoring agent                                               |
-ROW   |1754     |29547 |Application|Status                                                         |
-ROW   |1755     |30000 |Application|RabbitMQ                                                       |
-ROW   |1756     |30001 |Application|RabbitMQ                                                       |
-ROW   |1757     |30002 |Application|RabbitMQ                                                       |
-ROW   |1758     |30003 |Application|RabbitMQ                                                       |
-ROW   |1759     |30004 |Application|RabbitMQ                                                       |
-ROW   |1760     |30005 |Application|RabbitMQ                                                       |
-ROW   |1761     |30006 |Application|RabbitMQ                                                       |
-ROW   |1762     |30007 |Application|RabbitMQ                                                       |
-ROW   |1763     |30008 |Application|RabbitMQ                                                       |
-ROW   |1764     |30009 |Application|RabbitMQ                                                       |
-ROW   |1765     |30010 |Application|RabbitMQ                                                       |
-ROW   |1766     |30011 |Application|RabbitMQ                                                       |
-ROW   |1767     |30012 |Application|RabbitMQ                                                       |
-ROW   |1768     |30013 |Application|RabbitMQ                                                       |
-ROW   |1769     |30014 |Application|RabbitMQ                                                       |
-ROW   |1770     |30015 |Application|RabbitMQ                                                       |
-ROW   |1771     |30016 |Application|RabbitMQ                                                       |
-ROW   |1772     |30017 |Application|RabbitMQ                                                       |
-ROW   |1773     |30018 |Application|RabbitMQ                                                       |
-ROW   |1774     |30019 |Application|RabbitMQ                                                       |
-ROW   |1775     |30020 |Application|RabbitMQ                                                       |
-ROW   |1776     |30021 |Application|RabbitMQ                                                       |
-ROW   |1777     |30022 |Application|RabbitMQ                                                       |
-ROW   |1778     |30023 |Application|RabbitMQ                                                       |
-ROW   |1779     |33747 |Application|RabbitMQ                                                       |
-ROW   |1780     |29998 |Application|Zabbix raw items                                               |
-ROW   |1781     |29999 |Application|Zabbix raw items                                               |
-ROW   |1782     |29655 |Application|RabbitMQ                                                       |
-ROW   |1783     |29656 |Application|RabbitMQ                                                       |
-ROW   |1784     |29657 |Application|RabbitMQ                                                       |
-ROW   |1785     |29658 |Application|RabbitMQ                                                       |
-ROW   |1786     |29659 |Application|RabbitMQ                                                       |
-ROW   |1787     |29660 |Application|RabbitMQ                                                       |
-ROW   |1788     |29687 |Application|RabbitMQ                                                       |
-ROW   |1789     |29688 |Application|RabbitMQ                                                       |
-ROW   |1790     |29691 |Application|RabbitMQ                                                       |
-ROW   |1791     |29692 |Application|RabbitMQ                                                       |
-ROW   |1792     |29693 |Application|RabbitMQ                                                       |
-ROW   |1793     |29694 |Application|RabbitMQ                                                       |
-ROW   |1794     |29695 |Application|RabbitMQ                                                       |
-ROW   |1795     |29696 |Application|RabbitMQ                                                       |
-ROW   |1796     |29697 |Application|RabbitMQ                                                       |
-ROW   |1797     |29698 |Application|RabbitMQ                                                       |
-ROW   |1798     |29699 |Application|RabbitMQ                                                       |
-ROW   |1799     |29700 |Application|RabbitMQ                                                       |
-ROW   |1800     |29701 |Application|RabbitMQ                                                       |
-ROW   |1801     |30024 |Application|RabbitMQ                                                       |
-ROW   |1802     |30025 |Application|RabbitMQ                                                       |
-ROW   |1803     |33748 |Application|RabbitMQ                                                       |
-ROW   |1804     |33749 |Application|RabbitMQ                                                       |
-ROW   |1805     |33750 |Application|RabbitMQ                                                       |
-ROW   |1806     |33751 |Application|RabbitMQ                                                       |
-ROW   |1807     |33752 |Application|RabbitMQ                                                       |
-ROW   |1808     |33753 |Application|RabbitMQ                                                       |
-ROW   |1809     |29653 |Application|Zabbix raw items                                               |
-ROW   |1810     |29654 |Application|Zabbix raw items                                               |
-ROW   |1811     |29661 |Application|Zabbix raw items                                               |
-ROW   |1812     |29746 |Application|RabbitMQ                                                       |
-ROW   |1813     |29747 |Application|RabbitMQ                                                       |
-ROW   |1814     |29748 |Application|RabbitMQ                                                       |
-ROW   |1815     |29749 |Application|RabbitMQ                                                       |
-ROW   |1816     |29750 |Application|RabbitMQ                                                       |
-ROW   |1817     |29751 |Application|RabbitMQ                                                       |
-ROW   |1818     |29752 |Application|RabbitMQ                                                       |
-ROW   |1819     |29753 |Application|RabbitMQ                                                       |
-ROW   |1820     |29754 |Application|RabbitMQ                                                       |
-ROW   |1821     |29755 |Application|RabbitMQ                                                       |
-ROW   |1822     |29756 |Application|RabbitMQ                                                       |
-ROW   |1823     |29757 |Application|RabbitMQ                                                       |
-ROW   |1824     |29758 |Application|RabbitMQ                                                       |
-ROW   |1825     |29759 |Application|RabbitMQ                                                       |
-ROW   |1826     |29760 |Application|RabbitMQ                                                       |
-ROW   |1827     |29761 |Application|RabbitMQ                                                       |
-ROW   |1828     |29762 |Application|RabbitMQ                                                       |
-ROW   |1829     |29763 |Application|RabbitMQ                                                       |
-ROW   |1830     |29764 |Application|RabbitMQ                                                       |
-ROW   |1831     |29765 |Application|RabbitMQ                                                       |
-ROW   |1832     |29766 |Application|RabbitMQ                                                       |
-ROW   |1833     |29767 |Application|RabbitMQ                                                       |
-ROW   |1834     |29768 |Application|RabbitMQ                                                       |
-ROW   |1835     |29769 |Application|RabbitMQ                                                       |
-ROW   |1836     |33757 |Application|RabbitMQ                                                       |
-ROW   |1837     |29738 |Application|Zabbix raw items                                               |
-ROW   |1838     |29739 |Application|Zabbix raw items                                               |
-ROW   |1839     |29742 |Application|RabbitMQ                                                       |
-ROW   |1840     |29743 |Application|RabbitMQ                                                       |
-ROW   |1841     |29771 |Application|RabbitMQ                                                       |
-ROW   |1842     |29772 |Application|RabbitMQ                                                       |
-ROW   |1843     |29773 |Application|RabbitMQ                                                       |
-ROW   |1844     |29774 |Application|RabbitMQ                                                       |
-ROW   |1845     |29775 |Application|RabbitMQ                                                       |
-ROW   |1846     |29776 |Application|RabbitMQ                                                       |
-ROW   |1847     |29777 |Application|RabbitMQ                                                       |
-ROW   |1848     |29779 |Application|RabbitMQ                                                       |
-ROW   |1849     |29780 |Application|RabbitMQ                                                       |
-ROW   |1850     |29781 |Application|RabbitMQ                                                       |
-ROW   |1851     |29782 |Application|RabbitMQ                                                       |
-ROW   |1852     |29783 |Application|RabbitMQ                                                       |
-ROW   |1853     |29784 |Application|RabbitMQ                                                       |
-ROW   |1854     |30044 |Application|RabbitMQ                                                       |
-ROW   |1855     |30045 |Application|RabbitMQ                                                       |
-ROW   |1856     |33758 |Application|RabbitMQ                                                       |
-ROW   |1857     |33759 |Application|RabbitMQ                                                       |
-ROW   |1858     |33760 |Application|RabbitMQ                                                       |
-ROW   |1859     |33761 |Application|RabbitMQ                                                       |
-ROW   |1860     |33762 |Application|RabbitMQ                                                       |
-ROW   |1861     |33763 |Application|RabbitMQ                                                       |
-ROW   |1862     |29741 |Application|Zabbix raw items                                               |
-ROW   |1863     |29745 |Application|Zabbix raw items                                               |
-ROW   |1864     |30043 |Application|Zabbix raw items                                               |
-ROW   |1865     |30083 |Application|Disk arrays                                                    |
-ROW   |1866     |30084 |Application|Disk arrays                                                    |
-ROW   |1867     |30085 |Application|Disk arrays                                                    |
-ROW   |1868     |30075 |Application|Fans                                                           |
-ROW   |1869     |30049 |Application|General                                                        |
-ROW   |1870     |30050 |Application|General                                                        |
-ROW   |1871     |30051 |Application|General                                                        |
-ROW   |1872     |30052 |Application|General                                                        |
-ROW   |1873     |30053 |Application|General                                                        |
-ROW   |1874     |30054 |Application|General                                                        |
-ROW   |1875     |30073 |Application|Inventory                                                      |
-ROW   |1876     |30074 |Application|Inventory                                                      |
-ROW   |1877     |30076 |Application|Physical disks                                                 |
-ROW   |1878     |30077 |Application|Physical disks                                                 |
-ROW   |1879     |30078 |Application|Physical disks                                                 |
-ROW   |1880     |30079 |Application|Physical disks                                                 |
-ROW   |1881     |30071 |Application|Power supply                                                   |
-ROW   |1882     |30046 |Application|Status                                                         |
-ROW   |1883     |30047 |Application|Status                                                         |
-ROW   |1884     |30048 |Application|Status                                                         |
-ROW   |1885     |30055 |Application|Status                                                         |
-ROW   |1886     |30056 |Application|Status                                                         |
-ROW   |1887     |30072 |Application|Status                                                         |
-ROW   |1888     |30066 |Application|Temperature                                                    |
-ROW   |1889     |30067 |Application|Temperature                                                    |
-ROW   |1890     |30068 |Application|Temperature                                                    |
-ROW   |1891     |30069 |Application|Temperature                                                    |
-ROW   |1892     |30070 |Application|Temperature                                                    |
-ROW   |1893     |30080 |Application|Virtual disks                                                  |
-ROW   |1894     |30081 |Application|Virtual disks                                                  |
-ROW   |1895     |30082 |Application|Virtual disks                                                  |
-ROW   |1896     |30142 |Application|CPU                                                            |
-ROW   |1897     |30157 |Application|Memory                                                         |
-ROW   |1898     |30158 |Application|Memory                                                         |
-ROW   |1899     |30159 |Application|Memory                                                         |
-ROW   |1912     |30273 |Application|Redis                                                          |
-ROW   |1913     |30274 |Application|Redis                                                          |
-ROW   |1914     |30277 |Application|Redis                                                          |
-ROW   |1915     |30278 |Application|Redis                                                          |
-ROW   |1916     |30279 |Application|Redis                                                          |
-ROW   |1917     |30280 |Application|Redis                                                          |
-ROW   |1918     |30281 |Application|Redis                                                          |
-ROW   |1919     |30282 |Application|Redis                                                          |
-ROW   |1920     |30283 |Application|Redis                                                          |
-ROW   |1921     |30284 |Application|Redis                                                          |
-ROW   |1922     |30285 |Application|Redis                                                          |
-ROW   |1923     |30286 |Application|Redis                                                          |
-ROW   |1924     |30287 |Application|Redis                                                          |
-ROW   |1925     |30288 |Application|Redis                                                          |
-ROW   |1926     |30289 |Application|Redis                                                          |
-ROW   |1927     |30290 |Application|Redis                                                          |
-ROW   |1928     |30291 |Application|Redis                                                          |
-ROW   |1929     |30292 |Application|Redis                                                          |
-ROW   |1930     |30293 |Application|Redis                                                          |
-ROW   |1931     |30294 |Application|Redis                                                          |
-ROW   |1932     |30295 |Application|Redis                                                          |
-ROW   |1933     |30296 |Application|Redis                                                          |
-ROW   |1934     |30297 |Application|Redis                                                          |
-ROW   |1935     |30298 |Application|Redis                                                          |
-ROW   |1936     |30299 |Application|Redis                                                          |
-ROW   |1937     |30300 |Application|Redis                                                          |
-ROW   |1938     |30301 |Application|Redis                                                          |
-ROW   |1939     |30302 |Application|Redis                                                          |
-ROW   |1940     |30303 |Application|Redis                                                          |
-ROW   |1941     |30304 |Application|Redis                                                          |
-ROW   |1942     |30305 |Application|Redis                                                          |
-ROW   |1943     |30306 |Application|Redis                                                          |
-ROW   |1944     |30307 |Application|Redis                                                          |
-ROW   |1945     |30308 |Application|Redis                                                          |
-ROW   |1946     |30309 |Application|Redis                                                          |
-ROW   |1947     |30310 |Application|Redis                                                          |
-ROW   |1948     |30311 |Application|Redis                                                          |
-ROW   |1949     |30312 |Application|Redis                                                          |
-ROW   |1950     |30313 |Application|Redis                                                          |
-ROW   |1951     |30314 |Application|Redis                                                          |
-ROW   |1952     |30315 |Application|Redis                                                          |
-ROW   |1953     |30316 |Application|Redis                                                          |
-ROW   |1954     |30317 |Application|Redis                                                          |
-ROW   |1955     |30318 |Application|Redis                                                          |
-ROW   |1956     |30319 |Application|Redis                                                          |
-ROW   |1957     |30320 |Application|Redis                                                          |
-ROW   |1958     |30321 |Application|Redis                                                          |
-ROW   |1959     |30322 |Application|Redis                                                          |
-ROW   |1960     |30323 |Application|Redis                                                          |
-ROW   |1961     |30324 |Application|Redis                                                          |
-ROW   |1962     |30325 |Application|Redis                                                          |
-ROW   |1963     |30326 |Application|Redis                                                          |
-ROW   |1964     |30327 |Application|Redis                                                          |
-ROW   |1965     |30328 |Application|Redis                                                          |
-ROW   |1966     |30329 |Application|Redis                                                          |
-ROW   |1967     |30330 |Application|Redis                                                          |
-ROW   |1968     |30331 |Application|Redis                                                          |
-ROW   |1969     |30332 |Application|Redis                                                          |
-ROW   |1970     |30333 |Application|Redis                                                          |
-ROW   |1971     |30334 |Application|Redis                                                          |
-ROW   |1972     |30335 |Application|Redis                                                          |
-ROW   |1973     |30336 |Application|Redis                                                          |
-ROW   |1974     |30344 |Application|Redis                                                          |
-ROW   |1975     |30345 |Application|Redis                                                          |
-ROW   |1976     |30346 |Application|Redis                                                          |
-ROW   |1977     |30347 |Application|Redis                                                          |
-ROW   |1978     |30351 |Application|Redis                                                          |
-ROW   |1979     |30352 |Application|Redis                                                          |
-ROW   |1980     |30353 |Application|Redis                                                          |
-ROW   |1981     |30354 |Application|Redis                                                          |
-ROW   |1982     |30355 |Application|Redis                                                          |
-ROW   |1983     |30356 |Application|Redis                                                          |
-ROW   |1984     |30357 |Application|Redis                                                          |
-ROW   |1985     |30358 |Application|Redis                                                          |
-ROW   |1986     |30359 |Application|Redis                                                          |
-ROW   |1987     |30360 |Application|Redis                                                          |
-ROW   |1988     |30361 |Application|Redis                                                          |
-ROW   |1989     |30362 |Application|Redis                                                          |
-ROW   |1990     |30363 |Application|Redis                                                          |
-ROW   |1991     |30364 |Application|Redis                                                          |
-ROW   |1992     |30365 |Application|Redis                                                          |
-ROW   |1993     |30366 |Application|Redis                                                          |
-ROW   |1994     |30367 |Application|Redis                                                          |
-ROW   |1995     |30368 |Application|Redis                                                          |
-ROW   |1996     |30369 |Application|Redis                                                          |
-ROW   |1997     |30370 |Application|Redis                                                          |
-ROW   |1998     |30371 |Application|Redis                                                          |
-ROW   |1999     |30372 |Application|Redis                                                          |
-ROW   |2000     |30373 |Application|Redis                                                          |
-ROW   |2001     |30374 |Application|Redis                                                          |
-ROW   |2002     |30375 |Application|Redis                                                          |
-ROW   |2003     |30376 |Application|Redis                                                          |
-ROW   |2004     |30377 |Application|Redis                                                          |
-ROW   |2005     |30378 |Application|Redis                                                          |
-ROW   |2006     |30379 |Application|Redis                                                          |
-ROW   |2007     |30380 |Application|Redis                                                          |
-ROW   |2008     |30381 |Application|Redis                                                          |
-ROW   |2009     |30382 |Application|Redis                                                          |
-ROW   |2010     |30383 |Application|Redis                                                          |
-ROW   |2011     |30384 |Application|Redis                                                          |
-ROW   |2012     |30385 |Application|Redis                                                          |
-ROW   |2013     |30386 |Application|Redis                                                          |
-ROW   |2014     |30387 |Application|Redis                                                          |
-ROW   |2015     |30388 |Application|Redis                                                          |
-ROW   |2016     |30389 |Application|Redis                                                          |
-ROW   |2017     |30390 |Application|Redis                                                          |
-ROW   |2018     |30391 |Application|Redis                                                          |
-ROW   |2019     |30392 |Application|Redis                                                          |
-ROW   |2020     |30393 |Application|Redis                                                          |
-ROW   |2021     |30394 |Application|Redis                                                          |
-ROW   |2022     |30395 |Application|Redis                                                          |
-ROW   |2023     |30397 |Application|Redis                                                          |
-ROW   |2024     |30398 |Application|Redis                                                          |
-ROW   |2025     |30399 |Application|Redis                                                          |
-ROW   |2026     |30400 |Application|Redis                                                          |
-ROW   |2027     |30401 |Application|Redis                                                          |
-ROW   |2028     |30402 |Application|Redis                                                          |
-ROW   |2029     |30403 |Application|Redis                                                          |
-ROW   |2030     |30404 |Application|Redis                                                          |
-ROW   |2031     |30275 |Application|Zabbix raw items                                               |
-ROW   |2032     |30276 |Application|Zabbix raw items                                               |
-ROW   |2033     |30425 |Application|Services                                                       |
-ROW   |2034     |30431 |Application|MySQL                                                          |
-ROW   |2035     |30432 |Application|MySQL                                                          |
-ROW   |2036     |30434 |Application|MySQL                                                          |
-ROW   |2037     |30435 |Application|MySQL                                                          |
-ROW   |2038     |30437 |Application|MySQL                                                          |
-ROW   |2039     |30438 |Application|MySQL                                                          |
-ROW   |2040     |30439 |Application|MySQL                                                          |
-ROW   |2041     |30440 |Application|MySQL                                                          |
-ROW   |2042     |30441 |Application|MySQL                                                          |
-ROW   |2043     |30442 |Application|MySQL                                                          |
-ROW   |2044     |30444 |Application|MySQL                                                          |
-ROW   |2045     |30445 |Application|MySQL                                                          |
-ROW   |2046     |30446 |Application|MySQL                                                          |
-ROW   |2047     |30447 |Application|MySQL                                                          |
-ROW   |2048     |30449 |Application|MySQL                                                          |
-ROW   |2049     |30450 |Application|MySQL                                                          |
-ROW   |2050     |30451 |Application|MySQL                                                          |
-ROW   |2051     |30452 |Application|MySQL                                                          |
-ROW   |2052     |30453 |Application|MySQL                                                          |
-ROW   |2053     |30454 |Application|MySQL                                                          |
-ROW   |2054     |30455 |Application|MySQL                                                          |
-ROW   |2055     |30456 |Application|MySQL                                                          |
-ROW   |2056     |30457 |Application|MySQL                                                          |
-ROW   |2057     |30458 |Application|MySQL                                                          |
-ROW   |2058     |30459 |Application|MySQL                                                          |
-ROW   |2059     |30460 |Application|MySQL                                                          |
-ROW   |2060     |30461 |Application|MySQL                                                          |
-ROW   |2061     |30462 |Application|MySQL                                                          |
-ROW   |2062     |30463 |Application|MySQL                                                          |
-ROW   |2063     |30464 |Application|MySQL                                                          |
-ROW   |2064     |30465 |Application|MySQL                                                          |
-ROW   |2065     |30466 |Application|MySQL                                                          |
-ROW   |2066     |30470 |Application|MySQL                                                          |
-ROW   |2067     |30471 |Application|MySQL                                                          |
-ROW   |2068     |30474 |Application|MySQL                                                          |
-ROW   |2069     |30476 |Application|MySQL                                                          |
-ROW   |2070     |30477 |Application|MySQL                                                          |
-ROW   |2071     |30478 |Application|MySQL                                                          |
-ROW   |2072     |31168 |Application|MySQL                                                          |
-ROW   |2073     |31169 |Application|MySQL                                                          |
-ROW   |2074     |31170 |Application|MySQL                                                          |
-ROW   |2075     |31171 |Application|MySQL                                                          |
-ROW   |2076     |33126 |Application|MySQL                                                          |
-ROW   |2077     |33127 |Application|MySQL                                                          |
-ROW   |2078     |33128 |Application|MySQL                                                          |
-ROW   |2079     |33129 |Application|MySQL                                                          |
-ROW   |2080     |33130 |Application|MySQL                                                          |
-ROW   |2081     |33131 |Application|MySQL                                                          |
-ROW   |2082     |33132 |Application|MySQL                                                          |
-ROW   |2083     |33134 |Application|MySQL                                                          |
-ROW   |2084     |33135 |Application|MySQL                                                          |
-ROW   |2085     |33136 |Application|MySQL                                                          |
-ROW   |2086     |33137 |Application|MySQL                                                          |
-ROW   |2087     |33138 |Application|MySQL                                                          |
-ROW   |2088     |33139 |Application|MySQL                                                          |
-ROW   |2089     |30433 |Application|Zabbix raw items                                               |
-ROW   |2090     |30436 |Application|Zabbix raw items                                               |
-ROW   |2091     |30443 |Application|Zabbix raw items                                               |
-ROW   |2092     |30475 |Application|Zabbix raw items                                               |
-ROW   |2093     |30480 |Application|MySQL                                                          |
-ROW   |2094     |30481 |Application|MySQL                                                          |
-ROW   |2095     |30482 |Application|MySQL                                                          |
-ROW   |2096     |30483 |Application|MySQL                                                          |
-ROW   |2097     |30484 |Application|MySQL                                                          |
-ROW   |2098     |30486 |Application|MySQL                                                          |
-ROW   |2099     |30488 |Application|MySQL                                                          |
-ROW   |2100     |30489 |Application|MySQL                                                          |
-ROW   |2101     |30490 |Application|MySQL                                                          |
-ROW   |2102     |30491 |Application|MySQL                                                          |
-ROW   |2103     |30492 |Application|MySQL                                                          |
-ROW   |2104     |30493 |Application|MySQL                                                          |
-ROW   |2105     |30494 |Application|MySQL                                                          |
-ROW   |2106     |30495 |Application|MySQL                                                          |
-ROW   |2107     |30496 |Application|MySQL                                                          |
-ROW   |2108     |30497 |Application|MySQL                                                          |
-ROW   |2109     |30499 |Application|MySQL                                                          |
-ROW   |2110     |30500 |Application|MySQL                                                          |
-ROW   |2111     |30503 |Application|MySQL                                                          |
-ROW   |2112     |30504 |Application|MySQL                                                          |
-ROW   |2113     |30505 |Application|MySQL                                                          |
-ROW   |2114     |30506 |Application|MySQL                                                          |
-ROW   |2115     |30507 |Application|MySQL                                                          |
-ROW   |2116     |30508 |Application|MySQL                                                          |
-ROW   |2117     |30509 |Application|MySQL                                                          |
-ROW   |2118     |30510 |Application|MySQL                                                          |
-ROW   |2119     |30512 |Application|MySQL                                                          |
-ROW   |2120     |30513 |Application|MySQL                                                          |
-ROW   |2121     |30514 |Application|MySQL                                                          |
-ROW   |2122     |30515 |Application|MySQL                                                          |
-ROW   |2123     |30516 |Application|MySQL                                                          |
-ROW   |2124     |30517 |Application|MySQL                                                          |
-ROW   |2125     |30518 |Application|MySQL                                                          |
-ROW   |2126     |30519 |Application|MySQL                                                          |
-ROW   |2127     |30522 |Application|MySQL                                                          |
-ROW   |2128     |30524 |Application|MySQL                                                          |
-ROW   |2129     |30525 |Application|MySQL                                                          |
-ROW   |2130     |30526 |Application|MySQL                                                          |
-ROW   |2131     |31176 |Application|MySQL                                                          |
-ROW   |2132     |31177 |Application|MySQL                                                          |
-ROW   |2133     |31178 |Application|MySQL                                                          |
-ROW   |2134     |31179 |Application|MySQL                                                          |
-ROW   |2135     |33154 |Application|MySQL                                                          |
-ROW   |2136     |33155 |Application|MySQL                                                          |
-ROW   |2137     |33156 |Application|MySQL                                                          |
-ROW   |2138     |33157 |Application|MySQL                                                          |
-ROW   |2139     |33158 |Application|MySQL                                                          |
-ROW   |2140     |33159 |Application|MySQL                                                          |
-ROW   |2141     |33160 |Application|MySQL                                                          |
-ROW   |2142     |33162 |Application|MySQL                                                          |
-ROW   |2143     |33163 |Application|MySQL                                                          |
-ROW   |2144     |33164 |Application|MySQL                                                          |
-ROW   |2145     |33165 |Application|MySQL                                                          |
-ROW   |2146     |33166 |Application|MySQL                                                          |
-ROW   |2147     |33167 |Application|MySQL                                                          |
-ROW   |2148     |30479 |Application|Zabbix raw items                                               |
-ROW   |2149     |30485 |Application|Zabbix raw items                                               |
-ROW   |2150     |30487 |Application|Zabbix raw items                                               |
-ROW   |2151     |30523 |Application|Zabbix raw items                                               |
-ROW   |2152     |30530 |Application|Docker                                                         |
-ROW   |2153     |30532 |Application|Docker                                                         |
-ROW   |2154     |30533 |Application|Docker                                                         |
-ROW   |2155     |30534 |Application|Docker                                                         |
-ROW   |2156     |30535 |Application|Docker                                                         |
-ROW   |2157     |30536 |Application|Docker                                                         |
-ROW   |2158     |30537 |Application|Docker                                                         |
-ROW   |2159     |30538 |Application|Docker                                                         |
-ROW   |2160     |30539 |Application|Docker                                                         |
-ROW   |2161     |30540 |Application|Docker                                                         |
-ROW   |2162     |30541 |Application|Docker                                                         |
-ROW   |2163     |30542 |Application|Docker                                                         |
-ROW   |2164     |30543 |Application|Docker                                                         |
-ROW   |2165     |30544 |Application|Docker                                                         |
-ROW   |2166     |30545 |Application|Docker                                                         |
-ROW   |2167     |30546 |Application|Docker                                                         |
-ROW   |2168     |30547 |Application|Docker                                                         |
-ROW   |2169     |30548 |Application|Docker                                                         |
-ROW   |2170     |30549 |Application|Docker                                                         |
-ROW   |2171     |30550 |Application|Docker                                                         |
-ROW   |2172     |30551 |Application|Docker                                                         |
-ROW   |2173     |30552 |Application|Docker                                                         |
-ROW   |2174     |30553 |Application|Docker                                                         |
-ROW   |2175     |30554 |Application|Docker                                                         |
-ROW   |2176     |30555 |Application|Docker                                                         |
-ROW   |2177     |30556 |Application|Docker                                                         |
-ROW   |2178     |30557 |Application|Docker                                                         |
-ROW   |2179     |30558 |Application|Docker                                                         |
-ROW   |2180     |30559 |Application|Docker                                                         |
-ROW   |2181     |30560 |Application|Docker                                                         |
-ROW   |2182     |30561 |Application|Docker                                                         |
-ROW   |2183     |30562 |Application|Docker                                                         |
-ROW   |2184     |30563 |Application|Docker                                                         |
-ROW   |2185     |30564 |Application|Docker                                                         |
-ROW   |2186     |30565 |Application|Docker                                                         |
-ROW   |2187     |30566 |Application|Docker                                                         |
-ROW   |2188     |30567 |Application|Docker                                                         |
-ROW   |2189     |30568 |Application|Docker                                                         |
-ROW   |2190     |30569 |Application|Docker                                                         |
-ROW   |2191     |30570 |Application|Docker                                                         |
-ROW   |2192     |30527 |Application|Zabbix raw items                                               |
-ROW   |2193     |30528 |Application|Zabbix raw items                                               |
-ROW   |2194     |30529 |Application|Zabbix raw items                                               |
-ROW   |2195     |30531 |Application|Zabbix raw items                                               |
-ROW   |2196     |30611 |Application|Memcached                                                      |
-ROW   |2197     |30613 |Application|Memcached                                                      |
-ROW   |2198     |30614 |Application|Memcached                                                      |
-ROW   |2199     |30615 |Application|Memcached                                                      |
-ROW   |2200     |30616 |Application|Memcached                                                      |
-ROW   |2201     |30617 |Application|Memcached                                                      |
-ROW   |2202     |30618 |Application|Memcached                                                      |
-ROW   |2203     |30619 |Application|Memcached                                                      |
-ROW   |2204     |30620 |Application|Memcached                                                      |
-ROW   |2205     |30621 |Application|Memcached                                                      |
-ROW   |2206     |30622 |Application|Memcached                                                      |
-ROW   |2207     |30623 |Application|Memcached                                                      |
-ROW   |2208     |30624 |Application|Memcached                                                      |
-ROW   |2209     |30625 |Application|Memcached                                                      |
-ROW   |2210     |30626 |Application|Memcached                                                      |
-ROW   |2211     |30627 |Application|Memcached                                                      |
-ROW   |2212     |30628 |Application|Memcached                                                      |
-ROW   |2213     |30629 |Application|Memcached                                                      |
-ROW   |2214     |30630 |Application|Memcached                                                      |
-ROW   |2215     |30631 |Application|Memcached                                                      |
-ROW   |2216     |30632 |Application|Memcached                                                      |
-ROW   |2217     |30633 |Application|Memcached                                                      |
-ROW   |2218     |30634 |Application|Memcached                                                      |
-ROW   |2219     |30635 |Application|Memcached                                                      |
-ROW   |2220     |30636 |Application|Memcached                                                      |
-ROW   |2221     |30612 |Application|Zabbix raw items                                               |
-ROW   |2222     |30637 |Application|MySQL                                                          |
-ROW   |2223     |30638 |Application|MySQL                                                          |
-ROW   |2224     |30640 |Application|MySQL                                                          |
-ROW   |2225     |30641 |Application|MySQL                                                          |
-ROW   |2226     |30643 |Application|MySQL                                                          |
-ROW   |2227     |30644 |Application|MySQL                                                          |
-ROW   |2228     |30645 |Application|MySQL                                                          |
-ROW   |2229     |30646 |Application|MySQL                                                          |
-ROW   |2230     |30647 |Application|MySQL                                                          |
-ROW   |2231     |30648 |Application|MySQL                                                          |
-ROW   |2232     |30650 |Application|MySQL                                                          |
-ROW   |2233     |30651 |Application|MySQL                                                          |
-ROW   |2234     |30652 |Application|MySQL                                                          |
-ROW   |2235     |30653 |Application|MySQL                                                          |
-ROW   |2236     |30655 |Application|MySQL                                                          |
-ROW   |2237     |30656 |Application|MySQL                                                          |
-ROW   |2238     |30657 |Application|MySQL                                                          |
-ROW   |2239     |30658 |Application|MySQL                                                          |
-ROW   |2240     |30659 |Application|MySQL                                                          |
-ROW   |2241     |30660 |Application|MySQL                                                          |
-ROW   |2242     |30661 |Application|MySQL                                                          |
-ROW   |2243     |30662 |Application|MySQL                                                          |
-ROW   |2244     |30663 |Application|MySQL                                                          |
-ROW   |2245     |30664 |Application|MySQL                                                          |
-ROW   |2246     |30665 |Application|MySQL                                                          |
-ROW   |2247     |30666 |Application|MySQL                                                          |
-ROW   |2248     |30667 |Application|MySQL                                                          |
-ROW   |2249     |30668 |Application|MySQL                                                          |
-ROW   |2250     |30669 |Application|MySQL                                                          |
-ROW   |2251     |30670 |Application|MySQL                                                          |
-ROW   |2252     |30671 |Application|MySQL                                                          |
-ROW   |2253     |30672 |Application|MySQL                                                          |
-ROW   |2254     |30676 |Application|MySQL                                                          |
-ROW   |2255     |30677 |Application|MySQL                                                          |
-ROW   |2256     |30680 |Application|MySQL                                                          |
-ROW   |2257     |30682 |Application|MySQL                                                          |
-ROW   |2258     |30683 |Application|MySQL                                                          |
-ROW   |2259     |30684 |Application|MySQL                                                          |
-ROW   |2260     |31172 |Application|MySQL                                                          |
-ROW   |2261     |31173 |Application|MySQL                                                          |
-ROW   |2262     |31174 |Application|MySQL                                                          |
-ROW   |2263     |31175 |Application|MySQL                                                          |
-ROW   |2264     |33140 |Application|MySQL                                                          |
-ROW   |2265     |33141 |Application|MySQL                                                          |
-ROW   |2266     |33142 |Application|MySQL                                                          |
-ROW   |2267     |33143 |Application|MySQL                                                          |
-ROW   |2268     |33144 |Application|MySQL                                                          |
-ROW   |2269     |33145 |Application|MySQL                                                          |
-ROW   |2270     |33146 |Application|MySQL                                                          |
-ROW   |2271     |33148 |Application|MySQL                                                          |
-ROW   |2272     |33149 |Application|MySQL                                                          |
-ROW   |2273     |33150 |Application|MySQL                                                          |
-ROW   |2274     |33151 |Application|MySQL                                                          |
-ROW   |2275     |33152 |Application|MySQL                                                          |
-ROW   |2276     |33153 |Application|MySQL                                                          |
-ROW   |2277     |30639 |Application|Zabbix raw items                                               |
-ROW   |2278     |30642 |Application|Zabbix raw items                                               |
-ROW   |2279     |30649 |Application|Zabbix raw items                                               |
-ROW   |2280     |30681 |Application|Zabbix raw items                                               |
-ROW   |2281     |30685 |Application|Zabbix raw items                                               |
-ROW   |2282     |30690 |Application|ES cluster                                                     |
-ROW   |2283     |30692 |Application|ES cluster                                                     |
-ROW   |2284     |30695 |Application|ES cluster                                                     |
-ROW   |2285     |30696 |Application|ES cluster                                                     |
-ROW   |2286     |30697 |Application|ES cluster                                                     |
-ROW   |2287     |30698 |Application|ES cluster                                                     |
-ROW   |2288     |30699 |Application|ES cluster                                                     |
-ROW   |2289     |30700 |Application|ES cluster                                                     |
-ROW   |2290     |30701 |Application|ES cluster                                                     |
-ROW   |2291     |30702 |Application|ES cluster                                                     |
-ROW   |2292     |30703 |Application|ES cluster                                                     |
-ROW   |2293     |30704 |Application|ES cluster                                                     |
-ROW   |2294     |30705 |Application|ES cluster                                                     |
-ROW   |2295     |30706 |Application|ES cluster                                                     |
-ROW   |2296     |30707 |Application|ES cluster                                                     |
-ROW   |2297     |30708 |Application|ES cluster                                                     |
-ROW   |2298     |30709 |Application|ES cluster                                                     |
-ROW   |2299     |30710 |Application|ES cluster                                                     |
-ROW   |2300     |30711 |Application|ES cluster                                                     |
-ROW   |2301     |30712 |Application|ES cluster                                                     |
-ROW   |2302     |30691 |Application|Zabbix raw items                                               |
-ROW   |2303     |30693 |Application|Zabbix raw items                                               |
-ROW   |2304     |30694 |Application|Zabbix raw items                                               |
-ROW   |2305     |30719 |Application|Zabbix raw items                                               |
-ROW   |2306     |30739 |Application|Zabbix raw items                                               |
-ROW   |2307     |30743 |Application|Zabbix raw items                                               |
-ROW   |2308     |30744 |Application|Zabbix raw items                                               |
-ROW   |2309     |30746 |Application|Zabbix raw items                                               |
-ROW   |2310     |30747 |Application|Zabbix raw items                                               |
-ROW   |2311     |30754 |Application|Zabbix raw items                                               |
-ROW   |2312     |30756 |Application|Zabbix raw items                                               |
-ROW   |2313     |30821 |Application|ClickHouse                                                     |
-ROW   |2314     |30822 |Application|ClickHouse                                                     |
-ROW   |2315     |30827 |Application|ClickHouse                                                     |
-ROW   |2316     |30831 |Application|ClickHouse                                                     |
-ROW   |2317     |30832 |Application|ClickHouse                                                     |
-ROW   |2318     |30833 |Application|ClickHouse                                                     |
-ROW   |2319     |30834 |Application|ClickHouse                                                     |
-ROW   |2320     |30835 |Application|ClickHouse                                                     |
-ROW   |2321     |30837 |Application|ClickHouse                                                     |
-ROW   |2322     |30838 |Application|ClickHouse                                                     |
-ROW   |2323     |30839 |Application|ClickHouse                                                     |
-ROW   |2324     |30841 |Application|ClickHouse                                                     |
-ROW   |2325     |30846 |Application|ClickHouse                                                     |
-ROW   |2326     |30847 |Application|ClickHouse                                                     |
-ROW   |2327     |30848 |Application|ClickHouse                                                     |
-ROW   |2328     |30849 |Application|ClickHouse                                                     |
-ROW   |2329     |30850 |Application|ClickHouse                                                     |
-ROW   |2330     |30851 |Application|ClickHouse                                                     |
-ROW   |2331     |30852 |Application|ClickHouse                                                     |
-ROW   |2332     |30853 |Application|ClickHouse                                                     |
-ROW   |2333     |30854 |Application|ClickHouse                                                     |
-ROW   |2334     |30855 |Application|ClickHouse                                                     |
-ROW   |2335     |30856 |Application|ClickHouse                                                     |
-ROW   |2336     |30857 |Application|ClickHouse                                                     |
-ROW   |2337     |30858 |Application|ClickHouse                                                     |
-ROW   |2338     |30859 |Application|ClickHouse                                                     |
-ROW   |2339     |30860 |Application|ClickHouse                                                     |
-ROW   |2340     |30861 |Application|ClickHouse                                                     |
-ROW   |2341     |30862 |Application|ClickHouse                                                     |
-ROW   |2342     |30863 |Application|ClickHouse                                                     |
-ROW   |2343     |30864 |Application|ClickHouse                                                     |
-ROW   |2344     |30865 |Application|ClickHouse                                                     |
-ROW   |2345     |30866 |Application|ClickHouse                                                     |
-ROW   |2346     |30867 |Application|ClickHouse                                                     |
-ROW   |2347     |30868 |Application|ClickHouse                                                     |
-ROW   |2348     |30869 |Application|ClickHouse                                                     |
-ROW   |2349     |30870 |Application|ClickHouse                                                     |
-ROW   |2350     |30871 |Application|ClickHouse                                                     |
-ROW   |2351     |30872 |Application|ClickHouse                                                     |
-ROW   |2352     |31054 |Application|ClickHouse                                                     |
-ROW   |2353     |30836 |Application|ClickHouse ZooKeeper                                           |
-ROW   |2355     |30842 |Application|ClickHouse ZooKeeper                                           |
-ROW   |2356     |30843 |Application|ClickHouse ZooKeeper                                           |
-ROW   |2357     |30844 |Application|ClickHouse ZooKeeper                                           |
-ROW   |2358     |30845 |Application|ClickHouse ZooKeeper                                           |
-ROW   |2359     |30873 |Application|ClickHouse ZooKeeper                                           |
-ROW   |2360     |30823 |Application|Zabbix raw items                                               |
-ROW   |2361     |30824 |Application|Zabbix raw items                                               |
-ROW   |2362     |30825 |Application|Zabbix raw items                                               |
-ROW   |2363     |30826 |Application|Zabbix raw items                                               |
-ROW   |2364     |30828 |Application|Zabbix raw items                                               |
-ROW   |2365     |30829 |Application|Zabbix raw items                                               |
-ROW   |2366     |30830 |Application|Zabbix raw items                                               |
-ROW   |2367     |30923 |Application|Etcd                                                           |
-ROW   |2368     |30924 |Application|Etcd                                                           |
-ROW   |2369     |30927 |Application|Etcd                                                           |
-ROW   |2370     |30928 |Application|Etcd                                                           |
-ROW   |2371     |30929 |Application|Etcd                                                           |
-ROW   |2372     |30930 |Application|Etcd                                                           |
-ROW   |2373     |30931 |Application|Etcd                                                           |
-ROW   |2374     |30932 |Application|Etcd                                                           |
-ROW   |2375     |30933 |Application|Etcd                                                           |
-ROW   |2376     |30934 |Application|Etcd                                                           |
-ROW   |2377     |30935 |Application|Etcd                                                           |
-ROW   |2378     |30936 |Application|Etcd                                                           |
-ROW   |2379     |30937 |Application|Etcd                                                           |
-ROW   |2380     |30938 |Application|Etcd                                                           |
-ROW   |2381     |30939 |Application|Etcd                                                           |
-ROW   |2382     |30940 |Application|Etcd                                                           |
-ROW   |2383     |30941 |Application|Etcd                                                           |
-ROW   |2384     |30942 |Application|Etcd                                                           |
-ROW   |2385     |30943 |Application|Etcd                                                           |
-ROW   |2386     |30944 |Application|Etcd                                                           |
-ROW   |2387     |30945 |Application|Etcd                                                           |
-ROW   |2388     |30946 |Application|Etcd                                                           |
-ROW   |2389     |30947 |Application|Etcd                                                           |
-ROW   |2390     |30948 |Application|Etcd                                                           |
-ROW   |2391     |30949 |Application|Etcd                                                           |
-ROW   |2392     |30950 |Application|Etcd                                                           |
-ROW   |2393     |30951 |Application|Etcd                                                           |
-ROW   |2394     |30952 |Application|Etcd                                                           |
-ROW   |2395     |30953 |Application|Etcd                                                           |
-ROW   |2396     |30954 |Application|Etcd                                                           |
-ROW   |2397     |30955 |Application|Etcd                                                           |
-ROW   |2398     |30956 |Application|Etcd                                                           |
-ROW   |2399     |30957 |Application|Etcd                                                           |
-ROW   |2400     |30958 |Application|Etcd                                                           |
-ROW   |2401     |30959 |Application|Etcd                                                           |
-ROW   |2402     |30960 |Application|Etcd                                                           |
-ROW   |2403     |30963 |Application|Etcd                                                           |
-ROW   |2404     |30925 |Application|Zabbix raw items                                               |
-ROW   |2405     |30926 |Application|Zabbix raw items                                               |
-ROW   |2406     |30968 |Application|IIS                                                            |
-ROW   |2407     |30969 |Application|IIS                                                            |
-ROW   |2408     |30970 |Application|IIS                                                            |
-ROW   |2409     |30971 |Application|IIS                                                            |
-ROW   |2410     |30972 |Application|IIS                                                            |
-ROW   |2411     |30973 |Application|IIS                                                            |
-ROW   |2412     |30974 |Application|IIS                                                            |
-ROW   |2413     |30975 |Application|IIS                                                            |
-ROW   |2414     |30976 |Application|IIS                                                            |
-ROW   |2415     |30977 |Application|IIS                                                            |
-ROW   |2416     |30978 |Application|IIS                                                            |
-ROW   |2417     |30979 |Application|IIS                                                            |
-ROW   |2418     |30980 |Application|IIS                                                            |
-ROW   |2419     |30981 |Application|IIS                                                            |
-ROW   |2420     |30982 |Application|IIS                                                            |
-ROW   |2421     |30983 |Application|IIS                                                            |
-ROW   |2422     |30984 |Application|IIS                                                            |
-ROW   |2423     |30985 |Application|IIS                                                            |
-ROW   |2424     |30986 |Application|IIS                                                            |
-ROW   |2425     |30987 |Application|IIS                                                            |
-ROW   |2426     |30988 |Application|IIS                                                            |
-ROW   |2427     |30989 |Application|IIS                                                            |
-ROW   |2428     |30990 |Application|IIS                                                            |
-ROW   |2429     |30991 |Application|IIS                                                            |
-ROW   |2430     |30992 |Application|IIS                                                            |
-ROW   |2431     |30993 |Application|IIS                                                            |
-ROW   |2432     |30994 |Application|IIS                                                            |
-ROW   |2433     |30995 |Application|IIS                                                            |
-ROW   |2434     |30996 |Application|IIS                                                            |
-ROW   |2435     |30997 |Application|IIS                                                            |
-ROW   |2436     |30998 |Application|IIS                                                            |
-ROW   |2437     |30999 |Application|IIS                                                            |
-ROW   |2438     |31000 |Application|IIS                                                            |
-ROW   |2439     |31001 |Application|IIS                                                            |
-ROW   |2440     |31002 |Application|IIS                                                            |
-ROW   |2441     |31003 |Application|IIS                                                            |
-ROW   |2442     |31004 |Application|IIS                                                            |
-ROW   |2443     |31010 |Application|IIS                                                            |
-ROW   |2444     |31011 |Application|IIS                                                            |
-ROW   |2445     |31012 |Application|IIS                                                            |
-ROW   |2446     |31013 |Application|IIS                                                            |
-ROW   |2447     |31014 |Application|IIS                                                            |
-ROW   |2448     |31015 |Application|IIS                                                            |
-ROW   |2449     |31016 |Application|IIS                                                            |
-ROW   |2450     |31017 |Application|IIS                                                            |
-ROW   |2451     |31018 |Application|IIS                                                            |
-ROW   |2452     |31019 |Application|IIS                                                            |
-ROW   |2453     |31020 |Application|IIS                                                            |
-ROW   |2454     |31021 |Application|IIS                                                            |
-ROW   |2455     |31022 |Application|IIS                                                            |
-ROW   |2456     |31023 |Application|IIS                                                            |
-ROW   |2457     |31024 |Application|IIS                                                            |
-ROW   |2458     |31025 |Application|IIS                                                            |
-ROW   |2459     |31026 |Application|IIS                                                            |
-ROW   |2460     |31027 |Application|IIS                                                            |
-ROW   |2461     |31028 |Application|IIS                                                            |
-ROW   |2462     |31029 |Application|IIS                                                            |
-ROW   |2463     |31030 |Application|IIS                                                            |
-ROW   |2464     |31031 |Application|IIS                                                            |
-ROW   |2465     |31032 |Application|IIS                                                            |
-ROW   |2466     |31033 |Application|IIS                                                            |
-ROW   |2467     |31034 |Application|IIS                                                            |
-ROW   |2468     |31035 |Application|IIS                                                            |
-ROW   |2469     |31036 |Application|IIS                                                            |
-ROW   |2470     |31037 |Application|IIS                                                            |
-ROW   |2471     |31038 |Application|IIS                                                            |
-ROW   |2472     |31039 |Application|IIS                                                            |
-ROW   |2473     |31040 |Application|IIS                                                            |
-ROW   |2474     |31041 |Application|IIS                                                            |
-ROW   |2475     |31042 |Application|IIS                                                            |
-ROW   |2476     |31043 |Application|IIS                                                            |
-ROW   |2477     |31044 |Application|IIS                                                            |
-ROW   |2478     |31045 |Application|IIS                                                            |
-ROW   |2479     |31046 |Application|IIS                                                            |
-ROW   |2480     |31056 |Application|MSSQL                                                          |
-ROW   |2481     |31057 |Application|MSSQL                                                          |
-ROW   |2482     |31058 |Application|MSSQL                                                          |
-ROW   |2483     |31060 |Application|MSSQL                                                          |
-ROW   |2484     |31061 |Application|MSSQL                                                          |
-ROW   |2485     |31062 |Application|MSSQL                                                          |
-ROW   |2486     |31063 |Application|MSSQL                                                          |
-ROW   |2487     |31064 |Application|MSSQL                                                          |
-ROW   |2488     |31065 |Application|MSSQL                                                          |
-ROW   |2489     |31066 |Application|MSSQL                                                          |
-ROW   |2490     |31067 |Application|MSSQL                                                          |
-ROW   |2491     |31068 |Application|MSSQL                                                          |
-ROW   |2492     |31069 |Application|MSSQL                                                          |
-ROW   |2493     |31070 |Application|MSSQL                                                          |
-ROW   |2494     |31071 |Application|MSSQL                                                          |
-ROW   |2495     |31072 |Application|MSSQL                                                          |
-ROW   |2496     |31073 |Application|MSSQL                                                          |
-ROW   |2497     |31074 |Application|MSSQL                                                          |
-ROW   |2498     |31075 |Application|MSSQL                                                          |
-ROW   |2499     |31076 |Application|MSSQL                                                          |
-ROW   |2500     |31077 |Application|MSSQL                                                          |
-ROW   |2501     |31078 |Application|MSSQL                                                          |
-ROW   |2502     |31079 |Application|MSSQL                                                          |
-ROW   |2503     |31080 |Application|MSSQL                                                          |
-ROW   |2504     |31081 |Application|MSSQL                                                          |
-ROW   |2505     |31082 |Application|MSSQL                                                          |
-ROW   |2506     |31083 |Application|MSSQL                                                          |
-ROW   |2507     |31084 |Application|MSSQL                                                          |
-ROW   |2508     |31085 |Application|MSSQL                                                          |
-ROW   |2509     |31086 |Application|MSSQL                                                          |
-ROW   |2510     |31087 |Application|MSSQL                                                          |
-ROW   |2511     |31088 |Application|MSSQL                                                          |
-ROW   |2512     |31089 |Application|MSSQL                                                          |
-ROW   |2513     |31090 |Application|MSSQL                                                          |
-ROW   |2514     |31092 |Application|MSSQL                                                          |
-ROW   |2515     |31095 |Application|MSSQL                                                          |
-ROW   |2516     |31096 |Application|MSSQL                                                          |
-ROW   |2517     |31097 |Application|MSSQL                                                          |
-ROW   |2518     |31098 |Application|MSSQL                                                          |
-ROW   |2519     |31099 |Application|MSSQL                                                          |
-ROW   |2520     |31100 |Application|MSSQL                                                          |
-ROW   |2521     |31101 |Application|MSSQL                                                          |
-ROW   |2522     |31102 |Application|MSSQL                                                          |
-ROW   |2523     |31103 |Application|MSSQL                                                          |
-ROW   |2524     |31104 |Application|MSSQL                                                          |
-ROW   |2525     |31105 |Application|MSSQL                                                          |
-ROW   |2526     |31106 |Application|MSSQL                                                          |
-ROW   |2527     |31107 |Application|MSSQL                                                          |
-ROW   |2528     |31108 |Application|MSSQL                                                          |
-ROW   |2529     |31109 |Application|MSSQL                                                          |
-ROW   |2530     |31110 |Application|MSSQL                                                          |
-ROW   |2531     |31111 |Application|MSSQL                                                          |
-ROW   |2532     |31112 |Application|MSSQL                                                          |
-ROW   |2533     |31113 |Application|MSSQL                                                          |
-ROW   |2534     |31114 |Application|MSSQL                                                          |
-ROW   |2535     |31115 |Application|MSSQL                                                          |
-ROW   |2536     |31116 |Application|MSSQL                                                          |
-ROW   |2537     |31117 |Application|MSSQL                                                          |
-ROW   |2538     |31118 |Application|MSSQL                                                          |
-ROW   |2539     |31119 |Application|MSSQL                                                          |
-ROW   |2540     |31120 |Application|MSSQL                                                          |
-ROW   |2541     |31121 |Application|MSSQL                                                          |
-ROW   |2542     |31554 |Application|MSSQL                                                          |
-ROW   |2543     |31555 |Application|MSSQL                                                          |
-ROW   |2544     |31556 |Application|MSSQL                                                          |
-ROW   |2545     |31055 |Application|Zabbix raw items                                               |
-ROW   |2546     |31059 |Application|Zabbix raw items                                               |
-ROW   |2547     |31091 |Application|Zabbix raw items                                               |
-ROW   |2548     |31093 |Application|Zabbix raw items                                               |
-ROW   |2549     |31094 |Application|Zabbix raw items                                               |
-ROW   |2550     |31128 |Application|Zabbix raw items                                               |
-ROW   |2551     |31129 |Application|Zabbix raw items                                               |
-ROW   |2552     |31130 |Application|Zabbix raw items                                               |
-ROW   |2553     |31132 |Application|Zabbix raw items                                               |
-ROW   |2554     |33941 |Application|Zabbix raw items                                               |
-ROW   |2555     |31183 |Application|Oracle                                                         |
-ROW   |2556     |31184 |Application|Oracle                                                         |
-ROW   |2557     |31189 |Application|Oracle                                                         |
-ROW   |2558     |31190 |Application|Oracle                                                         |
-ROW   |2559     |31191 |Application|Oracle                                                         |
-ROW   |2560     |31192 |Application|Oracle                                                         |
-ROW   |2561     |31193 |Application|Oracle                                                         |
-ROW   |2562     |31194 |Application|Oracle                                                         |
-ROW   |2563     |31195 |Application|Oracle                                                         |
-ROW   |2564     |31196 |Application|Oracle                                                         |
-ROW   |2565     |31197 |Application|Oracle                                                         |
-ROW   |2566     |31198 |Application|Oracle                                                         |
-ROW   |2567     |31199 |Application|Oracle                                                         |
-ROW   |2568     |31200 |Application|Oracle                                                         |
-ROW   |2569     |31201 |Application|Oracle                                                         |
-ROW   |2570     |31202 |Application|Oracle                                                         |
-ROW   |2571     |31203 |Application|Oracle                                                         |
-ROW   |2572     |31204 |Application|Oracle                                                         |
-ROW   |2573     |31205 |Application|Oracle                                                         |
-ROW   |2574     |31206 |Application|Oracle                                                         |
-ROW   |2575     |31207 |Application|Oracle                                                         |
-ROW   |2576     |31208 |Application|Oracle                                                         |
-ROW   |2577     |31209 |Application|Oracle                                                         |
-ROW   |2578     |31210 |Application|Oracle                                                         |
-ROW   |2579     |31211 |Application|Oracle                                                         |
-ROW   |2580     |31212 |Application|Oracle                                                         |
-ROW   |2581     |31213 |Application|Oracle                                                         |
-ROW   |2582     |31214 |Application|Oracle                                                         |
-ROW   |2583     |31215 |Application|Oracle                                                         |
-ROW   |2584     |31216 |Application|Oracle                                                         |
-ROW   |2585     |31217 |Application|Oracle                                                         |
-ROW   |2586     |31218 |Application|Oracle                                                         |
-ROW   |2587     |31219 |Application|Oracle                                                         |
-ROW   |2588     |31220 |Application|Oracle                                                         |
-ROW   |2589     |31221 |Application|Oracle                                                         |
-ROW   |2590     |31222 |Application|Oracle                                                         |
-ROW   |2591     |31223 |Application|Oracle                                                         |
-ROW   |2592     |31224 |Application|Oracle                                                         |
-ROW   |2593     |31225 |Application|Oracle                                                         |
-ROW   |2594     |31226 |Application|Oracle                                                         |
-ROW   |2595     |31227 |Application|Oracle                                                         |
-ROW   |2596     |31228 |Application|Oracle                                                         |
-ROW   |2597     |31229 |Application|Oracle                                                         |
-ROW   |2598     |31230 |Application|Oracle                                                         |
-ROW   |2599     |31231 |Application|Oracle                                                         |
-ROW   |2600     |31232 |Application|Oracle                                                         |
-ROW   |2601     |31233 |Application|Oracle                                                         |
-ROW   |2602     |31234 |Application|Oracle                                                         |
-ROW   |2603     |31235 |Application|Oracle                                                         |
-ROW   |2604     |31236 |Application|Oracle                                                         |
-ROW   |2605     |31237 |Application|Oracle                                                         |
-ROW   |2606     |31238 |Application|Oracle                                                         |
-ROW   |2607     |31239 |Application|Oracle                                                         |
-ROW   |2608     |31240 |Application|Oracle                                                         |
-ROW   |2609     |31241 |Application|Oracle                                                         |
-ROW   |2610     |31242 |Application|Oracle                                                         |
-ROW   |2611     |31243 |Application|Oracle                                                         |
-ROW   |2612     |31244 |Application|Oracle                                                         |
-ROW   |2613     |31245 |Application|Oracle                                                         |
-ROW   |2614     |31246 |Application|Oracle                                                         |
-ROW   |2615     |31247 |Application|Oracle                                                         |
-ROW   |2616     |31248 |Application|Oracle                                                         |
-ROW   |2617     |31249 |Application|Oracle                                                         |
-ROW   |2618     |31250 |Application|Oracle                                                         |
-ROW   |2619     |31251 |Application|Oracle                                                         |
-ROW   |2620     |31252 |Application|Oracle                                                         |
-ROW   |2621     |31180 |Application|Zabbix raw items                                               |
-ROW   |2622     |31181 |Application|Zabbix raw items                                               |
-ROW   |2623     |31182 |Application|Zabbix raw items                                               |
-ROW   |2624     |31185 |Application|Zabbix raw items                                               |
-ROW   |2625     |31186 |Application|Zabbix raw items                                               |
-ROW   |2626     |31187 |Application|Zabbix raw items                                               |
-ROW   |2627     |31188 |Application|Zabbix raw items                                               |
-ROW   |2628     |31275 |Application|PostgreSQL                                                     |
-ROW   |2629     |31282 |Application|PostgreSQL                                                     |
-ROW   |2630     |31283 |Application|PostgreSQL                                                     |
-ROW   |2631     |31284 |Application|PostgreSQL                                                     |
-ROW   |2632     |31285 |Application|PostgreSQL                                                     |
-ROW   |2633     |31286 |Application|PostgreSQL                                                     |
-ROW   |2634     |31287 |Application|PostgreSQL                                                     |
-ROW   |2635     |31288 |Application|PostgreSQL                                                     |
-ROW   |2636     |31291 |Application|PostgreSQL                                                     |
-ROW   |2637     |31293 |Application|PostgreSQL                                                     |
-ROW   |2638     |31294 |Application|PostgreSQL                                                     |
-ROW   |2639     |31295 |Application|PostgreSQL                                                     |
-ROW   |2640     |31296 |Application|PostgreSQL                                                     |
-ROW   |2641     |31297 |Application|PostgreSQL                                                     |
-ROW   |2642     |31298 |Application|PostgreSQL                                                     |
-ROW   |2643     |31299 |Application|PostgreSQL                                                     |
-ROW   |2644     |31300 |Application|PostgreSQL                                                     |
-ROW   |2645     |31301 |Application|PostgreSQL                                                     |
-ROW   |2646     |31302 |Application|PostgreSQL                                                     |
-ROW   |2647     |31303 |Application|PostgreSQL                                                     |
-ROW   |2648     |31304 |Application|PostgreSQL                                                     |
-ROW   |2649     |31305 |Application|PostgreSQL                                                     |
-ROW   |2650     |31306 |Application|PostgreSQL                                                     |
-ROW   |2651     |31307 |Application|PostgreSQL                                                     |
-ROW   |2652     |31309 |Application|PostgreSQL                                                     |
-ROW   |2653     |31310 |Application|PostgreSQL                                                     |
-ROW   |2654     |31311 |Application|PostgreSQL                                                     |
-ROW   |2655     |31312 |Application|PostgreSQL                                                     |
-ROW   |2656     |31313 |Application|PostgreSQL                                                     |
-ROW   |2657     |31314 |Application|PostgreSQL                                                     |
-ROW   |2658     |31315 |Application|PostgreSQL                                                     |
-ROW   |2659     |31316 |Application|PostgreSQL                                                     |
-ROW   |2660     |31317 |Application|PostgreSQL                                                     |
-ROW   |2661     |31318 |Application|PostgreSQL                                                     |
-ROW   |2662     |31319 |Application|PostgreSQL                                                     |
-ROW   |2663     |31320 |Application|PostgreSQL                                                     |
-ROW   |2664     |31321 |Application|PostgreSQL                                                     |
-ROW   |2665     |31322 |Application|PostgreSQL                                                     |
-ROW   |2666     |31323 |Application|PostgreSQL                                                     |
-ROW   |2667     |31324 |Application|PostgreSQL                                                     |
-ROW   |2668     |31325 |Application|PostgreSQL                                                     |
-ROW   |2669     |31326 |Application|PostgreSQL                                                     |
-ROW   |2670     |31327 |Application|PostgreSQL                                                     |
-ROW   |2671     |31328 |Application|PostgreSQL                                                     |
-ROW   |2672     |31329 |Application|PostgreSQL                                                     |
-ROW   |2673     |31330 |Application|PostgreSQL                                                     |
-ROW   |2674     |31331 |Application|PostgreSQL                                                     |
-ROW   |2675     |31332 |Application|PostgreSQL                                                     |
-ROW   |2676     |31333 |Application|PostgreSQL                                                     |
-ROW   |2677     |33172 |Application|PostgreSQL                                                     |
-ROW   |2678     |33173 |Application|PostgreSQL                                                     |
-ROW   |2679     |33174 |Application|PostgreSQL                                                     |
-ROW   |2680     |33176 |Application|PostgreSQL                                                     |
-ROW   |2681     |31274 |Application|Zabbix raw items                                               |
-ROW   |2682     |31276 |Application|Zabbix raw items                                               |
-ROW   |2683     |31277 |Application|Zabbix raw items                                               |
-ROW   |2684     |31279 |Application|Zabbix raw items                                               |
-ROW   |2685     |31280 |Application|Zabbix raw items                                               |
-ROW   |2686     |31289 |Application|Zabbix raw items                                               |
-ROW   |2687     |31290 |Application|Zabbix raw items                                               |
-ROW   |2688     |33175 |Application|Zabbix raw items                                               |
-ROW   |2689     |31572 |Application|PHP-FPM                                                        |
-ROW   |2690     |31573 |Application|PHP-FPM                                                        |
-ROW   |2691     |31574 |Application|PHP-FPM                                                        |
-ROW   |2692     |31575 |Application|PHP-FPM                                                        |
-ROW   |2693     |31576 |Application|PHP-FPM                                                        |
-ROW   |2694     |31577 |Application|PHP-FPM                                                        |
-ROW   |2695     |31578 |Application|PHP-FPM                                                        |
-ROW   |2696     |31579 |Application|PHP-FPM                                                        |
-ROW   |2697     |31580 |Application|PHP-FPM                                                        |
-ROW   |2698     |31581 |Application|PHP-FPM                                                        |
-ROW   |2699     |31582 |Application|PHP-FPM                                                        |
-ROW   |2700     |31583 |Application|PHP-FPM                                                        |
-ROW   |2701     |31584 |Application|PHP-FPM                                                        |
-ROW   |2702     |31585 |Application|PHP-FPM                                                        |
-ROW   |2703     |31586 |Application|PHP-FPM                                                        |
-ROW   |2704     |31587 |Application|PHP-FPM                                                        |
-ROW   |2705     |31588 |Application|PHP-FPM                                                        |
-ROW   |2706     |31589 |Application|PHP-FPM                                                        |
-ROW   |2707     |31590 |Application|PHP-FPM                                                        |
-ROW   |2708     |31591 |Application|PHP-FPM                                                        |
-ROW   |2709     |31592 |Application|PHP-FPM                                                        |
-ROW   |2710     |31570 |Application|Zabbix raw items                                               |
-ROW   |2711     |31571 |Application|Zabbix raw items                                               |
-ROW   |2712     |31593 |Application|PHP-FPM                                                        |
-ROW   |2713     |31596 |Application|PHP-FPM                                                        |
-ROW   |2714     |31597 |Application|PHP-FPM                                                        |
-ROW   |2715     |31598 |Application|PHP-FPM                                                        |
-ROW   |2716     |31599 |Application|PHP-FPM                                                        |
-ROW   |2717     |31600 |Application|PHP-FPM                                                        |
-ROW   |2718     |31601 |Application|PHP-FPM                                                        |
-ROW   |2719     |31602 |Application|PHP-FPM                                                        |
-ROW   |2720     |31603 |Application|PHP-FPM                                                        |
-ROW   |2721     |31604 |Application|PHP-FPM                                                        |
-ROW   |2722     |31605 |Application|PHP-FPM                                                        |
-ROW   |2723     |31606 |Application|PHP-FPM                                                        |
-ROW   |2724     |31607 |Application|PHP-FPM                                                        |
-ROW   |2725     |31608 |Application|PHP-FPM                                                        |
-ROW   |2726     |31609 |Application|PHP-FPM                                                        |
-ROW   |2727     |31610 |Application|PHP-FPM                                                        |
-ROW   |2728     |31611 |Application|PHP-FPM                                                        |
-ROW   |2729     |31594 |Application|Zabbix raw items                                               |
-ROW   |2730     |31595 |Application|Zabbix raw items                                               |
-ROW   |2731     |31684 |Application|Oracle                                                         |
-ROW   |2732     |31685 |Application|Oracle                                                         |
-ROW   |2733     |31687 |Application|Oracle                                                         |
-ROW   |2734     |31695 |Application|Oracle                                                         |
-ROW   |2735     |31696 |Application|Oracle                                                         |
-ROW   |2736     |31701 |Application|Oracle                                                         |
-ROW   |2737     |31702 |Application|Oracle                                                         |
-ROW   |2738     |31703 |Application|Oracle                                                         |
-ROW   |2739     |31704 |Application|Oracle                                                         |
-ROW   |2740     |31705 |Application|Oracle                                                         |
-ROW   |2741     |31706 |Application|Oracle                                                         |
-ROW   |2742     |31707 |Application|Oracle                                                         |
-ROW   |2743     |31708 |Application|Oracle                                                         |
-ROW   |2744     |31709 |Application|Oracle                                                         |
-ROW   |2745     |31710 |Application|Oracle                                                         |
-ROW   |2746     |31711 |Application|Oracle                                                         |
-ROW   |2747     |31712 |Application|Oracle                                                         |
-ROW   |2748     |31713 |Application|Oracle                                                         |
-ROW   |2749     |31714 |Application|Oracle                                                         |
-ROW   |2750     |31715 |Application|Oracle                                                         |
-ROW   |2751     |31716 |Application|Oracle                                                         |
-ROW   |2752     |31717 |Application|Oracle                                                         |
-ROW   |2753     |31718 |Application|Oracle                                                         |
-ROW   |2754     |31719 |Application|Oracle                                                         |
-ROW   |2755     |31720 |Application|Oracle                                                         |
-ROW   |2756     |31721 |Application|Oracle                                                         |
-ROW   |2757     |31722 |Application|Oracle                                                         |
-ROW   |2758     |31723 |Application|Oracle                                                         |
-ROW   |2759     |31724 |Application|Oracle                                                         |
-ROW   |2760     |31725 |Application|Oracle                                                         |
-ROW   |2761     |31726 |Application|Oracle                                                         |
-ROW   |2762     |31727 |Application|Oracle                                                         |
-ROW   |2763     |31728 |Application|Oracle                                                         |
-ROW   |2764     |31729 |Application|Oracle                                                         |
-ROW   |2765     |31730 |Application|Oracle                                                         |
-ROW   |2766     |31731 |Application|Oracle                                                         |
-ROW   |2767     |31732 |Application|Oracle                                                         |
-ROW   |2768     |31733 |Application|Oracle                                                         |
-ROW   |2769     |31734 |Application|Oracle                                                         |
-ROW   |2770     |31735 |Application|Oracle                                                         |
-ROW   |2771     |31736 |Application|Oracle                                                         |
-ROW   |2772     |31737 |Application|Oracle                                                         |
-ROW   |2773     |31738 |Application|Oracle                                                         |
-ROW   |2774     |31739 |Application|Oracle                                                         |
-ROW   |2775     |31740 |Application|Oracle                                                         |
-ROW   |2776     |31741 |Application|Oracle                                                         |
-ROW   |2777     |31742 |Application|Oracle                                                         |
-ROW   |2778     |31743 |Application|Oracle                                                         |
-ROW   |2779     |31744 |Application|Oracle                                                         |
-ROW   |2780     |31745 |Application|Oracle                                                         |
-ROW   |2781     |31746 |Application|Oracle                                                         |
-ROW   |2782     |31747 |Application|Oracle                                                         |
-ROW   |2783     |31748 |Application|Oracle                                                         |
-ROW   |2784     |31749 |Application|Oracle                                                         |
-ROW   |2785     |31750 |Application|Oracle                                                         |
-ROW   |2786     |31751 |Application|Oracle                                                         |
-ROW   |2787     |31752 |Application|Oracle                                                         |
-ROW   |2788     |31753 |Application|Oracle                                                         |
-ROW   |2789     |31754 |Application|Oracle                                                         |
-ROW   |2790     |31755 |Application|Oracle                                                         |
-ROW   |2791     |31756 |Application|Oracle                                                         |
-ROW   |2792     |31757 |Application|Oracle                                                         |
-ROW   |2793     |31758 |Application|Oracle                                                         |
-ROW   |2794     |31759 |Application|Oracle                                                         |
-ROW   |2795     |31760 |Application|Oracle                                                         |
-ROW   |2796     |31686 |Application|Zabbix raw items                                               |
-ROW   |2797     |31688 |Application|Zabbix raw items                                               |
-ROW   |2798     |31689 |Application|Zabbix raw items                                               |
-ROW   |2799     |31690 |Application|Zabbix raw items                                               |
-ROW   |2800     |31691 |Application|Zabbix raw items                                               |
-ROW   |2801     |31692 |Application|Zabbix raw items                                               |
-ROW   |2802     |31693 |Application|Zabbix raw items                                               |
-ROW   |2803     |31694 |Application|Zabbix raw items                                               |
-ROW   |2804     |31697 |Application|Zabbix raw items                                               |
-ROW   |2805     |31698 |Application|Zabbix raw items                                               |
-ROW   |2806     |31699 |Application|Zabbix raw items                                               |
-ROW   |2807     |31700 |Application|Zabbix raw items                                               |
-ROW   |2808     |31782 |Application|Asterisk                                                       |
-ROW   |2809     |31783 |Application|Asterisk                                                       |
-ROW   |2810     |31785 |Application|Asterisk                                                       |
-ROW   |2811     |31786 |Application|Asterisk                                                       |
-ROW   |2812     |31787 |Application|Asterisk                                                       |
-ROW   |2813     |31788 |Application|Asterisk                                                       |
-ROW   |2814     |31789 |Application|Asterisk                                                       |
-ROW   |2815     |31790 |Application|Asterisk                                                       |
-ROW   |2816     |31791 |Application|Asterisk                                                       |
-ROW   |2817     |31792 |Application|Asterisk                                                       |
-ROW   |2818     |31793 |Application|Asterisk                                                       |
-ROW   |2819     |31794 |Application|Asterisk                                                       |
-ROW   |2820     |31795 |Application|Asterisk                                                       |
-ROW   |2821     |31796 |Application|Asterisk                                                       |
-ROW   |2822     |31797 |Application|Asterisk                                                       |
-ROW   |2823     |31798 |Application|Asterisk                                                       |
-ROW   |2824     |31799 |Application|Asterisk                                                       |
-ROW   |2825     |31800 |Application|Asterisk                                                       |
-ROW   |2826     |31801 |Application|Asterisk                                                       |
-ROW   |2827     |31802 |Application|Asterisk                                                       |
-ROW   |2828     |33389 |Application|Asterisk                                                       |
-ROW   |2829     |33390 |Application|Asterisk                                                       |
-ROW   |2830     |31784 |Application|Zabbix raw items                                               |
-ROW   |2831     |31904 |Application|Zabbix raw items                                               |
-ROW   |2832     |31934 |Application|Zabbix raw items                                               |
-ROW   |2833     |31937 |Application|Zabbix raw items                                               |
-ROW   |2834     |31820 |Application|CPU                                                            |
-ROW   |2835     |31821 |Application|CPU                                                            |
-ROW   |2836     |31822 |Application|CPU                                                            |
-ROW   |2837     |31823 |Application|CPU                                                            |
-ROW   |2838     |31824 |Application|CPU                                                            |
-ROW   |2839     |31825 |Application|CPU                                                            |
-ROW   |2840     |31826 |Application|CPU                                                            |
-ROW   |2841     |31827 |Application|CPU                                                            |
-ROW   |2842     |31828 |Application|CPU                                                            |
-ROW   |2843     |31829 |Application|CPU                                                            |
-ROW   |2844     |31830 |Application|CPU                                                            |
-ROW   |2845     |31831 |Application|CPU                                                            |
-ROW   |2846     |31832 |Application|CPU                                                            |
-ROW   |2847     |31833 |Application|CPU                                                            |
-ROW   |2848     |31834 |Application|CPU                                                            |
-ROW   |2849     |31835 |Application|CPU                                                            |
-ROW   |2850     |31892 |Application|CPU                                                            |
-ROW   |2851     |31836 |Application|General                                                        |
-ROW   |2852     |31837 |Application|General                                                        |
-ROW   |2853     |31838 |Application|General                                                        |
-ROW   |2854     |31839 |Application|General                                                        |
-ROW   |2855     |31840 |Application|General                                                        |
-ROW   |2856     |31841 |Application|General                                                        |
-ROW   |2857     |31842 |Application|General                                                        |
-ROW   |2858     |31846 |Application|General                                                        |
-ROW   |2859     |31848 |Application|General                                                        |
-ROW   |2860     |31843 |Application|Inventory                                                      |
-ROW   |2861     |31844 |Application|Inventory                                                      |
-ROW   |2862     |31845 |Application|Inventory                                                      |
-ROW   |2863     |31849 |Application|Security                                                       |
-ROW   |2864     |31847 |Application|Status                                                         |
-ROW   |2865     |31850 |Application|Memory                                                         |
-ROW   |2866     |31851 |Application|Memory                                                         |
-ROW   |2867     |31852 |Application|Memory                                                         |
-ROW   |2868     |31853 |Application|Memory                                                         |
-ROW   |2869     |31854 |Application|Memory                                                         |
-ROW   |2870     |31855 |Application|Memory                                                         |
-ROW   |2871     |31893 |Application|Memory                                                         |
-ROW   |2872     |31856 |Application|CPU                                                            |
-ROW   |2873     |31857 |Application|CPU                                                            |
-ROW   |2874     |31858 |Application|CPU                                                            |
-ROW   |2875     |31859 |Application|CPU                                                            |
-ROW   |2876     |31860 |Application|CPU                                                            |
-ROW   |2877     |31861 |Application|CPU                                                            |
-ROW   |2878     |31862 |Application|CPU                                                            |
-ROW   |2879     |31863 |Application|CPU                                                            |
-ROW   |2880     |31864 |Application|CPU                                                            |
-ROW   |2881     |31865 |Application|CPU                                                            |
-ROW   |2882     |31866 |Application|CPU                                                            |
-ROW   |2883     |31867 |Application|CPU                                                            |
-ROW   |2884     |31868 |Application|CPU                                                            |
-ROW   |2885     |31869 |Application|CPU                                                            |
-ROW   |2886     |31870 |Application|CPU                                                            |
-ROW   |2887     |31871 |Application|CPU                                                            |
-ROW   |2888     |31894 |Application|CPU                                                            |
-ROW   |2889     |31872 |Application|General                                                        |
-ROW   |2890     |31873 |Application|General                                                        |
-ROW   |2891     |31874 |Application|General                                                        |
-ROW   |2892     |31875 |Application|General                                                        |
-ROW   |2893     |31876 |Application|General                                                        |
-ROW   |2894     |31877 |Application|General                                                        |
-ROW   |2895     |31878 |Application|General                                                        |
-ROW   |2896     |31882 |Application|General                                                        |
-ROW   |2897     |31884 |Application|General                                                        |
-ROW   |2898     |31879 |Application|Inventory                                                      |
-ROW   |2899     |31880 |Application|Inventory                                                      |
-ROW   |2900     |31881 |Application|Inventory                                                      |
-ROW   |2901     |31886 |Application|Memory                                                         |
-ROW   |2902     |31887 |Application|Memory                                                         |
-ROW   |2903     |31888 |Application|Memory                                                         |
-ROW   |2904     |31889 |Application|Memory                                                         |
-ROW   |2905     |31890 |Application|Memory                                                         |
-ROW   |2906     |31891 |Application|Memory                                                         |
-ROW   |2907     |31895 |Application|Memory                                                         |
-ROW   |2908     |31816 |Application|Monitoring agent                                               |
-ROW   |2909     |31817 |Application|Monitoring agent                                               |
-ROW   |2910     |31818 |Application|Monitoring agent                                               |
-ROW   |2911     |31885 |Application|Security                                                       |
-ROW   |2912     |31819 |Application|Status                                                         |
-ROW   |2913     |31883 |Application|Status                                                         |
-ROW   |2914     |31919 |Application|Zabbix raw items                                               |
-ROW   |2915     |31940 |Application|Zabbix raw items                                               |
-ROW   |2916     |31943 |Application|Zabbix raw items                                               |
-ROW   |2917     |31948 |Application|CPU                                                            |
-ROW   |2918     |31949 |Application|CPU                                                            |
-ROW   |2919     |31950 |Application|CPU                                                            |
-ROW   |2920     |31951 |Application|CPU                                                            |
-ROW   |2921     |31952 |Application|CPU                                                            |
-ROW   |2922     |31953 |Application|CPU                                                            |
-ROW   |2923     |31954 |Application|CPU                                                            |
-ROW   |2924     |31955 |Application|CPU                                                            |
-ROW   |2925     |31956 |Application|General                                                        |
-ROW   |2926     |31957 |Application|General                                                        |
-ROW   |2927     |31958 |Application|General                                                        |
-ROW   |2928     |31959 |Application|General                                                        |
-ROW   |2929     |31961 |Application|General                                                        |
-ROW   |2930     |31960 |Application|Inventory                                                      |
-ROW   |2931     |31962 |Application|Status                                                         |
-ROW   |2932     |31963 |Application|Memory                                                         |
-ROW   |2933     |31964 |Application|Memory                                                         |
-ROW   |2934     |31965 |Application|Memory                                                         |
-ROW   |2935     |31966 |Application|Memory                                                         |
-ROW   |2936     |31967 |Application|Memory                                                         |
-ROW   |2937     |31968 |Application|Memory                                                         |
-ROW   |2938     |31969 |Application|Memory                                                         |
-ROW   |2939     |31970 |Application|Memory                                                         |
-ROW   |2940     |31971 |Application|Memory                                                         |
-ROW   |2941     |31972 |Application|Memory                                                         |
-ROW   |2942     |31973 |Application|Memory                                                         |
-ROW   |2943     |32002 |Application|Memory                                                         |
-ROW   |2944     |31974 |Application|Zabbix raw items                                               |
-ROW   |2945     |32025 |Application|Services                                                       |
-ROW   |2946     |31975 |Application|CPU                                                            |
-ROW   |2947     |31976 |Application|CPU                                                            |
-ROW   |2948     |31977 |Application|CPU                                                            |
-ROW   |2949     |31978 |Application|CPU                                                            |
-ROW   |2950     |31979 |Application|CPU                                                            |
-ROW   |2951     |31980 |Application|CPU                                                            |
-ROW   |2952     |31981 |Application|CPU                                                            |
-ROW   |2953     |31982 |Application|CPU                                                            |
-ROW   |2954     |31983 |Application|General                                                        |
-ROW   |2955     |31984 |Application|General                                                        |
-ROW   |2956     |31985 |Application|General                                                        |
-ROW   |2957     |31986 |Application|General                                                        |
-ROW   |2958     |31988 |Application|General                                                        |
-ROW   |2959     |31987 |Application|Inventory                                                      |
-ROW   |2960     |31990 |Application|Memory                                                         |
-ROW   |2961     |31991 |Application|Memory                                                         |
-ROW   |2962     |31992 |Application|Memory                                                         |
-ROW   |2963     |31993 |Application|Memory                                                         |
-ROW   |2964     |31994 |Application|Memory                                                         |
-ROW   |2965     |31995 |Application|Memory                                                         |
-ROW   |2966     |31996 |Application|Memory                                                         |
-ROW   |2967     |31997 |Application|Memory                                                         |
-ROW   |2968     |31998 |Application|Memory                                                         |
-ROW   |2969     |31999 |Application|Memory                                                         |
-ROW   |2970     |32000 |Application|Memory                                                         |
-ROW   |2971     |32003 |Application|Memory                                                         |
-ROW   |2972     |31944 |Application|Monitoring agent                                               |
-ROW   |2973     |31945 |Application|Monitoring agent                                               |
-ROW   |2974     |31946 |Application|Monitoring agent                                               |
-ROW   |2975     |32039 |Application|Services                                                       |
-ROW   |2976     |31947 |Application|Status                                                         |
-ROW   |2977     |31989 |Application|Status                                                         |
-ROW   |2978     |32001 |Application|Zabbix raw items                                               |
-ROW   |2979     |32120 |Application|Ceph                                                           |
-ROW   |2980     |32122 |Application|Ceph                                                           |
-ROW   |2981     |32123 |Application|Ceph                                                           |
-ROW   |2982     |32124 |Application|Ceph                                                           |
-ROW   |2983     |32125 |Application|Ceph                                                           |
-ROW   |2984     |32126 |Application|Ceph                                                           |
-ROW   |2985     |32127 |Application|Ceph                                                           |
-ROW   |2986     |32128 |Application|Ceph                                                           |
-ROW   |2987     |32129 |Application|Ceph                                                           |
-ROW   |2988     |32130 |Application|Ceph                                                           |
-ROW   |2989     |32131 |Application|Ceph                                                           |
-ROW   |2990     |32132 |Application|Ceph                                                           |
-ROW   |2991     |32133 |Application|Ceph                                                           |
-ROW   |2992     |32134 |Application|Ceph                                                           |
-ROW   |2993     |32135 |Application|Ceph                                                           |
-ROW   |2994     |32136 |Application|Ceph                                                           |
-ROW   |2995     |32137 |Application|Ceph                                                           |
-ROW   |2996     |32138 |Application|Ceph                                                           |
-ROW   |2997     |32139 |Application|Ceph                                                           |
-ROW   |2998     |32140 |Application|Ceph                                                           |
-ROW   |2999     |32141 |Application|Ceph                                                           |
-ROW   |3000     |32142 |Application|Ceph                                                           |
-ROW   |3001     |32143 |Application|Ceph                                                           |
-ROW   |3002     |32144 |Application|Ceph                                                           |
-ROW   |3003     |32145 |Application|Ceph                                                           |
-ROW   |3004     |32146 |Application|Ceph                                                           |
-ROW   |3005     |32147 |Application|Ceph                                                           |
-ROW   |3006     |32148 |Application|Ceph                                                           |
-ROW   |3007     |32149 |Application|Ceph                                                           |
-ROW   |3008     |32150 |Application|Ceph                                                           |
-ROW   |3009     |32151 |Application|Ceph                                                           |
-ROW   |3010     |32152 |Application|Ceph                                                           |
-ROW   |3011     |32153 |Application|Ceph                                                           |
-ROW   |3012     |32154 |Application|Ceph                                                           |
-ROW   |3013     |32155 |Application|Ceph                                                           |
-ROW   |3014     |32156 |Application|Ceph                                                           |
-ROW   |3015     |32157 |Application|Ceph                                                           |
-ROW   |3016     |32158 |Application|Ceph                                                           |
-ROW   |3017     |32159 |Application|Ceph                                                           |
-ROW   |3018     |32160 |Application|Ceph                                                           |
-ROW   |3019     |32161 |Application|Ceph                                                           |
-ROW   |3020     |32162 |Application|Ceph                                                           |
-ROW   |3021     |32163 |Application|Ceph                                                           |
-ROW   |3022     |32164 |Application|Ceph                                                           |
-ROW   |3023     |32165 |Application|Ceph                                                           |
-ROW   |3024     |32166 |Application|Ceph                                                           |
-ROW   |3025     |32167 |Application|Ceph                                                           |
-ROW   |3026     |32117 |Application|Zabbix raw items                                               |
-ROW   |3027     |32118 |Application|Zabbix raw items                                               |
-ROW   |3028     |32119 |Application|Zabbix raw items                                               |
-ROW   |3029     |32121 |Application|Zabbix raw items                                               |
-ROW   |3030     |32239 |Application|Squid                                                          |
-ROW   |3031     |32240 |Application|Squid                                                          |
-ROW   |3032     |32241 |Application|Squid                                                          |
-ROW   |3033     |32242 |Application|Squid                                                          |
-ROW   |3034     |32243 |Application|Squid                                                          |
-ROW   |3035     |32244 |Application|Squid                                                          |
-ROW   |3036     |32245 |Application|Squid                                                          |
-ROW   |3037     |32246 |Application|Squid                                                          |
-ROW   |3038     |32247 |Application|Squid                                                          |
-ROW   |3039     |32248 |Application|Squid                                                          |
-ROW   |3040     |32249 |Application|Squid                                                          |
-ROW   |3041     |32250 |Application|Squid                                                          |
-ROW   |3042     |32251 |Application|Squid                                                          |
-ROW   |3043     |32252 |Application|Squid                                                          |
-ROW   |3044     |32253 |Application|Squid                                                          |
-ROW   |3045     |32254 |Application|Squid                                                          |
-ROW   |3046     |32255 |Application|Squid                                                          |
-ROW   |3047     |32256 |Application|Squid                                                          |
-ROW   |3048     |32257 |Application|Squid                                                          |
-ROW   |3049     |32258 |Application|Squid                                                          |
-ROW   |3050     |32259 |Application|Squid                                                          |
-ROW   |3051     |32260 |Application|Squid                                                          |
-ROW   |3052     |32261 |Application|Squid                                                          |
-ROW   |3053     |32262 |Application|Squid                                                          |
-ROW   |3054     |32263 |Application|Squid                                                          |
-ROW   |3055     |32264 |Application|Squid                                                          |
-ROW   |3056     |32265 |Application|Squid                                                          |
-ROW   |3057     |32266 |Application|Squid                                                          |
-ROW   |3058     |32267 |Application|Squid                                                          |
-ROW   |3059     |32268 |Application|Squid                                                          |
-ROW   |3060     |32269 |Application|Squid                                                          |
-ROW   |3061     |32270 |Application|Squid                                                          |
-ROW   |3062     |32271 |Application|Squid                                                          |
-ROW   |3063     |32272 |Application|Squid                                                          |
-ROW   |3064     |32273 |Application|Squid                                                          |
-ROW   |3065     |32274 |Application|Squid                                                          |
-ROW   |3066     |32275 |Application|Squid                                                          |
-ROW   |3067     |32276 |Application|Squid                                                          |
-ROW   |3068     |32277 |Application|Squid                                                          |
-ROW   |3069     |32278 |Application|Squid                                                          |
-ROW   |3070     |32279 |Application|Squid                                                          |
-ROW   |3071     |32280 |Application|Squid                                                          |
-ROW   |3072     |32281 |Application|Squid                                                          |
-ROW   |3073     |32282 |Application|Squid                                                          |
-ROW   |3074     |32283 |Application|Squid                                                          |
-ROW   |3075     |32284 |Application|Squid                                                          |
-ROW   |3076     |32285 |Application|Squid                                                          |
-ROW   |3077     |32286 |Application|Squid                                                          |
-ROW   |3078     |32287 |Application|Squid                                                          |
-ROW   |3079     |32288 |Application|Squid                                                          |
-ROW   |3080     |32289 |Application|Squid                                                          |
-ROW   |3081     |32290 |Application|Squid                                                          |
-ROW   |3082     |32291 |Application|Squid                                                          |
-ROW   |3083     |32292 |Application|Squid                                                          |
-ROW   |3084     |32366 |Application|PostgreSQL                                                     |
-ROW   |3085     |32367 |Application|PostgreSQL                                                     |
-ROW   |3086     |32369 |Application|PostgreSQL                                                     |
-ROW   |3087     |32370 |Application|PostgreSQL                                                     |
-ROW   |3088     |32371 |Application|PostgreSQL                                                     |
-ROW   |3089     |32372 |Application|PostgreSQL                                                     |
-ROW   |3090     |32373 |Application|PostgreSQL                                                     |
-ROW   |3091     |32374 |Application|PostgreSQL                                                     |
-ROW   |3092     |32377 |Application|PostgreSQL                                                     |
-ROW   |3093     |32378 |Application|PostgreSQL                                                     |
-ROW   |3094     |32381 |Application|PostgreSQL                                                     |
-ROW   |3095     |32382 |Application|PostgreSQL                                                     |
-ROW   |3096     |32383 |Application|PostgreSQL                                                     |
-ROW   |3097     |32384 |Application|PostgreSQL                                                     |
-ROW   |3098     |32385 |Application|PostgreSQL                                                     |
-ROW   |3099     |32386 |Application|PostgreSQL                                                     |
-ROW   |3100     |32387 |Application|PostgreSQL                                                     |
-ROW   |3101     |32388 |Application|PostgreSQL                                                     |
-ROW   |3102     |32389 |Application|PostgreSQL                                                     |
-ROW   |3103     |32390 |Application|PostgreSQL                                                     |
-ROW   |3104     |32391 |Application|PostgreSQL                                                     |
-ROW   |3105     |32392 |Application|PostgreSQL                                                     |
-ROW   |3106     |32393 |Application|PostgreSQL                                                     |
-ROW   |3107     |32394 |Application|PostgreSQL                                                     |
-ROW   |3108     |32395 |Application|PostgreSQL                                                     |
-ROW   |3109     |32396 |Application|PostgreSQL                                                     |
-ROW   |3110     |32397 |Application|PostgreSQL                                                     |
-ROW   |3111     |32398 |Application|PostgreSQL                                                     |
-ROW   |3112     |32399 |Application|PostgreSQL                                                     |
-ROW   |3113     |32400 |Application|PostgreSQL                                                     |
-ROW   |3114     |32401 |Application|PostgreSQL                                                     |
-ROW   |3115     |32402 |Application|PostgreSQL                                                     |
-ROW   |3116     |32403 |Application|PostgreSQL                                                     |
-ROW   |3117     |32364 |Application|Zabbix raw items                                               |
-ROW   |3118     |32365 |Application|Zabbix raw items                                               |
-ROW   |3119     |32368 |Application|Zabbix raw items                                               |
-ROW   |3120     |32375 |Application|Zabbix raw items                                               |
-ROW   |3121     |32376 |Application|Zabbix raw items                                               |
-ROW   |3122     |32379 |Application|Zabbix raw items                                               |
-ROW   |3123     |32380 |Application|Zabbix raw items                                               |
-ROW   |3124     |32406 |Application|Zabbix raw items                                               |
-ROW   |3125     |32407 |Application|Zabbix raw items                                               |
-ROW   |3126     |32463 |Application|Zabbix raw items                                               |
-ROW   |3127     |32464 |Application|Zabbix raw items                                               |
-ROW   |3128     |32516 |Application|MS Exchange                                                    |
-ROW   |3129     |32517 |Application|MS Exchange                                                    |
-ROW   |3130     |32518 |Application|MS Exchange                                                    |
-ROW   |3131     |32519 |Application|MS Exchange                                                    |
-ROW   |3132     |32520 |Application|MS Exchange                                                    |
-ROW   |3133     |32521 |Application|MS Exchange                                                    |
-ROW   |3134     |32522 |Application|MS Exchange                                                    |
-ROW   |3135     |32523 |Application|MS Exchange                                                    |
-ROW   |3136     |32524 |Application|MS Exchange                                                    |
-ROW   |3137     |32543 |Application|MS Exchange                                                    |
-ROW   |3138     |32544 |Application|MS Exchange                                                    |
-ROW   |3139     |32545 |Application|MS Exchange                                                    |
-ROW   |3140     |32546 |Application|MS Exchange                                                    |
-ROW   |3141     |32547 |Application|MS Exchange                                                    |
-ROW   |3142     |32548 |Application|MS Exchange                                                    |
-ROW   |3143     |32549 |Application|MS Exchange                                                    |
-ROW   |3144     |32550 |Application|MS Exchange                                                    |
-ROW   |3145     |32551 |Application|MS Exchange                                                    |
-ROW   |3146     |32552 |Application|MS Exchange                                                    |
-ROW   |3147     |32553 |Application|MS Exchange                                                    |
-ROW   |3148     |32554 |Application|MS Exchange                                                    |
-ROW   |3149     |32573 |Application|MS Exchange                                                    |
-ROW   |3150     |32574 |Application|MS Exchange                                                    |
-ROW   |3151     |32575 |Application|MS Exchange                                                    |
-ROW   |3152     |32576 |Application|GitLab                                                         |
-ROW   |3153     |32577 |Application|GitLab                                                         |
-ROW   |3154     |32579 |Application|GitLab                                                         |
-ROW   |3155     |32580 |Application|GitLab                                                         |
-ROW   |3156     |32581 |Application|GitLab                                                         |
-ROW   |3157     |32582 |Application|GitLab                                                         |
-ROW   |3158     |32583 |Application|GitLab                                                         |
-ROW   |3159     |32584 |Application|GitLab                                                         |
-ROW   |3160     |32585 |Application|GitLab                                                         |
-ROW   |3161     |32586 |Application|GitLab                                                         |
-ROW   |3162     |32587 |Application|GitLab                                                         |
-ROW   |3163     |32588 |Application|GitLab                                                         |
-ROW   |3164     |32589 |Application|GitLab                                                         |
-ROW   |3165     |32590 |Application|GitLab                                                         |
-ROW   |3166     |32591 |Application|GitLab                                                         |
-ROW   |3167     |32592 |Application|GitLab                                                         |
-ROW   |3168     |32593 |Application|GitLab                                                         |
-ROW   |3169     |32594 |Application|GitLab                                                         |
-ROW   |3170     |32595 |Application|GitLab                                                         |
-ROW   |3171     |32596 |Application|GitLab                                                         |
-ROW   |3172     |32597 |Application|GitLab                                                         |
-ROW   |3173     |32598 |Application|GitLab                                                         |
-ROW   |3174     |32599 |Application|GitLab                                                         |
-ROW   |3175     |32600 |Application|GitLab                                                         |
-ROW   |3176     |32601 |Application|GitLab                                                         |
-ROW   |3177     |32602 |Application|GitLab                                                         |
-ROW   |3178     |32603 |Application|GitLab                                                         |
-ROW   |3179     |32604 |Application|GitLab                                                         |
-ROW   |3180     |32605 |Application|GitLab                                                         |
-ROW   |3181     |32606 |Application|GitLab                                                         |
-ROW   |3182     |32607 |Application|GitLab                                                         |
-ROW   |3183     |32608 |Application|GitLab                                                         |
-ROW   |3184     |32609 |Application|GitLab                                                         |
-ROW   |3185     |32610 |Application|GitLab                                                         |
-ROW   |3186     |32611 |Application|GitLab                                                         |
-ROW   |3187     |32612 |Application|GitLab                                                         |
-ROW   |3188     |32613 |Application|GitLab                                                         |
-ROW   |3189     |32614 |Application|GitLab                                                         |
-ROW   |3190     |32615 |Application|GitLab                                                         |
-ROW   |3191     |32616 |Application|GitLab                                                         |
-ROW   |3192     |32617 |Application|GitLab                                                         |
-ROW   |3193     |32618 |Application|GitLab                                                         |
-ROW   |3194     |32621 |Application|GitLab: Puma stats                                             |
-ROW   |3195     |32622 |Application|GitLab: Puma stats                                             |
-ROW   |3196     |32623 |Application|GitLab: Puma stats                                             |
-ROW   |3197     |32624 |Application|GitLab: Puma stats                                             |
-ROW   |3198     |32625 |Application|GitLab: Puma stats                                             |
-ROW   |3199     |32626 |Application|GitLab: Puma stats                                             |
-ROW   |3200     |32627 |Application|GitLab: Puma stats                                             |
-ROW   |3201     |32628 |Application|GitLab: Puma stats                                             |
-ROW   |3202     |32629 |Application|GitLab: Puma stats                                             |
-ROW   |3203     |32630 |Application|GitLab: Puma stats                                             |
-ROW   |3204     |32631 |Application|GitLab: Unicorn stats                                          |
-ROW   |3205     |32632 |Application|GitLab: Unicorn stats                                          |
-ROW   |3206     |32633 |Application|GitLab: Unicorn stats                                          |
-ROW   |3207     |32578 |Application|Zabbix raw items                                               |
-ROW   |3208     |32636 |Application|Hadoop                                                         |
-ROW   |3209     |32637 |Application|Hadoop                                                         |
-ROW   |3210     |32638 |Application|Hadoop                                                         |
-ROW   |3211     |32640 |Application|Hadoop                                                         |
-ROW   |3212     |32642 |Application|Hadoop                                                         |
-ROW   |3213     |32643 |Application|Hadoop                                                         |
-ROW   |3214     |32644 |Application|Hadoop                                                         |
-ROW   |3215     |32645 |Application|Hadoop                                                         |
-ROW   |3216     |32646 |Application|Hadoop                                                         |
-ROW   |3217     |32647 |Application|Hadoop                                                         |
-ROW   |3218     |32648 |Application|Hadoop                                                         |
-ROW   |3219     |32649 |Application|Hadoop                                                         |
-ROW   |3220     |32650 |Application|Hadoop                                                         |
-ROW   |3221     |32651 |Application|Hadoop                                                         |
-ROW   |3222     |32652 |Application|Hadoop                                                         |
-ROW   |3223     |32653 |Application|Hadoop                                                         |
-ROW   |3224     |32654 |Application|Hadoop                                                         |
-ROW   |3225     |32655 |Application|Hadoop                                                         |
-ROW   |3226     |32656 |Application|Hadoop                                                         |
-ROW   |3227     |32657 |Application|Hadoop                                                         |
-ROW   |3228     |32658 |Application|Hadoop                                                         |
-ROW   |3229     |32659 |Application|Hadoop                                                         |
-ROW   |3230     |32660 |Application|Hadoop                                                         |
-ROW   |3231     |32661 |Application|Hadoop                                                         |
-ROW   |3232     |32662 |Application|Hadoop                                                         |
-ROW   |3233     |32663 |Application|Hadoop                                                         |
-ROW   |3234     |32664 |Application|Hadoop                                                         |
-ROW   |3235     |32665 |Application|Hadoop                                                         |
-ROW   |3236     |32666 |Application|Hadoop                                                         |
-ROW   |3237     |32667 |Application|Hadoop                                                         |
-ROW   |3238     |32634 |Application|Zabbix raw items                                               |
-ROW   |3239     |32635 |Application|Zabbix raw items                                               |
-ROW   |3240     |32639 |Application|Zabbix raw items                                               |
-ROW   |3241     |32641 |Application|Zabbix raw items                                               |
-ROW   |3242     |32670 |Application|Zabbix raw items                                               |
-ROW   |3243     |32671 |Application|Zabbix raw items                                               |
-ROW   |3244     |32693 |Application|Kafka                                                          |
-ROW   |3245     |32694 |Application|Kafka                                                          |
-ROW   |3246     |32695 |Application|Kafka                                                          |
-ROW   |3247     |32696 |Application|Kafka                                                          |
-ROW   |3248     |32697 |Application|Kafka                                                          |
-ROW   |3249     |32698 |Application|Kafka                                                          |
-ROW   |3250     |32699 |Application|Kafka                                                          |
-ROW   |3251     |32700 |Application|Kafka                                                          |
-ROW   |3252     |32701 |Application|Kafka                                                          |
-ROW   |3253     |32702 |Application|Kafka                                                          |
-ROW   |3254     |32703 |Application|Kafka                                                          |
-ROW   |3255     |32704 |Application|Kafka                                                          |
-ROW   |3256     |32705 |Application|Kafka                                                          |
-ROW   |3257     |32706 |Application|Kafka                                                          |
-ROW   |3258     |32707 |Application|Kafka                                                          |
-ROW   |3259     |32708 |Application|Kafka                                                          |
-ROW   |3260     |32709 |Application|Kafka                                                          |
-ROW   |3261     |32710 |Application|Kafka                                                          |
-ROW   |3262     |32711 |Application|Kafka                                                          |
-ROW   |3263     |32712 |Application|Kafka                                                          |
-ROW   |3264     |32713 |Application|Kafka                                                          |
-ROW   |3265     |32714 |Application|Kafka                                                          |
-ROW   |3266     |32715 |Application|Kafka                                                          |
-ROW   |3267     |32716 |Application|Kafka                                                          |
-ROW   |3268     |32717 |Application|Kafka                                                          |
-ROW   |3269     |32718 |Application|Kafka                                                          |
-ROW   |3270     |32719 |Application|Kafka                                                          |
-ROW   |3271     |32720 |Application|Kafka                                                          |
-ROW   |3272     |32721 |Application|Kafka                                                          |
-ROW   |3273     |32722 |Application|Kafka                                                          |
-ROW   |3274     |32723 |Application|Kafka                                                          |
-ROW   |3275     |32724 |Application|Kafka                                                          |
-ROW   |3276     |32725 |Application|Kafka                                                          |
-ROW   |3277     |32726 |Application|Kafka                                                          |
-ROW   |3278     |32727 |Application|Kafka                                                          |
-ROW   |3279     |32728 |Application|Kafka                                                          |
-ROW   |3280     |32729 |Application|Kafka                                                          |
-ROW   |3281     |32730 |Application|Kafka                                                          |
-ROW   |3282     |32731 |Application|Kafka                                                          |
-ROW   |3283     |32732 |Application|Kafka                                                          |
-ROW   |3284     |32733 |Application|Kafka                                                          |
-ROW   |3285     |32734 |Application|Kafka                                                          |
-ROW   |3286     |32735 |Application|Kafka                                                          |
-ROW   |3287     |32736 |Application|Kafka                                                          |
-ROW   |3288     |32737 |Application|Kafka                                                          |
-ROW   |3289     |32738 |Application|Kafka                                                          |
-ROW   |3290     |32739 |Application|Kafka                                                          |
-ROW   |3291     |32740 |Application|Kafka                                                          |
-ROW   |3292     |32741 |Application|Kafka                                                          |
-ROW   |3293     |32742 |Application|Kafka                                                          |
-ROW   |3294     |32743 |Application|Kafka                                                          |
-ROW   |3295     |32744 |Application|Kafka                                                          |
-ROW   |3296     |32745 |Application|Kafka                                                          |
-ROW   |3297     |32746 |Application|Kafka                                                          |
-ROW   |3298     |32747 |Application|Kafka                                                          |
-ROW   |3299     |32748 |Application|Kafka                                                          |
-ROW   |3300     |32749 |Application|Kafka                                                          |
-ROW   |3301     |32750 |Application|Kafka                                                          |
-ROW   |3302     |32751 |Application|Kafka                                                          |
-ROW   |3303     |32752 |Application|Kafka                                                          |
-ROW   |3304     |32753 |Application|Kafka                                                          |
-ROW   |3305     |32754 |Application|Kafka                                                          |
-ROW   |3306     |32784 |Application|Vault                                                          |
-ROW   |3307     |32785 |Application|Vault                                                          |
-ROW   |3308     |32786 |Application|Vault                                                          |
-ROW   |3309     |32787 |Application|Vault                                                          |
-ROW   |3310     |32788 |Application|Vault                                                          |
-ROW   |3311     |32789 |Application|Vault                                                          |
-ROW   |3312     |32790 |Application|Vault                                                          |
-ROW   |3313     |32791 |Application|Vault                                                          |
-ROW   |3314     |32792 |Application|Vault                                                          |
-ROW   |3315     |32793 |Application|Vault                                                          |
-ROW   |3316     |32794 |Application|Vault                                                          |
-ROW   |3317     |32796 |Application|Vault                                                          |
-ROW   |3318     |32797 |Application|Vault                                                          |
-ROW   |3319     |32798 |Application|Vault                                                          |
-ROW   |3320     |32799 |Application|Vault                                                          |
-ROW   |3321     |32800 |Application|Vault                                                          |
-ROW   |3322     |32801 |Application|Vault                                                          |
-ROW   |3323     |32802 |Application|Vault                                                          |
-ROW   |3324     |32804 |Application|Vault                                                          |
-ROW   |3325     |32805 |Application|Vault                                                          |
-ROW   |3326     |32806 |Application|Vault                                                          |
-ROW   |3327     |32807 |Application|Vault                                                          |
-ROW   |3328     |32808 |Application|Vault                                                          |
-ROW   |3329     |32809 |Application|Vault                                                          |
-ROW   |3330     |32810 |Application|Vault                                                          |
-ROW   |3331     |32811 |Application|Vault                                                          |
-ROW   |3332     |32812 |Application|Vault                                                          |
-ROW   |3333     |32813 |Application|Vault                                                          |
-ROW   |3334     |32814 |Application|Vault                                                          |
-ROW   |3335     |32815 |Application|Vault                                                          |
-ROW   |3336     |32816 |Application|Vault                                                          |
-ROW   |3337     |32817 |Application|Vault                                                          |
-ROW   |3338     |32818 |Application|Vault                                                          |
-ROW   |3339     |32819 |Application|Vault                                                          |
-ROW   |3340     |32820 |Application|Vault                                                          |
-ROW   |3341     |32821 |Application|Vault                                                          |
-ROW   |3342     |32822 |Application|Vault                                                          |
-ROW   |3343     |32823 |Application|Vault                                                          |
-ROW   |3344     |32824 |Application|Vault                                                          |
-ROW   |3345     |32825 |Application|Vault                                                          |
-ROW   |3346     |32826 |Application|Vault                                                          |
-ROW   |3347     |32827 |Application|Vault                                                          |
-ROW   |3348     |32828 |Application|Vault                                                          |
-ROW   |3349     |32829 |Application|Vault                                                          |
-ROW   |3350     |32830 |Application|Vault                                                          |
-ROW   |3351     |32831 |Application|Vault                                                          |
-ROW   |3352     |32832 |Application|Vault                                                          |
-ROW   |3353     |32833 |Application|Vault                                                          |
-ROW   |3354     |32834 |Application|Vault                                                          |
-ROW   |3355     |32835 |Application|Vault                                                          |
-ROW   |3356     |32836 |Application|Vault                                                          |
-ROW   |3357     |32837 |Application|Vault                                                          |
-ROW   |3358     |32838 |Application|Vault                                                          |
-ROW   |3359     |32839 |Application|Vault                                                          |
-ROW   |3360     |32840 |Application|Vault                                                          |
-ROW   |3361     |32841 |Application|Vault                                                          |
-ROW   |3362     |32842 |Application|Vault                                                          |
-ROW   |3363     |32843 |Application|Vault                                                          |
-ROW   |3364     |32844 |Application|Vault                                                          |
-ROW   |3365     |32847 |Application|Vault                                                          |
-ROW   |3366     |32848 |Application|Vault                                                          |
-ROW   |3367     |32849 |Application|Vault                                                          |
-ROW   |3368     |32851 |Application|Vault                                                          |
-ROW   |3369     |32852 |Application|Vault                                                          |
-ROW   |3370     |32853 |Application|Vault                                                          |
-ROW   |3371     |32854 |Application|Vault                                                          |
-ROW   |3372     |32855 |Application|Vault                                                          |
-ROW   |3373     |32856 |Application|Vault                                                          |
-ROW   |3374     |32857 |Application|Vault                                                          |
-ROW   |3375     |32858 |Application|Vault                                                          |
-ROW   |3376     |32859 |Application|Vault                                                          |
-ROW   |3377     |32860 |Application|Vault                                                          |
-ROW   |3378     |32861 |Application|Vault                                                          |
-ROW   |3379     |32862 |Application|Vault                                                          |
-ROW   |3380     |32863 |Application|Vault                                                          |
-ROW   |3381     |32864 |Application|Vault                                                          |
-ROW   |3382     |32865 |Application|Vault                                                          |
-ROW   |3383     |32780 |Application|Zabbix raw items                                               |
-ROW   |3384     |32781 |Application|Zabbix raw items                                               |
-ROW   |3385     |32782 |Application|Zabbix raw items                                               |
-ROW   |3386     |32783 |Application|Zabbix raw items                                               |
-ROW   |3387     |32795 |Application|Zabbix raw items                                               |
-ROW   |3388     |32803 |Application|Zabbix raw items                                               |
-ROW   |3389     |32845 |Application|Zabbix raw items                                               |
-ROW   |3390     |32846 |Application|Zabbix raw items                                               |
-ROW   |3391     |32850 |Application|Zabbix raw items                                               |
-ROW   |3392     |32951 |Application|VMware                                                         |
-ROW   |3393     |32952 |Application|VMware                                                         |
-ROW   |3394     |32953 |Application|VMware                                                         |
-ROW   |3395     |32958 |Application|VMware                                                         |
-ROW   |3396     |32959 |Application|VMware                                                         |
-ROW   |3397     |32960 |Application|VMware                                                         |
-ROW   |3398     |32961 |Application|VMware                                                         |
-ROW   |3399     |32962 |Application|VMware                                                         |
-ROW   |3400     |32963 |Application|Zabbix raw items                                               |
-ROW   |3401     |32964 |Application|Zabbix raw items                                               |
-ROW   |3402     |32965 |Application|Zookeeper                                                      |
-ROW   |3403     |32966 |Application|Zookeeper                                                      |
-ROW   |3404     |32967 |Application|Zookeeper                                                      |
-ROW   |3405     |32968 |Application|Zookeeper                                                      |
-ROW   |3406     |32969 |Application|Zookeeper                                                      |
-ROW   |3407     |32970 |Application|Zookeeper                                                      |
-ROW   |3408     |32971 |Application|Zookeeper                                                      |
-ROW   |3409     |32972 |Application|Zookeeper                                                      |
-ROW   |3410     |32973 |Application|Zookeeper                                                      |
-ROW   |3411     |32974 |Application|Zookeeper                                                      |
-ROW   |3412     |32975 |Application|Zookeeper                                                      |
-ROW   |3413     |32976 |Application|Zookeeper                                                      |
-ROW   |3414     |32977 |Application|Zookeeper                                                      |
-ROW   |3415     |32978 |Application|Zookeeper                                                      |
-ROW   |3416     |32979 |Application|Zookeeper                                                      |
-ROW   |3417     |32980 |Application|Zookeeper                                                      |
-ROW   |3418     |32981 |Application|Zookeeper                                                      |
-ROW   |3419     |32982 |Application|Zookeeper                                                      |
-ROW   |3420     |32983 |Application|Zookeeper                                                      |
-ROW   |3421     |32984 |Application|Zookeeper                                                      |
-ROW   |3422     |32985 |Application|Zookeeper                                                      |
-ROW   |3423     |32986 |Application|Zookeeper                                                      |
-ROW   |3424     |32987 |Application|Zookeeper                                                      |
-ROW   |3425     |32988 |Application|Zookeeper                                                      |
-ROW   |3426     |32989 |Application|Zookeeper                                                      |
-ROW   |3427     |32990 |Application|Zookeeper                                                      |
-ROW   |3428     |32991 |Application|Zookeeper                                                      |
-ROW   |3429     |32992 |Application|Zookeeper                                                      |
-ROW   |3430     |32993 |Application|Zookeeper                                                      |
-ROW   |3431     |32994 |Application|Zookeeper                                                      |
-ROW   |3432     |32995 |Application|Zookeeper                                                      |
-ROW   |3433     |32996 |Application|Zookeeper                                                      |
-ROW   |3434     |32997 |Application|Zookeeper                                                      |
-ROW   |3435     |33006 |Application|Zookeeper                                                      |
-ROW   |3436     |33007 |Application|Zookeeper                                                      |
-ROW   |3437     |33008 |Application|Zookeeper                                                      |
-ROW   |3438     |33009 |Application|Zookeeper                                                      |
-ROW   |3439     |33010 |Application|Zookeeper                                                      |
-ROW   |3440     |33011 |Application|Zookeeper                                                      |
-ROW   |3441     |33028 |Application|Cassandra                                                      |
-ROW   |3442     |33029 |Application|Cassandra                                                      |
-ROW   |3443     |33030 |Application|Cassandra                                                      |
-ROW   |3444     |33031 |Application|Cassandra                                                      |
-ROW   |3445     |33032 |Application|Cassandra                                                      |
-ROW   |3446     |33033 |Application|Cassandra                                                      |
-ROW   |3447     |33034 |Application|Cassandra                                                      |
-ROW   |3448     |33035 |Application|Cassandra                                                      |
-ROW   |3449     |33036 |Application|Cassandra                                                      |
-ROW   |3450     |33037 |Application|Cassandra                                                      |
-ROW   |3451     |33038 |Application|Cassandra                                                      |
-ROW   |3452     |33039 |Application|Cassandra                                                      |
-ROW   |3453     |33040 |Application|Cassandra                                                      |
-ROW   |3454     |33041 |Application|Cassandra                                                      |
-ROW   |3455     |33042 |Application|Cassandra                                                      |
-ROW   |3456     |33043 |Application|Cassandra                                                      |
-ROW   |3457     |33044 |Application|Cassandra                                                      |
-ROW   |3458     |33045 |Application|Cassandra                                                      |
-ROW   |3459     |33046 |Application|Cassandra                                                      |
-ROW   |3460     |33047 |Application|Cassandra                                                      |
-ROW   |3461     |33048 |Application|Cassandra                                                      |
-ROW   |3462     |33049 |Application|Cassandra                                                      |
-ROW   |3463     |33050 |Application|Cassandra                                                      |
-ROW   |3464     |33051 |Application|Cassandra                                                      |
-ROW   |3465     |33052 |Application|Cassandra                                                      |
-ROW   |3466     |33053 |Application|Cassandra                                                      |
-ROW   |3467     |33054 |Application|Cassandra                                                      |
-ROW   |3468     |33055 |Application|Cassandra                                                      |
-ROW   |3469     |33056 |Application|Cassandra                                                      |
-ROW   |3470     |33057 |Application|Cassandra                                                      |
-ROW   |3471     |33058 |Application|Cassandra                                                      |
-ROW   |3472     |33059 |Application|Cassandra                                                      |
-ROW   |3473     |33060 |Application|Cassandra                                                      |
-ROW   |3474     |33061 |Application|Cassandra                                                      |
-ROW   |3475     |33062 |Application|Cassandra                                                      |
-ROW   |3476     |33063 |Application|Cassandra                                                      |
-ROW   |3477     |33064 |Application|Cassandra                                                      |
-ROW   |3478     |33065 |Application|Cassandra                                                      |
-ROW   |3479     |33066 |Application|Cassandra                                                      |
-ROW   |3480     |33067 |Application|Cassandra                                                      |
-ROW   |3481     |33068 |Application|Cassandra                                                      |
-ROW   |3482     |33069 |Application|Cassandra                                                      |
-ROW   |3483     |33070 |Application|Cassandra                                                      |
-ROW   |3484     |33071 |Application|Cassandra                                                      |
-ROW   |3485     |33072 |Application|Cassandra                                                      |
-ROW   |3486     |33073 |Application|Cassandra                                                      |
-ROW   |3487     |33074 |Application|Cassandra                                                      |
-ROW   |3488     |33075 |Application|Cassandra                                                      |
-ROW   |3489     |33076 |Application|Cassandra                                                      |
-ROW   |3490     |33077 |Application|Cassandra                                                      |
-ROW   |3491     |33078 |Application|Cassandra                                                      |
-ROW   |3492     |33079 |Application|Cassandra                                                      |
-ROW   |3493     |33080 |Application|Cassandra                                                      |
-ROW   |3494     |33081 |Application|Cassandra                                                      |
-ROW   |3495     |33082 |Application|Cassandra                                                      |
-ROW   |3496     |33083 |Application|Cassandra                                                      |
-ROW   |3497     |33084 |Application|Cassandra                                                      |
-ROW   |3498     |33085 |Application|Cassandra                                                      |
-ROW   |3499     |33086 |Application|Cassandra                                                      |
-ROW   |3500     |33087 |Application|Cassandra                                                      |
-ROW   |3501     |33088 |Application|Cassandra                                                      |
-ROW   |3502     |33089 |Application|Cassandra                                                      |
-ROW   |3503     |33090 |Application|Cassandra                                                      |
-ROW   |3504     |33091 |Application|Cassandra                                                      |
-ROW   |3505     |33092 |Application|Cassandra                                                      |
-ROW   |3506     |33093 |Application|Cassandra                                                      |
-ROW   |3507     |33094 |Application|Cassandra                                                      |
-ROW   |3508     |33184 |Application|Array                                                          |
-ROW   |3509     |33195 |Application|Array                                                          |
-ROW   |3510     |33202 |Application|Array                                                          |
-ROW   |3511     |33203 |Application|Array                                                          |
-ROW   |3512     |33188 |Application|Battery                                                        |
-ROW   |3513     |33199 |Application|Battery                                                        |
-ROW   |3514     |33200 |Application|Battery                                                        |
-ROW   |3515     |33206 |Application|Battery                                                        |
-ROW   |3516     |33196 |Application|Counter                                                        |
-ROW   |3517     |33197 |Application|Counter                                                        |
-ROW   |3518     |33198 |Application|Counter                                                        |
-ROW   |3519     |33185 |Application|Load                                                           |
-ROW   |3520     |33193 |Application|Load                                                           |
-ROW   |3521     |33194 |Application|Load                                                           |
-ROW   |3522     |33189 |Application|Status                                                         |
-ROW   |3523     |33190 |Application|Status                                                         |
-ROW   |3524     |33191 |Application|Status                                                         |
-ROW   |3525     |33192 |Application|Status                                                         |
-ROW   |3526     |33186 |Application|Temperature                                                    |
-ROW   |3527     |33187 |Application|Temperature                                                    |
-ROW   |3528     |33204 |Application|Temperature                                                    |
-ROW   |3529     |33201 |Application|Zabbix raw items                                               |
-ROW   |3530     |33207 |Application|Array                                                          |
-ROW   |3531     |33211 |Application|Battery                                                        |
-ROW   |3532     |33222 |Application|Battery                                                        |
-ROW   |3533     |33223 |Application|Battery                                                        |
-ROW   |3534     |33226 |Application|Battery                                                        |
-ROW   |3535     |33219 |Application|Counter                                                        |
-ROW   |3536     |33220 |Application|Counter                                                        |
-ROW   |3537     |33221 |Application|Counter                                                        |
-ROW   |3538     |33215 |Application|Load                                                           |
-ROW   |3539     |33217 |Application|Load                                                           |
-ROW   |3540     |33218 |Application|Load                                                           |
-ROW   |3541     |33208 |Application|Status                                                         |
-ROW   |3542     |33212 |Application|Status                                                         |
-ROW   |3543     |33213 |Application|Status                                                         |
-ROW   |3544     |33214 |Application|Status                                                         |
-ROW   |3545     |33209 |Application|Temperature                                                    |
-ROW   |3546     |33210 |Application|Temperature                                                    |
-ROW   |3547     |33224 |Application|Temperature                                                    |
-ROW   |3548     |33216 |Application|Zabbix raw items                                               |
-ROW   |3549     |33227 |Application|Array                                                          |
-ROW   |3550     |33238 |Application|Array                                                          |
-ROW   |3551     |33245 |Application|Array                                                          |
-ROW   |3552     |33246 |Application|Array                                                          |
-ROW   |3553     |33231 |Application|Battery                                                        |
-ROW   |3554     |33242 |Application|Battery                                                        |
-ROW   |3555     |33243 |Application|Battery                                                        |
-ROW   |3556     |33249 |Application|Battery                                                        |
-ROW   |3557     |33239 |Application|Counter                                                        |
-ROW   |3558     |33240 |Application|Counter                                                        |
-ROW   |3559     |33241 |Application|Counter                                                        |
-ROW   |3560     |33228 |Application|Load                                                           |
-ROW   |3561     |33236 |Application|Load                                                           |
-ROW   |3562     |33237 |Application|Load                                                           |
-ROW   |3563     |33232 |Application|Status                                                         |
-ROW   |3564     |33233 |Application|Status                                                         |
-ROW   |3565     |33234 |Application|Status                                                         |
-ROW   |3566     |33235 |Application|Status                                                         |
-ROW   |3567     |33229 |Application|Temperature                                                    |
-ROW   |3568     |33230 |Application|Temperature                                                    |
-ROW   |3569     |33247 |Application|Temperature                                                    |
-ROW   |3570     |33244 |Application|Zabbix raw items                                               |
-ROW   |3571     |33258 |Application|Battery                                                        |
-ROW   |3572     |33251 |Application|Load                                                           |
-ROW   |3573     |33252 |Application|Load                                                           |
-ROW   |3574     |33253 |Application|Status                                                         |
-ROW   |3575     |33254 |Application|Status                                                         |
-ROW   |3576     |33255 |Application|Status                                                         |
-ROW   |3577     |33256 |Application|Temperature                                                    |
-ROW   |3578     |33250 |Application|Zabbix raw items                                               |
-ROW   |3579     |33259 |Application|Array                                                          |
-ROW   |3580     |33268 |Application|Array                                                          |
-ROW   |3581     |33272 |Application|Array                                                          |
-ROW   |3582     |33273 |Application|Array                                                          |
-ROW   |3583     |33274 |Application|Array                                                          |
-ROW   |3584     |33262 |Application|Battery                                                        |
-ROW   |3585     |33267 |Application|Battery                                                        |
-ROW   |3586     |33269 |Application|Battery                                                        |
-ROW   |3587     |33270 |Application|Battery                                                        |
-ROW   |3588     |33277 |Application|Battery                                                        |
-ROW   |3589     |33260 |Application|Counter                                                        |
-ROW   |3590     |33266 |Application|Counter                                                        |
-ROW   |3591     |33263 |Application|Status                                                         |
-ROW   |3592     |33264 |Application|Status                                                         |
-ROW   |3593     |33265 |Application|Status                                                         |
-ROW   |3594     |33261 |Application|Temperature                                                    |
-ROW   |3595     |33275 |Application|Temperature                                                    |
-ROW   |3596     |33271 |Application|Zabbix raw items                                               |
-ROW   |3597     |33278 |Application|Array                                                          |
-ROW   |3598     |33287 |Application|Array                                                          |
-ROW   |3599     |33291 |Application|Array                                                          |
-ROW   |3600     |33292 |Application|Array                                                          |
-ROW   |3601     |33293 |Application|Array                                                          |
-ROW   |3602     |33281 |Application|Battery                                                        |
-ROW   |3603     |33286 |Application|Battery                                                        |
-ROW   |3604     |33288 |Application|Battery                                                        |
-ROW   |3605     |33289 |Application|Battery                                                        |
-ROW   |3606     |33296 |Application|Battery                                                        |
-ROW   |3607     |33279 |Application|Counter                                                        |
-ROW   |3608     |33285 |Application|Counter                                                        |
-ROW   |3609     |33282 |Application|Status                                                         |
-ROW   |3610     |33283 |Application|Status                                                         |
-ROW   |3611     |33284 |Application|Status                                                         |
-ROW   |3612     |33280 |Application|Temperature                                                    |
-ROW   |3613     |33294 |Application|Temperature                                                    |
-ROW   |3614     |33290 |Application|Zabbix raw items                                               |
-ROW   |3615     |33313 |Application|Array                                                          |
-ROW   |3616     |33312 |Application|Battery                                                        |
-ROW   |3617     |33314 |Application|Battery                                                        |
-ROW   |3618     |33315 |Application|Battery                                                        |
-ROW   |3619     |33316 |Application|Battery                                                        |
-ROW   |3620     |33299 |Application|Counter                                                        |
-ROW   |3621     |33300 |Application|Counter                                                        |
-ROW   |3622     |33317 |Application|Load                                                           |
-ROW   |3623     |33318 |Application|Load                                                           |
-ROW   |3624     |33319 |Application|Load                                                           |
-ROW   |3625     |33320 |Application|Load                                                           |
-ROW   |3626     |33298 |Application|Status                                                         |
-ROW   |3627     |33301 |Application|Status                                                         |
-ROW   |3628     |33302 |Application|Status                                                         |
-ROW   |3629     |33303 |Application|Status                                                         |
-ROW   |3630     |33304 |Application|Temperature                                                    |
-ROW   |3631     |33305 |Application|Temperature                                                    |
-ROW   |3632     |33297 |Application|Zabbix raw items                                               |
-ROW   |3633     |33340 |Application|General                                                        |
-ROW   |3634     |33341 |Application|General                                                        |
-ROW   |3635     |33342 |Application|General                                                        |
-ROW   |3636     |33343 |Application|General                                                        |
-ROW   |3637     |33344 |Application|General                                                        |
-ROW   |3638     |33345 |Application|General                                                        |
-ROW   |3639     |33348 |Application|NetApp FAS3220                                                 |
-ROW   |3640     |33349 |Application|NetApp FAS3220                                                 |
-ROW   |3641     |33350 |Application|NetApp FAS3220                                                 |
-ROW   |3642     |33351 |Application|NetApp FAS3220                                                 |
-ROW   |3643     |33337 |Application|Status                                                         |
-ROW   |3644     |33338 |Application|Status                                                         |
-ROW   |3645     |33339 |Application|Status                                                         |
-ROW   |3646     |33346 |Application|Status                                                         |
-ROW   |3647     |33347 |Application|Status                                                         |
-ROW   |3648     |33392 |Application|Jenkins                                                        |
-ROW   |3649     |33396 |Application|Jenkins                                                        |
-ROW   |3650     |33397 |Application|Jenkins                                                        |
-ROW   |3651     |33398 |Application|Jenkins                                                        |
-ROW   |3652     |33399 |Application|Jenkins                                                        |
-ROW   |3653     |33400 |Application|Jenkins                                                        |
-ROW   |3654     |33401 |Application|Jenkins                                                        |
-ROW   |3655     |33402 |Application|Jenkins                                                        |
-ROW   |3656     |33403 |Application|Jenkins                                                        |
-ROW   |3657     |33404 |Application|Jenkins                                                        |
-ROW   |3658     |33405 |Application|Jenkins                                                        |
-ROW   |3659     |33406 |Application|Jenkins                                                        |
-ROW   |3660     |33407 |Application|Jenkins                                                        |
-ROW   |3661     |33408 |Application|Jenkins                                                        |
-ROW   |3662     |33409 |Application|Jenkins                                                        |
-ROW   |3663     |33410 |Application|Jenkins                                                        |
-ROW   |3664     |33411 |Application|Jenkins                                                        |
-ROW   |3665     |33412 |Application|Jenkins                                                        |
-ROW   |3666     |33413 |Application|Jenkins                                                        |
-ROW   |3667     |33414 |Application|Jenkins                                                        |
-ROW   |3668     |33415 |Application|Jenkins                                                        |
-ROW   |3669     |33416 |Application|Jenkins                                                        |
-ROW   |3670     |33417 |Application|Jenkins                                                        |
-ROW   |3671     |33418 |Application|Jenkins                                                        |
-ROW   |3672     |33419 |Application|Jenkins                                                        |
-ROW   |3673     |33420 |Application|Jenkins                                                        |
-ROW   |3674     |33421 |Application|Jenkins                                                        |
-ROW   |3675     |33422 |Application|Jenkins                                                        |
-ROW   |3676     |33423 |Application|Jenkins                                                        |
-ROW   |3677     |33424 |Application|Jenkins                                                        |
-ROW   |3678     |33425 |Application|Jenkins                                                        |
-ROW   |3679     |33426 |Application|Jenkins                                                        |
-ROW   |3680     |33427 |Application|Jenkins                                                        |
-ROW   |3681     |33428 |Application|Jenkins                                                        |
-ROW   |3682     |33429 |Application|Jenkins                                                        |
-ROW   |3683     |33430 |Application|Jenkins                                                        |
-ROW   |3684     |33431 |Application|Jenkins                                                        |
-ROW   |3685     |33432 |Application|Jenkins                                                        |
-ROW   |3686     |33433 |Application|Jenkins                                                        |
-ROW   |3687     |33434 |Application|Jenkins                                                        |
-ROW   |3688     |33435 |Application|Jenkins                                                        |
-ROW   |3689     |33436 |Application|Jenkins                                                        |
-ROW   |3690     |33437 |Application|Jenkins                                                        |
-ROW   |3691     |33438 |Application|Jenkins                                                        |
-ROW   |3692     |33439 |Application|Jenkins                                                        |
-ROW   |3693     |33440 |Application|Jenkins                                                        |
-ROW   |3694     |33441 |Application|Jenkins                                                        |
-ROW   |3695     |33442 |Application|Jenkins                                                        |
-ROW   |3696     |33443 |Application|Jenkins                                                        |
-ROW   |3697     |33444 |Application|Jenkins                                                        |
-ROW   |3698     |33445 |Application|Jenkins                                                        |
-ROW   |3699     |33446 |Application|Jenkins                                                        |
-ROW   |3700     |33447 |Application|Jenkins                                                        |
-ROW   |3701     |33448 |Application|Jenkins                                                        |
-ROW   |3702     |33449 |Application|Jenkins                                                        |
-ROW   |3703     |33450 |Application|Jenkins                                                        |
-ROW   |3704     |33451 |Application|Jenkins                                                        |
-ROW   |3705     |33452 |Application|Jenkins                                                        |
-ROW   |3706     |33453 |Application|Jenkins                                                        |
-ROW   |3707     |33454 |Application|Jenkins                                                        |
-ROW   |3708     |33455 |Application|Jenkins                                                        |
-ROW   |3709     |33456 |Application|Jenkins                                                        |
-ROW   |3710     |33457 |Application|Jenkins                                                        |
-ROW   |3711     |33458 |Application|Jenkins                                                        |
-ROW   |3712     |33459 |Application|Jenkins                                                        |
-ROW   |3713     |33460 |Application|Jenkins                                                        |
-ROW   |3714     |33461 |Application|Jenkins                                                        |
-ROW   |3715     |33462 |Application|Jenkins                                                        |
-ROW   |3716     |33463 |Application|Jenkins                                                        |
-ROW   |3717     |33464 |Application|Jenkins                                                        |
-ROW   |3718     |33391 |Application|Zabbix raw items                                               |
-ROW   |3719     |33393 |Application|Zabbix raw items                                               |
-ROW   |3720     |33394 |Application|Zabbix raw items                                               |
-ROW   |3721     |33395 |Application|Zabbix raw items                                               |
-ROW   |3722     |33518 |Application|CPU                                                            |
-ROW   |3723     |33494 |Application|Hikvision camera                                               |
-ROW   |3724     |33495 |Application|Hikvision camera                                               |
-ROW   |3725     |33496 |Application|Hikvision camera                                               |
-ROW   |3726     |33497 |Application|Hikvision camera                                               |
-ROW   |3727     |33498 |Application|Hikvision camera                                               |
-ROW   |3728     |33499 |Application|Hikvision camera                                               |
-ROW   |3729     |33500 |Application|Hikvision camera                                               |
-ROW   |3730     |33502 |Application|Hikvision camera                                               |
-ROW   |3731     |33503 |Application|Hikvision camera                                               |
-ROW   |3732     |33507 |Application|Hikvision camera                                               |
-ROW   |3733     |33508 |Application|Hikvision camera                                               |
-ROW   |3734     |33509 |Application|Hikvision camera                                               |
-ROW   |3735     |33510 |Application|Hikvision camera                                               |
-ROW   |3736     |33511 |Application|Hikvision camera                                               |
-ROW   |3737     |33512 |Application|Hikvision camera                                               |
-ROW   |3738     |33513 |Application|Hikvision camera                                               |
-ROW   |3739     |33514 |Application|Hikvision camera                                               |
-ROW   |3740     |33515 |Application|Hikvision camera                                               |
-ROW   |3741     |33516 |Application|Hikvision camera                                               |
-ROW   |3742     |33517 |Application|Hikvision camera                                               |
-ROW   |3743     |33501 |Application|Memory                                                         |
-ROW   |3744     |33504 |Application|Status                                                         |
-ROW   |3745     |33505 |Application|Status                                                         |
-ROW   |3746     |33506 |Application|Status                                                         |
-ROW   |3747     |33519 |Application|Status                                                         |
-ROW   |3748     |33491 |Application|Zabbix raw items                                               |
-ROW   |3749     |33492 |Application|Zabbix raw items                                               |
-ROW   |3750     |33493 |Application|Zabbix raw items                                               |
-ROW   |3751     |33522 |Application|Zabbix raw items                                               |
-ROW   |3752     |33523 |Application|Zabbix raw items                                               |
-ROW   |3753     |33631 |Application|Sharepoint                                                     |
-ROW   |3754     |33632 |Application|Sharepoint                                                     |
-ROW   |3755     |33633 |Application|Sharepoint                                                     |
-ROW   |3756     |33630 |Application|Zabbix raw items                                               |
-ROW   |3757     |33656 |Application|Zabbix raw items                                               |
-ROW   |3758     |33668 |Application|Zabbix raw items                                               |
-ROW   |3759     |33683 |Application|General                                                        |
-ROW   |3760     |33684 |Application|General                                                        |
-ROW   |3761     |33685 |Application|General                                                        |
-ROW   |3762     |33686 |Application|General                                                        |
-ROW   |3763     |33687 |Application|General                                                        |
-ROW   |3764     |33688 |Application|General                                                        |
-ROW   |3765     |33691 |Application|Huawei                                                         |
-ROW   |3766     |33692 |Application|Huawei                                                         |
-ROW   |3767     |33693 |Application|Huawei                                                         |
-ROW   |3768     |33694 |Application|Huawei                                                         |
-ROW   |3769     |33680 |Application|Status                                                         |
-ROW   |3770     |33681 |Application|Status                                                         |
-ROW   |3771     |33682 |Application|Status                                                         |
-ROW   |3772     |33689 |Application|Status                                                         |
-ROW   |3773     |33690 |Application|Status                                                         |
-ROW   |3774     |33766 |Application|MongoDB                                                        |
-ROW   |3775     |33769 |Application|MongoDB                                                        |
-ROW   |3776     |33770 |Application|MongoDB                                                        |
-ROW   |3777     |33771 |Application|MongoDB                                                        |
-ROW   |3778     |33772 |Application|MongoDB                                                        |
-ROW   |3779     |33773 |Application|MongoDB                                                        |
-ROW   |3780     |33774 |Application|MongoDB                                                        |
-ROW   |3781     |33775 |Application|MongoDB                                                        |
-ROW   |3782     |33776 |Application|MongoDB                                                        |
-ROW   |3783     |33777 |Application|MongoDB                                                        |
-ROW   |3784     |33778 |Application|MongoDB                                                        |
-ROW   |3785     |33779 |Application|MongoDB                                                        |
-ROW   |3786     |33780 |Application|MongoDB                                                        |
-ROW   |3787     |33781 |Application|MongoDB                                                        |
-ROW   |3788     |33782 |Application|MongoDB                                                        |
-ROW   |3789     |33783 |Application|MongoDB                                                        |
-ROW   |3790     |33784 |Application|MongoDB                                                        |
-ROW   |3791     |33785 |Application|MongoDB                                                        |
-ROW   |3792     |33786 |Application|MongoDB                                                        |
-ROW   |3793     |33787 |Application|MongoDB                                                        |
-ROW   |3794     |33788 |Application|MongoDB                                                        |
-ROW   |3795     |33789 |Application|MongoDB                                                        |
-ROW   |3796     |33790 |Application|MongoDB                                                        |
-ROW   |3797     |33791 |Application|MongoDB                                                        |
-ROW   |3798     |33792 |Application|MongoDB                                                        |
-ROW   |3799     |33793 |Application|MongoDB                                                        |
-ROW   |3800     |33794 |Application|MongoDB                                                        |
-ROW   |3801     |33795 |Application|MongoDB                                                        |
-ROW   |3802     |33796 |Application|MongoDB                                                        |
-ROW   |3803     |33797 |Application|MongoDB                                                        |
-ROW   |3804     |33798 |Application|MongoDB                                                        |
-ROW   |3805     |33799 |Application|MongoDB                                                        |
-ROW   |3806     |33800 |Application|MongoDB                                                        |
-ROW   |3807     |33801 |Application|MongoDB                                                        |
-ROW   |3808     |33802 |Application|MongoDB                                                        |
-ROW   |3809     |33803 |Application|MongoDB                                                        |
-ROW   |3810     |33804 |Application|MongoDB                                                        |
-ROW   |3811     |33805 |Application|MongoDB                                                        |
-ROW   |3812     |33806 |Application|MongoDB                                                        |
-ROW   |3813     |33807 |Application|MongoDB                                                        |
-ROW   |3814     |33869 |Application|MongoDB                                                        |
-ROW   |3815     |33870 |Application|MongoDB                                                        |
-ROW   |3816     |33871 |Application|MongoDB                                                        |
-ROW   |3817     |33872 |Application|MongoDB                                                        |
-ROW   |3818     |33873 |Application|MongoDB                                                        |
-ROW   |3819     |33874 |Application|MongoDB                                                        |
-ROW   |3820     |33875 |Application|MongoDB                                                        |
-ROW   |3821     |33876 |Application|MongoDB                                                        |
-ROW   |3822     |33877 |Application|MongoDB                                                        |
-ROW   |3823     |33878 |Application|MongoDB                                                        |
-ROW   |3824     |33879 |Application|MongoDB                                                        |
-ROW   |3825     |33880 |Application|MongoDB                                                        |
-ROW   |3826     |33881 |Application|MongoDB                                                        |
-ROW   |3827     |33882 |Application|MongoDB                                                        |
-ROW   |3828     |33883 |Application|MongoDB                                                        |
-ROW   |3829     |33884 |Application|MongoDB                                                        |
-ROW   |3830     |33885 |Application|MongoDB                                                        |
-ROW   |3831     |33764 |Application|Zabbix raw items                                               |
-ROW   |3832     |33765 |Application|Zabbix raw items                                               |
-ROW   |3833     |33767 |Application|Zabbix raw items                                               |
-ROW   |3834     |33768 |Application|Zabbix raw items                                               |
-ROW   |3835     |33812 |Application|Zabbix raw items                                               |
-ROW   |3836     |33813 |Application|Zabbix raw items                                               |
-ROW   |3837     |33886 |Application|MongoDB sharded cluster                                        |
-ROW   |3838     |33888 |Application|MongoDB sharded cluster                                        |
-ROW   |3840     |33891 |Application|MongoDB sharded cluster                                        |
-ROW   |3841     |33892 |Application|MongoDB sharded cluster                                        |
-ROW   |3842     |33893 |Application|MongoDB sharded cluster                                        |
-ROW   |3843     |33894 |Application|MongoDB sharded cluster                                        |
-ROW   |3844     |33895 |Application|MongoDB sharded cluster                                        |
-ROW   |3845     |33896 |Application|MongoDB sharded cluster                                        |
-ROW   |3846     |33897 |Application|MongoDB sharded cluster                                        |
-ROW   |3847     |33898 |Application|MongoDB sharded cluster                                        |
-ROW   |3848     |33899 |Application|MongoDB sharded cluster                                        |
-ROW   |3849     |33900 |Application|MongoDB sharded cluster                                        |
-ROW   |3850     |33901 |Application|MongoDB sharded cluster                                        |
-ROW   |3851     |33902 |Application|MongoDB sharded cluster                                        |
-ROW   |3852     |33903 |Application|MongoDB sharded cluster                                        |
-ROW   |3853     |33904 |Application|MongoDB sharded cluster                                        |
-ROW   |3854     |33905 |Application|MongoDB sharded cluster                                        |
-ROW   |3855     |33906 |Application|MongoDB sharded cluster                                        |
-ROW   |3856     |33907 |Application|MongoDB sharded cluster                                        |
-ROW   |3857     |33908 |Application|MongoDB sharded cluster                                        |
-ROW   |3858     |33909 |Application|MongoDB sharded cluster                                        |
-ROW   |3859     |33910 |Application|MongoDB sharded cluster                                        |
-ROW   |3860     |33911 |Application|MongoDB sharded cluster                                        |
-ROW   |3861     |33912 |Application|MongoDB sharded cluster                                        |
-ROW   |3862     |33913 |Application|MongoDB sharded cluster                                        |
-ROW   |3863     |33914 |Application|MongoDB sharded cluster                                        |
-ROW   |3864     |33915 |Application|MongoDB sharded cluster                                        |
-ROW   |3865     |33916 |Application|MongoDB sharded cluster                                        |
-ROW   |3866     |33917 |Application|MongoDB sharded cluster                                        |
-ROW   |3867     |33918 |Application|MongoDB sharded cluster                                        |
-ROW   |3868     |33919 |Application|MongoDB sharded cluster                                        |
-ROW   |3869     |33887 |Application|Zabbix raw items                                               |
-ROW   |3870     |33889 |Application|Zabbix raw items                                               |
-ROW   |3871     |33924 |Application|Zabbix raw items                                               |
-ROW   |3872     |33925 |Application|Zabbix raw items                                               |
-ROW   |3873     |33966 |Application|CPU                                                            |
-ROW   |3874     |33968 |Application|Fans                                                           |
-ROW   |3875     |33947 |Application|General                                                        |
-ROW   |3876     |33948 |Application|General                                                        |
-ROW   |3877     |33949 |Application|General                                                        |
-ROW   |3878     |33952 |Application|General                                                        |
-ROW   |3879     |33953 |Application|General                                                        |
-ROW   |3880     |33954 |Application|General                                                        |
-ROW   |3881     |33950 |Application|Inventory                                                      |
-ROW   |3882     |33951 |Application|Inventory                                                      |
-ROW   |3883     |33955 |Application|Inventory                                                      |
-ROW   |3884     |33967 |Application|Inventory                                                      |
-ROW   |3885     |33969 |Application|Memory                                                         |
-ROW   |3886     |33970 |Application|Memory                                                         |
-ROW   |3887     |33971 |Application|Memory                                                         |
-ROW   |3888     |33982 |Application|Power supply                                                   |
-ROW   |3889     |33944 |Application|Status                                                         |
-ROW   |3890     |33945 |Application|Status                                                         |
-ROW   |3891     |33946 |Application|Status                                                         |
-ROW   |3892     |33956 |Application|Status                                                         |
-ROW   |3893     |33957 |Application|Status                                                         |
-ROW   |3894     |33983 |Application|Temperature                                                    |
-ROW   |3895     |33984 |Application|Temperature                                                    |
-ROW   |3896     |34007 |Application|CPU                                                            |
-ROW   |3897     |34009 |Application|Fans                                                           |
-ROW   |3898     |33988 |Application|General                                                        |
-ROW   |3899     |33989 |Application|General                                                        |
-ROW   |3900     |33990 |Application|General                                                        |
-ROW   |3901     |33993 |Application|General                                                        |
-ROW   |3902     |33994 |Application|General                                                        |
-ROW   |3903     |33995 |Application|General                                                        |
-ROW   |3904     |33991 |Application|Inventory                                                      |
-ROW   |3905     |33992 |Application|Inventory                                                      |
-ROW   |3906     |33996 |Application|Inventory                                                      |
-ROW   |3907     |34008 |Application|Inventory                                                      |
-ROW   |3908     |34010 |Application|Memory                                                         |
-ROW   |3909     |34011 |Application|Memory                                                         |
-ROW   |3910     |34012 |Application|Memory                                                         |
-ROW   |3911     |34023 |Application|Power supply                                                   |
-ROW   |3912     |33985 |Application|Status                                                         |
-ROW   |3913     |33986 |Application|Status                                                         |
-ROW   |3914     |33987 |Application|Status                                                         |
-ROW   |3915     |33997 |Application|Status                                                         |
-ROW   |3916     |33998 |Application|Status                                                         |
-ROW   |3917     |34024 |Application|Temperature                                                    |
-ROW   |3918     |34025 |Application|Temperature                                                    |
-ROW   |3919     |34048 |Application|CPU                                                            |
-ROW   |3920     |34050 |Application|Fans                                                           |
-ROW   |3921     |34029 |Application|General                                                        |
-ROW   |3922     |34030 |Application|General                                                        |
-ROW   |3923     |34031 |Application|General                                                        |
-ROW   |3924     |34034 |Application|General                                                        |
-ROW   |3925     |34035 |Application|General                                                        |
-ROW   |3926     |34036 |Application|General                                                        |
-ROW   |3927     |34032 |Application|Inventory                                                      |
-ROW   |3928     |34033 |Application|Inventory                                                      |
-ROW   |3929     |34037 |Application|Inventory                                                      |
-ROW   |3930     |34049 |Application|Inventory                                                      |
-ROW   |3931     |34051 |Application|Memory                                                         |
-ROW   |3932     |34052 |Application|Memory                                                         |
-ROW   |3933     |34053 |Application|Memory                                                         |
-ROW   |3934     |34064 |Application|Power supply                                                   |
-ROW   |3935     |34026 |Application|Status                                                         |
-ROW   |3936     |34027 |Application|Status                                                         |
-ROW   |3937     |34028 |Application|Status                                                         |
-ROW   |3938     |34038 |Application|Status                                                         |
-ROW   |3939     |34039 |Application|Status                                                         |
-ROW   |3940     |34065 |Application|Temperature                                                    |
-ROW   |3941     |34066 |Application|Temperature                                                    |
-ROW   |3942     |34089 |Application|CPU                                                            |
-ROW   |3943     |34091 |Application|Fans                                                           |
-ROW   |3944     |34070 |Application|General                                                        |
-ROW   |3945     |34071 |Application|General                                                        |
-ROW   |3946     |34072 |Application|General                                                        |
-ROW   |3947     |34075 |Application|General                                                        |
-ROW   |3948     |34076 |Application|General                                                        |
-ROW   |3949     |34077 |Application|General                                                        |
-ROW   |3950     |34073 |Application|Inventory                                                      |
-ROW   |3951     |34074 |Application|Inventory                                                      |
-ROW   |3952     |34078 |Application|Inventory                                                      |
-ROW   |3953     |34090 |Application|Inventory                                                      |
-ROW   |3954     |34092 |Application|Memory                                                         |
-ROW   |3955     |34093 |Application|Memory                                                         |
-ROW   |3956     |34094 |Application|Memory                                                         |
-ROW   |3957     |34105 |Application|Power supply                                                   |
-ROW   |3958     |34067 |Application|Status                                                         |
-ROW   |3959     |34068 |Application|Status                                                         |
-ROW   |3960     |34069 |Application|Status                                                         |
-ROW   |3961     |34079 |Application|Status                                                         |
-ROW   |3962     |34080 |Application|Status                                                         |
-ROW   |3963     |34106 |Application|Temperature                                                    |
-ROW   |3964     |34107 |Application|Temperature                                                    |
-ROW   |3965     |34130 |Application|CPU                                                            |
-ROW   |3966     |34132 |Application|Fans                                                           |
-ROW   |3967     |34111 |Application|General                                                        |
-ROW   |3968     |34112 |Application|General                                                        |
-ROW   |3969     |34113 |Application|General                                                        |
-ROW   |3970     |34116 |Application|General                                                        |
-ROW   |3971     |34117 |Application|General                                                        |
-ROW   |3972     |34118 |Application|General                                                        |
-ROW   |3973     |34114 |Application|Inventory                                                      |
-ROW   |3974     |34115 |Application|Inventory                                                      |
-ROW   |3975     |34119 |Application|Inventory                                                      |
-ROW   |3976     |34131 |Application|Inventory                                                      |
-ROW   |3977     |34133 |Application|Memory                                                         |
-ROW   |3978     |34134 |Application|Memory                                                         |
-ROW   |3979     |34135 |Application|Memory                                                         |
-ROW   |3980     |34146 |Application|Power supply                                                   |
-ROW   |3981     |34108 |Application|Status                                                         |
-ROW   |3982     |34109 |Application|Status                                                         |
-ROW   |3983     |34110 |Application|Status                                                         |
-ROW   |3984     |34120 |Application|Status                                                         |
-ROW   |3985     |34121 |Application|Status                                                         |
-ROW   |3986     |34147 |Application|Temperature                                                    |
-ROW   |3987     |34148 |Application|Temperature                                                    |
-ROW   |4030     |34227 |Application|General                                                        |
-ROW   |4031     |34236 |Application|General                                                        |
-ROW   |4032     |34237 |Application|General                                                        |
-ROW   |4033     |34239 |Application|General                                                        |
-ROW   |4034     |34240 |Application|General                                                        |
-ROW   |4035     |34241 |Application|General                                                        |
-ROW   |4036     |34242 |Application|General                                                        |
-ROW   |4037     |34243 |Application|General                                                        |
-ROW   |4038     |34244 |Application|General                                                        |
-ROW   |4039     |34245 |Application|General                                                        |
-ROW   |4040     |34246 |Application|General                                                        |
-ROW   |4041     |34248 |Application|General                                                        |
-ROW   |4042     |34249 |Application|General                                                        |
-ROW   |4043     |34251 |Application|General                                                        |
-ROW   |4044     |34252 |Application|General                                                        |
-ROW   |4045     |34253 |Application|General                                                        |
-ROW   |4046     |34226 |Application|Zabbix raw items                                               |
-ROW   |4047     |34228 |Application|Zabbix raw items                                               |
-ROW   |4048     |34229 |Application|Zabbix raw items                                               |
-ROW   |4049     |34230 |Application|Zabbix raw items                                               |
-ROW   |4050     |34231 |Application|Zabbix raw items                                               |
-ROW   |4051     |34232 |Application|Zabbix raw items                                               |
-ROW   |4052     |34233 |Application|Zabbix raw items                                               |
-ROW   |4053     |34234 |Application|Zabbix raw items                                               |
-ROW   |4054     |34235 |Application|Zabbix raw items                                               |
-ROW   |4055     |34238 |Application|Zabbix raw items                                               |
-ROW   |4056     |34247 |Application|Zabbix raw items                                               |
-ROW   |4057     |34250 |Application|Zabbix raw items                                               |
-ROW   |4058     |34254 |Application|Zabbix raw items                                               |
-ROW   |4059     |34255 |Application|Zabbix raw items                                               |
-ROW   |4060     |34256 |Application|Zabbix raw items                                               |
-ROW   |4061     |34257 |Application|Zabbix raw items                                               |
-ROW   |4062     |34258 |Application|Zabbix raw items                                               |
-ROW   |4063     |34259 |Application|Zabbix raw items                                               |
-ROW   |4064     |34296 |Application|Zabbix raw items                                               |
-ROW   |4065     |34297 |Application|Zabbix raw items                                               |
-ROW   |4066     |34298 |Application|Zabbix raw items                                               |
-ROW   |4067     |34299 |Application|Zabbix raw items                                               |
-ROW   |4068     |34302 |Application|Zabbix raw items                                               |
-ROW   |4069     |34303 |Application|Zabbix raw items                                               |
-ROW   |4070     |34304 |Application|Zabbix raw items                                               |
-ROW   |4071     |34305 |Application|Zabbix raw items                                               |
-ROW   |4072     |29014 |Application|Disk {#DEVNAME}                                                |
-ROW   |4073     |29015 |Application|Disk {#DEVNAME}                                                |
-ROW   |4074     |29016 |Application|Disk {#DEVNAME}                                                |
-ROW   |4075     |29027 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4076     |29028 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4077     |29029 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4078     |29030 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4079     |29031 |Application|Disk {#DEVNAME}                                                |
-ROW   |4080     |29032 |Application|Disk {#DEVNAME}                                                |
-ROW   |4081     |29033 |Application|Disk {#DEVNAME}                                                |
-ROW   |4082     |29044 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4083     |29045 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4084     |29046 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4085     |29047 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4086     |29210 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4087     |29211 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4088     |29212 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4089     |29213 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4090     |29216 |Application|Interface {#IFNAME}                                            |
-ROW   |4091     |29217 |Application|Interface {#IFNAME}                                            |
-ROW   |4092     |29218 |Application|Interface {#IFNAME}                                            |
-ROW   |4093     |29219 |Application|Interface {#IFNAME}                                            |
-ROW   |4094     |29220 |Application|Interface {#IFNAME}                                            |
-ROW   |4095     |29221 |Application|Interface {#IFNAME}                                            |
-ROW   |4096     |29222 |Application|Interface {#IFNAME}                                            |
-ROW   |4097     |29223 |Application|Interface {#IFNAME}                                            |
-ROW   |4098     |29224 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4099     |29225 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4100     |29226 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4101     |29227 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4102     |29230 |Application|Interface {#IFNAME}                                            |
-ROW   |4103     |29231 |Application|Interface {#IFNAME}                                            |
-ROW   |4104     |29232 |Application|Interface {#IFNAME}                                            |
-ROW   |4105     |29233 |Application|Interface {#IFNAME}                                            |
-ROW   |4106     |29234 |Application|Interface {#IFNAME}                                            |
-ROW   |4107     |29235 |Application|Interface {#IFNAME}                                            |
-ROW   |4108     |29236 |Application|Interface {#IFNAME}                                            |
-ROW   |4109     |29237 |Application|Interface {#IFNAME}                                            |
-ROW   |4110     |29238 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4111     |29239 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4112     |29240 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4113     |29241 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4114     |29244 |Application|Interface {#IFNAME}                                            |
-ROW   |4115     |29245 |Application|Interface {#IFNAME}                                            |
-ROW   |4116     |29246 |Application|Interface {#IFNAME}                                            |
-ROW   |4117     |29247 |Application|Interface {#IFNAME}                                            |
-ROW   |4118     |29248 |Application|Interface {#IFNAME}                                            |
-ROW   |4119     |29249 |Application|Interface {#IFNAME}                                            |
-ROW   |4120     |29250 |Application|Interface {#IFNAME}                                            |
-ROW   |4121     |29251 |Application|Interface {#IFNAME}                                            |
-ROW   |4122     |29432 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4123     |29433 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4124     |29445 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4125     |29446 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4126     |29447 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4127     |29434 |Application|Disk {#DEVNAME}                                                |
-ROW   |4128     |29435 |Application|Disk {#DEVNAME}                                                |
-ROW   |4129     |29448 |Application|Disk {#DEVNAME}                                                |
-ROW   |4130     |29449 |Application|Disk {#DEVNAME}                                                |
-ROW   |4131     |29452 |Application|Disk {#DEVNAME}                                                |
-ROW   |4132     |29453 |Application|Disk {#DEVNAME}                                                |
-ROW   |4133     |29436 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4134     |29437 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4135     |29438 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4136     |29439 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4137     |29440 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4138     |29441 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4139     |29442 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4140     |29443 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4141     |29444 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4142     |29512 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4143     |29513 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4144     |29514 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4145     |29521 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4146     |29522 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4147     |29523 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4148     |29720 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4149     |29721 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4150     |29722 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4151     |29723 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4152     |29724 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4153     |29725 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4154     |29726 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4155     |29727 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4156     |29728 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4157     |29729 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4158     |29730 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4159     |29731 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4160     |29732 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4161     |29733 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4162     |29734 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4163     |29735 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4164     |29736 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4165     |29737 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4166     |29787 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4167     |29788 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4168     |29789 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4169     |29790 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4170     |29791 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4171     |29792 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4172     |29793 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4173     |29794 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4174     |29795 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4175     |29796 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4176     |29797 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4177     |29798 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4178     |29799 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4179     |29800 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4180     |29801 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4181     |29802 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4182     |29803 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4183     |29804 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4184     |29805 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4185     |29806 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4186     |29807 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4187     |29808 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4188     |29809 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4189     |29810 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4190     |29811 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4191     |29812 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4192     |29813 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4193     |29814 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4194     |29815 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4195     |29816 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4196     |29817 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4197     |29818 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4198     |29819 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4199     |29820 |Application|RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
-ROW   |4200     |27032 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4201     |27191 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4202     |27332 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4203     |27461 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4204     |27531 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4205     |27567 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4206     |27630 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4207     |27653 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4208     |27733 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4209     |27799 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4210     |27955 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4211     |28129 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4212     |28281 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4213     |28956 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4214     |27099 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4215     |27100 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4216     |27101 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4217     |27102 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4218     |27103 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4219     |27104 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4220     |27105 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4221     |27106 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4222     |27107 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4223     |27181 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4224     |27182 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4225     |27183 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4226     |27184 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4227     |27185 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4228     |27186 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4229     |27187 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4230     |27188 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4231     |27189 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4232     |27216 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4233     |27217 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4234     |27218 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4235     |27219 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4236     |27220 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4237     |27221 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4238     |27222 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4239     |27223 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4240     |27224 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4241     |27252 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4242     |27253 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4243     |27254 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4244     |27255 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4245     |27256 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4246     |27257 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4247     |27258 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4248     |27259 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4249     |27260 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4250     |27273 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4251     |27274 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4252     |27275 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4253     |27276 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4254     |27277 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4255     |27278 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4256     |27279 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4257     |27280 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4258     |27281 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4259     |27322 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4260     |27323 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4261     |27324 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4262     |27325 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4263     |27326 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4264     |27327 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4265     |27328 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4266     |27329 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4267     |27330 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4268     |27451 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4269     |27452 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4270     |27453 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4271     |27454 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4272     |27455 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4273     |27456 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4274     |27457 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4275     |27458 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4276     |27459 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4277     |27487 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4278     |27488 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4279     |27489 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4280     |27490 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4281     |27491 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4282     |27492 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4283     |27493 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4284     |27494 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4285     |27495 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4286     |27521 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4287     |27522 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4288     |27523 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4289     |27524 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4290     |27525 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4291     |27526 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4292     |27527 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4293     |27528 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4294     |27529 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4295     |27557 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4296     |27558 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4297     |27559 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4298     |27560 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4299     |27561 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4300     |27562 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4301     |27563 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4302     |27564 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4303     |27565 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4304     |27643 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4305     |27644 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4306     |27645 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4307     |27646 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4308     |27647 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4309     |27648 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4310     |27649 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4311     |27650 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4312     |27651 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4313     |27723 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4314     |27724 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4315     |27725 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4316     |27726 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4317     |27727 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4318     |27728 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4319     |27729 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4320     |27730 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4321     |27731 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4322     |27757 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4323     |27758 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4324     |27759 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4325     |27760 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4326     |27761 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4327     |27762 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4328     |27763 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4329     |27764 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4330     |27765 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4331     |27789 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4332     |27790 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4333     |27791 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4334     |27792 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4335     |27793 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4336     |27794 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4337     |27795 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4338     |27796 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4339     |27797 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4340     |27873 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4341     |27874 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4342     |27875 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4343     |27876 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4344     |27877 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4345     |27878 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4346     |27879 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4347     |27880 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4348     |27881 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4349     |27910 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4350     |27911 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4351     |27912 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4352     |27913 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4353     |27914 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4354     |27915 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4355     |27916 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4356     |27917 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4357     |27918 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4358     |27945 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4359     |27946 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4360     |27947 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4361     |27948 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4362     |27949 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4363     |27950 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4364     |27951 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4365     |27952 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4366     |27953 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4367     |28119 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4368     |28120 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4369     |28121 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4370     |28122 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4371     |28123 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4372     |28124 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4373     |28125 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4374     |28126 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4375     |28127 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4376     |28224 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4377     |28225 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4378     |28226 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4379     |28227 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4380     |28228 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4381     |28229 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4382     |28230 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4383     |28231 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4384     |28232 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4385     |28294 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4386     |28295 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4387     |28296 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4388     |28297 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4389     |28298 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4390     |28299 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4391     |28300 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4392     |28301 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4393     |28302 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4394     |28969 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4395     |28970 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4396     |28971 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4397     |28972 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4398     |28973 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4399     |28974 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4400     |28975 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4401     |28976 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4402     |28977 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4403     |28006 |Application|Interface {#IFDESCR}                                           |
-ROW   |4404     |28007 |Application|Interface {#IFDESCR}                                           |
-ROW   |4405     |28008 |Application|Interface {#IFDESCR}                                           |
-ROW   |4406     |28009 |Application|Interface {#IFDESCR}                                           |
-ROW   |4407     |28010 |Application|Interface {#IFDESCR}                                           |
-ROW   |4408     |28011 |Application|Interface {#IFDESCR}                                           |
-ROW   |4409     |28012 |Application|Interface {#IFDESCR}                                           |
-ROW   |4410     |28013 |Application|Interface {#IFDESCR}                                           |
-ROW   |4411     |28014 |Application|Interface {#IFDESCR}                                           |
-ROW   |4412     |27079 |Application|Interface {#IFDESCR}                                           |
-ROW   |4413     |27080 |Application|Interface {#IFDESCR}                                           |
-ROW   |4414     |27081 |Application|Interface {#IFDESCR}                                           |
-ROW   |4415     |27082 |Application|Interface {#IFDESCR}                                           |
-ROW   |4416     |27083 |Application|Interface {#IFDESCR}                                           |
-ROW   |4417     |27084 |Application|Interface {#IFDESCR}                                           |
-ROW   |4418     |27085 |Application|Interface {#IFDESCR}                                           |
-ROW   |4419     |27086 |Application|Interface {#IFDESCR}                                           |
-ROW   |4420     |27087 |Application|Interface {#IFDESCR}                                           |
-ROW   |4421     |27620 |Application|Interface {#IFDESCR}                                           |
-ROW   |4422     |27621 |Application|Interface {#IFDESCR}                                           |
-ROW   |4423     |27622 |Application|Interface {#IFDESCR}                                           |
-ROW   |4424     |27623 |Application|Interface {#IFDESCR}                                           |
-ROW   |4425     |27624 |Application|Interface {#IFDESCR}                                           |
-ROW   |4426     |27625 |Application|Interface {#IFDESCR}                                           |
-ROW   |4427     |27626 |Application|Interface {#IFDESCR}                                           |
-ROW   |4428     |27627 |Application|Interface {#IFDESCR}                                           |
-ROW   |4429     |27628 |Application|Interface {#IFDESCR}                                           |
-ROW   |4430     |27977 |Application|Interface {#IFDESCR}                                           |
-ROW   |4431     |27978 |Application|Interface {#IFDESCR}                                           |
-ROW   |4432     |27979 |Application|Interface {#IFDESCR}                                           |
-ROW   |4433     |27980 |Application|Interface {#IFDESCR}                                           |
-ROW   |4434     |27981 |Application|Interface {#IFDESCR}                                           |
-ROW   |4435     |27982 |Application|Interface {#IFDESCR}                                           |
-ROW   |4436     |27983 |Application|Interface {#IFDESCR}                                           |
-ROW   |4437     |27984 |Application|Interface {#IFDESCR}                                           |
-ROW   |4438     |27985 |Application|Interface {#IFDESCR}                                           |
-ROW   |4439     |27119 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4440     |27120 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4441     |27121 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4442     |27122 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4443     |27123 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4444     |27124 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4445     |27125 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4446     |27126 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4447     |27127 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4448     |29078 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4449     |29079 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4450     |29080 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4451     |29081 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4452     |29082 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4453     |29083 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4454     |29084 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4455     |29085 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4456     |29086 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4457     |30027 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4458     |30028 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4459     |30029 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4460     |30030 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4461     |30031 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4462     |30032 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4463     |30033 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4464     |30034 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4465     |30035 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4466     |30036 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4467     |30037 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4468     |30038 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4469     |30039 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4470     |30040 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4471     |30041 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4472     |30042 |Application|RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
-ROW   |4473     |30160 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4474     |30161 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4475     |30162 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4476     |30166 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4477     |30167 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4478     |30168 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4479     |30178 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4480     |30179 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4481     |30180 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4482     |30184 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4483     |30185 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4484     |30186 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4553     |30348 |Application|Redis: DB {#DB}                                                |
-ROW   |4554     |30349 |Application|Redis: DB {#DB}                                                |
-ROW   |4555     |30350 |Application|Redis: DB {#DB}                                                |
-ROW   |4556     |30396 |Application|Redis: Slave {#SLAVE_IP}:{#SLAVE_PORT}                         |
-ROW   |4557     |30573 |Application|Docker: Container {#NAME}                                      |
-ROW   |4558     |30574 |Application|Docker: Container {#NAME}                                      |
-ROW   |4559     |30575 |Application|Docker: Container {#NAME}                                      |
-ROW   |4560     |30576 |Application|Docker: Container {#NAME}                                      |
-ROW   |4561     |30577 |Application|Docker: Container {#NAME}                                      |
-ROW   |4562     |30578 |Application|Docker: Container {#NAME}                                      |
-ROW   |4563     |30579 |Application|Docker: Container {#NAME}                                      |
-ROW   |4564     |30580 |Application|Docker: Container {#NAME}                                      |
-ROW   |4565     |30581 |Application|Docker: Container {#NAME}                                      |
-ROW   |4566     |30582 |Application|Docker: Container {#NAME}                                      |
-ROW   |4567     |30583 |Application|Docker: Container {#NAME}                                      |
-ROW   |4568     |30584 |Application|Docker: Container {#NAME}                                      |
-ROW   |4569     |30585 |Application|Docker: Container {#NAME}                                      |
-ROW   |4570     |30586 |Application|Docker: Container {#NAME}                                      |
-ROW   |4571     |30587 |Application|Docker: Container {#NAME}                                      |
-ROW   |4572     |30588 |Application|Docker: Container {#NAME}                                      |
-ROW   |4573     |30589 |Application|Docker: Container {#NAME}                                      |
-ROW   |4574     |30590 |Application|Docker: Container {#NAME}                                      |
-ROW   |4575     |30591 |Application|Docker: Container {#NAME}                                      |
-ROW   |4576     |30592 |Application|Docker: Container {#NAME}                                      |
-ROW   |4577     |30593 |Application|Docker: Container {#NAME}                                      |
-ROW   |4578     |30594 |Application|Docker: Container {#NAME}                                      |
-ROW   |4579     |30595 |Application|Docker: Container {#NAME}                                      |
-ROW   |4580     |30596 |Application|Docker: Container {#NAME}                                      |
-ROW   |4581     |30597 |Application|Docker: Container {#NAME}                                      |
-ROW   |4582     |30598 |Application|Docker: Container {#NAME}                                      |
-ROW   |4583     |30599 |Application|Docker: Container {#NAME}                                      |
-ROW   |4584     |30600 |Application|Docker: Container {#NAME}                                      |
-ROW   |4585     |30601 |Application|Docker: Container {#NAME}                                      |
-ROW   |4586     |30602 |Application|Docker: Container {#NAME}                                      |
-ROW   |4587     |30603 |Application|Docker: Container {#NAME}                                      |
-ROW   |4588     |30604 |Application|Docker: Container {#NAME}                                      |
-ROW   |4589     |30605 |Application|Docker: Container {#NAME}                                      |
-ROW   |4590     |30606 |Application|Docker: Container {#NAME}                                      |
-ROW   |4591     |30607 |Application|Docker: Container {#NAME}                                      |
-ROW   |4592     |30608 |Application|Docker: Container {#NAME}                                      |
-ROW   |4593     |30609 |Application|Docker: Image {#NAME}                                          |
-ROW   |4594     |30610 |Application|Docker: Image {#NAME}                                          |
-ROW   |4595     |30688 |Application|IPMI {#SENSOR_TYPE}                                            |
-ROW   |4596     |30689 |Application|IPMI {#SENSOR_TYPE}                                            |
-ROW   |4597     |30714 |Application|ES {#ES.NODE}                                                  |
-ROW   |4598     |30715 |Application|ES {#ES.NODE}                                                  |
-ROW   |4599     |30716 |Application|ES {#ES.NODE}                                                  |
-ROW   |4600     |30717 |Application|ES {#ES.NODE}                                                  |
-ROW   |4601     |30718 |Application|ES {#ES.NODE}                                                  |
-ROW   |4602     |30720 |Application|ES {#ES.NODE}                                                  |
-ROW   |4603     |30721 |Application|ES {#ES.NODE}                                                  |
-ROW   |4604     |30722 |Application|ES {#ES.NODE}                                                  |
-ROW   |4605     |30723 |Application|ES {#ES.NODE}                                                  |
-ROW   |4606     |30724 |Application|ES {#ES.NODE}                                                  |
-ROW   |4607     |30725 |Application|ES {#ES.NODE}                                                  |
-ROW   |4608     |30726 |Application|ES {#ES.NODE}                                                  |
-ROW   |4609     |30727 |Application|ES {#ES.NODE}                                                  |
-ROW   |4610     |30728 |Application|ES {#ES.NODE}                                                  |
-ROW   |4611     |30729 |Application|ES {#ES.NODE}                                                  |
-ROW   |4612     |30730 |Application|ES {#ES.NODE}                                                  |
-ROW   |4613     |30731 |Application|ES {#ES.NODE}                                                  |
-ROW   |4614     |30732 |Application|ES {#ES.NODE}                                                  |
-ROW   |4615     |30733 |Application|ES {#ES.NODE}                                                  |
-ROW   |4616     |30734 |Application|ES {#ES.NODE}                                                  |
-ROW   |4617     |30735 |Application|ES {#ES.NODE}                                                  |
-ROW   |4618     |30736 |Application|ES {#ES.NODE}                                                  |
-ROW   |4619     |30737 |Application|ES {#ES.NODE}                                                  |
-ROW   |4620     |30738 |Application|ES {#ES.NODE}                                                  |
-ROW   |4621     |30740 |Application|ES {#ES.NODE}                                                  |
-ROW   |4622     |30741 |Application|ES {#ES.NODE}                                                  |
-ROW   |4623     |30742 |Application|ES {#ES.NODE}                                                  |
-ROW   |4624     |30745 |Application|ES {#ES.NODE}                                                  |
-ROW   |4625     |30748 |Application|ES {#ES.NODE}                                                  |
-ROW   |4626     |30749 |Application|ES {#ES.NODE}                                                  |
-ROW   |4627     |30750 |Application|ES {#ES.NODE}                                                  |
-ROW   |4628     |30751 |Application|ES {#ES.NODE}                                                  |
-ROW   |4629     |30752 |Application|ES {#ES.NODE}                                                  |
-ROW   |4630     |30753 |Application|ES {#ES.NODE}                                                  |
-ROW   |4631     |30755 |Application|ES {#ES.NODE}                                                  |
-ROW   |4632     |30757 |Application|ES {#ES.NODE}                                                  |
-ROW   |4633     |30758 |Application|ES {#ES.NODE}                                                  |
-ROW   |4688     |30877 |Application|ClickHouse: Dictionary "{#NAME}"                               |
-ROW   |4689     |30878 |Application|ClickHouse: Dictionary "{#NAME}"                               |
-ROW   |4690     |30879 |Application|ClickHouse: Dictionary "{#NAME}"                               |
-ROW   |4691     |30880 |Application|ClickHouse: "{#DB}.{#TABLE}" replica status                    |
-ROW   |4692     |30881 |Application|ClickHouse: "{#DB}.{#TABLE}" replica status                    |
-ROW   |4693     |30882 |Application|ClickHouse: "{#DB}.{#TABLE}" replica status                    |
-ROW   |4694     |30883 |Application|ClickHouse: "{#DB}.{#TABLE}" replica status                    |
-ROW   |4695     |30884 |Application|ClickHouse: "{#DB}.{#TABLE}" replica status                    |
-ROW   |4696     |30885 |Application|ClickHouse: "{#DB}.{#TABLE}" replica status                    |
-ROW   |4697     |30886 |Application|ClickHouse: "{#DB}.{#TABLE}" replica status                    |
-ROW   |4698     |30887 |Application|ClickHouse: "{#DB}.{#TABLE}" replica status                    |
-ROW   |4699     |30888 |Application|ClickHouse: "{#DB}.{#TABLE}" replica status                    |
-ROW   |4700     |30889 |Application|ClickHouse: "{#DB}.{#TABLE}" replica status                    |
-ROW   |4701     |30890 |Application|ClickHouse: "{#DB}.{#TABLE}" replica status                    |
-ROW   |4702     |30891 |Application|ClickHouse: "{#DB}.{#TABLE}" replica status                    |
-ROW   |4703     |30892 |Application|ClickHouse: DB "{#DB}"                                         |
-ROW   |4704     |30893 |Application|ClickHouse: Table "{#DB}.{#TABLE}"                             |
-ROW   |4705     |30894 |Application|ClickHouse: Table "{#DB}.{#TABLE}"                             |
-ROW   |4706     |30895 |Application|ClickHouse: Table "{#DB}.{#TABLE}"                             |
-ROW   |4707     |30964 |Application|Etcd peer {#ETCD.PEER}                                         |
-ROW   |4708     |30965 |Application|Etcd peer {#ETCD.PEER}                                         |
-ROW   |4709     |30966 |Application|Etcd peer {#ETCD.PEER}                                         |
-ROW   |4710     |30967 |Application|Etcd peer {#ETCD.PEER}                                         |
-ROW   |4711     |31006 |Application|{#APPPOOL}                                                     |
-ROW   |4712     |31007 |Application|{#APPPOOL}                                                     |
-ROW   |4713     |31008 |Application|{#APPPOOL}                                                     |
-ROW   |4714     |31009 |Application|{#APPPOOL}                                                     |
-ROW   |4715     |31048 |Application|{#APPPOOL}                                                     |
-ROW   |4716     |31049 |Application|{#APPPOOL}                                                     |
-ROW   |4717     |31050 |Application|{#APPPOOL}                                                     |
-ROW   |4718     |31051 |Application|{#APPPOOL}                                                     |
-ROW   |4752     |31258 |Application|Oracle Archivelog                                              |
-ROW   |4753     |31259 |Application|Oracle Archivelog                                              |
-ROW   |4754     |31260 |Application|Oracle Archivelog                                              |
-ROW   |4755     |31261 |Application|Oracle ASM                                                     |
-ROW   |4756     |31262 |Application|Oracle ASM                                                     |
-ROW   |4757     |31263 |Application|Oracle ASM                                                     |
-ROW   |4758     |31264 |Application|Oracle {#TYPE}                                                 |
-ROW   |4759     |31265 |Application|Oracle {#TYPE}                                                 |
-ROW   |4760     |31266 |Application|Oracle {#TYPE}                                                 |
-ROW   |4761     |31267 |Application|Oracle {#TYPE}                                                 |
-ROW   |4762     |31268 |Application|Oracle PDB                                                     |
-ROW   |4763     |31269 |Application|Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
-ROW   |4764     |31270 |Application|Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
-ROW   |4765     |31271 |Application|Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
-ROW   |4766     |31272 |Application|Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
-ROW   |4767     |31273 |Application|Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
-ROW   |4768     |33170 |Application|Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
-ROW   |4769     |33171 |Application|Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
-ROW   |4770     |31335 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4771     |31336 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4772     |31337 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4773     |31338 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4774     |31339 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4775     |31340 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4776     |31341 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4777     |31342 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4778     |31343 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4779     |31344 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4780     |31345 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4781     |31346 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4782     |31347 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4783     |31348 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4784     |31349 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4785     |31350 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4786     |31351 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4787     |31352 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4788     |31353 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4789     |31354 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4790     |31355 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4791     |31356 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4792     |31357 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4793     |31358 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4794     |31359 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4795     |31360 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4796     |31361 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4797     |31362 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4798     |31363 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4799     |31370 |Application|Disk {#DEVNAME}                                                |
-ROW   |4800     |31371 |Application|Disk {#DEVNAME}                                                |
-ROW   |4801     |31379 |Application|Disk {#DEVNAME}                                                |
-ROW   |4802     |31380 |Application|Disk {#DEVNAME}                                                |
-ROW   |4803     |31382 |Application|Disk {#DEVNAME}                                                |
-ROW   |4804     |31383 |Application|Disk {#DEVNAME}                                                |
-ROW   |4805     |31373 |Application|Disk {#DEVNAME}                                                |
-ROW   |4806     |31374 |Application|Disk {#DEVNAME}                                                |
-ROW   |4807     |31385 |Application|Disk {#DEVNAME}                                                |
-ROW   |4808     |31386 |Application|Disk {#DEVNAME}                                                |
-ROW   |4809     |31388 |Application|Disk {#DEVNAME}                                                |
-ROW   |4810     |31389 |Application|Disk {#DEVNAME}                                                |
-ROW   |4811     |31376 |Application|Disk {#DEVNAME}                                                |
-ROW   |4812     |31377 |Application|Disk {#DEVNAME}                                                |
-ROW   |4813     |31391 |Application|Disk {#DEVNAME}                                                |
-ROW   |4814     |31392 |Application|Disk {#DEVNAME}                                                |
-ROW   |4815     |31394 |Application|Disk {#DEVNAME}                                                |
-ROW   |4816     |31395 |Application|Disk {#DEVNAME}                                                |
-ROW   |4817     |31433 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4818     |31434 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4819     |31435 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4820     |31436 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4821     |31437 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4822     |31438 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4823     |31453 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4824     |31454 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4825     |31455 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4826     |31439 |Application|Disk {#DEVNAME}                                                |
-ROW   |4827     |31440 |Application|Disk {#DEVNAME}                                                |
-ROW   |4828     |31441 |Application|Disk {#DEVNAME}                                                |
-ROW   |4829     |31442 |Application|Disk {#DEVNAME}                                                |
-ROW   |4830     |33321 |Application|Disk {#DEVNAME}                                                |
-ROW   |4831     |33322 |Application|Disk {#DEVNAME}                                                |
-ROW   |4832     |33323 |Application|Disk {#DEVNAME}                                                |
-ROW   |4833     |33324 |Application|Disk {#DEVNAME}                                                |
-ROW   |4834     |31443 |Application|Disk {#DEVNAME}                                                |
-ROW   |4835     |31444 |Application|Disk {#DEVNAME}                                                |
-ROW   |4836     |31445 |Application|Disk {#DEVNAME}                                                |
-ROW   |4837     |31446 |Application|Disk {#DEVNAME}                                                |
-ROW   |4838     |33325 |Application|Disk {#DEVNAME}                                                |
-ROW   |4839     |33326 |Application|Disk {#DEVNAME}                                                |
-ROW   |4840     |33327 |Application|Disk {#DEVNAME}                                                |
-ROW   |4841     |33328 |Application|Disk {#DEVNAME}                                                |
-ROW   |4842     |31447 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4843     |31448 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4844     |31449 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4845     |31450 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4846     |31451 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4847     |31452 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4848     |31456 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4849     |31457 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4850     |31458 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4851     |31561 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4852     |31562 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4853     |31563 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4854     |31564 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4855     |31565 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4856     |31566 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4857     |31567 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4858     |31568 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4859     |31569 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4860     |31766 |Application|Oracle Archivelog                                              |
-ROW   |4861     |31767 |Application|Oracle Archivelog                                              |
-ROW   |4862     |31768 |Application|Oracle Archivelog                                              |
-ROW   |4863     |31769 |Application|Oracle {#TYPE}                                                 |
-ROW   |4864     |31770 |Application|Oracle {#TYPE}                                                 |
-ROW   |4865     |31771 |Application|Oracle {#TYPE}                                                 |
-ROW   |4866     |31772 |Application|Oracle {#TYPE}                                                 |
-ROW   |4867     |31773 |Application|Oracle ASM                                                     |
-ROW   |4868     |31774 |Application|Oracle ASM                                                     |
-ROW   |4869     |31775 |Application|Oracle ASM                                                     |
-ROW   |4870     |31776 |Application|Oracle PDB                                                     |
-ROW   |4871     |31777 |Application|Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
-ROW   |4872     |31778 |Application|Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
-ROW   |4873     |31779 |Application|Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
-ROW   |4874     |31780 |Application|Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
-ROW   |4875     |31781 |Application|Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
-ROW   |4876     |33168 |Application|Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
-ROW   |4877     |33169 |Application|Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
-ROW   |4878     |31807 |Application|Asterisk IAX trunks                                            |
-ROW   |4879     |31808 |Application|Asterisk IAX trunks                                            |
-ROW   |4880     |31809 |Application|Asterisk PJSIP trunks                                          |
-ROW   |4881     |31810 |Application|Asterisk PJSIP trunks                                          |
-ROW   |4882     |31811 |Application|Asterisk queue "{#QUEUE}"                                      |
-ROW   |4883     |31812 |Application|Asterisk queue "{#QUEUE}"                                      |
-ROW   |4884     |31813 |Application|Asterisk queue "{#QUEUE}"                                      |
-ROW   |4885     |31814 |Application|Asterisk SIP trunks                                            |
-ROW   |4886     |31815 |Application|Asterisk SIP trunks                                            |
-ROW   |4887     |31902 |Application|Disk {#DEVNAME}                                                |
-ROW   |4888     |31903 |Application|Disk {#DEVNAME}                                                |
-ROW   |4889     |31932 |Application|Disk {#DEVNAME}                                                |
-ROW   |4890     |31933 |Application|Disk {#DEVNAME}                                                |
-ROW   |4891     |31935 |Application|Disk {#DEVNAME}                                                |
-ROW   |4892     |31936 |Application|Disk {#DEVNAME}                                                |
-ROW   |4893     |31905 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4894     |31906 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4895     |31907 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4896     |31908 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4897     |31909 |Application|Interface {#IFNAME}                                            |
-ROW   |4898     |31910 |Application|Interface {#IFNAME}                                            |
-ROW   |4899     |31911 |Application|Interface {#IFNAME}                                            |
-ROW   |4900     |31912 |Application|Interface {#IFNAME}                                            |
-ROW   |4901     |31913 |Application|Interface {#IFNAME}                                            |
-ROW   |4902     |31914 |Application|Interface {#IFNAME}                                            |
-ROW   |4903     |31915 |Application|Interface {#IFNAME}                                            |
-ROW   |4904     |31916 |Application|Interface {#IFNAME}                                            |
-ROW   |4905     |31917 |Application|Disk {#DEVNAME}                                                |
-ROW   |4906     |31918 |Application|Disk {#DEVNAME}                                                |
-ROW   |4907     |31938 |Application|Disk {#DEVNAME}                                                |
-ROW   |4908     |31939 |Application|Disk {#DEVNAME}                                                |
-ROW   |4909     |31941 |Application|Disk {#DEVNAME}                                                |
-ROW   |4910     |31942 |Application|Disk {#DEVNAME}                                                |
-ROW   |4911     |31920 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4912     |31921 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4913     |31922 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4914     |31923 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4915     |31924 |Application|Interface {#IFNAME}                                            |
-ROW   |4916     |31925 |Application|Interface {#IFNAME}                                            |
-ROW   |4917     |31926 |Application|Interface {#IFNAME}                                            |
-ROW   |4918     |31927 |Application|Interface {#IFNAME}                                            |
-ROW   |4919     |31928 |Application|Interface {#IFNAME}                                            |
-ROW   |4920     |31929 |Application|Interface {#IFNAME}                                            |
-ROW   |4921     |31930 |Application|Interface {#IFNAME}                                            |
-ROW   |4922     |31931 |Application|Interface {#IFNAME}                                            |
-ROW   |4923     |32012 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4924     |32013 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4925     |32014 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4926     |32015 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4927     |32016 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4928     |32017 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4929     |32018 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4930     |32019 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4931     |32020 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4932     |32040 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4933     |32041 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4934     |32042 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4935     |32021 |Application|Disk {#DEVNAME}                                                |
-ROW   |4936     |32022 |Application|Disk {#DEVNAME}                                                |
-ROW   |4937     |32023 |Application|Disk {#DEVNAME}                                                |
-ROW   |4938     |32024 |Application|Disk {#DEVNAME}                                                |
-ROW   |4939     |33329 |Application|Disk {#DEVNAME}                                                |
-ROW   |4940     |33330 |Application|Disk {#DEVNAME}                                                |
-ROW   |4941     |33331 |Application|Disk {#DEVNAME}                                                |
-ROW   |4942     |33332 |Application|Disk {#DEVNAME}                                                |
-ROW   |4943     |32026 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4944     |32027 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4945     |32028 |Application|Filesystem {#FSNAME}                                           |
-ROW   |4946     |32029 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4947     |32030 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4948     |32031 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4949     |32032 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4950     |32033 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4951     |32034 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4952     |32043 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4953     |32044 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4954     |32045 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4955     |32035 |Application|Disk {#DEVNAME}                                                |
-ROW   |4956     |32036 |Application|Disk {#DEVNAME}                                                |
-ROW   |4957     |32037 |Application|Disk {#DEVNAME}                                                |
-ROW   |4958     |32038 |Application|Disk {#DEVNAME}                                                |
-ROW   |4959     |33333 |Application|Disk {#DEVNAME}                                                |
-ROW   |4960     |33334 |Application|Disk {#DEVNAME}                                                |
-ROW   |4961     |33335 |Application|Disk {#DEVNAME}                                                |
-ROW   |4962     |33336 |Application|Disk {#DEVNAME}                                                |
-ROW   |4963     |32405 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4964     |32408 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4965     |32409 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4966     |32410 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4967     |32411 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4968     |32412 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4969     |32413 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4970     |32414 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4971     |32415 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4972     |32416 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4973     |32417 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4974     |32418 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4975     |32419 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4976     |32420 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4977     |32421 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4978     |32422 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4979     |32423 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4980     |32424 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4981     |32425 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4982     |32426 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4983     |32427 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4984     |32428 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4985     |32429 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4986     |32430 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4987     |32431 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4988     |32432 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4989     |32433 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4990     |32434 |Application|PostgreSQL: DB {#DBNAME}                                       |
-ROW   |4991     |32436 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4992     |32437 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4993     |32438 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4994     |32439 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |4995     |32442 |Application|{#JMXBROKERNAME}                                               |
-ROW   |4996     |32443 |Application|{#JMXBROKERNAME}                                               |
-ROW   |4997     |32444 |Application|{#JMXBROKERNAME}                                               |
-ROW   |4998     |32445 |Application|{#JMXBROKERNAME}                                               |
-ROW   |4999     |32446 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5000     |32447 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5001     |32448 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5002     |32449 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5003     |32450 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5004     |32451 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5005     |32452 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5006     |32453 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5007     |32454 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5008     |32455 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5009     |32456 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5010     |32457 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5011     |32458 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5012     |32459 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5013     |32460 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5014     |32461 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5015     |32462 |Application|{#JMXBROKERNAME}                                               |
-ROW   |5016     |32486 |Application|{#METRIC}                                                      |
-ROW   |5017     |32487 |Application|{#METRIC}                                                      |
-ROW   |5018     |32488 |Application|{#METRIC}                                                      |
-ROW   |5019     |32489 |Application|{#METRIC}                                                      |
-ROW   |5020     |32490 |Application|{#METRIC}                                                      |
-ROW   |5021     |32491 |Application|{#METRIC}                                                      |
-ROW   |5022     |32492 |Application|{#METRIC}                                                      |
-ROW   |5023     |32493 |Application|{#METRIC}                                                      |
-ROW   |5024     |32494 |Application|{#METRIC}                                                      |
-ROW   |5025     |32495 |Application|{#METRIC}                                                      |
-ROW   |5026     |32496 |Application|{#METRIC}                                                      |
-ROW   |5027     |32497 |Application|{#METRIC}                                                      |
-ROW   |5028     |32498 |Application|{#METRIC}                                                      |
-ROW   |5029     |32499 |Application|{#METRIC}                                                      |
-ROW   |5030     |32500 |Application|{#METRIC}                                                      |
-ROW   |5031     |32501 |Application|{#METRIC}                                                      |
-ROW   |5032     |32502 |Application|{#METRIC}                                                      |
-ROW   |5033     |32503 |Application|{#METRIC}                                                      |
-ROW   |5034     |32504 |Application|{#METRIC}                                                      |
-ROW   |5035     |32505 |Application|{#METRIC}                                                      |
-ROW   |5036     |32506 |Application|{#METRIC}                                                      |
-ROW   |5037     |32507 |Application|Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
-ROW   |5038     |32508 |Application|Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
-ROW   |5039     |32509 |Application|Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
-ROW   |5040     |32510 |Application|Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
-ROW   |5041     |32511 |Application|Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
-ROW   |5042     |32512 |Application|Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
-ROW   |5043     |32513 |Application|Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
-ROW   |5044     |32514 |Application|Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
-ROW   |5045     |32515 |Application|Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
-ROW   |5046     |32170 |Application|Ceph {#HOST} OSD [{#CLASS}]                                    |
-ROW   |5047     |32171 |Application|Ceph {#HOST} OSD [{#CLASS}]                                    |
-ROW   |5048     |32172 |Application|Ceph {#HOST} OSD [{#CLASS}]                                    |
-ROW   |5049     |32173 |Application|Ceph {#HOST} OSD [{#CLASS}]                                    |
-ROW   |5050     |32174 |Application|Ceph {#HOST} OSD [{#CLASS}]                                    |
-ROW   |5051     |32175 |Application|Ceph {#HOST} OSD [{#CLASS}]                                    |
-ROW   |5052     |32528 |Application|Database {#INSTANCE}                                           |
-ROW   |5053     |32529 |Application|Database {#INSTANCE}                                           |
-ROW   |5054     |32530 |Application|Database {#INSTANCE}                                           |
-ROW   |5055     |32531 |Application|Database {#INSTANCE}                                           |
-ROW   |5056     |32532 |Application|Database {#INSTANCE}                                           |
-ROW   |5057     |32533 |Application|Database {#INSTANCE}                                           |
-ROW   |5058     |32534 |Application|Database {#INSTANCE}                                           |
-ROW   |5059     |32535 |Application|Database {#INSTANCE}                                           |
-ROW   |5060     |32536 |Application|Database {#INSTANCE}                                           |
-ROW   |5061     |32537 |Application|Database {#INSTANCE}                                           |
-ROW   |5062     |32538 |Application|Database {#INSTANCE}                                           |
-ROW   |5063     |32539 |Application|Database {#INSTANCE}                                           |
-ROW   |5064     |32540 |Application|Database {#INSTANCE}                                           |
-ROW   |5065     |32541 |Application|Database {#INSTANCE}                                           |
-ROW   |5066     |32542 |Application|Database {#INSTANCE}                                           |
-ROW   |5067     |32558 |Application|Database {#INSTANCE}                                           |
-ROW   |5068     |32559 |Application|Database {#INSTANCE}                                           |
-ROW   |5069     |32560 |Application|Database {#INSTANCE}                                           |
-ROW   |5070     |32561 |Application|Database {#INSTANCE}                                           |
-ROW   |5071     |32562 |Application|Database {#INSTANCE}                                           |
-ROW   |5072     |32563 |Application|Database {#INSTANCE}                                           |
-ROW   |5073     |32564 |Application|Database {#INSTANCE}                                           |
-ROW   |5074     |32565 |Application|Database {#INSTANCE}                                           |
-ROW   |5075     |32566 |Application|Database {#INSTANCE}                                           |
-ROW   |5076     |32567 |Application|Database {#INSTANCE}                                           |
-ROW   |5077     |32568 |Application|Database {#INSTANCE}                                           |
-ROW   |5078     |32569 |Application|Database {#INSTANCE}                                           |
-ROW   |5079     |32570 |Application|Database {#INSTANCE}                                           |
-ROW   |5080     |32571 |Application|Database {#INSTANCE}                                           |
-ROW   |5081     |32572 |Application|Database {#INSTANCE}                                           |
-ROW   |5082     |32672 |Application|Hadoop DataNode {#HOSTNAME}                                    |
-ROW   |5083     |32673 |Application|Hadoop DataNode {#HOSTNAME}                                    |
-ROW   |5084     |32674 |Application|Hadoop DataNode {#HOSTNAME}                                    |
-ROW   |5085     |32675 |Application|Hadoop DataNode {#HOSTNAME}                                    |
-ROW   |5086     |32676 |Application|Hadoop DataNode {#HOSTNAME}                                    |
-ROW   |5087     |32677 |Application|Hadoop DataNode {#HOSTNAME}                                    |
-ROW   |5088     |32678 |Application|Hadoop DataNode {#HOSTNAME}                                    |
-ROW   |5089     |32679 |Application|Hadoop DataNode {#HOSTNAME}                                    |
-ROW   |5090     |32680 |Application|Hadoop DataNode {#HOSTNAME}                                    |
-ROW   |5091     |32681 |Application|Hadoop DataNode {#HOSTNAME}                                    |
-ROW   |5092     |32682 |Application|Hadoop NodeManager {#HOSTNAME}                                 |
-ROW   |5093     |32683 |Application|Hadoop NodeManager {#HOSTNAME}                                 |
-ROW   |5094     |32684 |Application|Hadoop NodeManager {#HOSTNAME}                                 |
-ROW   |5095     |32685 |Application|Hadoop NodeManager {#HOSTNAME}                                 |
-ROW   |5096     |32686 |Application|Hadoop NodeManager {#HOSTNAME}                                 |
-ROW   |5097     |32687 |Application|Hadoop NodeManager {#HOSTNAME}                                 |
-ROW   |5098     |32688 |Application|Hadoop NodeManager {#HOSTNAME}                                 |
-ROW   |5099     |32689 |Application|Hadoop NodeManager {#HOSTNAME}                                 |
-ROW   |5100     |32690 |Application|Hadoop NodeManager {#HOSTNAME}                                 |
-ROW   |5101     |32691 |Application|Hadoop NodeManager {#HOSTNAME}                                 |
-ROW   |5102     |32692 |Application|Hadoop NodeManager {#HOSTNAME}                                 |
-ROW   |5103     |32758 |Application|Kafka topic [{#JMXTOPIC}]                                      |
-ROW   |5104     |32759 |Application|Kafka topic [{#JMXTOPIC}]                                      |
-ROW   |5105     |32760 |Application|Kafka topic [{#JMXTOPIC}]                                      |
-ROW   |5106     |32761 |Application|Kafka topic [{#JMXTOPIC}]                                      |
-ROW   |5107     |32766 |Application|Tomcat: ProtocolHandler {#JMXVALUE}                            |
-ROW   |5108     |32767 |Application|Tomcat: {#JMXTYPE} {#JMXNAME}                                  |
-ROW   |5109     |32768 |Application|Tomcat: {#JMXTYPE} {#JMXNAME}                                  |
-ROW   |5110     |32769 |Application|Tomcat: {#JMXTYPE} {#JMXNAME}                                  |
-ROW   |5111     |32770 |Application|Tomcat: {#JMXTYPE} {#JMXNAME}                                  |
-ROW   |5112     |32771 |Application|Tomcat: {#JMXTYPE} {#JMXNAME}                                  |
-ROW   |5113     |32772 |Application|Tomcat: Context {#JMXHOST}{#JMXCONTEXT}                        |
-ROW   |5114     |32773 |Application|Tomcat: Context {#JMXHOST}{#JMXCONTEXT}                        |
-ROW   |5115     |32774 |Application|Tomcat: Context {#JMXHOST}{#JMXCONTEXT}                        |
-ROW   |5116     |32775 |Application|Tomcat: Context {#JMXHOST}{#JMXCONTEXT}                        |
-ROW   |5117     |32776 |Application|Tomcat: Context {#JMXHOST}{#JMXCONTEXT}                        |
-ROW   |5118     |32777 |Application|Tomcat: {#JMXTYPE} {#JMXNAME}                                  |
-ROW   |5119     |32778 |Application|Tomcat: {#JMXTYPE} {#JMXNAME}                                  |
-ROW   |5120     |32779 |Application|Tomcat: {#JMXTYPE} {#JMXNAME}                                  |
-ROW   |5121     |32871 |Application|Vault: Token {#TOKEN_NAME}                                     |
-ROW   |5122     |32872 |Application|Vault: Token {#TOKEN_NAME}                                     |
-ROW   |5123     |32873 |Application|Vault: Token {#TOKEN_NAME}                                     |
-ROW   |5124     |32874 |Application|Vault: Mountpoint {#MOUNTPOINT}                                |
-ROW   |5125     |32875 |Application|Vault: Mountpoint {#MOUNTPOINT}                                |
-ROW   |5126     |32876 |Application|Vault: Replication                                             |
-ROW   |5127     |32877 |Application|Vault: Replication                                             |
-ROW   |5128     |32878 |Application|Vault: Replication                                             |
-ROW   |5129     |32879 |Application|Vault: Replication                                             |
-ROW   |5130     |32880 |Application|Vault: Replication                                             |
-ROW   |5131     |32881 |Application|Vault: Replication                                             |
-ROW   |5132     |32882 |Application|Vault: Replication                                             |
-ROW   |5133     |32883 |Application|Vault: Storage {#STORAGE}                                      |
-ROW   |5134     |32884 |Application|Vault: WAL                                                     |
-ROW   |5135     |32885 |Application|Vault: WAL                                                     |
-ROW   |5136     |32886 |Application|Vault: WAL                                                     |
-ROW   |5137     |32887 |Application|Vault: WAL                                                     |
-ROW   |5138     |32888 |Application|Vault: WAL                                                     |
-ROW   |5139     |32889 |Application|Vault: WAL                                                     |
-ROW   |5140     |33000 |Application|Zookeeper {#TYPE} {#CLIENT}                                    |
-ROW   |5141     |33001 |Application|Zookeeper {#TYPE} {#CLIENT}                                    |
-ROW   |5142     |33002 |Application|Zookeeper {#TYPE} {#CLIENT}                                    |
-ROW   |5143     |33003 |Application|Zookeeper {#TYPE} {#CLIENT}                                    |
-ROW   |5144     |33004 |Application|Zookeeper {#TYPE} {#CLIENT}                                    |
-ROW   |5145     |33005 |Application|Zookeeper {#TYPE} {#CLIENT}                                    |
-ROW   |5146     |33096 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5147     |33097 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5148     |33098 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5149     |33099 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5150     |33100 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5151     |33101 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5152     |33102 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5153     |33103 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5154     |33104 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5155     |33105 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5156     |33106 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5157     |33107 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5158     |33108 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5159     |33109 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5160     |33110 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5161     |33111 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5162     |33112 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5163     |33113 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5164     |33114 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5165     |33115 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5166     |33116 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5167     |33117 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5168     |33118 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5169     |33119 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5170     |33120 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5171     |33121 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5172     |33122 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5173     |33123 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5174     |33124 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5175     |33125 |Application|Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
-ROW   |5176     |33178 |Application|PostgreSQL: Application {#APPLICATION}                         |
-ROW   |5177     |33179 |Application|PostgreSQL: Application {#APPLICATION}                         |
-ROW   |5178     |33180 |Application|PostgreSQL: Application {#APPLICATION}                         |
-ROW   |5179     |33357 |Application|Node {#NODE.NAME} Health                                       |
-ROW   |5180     |33358 |Application|Node {#NODE.NAME} Health                                       |
-ROW   |5181     |33359 |Application|Node {#NODE.NAME} Health                                       |
-ROW   |5182     |33360 |Application|Node {#NODE.NAME} Health                                       |
-ROW   |5183     |33361 |Application|Node {#NODE.NAME} Health                                       |
-ROW   |5184     |33362 |Application|Node {#NODE.NAME} Health                                       |
-ROW   |5185     |33365 |Application|Node {#NODE.NAME} Health                                       |
-ROW   |5186     |33367 |Application|Node {#NODE.NAME} Health                                       |
-ROW   |5187     |33363 |Application|Node {#NODE.NAME} Inventory                                    |
-ROW   |5188     |33364 |Application|Node {#NODE.NAME} Inventory                                    |
-ROW   |5189     |33366 |Application|Node {#NODE.NAME} Inventory                                    |
-ROW   |5190     |33368 |Application|Node {#NODE.NAME} CPU                                          |
-ROW   |5191     |33369 |Application|{#VSERVER}{#FSNAME}                                            |
-ROW   |5192     |33370 |Application|{#VSERVER}{#FSNAME}                                            |
-ROW   |5193     |33371 |Application|{#VSERVER}{#FSNAME}                                            |
-ROW   |5194     |33372 |Application|{#VSERVER}{#FSNAME}                                            |
-ROW   |5195     |33373 |Application|{#VSERVER}{#FSNAME}                                            |
-ROW   |5196     |33374 |Application|{#VSERVER}{#FSNAME}                                            |
-ROW   |5197     |33375 |Application|Node {#NODE.NAME} HA                                           |
-ROW   |5198     |33376 |Application|Node {#NODE.NAME} HA                                           |
-ROW   |5199     |33377 |Application|{#IFDESCR}                                                     |
-ROW   |5200     |33378 |Application|{#IFDESCR}                                                     |
-ROW   |5201     |33379 |Application|{#IFDESCR}                                                     |
-ROW   |5202     |33380 |Application|{#IFDESCR}                                                     |
-ROW   |5203     |33381 |Application|{#IFDESCR}                                                     |
-ROW   |5204     |33382 |Application|{#IFDESCR}                                                     |
-ROW   |5205     |33383 |Application|{#IFDESCR}                                                     |
-ROW   |5206     |33384 |Application|{#IFDESCR}                                                     |
-ROW   |5207     |33385 |Application|{#IFDESCR}                                                     |
-ROW   |5208     |33386 |Application|{#IFDESCR}                                                     |
-ROW   |5209     |33387 |Application|{#IFDESCR}                                                     |
-ROW   |5210     |33388 |Application|{#IFDESCR}                                                     |
-ROW   |5211     |33467 |Application|Jenkins: Computer [{#DISPLAY_NAME}]                            |
-ROW   |5212     |33468 |Application|Jenkins: Computer [{#DISPLAY_NAME}]                            |
-ROW   |5213     |33469 |Application|Jenkins: Computer [{#DISPLAY_NAME}]                            |
-ROW   |5214     |33470 |Application|Jenkins: Computer [{#DISPLAY_NAME}]                            |
-ROW   |5215     |33471 |Application|Jenkins: Computer [{#DISPLAY_NAME}]                            |
-ROW   |5216     |33472 |Application|Jenkins: Computer [{#DISPLAY_NAME}]                            |
-ROW   |5217     |33473 |Application|Jenkins: Computer [{#DISPLAY_NAME}]                            |
-ROW   |5218     |33474 |Application|Jenkins: Computer [{#DISPLAY_NAME}]                            |
-ROW   |5219     |33475 |Application|Jenkins: Computer [{#DISPLAY_NAME}]                            |
-ROW   |5220     |33476 |Application|Jenkins: Computer [{#DISPLAY_NAME}]                            |
-ROW   |5221     |33477 |Application|Jenkins: Computer [{#DISPLAY_NAME}]                            |
-ROW   |5222     |33478 |Application|Jenkins: Computer [{#DISPLAY_NAME}]                            |
-ROW   |5223     |33479 |Application|Jenkins: Computer [{#DISPLAY_NAME}]                            |
-ROW   |5224     |33480 |Application|Jenkins job [{#NAME}]                                          |
-ROW   |5225     |33481 |Application|Jenkins job [{#NAME}]                                          |
-ROW   |5226     |33482 |Application|Jenkins job [{#NAME}]                                          |
-ROW   |5227     |33483 |Application|Jenkins job [{#NAME}]                                          |
-ROW   |5228     |33484 |Application|Jenkins job [{#NAME}]                                          |
-ROW   |5229     |33485 |Application|Jenkins job [{#NAME}]                                          |
-ROW   |5230     |33486 |Application|Jenkins job [{#NAME}]                                          |
-ROW   |5231     |33487 |Application|Jenkins job [{#NAME}]                                          |
-ROW   |5232     |33488 |Application|Jenkins job [{#NAME}]                                          |
-ROW   |5233     |33489 |Application|Jenkins job [{#NAME}]                                          |
-ROW   |5234     |33490 |Application|Jenkins job [{#NAME}]                                          |
-ROW   |5235     |33524 |Application|Hikvision camera: PTZ channel "{#PTZ_CHANNEL_ID}"              |
-ROW   |5236     |33525 |Application|Hikvision camera: PTZ channel "{#PTZ_CHANNEL_ID}"              |
-ROW   |5237     |33526 |Application|Hikvision camera: PTZ channel "{#PTZ_CHANNEL_ID}"              |
-ROW   |5238     |33527 |Application|Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
-ROW   |5239     |33528 |Application|Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
-ROW   |5240     |33529 |Application|Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
-ROW   |5241     |33530 |Application|Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
-ROW   |5242     |33531 |Application|Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
-ROW   |5243     |33532 |Application|Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
-ROW   |5244     |33533 |Application|Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
-ROW   |5245     |33534 |Application|Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
-ROW   |5246     |33535 |Application|Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
-ROW   |5247     |33536 |Application|Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
-ROW   |5248     |33537 |Application|Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
-ROW   |5249     |33538 |Application|Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
-ROW   |5250     |33539 |Application|Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
-ROW   |5251     |33540 |Application|Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
-ROW   |5252     |33541 |Application|Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
-ROW   |5253     |33552 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
-ROW   |5254     |33553 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
-ROW   |5255     |33554 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
-ROW   |5256     |33555 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
-ROW   |5257     |33556 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
-ROW   |5258     |33557 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
-ROW   |5259     |33558 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
-ROW   |5260     |33559 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
-ROW   |5261     |33560 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
-ROW   |5262     |33561 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
-ROW   |5263     |33562 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
-ROW   |5264     |33563 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5265     |33564 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5266     |33565 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5267     |33566 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5268     |33567 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5269     |33568 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5270     |33569 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5271     |33570 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5272     |33571 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5273     |33572 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5274     |33573 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5275     |33574 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5276     |33575 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5277     |33576 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5278     |33577 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5279     |33578 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5280     |33579 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5281     |33580 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5282     |33581 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5283     |33582 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5284     |33584 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5285     |33585 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5286     |33586 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5287     |33587 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5288     |33588 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5289     |33589 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5290     |33590 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5291     |33591 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5292     |33592 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5293     |33593 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5294     |33594 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5295     |33595 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5296     |33596 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5297     |33597 |Application|Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
-ROW   |5298     |33598 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
-ROW   |5299     |33599 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
-ROW   |5300     |33600 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
-ROW   |5301     |33601 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
-ROW   |5302     |33602 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
-ROW   |5303     |33603 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
-ROW   |5304     |33604 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
-ROW   |5305     |33605 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
-ROW   |5306     |33606 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
-ROW   |5307     |33607 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]    |
-ROW   |5308     |33608 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]    |
-ROW   |5309     |33609 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]    |
-ROW   |5310     |33610 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]    |
-ROW   |5311     |33611 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
-ROW   |5312     |33612 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
-ROW   |5313     |33613 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
-ROW   |5314     |33614 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
-ROW   |5315     |33615 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
-ROW   |5316     |33616 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
-ROW   |5317     |33617 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
-ROW   |5318     |33618 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
-ROW   |5319     |33619 |Application|Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
-ROW   |5320     |33635 |Application|Sharepoint object [{#SHAREPOINT.LLD.FULL_PATH}]"               |
-ROW   |5321     |33636 |Application|Sharepoint object [{#SHAREPOINT.LLD.FULL_PATH}]"               |
-ROW   |5322     |33637 |Application|Sharepoint object [{#SHAREPOINT.LLD.FULL_PATH}]"               |
-ROW   |5323     |33659 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5324     |33660 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5325     |33661 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5326     |33662 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5327     |33663 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5328     |33664 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5329     |33665 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5330     |33666 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5331     |33667 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5332     |33671 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5333     |33672 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5334     |33673 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5335     |33674 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5336     |33675 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5337     |33676 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5338     |33677 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5339     |33678 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5340     |33679 |Application|{#DISKTYPE} {#NAME}                                            |
-ROW   |5341     |33703 |Application|BBU {#ID}                                                      |
-ROW   |5342     |33704 |Application|BBU {#ID}                                                      |
-ROW   |5343     |33705 |Application|Controller {#ID}                                               |
-ROW   |5344     |33706 |Application|Controller {#ID}                                               |
-ROW   |5345     |33707 |Application|Controller {#ID}                                               |
-ROW   |5346     |33708 |Application|Controller {#ID}                                               |
-ROW   |5347     |33709 |Application|Controller {#ID}                                               |
-ROW   |5348     |33710 |Application|Disk {#MODEL}                                                  |
-ROW   |5349     |33712 |Application|Disk {#MODEL}                                                  |
-ROW   |5350     |33713 |Application|Disk {#MODEL}                                                  |
-ROW   |5351     |33711 |Application|Disk {#NAME}                                                   |
-ROW   |5352     |33714 |Application|Enclosure {#NAME}                                              |
-ROW   |5353     |33715 |Application|Enclosure {#NAME}                                              |
-ROW   |5354     |33716 |Application|Enclosure {#NAME}                                              |
-ROW   |5355     |33717 |Application|FAN {#ID}                                                      |
-ROW   |5356     |33718 |Application|FAN {#ID}                                                      |
-ROW   |5357     |33719 |Application|LUN {#NAME}                                                    |
-ROW   |5358     |33720 |Application|LUN {#NAME}                                                    |
-ROW   |5359     |33721 |Application|LUN {#NAME}                                                    |
-ROW   |5360     |33722 |Application|LUN {#NAME}                                                    |
-ROW   |5361     |33723 |Application|LUN {#NAME}                                                    |
-ROW   |5362     |33724 |Application|LUN {#NAME}                                                    |
-ROW   |5363     |33725 |Application|LUN {#NAME}                                                    |
-ROW   |5364     |33726 |Application|LUN {#NAME}                                                    |
-ROW   |5365     |33727 |Application|LUN {#NAME}                                                    |
-ROW   |5366     |33728 |Application|LUN {#NAME}                                                    |
-ROW   |5367     |33729 |Application|LUN {#NAME}                                                    |
-ROW   |5368     |33730 |Application|Node {#NODE}                                                   |
-ROW   |5369     |33731 |Application|Node {#NODE}                                                   |
-ROW   |5370     |33732 |Application|Node {#NODE}                                                   |
-ROW   |5371     |33733 |Application|Node {#NODE}                                                   |
-ROW   |5372     |33734 |Application|Node {#NODE}                                                   |
-ROW   |5373     |33735 |Application|Node {#NODE}                                                   |
-ROW   |5374     |33736 |Application|Node {#NODE}                                                   |
-ROW   |5375     |33737 |Application|Node {#NODE}                                                   |
-ROW   |5376     |33738 |Application|Pool {#MODEL}                                                  |
-ROW   |5377     |33739 |Application|Pool {#MODEL}                                                  |
-ROW   |5378     |33741 |Application|Pool {#MODEL}                                                  |
-ROW   |5379     |33742 |Application|Pool {#MODEL}                                                  |
-ROW   |5380     |33743 |Application|Pool {#MODEL}                                                  |
-ROW   |5381     |33740 |Application|Pool {#NAME}                                                   |
-ROW   |5382     |33814 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5383     |33815 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5384     |33816 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5385     |33817 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5386     |33818 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5387     |33819 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5388     |33820 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5389     |33821 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5390     |33822 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5391     |33823 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5392     |33824 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5393     |33825 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5394     |33826 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5395     |33827 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5396     |33828 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5397     |33829 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5398     |33830 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5399     |33831 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5400     |33832 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5401     |33833 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5402     |33834 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5403     |33835 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5404     |33836 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5405     |33837 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5406     |33838 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5407     |33839 |Application|MongoDB: {#DBNAME}.{#COLLECTION}                               |
-ROW   |5408     |33840 |Application|MongoDB: {#DBNAME}                                             |
-ROW   |5409     |33841 |Application|MongoDB: {#DBNAME}                                             |
-ROW   |5410     |33842 |Application|MongoDB: {#DBNAME}                                             |
-ROW   |5411     |33843 |Application|MongoDB: {#DBNAME}                                             |
-ROW   |5412     |33844 |Application|MongoDB: {#DBNAME}                                             |
-ROW   |5413     |33845 |Application|MongoDB: {#DBNAME}                                             |
-ROW   |5414     |33846 |Application|MongoDB: {#DBNAME}                                             |
-ROW   |5415     |33847 |Application|MongoDB: {#DBNAME}                                             |
-ROW   |5416     |33848 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5417     |33849 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5418     |33850 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5419     |33851 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5420     |33852 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5421     |33853 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5422     |33854 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5423     |33855 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5424     |33856 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5425     |33857 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5426     |33858 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5427     |33859 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5428     |33860 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5429     |33861 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5430     |33862 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5431     |33863 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5432     |33864 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5433     |33865 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5434     |33866 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5435     |33867 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5436     |33868 |Application|MongoDB Replica Set: {#RS_NAME}                                |
-ROW   |5437     |33926 |Application|MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}               |
-ROW   |5438     |33927 |Application|MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}               |
-ROW   |5439     |33928 |Application|MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}               |
-ROW   |5440     |33929 |Application|MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}               |
-ROW   |5441     |33930 |Application|MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}               |
-ROW   |5442     |33931 |Application|MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}               |
-ROW   |5443     |33932 |Application|MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}               |
-ROW   |5444     |33933 |Application|MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}               |
-ROW   |5445     |33934 |Application|MongoDB sharded cluster: {#DBNAME}                             |
-ROW   |5446     |33935 |Application|MongoDB sharded cluster: {#DBNAME}                             |
-ROW   |5447     |33936 |Application|MongoDB sharded cluster: {#DBNAME}                             |
-ROW   |5448     |33937 |Application|MongoDB sharded cluster: {#DBNAME}                             |
-ROW   |5449     |33938 |Application|MongoDB sharded cluster: {#DBNAME}                             |
-ROW   |5450     |33939 |Application|MongoDB sharded cluster: {#DBNAME}                             |
-ROW   |5451     |33940 |Application|MongoDB sharded cluster: {#DBNAME}                             |
-ROW   |5454     |33972 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5455     |33973 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5456     |33974 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5457     |33975 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5458     |33976 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5459     |33977 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5460     |33978 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5461     |33979 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5462     |33980 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5463     |33981 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5464     |34013 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5465     |34014 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5466     |34015 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5467     |34016 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5468     |34017 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5469     |34018 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5470     |34019 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5471     |34020 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5472     |34021 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5473     |34022 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5474     |34054 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5475     |34055 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5476     |34056 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5477     |34057 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5478     |34058 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5479     |34059 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5480     |34060 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5481     |34061 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5482     |34062 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5483     |34063 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5484     |34095 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5485     |34096 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5486     |34097 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5487     |34098 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5488     |34099 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5489     |34100 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5490     |34101 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5491     |34102 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5492     |34103 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5493     |34104 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5494     |34136 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5495     |34137 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5496     |34138 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5497     |34139 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5498     |34140 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5499     |34141 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5500     |34142 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5501     |34143 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5502     |34144 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5503     |34145 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5504     |34164 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5505     |34165 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5506     |34166 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5507     |34167 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5508     |34168 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5509     |34169 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5510     |34170 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5511     |34171 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5512     |34172 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |5513     |34173 |Application|Filesystem {#FSNAME}                                           |
-ROW   |5514     |34174 |Application|Filesystem {#FSNAME}                                           |
-ROW   |5515     |34175 |Application|Filesystem {#FSNAME}                                           |
-ROW   |5516     |34269 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5517     |34270 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5518     |34271 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5519     |34272 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5520     |34291 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5521     |34292 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5522     |34293 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5523     |34294 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5524     |34295 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5525     |34300 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5526     |34301 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5527     |34306 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5528     |34307 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5529     |34308 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5530     |34309 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5531     |34310 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5532     |34311 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5533     |34312 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5534     |34313 |Application|Volume "{#VOLUMENAME}"                                         |
-ROW   |5535     |34273 |Application|Chassis "{#ID}"                                                |
-ROW   |5536     |34274 |Application|Node "{#NODENAME}" disks                                       |
-ROW   |5537     |34275 |Application|Chassis "{#CHASSISID}"                                         |
-ROW   |5538     |34276 |Application|SVM "{#SVMNAME}"                                               |
-ROW   |5539     |34277 |Application|SVM "{#SVMNAME}"                                               |
-ROW   |5540     |34278 |Application|SVM "{#SVMNAME}"                                               |
-ROW   |5541     |34279 |Application|SVM "{#SVMNAME}"                                               |
-ROW   |5542     |34280 |Application|Node "{#NODENAME}"                                             |
-ROW   |5543     |34281 |Application|Node "{#NODENAME}"                                             |
-ROW   |5544     |34282 |Application|Node "{#NODENAME}"                                             |
-ROW   |5545     |34283 |Application|Node "{#NODENAME}"                                             |
-ROW   |5546     |34284 |Application|Node "{#NODENAME}"                                             |
-ROW   |5547     |34285 |Application|Node "{#NODENAME}"                                             |
-ROW   |5548     |34286 |Application|Node "{#NODENAME}" Ethernet ports                              |
-ROW   |5549     |34287 |Application|Node "{#NODENAME}" FC ports                                    |
-ROW   |5550     |34288 |Application|Node "{#NODENAME}" FC ports                                    |
-ROW   |5551     |34289 |Application|SVM "{#SVMNAME}"                                               |
-ROW   |5552     |34290 |Application|SVM "{#SVMNAME}"                                               |
-ROW   |5553     |34314 |Application|Zabbix server                                                  |
-ROW   |5554     |34315 |Application|Zabbix server                                                  |
-ROW   |5555     |34316 |Application|Zabbix server                                                  |
-ROW   |5556     |34317 |Application|Zabbix server                                                  |
-ROW   |5557     |34318 |Application|Zabbix server                                                  |
-ROW   |5558     |34319 |Application|Zabbix server                                                  |
-ROW   |5559     |34320 |Application|ClickHouse ZooKeeper                                           |
-ROW   |5560     |34321 |Application|MongoDB sharded cluster                                        |
-ROW   |5561     |34322 |Application|Zabbix raw items                                               |
-ROW   |5562     |34323 |Application|Zabbix raw items                                               |
-ROW   |5563     |34325 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5564     |34326 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5565     |34327 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5566     |34328 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5567     |34329 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5568     |34330 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5569     |34331 |Application|MSSQL Job '{#JOBNAME}'                                         |
-ROW   |5570     |34332 |Application|MSSQL Job '{#JOBNAME}'                                         |
-ROW   |5571     |34333 |Application|MSSQL Job '{#JOBNAME}'                                         |
-ROW   |5572     |34334 |Application|MSSQL Job '{#JOBNAME}'                                         |
-ROW   |5573     |34335 |Application|MSSQL Job '{#JOBNAME}'                                         |
-ROW   |5574     |31133 |Application|MSSQL Availability Group '{#GROUP_NAME}'                       |
-ROW   |5575     |31134 |Application|MSSQL Availability Group '{#GROUP_NAME}'                       |
-ROW   |5576     |31135 |Application|MSSQL Availability Group '{#GROUP_NAME}'                       |
-ROW   |5577     |31136 |Application|MSSQL Availability Group '{#GROUP_NAME}'                       |
-ROW   |5578     |31137 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5579     |31138 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5580     |31139 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5581     |31140 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5582     |31141 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5583     |31142 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5584     |31143 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5585     |31144 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5586     |31145 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5587     |31146 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5588     |31147 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5589     |31148 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5590     |31149 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5591     |31150 |Application|MSSQL Database '{#DBNAME}'                                     |
-ROW   |5592     |31151 |Application|MSSQL Available Group '{#GROUP_NAME}' Local DB '{#DBNAME}'     |
-ROW   |5593     |31152 |Application|MSSQL Available Group '{#GROUP_NAME}' Local DB '{#DBNAME}'     |
-ROW   |5594     |31153 |Application|MSSQL Available Group '{#GROUP_NAME}' Local DB '{#DBNAME}'     |
-ROW   |5595     |31154 |Application|MSSQL Mirroring '{#DBNAME}'                                    |
-ROW   |5596     |31155 |Application|MSSQL Mirroring '{#DBNAME}'                                    |
-ROW   |5597     |31156 |Application|MSSQL Mirroring '{#DBNAME}'                                    |
-ROW   |5598     |31157 |Application|MSSQL Mirroring '{#DBNAME}'                                    |
-ROW   |5599     |31158 |Application|MSSQL Mirroring '{#DBNAME}'                                    |
-ROW   |5600     |31161 |Application|MSSQL Available Group '{#GROUP_NAME}' Replica '{#REPLICA_NAME}'|
-ROW   |5601     |31162 |Application|MSSQL Available Group '{#GROUP_NAME}' Replica '{#REPLICA_NAME}'|
-ROW   |5602     |31163 |Application|MSSQL Available Group '{#GROUP_NAME}' Replica '{#REPLICA_NAME}'|
-ROW   |5603     |31164 |Application|MSSQL Available Group '{#GROUP_NAME}' Replica '{#REPLICA_NAME}'|
-ROW   |5604     |31165 |Application|MSSQL Available Group '{#GROUP_NAME}' Replica '{#REPLICA_NAME}'|
-ROW   |5605     |31166 |Application|MSSQL Available Group '{#GROUP_NAME}' Replica '{#REPLICA_NAME}'|
-ROW   |5606     |31167 |Application|MSSQL Available Group '{#GROUP_NAME}' Replica '{#REPLICA_NAME}'|
-ROW   |5607     |33942 |Application|MSSQL Available Group '{#GROUP_NAME}' Non-Local DB '{#DBNAME}' |
-ROW   |5608     |33943 |Application|MSSQL Available Group '{#GROUP_NAME}' Non-Local DB '{#DBNAME}' |
-ROW   |5609     |34336 |Application|Zabbix raw items                                               |
-ROW   |5610     |34337 |Application|Zabbix raw items                                               |
-ROW   |5611     |34338 |Application|PD instance                                                    |
-ROW   |5612     |34339 |Application|PD instance                                                    |
-ROW   |5613     |34340 |Application|PD instance                                                    |
-ROW   |5614     |34341 |Application|PD instance                                                    |
-ROW   |5615     |34348 |Application|TiDB cluster                                                   |
-ROW   |5616     |34349 |Application|TiDB cluster                                                   |
-ROW   |5617     |34350 |Application|TiDB cluster                                                   |
-ROW   |5618     |34351 |Application|TiDB cluster                                                   |
-ROW   |5619     |34352 |Application|TiDB cluster                                                   |
-ROW   |5620     |34353 |Application|TiDB cluster                                                   |
-ROW   |5621     |34354 |Application|TiDB cluster                                                   |
-ROW   |5622     |34355 |Application|TiDB cluster                                                   |
-ROW   |5623     |34356 |Application|TiDB cluster                                                   |
-ROW   |5624     |34357 |Application|TiDB cluster                                                   |
-ROW   |5625     |34358 |Application|TiDB cluster                                                   |
-ROW   |5626     |34359 |Application|PD instance                                                    |
-ROW   |5627     |34360 |Application|TiDB Store [{#STORE_ADDRESS}]                                  |
-ROW   |5628     |34361 |Application|TiDB Store [{#STORE_ADDRESS}]                                  |
-ROW   |5629     |34362 |Application|TiDB Store [{#STORE_ADDRESS}]                                  |
-ROW   |5630     |34363 |Application|TiDB Store [{#STORE_ADDRESS}]                                  |
-ROW   |5631     |34364 |Application|TiDB cluster                                                   |
-ROW   |5632     |34365 |Application|TiDB cluster                                                   |
-ROW   |5633     |34366 |Application|TiDB cluster                                                   |
-ROW   |5634     |34367 |Application|Zabbix raw items                                               |
-ROW   |5635     |34368 |Application|Zabbix raw items                                               |
-ROW   |5636     |34369 |Application|TiDB node                                                      |
-ROW   |5637     |34370 |Application|TiDB node                                                      |
-ROW   |5638     |34371 |Application|TiDB node                                                      |
-ROW   |5639     |34372 |Application|TiDB node                                                      |
-ROW   |5640     |34373 |Application|TiDB node                                                      |
-ROW   |5641     |34374 |Application|TiDB node                                                      |
-ROW   |5642     |34375 |Application|TiDB node                                                      |
-ROW   |5643     |34376 |Application|TiDB node                                                      |
-ROW   |5644     |34377 |Application|TiDB node                                                      |
-ROW   |5645     |34378 |Application|TiDB node                                                      |
-ROW   |5646     |34379 |Application|TiDB node                                                      |
-ROW   |5647     |34380 |Application|TiDB node                                                      |
-ROW   |5648     |34381 |Application|TiDB node                                                      |
-ROW   |5649     |34382 |Application|TiDB node                                                      |
-ROW   |5650     |34383 |Application|TiDB node                                                      |
-ROW   |5651     |34384 |Application|TiDB node                                                      |
-ROW   |5652     |34385 |Application|TiDB node                                                      |
-ROW   |5653     |34386 |Application|TiDB node                                                      |
-ROW   |5654     |34387 |Application|TiDB node                                                      |
-ROW   |5655     |34388 |Application|TiDB node                                                      |
-ROW   |5656     |34389 |Application|TiDB node                                                      |
-ROW   |5657     |34390 |Application|TiDB node                                                      |
-ROW   |5658     |34391 |Application|TiDB node                                                      |
-ROW   |5659     |34392 |Application|TiDB node                                                      |
-ROW   |5660     |34393 |Application|TiDB node                                                      |
-ROW   |5661     |34394 |Application|TiDB node                                                      |
-ROW   |5662     |34395 |Application|TiDB node                                                      |
-ROW   |5663     |34396 |Application|TiDB node                                                      |
-ROW   |5664     |34397 |Application|TiDB node                                                      |
-ROW   |5665     |34398 |Application|TiDB node                                                      |
-ROW   |5666     |34405 |Application|TiDB node                                                      |
-ROW   |5667     |34406 |Application|TiDB node                                                      |
-ROW   |5668     |34407 |Application|TiDB node                                                      |
-ROW   |5669     |34408 |Application|TiDB node                                                      |
-ROW   |5670     |34409 |Application|TiDB node                                                      |
-ROW   |5671     |34410 |Application|TiDB node                                                      |
-ROW   |5672     |34411 |Application|TiDB node                                                      |
-ROW   |5673     |34412 |Application|Zabbix raw items                                               |
-ROW   |5674     |34413 |Application|TiKV node                                                      |
-ROW   |5675     |34414 |Application|TiKV node                                                      |
-ROW   |5676     |34415 |Application|TiKV node                                                      |
-ROW   |5677     |34416 |Application|TiKV node                                                      |
-ROW   |5678     |34417 |Application|TiKV node                                                      |
-ROW   |5679     |34418 |Application|TiKV node                                                      |
-ROW   |5680     |34419 |Application|TiKV node                                                      |
-ROW   |5681     |34420 |Application|TiKV node                                                      |
-ROW   |5682     |34421 |Application|TiKV node                                                      |
-ROW   |5683     |34422 |Application|TiKV node                                                      |
-ROW   |5684     |34423 |Application|TiKV node                                                      |
-ROW   |5685     |34424 |Application|TiKV node                                                      |
-ROW   |5686     |34425 |Application|TiKV node                                                      |
-ROW   |5687     |34426 |Application|TiKV node                                                      |
-ROW   |5688     |34427 |Application|TiKV node                                                      |
-ROW   |5689     |34428 |Application|TiKV node                                                      |
-ROW   |5690     |34429 |Application|TiKV node                                                      |
-ROW   |5691     |34430 |Application|TiKV node                                                      |
-ROW   |5692     |34431 |Application|TiKV node                                                      |
-ROW   |5693     |34432 |Application|TiKV node                                                      |
-ROW   |5694     |34433 |Application|TiKV node                                                      |
-ROW   |5695     |34434 |Application|TiKV node                                                      |
-ROW   |5696     |34435 |Application|TiKV node                                                      |
-ROW   |5697     |34436 |Application|TiKV node                                                      |
-ROW   |5698     |34437 |Application|TiKV node                                                      |
-ROW   |5699     |34438 |Application|TiKV node                                                      |
-ROW   |5700     |34439 |Application|TiKV node                                                      |
-ROW   |5701     |34444 |Application|TiKV node                                                      |
-ROW   |5702     |34445 |Application|TiKV node                                                      |
-ROW   |5703     |34446 |Application|TiKV node                                                      |
-ROW   |5704     |34447 |Application|TiKV node                                                      |
-ROW   |5705     |34448 |Application|TiKV node                                                      |
-ROW   |5706     |34449 |Application|TiKV node                                                      |
-ROW   |5707     |34450 |Application|TiKV node                                                      |
-ROW   |5708     |34451 |Status     |                                                               |
-ROW   |5709     |34452 |Status     |                                                               |
-ROW   |5710     |34453 |Status     |                                                               |
-ROW   |5711     |34454 |General    |                                                               |
-ROW   |5712     |34455 |General    |                                                               |
-ROW   |5713     |34456 |General    |                                                               |
-ROW   |5714     |34457 |General    |                                                               |
-ROW   |5715     |34458 |General    |                                                               |
-ROW   |5716     |34459 |General    |                                                               |
-ROW   |5717     |34460 |General    |                                                               |
-ROW   |5718     |34461 |General    |                                                               |
-ROW   |5719     |34462 |Status     |                                                               |
-ROW   |5720     |34463 |Status     |                                                               |
-ROW   |5721     |34464 |Status     |                                                               |
-ROW   |5722     |34465 |Status     |                                                               |
-ROW   |5723     |34466 |Status     |                                                               |
-ROW   |5724     |34467 |Status     |                                                               |
-ROW   |5725     |34468 |Status     |                                                               |
-ROW   |5726     |34469 |Status     |                                                               |
-ROW   |5727     |34470 |Status     |                                                               |
-ROW   |5728     |34471 |Status     |                                                               |
-ROW   |5729     |34472 |Status     |                                                               |
-ROW   |5730     |34473 |Status     |                                                               |
-ROW   |5731     |34474 |Status     |                                                               |
-ROW   |5732     |34475 |Status     |                                                               |
-ROW   |5733     |34482 |Status     |                                                               |
-ROW   |5734     |34483 |Status     |                                                               |
-ROW   |5735     |34484 |Status     |                                                               |
-ROW   |5736     |34485 |Status     |                                                               |
-ROW   |5737     |34486 |Status     |                                                               |
-ROW   |5738     |34487 |General    |                                                               |
-ROW   |5739     |34488 |Status     |                                                               |
-ROW   |5740     |34489 |Status     |                                                               |
-ROW   |5741     |34490 |Status     |                                                               |
-ROW   |5742     |34491 |Status     |                                                               |
-ROW   |5743     |34492 |Status     |                                                               |
-ROW   |5744     |34493 |Status     |                                                               |
-ROW   |5745     |34494 |Status     |                                                               |
-ROW   |5746     |34495 |Status     |                                                               |
-ROW   |5747     |34496 |Status     |                                                               |
-ROW   |5748     |34497 |Status     |                                                               |
-ROW   |5749     |34498 |Status     |                                                               |
-ROW   |5750     |34499 |Status     |                                                               |
-ROW   |5751     |34500 |Status     |                                                               |
-ROW   |5752     |34501 |Status     |                                                               |
-ROW   |5753     |34502 |General    |                                                               |
-ROW   |5754     |34503 |General    |                                                               |
-ROW   |5755     |34504 |General    |                                                               |
-ROW   |5756     |34505 |General    |                                                               |
-ROW   |5757     |34506 |General    |                                                               |
-ROW   |5758     |34507 |General    |                                                               |
-ROW   |5759     |34508 |General    |                                                               |
-ROW   |5760     |34509 |General    |                                                               |
-ROW   |5761     |34510 |Status     |                                                               |
-ROW   |5762     |34511 |Status     |                                                               |
-ROW   |5763     |34512 |Status     |                                                               |
-ROW   |5764     |34513 |Status     |                                                               |
-ROW   |5765     |34514 |Status     |                                                               |
-ROW   |5766     |34515 |Status     |                                                               |
-ROW   |5767     |34516 |Status     |                                                               |
-ROW   |5768     |34517 |Status     |                                                               |
-ROW   |5769     |34518 |Status     |                                                               |
-ROW   |5770     |34519 |Status     |                                                               |
-ROW   |5771     |34520 |Status     |                                                               |
-ROW   |5772     |34521 |Status     |                                                               |
-ROW   |5773     |34522 |Status     |                                                               |
-ROW   |5774     |34523 |Status     |                                                               |
-ROW   |5775     |34530 |Status     |                                                               |
-ROW   |5776     |34531 |Status     |                                                               |
-ROW   |5777     |34532 |Status     |                                                               |
-ROW   |5778     |34533 |Status     |                                                               |
-ROW   |5779     |34534 |Status     |                                                               |
-ROW   |5780     |34535 |General    |                                                               |
-ROW   |5781     |34536 |Status     |                                                               |
-ROW   |5782     |34537 |Status     |                                                               |
-ROW   |5783     |34538 |Status     |                                                               |
-ROW   |5784     |34539 |Status     |                                                               |
-ROW   |5785     |34540 |Status     |                                                               |
-ROW   |5786     |34541 |Status     |                                                               |
-ROW   |5787     |34542 |Status     |                                                               |
-ROW   |5788     |34543 |Status     |                                                               |
-ROW   |5789     |34544 |Status     |                                                               |
-ROW   |5790     |34545 |Status     |                                                               |
-ROW   |5791     |34546 |Status     |                                                               |
-ROW   |5792     |34547 |Status     |                                                               |
-ROW   |5793     |34548 |Status     |                                                               |
-ROW   |5794     |34549 |Status     |                                                               |
-ROW   |5795     |34550 |General    |                                                               |
-ROW   |5796     |34551 |General    |                                                               |
-ROW   |5797     |34552 |General    |                                                               |
-ROW   |5798     |34553 |General    |                                                               |
-ROW   |5799     |34554 |General    |                                                               |
-ROW   |5800     |34555 |General    |                                                               |
-ROW   |5801     |34556 |General    |                                                               |
-ROW   |5802     |34557 |General    |                                                               |
-ROW   |5803     |34558 |Status     |                                                               |
-ROW   |5804     |34559 |Status     |                                                               |
-ROW   |5805     |34560 |Status     |                                                               |
-ROW   |5806     |34561 |Status     |                                                               |
-ROW   |5807     |34562 |Status     |                                                               |
-ROW   |5808     |34563 |Status     |                                                               |
-ROW   |5809     |34564 |Status     |                                                               |
-ROW   |5810     |34565 |Status     |                                                               |
-ROW   |5811     |34566 |Status     |                                                               |
-ROW   |5812     |34567 |Status     |                                                               |
-ROW   |5813     |34568 |Status     |                                                               |
-ROW   |5814     |34569 |Status     |                                                               |
-ROW   |5815     |34570 |Status     |                                                               |
-ROW   |5816     |34571 |Status     |                                                               |
-ROW   |5817     |34578 |Status     |                                                               |
-ROW   |5818     |34579 |Status     |                                                               |
-ROW   |5819     |34580 |Status     |                                                               |
-ROW   |5820     |34581 |Status     |                                                               |
-ROW   |5821     |34582 |Status     |                                                               |
-ROW   |5822     |34583 |General    |                                                               |
-ROW   |5823     |34584 |Status     |                                                               |
-ROW   |5824     |34585 |Status     |                                                               |
-ROW   |5825     |34586 |Status     |                                                               |
-ROW   |5826     |34587 |Status     |                                                               |
-ROW   |5827     |34588 |Status     |                                                               |
-ROW   |5828     |34589 |Status     |                                                               |
-ROW   |5829     |34590 |Status     |                                                               |
-ROW   |5830     |34591 |Status     |                                                               |
-ROW   |5831     |34592 |Status     |                                                               |
-ROW   |5832     |34593 |Status     |                                                               |
-ROW   |5833     |34594 |Status     |                                                               |
-ROW   |5834     |34595 |Status     |                                                               |
-ROW   |5835     |34596 |Status     |                                                               |
-ROW   |5836     |34597 |Status     |                                                               |
-ROW   |5837     |34598 |General    |                                                               |
-ROW   |5838     |34599 |General    |                                                               |
-ROW   |5839     |34600 |General    |                                                               |
-ROW   |5840     |34601 |General    |                                                               |
-ROW   |5841     |34602 |General    |                                                               |
-ROW   |5842     |34603 |General    |                                                               |
-ROW   |5843     |34604 |General    |                                                               |
-ROW   |5844     |34605 |General    |                                                               |
-ROW   |5845     |34606 |Status     |                                                               |
-ROW   |5846     |34607 |Status     |                                                               |
-ROW   |5847     |34608 |Status     |                                                               |
-ROW   |5848     |34609 |Status     |                                                               |
-ROW   |5849     |34610 |Status     |                                                               |
-ROW   |5850     |34611 |Status     |                                                               |
-ROW   |5851     |34612 |Status     |                                                               |
-ROW   |5852     |34613 |Status     |                                                               |
-ROW   |5853     |34614 |Status     |                                                               |
-ROW   |5854     |34615 |Status     |                                                               |
-ROW   |5855     |34616 |Status     |                                                               |
-ROW   |5856     |34617 |Status     |                                                               |
-ROW   |5857     |34618 |Status     |                                                               |
-ROW   |5858     |34619 |Status     |                                                               |
-ROW   |5859     |34626 |Status     |                                                               |
-ROW   |5860     |34627 |Status     |                                                               |
-ROW   |5861     |34628 |Status     |                                                               |
-ROW   |5862     |34629 |Status     |                                                               |
-ROW   |5863     |34630 |Status     |                                                               |
-ROW   |5864     |34631 |General    |                                                               |
-ROW   |5865     |34632 |Status     |                                                               |
-ROW   |5866     |34633 |Status     |                                                               |
-ROW   |5867     |34634 |Status     |                                                               |
-ROW   |5868     |34635 |Status     |                                                               |
-ROW   |5869     |34636 |Status     |                                                               |
-ROW   |5870     |34637 |Status     |                                                               |
-ROW   |5871     |34638 |Status     |                                                               |
-ROW   |5872     |34639 |Status     |                                                               |
-ROW   |5873     |34640 |Status     |                                                               |
-ROW   |5874     |34641 |Status     |                                                               |
-ROW   |5875     |34642 |Status     |                                                               |
-ROW   |5876     |34643 |Status     |                                                               |
-ROW   |5877     |34644 |Status     |                                                               |
-ROW   |5878     |34645 |Status     |                                                               |
-ROW   |5879     |34646 |General    |                                                               |
-ROW   |5880     |34647 |General    |                                                               |
-ROW   |5881     |34648 |General    |                                                               |
-ROW   |5882     |34649 |General    |                                                               |
-ROW   |5883     |34650 |General    |                                                               |
-ROW   |5884     |34651 |General    |                                                               |
-ROW   |5885     |34652 |General    |                                                               |
-ROW   |5886     |34653 |General    |                                                               |
-ROW   |5887     |34654 |Status     |                                                               |
-ROW   |5888     |34655 |Status     |                                                               |
-ROW   |5889     |34656 |Status     |                                                               |
-ROW   |5890     |34657 |Status     |                                                               |
-ROW   |5891     |34658 |Status     |                                                               |
-ROW   |5892     |34659 |Status     |                                                               |
-ROW   |5893     |34660 |Status     |                                                               |
-ROW   |5894     |34661 |Status     |                                                               |
-ROW   |5895     |34662 |Status     |                                                               |
-ROW   |5896     |34663 |Status     |                                                               |
-ROW   |5897     |34664 |Status     |                                                               |
-ROW   |5898     |34665 |Status     |                                                               |
-ROW   |5899     |34666 |Status     |                                                               |
-ROW   |5900     |34667 |Status     |                                                               |
-ROW   |5901     |34674 |Status     |                                                               |
-ROW   |5902     |34675 |Status     |                                                               |
-ROW   |5903     |34676 |Status     |                                                               |
-ROW   |5904     |34677 |Status     |                                                               |
-ROW   |5905     |34678 |Status     |                                                               |
-ROW   |5906     |34679 |General    |                                                               |
-ROW   |5907     |34680 |Status     |                                                               |
-ROW   |5908     |34681 |Status     |                                                               |
-ROW   |5909     |34682 |Status     |                                                               |
-ROW   |5910     |34683 |Status     |                                                               |
-ROW   |5911     |34684 |Status     |                                                               |
-ROW   |5912     |34685 |Status     |                                                               |
-ROW   |5913     |34686 |Status     |                                                               |
-ROW   |5914     |34687 |Status     |                                                               |
-ROW   |5915     |34688 |Status     |                                                               |
-ROW   |5916     |34689 |Status     |                                                               |
-ROW   |5917     |34690 |Status     |                                                               |
-ROW   |5918     |34691 |Status     |                                                               |
-ROW   |5919     |34692 |Status     |                                                               |
-ROW   |5920     |34693 |Status     |                                                               |
-ROW   |5921     |34694 |General    |                                                               |
-ROW   |5922     |34695 |General    |                                                               |
-ROW   |5923     |34696 |General    |                                                               |
-ROW   |5924     |34697 |General    |                                                               |
-ROW   |5925     |34698 |General    |                                                               |
-ROW   |5926     |34699 |General    |                                                               |
-ROW   |5927     |34700 |General    |                                                               |
-ROW   |5928     |34701 |General    |                                                               |
-ROW   |5929     |34702 |Status     |                                                               |
-ROW   |5930     |34703 |Status     |                                                               |
-ROW   |5931     |34704 |Status     |                                                               |
-ROW   |5932     |34705 |Status     |                                                               |
-ROW   |5933     |34706 |Status     |                                                               |
-ROW   |5934     |34707 |Status     |                                                               |
-ROW   |5935     |34708 |Status     |                                                               |
-ROW   |5936     |34709 |Status     |                                                               |
-ROW   |5937     |34710 |Status     |                                                               |
-ROW   |5938     |34711 |Status     |                                                               |
-ROW   |5939     |34712 |Status     |                                                               |
-ROW   |5940     |34713 |Status     |                                                               |
-ROW   |5941     |34714 |Status     |                                                               |
-ROW   |5942     |34715 |Status     |                                                               |
-ROW   |5943     |34722 |Status     |                                                               |
-ROW   |5944     |34723 |Status     |                                                               |
-ROW   |5945     |34724 |Status     |                                                               |
-ROW   |5946     |34725 |Status     |                                                               |
-ROW   |5947     |34726 |Status     |                                                               |
-ROW   |5948     |34727 |General    |                                                               |
-ROW   |5949     |34728 |Status     |                                                               |
-ROW   |5950     |34729 |Status     |                                                               |
-ROW   |5951     |34730 |Status     |                                                               |
-ROW   |5952     |34731 |Status     |                                                               |
-ROW   |5953     |34732 |Status     |                                                               |
-ROW   |5954     |34733 |Status     |                                                               |
-ROW   |5955     |34734 |Status     |                                                               |
-ROW   |5956     |34735 |Status     |                                                               |
-ROW   |5957     |34736 |Status     |                                                               |
-ROW   |5958     |34737 |Status     |                                                               |
-ROW   |5959     |34738 |Status     |                                                               |
-ROW   |5960     |34739 |Status     |                                                               |
-ROW   |5961     |34740 |Status     |                                                               |
-ROW   |5962     |34741 |Status     |                                                               |
-ROW   |5963     |34742 |General    |                                                               |
-ROW   |5964     |34743 |General    |                                                               |
-ROW   |5965     |34744 |General    |                                                               |
-ROW   |5966     |34745 |General    |                                                               |
-ROW   |5967     |34746 |General    |                                                               |
-ROW   |5968     |34747 |General    |                                                               |
-ROW   |5969     |34748 |General    |                                                               |
-ROW   |5970     |34749 |General    |                                                               |
-ROW   |5971     |34750 |Status     |                                                               |
-ROW   |5972     |34751 |Status     |                                                               |
-ROW   |5973     |34752 |Status     |                                                               |
-ROW   |5974     |34753 |Status     |                                                               |
-ROW   |5975     |34754 |Status     |                                                               |
-ROW   |5976     |34755 |Status     |                                                               |
-ROW   |5977     |34756 |Status     |                                                               |
-ROW   |5978     |34757 |Status     |                                                               |
-ROW   |5979     |34758 |Status     |                                                               |
-ROW   |5980     |34759 |Status     |                                                               |
-ROW   |5981     |34760 |Status     |                                                               |
-ROW   |5982     |34761 |Status     |                                                               |
-ROW   |5983     |34762 |Status     |                                                               |
-ROW   |5984     |34763 |Status     |                                                               |
-ROW   |5985     |34770 |Status     |                                                               |
-ROW   |5986     |34771 |Status     |                                                               |
-ROW   |5987     |34772 |Status     |                                                               |
-ROW   |5988     |34773 |Status     |                                                               |
-ROW   |5989     |34774 |Status     |                                                               |
-ROW   |5990     |34775 |General    |                                                               |
-ROW   |5991     |34776 |Status     |                                                               |
-ROW   |5992     |34777 |Status     |                                                               |
-ROW   |5993     |34778 |Status     |                                                               |
-ROW   |5994     |34779 |Status     |                                                               |
-ROW   |5995     |34780 |Status     |                                                               |
-ROW   |5996     |34781 |Status     |                                                               |
-ROW   |5997     |34782 |Status     |                                                               |
-ROW   |5998     |34783 |Status     |                                                               |
-ROW   |5999     |34784 |Status     |                                                               |
-ROW   |6000     |34785 |Status     |                                                               |
-ROW   |6001     |34786 |Status     |                                                               |
-ROW   |6002     |34787 |Status     |                                                               |
-ROW   |6003     |34788 |General    |                                                               |
-ROW   |6004     |34180 |Status     |                                                               |
-ROW   |6005     |34181 |Status     |                                                               |
-ROW   |6006     |34182 |General    |                                                               |
-ROW   |6007     |34183 |General    |                                                               |
-ROW   |6008     |34185 |General    |                                                               |
-ROW   |6009     |34186 |General    |                                                               |
-ROW   |6010     |34187 |General    |                                                               |
-ROW   |6011     |34188 |General    |                                                               |
-ROW   |6012     |34189 |General    |                                                               |
-ROW   |6013     |34190 |Status     |                                                               |
-ROW   |6014     |34191 |Status     |                                                               |
-ROW   |6015     |34192 |Status     |                                                               |
-ROW   |6016     |34193 |Status     |                                                               |
-ROW   |6017     |34194 |Status     |                                                               |
-ROW   |6018     |34195 |Status     |                                                               |
-ROW   |6019     |34196 |Status     |                                                               |
-ROW   |6020     |34200 |Status     |                                                               |
-ROW   |6021     |34201 |Status     |                                                               |
-ROW   |6022     |34202 |Status     |                                                               |
-ROW   |6023     |34203 |Status     |                                                               |
-ROW   |6024     |34204 |Status     |                                                               |
-ROW   |6025     |34205 |Status     |                                                               |
-ROW   |6026     |34206 |Status     |                                                               |
-ROW   |6027     |34790 |Status     |                                                               |
-ROW   |6028     |34791 |Status     |                                                               |
-ROW   |6029     |34792 |Status     |                                                               |
-ROW   |6030     |34212 |Status     |                                                               |
-ROW   |6031     |34213 |Status     |                                                               |
-ROW   |6032     |34214 |Status     |                                                               |
-ROW   |6033     |34215 |Status     |                                                               |
-ROW   |6034     |34216 |Status     |                                                               |
-ROW   |6035     |34217 |General    |                                                               |
-ROW   |6036     |34218 |Status     |                                                               |
-ROW   |6037     |34219 |Status     |                                                               |
-ROW   |6038     |34220 |Status     |                                                               |
-ROW   |6039     |34221 |Status     |                                                               |
-ROW   |6040     |34222 |Status     |                                                               |
-ROW   |6041     |34223 |Status     |                                                               |
-ROW   |6042     |34224 |Status     |                                                               |
-ROW   |6043     |34225 |Status     |                                                               |
-ROW   |6044     |34793 |Status     |                                                               |
-ROW   |6045     |34794 |Status     |                                                               |
-ROW   |6046     |34795 |Status     |                                                               |
-ROW   |6047     |34796 |General    |                                                               |
-ROW   |6048     |34797 |General    |                                                               |
-ROW   |6049     |34798 |General    |                                                               |
-ROW   |6050     |34799 |General    |                                                               |
-ROW   |6051     |34800 |General    |                                                               |
-ROW   |6052     |34801 |General    |                                                               |
-ROW   |6053     |34802 |General    |                                                               |
-ROW   |6054     |34803 |General    |                                                               |
-ROW   |6055     |34804 |Status     |                                                               |
-ROW   |6056     |34805 |Status     |                                                               |
-ROW   |6057     |34806 |Status     |                                                               |
-ROW   |6058     |34807 |Status     |                                                               |
-ROW   |6059     |34808 |Status     |                                                               |
-ROW   |6060     |34809 |Status     |                                                               |
-ROW   |6061     |34810 |Status     |                                                               |
-ROW   |6062     |34811 |Status     |                                                               |
-ROW   |6063     |34812 |Status     |                                                               |
-ROW   |6064     |34813 |Status     |                                                               |
-ROW   |6065     |34814 |Status     |                                                               |
-ROW   |6066     |34815 |Status     |                                                               |
-ROW   |6067     |34816 |Status     |                                                               |
-ROW   |6068     |34817 |Status     |                                                               |
-ROW   |6069     |34824 |Status     |                                                               |
-ROW   |6070     |34825 |Status     |                                                               |
-ROW   |6071     |34826 |Status     |                                                               |
-ROW   |6072     |34827 |Status     |                                                               |
-ROW   |6073     |34828 |Status     |                                                               |
-ROW   |6074     |34829 |General    |                                                               |
-ROW   |6075     |34830 |Status     |                                                               |
-ROW   |6076     |34831 |Status     |                                                               |
-ROW   |6077     |34832 |Status     |                                                               |
-ROW   |6078     |34833 |Status     |                                                               |
-ROW   |6079     |34834 |Status     |                                                               |
-ROW   |6080     |34835 |Status     |                                                               |
-ROW   |6081     |34836 |Status     |                                                               |
-ROW   |6082     |34837 |Status     |                                                               |
-ROW   |6083     |34838 |Status     |                                                               |
-ROW   |6084     |34839 |Status     |                                                               |
-ROW   |6085     |34840 |Status     |                                                               |
-ROW   |6086     |34841 |Status     |                                                               |
-ROW   |6087     |34842 |Status     |                                                               |
-ROW   |6088     |34843 |Status     |                                                               |
-ROW   |6089     |34844 |General    |                                                               |
-ROW   |6090     |34845 |General    |                                                               |
-ROW   |6091     |34846 |General    |                                                               |
-ROW   |6092     |34847 |General    |                                                               |
-ROW   |6093     |34848 |General    |                                                               |
-ROW   |6094     |34849 |General    |                                                               |
-ROW   |6095     |34850 |General    |                                                               |
-ROW   |6096     |34851 |General    |                                                               |
-ROW   |6097     |34852 |Status     |                                                               |
-ROW   |6098     |34853 |Status     |                                                               |
-ROW   |6099     |34854 |Status     |                                                               |
-ROW   |6100     |34855 |Status     |                                                               |
-ROW   |6101     |34856 |Status     |                                                               |
-ROW   |6102     |34857 |Status     |                                                               |
-ROW   |6103     |34858 |Status     |                                                               |
-ROW   |6104     |34859 |Status     |                                                               |
-ROW   |6105     |34860 |Status     |                                                               |
-ROW   |6106     |34861 |Status     |                                                               |
-ROW   |6107     |34862 |Status     |                                                               |
-ROW   |6108     |34863 |Status     |                                                               |
-ROW   |6109     |34864 |Status     |                                                               |
-ROW   |6110     |34865 |Status     |                                                               |
-ROW   |6111     |34872 |Status     |                                                               |
-ROW   |6112     |34873 |Status     |                                                               |
-ROW   |6113     |34874 |Status     |                                                               |
-ROW   |6114     |34875 |Status     |                                                               |
-ROW   |6115     |34876 |Status     |                                                               |
-ROW   |6116     |34877 |General    |                                                               |
-ROW   |6117     |34878 |Status     |                                                               |
-ROW   |6118     |34879 |Status     |                                                               |
-ROW   |6119     |34880 |Status     |                                                               |
-ROW   |6120     |34881 |Status     |                                                               |
-ROW   |6121     |34882 |Status     |                                                               |
-ROW   |6122     |34883 |Status     |                                                               |
-ROW   |6123     |34884 |Status     |                                                               |
-ROW   |6124     |34885 |Status     |                                                               |
-ROW   |6125     |34886 |Status     |                                                               |
-ROW   |6126     |34887 |Status     |                                                               |
-ROW   |6127     |34888 |Status     |                                                               |
-ROW   |6128     |34889 |Status     |                                                               |
-ROW   |6129     |34890 |Status     |                                                               |
-ROW   |6130     |34891 |Status     |                                                               |
-ROW   |6131     |34892 |General    |                                                               |
-ROW   |6132     |34893 |General    |                                                               |
-ROW   |6133     |34894 |General    |                                                               |
-ROW   |6134     |34895 |General    |                                                               |
-ROW   |6135     |34896 |General    |                                                               |
-ROW   |6136     |34897 |General    |                                                               |
-ROW   |6137     |34898 |General    |                                                               |
-ROW   |6138     |34899 |General    |                                                               |
-ROW   |6139     |34900 |Status     |                                                               |
-ROW   |6140     |34901 |Status     |                                                               |
-ROW   |6141     |34902 |Status     |                                                               |
-ROW   |6142     |34903 |Status     |                                                               |
-ROW   |6143     |34904 |Status     |                                                               |
-ROW   |6144     |34905 |Status     |                                                               |
-ROW   |6145     |34906 |Status     |                                                               |
-ROW   |6146     |34907 |Status     |                                                               |
-ROW   |6147     |34908 |Status     |                                                               |
-ROW   |6148     |34909 |Status     |                                                               |
-ROW   |6149     |34910 |Status     |                                                               |
-ROW   |6150     |34911 |Status     |                                                               |
-ROW   |6151     |34912 |Status     |                                                               |
-ROW   |6152     |34913 |Status     |                                                               |
-ROW   |6153     |34920 |Status     |                                                               |
-ROW   |6154     |34921 |Status     |                                                               |
-ROW   |6155     |34922 |Status     |                                                               |
-ROW   |6156     |34923 |Status     |                                                               |
-ROW   |6157     |34924 |Status     |                                                               |
-ROW   |6158     |34925 |General    |                                                               |
-ROW   |6159     |34926 |Status     |                                                               |
-ROW   |6160     |34927 |Status     |                                                               |
-ROW   |6161     |34928 |Status     |                                                               |
-ROW   |6162     |34929 |Status     |                                                               |
-ROW   |6163     |34930 |Status     |                                                               |
-ROW   |6164     |34931 |Status     |                                                               |
-ROW   |6165     |34932 |Status     |                                                               |
-ROW   |6166     |34933 |Status     |                                                               |
-ROW   |6167     |34934 |Status     |                                                               |
-ROW   |6168     |34935 |Status     |                                                               |
-ROW   |6169     |34936 |Status     |                                                               |
-ROW   |6170     |34937 |Application|WildFly                                                        |
-ROW   |6171     |34938 |Application|WildFly                                                        |
-ROW   |6172     |34939 |Application|WildFly                                                        |
-ROW   |6173     |34940 |Application|WildFly                                                        |
-ROW   |6174     |34941 |Application|WildFly                                                        |
-ROW   |6175     |34944 |Application|WildFly deployment [{#DEPLOYMENT}]                             |
-ROW   |6176     |34945 |Application|WildFly deployment [{#DEPLOYMENT}]                             |
-ROW   |6177     |34946 |Application|WildFly domain: Server [{#SERVER}]                             |
-ROW   |6178     |34947 |Application|WildFly domain: Server [{#SERVER}]                             |
-ROW   |6179     |34948 |Application|WildFly domain: Server [{#SERVER}]                             |
-ROW   |6180     |34949 |Application|WildFly                                                        |
-ROW   |6181     |34950 |Application|WildFly                                                        |
-ROW   |6182     |34951 |Application|WildFly                                                        |
-ROW   |6183     |34952 |Application|WildFly                                                        |
-ROW   |6184     |34953 |Application|WildFly                                                        |
-ROW   |6185     |34954 |Application|WildFly                                                        |
-ROW   |6186     |34955 |Application|WildFly                                                        |
-ROW   |6187     |34956 |Application|WildFly                                                        |
-ROW   |6188     |34957 |Application|WildFly                                                        |
-ROW   |6189     |34958 |Application|WildFly                                                        |
-ROW   |6190     |34959 |Application|WildFly                                                        |
-ROW   |6191     |34960 |Application|WildFly                                                        |
-ROW   |6192     |34961 |Application|WildFly                                                        |
-ROW   |6193     |34962 |Application|WildFly                                                        |
-ROW   |6194     |34963 |Application|WildFly                                                        |
-ROW   |6195     |34964 |Application|WildFly                                                        |
-ROW   |6196     |34965 |Application|WildFly                                                        |
-ROW   |6197     |34970 |Application|WildFly deployment [{#DEPLOYMENT}]                             |
-ROW   |6198     |34971 |Application|WildFly deployment [{#DEPLOYMENT}]                             |
-ROW   |6199     |34972 |Application|WildFly deployment [{#DEPLOYMENT}]                             |
-ROW   |6200     |34973 |Application|WildFly deployment [{#DEPLOYMENT}]                             |
-ROW   |6201     |34974 |Application|WildFly deployment [{#DEPLOYMENT}]                             |
-ROW   |6202     |34975 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6203     |34976 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6204     |34977 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6205     |34978 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6206     |34979 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6207     |34980 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6208     |34981 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6209     |34982 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6210     |34983 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6211     |34984 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6212     |34985 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6213     |34986 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6214     |34987 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6215     |34988 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6216     |34989 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6217     |34990 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6218     |34991 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6219     |34992 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6220     |34993 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6221     |34994 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6222     |34995 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6223     |34996 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6224     |34997 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6225     |34998 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6226     |34999 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6227     |35000 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6228     |35001 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6229     |35002 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6230     |35003 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6231     |35004 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6232     |35005 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6233     |35006 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6234     |35007 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6235     |35008 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6236     |35009 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6237     |35010 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6238     |35011 |Application|WildFly datasource [{#JMX_DATA_SOURCE}]                        |
-ROW   |6239     |35012 |Application|WildFly listener [{#SERVER}.{#HTTP_LISTENER}]                  |
-ROW   |6240     |35013 |Application|WildFly listener [{#SERVER}.{#HTTP_LISTENER}]                  |
-ROW   |6241     |35014 |Application|WildFly listener [{#SERVER}.{#HTTP_LISTENER}]                  |
-ROW   |6242     |35015 |Application|WildFly listener [{#SERVER}.{#HTTP_LISTENER}]                  |
-ROW   |6243     |35016 |Application|Status                                                         |
-ROW   |6244     |35017 |Application|Status                                                         |
-ROW   |6245     |35018 |Application|Status                                                         |
-ROW   |6246     |35019 |Application|General                                                        |
-ROW   |6247     |35020 |Application|General                                                        |
-ROW   |6248     |35021 |Application|General                                                        |
-ROW   |6249     |35022 |Application|General                                                        |
-ROW   |6250     |35023 |Application|General                                                        |
-ROW   |6251     |35024 |Application|General                                                        |
-ROW   |6252     |35025 |Application|General                                                        |
-ROW   |6253     |35026 |Application|General                                                        |
-ROW   |6254     |35027 |Application|Status                                                         |
-ROW   |6255     |35028 |Application|Status                                                         |
-ROW   |6256     |35029 |Application|Status                                                         |
-ROW   |6257     |35030 |Application|Status                                                         |
-ROW   |6258     |35031 |Application|Status                                                         |
-ROW   |6259     |35032 |Application|Status                                                         |
-ROW   |6260     |35033 |Application|Status                                                         |
-ROW   |6261     |35034 |Application|Status                                                         |
-ROW   |6262     |35035 |Application|Status                                                         |
-ROW   |6263     |35036 |Application|Status                                                         |
-ROW   |6264     |35037 |Application|Status                                                         |
-ROW   |6265     |35038 |Application|Status                                                         |
-ROW   |6266     |35039 |Application|Status                                                         |
-ROW   |6267     |35040 |Application|Status                                                         |
-ROW   |6268     |35047 |Application|Status                                                         |
-ROW   |6269     |35048 |Application|Status                                                         |
-ROW   |6270     |35049 |Application|Status                                                         |
-ROW   |6271     |35050 |Application|Status                                                         |
-ROW   |6272     |35051 |Application|Status                                                         |
-ROW   |6273     |35052 |Application|General                                                        |
-ROW   |6274     |35053 |Application|Status                                                         |
-ROW   |6275     |35054 |Application|Status                                                         |
-ROW   |6276     |35055 |Application|Status                                                         |
-ROW   |6277     |35056 |Application|Status                                                         |
-ROW   |6278     |35057 |Application|Status                                                         |
-ROW   |6279     |35058 |Application|Status                                                         |
-ROW   |6280     |35059 |Application|Status                                                         |
-ROW   |6281     |35060 |Application|Status                                                         |
-ROW   |6282     |35061 |Application|Status                                                         |
-ROW   |6283     |35062 |Application|Status                                                         |
-ROW   |6284     |35063 |Application|Status                                                         |
-ROW   |6285     |35064 |data       |raw                                                            |
-ROW   |6286     |35064 |target     |cert                                                           |
-ROW   |6287     |35064 |transport  |agent                                                          |
-ROW   |6288     |35065 |resource   |general                                                        |
-ROW   |6289     |35065 |target     |cert                                                           |
-ROW   |6290     |35065 |transport  |dependent                                                      |
-ROW   |6291     |35065 |type       |gauge                                                          |
-ROW   |6292     |35066 |resource   |general                                                        |
-ROW   |6293     |35066 |target     |cert                                                           |
-ROW   |6294     |35066 |transport  |dependent                                                      |
-ROW   |6295     |35066 |type       |gauge                                                          |
-ROW   |6296     |35067 |resource   |general                                                        |
-ROW   |6297     |35067 |target     |cert                                                           |
-ROW   |6298     |35067 |transport  |dependent                                                      |
-ROW   |6299     |35067 |type       |gauge                                                          |
-ROW   |6300     |35068 |resource   |general                                                        |
-ROW   |6301     |35068 |target     |cert                                                           |
-ROW   |6302     |35068 |transport  |dependent                                                      |
-ROW   |6303     |35068 |type       |gauge                                                          |
-ROW   |6304     |35069 |resource   |general                                                        |
-ROW   |6305     |35069 |target     |cert                                                           |
-ROW   |6306     |35069 |transport  |dependent                                                      |
-ROW   |6307     |35069 |type       |gauge                                                          |
-ROW   |6308     |35070 |resource   |general                                                        |
-ROW   |6309     |35070 |target     |cert                                                           |
-ROW   |6310     |35070 |transport  |dependent                                                      |
-ROW   |6311     |35070 |type       |gauge                                                          |
-ROW   |6312     |35071 |resource   |general                                                        |
-ROW   |6313     |35071 |target     |cert                                                           |
-ROW   |6314     |35071 |transport  |dependent                                                      |
-ROW   |6315     |35071 |type       |gauge                                                          |
-ROW   |6316     |35072 |resource   |general                                                        |
-ROW   |6317     |35072 |target     |cert                                                           |
-ROW   |6318     |35072 |transport  |dependent                                                      |
-ROW   |6319     |35072 |type       |gauge                                                          |
-ROW   |6320     |35073 |resource   |general                                                        |
-ROW   |6321     |35073 |target     |cert                                                           |
-ROW   |6322     |35073 |transport  |dependent                                                      |
-ROW   |6323     |35073 |type       |gauge                                                          |
-ROW   |6324     |35074 |resource   |general                                                        |
-ROW   |6325     |35074 |target     |cert                                                           |
-ROW   |6326     |35074 |transport  |dependent                                                      |
-ROW   |6327     |35074 |type       |gauge                                                          |
-ROW   |6328     |35075 |resource   |general                                                        |
-ROW   |6329     |35075 |target     |cert                                                           |
-ROW   |6330     |35075 |transport  |dependent                                                      |
-ROW   |6331     |35075 |type       |gauge                                                          |
-ROW   |6332     |35076 |resource   |general                                                        |
-ROW   |6333     |35076 |target     |cert                                                           |
-ROW   |6334     |35076 |transport  |dependent                                                      |
-ROW   |6335     |35076 |type       |gauge                                                          |
-ROW   |6336     |35077 |data       |raw                                                            |
-ROW   |6337     |35077 |target     |cloudflare                                                     |
-ROW   |6338     |35077 |transport  |Script                                                         |
-ROW   |6339     |35078 |resource   |bandwidth                                                      |
-ROW   |6340     |35078 |target     |cloudflare                                                     |
-ROW   |6341     |35078 |type       |gauge                                                          |
-ROW   |6342     |35079 |resource   |requests                                                       |
-ROW   |6343     |35079 |target     |cloudflare                                                     |
-ROW   |6344     |35079 |type       |ratio                                                          |
-ROW   |6345     |35080 |resource   |threats                                                        |
-ROW   |6346     |35080 |target     |cloudflare                                                     |
-ROW   |6347     |35080 |type       |gauge                                                          |
-ROW   |6348     |35081 |resource   |requests                                                       |
-ROW   |6349     |35081 |target     |cloudflare                                                     |
-ROW   |6350     |35081 |type       |gauge                                                          |
-ROW   |6351     |35082 |resource   |requests                                                       |
-ROW   |6352     |35082 |target     |cloudflare                                                     |
-ROW   |6353     |35082 |type       |ratio                                                          |
-ROW   |6354     |35083 |resource   |requests                                                       |
-ROW   |6355     |35083 |target     |cloudflare                                                     |
-ROW   |6356     |35083 |type       |gauge                                                          |
-ROW   |6357     |35084 |resource   |requests                                                       |
-ROW   |6358     |35084 |target     |cloudflare                                                     |
-ROW   |6359     |35084 |type       |gauge                                                          |
-ROW   |6360     |35085 |resource   |requests                                                       |
-ROW   |6361     |35085 |target     |cloudflare                                                     |
-ROW   |6362     |35085 |type       |gauge                                                          |
-ROW   |6363     |35086 |resource   |requests                                                       |
-ROW   |6364     |35086 |target     |cloudflare                                                     |
-ROW   |6365     |35086 |type       |gauge                                                          |
-ROW   |6366     |35087 |resource   |requests                                                       |
-ROW   |6367     |35087 |target     |cloudflare                                                     |
-ROW   |6368     |35087 |type       |gauge                                                          |
-ROW   |6369     |35088 |resource   |requests                                                       |
-ROW   |6370     |35088 |target     |cloudflare                                                     |
-ROW   |6371     |35088 |type       |gauge                                                          |
-ROW   |6372     |35089 |resource   |requests                                                       |
-ROW   |6373     |35089 |target     |cloudflare                                                     |
-ROW   |6374     |35089 |type       |gauge                                                          |
-ROW   |6375     |35090 |resource   |requests                                                       |
-ROW   |6376     |35090 |target     |cloudflare                                                     |
-ROW   |6377     |35090 |type       |ratio                                                          |
-ROW   |6378     |35091 |resource   |bandwidth                                                      |
-ROW   |6379     |35091 |target     |cloudflare                                                     |
-ROW   |6380     |35091 |type       |gauge                                                          |
-ROW   |6381     |35092 |resource   |requests                                                       |
-ROW   |6382     |35092 |target     |cloudflare                                                     |
-ROW   |6383     |35092 |type       |gauge                                                          |
-ROW   |6384     |35093 |resource   |requests                                                       |
-ROW   |6385     |35093 |target     |cloudflare                                                     |
-ROW   |6386     |35093 |type       |gauge                                                          |
-ROW   |6387     |35094 |resource   |pageviews                                                      |
-ROW   |6388     |35094 |target     |cloudflare                                                     |
-ROW   |6389     |35094 |type       |gauge                                                          |
-ROW   |6390     |35095 |resource   |dns                                                            |
-ROW   |6391     |35095 |target     |cloudflare                                                     |
-ROW   |6392     |35095 |type       |gauge                                                          |
-ROW   |6393     |35096 |resource   |dns                                                            |
-ROW   |6394     |35096 |target     |cloudflare                                                     |
-ROW   |6395     |35096 |type       |gauge                                                          |
-ROW   |6396     |35097 |resource   |dns                                                            |
-ROW   |6397     |35097 |target     |cloudflare                                                     |
-ROW   |6398     |35097 |type       |gauge                                                          |
-ROW   |6399     |35098 |resource   |bandwidth                                                      |
-ROW   |6400     |35098 |target     |cloudflare                                                     |
-ROW   |6401     |35098 |type       |gauge                                                          |
-ROW   |6402     |35099 |resource   |bandwidth                                                      |
-ROW   |6403     |35099 |target     |cloudflare                                                     |
-ROW   |6404     |35099 |type       |gauge                                                          |
-ROW   |6405     |35100 |resource   |bandwidth                                                      |
-ROW   |6406     |35100 |target     |cloudflare                                                     |
-ROW   |6407     |35100 |type       |gauge                                                          |
-ROW   |6408     |35101 |resource   |bandwidth                                                      |
-ROW   |6409     |35101 |target     |cloudflare                                                     |
-ROW   |6410     |35101 |type       |ratio                                                          |
-ROW   |6411     |35102 |resource   |uniques                                                        |
-ROW   |6412     |35102 |target     |cloudflare                                                     |
-ROW   |6413     |35102 |type       |gauge                                                          |
-ROW   |6414     |30187 |resource   |general                                                        |
-ROW   |6415     |30187 |target     |haproxy                                                        |
-ROW   |6416     |30187 |transport  |agent                                                          |
-ROW   |6417     |30187 |type       |gauge                                                          |
-ROW   |6418     |30188 |resource   |general                                                        |
-ROW   |6419     |30188 |target     |haproxy                                                        |
-ROW   |6420     |30188 |transport  |agent                                                          |
-ROW   |6421     |30188 |type       |gauge                                                          |
-ROW   |6422     |30189 |data       |raw                                                            |
-ROW   |6423     |30189 |target     |haproxy                                                        |
-ROW   |6424     |30189 |transport  |agent                                                          |
-ROW   |6425     |30190 |data       |raw                                                            |
-ROW   |6426     |30190 |target     |haproxy                                                        |
-ROW   |6427     |30190 |transport  |agent                                                          |
-ROW   |6428     |30191 |resource   |general                                                        |
-ROW   |6429     |30191 |target     |haproxy                                                        |
-ROW   |6430     |30191 |transport  |dependent                                                      |
-ROW   |6431     |30191 |type       |gauge                                                          |
-ROW   |6432     |30192 |resource   |general                                                        |
-ROW   |6433     |30192 |target     |haproxy                                                        |
-ROW   |6434     |30192 |transport  |dependent                                                      |
-ROW   |6435     |30192 |type       |gauge                                                          |
-ROW   |6436     |35103 |data       |raw                                                            |
-ROW   |6437     |35103 |target     |haproxy                                                        |
-ROW   |6438     |35103 |transport  |dependent                                                      |
-ROW   |6439     |30196 |frontend   |{#PXNAME}                                                      |
-ROW   |6440     |30196 |resource   |frontend                                                       |
-ROW   |6441     |30196 |target     |haproxy                                                        |
-ROW   |6442     |30196 |transport  |calculated                                                     |
-ROW   |6443     |30196 |type       |gauge                                                          |
-ROW   |6444     |30197 |backend    |{#PXNAME}                                                      |
-ROW   |6445     |30197 |resource   |backend                                                        |
-ROW   |6446     |30197 |target     |haproxy                                                        |
-ROW   |6447     |30197 |transport  |dependent                                                      |
-ROW   |6448     |30197 |type       |rate                                                           |
-ROW   |6449     |30198 |backend    |{#PXNAME}                                                      |
-ROW   |6450     |30198 |resource   |backend                                                        |
-ROW   |6451     |30198 |target     |haproxy                                                        |
-ROW   |6452     |30198 |transport  |dependent                                                      |
-ROW   |6453     |30198 |type       |rate                                                           |
-ROW   |6454     |30199 |backend    |{#PXNAME}                                                      |
-ROW   |6455     |30199 |resource   |backend                                                        |
-ROW   |6456     |30199 |target     |haproxy                                                        |
-ROW   |6457     |30199 |transport  |dependent                                                      |
-ROW   |6458     |30199 |type       |rate                                                           |
-ROW   |6459     |30200 |backend    |{#PXNAME}                                                      |
-ROW   |6460     |30200 |resource   |backend                                                        |
-ROW   |6461     |30200 |target     |haproxy                                                        |
-ROW   |6462     |30200 |transport  |dependent                                                      |
-ROW   |6463     |30200 |type       |gauge                                                          |
-ROW   |6464     |30201 |backend    |{#PXNAME}                                                      |
-ROW   |6465     |30201 |resource   |backend                                                        |
-ROW   |6466     |30201 |target     |haproxy                                                        |
-ROW   |6467     |30201 |transport  |dependent                                                      |
-ROW   |6468     |30201 |type       |gauge                                                          |
-ROW   |6469     |30202 |backend    |{#PXNAME}                                                      |
-ROW   |6470     |30202 |resource   |backend                                                        |
-ROW   |6471     |30202 |target     |haproxy                                                        |
-ROW   |6472     |30202 |transport  |dependent                                                      |
-ROW   |6473     |30202 |type       |gauge                                                          |
-ROW   |6474     |30203 |backend    |{#PXNAME}                                                      |
-ROW   |6475     |30203 |resource   |backend                                                        |
-ROW   |6476     |30203 |target     |haproxy                                                        |
-ROW   |6477     |30203 |transport  |dependent                                                      |
-ROW   |6478     |30203 |type       |state                                                          |
-ROW   |6479     |30204 |backend    |{#PXNAME}                                                      |
-ROW   |6480     |30204 |resource   |backend                                                        |
-ROW   |6481     |30204 |target     |haproxy                                                        |
-ROW   |6482     |30204 |transport  |dependent                                                      |
-ROW   |6483     |30204 |type       |rate                                                           |
-ROW   |6484     |30205 |backend    |{#PXNAME}                                                      |
-ROW   |6485     |30205 |resource   |backend                                                        |
-ROW   |6486     |30205 |target     |haproxy                                                        |
-ROW   |6487     |30205 |transport  |dependent                                                      |
-ROW   |6488     |30205 |type       |rate                                                           |
-ROW   |6489     |30206 |frontend   |{#PXNAME}                                                      |
-ROW   |6490     |30206 |resource   |frontend                                                       |
-ROW   |6491     |30206 |target     |haproxy                                                        |
-ROW   |6492     |30206 |transport  |dependent                                                      |
-ROW   |6493     |30206 |type       |rate                                                           |
-ROW   |6494     |30207 |frontend   |{#PXNAME}                                                      |
-ROW   |6495     |30207 |resource   |frontend                                                       |
-ROW   |6496     |30207 |target     |haproxy                                                        |
-ROW   |6497     |30207 |transport  |dependent                                                      |
-ROW   |6498     |30207 |type       |rate                                                           |
-ROW   |6499     |30208 |frontend   |{#PXNAME}                                                      |
-ROW   |6500     |30208 |resource   |frontend                                                       |
-ROW   |6501     |30208 |target     |haproxy                                                        |
-ROW   |6502     |30208 |transport  |dependent                                                      |
-ROW   |6503     |30208 |type       |rate                                                           |
-ROW   |6504     |30209 |frontend   |{#PXNAME}                                                      |
-ROW   |6505     |30209 |resource   |frontend                                                       |
-ROW   |6506     |30209 |target     |haproxy                                                        |
-ROW   |6507     |30209 |transport  |dependent                                                      |
-ROW   |6508     |30209 |type       |rate                                                           |
-ROW   |6509     |30210 |frontend   |{#PXNAME}                                                      |
-ROW   |6510     |30210 |resource   |frontend                                                       |
-ROW   |6511     |30210 |target     |haproxy                                                        |
-ROW   |6512     |30210 |transport  |dependent                                                      |
-ROW   |6513     |30210 |type       |rate                                                           |
-ROW   |6514     |30211 |frontend   |{#PXNAME}                                                      |
-ROW   |6515     |30211 |resource   |frontend                                                       |
-ROW   |6516     |30211 |target     |haproxy                                                        |
-ROW   |6517     |30211 |transport  |dependent                                                      |
-ROW   |6518     |30211 |type       |rate                                                           |
-ROW   |6519     |30212 |frontend   |{#PXNAME}                                                      |
-ROW   |6520     |30212 |resource   |frontend                                                       |
-ROW   |6521     |30212 |target     |haproxy                                                        |
-ROW   |6522     |30212 |transport  |dependent                                                      |
-ROW   |6523     |30212 |type       |rate                                                           |
-ROW   |6524     |30213 |frontend   |{#PXNAME}                                                      |
-ROW   |6525     |30213 |resource   |frontend                                                       |
-ROW   |6526     |30213 |target     |haproxy                                                        |
-ROW   |6527     |30213 |transport  |dependent                                                      |
-ROW   |6528     |30213 |type       |rate                                                           |
-ROW   |6529     |30214 |frontend   |{#PXNAME}                                                      |
-ROW   |6530     |30214 |resource   |frontend                                                       |
-ROW   |6531     |30214 |target     |haproxy                                                        |
-ROW   |6532     |30214 |transport  |dependent                                                      |
-ROW   |6533     |30214 |type       |rate                                                           |
-ROW   |6534     |30215 |frontend   |{#PXNAME}                                                      |
-ROW   |6535     |30215 |resource   |frontend                                                       |
-ROW   |6536     |30215 |target     |haproxy                                                        |
-ROW   |6537     |30215 |transport  |dependent                                                      |
-ROW   |6538     |30215 |type       |gauge                                                          |
-ROW   |6539     |30216 |frontend   |{#PXNAME}                                                      |
-ROW   |6540     |30216 |resource   |frontend                                                       |
-ROW   |6541     |30216 |target     |haproxy                                                        |
-ROW   |6542     |30216 |transport  |dependent                                                      |
-ROW   |6543     |30216 |type       |gauge                                                          |
-ROW   |6544     |30217 |frontend   |{#PXNAME}                                                      |
-ROW   |6545     |30217 |resource   |frontend                                                       |
-ROW   |6546     |30217 |target     |haproxy                                                        |
-ROW   |6547     |30217 |transport  |dependent                                                      |
-ROW   |6548     |30217 |type       |gauge                                                          |
-ROW   |6549     |30218 |frontend   |{#PXNAME}                                                      |
-ROW   |6550     |30218 |resource   |frontend                                                       |
-ROW   |6551     |30218 |target     |haproxy                                                        |
-ROW   |6552     |30218 |transport  |dependent                                                      |
-ROW   |6553     |30218 |type       |gauge                                                          |
-ROW   |6554     |30219 |resource   |server                                                         |
-ROW   |6555     |30219 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6556     |30219 |target     |haproxy                                                        |
-ROW   |6557     |30219 |transport  |dependent                                                      |
-ROW   |6558     |30219 |type       |rate                                                           |
-ROW   |6559     |30220 |resource   |server                                                         |
-ROW   |6560     |30220 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6561     |30220 |target     |haproxy                                                        |
-ROW   |6562     |30220 |transport  |dependent                                                      |
-ROW   |6563     |30220 |type       |rate                                                           |
-ROW   |6564     |30221 |resource   |server                                                         |
-ROW   |6565     |30221 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6566     |30221 |target     |haproxy                                                        |
-ROW   |6567     |30221 |transport  |dependent                                                      |
-ROW   |6568     |30221 |type       |rate                                                           |
-ROW   |6569     |30222 |resource   |server                                                         |
-ROW   |6570     |30222 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6571     |30222 |target     |haproxy                                                        |
-ROW   |6572     |30222 |transport  |dependent                                                      |
-ROW   |6573     |30222 |type       |rate                                                           |
-ROW   |6574     |30223 |resource   |server                                                         |
-ROW   |6575     |30223 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6576     |30223 |target     |haproxy                                                        |
-ROW   |6577     |30223 |transport  |dependent                                                      |
-ROW   |6578     |30223 |type       |rate                                                           |
-ROW   |6579     |30224 |resource   |server                                                         |
-ROW   |6580     |30224 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6581     |30224 |target     |haproxy                                                        |
-ROW   |6582     |30224 |transport  |dependent                                                      |
-ROW   |6583     |30224 |type       |gauge                                                          |
-ROW   |6584     |30225 |resource   |server                                                         |
-ROW   |6585     |30225 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6586     |30225 |target     |haproxy                                                        |
-ROW   |6587     |30225 |transport  |dependent                                                      |
-ROW   |6588     |30225 |type       |gauge                                                          |
-ROW   |6589     |30226 |resource   |server                                                         |
-ROW   |6590     |30226 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6591     |30226 |target     |haproxy                                                        |
-ROW   |6592     |30226 |transport  |dependent                                                      |
-ROW   |6593     |30226 |type       |gauge                                                          |
-ROW   |6594     |30227 |resource   |server                                                         |
-ROW   |6595     |30227 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6596     |30227 |target     |haproxy                                                        |
-ROW   |6597     |30227 |transport  |dependent                                                      |
-ROW   |6598     |30227 |type       |state                                                          |
-ROW   |6599     |30228 |resource   |server                                                         |
-ROW   |6600     |30228 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6601     |30228 |target     |haproxy                                                        |
-ROW   |6602     |30228 |transport  |dependent                                                      |
-ROW   |6603     |30228 |type       |rate                                                           |
-ROW   |6604     |30229 |resource   |server                                                         |
-ROW   |6605     |30229 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6606     |30229 |target     |haproxy                                                        |
-ROW   |6607     |30229 |transport  |dependent                                                      |
-ROW   |6608     |30229 |type       |rate                                                           |
-ROW   |6609     |35104 |backend    |{#PXNAME}                                                      |
-ROW   |6610     |35104 |resource   |backend                                                        |
-ROW   |6611     |35104 |target     |haproxy                                                        |
-ROW   |6612     |35104 |transport  |dependent                                                      |
-ROW   |6613     |35104 |type       |gauge                                                          |
-ROW   |6614     |35105 |backend    |{#PXNAME}                                                      |
-ROW   |6615     |35105 |resource   |backend                                                        |
-ROW   |6616     |35105 |target     |haproxy                                                        |
-ROW   |6617     |35105 |transport  |dependent                                                      |
-ROW   |6618     |35105 |type       |rate                                                           |
-ROW   |6619     |35106 |backend    |{#PXNAME}                                                      |
-ROW   |6620     |35106 |resource   |backend                                                        |
-ROW   |6621     |35106 |target     |haproxy                                                        |
-ROW   |6622     |35106 |transport  |dependent                                                      |
-ROW   |6623     |35106 |type       |gauge                                                          |
-ROW   |6624     |35107 |backend    |{#PXNAME}                                                      |
-ROW   |6625     |35107 |resource   |backend                                                        |
-ROW   |6626     |35107 |target     |haproxy                                                        |
-ROW   |6627     |35107 |transport  |dependent                                                      |
-ROW   |6628     |35107 |type       |rate                                                           |
-ROW   |6629     |35108 |backend    |{#PXNAME}                                                      |
-ROW   |6630     |35108 |resource   |backend                                                        |
-ROW   |6631     |35108 |target     |haproxy                                                        |
-ROW   |6632     |35108 |transport  |dependent                                                      |
-ROW   |6633     |35108 |type       |rate                                                           |
-ROW   |6634     |35109 |backend    |{#PXNAME}                                                      |
-ROW   |6635     |35109 |resource   |backend                                                        |
-ROW   |6636     |35109 |target     |haproxy                                                        |
-ROW   |6637     |35109 |transport  |dependent                                                      |
-ROW   |6638     |35109 |type       |gauge                                                          |
-ROW   |6639     |35110 |backend    |{#PXNAME}                                                      |
-ROW   |6640     |35110 |resource   |backend                                                        |
-ROW   |6641     |35110 |target     |haproxy                                                        |
-ROW   |6642     |35110 |transport  |dependent                                                      |
-ROW   |6643     |35110 |type       |rate                                                           |
-ROW   |6644     |35111 |backend    |{#PXNAME}                                                      |
-ROW   |6645     |35111 |resource   |backend                                                        |
-ROW   |6646     |35111 |target     |haproxy                                                        |
-ROW   |6647     |35111 |transport  |dependent                                                      |
-ROW   |6648     |35111 |type       |rate                                                           |
-ROW   |6649     |35112 |backend    |{#PXNAME}                                                      |
-ROW   |6650     |35112 |resource   |backend                                                        |
-ROW   |6651     |35112 |target     |haproxy                                                        |
-ROW   |6652     |35112 |transport  |dependent                                                      |
-ROW   |6653     |35112 |type       |rate                                                           |
-ROW   |6654     |35113 |backend    |{#PXNAME}                                                      |
-ROW   |6655     |35113 |resource   |backend                                                        |
-ROW   |6656     |35113 |target     |haproxy                                                        |
-ROW   |6657     |35113 |transport  |dependent                                                      |
-ROW   |6658     |35113 |type       |rate                                                           |
-ROW   |6659     |35114 |backend    |{#PXNAME}                                                      |
-ROW   |6660     |35114 |resource   |backend                                                        |
-ROW   |6661     |35114 |target     |haproxy                                                        |
-ROW   |6662     |35114 |transport  |dependent                                                      |
-ROW   |6663     |35114 |type       |rate                                                           |
-ROW   |6664     |35115 |frontend   |{#PXNAME}                                                      |
-ROW   |6665     |35115 |resource   |frontend                                                       |
-ROW   |6666     |35115 |target     |haproxy                                                        |
-ROW   |6667     |35115 |transport  |dependent                                                      |
-ROW   |6668     |35115 |type       |state                                                          |
-ROW   |6669     |35116 |resource   |server                                                         |
-ROW   |6670     |35116 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6671     |35116 |target     |haproxy                                                        |
-ROW   |6672     |35116 |transport  |dependent                                                      |
-ROW   |6673     |35116 |type       |gauge                                                          |
-ROW   |6674     |35117 |resource   |server                                                         |
-ROW   |6675     |35117 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6676     |35117 |target     |haproxy                                                        |
-ROW   |6677     |35117 |transport  |dependent                                                      |
-ROW   |6678     |35117 |type       |gauge                                                          |
-ROW   |6679     |35118 |resource   |server                                                         |
-ROW   |6680     |35118 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6681     |35118 |target     |haproxy                                                        |
-ROW   |6682     |35118 |transport  |dependent                                                      |
-ROW   |6683     |35118 |type       |rate                                                           |
-ROW   |6684     |35119 |resource   |server                                                         |
-ROW   |6685     |35119 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6686     |35119 |target     |haproxy                                                        |
-ROW   |6687     |35119 |transport  |dependent                                                      |
-ROW   |6688     |35119 |type       |gauge                                                          |
-ROW   |6689     |35120 |resource   |server                                                         |
-ROW   |6690     |35120 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6691     |35120 |target     |haproxy                                                        |
-ROW   |6692     |35120 |transport  |dependent                                                      |
-ROW   |6693     |35120 |type       |rate                                                           |
-ROW   |6694     |35121 |resource   |server                                                         |
-ROW   |6695     |35121 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6696     |35121 |target     |haproxy                                                        |
-ROW   |6697     |35121 |transport  |dependent                                                      |
-ROW   |6698     |35121 |type       |gauge                                                          |
-ROW   |6699     |35122 |resource   |server                                                         |
-ROW   |6700     |35122 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6701     |35122 |target     |haproxy                                                        |
-ROW   |6702     |35122 |transport  |dependent                                                      |
-ROW   |6703     |35122 |type       |rate                                                           |
-ROW   |6704     |35123 |resource   |server                                                         |
-ROW   |6705     |35123 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6706     |35123 |target     |haproxy                                                        |
-ROW   |6707     |35123 |transport  |dependent                                                      |
-ROW   |6708     |35123 |type       |rate                                                           |
-ROW   |6709     |35124 |resource   |server                                                         |
-ROW   |6710     |35124 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6711     |35124 |target     |haproxy                                                        |
-ROW   |6712     |35124 |transport  |dependent                                                      |
-ROW   |6713     |35124 |type       |rate                                                           |
-ROW   |6714     |35125 |resource   |server                                                         |
-ROW   |6715     |35125 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6716     |35125 |target     |haproxy                                                        |
-ROW   |6717     |35125 |transport  |dependent                                                      |
-ROW   |6718     |35125 |type       |state                                                          |
-ROW   |6719     |35126 |resource   |server                                                         |
-ROW   |6720     |35126 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6721     |35126 |target     |haproxy                                                        |
-ROW   |6722     |35126 |transport  |dependent                                                      |
-ROW   |6723     |35126 |type       |rate                                                           |
-ROW   |6724     |35127 |resource   |server                                                         |
-ROW   |6725     |35127 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6726     |35127 |target     |haproxy                                                        |
-ROW   |6727     |35127 |transport  |dependent                                                      |
-ROW   |6728     |35127 |type       |rate                                                           |
-ROW   |6729     |30230 |data       |raw                                                            |
-ROW   |6730     |30230 |target     |haproxy                                                        |
-ROW   |6731     |30230 |transport  |http                                                           |
-ROW   |6732     |30231 |data       |raw                                                            |
-ROW   |6733     |30231 |target     |haproxy                                                        |
-ROW   |6734     |30231 |transport  |http                                                           |
-ROW   |6735     |30789 |resource   |general                                                        |
-ROW   |6736     |30789 |target     |haproxy                                                        |
-ROW   |6737     |30789 |transport  |simple                                                         |
-ROW   |6738     |30789 |type       |gauge                                                          |
-ROW   |6739     |30790 |resource   |general                                                        |
-ROW   |6740     |30790 |target     |haproxy                                                        |
-ROW   |6741     |30790 |transport  |simple                                                         |
-ROW   |6742     |30790 |type       |gauge                                                          |
-ROW   |6743     |30234 |resource   |general                                                        |
-ROW   |6744     |30234 |target     |haproxy                                                        |
-ROW   |6745     |30234 |transport  |dependent                                                      |
-ROW   |6746     |30234 |type       |gauge                                                          |
-ROW   |6747     |30235 |resource   |general                                                        |
-ROW   |6748     |30235 |target     |haproxy                                                        |
-ROW   |6749     |30235 |transport  |dependent                                                      |
-ROW   |6750     |30235 |type       |gauge                                                          |
-ROW   |6751     |35128 |data       |raw                                                            |
-ROW   |6752     |35128 |target     |haproxy                                                        |
-ROW   |6753     |35128 |transport  |dependent                                                      |
-ROW   |6754     |30239 |frontend   |{#PXNAME}                                                      |
-ROW   |6755     |30239 |resource   |frontend                                                       |
-ROW   |6756     |30239 |target     |haproxy                                                        |
-ROW   |6757     |30239 |transport  |calculated                                                     |
-ROW   |6758     |30239 |type       |gauge                                                          |
-ROW   |6759     |30240 |backend    |{#PXNAME}                                                      |
-ROW   |6760     |30240 |resource   |backend                                                        |
-ROW   |6761     |30240 |target     |haproxy                                                        |
-ROW   |6762     |30240 |transport  |dependent                                                      |
-ROW   |6763     |30240 |type       |rate                                                           |
-ROW   |6764     |30241 |backend    |{#PXNAME}                                                      |
-ROW   |6765     |30241 |resource   |backend                                                        |
-ROW   |6766     |30241 |target     |haproxy                                                        |
-ROW   |6767     |30241 |transport  |dependent                                                      |
-ROW   |6768     |30241 |type       |rate                                                           |
-ROW   |6769     |30242 |backend    |{#PXNAME}                                                      |
-ROW   |6770     |30242 |resource   |backend                                                        |
-ROW   |6771     |30242 |target     |haproxy                                                        |
-ROW   |6772     |30242 |transport  |dependent                                                      |
-ROW   |6773     |30242 |type       |rate                                                           |
-ROW   |6774     |30243 |backend    |{#PXNAME}                                                      |
-ROW   |6775     |30243 |resource   |backend                                                        |
-ROW   |6776     |30243 |target     |haproxy                                                        |
-ROW   |6777     |30243 |transport  |dependent                                                      |
-ROW   |6778     |30243 |type       |gauge                                                          |
-ROW   |6779     |30244 |backend    |{#PXNAME}                                                      |
-ROW   |6780     |30244 |resource   |backend                                                        |
-ROW   |6781     |30244 |target     |haproxy                                                        |
-ROW   |6782     |30244 |transport  |dependent                                                      |
-ROW   |6783     |30244 |type       |gauge                                                          |
-ROW   |6784     |30245 |backend    |{#PXNAME}                                                      |
-ROW   |6785     |30245 |resource   |backend                                                        |
-ROW   |6786     |30245 |target     |haproxy                                                        |
-ROW   |6787     |30245 |transport  |dependent                                                      |
-ROW   |6788     |30245 |type       |gauge                                                          |
-ROW   |6789     |30246 |backend    |{#PXNAME}                                                      |
-ROW   |6790     |30246 |resource   |backend                                                        |
-ROW   |6791     |30246 |target     |haproxy                                                        |
-ROW   |6792     |30246 |transport  |dependent                                                      |
-ROW   |6793     |30246 |type       |state                                                          |
-ROW   |6794     |30247 |backend    |{#PXNAME}                                                      |
-ROW   |6795     |30247 |resource   |backend                                                        |
-ROW   |6796     |30247 |target     |haproxy                                                        |
-ROW   |6797     |30247 |transport  |dependent                                                      |
-ROW   |6798     |30247 |type       |rate                                                           |
-ROW   |6799     |30248 |backend    |{#PXNAME}                                                      |
-ROW   |6800     |30248 |resource   |backend                                                        |
-ROW   |6801     |30248 |target     |haproxy                                                        |
-ROW   |6802     |30248 |transport  |dependent                                                      |
-ROW   |6803     |30248 |type       |rate                                                           |
-ROW   |6804     |30249 |frontend   |{#PXNAME}                                                      |
-ROW   |6805     |30249 |resource   |frontend                                                       |
-ROW   |6806     |30249 |target     |haproxy                                                        |
-ROW   |6807     |30249 |transport  |dependent                                                      |
-ROW   |6808     |30249 |type       |rate                                                           |
-ROW   |6809     |30250 |frontend   |{#PXNAME}                                                      |
-ROW   |6810     |30250 |resource   |frontend                                                       |
-ROW   |6811     |30250 |target     |haproxy                                                        |
-ROW   |6812     |30250 |transport  |dependent                                                      |
-ROW   |6813     |30250 |type       |rate                                                           |
-ROW   |6814     |30251 |frontend   |{#PXNAME}                                                      |
-ROW   |6815     |30251 |resource   |frontend                                                       |
-ROW   |6816     |30251 |target     |haproxy                                                        |
-ROW   |6817     |30251 |transport  |dependent                                                      |
-ROW   |6818     |30251 |type       |rate                                                           |
-ROW   |6819     |30252 |frontend   |{#PXNAME}                                                      |
-ROW   |6820     |30252 |resource   |frontend                                                       |
-ROW   |6821     |30252 |target     |haproxy                                                        |
-ROW   |6822     |30252 |transport  |dependent                                                      |
-ROW   |6823     |30252 |type       |rate                                                           |
-ROW   |6824     |30253 |frontend   |{#PXNAME}                                                      |
-ROW   |6825     |30253 |resource   |frontend                                                       |
-ROW   |6826     |30253 |target     |haproxy                                                        |
-ROW   |6827     |30253 |transport  |dependent                                                      |
-ROW   |6828     |30253 |type       |rate                                                           |
-ROW   |6829     |30254 |frontend   |{#PXNAME}                                                      |
-ROW   |6830     |30254 |resource   |frontend                                                       |
-ROW   |6831     |30254 |target     |haproxy                                                        |
-ROW   |6832     |30254 |transport  |dependent                                                      |
-ROW   |6833     |30254 |type       |rate                                                           |
-ROW   |6834     |30255 |frontend   |{#PXNAME}                                                      |
-ROW   |6835     |30255 |resource   |frontend                                                       |
-ROW   |6836     |30255 |target     |haproxy                                                        |
-ROW   |6837     |30255 |transport  |dependent                                                      |
-ROW   |6838     |30255 |type       |rate                                                           |
-ROW   |6839     |30256 |frontend   |{#PXNAME}                                                      |
-ROW   |6840     |30256 |resource   |frontend                                                       |
-ROW   |6841     |30256 |target     |haproxy                                                        |
-ROW   |6842     |30256 |transport  |dependent                                                      |
-ROW   |6843     |30256 |type       |rate                                                           |
-ROW   |6844     |30257 |frontend   |{#PXNAME}                                                      |
-ROW   |6845     |30257 |resource   |frontend                                                       |
-ROW   |6846     |30257 |target     |haproxy                                                        |
-ROW   |6847     |30257 |transport  |dependent                                                      |
-ROW   |6848     |30257 |type       |rate                                                           |
-ROW   |6849     |30258 |frontend   |{#PXNAME}                                                      |
-ROW   |6850     |30258 |resource   |frontend                                                       |
-ROW   |6851     |30258 |target     |haproxy                                                        |
-ROW   |6852     |30258 |transport  |dependent                                                      |
-ROW   |6853     |30258 |type       |gauge                                                          |
-ROW   |6854     |30259 |frontend   |{#PXNAME}                                                      |
-ROW   |6855     |30259 |resource   |frontend                                                       |
-ROW   |6856     |30259 |target     |haproxy                                                        |
-ROW   |6857     |30259 |transport  |dependent                                                      |
-ROW   |6858     |30259 |type       |gauge                                                          |
-ROW   |6859     |30260 |frontend   |{#PXNAME}                                                      |
-ROW   |6860     |30260 |resource   |frontend                                                       |
-ROW   |6861     |30260 |target     |haproxy                                                        |
-ROW   |6862     |30260 |transport  |dependent                                                      |
-ROW   |6863     |30260 |type       |gauge                                                          |
-ROW   |6864     |30261 |frontend   |{#PXNAME}                                                      |
-ROW   |6865     |30261 |resource   |frontend                                                       |
-ROW   |6866     |30261 |target     |haproxy                                                        |
-ROW   |6867     |30261 |transport  |dependent                                                      |
-ROW   |6868     |30261 |type       |gauge                                                          |
-ROW   |6869     |30262 |resource   |server                                                         |
-ROW   |6870     |30262 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6871     |30262 |target     |haproxy                                                        |
-ROW   |6872     |30262 |transport  |dependent                                                      |
-ROW   |6873     |30262 |type       |rate                                                           |
-ROW   |6874     |30263 |resource   |server                                                         |
-ROW   |6875     |30263 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6876     |30263 |target     |haproxy                                                        |
-ROW   |6877     |30263 |transport  |dependent                                                      |
-ROW   |6878     |30263 |type       |rate                                                           |
-ROW   |6879     |30264 |resource   |server                                                         |
-ROW   |6880     |30264 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6881     |30264 |target     |haproxy                                                        |
-ROW   |6882     |30264 |transport  |dependent                                                      |
-ROW   |6883     |30264 |type       |rate                                                           |
-ROW   |6884     |30265 |resource   |server                                                         |
-ROW   |6885     |30265 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6886     |30265 |target     |haproxy                                                        |
-ROW   |6887     |30265 |transport  |dependent                                                      |
-ROW   |6888     |30265 |type       |rate                                                           |
-ROW   |6889     |30266 |resource   |server                                                         |
-ROW   |6890     |30266 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6891     |30266 |target     |haproxy                                                        |
-ROW   |6892     |30266 |transport  |dependent                                                      |
-ROW   |6893     |30266 |type       |rate                                                           |
-ROW   |6894     |30267 |resource   |server                                                         |
-ROW   |6895     |30267 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6896     |30267 |target     |haproxy                                                        |
-ROW   |6897     |30267 |transport  |dependent                                                      |
-ROW   |6898     |30267 |type       |gauge                                                          |
-ROW   |6899     |30268 |resource   |server                                                         |
-ROW   |6900     |30268 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6901     |30268 |target     |haproxy                                                        |
-ROW   |6902     |30268 |transport  |dependent                                                      |
-ROW   |6903     |30268 |type       |gauge                                                          |
-ROW   |6904     |30269 |resource   |server                                                         |
-ROW   |6905     |30269 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6906     |30269 |target     |haproxy                                                        |
-ROW   |6907     |30269 |transport  |dependent                                                      |
-ROW   |6908     |30269 |type       |gauge                                                          |
-ROW   |6909     |30270 |resource   |server                                                         |
-ROW   |6910     |30270 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6911     |30270 |target     |haproxy                                                        |
-ROW   |6912     |30270 |transport  |dependent                                                      |
-ROW   |6913     |30270 |type       |state                                                          |
-ROW   |6914     |30271 |resource   |server                                                         |
-ROW   |6915     |30271 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6916     |30271 |target     |haproxy                                                        |
-ROW   |6917     |30271 |transport  |dependent                                                      |
-ROW   |6918     |30271 |type       |rate                                                           |
-ROW   |6919     |30272 |resource   |server                                                         |
-ROW   |6920     |30272 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6921     |30272 |target     |haproxy                                                        |
-ROW   |6922     |30272 |transport  |dependent                                                      |
-ROW   |6923     |30272 |type       |rate                                                           |
-ROW   |6924     |35129 |backend    |{#PXNAME}                                                      |
-ROW   |6925     |35129 |resource   |backend                                                        |
-ROW   |6926     |35129 |target     |haproxy                                                        |
-ROW   |6927     |35129 |transport  |dependent                                                      |
-ROW   |6928     |35129 |type       |gauge                                                          |
-ROW   |6929     |35130 |backend    |{#PXNAME}                                                      |
-ROW   |6930     |35130 |resource   |backend                                                        |
-ROW   |6931     |35130 |target     |haproxy                                                        |
-ROW   |6932     |35130 |transport  |dependent                                                      |
-ROW   |6933     |35130 |type       |rate                                                           |
-ROW   |6934     |35131 |backend    |{#PXNAME}                                                      |
-ROW   |6935     |35131 |resource   |backend                                                        |
-ROW   |6936     |35131 |target     |haproxy                                                        |
-ROW   |6937     |35131 |transport  |dependent                                                      |
-ROW   |6938     |35131 |type       |gauge                                                          |
-ROW   |6939     |35132 |backend    |{#PXNAME}                                                      |
-ROW   |6940     |35132 |resource   |backend                                                        |
-ROW   |6941     |35132 |target     |haproxy                                                        |
-ROW   |6942     |35132 |transport  |dependent                                                      |
-ROW   |6943     |35132 |type       |rate                                                           |
-ROW   |6944     |35133 |backend    |{#PXNAME}                                                      |
-ROW   |6945     |35133 |resource   |backend                                                        |
-ROW   |6946     |35133 |target     |haproxy                                                        |
-ROW   |6947     |35133 |transport  |dependent                                                      |
-ROW   |6948     |35133 |type       |rate                                                           |
-ROW   |6949     |35134 |backend    |{#PXNAME}                                                      |
-ROW   |6950     |35134 |resource   |backend                                                        |
-ROW   |6951     |35134 |target     |haproxy                                                        |
-ROW   |6952     |35134 |transport  |dependent                                                      |
-ROW   |6953     |35134 |type       |gauge                                                          |
-ROW   |6954     |35135 |backend    |{#PXNAME}                                                      |
-ROW   |6955     |35135 |resource   |backend                                                        |
-ROW   |6956     |35135 |target     |haproxy                                                        |
-ROW   |6957     |35135 |transport  |dependent                                                      |
-ROW   |6958     |35135 |type       |rate                                                           |
-ROW   |6959     |35136 |backend    |{#PXNAME}                                                      |
-ROW   |6960     |35136 |resource   |backend                                                        |
-ROW   |6961     |35136 |target     |haproxy                                                        |
-ROW   |6962     |35136 |transport  |dependent                                                      |
-ROW   |6963     |35136 |type       |rate                                                           |
-ROW   |6964     |35137 |backend    |{#PXNAME}                                                      |
-ROW   |6965     |35137 |resource   |backend                                                        |
-ROW   |6966     |35137 |target     |haproxy                                                        |
-ROW   |6967     |35137 |transport  |dependent                                                      |
-ROW   |6968     |35137 |type       |rate                                                           |
-ROW   |6969     |35138 |backend    |{#PXNAME}                                                      |
-ROW   |6970     |35138 |resource   |backend                                                        |
-ROW   |6971     |35138 |target     |haproxy                                                        |
-ROW   |6972     |35138 |transport  |dependent                                                      |
-ROW   |6973     |35138 |type       |rate                                                           |
-ROW   |6974     |35139 |backend    |{#PXNAME}                                                      |
-ROW   |6975     |35139 |resource   |backend                                                        |
-ROW   |6976     |35139 |target     |haproxy                                                        |
-ROW   |6977     |35139 |transport  |dependent                                                      |
-ROW   |6978     |35139 |type       |rate                                                           |
-ROW   |6979     |35140 |frontend   |{#PXNAME}                                                      |
-ROW   |6980     |35140 |resource   |frontend                                                       |
-ROW   |6981     |35140 |target     |haproxy                                                        |
-ROW   |6982     |35140 |transport  |dependent                                                      |
-ROW   |6983     |35140 |type       |state                                                          |
-ROW   |6984     |35141 |resource   |server                                                         |
-ROW   |6985     |35141 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6986     |35141 |target     |haproxy                                                        |
-ROW   |6987     |35141 |transport  |dependent                                                      |
-ROW   |6988     |35141 |type       |gauge                                                          |
-ROW   |6989     |35142 |resource   |server                                                         |
-ROW   |6990     |35142 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6991     |35142 |target     |haproxy                                                        |
-ROW   |6992     |35142 |transport  |dependent                                                      |
-ROW   |6993     |35142 |type       |gauge                                                          |
-ROW   |6994     |35143 |resource   |server                                                         |
-ROW   |6995     |35143 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |6996     |35143 |target     |haproxy                                                        |
-ROW   |6997     |35143 |transport  |dependent                                                      |
-ROW   |6998     |35143 |type       |rate                                                           |
-ROW   |6999     |35144 |resource   |server                                                         |
-ROW   |7000     |35144 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |7001     |35144 |target     |haproxy                                                        |
-ROW   |7002     |35144 |transport  |dependent                                                      |
-ROW   |7003     |35144 |type       |gauge                                                          |
-ROW   |7004     |35145 |resource   |server                                                         |
-ROW   |7005     |35145 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |7006     |35145 |target     |haproxy                                                        |
-ROW   |7007     |35145 |transport  |dependent                                                      |
-ROW   |7008     |35145 |type       |rate                                                           |
-ROW   |7009     |35146 |resource   |server                                                         |
-ROW   |7010     |35146 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |7011     |35146 |target     |haproxy                                                        |
-ROW   |7012     |35146 |transport  |dependent                                                      |
-ROW   |7013     |35146 |type       |gauge                                                          |
-ROW   |7014     |35147 |resource   |server                                                         |
-ROW   |7015     |35147 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |7016     |35147 |target     |haproxy                                                        |
-ROW   |7017     |35147 |transport  |dependent                                                      |
-ROW   |7018     |35147 |type       |rate                                                           |
-ROW   |7019     |35148 |resource   |server                                                         |
-ROW   |7020     |35148 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |7021     |35148 |target     |haproxy                                                        |
-ROW   |7022     |35148 |transport  |dependent                                                      |
-ROW   |7023     |35148 |type       |rate                                                           |
-ROW   |7024     |35149 |resource   |server                                                         |
-ROW   |7025     |35149 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |7026     |35149 |target     |haproxy                                                        |
-ROW   |7027     |35149 |transport  |dependent                                                      |
-ROW   |7028     |35149 |type       |rate                                                           |
-ROW   |7029     |35150 |resource   |server                                                         |
-ROW   |7030     |35150 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |7031     |35150 |target     |haproxy                                                        |
-ROW   |7032     |35150 |transport  |dependent                                                      |
-ROW   |7033     |35150 |type       |state                                                          |
-ROW   |7034     |35151 |resource   |server                                                         |
-ROW   |7035     |35151 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |7036     |35151 |target     |haproxy                                                        |
-ROW   |7037     |35151 |transport  |dependent                                                      |
-ROW   |7038     |35151 |type       |rate                                                           |
-ROW   |7039     |35152 |resource   |server                                                         |
-ROW   |7040     |35152 |server     |{#PXNAME} {#SVNAME}                                            |
-ROW   |7041     |35152 |target     |haproxy                                                        |
-ROW   |7042     |35152 |transport  |dependent                                                      |
-ROW   |7043     |35152 |type       |rate                                                           |
-ROW   |7044     |35153 |Application|Zabbix raw items                                               |
-ROW   |7045     |35154 |Application|Zabbix raw items                                               |
-ROW   |7046     |35155 |Application|Zabbix raw items                                               |
-ROW   |7047     |35156 |Application|Zabbix raw items                                               |
-ROW   |7048     |35157 |Application|Zabbix raw items                                               |
-ROW   |7049     |35158 |Application|Zabbix raw items                                               |
-ROW   |7050     |35159 |Application|Zabbix raw items                                               |
-ROW   |7051     |35160 |Application|Zabbix raw items                                               |
-ROW   |7052     |35161 |Application|Zabbix raw items                                               |
-ROW   |7053     |35162 |Application|Zabbix raw items                                               |
-ROW   |7054     |35163 |Application|Nginx                                                          |
-ROW   |7055     |35164 |Application|Nginx                                                          |
-ROW   |7056     |35165 |Application|Nginx                                                          |
-ROW   |7057     |35166 |Application|Nginx                                                          |
-ROW   |7058     |35167 |Application|Nginx                                                          |
-ROW   |7059     |35168 |Application|Nginx                                                          |
-ROW   |7060     |35169 |Application|Nginx                                                          |
-ROW   |7061     |35170 |Application|Nginx                                                          |
-ROW   |7062     |35171 |Application|Nginx                                                          |
-ROW   |7063     |35172 |Application|Nginx                                                          |
-ROW   |7064     |35173 |Application|Nginx                                                          |
-ROW   |7065     |35174 |Application|Nginx                                                          |
-ROW   |7066     |35175 |Application|Nginx                                                          |
-ROW   |7067     |35176 |Application|Nginx                                                          |
-ROW   |7068     |35185 |Application|Nginx: HTTP location zone [{#NAME}]                            |
-ROW   |7069     |35186 |Application|Nginx: HTTP location zone [{#NAME}]                            |
-ROW   |7070     |35187 |Application|Nginx: HTTP location zone [{#NAME}]                            |
-ROW   |7071     |35188 |Application|Nginx: HTTP location zone [{#NAME}]                            |
-ROW   |7072     |35189 |Application|Nginx: HTTP location zone [{#NAME}]                            |
-ROW   |7073     |35190 |Application|Nginx: HTTP location zone [{#NAME}]                            |
-ROW   |7074     |35191 |Application|Nginx: HTTP location zone [{#NAME}]                            |
-ROW   |7075     |35192 |Application|Nginx: HTTP location zone [{#NAME}]                            |
-ROW   |7076     |35193 |Application|Nginx: HTTP location zone [{#NAME}]                            |
-ROW   |7077     |35194 |Application|Nginx: HTTP location zone [{#NAME}]                            |
-ROW   |7078     |35195 |Application|Nginx: HTTP zone [{#NAME}]                                     |
-ROW   |7079     |35196 |Application|Nginx: HTTP zone [{#NAME}]                                     |
-ROW   |7080     |35197 |Application|Nginx: HTTP zone [{#NAME}]                                     |
-ROW   |7081     |35198 |Application|Nginx: HTTP zone [{#NAME}]                                     |
-ROW   |7082     |35199 |Application|Nginx: HTTP zone [{#NAME}]                                     |
-ROW   |7083     |35200 |Application|Nginx: HTTP zone [{#NAME}]                                     |
-ROW   |7084     |35201 |Application|Nginx: HTTP zone [{#NAME}]                                     |
-ROW   |7085     |35202 |Application|Nginx: HTTP zone [{#NAME}]                                     |
-ROW   |7086     |35203 |Application|Nginx: HTTP zone [{#NAME}]                                     |
-ROW   |7087     |35204 |Application|Nginx: HTTP zone [{#NAME}]                                     |
-ROW   |7088     |35205 |Application|Nginx: HTTP zone [{#NAME}]                                     |
-ROW   |7089     |35206 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7090     |35207 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7091     |35208 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7092     |35209 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7093     |35210 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7094     |35211 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7095     |35212 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7096     |35213 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7097     |35214 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7098     |35215 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7099     |35216 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7100     |35217 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7101     |35218 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7102     |35219 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7103     |35220 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7104     |35221 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7105     |35222 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7106     |35223 |Application|Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
-ROW   |7107     |35224 |Application|Nginx: HTTP upstream [{#NAME}]                                 |
-ROW   |7108     |35225 |Application|Nginx: HTTP upstream [{#NAME}]                                 |
-ROW   |7109     |35226 |Application|Nginx: HTTP upstream [{#NAME}]                                 |
-ROW   |7110     |35227 |Application|Nginx: Resolver [{#NAME}]                                      |
-ROW   |7111     |35228 |Application|Nginx: Resolver [{#NAME}]                                      |
-ROW   |7112     |35229 |Application|Nginx: Resolver [{#NAME}]                                      |
-ROW   |7113     |35230 |Application|Nginx: Resolver [{#NAME}]                                      |
-ROW   |7114     |35231 |Application|Nginx: Resolver [{#NAME}]                                      |
-ROW   |7115     |35232 |Application|Nginx: Resolver [{#NAME}]                                      |
-ROW   |7116     |35233 |Application|Nginx: Resolver [{#NAME}]                                      |
-ROW   |7117     |35234 |Application|Nginx: Resolver [{#NAME}]                                      |
-ROW   |7118     |35235 |Application|Nginx: Resolver [{#NAME}]                                      |
-ROW   |7119     |35236 |Application|Nginx: Resolver [{#NAME}]                                      |
-ROW   |7120     |35237 |Application|Nginx: Resolver [{#NAME}]                                      |
-ROW   |7121     |35238 |Application|Nginx: Stream zone [{#NAME}]                                   |
-ROW   |7122     |35239 |Application|Nginx: Stream zone [{#NAME}]                                   |
-ROW   |7123     |35240 |Application|Nginx: Stream zone [{#NAME}]                                   |
-ROW   |7124     |35241 |Application|Nginx: Stream zone [{#NAME}]                                   |
-ROW   |7125     |35242 |Application|Nginx: Stream zone [{#NAME}]                                   |
-ROW   |7126     |35243 |Application|Nginx: Stream zone [{#NAME}]                                   |
-ROW   |7127     |35244 |Application|Nginx: Stream zone [{#NAME}]                                   |
-ROW   |7128     |35245 |Application|Nginx: Stream zone [{#NAME}]                                   |
-ROW   |7129     |35246 |Application|Nginx: Stream zone [{#NAME}]                                   |
-ROW   |7130     |35247 |Application|Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
-ROW   |7131     |35248 |Application|Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
-ROW   |7132     |35249 |Application|Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
-ROW   |7133     |35250 |Application|Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
-ROW   |7134     |35251 |Application|Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
-ROW   |7135     |35252 |Application|Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
-ROW   |7136     |35253 |Application|Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
-ROW   |7137     |35254 |Application|Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
-ROW   |7138     |35255 |Application|Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
-ROW   |7139     |35256 |Application|Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
-ROW   |7140     |35257 |Application|Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
-ROW   |7141     |35258 |Application|Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
-ROW   |7142     |35259 |Application|Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
-ROW   |7143     |35260 |Application|Nginx: Stream upstream [{#NAME}]                               |
-ROW   |7144     |35261 |Application|Nginx: Stream upstream [{#NAME}]                               |
-ROW   |7145     |35264 |Application|Zabbix raw items                                               |
-ROW   |7146     |35265 |Application|Zabbix raw items                                               |
-ROW   |7147     |35266 |Application|Systemd service: {#UNIT.NAME}                                  |
-ROW   |7148     |35267 |Application|Systemd service: {#UNIT.NAME}                                  |
-ROW   |7149     |35268 |Application|Systemd service: {#UNIT.NAME}                                  |
-ROW   |7150     |35269 |Application|Systemd service: {#UNIT.NAME}                                  |
-ROW   |7151     |35270 |Application|Systemd socket: {#UNIT.NAME}                                   |
-ROW   |7152     |35271 |Application|Systemd socket: {#UNIT.NAME}                                   |
-ROW   |7153     |35272 |Application|Zabbix server                                                  |
-ROW   |7154     |35273 |Application|Zabbix server                                                  |
-ROW   |7155     |35274 |Application|Zabbix server                                                  |
-ROW   |7156     |35275 |Application|Zabbix server                                                  |
-ROW   |7157     |35276 |Application|Zabbix server                                                  |
-ROW   |7158     |35277 |Application|Zabbix server                                                  |
-ROW   |7159     |28539 |Application|Zabbix raw items                                               |
-ROW   |7160     |35278 |Application|Zabbix server                                                  |
-ROW   |7161     |35279 |Application|Zabbix server                                                  |
-ROW   |7162     |35290 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
-ROW   |7163     |35291 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
-ROW   |7164     |35292 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
-ROW   |7165     |35293 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
-ROW   |7166     |35294 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
-ROW   |7167     |35295 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
-ROW   |7168     |35296 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
-ROW   |7169     |35297 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
-ROW   |7170     |35298 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
-ROW   |7171     |35299 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
-ROW   |7172     |35300 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
-ROW   |7173     |35301 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7174     |35302 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7175     |35303 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7176     |35304 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7177     |35305 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7178     |35306 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7179     |35307 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7180     |35308 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7181     |35309 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7182     |35310 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7183     |35311 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7184     |35312 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7185     |35313 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7186     |35314 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7187     |35315 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7188     |35316 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7189     |35317 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7190     |35318 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7191     |35319 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7192     |35320 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7193     |35321 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7194     |35322 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7195     |35323 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7196     |35324 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7197     |35325 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7198     |35326 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7199     |35327 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7200     |35328 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7201     |35329 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7202     |35330 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7203     |35331 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7204     |35332 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7205     |35333 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7206     |35334 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7207     |35335 |Application|GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
-ROW   |7208     |35336 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
-ROW   |7209     |35337 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
-ROW   |7210     |35338 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
-ROW   |7211     |35339 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
-ROW   |7212     |35340 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
-ROW   |7213     |35341 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
-ROW   |7214     |35342 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
-ROW   |7215     |35343 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
-ROW   |7216     |35344 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
-ROW   |7217     |35345 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]  |
-ROW   |7218     |35346 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]  |
-ROW   |7219     |35347 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]  |
-ROW   |7220     |35348 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]  |
-ROW   |7221     |35349 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
-ROW   |7222     |35350 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
-ROW   |7223     |35351 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
-ROW   |7224     |35352 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
-ROW   |7225     |35353 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
-ROW   |7226     |35354 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
-ROW   |7227     |35355 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
-ROW   |7228     |35356 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
-ROW   |7229     |35357 |Application|GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
-ROW   |7230     |35358 |Application|Inventory                                                      |
-ROW   |7231     |35359 |Application|Inventory                                                      |
-ROW   |7232     |35360 |Application|Inventory                                                      |
-ROW   |7233     |35361 |Application|Inventory                                                      |
-ROW   |7234     |35362 |Application|Status                                                         |
-ROW   |7235     |35363 |Application|Status                                                         |
-ROW   |7236     |35369 |Application|CPU                                                            |
-ROW   |7237     |35370 |Application|Memory                                                         |
-ROW   |7238     |35371 |Application|Memory                                                         |
-ROW   |7239     |35372 |Application|Memory                                                         |
-ROW   |7240     |35373 |Application|{#CISCO.IF.NAME}                                               |
-ROW   |7241     |35374 |Application|{#CISCO.IF.NAME}                                               |
-ROW   |7242     |35375 |Application|{#CISCO.IF.NAME}                                               |
-ROW   |7243     |35376 |Application|{#CISCO.IF.NAME}                                               |
-ROW   |7244     |35377 |Application|{#CISCO.IF.NAME}                                               |
-ROW   |7245     |35378 |Application|{#CISCO.IF.NAME}                                               |
-ROW   |7246     |35379 |Application|{#CISCO.IF.NAME}                                               |
-ROW   |7247     |35380 |Application|{#CISCO.IF.NAME}                                               |
-ROW   |7248     |35381 |Application|{#CISCO.IF.NAME}                                               |
-ROW   |7249     |35382 |Application|{#CISCO.IF.NAME}                                               |
-ROW   |7250     |35383 |Application|{#CISCO.IF.NAME}                                               |
-ROW   |7251     |35384 |Application|{#CISCO.IF.NAME}                                               |
-ROW   |7252     |35385 |Application|{#CISCO.IF.NAME}                                               |
-ROW   |7253     |35386 |Application|{#CISCO.IF.NAME}                                               |
-ROW   |7254     |35387 |Application|{#CISCO.IF.NAME}                                               |
-ROW   |7255     |35388 |Application|{#CISCO.ASAV.PHYS.NAME}                                        |
-ROW   |7256     |35389 |Application|{#CISCO.ASAV.PHYS.NAME}                                        |
-ROW   |7257     |35390 |Application|{#CISCO.ASAV.PHYS.NAME}                                        |
-ROW   |7258     |35391 |Application|{#CISCO.ASAV.PHYS.NAME}                                        |
-ROW   |7259     |35392 |Application|{#CISCO.ASAV.PHYS.NAME}                                        |
-ROW   |7260     |35393 |Application|{#CISCO.ASAV.PHYS.NAME}                                        |
-ROW   |7261     |35394 |Application|{#CISCO.ASAV.PHYS.NAME}                                        |
-ROW   |7262     |35395 |Application|{#CISCO.ASAV.PHYS.NAME}                                        |
-ROW   |7263     |35396 |Application|{#CISCO.CRAS.USER}                                             |
-ROW   |7264     |35397 |Application|{#CISCO.CRAS.USER}                                             |
-ROW   |7265     |35398 |Application|{#CISCO.CRAS.USER}                                             |
-ROW   |7266     |35399 |Application|{#CISCO.CRAS.USER}                                             |
-ROW   |7267     |35400 |Application|{#CISCO.CRAS.USER}                                             |
-ROW   |7268     |35401 |Application|{#CISCO.CRAS.USER}                                             |
-ROW   |7269     |35402 |Application|{#CISCO.CRAS.USER}                                             |
-ROW   |7270     |35403 |Application|{#CISCO.CRAS.USER}                                             |
-ROW   |7271     |35404 |Application|{#CISCO.CRAS.USER}                                             |
-ROW   |7272     |35405 |Application|{#CISCO.CRAS.USER}                                             |
-ROW   |7273     |35406 |Application|Inventory                                                      |
-ROW   |7274     |35407 |Application|TCP/UDP stat                                                   |
-ROW   |7275     |35408 |Application|Status                                                         |
-ROW   |7276     |35409 |Application|TCP/UDP stat                                                   |
-ROW   |7277     |35410 |Application|TCP/UDP stat                                                   |
-ROW   |7278     |35411 |Application|TCP/UDP stat                                                   |
-ROW   |7279     |35412 |Application|TCP/UDP stat                                                   |
-ROW   |7280     |35413 |Application|TCP/UDP stat                                                   |
-ROW   |7281     |35414 |Application|Inventory                                                      |
-ROW   |7282     |35415 |Application|Inventory                                                      |
-ROW   |7283     |35416 |Application|Inventory                                                      |
-ROW   |7284     |35417 |Application|Inventory                                                      |
-ROW   |7285     |35418 |Application|Inventory                                                      |
-ROW   |7286     |35419 |Application|Inventory                                                      |
-ROW   |7287     |35420 |Application|Inventory                                                      |
-ROW   |7288     |35421 |Application|Inventory                                                      |
-ROW   |7289     |35422 |Application|Inventory                                                      |
-ROW   |7290     |35423 |Application|Status                                                         |
-ROW   |7291     |35439 |Application|Temperature                                                    |
-ROW   |7292     |35440 |Application|Voltage                                                        |
-ROW   |7293     |35441 |Application|Voltage                                                        |
-ROW   |7294     |35442 |Application|Security                                                       |
-ROW   |7295     |35443 |Application|Fans                                                           |
-ROW   |7296     |35444 |Application|Fans                                                           |
-ROW   |7297     |35445 |Application|Power supply                                                   |
-ROW   |7298     |35446 |Application|Temperature                                                    |
-ROW   |7299     |35447 |Application|CPU                                                            |
-ROW   |7300     |35448 |Application|CPU                                                            |
-ROW   |7301     |35449 |Application|CPU                                                            |
-ROW   |7302     |35450 |Application|CPU                                                            |
-ROW   |7303     |35451 |Application|CPU                                                            |
-ROW   |7304     |35452 |Application|CPU                                                            |
-ROW   |7305     |35453 |Application|CPU                                                            |
-ROW   |7306     |35454 |Application|CPU                                                            |
-ROW   |7307     |35455 |Application|CPU                                                            |
-ROW   |7308     |35456 |Application|CPU                                                            |
-ROW   |7309     |35457 |Application|CPU                                                            |
-ROW   |7310     |35458 |Application|CPU                                                            |
-ROW   |7311     |35459 |Application|CPU                                                            |
-ROW   |7312     |35460 |Application|CPU                                                            |
-ROW   |7313     |35461 |Application|CPU                                                            |
-ROW   |7314     |35462 |Application|CPU                                                            |
-ROW   |7315     |35463 |Application|CPU                                                            |
-ROW   |7316     |35464 |Application|CPU                                                            |
-ROW   |7317     |35465 |Application|CPU                                                            |
-ROW   |7318     |35466 |Application|CPU                                                            |
-ROW   |7319     |35467 |Application|CPU                                                            |
-ROW   |7320     |35468 |Application|CPU                                                            |
-ROW   |7321     |35469 |Application|CPU                                                            |
-ROW   |7322     |35470 |Application|CPU                                                            |
-ROW   |7323     |35471 |Application|CPU                                                            |
-ROW   |7324     |35472 |Application|CPU                                                            |
-ROW   |7325     |35473 |Application|CPU                                                            |
-ROW   |7326     |35474 |Application|CPU                                                            |
-ROW   |7327     |35475 |Application|CPU                                                            |
-ROW   |7328     |35476 |Application|CPU                                                            |
-ROW   |7329     |35477 |Application|Mount point [{#PART.NAME}]                                     |
-ROW   |7330     |35478 |Application|Mount point [{#PART.NAME}]                                     |
-ROW   |7331     |35479 |Application|Mount point [{#PART.NAME}]                                     |
-ROW   |7332     |35480 |Application|Mount point [{#PART.NAME}]                                     |
-ROW   |7333     |35481 |Application|Mount point [{#PART.NAME}]                                     |
-ROW   |7334     |35482 |Application|Memory                                                         |
-ROW   |7335     |35483 |Application|Memory                                                         |
-ROW   |7336     |35484 |Application|Memory                                                         |
-ROW   |7337     |35485 |Application|Memory                                                         |
-ROW   |7338     |35486 |Application|Memory                                                         |
-ROW   |7339     |35487 |Application|Memory                                                         |
-ROW   |7340     |35488 |Application|Modules                                                        |
-ROW   |7341     |35489 |Application|Modules                                                        |
-ROW   |7342     |35490 |Application|Modules                                                        |
-ROW   |7343     |35491 |Application|Modules                                                        |
-ROW   |7344     |35492 |Application|Interface [{#IF.NAME}]                                         |
-ROW   |7345     |35493 |Application|Interface [{#IF.NAME}]                                         |
-ROW   |7346     |35494 |Application|Interface [{#IF.NAME}]                                         |
-ROW   |7347     |35495 |Application|Interface [{#IF.NAME}]                                         |
-ROW   |7348     |35496 |Application|Interface [{#IF.NAME}]                                         |
-ROW   |7349     |35497 |Application|Interface [{#IF.NAME}]                                         |
-ROW   |7350     |35498 |Application|Interface [{#IF.NAME}]                                         |
-ROW   |7351     |35499 |Application|Interface [{#IF.NAME}]                                         |
-ROW   |7352     |35500 |Application|Interface [{#IF.NAME}]                                         |
-ROW   |7353     |35501 |Application|Interface [{#IF.NAME}]                                         |
-ROW   |7354     |35502 |Application|Interface [{#IF.NAME}]                                         |
-ROW   |7355     |35503 |Application|Interface [{#IF.NAME}]                                         |
-ROW   |7356     |35504 |Application|Interface [{#IF.NAME}]                                         |
-ROW   |7357     |35505 |Application|Interface [{#IF.NAME}]                                         |
-ROW   |7358     |35506 |Application|Node [{#NODE.NAME}]                                            |
-ROW   |7359     |35507 |Application|Node [{#NODE.NAME}]                                            |
-ROW   |7360     |35508 |Application|Node [{#NODE.NAME}]                                            |
-ROW   |7361     |35509 |Application|Node [{#NODE.NAME}]                                            |
-ROW   |7362     |35510 |Application|Node [{#NODE.NAME}]                                            |
-ROW   |7363     |35511 |Application|Node [{#NODE.NAME}]                                            |
-ROW   |7364     |35512 |Application|Node [{#NODE.NAME}]                                            |
-ROW   |7365     |35513 |Application|Node [{#NODE.NAME}]                                            |
-ROW   |7366     |35514 |Application|Pool [{#POOL.NAME}]                                            |
-ROW   |7367     |35515 |Application|Pool [{#POOL.NAME}]                                            |
-ROW   |7368     |35516 |Application|Pool [{#POOL.NAME}]                                            |
-ROW   |7369     |35517 |Application|Pool [{#POOL.NAME}]                                            |
-ROW   |7370     |35518 |Application|Pool [{#POOL.NAME}]                                            |
-ROW   |7371     |35519 |Application|Pool [{#POOL.NAME}]                                            |
-ROW   |7372     |35520 |Application|Pool [{#POOL.NAME}]                                            |
-ROW   |7373     |35521 |Application|Pool [{#POOL.NAME}]                                            |
-ROW   |7374     |35522 |Application|Virtual server [{#VSERVER.NAME}]                               |
-ROW   |7375     |35523 |Application|Virtual server [{#VSERVER.NAME}]                               |
-ROW   |7376     |35524 |Application|Virtual server [{#VSERVER.NAME}]                               |
-ROW   |7377     |35525 |Application|Virtual server [{#VSERVER.NAME}]                               |
-ROW   |7378     |35526 |Application|Virtual server [{#VSERVER.NAME}]                               |
-ROW   |7379     |35527 |Application|Virtual server [{#VSERVER.NAME}]                               |
-ROW   |7380     |35528 |Application|Virtual server [{#VSERVER.NAME}]                               |
-ROW   |7381     |35529 |Application|Virtual server [{#VSERVER.NAME}]                               |
-ROW   |7382     |35530 |Application|Virtual server [{#VSERVER.NAME}]                               |
-ROW   |7383     |35531 |Application|Virtual server [{#VSERVER.NAME}]                               |
-ROW   |7384     |35532 |Application|Status                                                         |
-ROW   |7385     |35533 |Application|Inventory                                                      |
-ROW   |7386     |35534 |Application|Inventory                                                      |
-ROW   |7387     |35535 |Application|Inventory                                                      |
-ROW   |7388     |35536 |Application|Inventory                                                      |
-ROW   |7389     |35537 |Application|Inventory                                                      |
-ROW   |7390     |35538 |Application|Inventory                                                      |
-ROW   |7391     |35539 |Application|Inventory                                                      |
-ROW   |7392     |35540 |Application|Status                                                         |
-ROW   |7393     |35541 |Application|Status                                                         |
-ROW   |7394     |35546 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7395     |35547 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7396     |35548 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7397     |35549 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7398     |35550 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7399     |35551 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7400     |35552 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7401     |35553 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7402     |35554 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7403     |35555 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7404     |35556 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7405     |35557 |Application|Port {#ZYXEL.IF.NAME}                                          |
-ROW   |7406     |35558 |Application|Port {#ZYXEL.IF.NAME}                                          |
-ROW   |7407     |35559 |Application|Port {#ZYXEL.IF.NAME}                                          |
-ROW   |7408     |35560 |Application|Port {#ZYXEL.IF.NAME}                                          |
-ROW   |7409     |35561 |Application|Port {#ZYXEL.IF.NAME}                                          |
-ROW   |7410     |35562 |Application|Temperature                                                    |
-ROW   |7411     |35563 |Application|Power supply                                                   |
-ROW   |7412     |35564 |Application|Status                                                         |
-ROW   |7413     |35565 |Application|Inventory                                                      |
-ROW   |7414     |35566 |Application|CPU                                                            |
-ROW   |7415     |35567 |Application|Inventory                                                      |
-ROW   |7416     |35568 |Application|Inventory                                                      |
-ROW   |7417     |35569 |Application|Inventory                                                      |
-ROW   |7418     |35570 |Application|Inventory                                                      |
-ROW   |7419     |35571 |Application|Inventory                                                      |
-ROW   |7420     |35572 |Application|Inventory                                                      |
-ROW   |7421     |35573 |Application|Status                                                         |
-ROW   |7422     |35580 |Application|Memory                                                         |
-ROW   |7423     |35581 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7424     |35582 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7425     |35583 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7426     |35584 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7427     |35585 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7428     |35586 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7429     |35587 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7430     |35588 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7431     |35589 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7432     |35590 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7433     |35591 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7434     |35592 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7435     |35593 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7436     |35594 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7437     |35595 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7438     |35596 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7439     |35597 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7440     |35598 |Application|Port {#ZYXEL.SFP.PORT}                                         |
-ROW   |7441     |35599 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7442     |35600 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7443     |35601 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7444     |35602 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7445     |35603 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7446     |35604 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7447     |35605 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7448     |35606 |Application|Temperature                                                    |
-ROW   |7449     |35607 |Application|Power supply                                                   |
-ROW   |7450     |35608 |Application|Status                                                         |
-ROW   |7451     |35609 |Application|Inventory                                                      |
-ROW   |7452     |35610 |Application|CPU                                                            |
-ROW   |7453     |35611 |Application|Inventory                                                      |
-ROW   |7454     |35612 |Application|Inventory                                                      |
-ROW   |7455     |35613 |Application|Inventory                                                      |
-ROW   |7456     |35614 |Application|Inventory                                                      |
-ROW   |7457     |35615 |Application|Inventory                                                      |
-ROW   |7458     |35616 |Application|Inventory                                                      |
-ROW   |7459     |35617 |Application|Status                                                         |
-ROW   |7460     |35622 |Application|Fans                                                           |
-ROW   |7461     |35623 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7462     |35624 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7463     |35625 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7464     |35626 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7465     |35627 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7466     |35628 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7467     |35629 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7468     |35630 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7469     |35631 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7470     |35632 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7471     |35633 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7472     |35634 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7473     |35635 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7474     |35636 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7475     |35637 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7476     |35638 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7477     |35639 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7478     |35640 |Application|Temperature                                                    |
-ROW   |7479     |35641 |Application|Power supply                                                   |
-ROW   |7480     |35642 |Application|Status                                                         |
-ROW   |7481     |35643 |Application|Inventory                                                      |
-ROW   |7482     |35644 |Application|Inventory                                                      |
-ROW   |7483     |35645 |Application|Inventory                                                      |
-ROW   |7484     |35646 |Application|Inventory                                                      |
-ROW   |7485     |35647 |Application|Inventory                                                      |
-ROW   |7486     |35648 |Application|Status                                                         |
-ROW   |7487     |35658 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7488     |35659 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7489     |35660 |Application|Fans                                                           |
-ROW   |7490     |35661 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7491     |35662 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7492     |35663 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7493     |35664 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7494     |35665 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7495     |35666 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7496     |35667 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7497     |35668 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7498     |35669 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7499     |35670 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7500     |35671 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7501     |35672 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7502     |35673 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7503     |35674 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7504     |35675 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7505     |35676 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7506     |35677 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7507     |35678 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7508     |35679 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7509     |35680 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7510     |35681 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7511     |35682 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7512     |35683 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7513     |35684 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7514     |35685 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7515     |35686 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7516     |35687 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7517     |35688 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7518     |35689 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7519     |35690 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7520     |35691 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7521     |35692 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7522     |35693 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7523     |35694 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7524     |35695 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7525     |35696 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7526     |35697 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7527     |35698 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7528     |35699 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7529     |35700 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7530     |35701 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7531     |35702 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7532     |35703 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7533     |35704 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7534     |35705 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7535     |35706 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7536     |35707 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7537     |35708 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7538     |35709 |Application|Status                                                         |
-ROW   |7539     |35710 |Application|Inventory                                                      |
-ROW   |7540     |35711 |Application|Inventory                                                      |
-ROW   |7541     |35712 |Application|Inventory                                                      |
-ROW   |7542     |35713 |Application|Inventory                                                      |
-ROW   |7543     |35714 |Application|Inventory                                                      |
-ROW   |7544     |35715 |Application|Status                                                         |
-ROW   |7545     |35725 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7546     |35726 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7547     |35727 |Application|Fans                                                           |
-ROW   |7548     |35728 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7549     |35729 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7550     |35730 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7551     |35731 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7552     |35732 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7553     |35733 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7554     |35734 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7555     |35735 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7556     |35736 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7557     |35737 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7558     |35738 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7559     |35739 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7560     |35740 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7561     |35741 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7562     |35742 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7563     |35743 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7564     |35744 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7565     |35745 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7566     |35746 |Application|Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
-ROW   |7567     |35747 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7568     |35748 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7569     |35749 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7570     |35750 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7571     |35751 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7572     |35752 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7573     |35753 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7574     |35754 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7575     |35755 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7576     |35756 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7577     |35757 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7578     |35758 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7579     |35759 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7580     |35760 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7581     |35761 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7582     |35762 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7583     |35763 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7584     |35764 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7585     |35765 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7586     |35766 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7587     |35767 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7588     |35768 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7589     |35769 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7590     |35770 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7591     |35771 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7592     |35772 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7593     |35773 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7594     |35774 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7595     |35775 |Application|Slot {#ZYXEL.SLOT.ID}                                          |
-ROW   |7596     |35776 |Application|Status                                                         |
-ROW   |7597     |35777 |Application|Inventory                                                      |
-ROW   |7598     |35778 |Application|Inventory                                                      |
-ROW   |7599     |35779 |Application|Inventory                                                      |
-ROW   |7600     |35780 |Application|Inventory                                                      |
-ROW   |7601     |35781 |Application|Inventory                                                      |
-ROW   |7602     |35782 |Application|Inventory                                                      |
-ROW   |7603     |35783 |Application|Inventory                                                      |
-ROW   |7604     |35784 |Application|Status                                                         |
-ROW   |7605     |35785 |Application|Status                                                         |
-ROW   |7606     |35791 |Application|Fans                                                           |
-ROW   |7607     |35792 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7608     |35793 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7609     |35794 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7610     |35795 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7611     |35796 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7612     |35797 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7613     |35798 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7614     |35799 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7615     |35800 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7616     |35801 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7617     |35802 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7618     |35803 |Application|Port {#ZYXEL.IF.NAME}                                          |
-ROW   |7619     |35804 |Application|Port {#ZYXEL.IF.NAME}                                          |
-ROW   |7620     |35805 |Application|Port {#ZYXEL.IF.NAME}                                          |
-ROW   |7621     |35806 |Application|Port {#ZYXEL.IF.NAME}                                          |
-ROW   |7622     |35807 |Application|Port {#ZYXEL.IF.NAME}                                          |
-ROW   |7623     |35808 |Application|Temperature                                                    |
-ROW   |7624     |35809 |Application|Power supply                                                   |
-ROW   |7625     |35810 |Application|Status                                                         |
-ROW   |7626     |35811 |Application|Inventory                                                      |
-ROW   |7627     |35812 |Application|CPU                                                            |
-ROW   |7628     |35813 |Application|Inventory                                                      |
-ROW   |7629     |35814 |Application|Inventory                                                      |
-ROW   |7630     |35815 |Application|Inventory                                                      |
-ROW   |7631     |35816 |Application|Inventory                                                      |
-ROW   |7632     |35817 |Application|Inventory                                                      |
-ROW   |7633     |35818 |Application|Inventory                                                      |
-ROW   |7634     |35819 |Application|Status                                                         |
-ROW   |7635     |35823 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7636     |35824 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7637     |35825 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7638     |35826 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7639     |35827 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7640     |35828 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7641     |35829 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7642     |35830 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7643     |35831 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7644     |35832 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7645     |35833 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7646     |35834 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7647     |35835 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7648     |35836 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7649     |35837 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7650     |35838 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7651     |35839 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7652     |35840 |Application|Port {#ZYXEL.SFP.PORT}                                         |
-ROW   |7653     |35841 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7654     |35842 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7655     |35843 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7656     |35844 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7657     |35845 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7658     |35846 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7659     |35847 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7660     |35848 |Application|Status                                                         |
-ROW   |7661     |35849 |Application|Inventory                                                      |
-ROW   |7662     |35850 |Application|CPU                                                            |
-ROW   |7663     |35851 |Application|Inventory                                                      |
-ROW   |7664     |35852 |Application|Inventory                                                      |
-ROW   |7665     |35853 |Application|Inventory                                                      |
-ROW   |7666     |35854 |Application|Inventory                                                      |
-ROW   |7667     |35855 |Application|Inventory                                                      |
-ROW   |7668     |35856 |Application|Inventory                                                      |
-ROW   |7669     |35857 |Application|Status                                                         |
-ROW   |7670     |35864 |Application|Memory                                                         |
-ROW   |7671     |35865 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7672     |35866 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7673     |35867 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7674     |35868 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7675     |35869 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7676     |35870 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7677     |35871 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7678     |35872 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7679     |35873 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7680     |35874 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7681     |35875 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7682     |35876 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7683     |35877 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7684     |35878 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7685     |35879 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7686     |35880 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7687     |35881 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7688     |35882 |Application|Port {#ZYXEL.SFP.PORT}                                         |
-ROW   |7689     |35883 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7690     |35884 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7691     |35885 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7692     |35886 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7693     |35887 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7694     |35888 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7695     |35889 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7696     |35890 |Application|Temperature                                                    |
-ROW   |7697     |35891 |Application|Power supply                                                   |
-ROW   |7698     |35892 |Application|Status                                                         |
-ROW   |7699     |35893 |Application|Inventory                                                      |
-ROW   |7700     |35894 |Application|CPU                                                            |
-ROW   |7701     |35895 |Application|Inventory                                                      |
-ROW   |7702     |35896 |Application|Inventory                                                      |
-ROW   |7703     |35897 |Application|Inventory                                                      |
-ROW   |7704     |35898 |Application|Inventory                                                      |
-ROW   |7705     |35899 |Application|Inventory                                                      |
-ROW   |7706     |35900 |Application|Inventory                                                      |
-ROW   |7707     |35901 |Application|Status                                                         |
-ROW   |7708     |35908 |Application|Memory                                                         |
-ROW   |7709     |35909 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7710     |35910 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7711     |35911 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7712     |35912 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7713     |35913 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7714     |35914 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7715     |35915 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7716     |35916 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7717     |35917 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7718     |35918 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7719     |35919 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7720     |35920 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7721     |35921 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7722     |35922 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7723     |35923 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7724     |35924 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7725     |35925 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7726     |35926 |Application|Port {#ZYXEL.SFP.PORT}                                         |
-ROW   |7727     |35927 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7728     |35928 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7729     |35929 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7730     |35930 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7731     |35931 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7732     |35932 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7733     |35933 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7734     |35934 |Application|Temperature                                                    |
-ROW   |7735     |35935 |Application|Power supply                                                   |
-ROW   |7736     |35936 |Application|Status                                                         |
-ROW   |7737     |35937 |Application|Inventory                                                      |
-ROW   |7738     |35938 |Application|CPU                                                            |
-ROW   |7739     |35939 |Application|Inventory                                                      |
-ROW   |7740     |35940 |Application|Inventory                                                      |
-ROW   |7741     |35941 |Application|Inventory                                                      |
-ROW   |7742     |35942 |Application|Inventory                                                      |
-ROW   |7743     |35943 |Application|Inventory                                                      |
-ROW   |7744     |35944 |Application|Inventory                                                      |
-ROW   |7745     |35945 |Application|Status                                                         |
-ROW   |7746     |35952 |Application|Fans                                                           |
-ROW   |7747     |35953 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7748     |35954 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7749     |35955 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7750     |35956 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7751     |35957 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7752     |35958 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7753     |35959 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7754     |35960 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7755     |35961 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7756     |35962 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7757     |35963 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7758     |35964 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7759     |35965 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7760     |35966 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7761     |35967 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7762     |35968 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7763     |35969 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7764     |35970 |Application|Port {#ZYXEL.SFP.PORT}                                         |
-ROW   |7765     |35971 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7766     |35972 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7767     |35973 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7768     |35974 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7769     |35975 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7770     |35976 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7771     |35977 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7772     |35978 |Application|Temperature                                                    |
-ROW   |7773     |35979 |Application|Power supply                                                   |
-ROW   |7774     |35980 |Application|Status                                                         |
-ROW   |7775     |35981 |Application|Inventory                                                      |
-ROW   |7776     |35982 |Application|CPU                                                            |
-ROW   |7777     |35983 |Application|Inventory                                                      |
-ROW   |7778     |35984 |Application|Inventory                                                      |
-ROW   |7779     |35985 |Application|Inventory                                                      |
-ROW   |7780     |35986 |Application|Inventory                                                      |
-ROW   |7781     |35987 |Application|Inventory                                                      |
-ROW   |7782     |35988 |Application|Inventory                                                      |
-ROW   |7783     |35989 |Application|Status                                                         |
-ROW   |7784     |35996 |Application|Fans                                                           |
-ROW   |7785     |35997 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7786     |35998 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7787     |35999 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7788     |36000 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7789     |36001 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7790     |36002 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7791     |36003 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7792     |36004 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7793     |36005 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7794     |36006 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7795     |36007 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7796     |36008 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7797     |36009 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7798     |36010 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7799     |36011 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7800     |36012 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7801     |36013 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7802     |36014 |Application|Port {#ZYXEL.SFP.PORT}                                         |
-ROW   |7803     |36015 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7804     |36016 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7805     |36017 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7806     |36018 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7807     |36019 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7808     |36020 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7809     |36021 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7810     |36022 |Application|Temperature                                                    |
-ROW   |7811     |36023 |Application|Power supply                                                   |
-ROW   |7812     |36024 |Application|Status                                                         |
-ROW   |7813     |36025 |Application|Inventory                                                      |
-ROW   |7814     |36026 |Application|CPU                                                            |
-ROW   |7815     |36027 |Application|Inventory                                                      |
-ROW   |7816     |36028 |Application|Inventory                                                      |
-ROW   |7817     |36029 |Application|Inventory                                                      |
-ROW   |7818     |36030 |Application|Memory                                                         |
-ROW   |7819     |36031 |Application|Inventory                                                      |
-ROW   |7820     |36032 |Application|Inventory                                                      |
-ROW   |7821     |36033 |Application|Inventory                                                      |
-ROW   |7822     |36034 |Application|Status                                                         |
-ROW   |7823     |36041 |Application|Fans                                                           |
-ROW   |7824     |36042 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7825     |36043 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7826     |36044 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7827     |36045 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7828     |36046 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7829     |36047 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7830     |36048 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7831     |36049 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7832     |36050 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7833     |36051 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7834     |36052 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7835     |36053 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7836     |36054 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7837     |36055 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7838     |36056 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7839     |36057 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7840     |36058 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7841     |36059 |Application|Port {#ZYXEL.SFP.PORT}                                         |
-ROW   |7842     |36060 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7843     |36061 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7844     |36062 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7845     |36063 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7846     |36064 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7847     |36065 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7848     |36066 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7849     |36067 |Application|Temperature                                                    |
-ROW   |7850     |36068 |Application|Power supply                                                   |
-ROW   |7851     |36069 |Application|Status                                                         |
-ROW   |7852     |36070 |Application|Inventory                                                      |
-ROW   |7853     |36071 |Application|CPU                                                            |
-ROW   |7854     |36072 |Application|Inventory                                                      |
-ROW   |7855     |36073 |Application|Inventory                                                      |
-ROW   |7856     |36074 |Application|Inventory                                                      |
-ROW   |7857     |36075 |Application|Memory                                                         |
-ROW   |7858     |36076 |Application|Inventory                                                      |
-ROW   |7859     |36077 |Application|Inventory                                                      |
-ROW   |7860     |36078 |Application|Inventory                                                      |
-ROW   |7861     |36079 |Application|Status                                                         |
-ROW   |7862     |36086 |Application|Fans                                                           |
-ROW   |7863     |36087 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7864     |36088 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7865     |36089 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7866     |36090 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7867     |36091 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7868     |36092 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7869     |36093 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7870     |36094 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7871     |36095 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7872     |36096 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7873     |36097 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7874     |36098 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7875     |36099 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7876     |36100 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7877     |36101 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7878     |36102 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7879     |36103 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7880     |36104 |Application|Port {#ZYXEL.SFP.PORT}                                         |
-ROW   |7881     |36105 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7882     |36106 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7883     |36107 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7884     |36108 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7885     |36109 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7886     |36110 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7887     |36111 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7888     |36112 |Application|Temperature                                                    |
-ROW   |7889     |36113 |Application|Power supply                                                   |
-ROW   |7890     |36114 |Application|Status                                                         |
-ROW   |7891     |36115 |Application|Inventory                                                      |
-ROW   |7892     |36116 |Application|CPU                                                            |
-ROW   |7893     |36117 |Application|Inventory                                                      |
-ROW   |7894     |36118 |Application|Inventory                                                      |
-ROW   |7895     |36119 |Application|Inventory                                                      |
-ROW   |7896     |36120 |Application|Inventory                                                      |
-ROW   |7897     |36121 |Application|Inventory                                                      |
-ROW   |7898     |36122 |Application|Inventory                                                      |
-ROW   |7899     |36123 |Application|Status                                                         |
-ROW   |7900     |36131 |Application|Fans                                                           |
-ROW   |7901     |36132 |Application|Memory                                                         |
-ROW   |7902     |36133 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7903     |36134 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7904     |36135 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7905     |36136 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7906     |36137 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7907     |36138 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7908     |36139 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7909     |36140 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7910     |36141 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7911     |36142 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7912     |36143 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7913     |36144 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7914     |36145 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7915     |36146 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7916     |36147 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7917     |36148 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7918     |36149 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7919     |36150 |Application|Port {#ZYXEL.SFP.PORT}                                         |
-ROW   |7920     |36151 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7921     |36152 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7922     |36153 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7923     |36154 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7924     |36155 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7925     |36156 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7926     |36157 |Application|Port {#SNMPINDEX}                                              |
-ROW   |7927     |36158 |Application|Temperature                                                    |
-ROW   |7928     |36159 |Application|Power supply                                                   |
-ROW   |7929     |36160 |Application|General                                                        |
-ROW   |7930     |36161 |Application|General                                                        |
-ROW   |7931     |36162 |Application|General                                                        |
-ROW   |7932     |36163 |Application|General                                                        |
-ROW   |7933     |36164 |Application|General                                                        |
-ROW   |7934     |36165 |Application|Status                                                         |
-ROW   |7935     |36166 |Application|General                                                        |
-ROW   |7936     |36167 |Application|Status                                                         |
-ROW   |7937     |36178 |Application|Disk arrays                                                    |
-ROW   |7938     |36179 |Application|Disk arrays                                                    |
-ROW   |7939     |36180 |Application|Disk arrays                                                    |
-ROW   |7940     |36181 |Application|Fans                                                           |
-ROW   |7941     |36182 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |7942     |36183 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |7943     |36184 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |7944     |36185 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |7945     |36186 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |7946     |36187 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |7947     |36188 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |7948     |36189 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |7949     |36190 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |7950     |36191 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |7951     |36192 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |7952     |36193 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |7953     |36194 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |7954     |36195 |Application|Interface {#IFNAME}({#IFALIAS})                                |
-ROW   |7955     |36196 |Application|Physical disks                                                 |
-ROW   |7956     |36197 |Application|Physical disks                                                 |
-ROW   |7957     |36198 |Application|Physical disks                                                 |
-ROW   |7958     |36199 |Application|Physical disks                                                 |
-ROW   |7959     |36200 |Application|Physical disks                                                 |
-ROW   |7960     |36201 |Application|Power supply                                                   |
-ROW   |7961     |36202 |Application|Temperature                                                    |
-ROW   |7962     |36203 |Application|Temperature                                                    |
-ROW   |7963     |36204 |Application|Temperature                                                    |
-ROW   |7964     |36205 |Application|Temperature                                                    |
-ROW   |7965     |36206 |Application|Temperature                                                    |
-ROW   |7966     |36207 |Application|Inventory                                                      |
-ROW   |7967     |36208 |Application|Inventory                                                      |
-ROW   |7968     |36209 |Application|Status                                                         |
-ROW   |7969     |36210 |Application|Virtual disks                                                  |
-ROW   |7970     |36211 |Application|Virtual disks                                                  |
-ROW   |7971     |36212 |Application|Virtual disks                                                  |
-ROW   |7972     |36213 |Application|Zabbix raw items                                               |
-ROW   |7973     |36214 |Application|Status                                                         |
-ROW   |7974     |36215 |Application|Inventory                                                      |
-ROW   |7975     |36216 |Application|Inventory                                                      |
-ROW   |7976     |36217 |Application|Inventory                                                      |
-ROW   |7977     |36218 |Application|Status                                                         |
-ROW   |7978     |36227 |Application|Zabbix raw items                                               |
-ROW   |7979     |36228 |Application|Zabbix raw items                                               |
-ROW   |7980     |36229 |Application|Zabbix raw items                                               |
-ROW   |7981     |36230 |Application|Zabbix raw items                                               |
-ROW   |7982     |36231 |Application|Zabbix raw items                                               |
-ROW   |7983     |36232 |Application|Zabbix raw items                                               |
-ROW   |7984     |36233 |Application|Zabbix raw items                                               |
-ROW   |7985     |36234 |Application|Zabbix raw items                                               |
-ROW   |7986     |36235 |Application|Fans                                                           |
-ROW   |7987     |36236 |Application|Fans                                                           |
-ROW   |7988     |36237 |Application|Network interfaces                                             |
-ROW   |7989     |36238 |Application|Network interfaces                                             |
-ROW   |7990     |36239 |Application|Network interfaces                                             |
-ROW   |7991     |36240 |Application|Network interfaces                                             |
-ROW   |7992     |36241 |Application|Physical disks                                                 |
-ROW   |7993     |36242 |Application|Physical disks                                                 |
-ROW   |7994     |36243 |Application|Physical disks                                                 |
-ROW   |7995     |36244 |Application|Physical disks                                                 |
-ROW   |7996     |36245 |Application|Physical disks                                                 |
-ROW   |7997     |36246 |Application|Power supply                                                   |
-ROW   |7998     |36247 |Application|Temperature                                                    |
-ROW   |7999     |36248 |Application|Temperature                                                    |
-ROW   |8000     |36249 |Application|Virtual disks                                                  |
-ROW   |8001     |36250 |Application|Virtual disks                                                  |
-ROW   |8002     |36251 |Application|Virtual disks                                                  |
-ROW   |8003     |36252 |Application|Virtual disks                                                  |
-ROW   |8004     |36253 |Application|Virtual disks                                                  |
-ROW   |8005     |36254 |Application|Virtual disks                                                  |
-ROW   |8006     |36255 |Application|General                                                        |
-ROW   |8007     |36256 |Application|General                                                        |
-ROW   |8008     |36257 |Application|Inventory                                                      |
-ROW   |8009     |36258 |Application|Inventory                                                      |
-ROW   |8010     |36259 |Application|Inventory                                                      |
-ROW   |8011     |36260 |Application|General                                                        |
-ROW   |8012     |36261 |Application|General                                                        |
-ROW   |8013     |36262 |Application|General                                                        |
-ROW   |8014     |36263 |Application|Status                                                         |
-ROW   |8015     |36264 |Application|Inventory                                                      |
-ROW   |8016     |36265 |Application|Status                                                         |
-ROW   |8017     |36266 |Application|General                                                        |
-ROW   |8018     |36267 |Application|Status                                                         |
-ROW   |8019     |36275 |Application|Disk arrays                                                    |
-ROW   |8020     |36276 |Application|Disk arrays                                                    |
-ROW   |8021     |36277 |Application|Disk arrays                                                    |
-ROW   |8022     |36278 |Application|Fans                                                           |
-ROW   |8023     |36279 |Application|Fans                                                           |
-ROW   |8024     |36280 |Application|Physical disks                                                 |
-ROW   |8025     |36281 |Application|Physical disks                                                 |
-ROW   |8026     |36282 |Application|Physical disks                                                 |
-ROW   |8027     |36283 |Application|Physical disks                                                 |
-ROW   |8028     |36284 |Application|Physical disks                                                 |
-ROW   |8029     |36285 |Application|Physical disks                                                 |
-ROW   |8030     |36286 |Application|Power supply                                                   |
-ROW   |8031     |36287 |Application|Temperature                                                    |
-ROW   |8032     |36288 |Application|Temperature                                                    |
-ROW   |8033     |36289 |Application|Virtual disks                                                  |
-ROW   |8034     |36290 |Application|Virtual disks                                                  |
-ROW   |8035     |36291 |Application|Virtual disks                                                  |
-ROW   |8036     |36292 |Application|Virtual disks                                                  |
-ROW   |8037     |36293 |Application|Virtual disks                                                  |
-ROW   |8038     |36294 |Application|Virtual disks                                                  |
-ROW   |8039     |36295 |Application|Zabbix raw items                                               |
-ROW   |8040     |36296 |Application|Status                                                         |
-ROW   |8041     |36297 |Application|Inventory                                                      |
-ROW   |8042     |36298 |Application|Inventory                                                      |
-ROW   |8043     |36299 |Application|Inventory                                                      |
-ROW   |8044     |36300 |Application|Status                                                         |
-ROW   |8045     |36309 |Application|Zabbix raw items                                               |
-ROW   |8046     |36310 |Application|Zabbix raw items                                               |
-ROW   |8047     |36311 |Application|Zabbix raw items                                               |
-ROW   |8048     |36312 |Application|Zabbix raw items                                               |
-ROW   |8049     |36313 |Application|Zabbix raw items                                               |
-ROW   |8050     |36314 |Application|Zabbix raw items                                               |
-ROW   |8051     |36315 |Application|Zabbix raw items                                               |
-ROW   |8052     |36316 |Application|Zabbix raw items                                               |
-ROW   |8053     |36317 |Application|Fans                                                           |
-ROW   |8054     |36318 |Application|Fans                                                           |
-ROW   |8055     |36319 |Application|Network interfaces                                             |
-ROW   |8056     |36320 |Application|Network interfaces                                             |
-ROW   |8057     |36321 |Application|Network interfaces                                             |
-ROW   |8058     |36322 |Application|Network interfaces                                             |
-ROW   |8059     |36323 |Application|Physical disks                                                 |
-ROW   |8060     |36324 |Application|Physical disks                                                 |
-ROW   |8061     |36325 |Application|Physical disks                                                 |
-ROW   |8062     |36326 |Application|Physical disks                                                 |
-ROW   |8063     |36327 |Application|Physical disks                                                 |
-ROW   |8064     |36328 |Application|Power supply                                                   |
-ROW   |8065     |36329 |Application|Temperature                                                    |
-ROW   |8066     |36330 |Application|Temperature                                                    |
-ROW   |8067     |36331 |Application|Virtual disks                                                  |
-ROW   |8068     |36332 |Application|Virtual disks                                                  |
-ROW   |8069     |36333 |Application|Virtual disks                                                  |
-ROW   |8070     |36334 |Application|Virtual disks                                                  |
-ROW   |8071     |36335 |Application|Virtual disks                                                  |
-ROW   |8072     |36336 |Application|Virtual disks                                                  |
-ROW   |8073     |36337 |Application|General                                                        |
-ROW   |8074     |36338 |Application|General                                                        |
-ROW   |8075     |36339 |Application|Inventory                                                      |
-ROW   |8076     |36340 |Application|Inventory                                                      |
-ROW   |8077     |36341 |Application|Inventory                                                      |
-ROW   |8078     |36342 |Application|General                                                        |
-ROW   |8079     |36343 |Application|General                                                        |
-ROW   |8080     |36344 |Application|General                                                        |
-ROW   |8081     |36345 |Application|Status                                                         |
-ROW   |8082     |36346 |Application|Inventory                                                      |
-ROW   |8083     |36347 |Application|Status                                                         |
-ROW   |8084     |36348 |Application|General                                                        |
-ROW   |8085     |36349 |Application|Status                                                         |
-ROW   |8086     |36357 |Application|Disk arrays                                                    |
-ROW   |8087     |36358 |Application|Disk arrays                                                    |
-ROW   |8088     |36359 |Application|Disk arrays                                                    |
-ROW   |8089     |36360 |Application|Fans                                                           |
-ROW   |8090     |36361 |Application|Fans                                                           |
-ROW   |8091     |36362 |Application|Physical disks                                                 |
-ROW   |8092     |36363 |Application|Physical disks                                                 |
-ROW   |8093     |36364 |Application|Physical disks                                                 |
-ROW   |8094     |36365 |Application|Physical disks                                                 |
-ROW   |8095     |36366 |Application|Physical disks                                                 |
-ROW   |8096     |36367 |Application|Physical disks                                                 |
-ROW   |8097     |36368 |Application|Power supply                                                   |
-ROW   |8098     |36369 |Application|Temperature                                                    |
-ROW   |8099     |36370 |Application|Temperature                                                    |
-ROW   |8100     |36371 |Application|Virtual disks                                                  |
-ROW   |8101     |36372 |Application|Virtual disks                                                  |
-ROW   |8102     |36373 |Application|Virtual disks                                                  |
-ROW   |8103     |36374 |Application|Virtual disks                                                  |
-ROW   |8104     |36375 |Application|Virtual disks                                                  |
-ROW   |8105     |36376 |Application|Virtual disks                                                  |
-ROW   |8106     |36377 |Application|Zabbix raw items                                               |
-ROW   |8107     |36378 |Application|Status                                                         |
-ROW   |8108     |36379 |Application|Inventory                                                      |
-ROW   |8109     |36380 |Application|Inventory                                                      |
-ROW   |8110     |36381 |Application|Inventory                                                      |
-ROW   |8111     |36382 |Application|Status                                                         |
-ROW   |8112     |36391 |Application|Zabbix raw items                                               |
-ROW   |8113     |36392 |Application|Zabbix raw items                                               |
-ROW   |8114     |36393 |Application|Zabbix raw items                                               |
-ROW   |8115     |36394 |Application|Zabbix raw items                                               |
-ROW   |8116     |36395 |Application|Zabbix raw items                                               |
-ROW   |8117     |36396 |Application|Zabbix raw items                                               |
-ROW   |8118     |36397 |Application|Zabbix raw items                                               |
-ROW   |8119     |36398 |Application|Zabbix raw items                                               |
-ROW   |8120     |36399 |Application|Fans                                                           |
-ROW   |8121     |36400 |Application|Fans                                                           |
-ROW   |8122     |36401 |Application|Network interfaces                                             |
-ROW   |8123     |36402 |Application|Network interfaces                                             |
-ROW   |8124     |36403 |Application|Network interfaces                                             |
-ROW   |8125     |36404 |Application|Network interfaces                                             |
-ROW   |8126     |36405 |Application|Physical disks                                                 |
-ROW   |8127     |36406 |Application|Physical disks                                                 |
-ROW   |8128     |36407 |Application|Physical disks                                                 |
-ROW   |8129     |36408 |Application|Physical disks                                                 |
-ROW   |8130     |36409 |Application|Physical disks                                                 |
-ROW   |8131     |36410 |Application|Power supply                                                   |
-ROW   |8132     |36411 |Application|Temperature                                                    |
-ROW   |8133     |36412 |Application|Temperature                                                    |
-ROW   |8134     |36413 |Application|Virtual disks                                                  |
-ROW   |8135     |36414 |Application|Virtual disks                                                  |
-ROW   |8136     |36415 |Application|Virtual disks                                                  |
-ROW   |8137     |36416 |Application|Virtual disks                                                  |
-ROW   |8138     |36417 |Application|Virtual disks                                                  |
-ROW   |8139     |36418 |Application|Virtual disks                                                  |
-ROW   |8140     |36419 |Application|General                                                        |
-ROW   |8141     |36420 |Application|General                                                        |
-ROW   |8142     |36421 |Application|Inventory                                                      |
-ROW   |8143     |36422 |Application|Inventory                                                      |
-ROW   |8144     |36423 |Application|Inventory                                                      |
-ROW   |8145     |36424 |Application|General                                                        |
-ROW   |8146     |36425 |Application|General                                                        |
-ROW   |8147     |36426 |Application|General                                                        |
-ROW   |8148     |36427 |Application|Status                                                         |
-ROW   |8149     |36428 |Application|Inventory                                                      |
-ROW   |8150     |36429 |Application|Status                                                         |
-ROW   |8151     |36430 |Application|General                                                        |
-ROW   |8152     |36431 |Application|Status                                                         |
-ROW   |8153     |36439 |Application|Disk arrays                                                    |
-ROW   |8154     |36440 |Application|Disk arrays                                                    |
-ROW   |8155     |36441 |Application|Disk arrays                                                    |
-ROW   |8156     |36442 |Application|Fans                                                           |
-ROW   |8157     |36443 |Application|Fans                                                           |
-ROW   |8158     |36444 |Application|Physical disks                                                 |
-ROW   |8159     |36445 |Application|Physical disks                                                 |
-ROW   |8160     |36446 |Application|Physical disks                                                 |
-ROW   |8161     |36447 |Application|Physical disks                                                 |
-ROW   |8162     |36448 |Application|Physical disks                                                 |
-ROW   |8163     |36449 |Application|Physical disks                                                 |
-ROW   |8164     |36450 |Application|Power supply                                                   |
-ROW   |8165     |36451 |Application|Temperature                                                    |
-ROW   |8166     |36452 |Application|Temperature                                                    |
-ROW   |8167     |36453 |Application|Virtual disks                                                  |
-ROW   |8168     |36454 |Application|Virtual disks                                                  |
-ROW   |8169     |36455 |Application|Virtual disks                                                  |
-ROW   |8170     |36456 |Application|Virtual disks                                                  |
-ROW   |8171     |36457 |Application|Virtual disks                                                  |
-ROW   |8172     |36458 |Application|Virtual disks                                                  |
-ROW   |8173     |36459 |Application|Zabbix raw items                                               |
-ROW   |8174     |36460 |Application|Status                                                         |
-ROW   |8175     |36461 |Application|Inventory                                                      |
-ROW   |8176     |36462 |Application|Inventory                                                      |
-ROW   |8177     |36463 |Application|Inventory                                                      |
-ROW   |8178     |36464 |Application|Status                                                         |
-ROW   |8179     |36473 |Application|Zabbix raw items                                               |
-ROW   |8180     |36474 |Application|Zabbix raw items                                               |
-ROW   |8181     |36475 |Application|Zabbix raw items                                               |
-ROW   |8182     |36476 |Application|Zabbix raw items                                               |
-ROW   |8183     |36477 |Application|Zabbix raw items                                               |
-ROW   |8184     |36478 |Application|Zabbix raw items                                               |
-ROW   |8185     |36479 |Application|Zabbix raw items                                               |
-ROW   |8186     |36480 |Application|Zabbix raw items                                               |
-ROW   |8187     |36481 |Application|Fans                                                           |
-ROW   |8188     |36482 |Application|Fans                                                           |
-ROW   |8189     |36483 |Application|Network interfaces                                             |
-ROW   |8190     |36484 |Application|Network interfaces                                             |
-ROW   |8191     |36485 |Application|Network interfaces                                             |
-ROW   |8192     |36486 |Application|Network interfaces                                             |
-ROW   |8193     |36487 |Application|Physical disks                                                 |
-ROW   |8194     |36488 |Application|Physical disks                                                 |
-ROW   |8195     |36489 |Application|Physical disks                                                 |
-ROW   |8196     |36490 |Application|Physical disks                                                 |
-ROW   |8197     |36491 |Application|Physical disks                                                 |
-ROW   |8198     |36492 |Application|Power supply                                                   |
-ROW   |8199     |36493 |Application|Temperature                                                    |
-ROW   |8200     |36494 |Application|Temperature                                                    |
-ROW   |8201     |36495 |Application|Virtual disks                                                  |
-ROW   |8202     |36496 |Application|Virtual disks                                                  |
-ROW   |8203     |36497 |Application|Virtual disks                                                  |
-ROW   |8204     |36498 |Application|Virtual disks                                                  |
-ROW   |8205     |36499 |Application|Virtual disks                                                  |
-ROW   |8206     |36500 |Application|Virtual disks                                                  |
-ROW   |8207     |36501 |Application|General                                                        |
-ROW   |8208     |36502 |Application|General                                                        |
-ROW   |8209     |36503 |Application|Inventory                                                      |
-ROW   |8210     |36504 |Application|Inventory                                                      |
-ROW   |8211     |36505 |Application|Inventory                                                      |
-ROW   |8212     |36506 |Application|General                                                        |
-ROW   |8213     |36507 |Application|General                                                        |
-ROW   |8214     |36508 |Application|General                                                        |
-ROW   |8215     |36509 |Application|Status                                                         |
-ROW   |8216     |36510 |Application|Inventory                                                      |
-ROW   |8217     |36511 |Application|Status                                                         |
-ROW   |8218     |36512 |Application|General                                                        |
-ROW   |8219     |36513 |Application|Status                                                         |
-ROW   |8220     |36521 |Application|Disk arrays                                                    |
-ROW   |8221     |36522 |Application|Disk arrays                                                    |
-ROW   |8222     |36523 |Application|Disk arrays                                                    |
-ROW   |8223     |36524 |Application|Fans                                                           |
-ROW   |8224     |36525 |Application|Fans                                                           |
-ROW   |8225     |36526 |Application|Physical disks                                                 |
-ROW   |8226     |36527 |Application|Physical disks                                                 |
-ROW   |8227     |36528 |Application|Physical disks                                                 |
-ROW   |8228     |36529 |Application|Physical disks                                                 |
-ROW   |8229     |36530 |Application|Physical disks                                                 |
-ROW   |8230     |36531 |Application|Physical disks                                                 |
-ROW   |8231     |36532 |Application|Power supply                                                   |
-ROW   |8232     |36533 |Application|Temperature                                                    |
-ROW   |8233     |36534 |Application|Temperature                                                    |
-ROW   |8234     |36535 |Application|Virtual disks                                                  |
-ROW   |8235     |36536 |Application|Virtual disks                                                  |
-ROW   |8236     |36537 |Application|Virtual disks                                                  |
-ROW   |8237     |36538 |Application|Virtual disks                                                  |
-ROW   |8238     |36539 |Application|Virtual disks                                                  |
-ROW   |8239     |36540 |Application|Virtual disks                                                  |
-ROW   |8240     |36541 |Application|General                                                        |
-ROW   |8241     |36542 |Application|General                                                        |
-ROW   |8242     |36543 |Application|Inventory                                                      |
-ROW   |8243     |36544 |Application|Inventory                                                      |
-ROW   |8244     |36545 |Application|General                                                        |
-ROW   |8245     |36546 |Application|General                                                        |
-ROW   |8246     |36547 |Application|General                                                        |
-ROW   |8247     |36548 |Application|Temperature                                                    |
-ROW   |8248     |36549 |Application|Status                                                         |
-ROW   |8249     |36550 |Application|Status                                                         |
-ROW   |8250     |36551 |Application|General                                                        |
-ROW   |8251     |36552 |Application|Status                                                         |
-ROW   |8252     |36567 |Application|Disk arrays                                                    |
-ROW   |8253     |36568 |Application|Disk arrays                                                    |
-ROW   |8254     |36569 |Application|Disk arrays                                                    |
-ROW   |8255     |36570 |Application|Disk arrays                                                    |
-ROW   |8256     |36571 |Application|Fans                                                           |
-ROW   |8257     |36572 |Application|Network interfaces                                             |
-ROW   |8258     |36573 |Application|Physical disks                                                 |
-ROW   |8259     |36574 |Application|Physical disks                                                 |
-ROW   |8260     |36575 |Application|Physical disks                                                 |
-ROW   |8261     |36576 |Application|Physical disks                                                 |
-ROW   |8262     |36577 |Application|Physical disks                                                 |
-ROW   |8263     |36578 |Application|Physical disks                                                 |
-ROW   |8264     |36579 |Application|Power supply                                                   |
-ROW   |8265     |36580 |Application|Temperature                                                    |
-ROW   |8266     |36581 |Application|Temperature                                                    |
-ROW   |8267     |36582 |Application|Temperature                                                    |
-ROW   |8268     |36583 |Application|Temperature                                                    |
-ROW   |8269     |36584 |Application|Temperature                                                    |
-ROW   |8270     |36585 |Application|Temperature                                                    |
-ROW   |8271     |36586 |Application|Temperature                                                    |
-ROW   |8272     |36587 |Application|Temperature                                                    |
-ROW   |8273     |36588 |Application|Temperature                                                    |
-ROW   |8274     |36589 |Application|Temperature                                                    |
-ROW   |8275     |36590 |Application|Temperature                                                    |
-ROW   |8276     |36591 |Application|Temperature                                                    |
-ROW   |8277     |36592 |Application|Temperature                                                    |
-ROW   |8278     |36593 |Application|Temperature                                                    |
-ROW   |8279     |36594 |Application|Temperature                                                    |
-ROW   |8280     |36595 |Application|Virtual disks                                                  |
-ROW   |8281     |36596 |Application|Virtual disks                                                  |
-ROW   |8282     |36597 |Application|Virtual disks                                                  |
-ROW   |8283     |36598 |Application|General                                                        |
-ROW   |8284     |36599 |Application|General                                                        |
-ROW   |8285     |36600 |Application|Inventory                                                      |
-ROW   |8286     |36601 |Application|Inventory                                                      |
-ROW   |8287     |36602 |Application|General                                                        |
-ROW   |8288     |36603 |Application|General                                                        |
-ROW   |8289     |36604 |Application|General                                                        |
-ROW   |8290     |36605 |Application|Temperature                                                    |
-ROW   |8291     |36606 |Application|Status                                                         |
-ROW   |8292     |36607 |Application|Status                                                         |
-ROW   |8293     |36608 |Application|General                                                        |
-ROW   |8294     |36609 |Application|Status                                                         |
-ROW   |8295     |36624 |Application|Disk arrays                                                    |
-ROW   |8296     |36625 |Application|Disk arrays                                                    |
-ROW   |8297     |36626 |Application|Disk arrays                                                    |
-ROW   |8298     |36627 |Application|Disk arrays                                                    |
-ROW   |8299     |36628 |Application|Fans                                                           |
-ROW   |8300     |36629 |Application|Network interfaces                                             |
-ROW   |8301     |36630 |Application|Physical disks                                                 |
-ROW   |8302     |36631 |Application|Physical disks                                                 |
-ROW   |8303     |36632 |Application|Physical disks                                                 |
-ROW   |8304     |36633 |Application|Physical disks                                                 |
-ROW   |8305     |36634 |Application|Physical disks                                                 |
-ROW   |8306     |36635 |Application|Physical disks                                                 |
-ROW   |8307     |36636 |Application|Power supply                                                   |
-ROW   |8308     |36637 |Application|Temperature                                                    |
-ROW   |8309     |36638 |Application|Temperature                                                    |
-ROW   |8310     |36639 |Application|Temperature                                                    |
-ROW   |8311     |36640 |Application|Temperature                                                    |
-ROW   |8312     |36641 |Application|Temperature                                                    |
-ROW   |8313     |36642 |Application|Temperature                                                    |
-ROW   |8314     |36643 |Application|Temperature                                                    |
-ROW   |8315     |36644 |Application|Temperature                                                    |
-ROW   |8316     |36645 |Application|Temperature                                                    |
-ROW   |8317     |36646 |Application|Temperature                                                    |
-ROW   |8318     |36647 |Application|Temperature                                                    |
-ROW   |8319     |36648 |Application|Temperature                                                    |
-ROW   |8320     |36649 |Application|Temperature                                                    |
-ROW   |8321     |36650 |Application|Temperature                                                    |
-ROW   |8322     |36651 |Application|Temperature                                                    |
-ROW   |8323     |36652 |Application|Virtual disks                                                  |
-ROW   |8324     |36653 |Application|Virtual disks                                                  |
-ROW   |8325     |36654 |Application|Virtual disks                                                  |
-ROW   |8326     |36655 |Application|General                                                        |
-ROW   |8327     |36656 |Application|General                                                        |
-ROW   |8328     |36657 |Application|Inventory                                                      |
-ROW   |8329     |36658 |Application|Inventory                                                      |
-ROW   |8330     |36659 |Application|General                                                        |
-ROW   |8331     |36660 |Application|General                                                        |
-ROW   |8332     |36661 |Application|General                                                        |
-ROW   |8333     |36662 |Application|Temperature                                                    |
-ROW   |8334     |36663 |Application|Status                                                         |
-ROW   |8335     |36664 |Application|Status                                                         |
-ROW   |8336     |36665 |Application|General                                                        |
-ROW   |8337     |36666 |Application|Status                                                         |
-ROW   |8338     |36681 |Application|Disk arrays                                                    |
-ROW   |8339     |36682 |Application|Disk arrays                                                    |
-ROW   |8340     |36683 |Application|Disk arrays                                                    |
-ROW   |8341     |36684 |Application|Disk arrays                                                    |
-ROW   |8342     |36685 |Application|Fans                                                           |
-ROW   |8343     |36686 |Application|Network interfaces                                             |
-ROW   |8344     |36687 |Application|Physical disks                                                 |
-ROW   |8345     |36688 |Application|Physical disks                                                 |
-ROW   |8346     |36689 |Application|Physical disks                                                 |
-ROW   |8347     |36690 |Application|Physical disks                                                 |
-ROW   |8348     |36691 |Application|Physical disks                                                 |
-ROW   |8349     |36692 |Application|Physical disks                                                 |
-ROW   |8350     |36693 |Application|Power supply                                                   |
-ROW   |8351     |36694 |Application|Temperature                                                    |
-ROW   |8352     |36695 |Application|Temperature                                                    |
-ROW   |8353     |36696 |Application|Temperature                                                    |
-ROW   |8354     |36697 |Application|Temperature                                                    |
-ROW   |8355     |36698 |Application|Temperature                                                    |
-ROW   |8356     |36699 |Application|Temperature                                                    |
-ROW   |8357     |36700 |Application|Temperature                                                    |
-ROW   |8358     |36701 |Application|Temperature                                                    |
-ROW   |8359     |36702 |Application|Temperature                                                    |
-ROW   |8360     |36703 |Application|Temperature                                                    |
-ROW   |8361     |36704 |Application|Temperature                                                    |
-ROW   |8362     |36705 |Application|Temperature                                                    |
-ROW   |8363     |36706 |Application|Temperature                                                    |
-ROW   |8364     |36707 |Application|Temperature                                                    |
-ROW   |8365     |36708 |Application|Temperature                                                    |
-ROW   |8366     |36709 |Application|Virtual disks                                                  |
-ROW   |8367     |36710 |Application|Virtual disks                                                  |
-ROW   |8368     |36711 |Application|Virtual disks                                                  |
-ROW   |8369     |36712 |Application|General                                                        |
-ROW   |8370     |36713 |Application|General                                                        |
-ROW   |8371     |36714 |Application|Inventory                                                      |
-ROW   |8372     |36715 |Application|Inventory                                                      |
-ROW   |8373     |36716 |Application|General                                                        |
-ROW   |8374     |36717 |Application|General                                                        |
-ROW   |8375     |36718 |Application|General                                                        |
-ROW   |8376     |36719 |Application|Temperature                                                    |
-ROW   |8377     |36720 |Application|Status                                                         |
-ROW   |8378     |36721 |Application|Status                                                         |
-ROW   |8379     |36722 |Application|General                                                        |
-ROW   |8380     |36723 |Application|Status                                                         |
-ROW   |8381     |36738 |Application|Disk arrays                                                    |
-ROW   |8382     |36739 |Application|Disk arrays                                                    |
-ROW   |8383     |36740 |Application|Disk arrays                                                    |
-ROW   |8384     |36741 |Application|Disk arrays                                                    |
-ROW   |8385     |36742 |Application|Fans                                                           |
-ROW   |8386     |36743 |Application|Network interfaces                                             |
-ROW   |8387     |36744 |Application|Physical disks                                                 |
-ROW   |8388     |36745 |Application|Physical disks                                                 |
-ROW   |8389     |36746 |Application|Physical disks                                                 |
-ROW   |8390     |36747 |Application|Physical disks                                                 |
-ROW   |8391     |36748 |Application|Physical disks                                                 |
-ROW   |8392     |36749 |Application|Physical disks                                                 |
-ROW   |8393     |36750 |Application|Power supply                                                   |
-ROW   |8394     |36751 |Application|Temperature                                                    |
-ROW   |8395     |36752 |Application|Temperature                                                    |
-ROW   |8396     |36753 |Application|Temperature                                                    |
-ROW   |8397     |36754 |Application|Temperature                                                    |
-ROW   |8398     |36755 |Application|Temperature                                                    |
-ROW   |8399     |36756 |Application|Temperature                                                    |
-ROW   |8400     |36757 |Application|Temperature                                                    |
-ROW   |8401     |36758 |Application|Temperature                                                    |
-ROW   |8402     |36759 |Application|Temperature                                                    |
-ROW   |8403     |36760 |Application|Temperature                                                    |
-ROW   |8404     |36761 |Application|Temperature                                                    |
-ROW   |8405     |36762 |Application|Temperature                                                    |
-ROW   |8406     |36763 |Application|Temperature                                                    |
-ROW   |8407     |36764 |Application|Temperature                                                    |
-ROW   |8408     |36765 |Application|Temperature                                                    |
-ROW   |8409     |36766 |Application|Virtual disks                                                  |
-ROW   |8410     |36767 |Application|Virtual disks                                                  |
-ROW   |8411     |36768 |Application|Virtual disks                                                  |
-ROW   |8412     |36769 |Application|Asterisk                                                       |
-ROW   |8413     |36770 |Application|Asterisk                                                       |
-ROW   |8414     |36771 |Application|Asterisk                                                       |
-ROW   |8415     |36772 |Application|Zabbix raw items                                               |
-ROW   |8416     |36773 |Application|Travis                                                         |
-ROW   |8417     |36774 |Application|Zabbix raw items                                               |
-ROW   |8418     |36775 |Application|Zabbix raw items                                               |
-ROW   |8419     |36776 |Application|Travis                                                         |
-ROW   |8420     |36777 |Application|Travis                                                         |
-ROW   |8421     |36778 |Application|Travis                                                         |
-ROW   |8422     |36779 |Application|Travis                                                         |
-ROW   |8423     |36780 |Application|Travis                                                         |
-ROW   |8424     |36782 |Application|Travis: Repo [{#SLUG}]                                         |
-ROW   |8425     |36783 |Application|Zabbix raw items                                               |
-ROW   |8426     |36784 |Application|Zabbix raw items                                               |
-ROW   |8427     |36785 |Application|Travis: Repo [{#SLUG}]                                         |
-ROW   |8428     |36786 |Application|Travis: Repo [{#SLUG}]                                         |
-ROW   |8429     |36787 |Application|Travis: Repo [{#SLUG}]                                         |
-ROW   |8430     |36788 |Application|Travis: Repo [{#SLUG}]                                         |
-ROW   |8431     |36789 |Application|Travis: Repo [{#SLUG}]                                         |
-ROW   |8432     |36790 |Application|Travis: Repo [{#SLUG}]                                         |
-ROW   |8433     |36791 |Application|Travis: Repo [{#SLUG}]                                         |
-ROW   |8434     |36792 |Application|Travis: Repo [{#SLUG}]                                         |
-ROW   |8435     |36793 |Application|Travis: Repo [{#SLUG}]                                         |
-ROW   |8436     |36794 |Application|Travis: Repo [{#SLUG}]                                         |
+FIELDS|itemtagid|itemid|tag         |value                                                          |
+ROW   |1        |29124 |Application |CPU                                                            |
+ROW   |2        |29125 |Application |CPU                                                            |
+ROW   |3        |29126 |Application |CPU                                                            |
+ROW   |4        |29127 |Application |CPU                                                            |
+ROW   |5        |29128 |Application |CPU                                                            |
+ROW   |6        |29129 |Application |CPU                                                            |
+ROW   |7        |29130 |Application |CPU                                                            |
+ROW   |8        |29131 |Application |CPU                                                            |
+ROW   |9        |29132 |Application |CPU                                                            |
+ROW   |10       |29133 |Application |CPU                                                            |
+ROW   |11       |29134 |Application |CPU                                                            |
+ROW   |12       |29135 |Application |CPU                                                            |
+ROW   |13       |29136 |Application |CPU                                                            |
+ROW   |14       |29137 |Application |CPU                                                            |
+ROW   |15       |29138 |Application |CPU                                                            |
+ROW   |16       |29139 |Application |CPU                                                            |
+ROW   |17       |29199 |Application |CPU                                                            |
+ROW   |18       |29148 |Application |General                                                        |
+ROW   |19       |29149 |Application |General                                                        |
+ROW   |20       |29150 |Application |General                                                        |
+ROW   |21       |29151 |Application |General                                                        |
+ROW   |22       |29152 |Application |General                                                        |
+ROW   |23       |29153 |Application |General                                                        |
+ROW   |24       |29154 |Application |General                                                        |
+ROW   |25       |29155 |Application |General                                                        |
+ROW   |26       |29156 |Application |General                                                        |
+ROW   |27       |29158 |Application |Inventory                                                      |
+ROW   |28       |29159 |Application |Inventory                                                      |
+ROW   |29       |29160 |Application |Inventory                                                      |
+ROW   |30       |29140 |Application |Memory                                                         |
+ROW   |31       |29141 |Application |Memory                                                         |
+ROW   |32       |29142 |Application |Memory                                                         |
+ROW   |33       |29143 |Application |Memory                                                         |
+ROW   |34       |29144 |Application |Memory                                                         |
+ROW   |35       |29145 |Application |Memory                                                         |
+ROW   |36       |31365 |Application |Memory                                                         |
+ROW   |37       |10020 |Application |Monitoring agent                                               |
+ROW   |38       |10059 |Application |Monitoring agent                                               |
+ROW   |39       |23319 |Application |Monitoring agent                                               |
+ROW   |40       |29157 |Application |Security                                                       |
+ROW   |41       |29147 |Application |Status                                                         |
+ROW   |42       |29548 |Application |Status                                                         |
+ROW   |43       |31375 |Application |Zabbix raw items                                               |
+ROW   |44       |31387 |Application |Zabbix raw items                                               |
+ROW   |45       |31390 |Application |Zabbix raw items                                               |
+ROW   |46       |10061 |Application |Zabbix server                                                  |
+ROW   |47       |10062 |Application |Zabbix server                                                  |
+ROW   |48       |10063 |Application |Zabbix server                                                  |
+ROW   |49       |10064 |Application |Zabbix server                                                  |
+ROW   |50       |10065 |Application |Zabbix server                                                  |
+ROW   |51       |10066 |Application |Zabbix server                                                  |
+ROW   |52       |22183 |Application |Zabbix server                                                  |
+ROW   |53       |22185 |Application |Zabbix server                                                  |
+ROW   |54       |22187 |Application |Zabbix server                                                  |
+ROW   |55       |22189 |Application |Zabbix server                                                  |
+ROW   |56       |22191 |Application |Zabbix server                                                  |
+ROW   |57       |22196 |Application |Zabbix server                                                  |
+ROW   |58       |22199 |Application |Zabbix server                                                  |
+ROW   |59       |22219 |Application |Zabbix server                                                  |
+ROW   |60       |22396 |Application |Zabbix server                                                  |
+ROW   |61       |22399 |Application |Zabbix server                                                  |
+ROW   |62       |22400 |Application |Zabbix server                                                  |
+ROW   |63       |22401 |Application |Zabbix server                                                  |
+ROW   |64       |22402 |Application |Zabbix server                                                  |
+ROW   |65       |22404 |Application |Zabbix server                                                  |
+ROW   |66       |22406 |Application |Zabbix server                                                  |
+ROW   |67       |22408 |Application |Zabbix server                                                  |
+ROW   |68       |22412 |Application |Zabbix server                                                  |
+ROW   |69       |22414 |Application |Zabbix server                                                  |
+ROW   |70       |22416 |Application |Zabbix server                                                  |
+ROW   |71       |22418 |Application |Zabbix server                                                  |
+ROW   |72       |22420 |Application |Zabbix server                                                  |
+ROW   |73       |22422 |Application |Zabbix server                                                  |
+ROW   |74       |22424 |Application |Zabbix server                                                  |
+ROW   |75       |22426 |Application |Zabbix server                                                  |
+ROW   |76       |22430 |Application |Zabbix server                                                  |
+ROW   |77       |22689 |Application |Zabbix server                                                  |
+ROW   |78       |23171 |Application |Zabbix server                                                  |
+ROW   |79       |23251 |Application |Zabbix server                                                  |
+ROW   |80       |23634 |Application |Zabbix server                                                  |
+ROW   |81       |23661 |Application |Zabbix server                                                  |
+ROW   |82       |23663 |Application |Zabbix server                                                  |
+ROW   |83       |25366 |Application |Zabbix server                                                  |
+ROW   |84       |25370 |Application |Zabbix server                                                  |
+ROW   |85       |25665 |Application |Zabbix server                                                  |
+ROW   |86       |25666 |Application |Zabbix server                                                  |
+ROW   |87       |28248 |Application |Zabbix server                                                  |
+ROW   |88       |28533 |Application |Zabbix server                                                  |
+ROW   |89       |28535 |Application |Zabbix server                                                  |
+ROW   |90       |28537 |Application |Zabbix server                                                  |
+ROW   |91       |29822 |Application |Zabbix server                                                  |
+ROW   |92       |33020 |Application |Zabbix server                                                  |
+ROW   |93       |33021 |Application |Zabbix server                                                  |
+ROW   |94       |33022 |Application |Zabbix server                                                  |
+ROW   |95       |33023 |Application |Zabbix server                                                  |
+ROW   |96       |10067 |Application |Zabbix proxy                                                   |
+ROW   |97       |10068 |Application |Zabbix proxy                                                   |
+ROW   |98       |10069 |Application |Zabbix proxy                                                   |
+ROW   |99       |10070 |Application |Zabbix proxy                                                   |
+ROW   |100      |10071 |Application |Zabbix proxy                                                   |
+ROW   |101      |10072 |Application |Zabbix proxy                                                   |
+ROW   |102      |23340 |Application |Zabbix proxy                                                   |
+ROW   |103      |23341 |Application |Zabbix proxy                                                   |
+ROW   |104      |23342 |Application |Zabbix proxy                                                   |
+ROW   |105      |23343 |Application |Zabbix proxy                                                   |
+ROW   |106      |23344 |Application |Zabbix proxy                                                   |
+ROW   |107      |23345 |Application |Zabbix proxy                                                   |
+ROW   |108      |23346 |Application |Zabbix proxy                                                   |
+ROW   |109      |23347 |Application |Zabbix proxy                                                   |
+ROW   |110      |23348 |Application |Zabbix proxy                                                   |
+ROW   |111      |23349 |Application |Zabbix proxy                                                   |
+ROW   |112      |23350 |Application |Zabbix proxy                                                   |
+ROW   |113      |23351 |Application |Zabbix proxy                                                   |
+ROW   |114      |23352 |Application |Zabbix proxy                                                   |
+ROW   |115      |23353 |Application |Zabbix proxy                                                   |
+ROW   |116      |23354 |Application |Zabbix proxy                                                   |
+ROW   |117      |23355 |Application |Zabbix proxy                                                   |
+ROW   |118      |23356 |Application |Zabbix proxy                                                   |
+ROW   |119      |23357 |Application |Zabbix proxy                                                   |
+ROW   |120      |23358 |Application |Zabbix proxy                                                   |
+ROW   |121      |23359 |Application |Zabbix proxy                                                   |
+ROW   |122      |23360 |Application |Zabbix proxy                                                   |
+ROW   |123      |25368 |Application |Zabbix proxy                                                   |
+ROW   |124      |25369 |Application |Zabbix proxy                                                   |
+ROW   |125      |28250 |Application |Zabbix proxy                                                   |
+ROW   |126      |28251 |Application |Zabbix proxy                                                   |
+ROW   |127      |28617 |Application |Zabbix proxy                                                   |
+ROW   |128      |28618 |Application |Zabbix proxy                                                   |
+ROW   |129      |28619 |Application |Zabbix proxy                                                   |
+ROW   |130      |33018 |Application |Zabbix proxy                                                   |
+ROW   |131      |33019 |Application |Zabbix proxy                                                   |
+ROW   |132      |22231 |Application |Monitoring agent                                               |
+ROW   |133      |22232 |Application |Monitoring agent                                               |
+ROW   |134      |23318 |Application |Monitoring agent                                               |
+ROW   |135      |29544 |Application |Status                                                         |
+ROW   |136      |22840 |Application |CPU                                                            |
+ROW   |137      |22841 |Application |CPU                                                            |
+ROW   |138      |22842 |Application |CPU                                                            |
+ROW   |139      |22843 |Application |CPU                                                            |
+ROW   |140      |22844 |Application |CPU                                                            |
+ROW   |141      |22845 |Application |CPU                                                            |
+ROW   |142      |22846 |Application |CPU                                                            |
+ROW   |143      |22848 |Application |CPU                                                            |
+ROW   |144      |22851 |Application |CPU                                                            |
+ROW   |145      |22852 |Application |CPU                                                            |
+ROW   |146      |22868 |Application |Filesystems                                                    |
+ROW   |147      |22869 |Application |Filesystems                                                    |
+ROW   |148      |22870 |Application |Filesystems                                                    |
+ROW   |149      |22871 |Application |Filesystems                                                    |
+ROW   |150      |22872 |Application |Filesystems                                                    |
+ROW   |151      |22839 |Application |General                                                        |
+ROW   |152      |22853 |Application |General                                                        |
+ROW   |153      |22854 |Application |General                                                        |
+ROW   |154      |22858 |Application |General                                                        |
+ROW   |155      |22859 |Application |General                                                        |
+ROW   |156      |22855 |Application |Memory                                                         |
+ROW   |157      |22856 |Application |Memory                                                         |
+ROW   |158      |22857 |Application |Memory                                                         |
+ROW   |159      |22862 |Application |Memory                                                         |
+ROW   |160      |22863 |Application |Memory                                                         |
+ROW   |161      |22833 |Application |Monitoring agent                                               |
+ROW   |162      |22834 |Application |Monitoring agent                                               |
+ROW   |163      |23320 |Application |Monitoring agent                                               |
+ROW   |164      |23075 |Application |Network interfaces                                             |
+ROW   |165      |23076 |Application |Network interfaces                                             |
+ROW   |166      |22835 |Application |OS                                                             |
+ROW   |167      |22836 |Application |OS                                                             |
+ROW   |168      |22839 |Application |OS                                                             |
+ROW   |169      |22853 |Application |OS                                                             |
+ROW   |170      |22854 |Application |OS                                                             |
+ROW   |171      |22858 |Application |OS                                                             |
+ROW   |172      |22859 |Application |OS                                                             |
+ROW   |173      |22860 |Application |OS                                                             |
+ROW   |174      |22840 |Application |Performance                                                    |
+ROW   |175      |22841 |Application |Performance                                                    |
+ROW   |176      |22842 |Application |Performance                                                    |
+ROW   |177      |22843 |Application |Performance                                                    |
+ROW   |178      |22844 |Application |Performance                                                    |
+ROW   |179      |22845 |Application |Performance                                                    |
+ROW   |180      |22846 |Application |Performance                                                    |
+ROW   |181      |22848 |Application |Performance                                                    |
+ROW   |182      |22851 |Application |Performance                                                    |
+ROW   |183      |22852 |Application |Performance                                                    |
+ROW   |184      |22837 |Application |Processes                                                      |
+ROW   |185      |22838 |Application |Processes                                                      |
+ROW   |186      |22860 |Application |Security                                                       |
+ROW   |187      |22861 |Application |Security                                                       |
+ROW   |188      |29549 |Application |Status                                                         |
+ROW   |189      |22880 |Application |CPU                                                            |
+ROW   |190      |22881 |Application |CPU                                                            |
+ROW   |191      |22882 |Application |CPU                                                            |
+ROW   |192      |22883 |Application |CPU                                                            |
+ROW   |193      |22884 |Application |CPU                                                            |
+ROW   |194      |22885 |Application |CPU                                                            |
+ROW   |195      |22886 |Application |CPU                                                            |
+ROW   |196      |22888 |Application |CPU                                                            |
+ROW   |197      |22891 |Application |CPU                                                            |
+ROW   |198      |22892 |Application |CPU                                                            |
+ROW   |199      |22908 |Application |Filesystems                                                    |
+ROW   |200      |22909 |Application |Filesystems                                                    |
+ROW   |201      |22910 |Application |Filesystems                                                    |
+ROW   |202      |22911 |Application |Filesystems                                                    |
+ROW   |203      |22912 |Application |Filesystems                                                    |
+ROW   |204      |22879 |Application |General                                                        |
+ROW   |205      |22893 |Application |General                                                        |
+ROW   |206      |22894 |Application |General                                                        |
+ROW   |207      |22898 |Application |General                                                        |
+ROW   |208      |22899 |Application |General                                                        |
+ROW   |209      |22895 |Application |Memory                                                         |
+ROW   |210      |22896 |Application |Memory                                                         |
+ROW   |211      |22897 |Application |Memory                                                         |
+ROW   |212      |22902 |Application |Memory                                                         |
+ROW   |213      |22903 |Application |Memory                                                         |
+ROW   |214      |22873 |Application |Monitoring agent                                               |
+ROW   |215      |22874 |Application |Monitoring agent                                               |
+ROW   |216      |23321 |Application |Monitoring agent                                               |
+ROW   |217      |23073 |Application |Network interfaces                                             |
+ROW   |218      |23074 |Application |Network interfaces                                             |
+ROW   |219      |22875 |Application |OS                                                             |
+ROW   |220      |22876 |Application |OS                                                             |
+ROW   |221      |22879 |Application |OS                                                             |
+ROW   |222      |22893 |Application |OS                                                             |
+ROW   |223      |22894 |Application |OS                                                             |
+ROW   |224      |22898 |Application |OS                                                             |
+ROW   |225      |22899 |Application |OS                                                             |
+ROW   |226      |22900 |Application |OS                                                             |
+ROW   |227      |22880 |Application |Performance                                                    |
+ROW   |228      |22881 |Application |Performance                                                    |
+ROW   |229      |22882 |Application |Performance                                                    |
+ROW   |230      |22883 |Application |Performance                                                    |
+ROW   |231      |22884 |Application |Performance                                                    |
+ROW   |232      |22885 |Application |Performance                                                    |
+ROW   |233      |22886 |Application |Performance                                                    |
+ROW   |234      |22888 |Application |Performance                                                    |
+ROW   |235      |22891 |Application |Performance                                                    |
+ROW   |236      |22892 |Application |Performance                                                    |
+ROW   |237      |22877 |Application |Processes                                                      |
+ROW   |238      |22878 |Application |Processes                                                      |
+ROW   |239      |22900 |Application |Security                                                       |
+ROW   |240      |22901 |Application |Security                                                       |
+ROW   |241      |29550 |Application |Status                                                         |
+ROW   |242      |22920 |Application |CPU                                                            |
+ROW   |243      |22921 |Application |CPU                                                            |
+ROW   |244      |22922 |Application |CPU                                                            |
+ROW   |245      |22923 |Application |CPU                                                            |
+ROW   |246      |22924 |Application |CPU                                                            |
+ROW   |247      |23108 |Application |CPU                                                            |
+ROW   |248      |23109 |Application |CPU                                                            |
+ROW   |249      |23110 |Application |CPU                                                            |
+ROW   |250      |23111 |Application |CPU                                                            |
+ROW   |251      |23112 |Application |CPU                                                            |
+ROW   |252      |23113 |Application |CPU                                                            |
+ROW   |253      |23114 |Application |CPU                                                            |
+ROW   |254      |23115 |Application |CPU                                                            |
+ROW   |255      |23118 |Application |CPU                                                            |
+ROW   |256      |23119 |Application |CPU                                                            |
+ROW   |257      |23120 |Application |CPU                                                            |
+ROW   |258      |23121 |Application |CPU                                                            |
+ROW   |259      |23123 |Application |CPU                                                            |
+ROW   |260      |22948 |Application |Filesystems                                                    |
+ROW   |261      |22949 |Application |Filesystems                                                    |
+ROW   |262      |22950 |Application |Filesystems                                                    |
+ROW   |263      |22951 |Application |Filesystems                                                    |
+ROW   |264      |22952 |Application |Filesystems                                                    |
+ROW   |265      |23116 |Application |Filesystems                                                    |
+ROW   |266      |23117 |Application |Filesystems                                                    |
+ROW   |267      |22933 |Application |General                                                        |
+ROW   |268      |22934 |Application |General                                                        |
+ROW   |269      |22938 |Application |General                                                        |
+ROW   |270      |22939 |Application |General                                                        |
+ROW   |271      |23108 |Application |Logical partitions                                             |
+ROW   |272      |23109 |Application |Logical partitions                                             |
+ROW   |273      |23111 |Application |Logical partitions                                             |
+ROW   |274      |23112 |Application |Logical partitions                                             |
+ROW   |275      |23118 |Application |Logical partitions                                             |
+ROW   |276      |22942 |Application |Memory                                                         |
+ROW   |277      |22943 |Application |Memory                                                         |
+ROW   |278      |23122 |Application |Memory                                                         |
+ROW   |279      |23124 |Application |Memory                                                         |
+ROW   |280      |23125 |Application |Memory                                                         |
+ROW   |281      |23126 |Application |Memory                                                         |
+ROW   |282      |23127 |Application |Memory                                                         |
+ROW   |283      |23128 |Application |Memory                                                         |
+ROW   |284      |23129 |Application |Memory                                                         |
+ROW   |285      |23130 |Application |Memory                                                         |
+ROW   |286      |23131 |Application |Memory                                                         |
+ROW   |287      |22913 |Application |Monitoring agent                                               |
+ROW   |288      |22914 |Application |Monitoring agent                                               |
+ROW   |289      |23322 |Application |Monitoring agent                                               |
+ROW   |290      |22945 |Application |Network interfaces                                             |
+ROW   |291      |22946 |Application |Network interfaces                                             |
+ROW   |292      |22933 |Application |OS                                                             |
+ROW   |293      |22934 |Application |OS                                                             |
+ROW   |294      |22938 |Application |OS                                                             |
+ROW   |295      |22939 |Application |OS                                                             |
+ROW   |296      |22940 |Application |OS                                                             |
+ROW   |297      |22920 |Application |Performance                                                    |
+ROW   |298      |22921 |Application |Performance                                                    |
+ROW   |299      |22922 |Application |Performance                                                    |
+ROW   |300      |22923 |Application |Performance                                                    |
+ROW   |301      |22924 |Application |Performance                                                    |
+ROW   |302      |23108 |Application |Performance                                                    |
+ROW   |303      |23109 |Application |Performance                                                    |
+ROW   |304      |23110 |Application |Performance                                                    |
+ROW   |305      |23111 |Application |Performance                                                    |
+ROW   |306      |23112 |Application |Performance                                                    |
+ROW   |307      |23113 |Application |Performance                                                    |
+ROW   |308      |23114 |Application |Performance                                                    |
+ROW   |309      |23115 |Application |Performance                                                    |
+ROW   |310      |23116 |Application |Performance                                                    |
+ROW   |311      |23117 |Application |Performance                                                    |
+ROW   |312      |23119 |Application |Performance                                                    |
+ROW   |313      |23120 |Application |Performance                                                    |
+ROW   |314      |23121 |Application |Performance                                                    |
+ROW   |315      |23122 |Application |Performance                                                    |
+ROW   |316      |23123 |Application |Performance                                                    |
+ROW   |317      |22917 |Application |Processes                                                      |
+ROW   |318      |22918 |Application |Processes                                                      |
+ROW   |319      |22940 |Application |Security                                                       |
+ROW   |320      |22941 |Application |Security                                                       |
+ROW   |321      |29551 |Application |Status                                                         |
+ROW   |322      |22961 |Application |CPU                                                            |
+ROW   |323      |22962 |Application |CPU                                                            |
+ROW   |324      |22963 |Application |CPU                                                            |
+ROW   |325      |22965 |Application |CPU                                                            |
+ROW   |326      |22968 |Application |CPU                                                            |
+ROW   |327      |22971 |Application |CPU                                                            |
+ROW   |328      |22972 |Application |CPU                                                            |
+ROW   |329      |22988 |Application |Filesystems                                                    |
+ROW   |330      |22989 |Application |Filesystems                                                    |
+ROW   |331      |22990 |Application |Filesystems                                                    |
+ROW   |332      |22991 |Application |Filesystems                                                    |
+ROW   |333      |22992 |Application |Filesystems                                                    |
+ROW   |334      |22973 |Application |General                                                        |
+ROW   |335      |22974 |Application |General                                                        |
+ROW   |336      |22978 |Application |General                                                        |
+ROW   |337      |22982 |Application |Memory                                                         |
+ROW   |338      |22983 |Application |Memory                                                         |
+ROW   |339      |22953 |Application |Monitoring agent                                               |
+ROW   |340      |22954 |Application |Monitoring agent                                               |
+ROW   |341      |23323 |Application |Monitoring agent                                               |
+ROW   |342      |22985 |Application |Network interfaces                                             |
+ROW   |343      |22986 |Application |Network interfaces                                             |
+ROW   |344      |22973 |Application |OS                                                             |
+ROW   |345      |22974 |Application |OS                                                             |
+ROW   |346      |22978 |Application |OS                                                             |
+ROW   |347      |22980 |Application |OS                                                             |
+ROW   |348      |22961 |Application |Performance                                                    |
+ROW   |349      |22962 |Application |Performance                                                    |
+ROW   |350      |22963 |Application |Performance                                                    |
+ROW   |351      |22965 |Application |Performance                                                    |
+ROW   |352      |22968 |Application |Performance                                                    |
+ROW   |353      |22971 |Application |Performance                                                    |
+ROW   |354      |22972 |Application |Performance                                                    |
+ROW   |355      |22980 |Application |Security                                                       |
+ROW   |356      |22981 |Application |Security                                                       |
+ROW   |357      |29552 |Application |Status                                                         |
+ROW   |358      |23000 |Application |CPU                                                            |
+ROW   |359      |23001 |Application |CPU                                                            |
+ROW   |360      |23002 |Application |CPU                                                            |
+ROW   |361      |23003 |Application |CPU                                                            |
+ROW   |362      |23004 |Application |CPU                                                            |
+ROW   |363      |23005 |Application |CPU                                                            |
+ROW   |364      |23007 |Application |CPU                                                            |
+ROW   |365      |23011 |Application |CPU                                                            |
+ROW   |366      |23012 |Application |CPU                                                            |
+ROW   |367      |23028 |Application |Filesystems                                                    |
+ROW   |368      |23029 |Application |Filesystems                                                    |
+ROW   |369      |23030 |Application |Filesystems                                                    |
+ROW   |370      |23031 |Application |Filesystems                                                    |
+ROW   |371      |23032 |Application |Filesystems                                                    |
+ROW   |372      |22999 |Application |General                                                        |
+ROW   |373      |23013 |Application |General                                                        |
+ROW   |374      |23014 |Application |General                                                        |
+ROW   |375      |23018 |Application |General                                                        |
+ROW   |376      |23019 |Application |General                                                        |
+ROW   |377      |23015 |Application |Memory                                                         |
+ROW   |378      |23016 |Application |Memory                                                         |
+ROW   |379      |23017 |Application |Memory                                                         |
+ROW   |380      |23022 |Application |Memory                                                         |
+ROW   |381      |23023 |Application |Memory                                                         |
+ROW   |382      |22993 |Application |Monitoring agent                                               |
+ROW   |383      |22994 |Application |Monitoring agent                                               |
+ROW   |384      |23324 |Application |Monitoring agent                                               |
+ROW   |385      |23025 |Application |Network interfaces                                             |
+ROW   |386      |23026 |Application |Network interfaces                                             |
+ROW   |387      |22996 |Application |OS                                                             |
+ROW   |388      |22999 |Application |OS                                                             |
+ROW   |389      |23013 |Application |OS                                                             |
+ROW   |390      |23014 |Application |OS                                                             |
+ROW   |391      |23018 |Application |OS                                                             |
+ROW   |392      |23019 |Application |OS                                                             |
+ROW   |393      |23020 |Application |OS                                                             |
+ROW   |394      |23000 |Application |Performance                                                    |
+ROW   |395      |23001 |Application |Performance                                                    |
+ROW   |396      |23002 |Application |Performance                                                    |
+ROW   |397      |23003 |Application |Performance                                                    |
+ROW   |398      |23004 |Application |Performance                                                    |
+ROW   |399      |23005 |Application |Performance                                                    |
+ROW   |400      |23007 |Application |Performance                                                    |
+ROW   |401      |23011 |Application |Performance                                                    |
+ROW   |402      |23012 |Application |Performance                                                    |
+ROW   |403      |22997 |Application |Processes                                                      |
+ROW   |404      |22998 |Application |Processes                                                      |
+ROW   |405      |23020 |Application |Security                                                       |
+ROW   |406      |23021 |Application |Security                                                       |
+ROW   |407      |29553 |Application |Status                                                         |
+ROW   |408      |23041 |Application |CPU                                                            |
+ROW   |409      |23042 |Application |CPU                                                            |
+ROW   |410      |23043 |Application |CPU                                                            |
+ROW   |411      |23068 |Application |Filesystems                                                    |
+ROW   |412      |23069 |Application |Filesystems                                                    |
+ROW   |413      |23070 |Application |Filesystems                                                    |
+ROW   |414      |23071 |Application |Filesystems                                                    |
+ROW   |415      |23072 |Application |Filesystems                                                    |
+ROW   |416      |23039 |Application |General                                                        |
+ROW   |417      |23053 |Application |General                                                        |
+ROW   |418      |23054 |Application |General                                                        |
+ROW   |419      |23058 |Application |General                                                        |
+ROW   |420      |23059 |Application |General                                                        |
+ROW   |421      |23062 |Application |Memory                                                         |
+ROW   |422      |23063 |Application |Memory                                                         |
+ROW   |423      |23033 |Application |Monitoring agent                                               |
+ROW   |424      |23034 |Application |Monitoring agent                                               |
+ROW   |425      |23325 |Application |Monitoring agent                                               |
+ROW   |426      |23077 |Application |Network interfaces                                             |
+ROW   |427      |23078 |Application |Network interfaces                                             |
+ROW   |428      |23035 |Application |OS                                                             |
+ROW   |429      |23036 |Application |OS                                                             |
+ROW   |430      |23039 |Application |OS                                                             |
+ROW   |431      |23053 |Application |OS                                                             |
+ROW   |432      |23054 |Application |OS                                                             |
+ROW   |433      |23058 |Application |OS                                                             |
+ROW   |434      |23059 |Application |OS                                                             |
+ROW   |435      |23060 |Application |OS                                                             |
+ROW   |436      |23041 |Application |Performance                                                    |
+ROW   |437      |23042 |Application |Performance                                                    |
+ROW   |438      |23043 |Application |Performance                                                    |
+ROW   |439      |23060 |Application |Security                                                       |
+ROW   |440      |23061 |Application |Security                                                       |
+ROW   |441      |29554 |Application |Status                                                         |
+ROW   |442      |29480 |Application |CPU                                                            |
+ROW   |443      |29481 |Application |CPU                                                            |
+ROW   |444      |29482 |Application |CPU                                                            |
+ROW   |445      |29483 |Application |CPU                                                            |
+ROW   |446      |29484 |Application |CPU                                                            |
+ROW   |447      |29485 |Application |CPU                                                            |
+ROW   |448      |30138 |Application |CPU                                                            |
+ROW   |449      |31423 |Application |CPU                                                            |
+ROW   |450      |29499 |Application |General                                                        |
+ROW   |451      |29500 |Application |General                                                        |
+ROW   |452      |29501 |Application |General                                                        |
+ROW   |453      |29502 |Application |General                                                        |
+ROW   |454      |29503 |Application |General                                                        |
+ROW   |455      |29504 |Application |Inventory                                                      |
+ROW   |456      |29486 |Application |Memory                                                         |
+ROW   |457      |29487 |Application |Memory                                                         |
+ROW   |458      |29488 |Application |Memory                                                         |
+ROW   |459      |29489 |Application |Memory                                                         |
+ROW   |460      |29492 |Application |Memory                                                         |
+ROW   |461      |29493 |Application |Memory                                                         |
+ROW   |462      |29494 |Application |Memory                                                         |
+ROW   |463      |29495 |Application |Memory                                                         |
+ROW   |464      |29496 |Application |Memory                                                         |
+ROW   |465      |31424 |Application |Memory                                                         |
+ROW   |466      |31425 |Application |Memory                                                         |
+ROW   |467      |31428 |Application |Memory                                                         |
+ROW   |468      |23160 |Application |Monitoring agent                                               |
+ROW   |469      |23161 |Application |Monitoring agent                                               |
+ROW   |470      |23326 |Application |Monitoring agent                                               |
+ROW   |471      |30426 |Application |Services                                                       |
+ROW   |472      |29498 |Application |Status                                                         |
+ROW   |473      |29555 |Application |Status                                                         |
+ROW   |474      |31426 |Application |Zabbix raw items                                               |
+ROW   |475      |29161 |Application |CPU                                                            |
+ROW   |476      |29162 |Application |CPU                                                            |
+ROW   |477      |29163 |Application |CPU                                                            |
+ROW   |478      |29164 |Application |CPU                                                            |
+ROW   |479      |29165 |Application |CPU                                                            |
+ROW   |480      |29166 |Application |CPU                                                            |
+ROW   |481      |29167 |Application |CPU                                                            |
+ROW   |482      |29168 |Application |CPU                                                            |
+ROW   |483      |29169 |Application |CPU                                                            |
+ROW   |484      |29170 |Application |CPU                                                            |
+ROW   |485      |29171 |Application |CPU                                                            |
+ROW   |486      |29172 |Application |CPU                                                            |
+ROW   |487      |29173 |Application |CPU                                                            |
+ROW   |488      |29174 |Application |CPU                                                            |
+ROW   |489      |29175 |Application |CPU                                                            |
+ROW   |490      |29176 |Application |CPU                                                            |
+ROW   |491      |29200 |Application |CPU                                                            |
+ROW   |492      |29185 |Application |General                                                        |
+ROW   |493      |29186 |Application |General                                                        |
+ROW   |494      |29187 |Application |General                                                        |
+ROW   |495      |29188 |Application |General                                                        |
+ROW   |496      |29189 |Application |General                                                        |
+ROW   |497      |29190 |Application |General                                                        |
+ROW   |498      |29191 |Application |General                                                        |
+ROW   |499      |29192 |Application |General                                                        |
+ROW   |500      |29193 |Application |General                                                        |
+ROW   |501      |29195 |Application |Inventory                                                      |
+ROW   |502      |29196 |Application |Inventory                                                      |
+ROW   |503      |29197 |Application |Inventory                                                      |
+ROW   |504      |29177 |Application |Memory                                                         |
+ROW   |505      |29178 |Application |Memory                                                         |
+ROW   |506      |29179 |Application |Memory                                                         |
+ROW   |507      |29180 |Application |Memory                                                         |
+ROW   |508      |29181 |Application |Memory                                                         |
+ROW   |509      |29182 |Application |Memory                                                         |
+ROW   |510      |31366 |Application |Memory                                                         |
+ROW   |511      |23287 |Application |Monitoring agent                                               |
+ROW   |512      |23288 |Application |Monitoring agent                                               |
+ROW   |513      |23327 |Application |Monitoring agent                                               |
+ROW   |514      |29194 |Application |Security                                                       |
+ROW   |515      |29184 |Application |Status                                                         |
+ROW   |516      |29557 |Application |Status                                                         |
+ROW   |517      |31378 |Application |Zabbix raw items                                               |
+ROW   |518      |31393 |Application |Zabbix raw items                                               |
+ROW   |519      |31396 |Application |Zabbix raw items                                               |
+ROW   |520      |10073 |Application |Zabbix server                                                  |
+ROW   |521      |10074 |Application |Zabbix server                                                  |
+ROW   |522      |10075 |Application |Zabbix server                                                  |
+ROW   |523      |10076 |Application |Zabbix server                                                  |
+ROW   |524      |10077 |Application |Zabbix server                                                  |
+ROW   |525      |10078 |Application |Zabbix server                                                  |
+ROW   |526      |23252 |Application |Zabbix server                                                  |
+ROW   |527      |23253 |Application |Zabbix server                                                  |
+ROW   |528      |23255 |Application |Zabbix server                                                  |
+ROW   |529      |23256 |Application |Zabbix server                                                  |
+ROW   |530      |23257 |Application |Zabbix server                                                  |
+ROW   |531      |23258 |Application |Zabbix server                                                  |
+ROW   |532      |23259 |Application |Zabbix server                                                  |
+ROW   |533      |23260 |Application |Zabbix server                                                  |
+ROW   |534      |23261 |Application |Zabbix server                                                  |
+ROW   |535      |23262 |Application |Zabbix server                                                  |
+ROW   |536      |23264 |Application |Zabbix server                                                  |
+ROW   |537      |23265 |Application |Zabbix server                                                  |
+ROW   |538      |23266 |Application |Zabbix server                                                  |
+ROW   |539      |23267 |Application |Zabbix server                                                  |
+ROW   |540      |23268 |Application |Zabbix server                                                  |
+ROW   |541      |23269 |Application |Zabbix server                                                  |
+ROW   |542      |23270 |Application |Zabbix server                                                  |
+ROW   |543      |23271 |Application |Zabbix server                                                  |
+ROW   |544      |23272 |Application |Zabbix server                                                  |
+ROW   |545      |23273 |Application |Zabbix server                                                  |
+ROW   |546      |23274 |Application |Zabbix server                                                  |
+ROW   |547      |23275 |Application |Zabbix server                                                  |
+ROW   |548      |23276 |Application |Zabbix server                                                  |
+ROW   |549      |23277 |Application |Zabbix server                                                  |
+ROW   |550      |23328 |Application |Zabbix server                                                  |
+ROW   |551      |23620 |Application |Zabbix server                                                  |
+ROW   |552      |23625 |Application |Zabbix server                                                  |
+ROW   |553      |23628 |Application |Zabbix server                                                  |
+ROW   |554      |23635 |Application |Zabbix server                                                  |
+ROW   |555      |23662 |Application |Zabbix server                                                  |
+ROW   |556      |23664 |Application |Zabbix server                                                  |
+ROW   |557      |25367 |Application |Zabbix server                                                  |
+ROW   |558      |25371 |Application |Zabbix server                                                  |
+ROW   |559      |25667 |Application |Zabbix server                                                  |
+ROW   |560      |25668 |Application |Zabbix server                                                  |
+ROW   |561      |28249 |Application |Zabbix server                                                  |
+ROW   |562      |28534 |Application |Zabbix server                                                  |
+ROW   |563      |28536 |Application |Zabbix server                                                  |
+ROW   |564      |28538 |Application |Zabbix server                                                  |
+ROW   |565      |29823 |Application |Zabbix server                                                  |
+ROW   |566      |33024 |Application |Zabbix server                                                  |
+ROW   |567      |33025 |Application |Zabbix server                                                  |
+ROW   |568      |33026 |Application |Zabbix server                                                  |
+ROW   |569      |33027 |Application |Zabbix server                                                  |
+ROW   |570      |23644 |Application |FTP service                                                    |
+ROW   |571      |23645 |Application |HTTP service                                                   |
+ROW   |572      |23646 |Application |HTTPS service                                                  |
+ROW   |573      |23647 |Application |IMAP service                                                   |
+ROW   |574      |23648 |Application |LDAP service                                                   |
+ROW   |575      |23649 |Application |NNTP service                                                   |
+ROW   |576      |23650 |Application |NTP service                                                    |
+ROW   |577      |23651 |Application |POP service                                                    |
+ROW   |578      |23652 |Application |SMTP service                                                   |
+ROW   |579      |23653 |Application |SSH service                                                    |
+ROW   |580      |23654 |Application |Telnet service                                                 |
+ROW   |581      |31499 |Application |JMX                                                            |
+ROW   |582      |31500 |Application |JMX                                                            |
+ROW   |583      |31501 |Application |JMX                                                            |
+ROW   |584      |31502 |Application |JMX                                                            |
+ROW   |585      |31503 |Application |JMX                                                            |
+ROW   |586      |31504 |Application |JMX                                                            |
+ROW   |587      |31505 |Application |JMX                                                            |
+ROW   |588      |31506 |Application |JMX                                                            |
+ROW   |589      |31507 |Application |JMX                                                            |
+ROW   |590      |31508 |Application |JMX                                                            |
+ROW   |591      |31509 |Application |JMX                                                            |
+ROW   |592      |31510 |Application |JMX                                                            |
+ROW   |593      |31511 |Application |JMX                                                            |
+ROW   |594      |31512 |Application |JMX                                                            |
+ROW   |595      |31513 |Application |JMX                                                            |
+ROW   |596      |31514 |Application |JMX                                                            |
+ROW   |597      |31515 |Application |JMX                                                            |
+ROW   |598      |31516 |Application |JMX                                                            |
+ROW   |599      |31517 |Application |JMX                                                            |
+ROW   |600      |31518 |Application |JMX                                                            |
+ROW   |601      |31519 |Application |JMX                                                            |
+ROW   |602      |31520 |Application |JMX                                                            |
+ROW   |603      |31521 |Application |JMX                                                            |
+ROW   |604      |31522 |Application |JMX                                                            |
+ROW   |605      |31523 |Application |JMX                                                            |
+ROW   |606      |31524 |Application |JMX                                                            |
+ROW   |607      |31525 |Application |JMX                                                            |
+ROW   |608      |31526 |Application |JMX                                                            |
+ROW   |609      |31527 |Application |JMX                                                            |
+ROW   |610      |31528 |Application |JMX                                                            |
+ROW   |611      |31529 |Application |JMX                                                            |
+ROW   |612      |31530 |Application |JMX                                                            |
+ROW   |613      |31531 |Application |JMX                                                            |
+ROW   |614      |31532 |Application |JMX                                                            |
+ROW   |615      |31533 |Application |JMX                                                            |
+ROW   |616      |31534 |Application |JMX                                                            |
+ROW   |617      |31535 |Application |JMX                                                            |
+ROW   |618      |31536 |Application |JMX                                                            |
+ROW   |619      |31537 |Application |JMX                                                            |
+ROW   |620      |31538 |Application |JMX                                                            |
+ROW   |621      |31539 |Application |JMX                                                            |
+ROW   |622      |31540 |Application |JMX                                                            |
+ROW   |623      |31541 |Application |JMX                                                            |
+ROW   |624      |31542 |Application |JMX                                                            |
+ROW   |625      |31543 |Application |JMX                                                            |
+ROW   |626      |31544 |Application |JMX                                                            |
+ROW   |627      |31545 |Application |JMX                                                            |
+ROW   |628      |31546 |Application |JMX                                                            |
+ROW   |629      |31547 |Application |JMX                                                            |
+ROW   |630      |31548 |Application |JMX                                                            |
+ROW   |631      |31549 |Application |JMX                                                            |
+ROW   |632      |31550 |Application |JMX                                                            |
+ROW   |633      |31551 |Application |JMX                                                            |
+ROW   |634      |31552 |Application |JMX                                                            |
+ROW   |635      |31553 |Application |JMX                                                            |
+ROW   |636      |26927 |Application |Fans                                                           |
+ROW   |637      |26928 |Application |Temperature                                                    |
+ROW   |638      |26925 |Application |Voltage                                                        |
+ROW   |639      |26926 |Application |Voltage                                                        |
+ROW   |640      |26929 |Application |Voltage                                                        |
+ROW   |641      |26930 |Application |Voltage                                                        |
+ROW   |642      |26931 |Application |Voltage                                                        |
+ROW   |643      |26932 |Application |Voltage                                                        |
+ROW   |644      |26935 |Application |Fans                                                           |
+ROW   |645      |26936 |Application |Fans                                                           |
+ROW   |646      |26933 |Application |Temperature                                                    |
+ROW   |647      |26943 |Application |Temperature                                                    |
+ROW   |648      |26934 |Application |Voltage                                                        |
+ROW   |649      |26937 |Application |Voltage                                                        |
+ROW   |650      |26938 |Application |Voltage                                                        |
+ROW   |651      |26939 |Application |Voltage                                                        |
+ROW   |652      |26940 |Application |Voltage                                                        |
+ROW   |653      |26941 |Application |Voltage                                                        |
+ROW   |654      |26942 |Application |Voltage                                                        |
+ROW   |655      |31612 |Application |VMware                                                         |
+ROW   |656      |31613 |Application |VMware                                                         |
+ROW   |657      |31614 |Application |VMware                                                         |
+ROW   |658      |31663 |Application |VMware                                                         |
+ROW   |659      |31664 |Application |VMware                                                         |
+ROW   |660      |31665 |Application |VMware                                                         |
+ROW   |661      |31666 |Application |VMware                                                         |
+ROW   |662      |31667 |Application |VMware                                                         |
+ROW   |663      |32890 |Application |VMware                                                         |
+ROW   |664      |32891 |Application |VMware                                                         |
+ROW   |665      |32892 |Application |VMware                                                         |
+ROW   |666      |32893 |Application |VMware                                                         |
+ROW   |667      |32894 |Application |VMware                                                         |
+ROW   |668      |32895 |Application |VMware                                                         |
+ROW   |669      |32896 |Application |VMware                                                         |
+ROW   |670      |32897 |Application |VMware                                                         |
+ROW   |671      |32898 |Application |VMware                                                         |
+ROW   |672      |32899 |Application |VMware                                                         |
+ROW   |673      |32900 |Application |VMware                                                         |
+ROW   |674      |32901 |Application |VMware                                                         |
+ROW   |675      |32902 |Application |VMware                                                         |
+ROW   |676      |32903 |Application |VMware                                                         |
+ROW   |677      |32904 |Application |VMware                                                         |
+ROW   |678      |32905 |Application |VMware                                                         |
+ROW   |679      |32906 |Application |VMware                                                         |
+ROW   |680      |32907 |Application |VMware                                                         |
+ROW   |681      |32908 |Application |VMware                                                         |
+ROW   |682      |32935 |Application |VMware                                                         |
+ROW   |683      |32936 |Application |VMware                                                         |
+ROW   |684      |32937 |Application |VMware                                                         |
+ROW   |685      |32938 |Application |VMware                                                         |
+ROW   |686      |32939 |Application |VMware                                                         |
+ROW   |687      |32940 |Application |VMware                                                         |
+ROW   |688      |32941 |Application |VMware                                                         |
+ROW   |689      |32942 |Application |VMware                                                         |
+ROW   |690      |32943 |Application |VMware                                                         |
+ROW   |691      |32944 |Application |VMware                                                         |
+ROW   |692      |32945 |Application |VMware                                                         |
+ROW   |693      |32946 |Application |VMware                                                         |
+ROW   |694      |33638 |Application |VMware                                                         |
+ROW   |695      |33639 |Application |VMware                                                         |
+ROW   |696      |33640 |Application |VMware                                                         |
+ROW   |697      |33641 |Application |VMware                                                         |
+ROW   |698      |33642 |Application |VMware                                                         |
+ROW   |699      |33643 |Application |VMware                                                         |
+ROW   |700      |33644 |Application |VMware                                                         |
+ROW   |701      |33645 |Application |VMware                                                         |
+ROW   |702      |33650 |Application |VMware                                                         |
+ROW   |703      |33651 |Application |VMware                                                         |
+ROW   |704      |33652 |Application |VMware                                                         |
+ROW   |705      |33653 |Application |VMware                                                         |
+ROW   |706      |33654 |Application |VMware                                                         |
+ROW   |707      |32909 |Application |VMware                                                         |
+ROW   |708      |32910 |Application |VMware                                                         |
+ROW   |709      |32911 |Application |VMware                                                         |
+ROW   |710      |32912 |Application |VMware                                                         |
+ROW   |711      |32913 |Application |VMware                                                         |
+ROW   |712      |32914 |Application |VMware                                                         |
+ROW   |713      |32915 |Application |VMware                                                         |
+ROW   |714      |32916 |Application |VMware                                                         |
+ROW   |715      |32917 |Application |VMware                                                         |
+ROW   |716      |32918 |Application |VMware                                                         |
+ROW   |717      |32919 |Application |VMware                                                         |
+ROW   |718      |32920 |Application |VMware                                                         |
+ROW   |719      |32921 |Application |VMware                                                         |
+ROW   |720      |32922 |Application |VMware                                                         |
+ROW   |721      |32923 |Application |VMware                                                         |
+ROW   |722      |32924 |Application |VMware                                                         |
+ROW   |723      |32925 |Application |VMware                                                         |
+ROW   |724      |32926 |Application |VMware                                                         |
+ROW   |725      |32927 |Application |VMware                                                         |
+ROW   |726      |32928 |Application |VMware                                                         |
+ROW   |727      |32929 |Application |VMware                                                         |
+ROW   |728      |32930 |Application |VMware                                                         |
+ROW   |729      |32947 |Application |VMware                                                         |
+ROW   |730      |32948 |Application |VMware                                                         |
+ROW   |731      |32949 |Application |VMware                                                         |
+ROW   |732      |32950 |Application |VMware                                                         |
+ROW   |733      |33646 |Application |VMware                                                         |
+ROW   |734      |33647 |Application |VMware                                                         |
+ROW   |735      |33648 |Application |VMware                                                         |
+ROW   |736      |33649 |Application |VMware                                                         |
+ROW   |737      |33655 |Application |VMware                                                         |
+ROW   |738      |30143 |Application |CPU                                                            |
+ROW   |739      |30163 |Application |Memory                                                         |
+ROW   |740      |30164 |Application |Memory                                                         |
+ROW   |741      |30165 |Application |Memory                                                         |
+ROW   |742      |27065 |Application |Status                                                         |
+ROW   |743      |27066 |Application |Status                                                         |
+ROW   |744      |27067 |Application |Status                                                         |
+ROW   |745      |27152 |Application |General                                                        |
+ROW   |746      |27157 |Application |General                                                        |
+ROW   |747      |29845 |Application |General                                                        |
+ROW   |748      |29846 |Application |General                                                        |
+ROW   |749      |29847 |Application |General                                                        |
+ROW   |750      |29848 |Application |General                                                        |
+ROW   |751      |27149 |Application |Status                                                         |
+ROW   |752      |27150 |Application |Status                                                         |
+ROW   |753      |27151 |Application |Status                                                         |
+ROW   |754      |27154 |Application |Status                                                         |
+ROW   |755      |29844 |Application |Status                                                         |
+ROW   |756      |27208 |Application |CPU                                                            |
+ROW   |757      |27213 |Application |Fans                                                           |
+ROW   |758      |27195 |Application |General                                                        |
+ROW   |759      |27199 |Application |General                                                        |
+ROW   |760      |29850 |Application |General                                                        |
+ROW   |761      |29851 |Application |General                                                        |
+ROW   |762      |29852 |Application |General                                                        |
+ROW   |763      |29853 |Application |General                                                        |
+ROW   |764      |27203 |Application |Inventory                                                      |
+ROW   |765      |27214 |Application |Inventory                                                      |
+ROW   |766      |30086 |Application |Inventory                                                      |
+ROW   |767      |27207 |Application |Memory                                                         |
+ROW   |768      |30087 |Application |Memory                                                         |
+ROW   |769      |30088 |Application |Memory                                                         |
+ROW   |770      |30089 |Application |Memory                                                         |
+ROW   |771      |30091 |Application |Power supply                                                   |
+ROW   |772      |30092 |Application |Power supply                                                   |
+ROW   |773      |27192 |Application |Status                                                         |
+ROW   |774      |27193 |Application |Status                                                         |
+ROW   |775      |27194 |Application |Status                                                         |
+ROW   |776      |27202 |Application |Status                                                         |
+ROW   |777      |29849 |Application |Status                                                         |
+ROW   |778      |27212 |Application |Temperature                                                    |
+ROW   |779      |27240 |Application |CPU                                                            |
+ROW   |780      |27249 |Application |Fans                                                           |
+ROW   |781      |27250 |Application |Fans                                                           |
+ROW   |782      |27228 |Application |General                                                        |
+ROW   |783      |27232 |Application |General                                                        |
+ROW   |784      |29855 |Application |General                                                        |
+ROW   |785      |29856 |Application |General                                                        |
+ROW   |786      |29857 |Application |General                                                        |
+ROW   |787      |29858 |Application |General                                                        |
+ROW   |788      |27236 |Application |Inventory                                                      |
+ROW   |789      |27237 |Application |Inventory                                                      |
+ROW   |790      |30093 |Application |Memory                                                         |
+ROW   |791      |27248 |Application |Power supply                                                   |
+ROW   |792      |27225 |Application |Status                                                         |
+ROW   |793      |27226 |Application |Status                                                         |
+ROW   |794      |27227 |Application |Status                                                         |
+ROW   |795      |27235 |Application |Status                                                         |
+ROW   |796      |27238 |Application |Status                                                         |
+ROW   |797      |29854 |Application |Status                                                         |
+ROW   |798      |27246 |Application |Temperature                                                    |
+ROW   |799      |27247 |Application |Temperature                                                    |
+ROW   |800      |27294 |Application |CPU                                                            |
+ROW   |801      |30094 |Application |Memory                                                         |
+ROW   |802      |27299 |Application |CPU                                                            |
+ROW   |803      |27313 |Application |Fans                                                           |
+ROW   |804      |27264 |Application |General                                                        |
+ROW   |805      |27268 |Application |General                                                        |
+ROW   |806      |29860 |Application |General                                                        |
+ROW   |807      |29861 |Application |General                                                        |
+ROW   |808      |29862 |Application |General                                                        |
+ROW   |809      |29863 |Application |General                                                        |
+ROW   |810      |27295 |Application |Inventory                                                      |
+ROW   |811      |27296 |Application |Inventory                                                      |
+ROW   |812      |30095 |Application |Memory                                                         |
+ROW   |813      |27312 |Application |Power supply                                                   |
+ROW   |814      |27261 |Application |Status                                                         |
+ROW   |815      |27262 |Application |Status                                                         |
+ROW   |816      |27263 |Application |Status                                                         |
+ROW   |817      |27271 |Application |Status                                                         |
+ROW   |818      |29859 |Application |Status                                                         |
+ROW   |819      |27314 |Application |Temperature                                                    |
+ROW   |820      |27315 |Application |Temperature                                                    |
+ROW   |821      |27301 |Application |CPU                                                            |
+ROW   |822      |27317 |Application |Fans                                                           |
+ROW   |823      |27285 |Application |General                                                        |
+ROW   |824      |27289 |Application |General                                                        |
+ROW   |825      |29865 |Application |General                                                        |
+ROW   |826      |29866 |Application |General                                                        |
+ROW   |827      |29867 |Application |General                                                        |
+ROW   |828      |29868 |Application |General                                                        |
+ROW   |829      |27297 |Application |Inventory                                                      |
+ROW   |830      |27319 |Application |Inventory                                                      |
+ROW   |831      |27320 |Application |Inventory                                                      |
+ROW   |832      |30096 |Application |Memory                                                         |
+ROW   |833      |27316 |Application |Power supply                                                   |
+ROW   |834      |27282 |Application |Status                                                         |
+ROW   |835      |27283 |Application |Status                                                         |
+ROW   |836      |27284 |Application |Status                                                         |
+ROW   |837      |27292 |Application |Status                                                         |
+ROW   |838      |29864 |Application |Status                                                         |
+ROW   |839      |27318 |Application |Temperature                                                    |
+ROW   |840      |27415 |Application |Memory                                                         |
+ROW   |841      |27416 |Application |Memory                                                         |
+ROW   |842      |30101 |Application |Memory                                                         |
+ROW   |843      |27417 |Application |CPU                                                            |
+ROW   |844      |27376 |Application |CPU                                                            |
+ROW   |845      |27378 |Application |Inventory                                                      |
+ROW   |846      |27379 |Application |Inventory                                                      |
+ROW   |847      |27419 |Application |Inventory                                                      |
+ROW   |848      |30097 |Application |Inventory                                                      |
+ROW   |849      |27423 |Application |Fans                                                           |
+ROW   |850      |27422 |Application |Power supply                                                   |
+ROW   |851      |27420 |Application |Temperature                                                    |
+ROW   |852      |27421 |Application |Temperature                                                    |
+ROW   |853      |27427 |Application |CPU                                                            |
+ROW   |854      |27432 |Application |Fans                                                           |
+ROW   |855      |27336 |Application |General                                                        |
+ROW   |856      |27340 |Application |General                                                        |
+ROW   |857      |29870 |Application |General                                                        |
+ROW   |858      |29871 |Application |General                                                        |
+ROW   |859      |29872 |Application |General                                                        |
+ROW   |860      |29873 |Application |General                                                        |
+ROW   |861      |27385 |Application |Inventory                                                      |
+ROW   |862      |27386 |Application |Inventory                                                      |
+ROW   |863      |27428 |Application |Inventory                                                      |
+ROW   |864      |30098 |Application |Inventory                                                      |
+ROW   |865      |27425 |Application |Memory                                                         |
+ROW   |866      |27426 |Application |Memory                                                         |
+ROW   |867      |30102 |Application |Memory                                                         |
+ROW   |868      |27431 |Application |Power supply                                                   |
+ROW   |869      |27333 |Application |Status                                                         |
+ROW   |870      |27334 |Application |Status                                                         |
+ROW   |871      |27335 |Application |Status                                                         |
+ROW   |872      |27343 |Application |Status                                                         |
+ROW   |873      |29869 |Application |Status                                                         |
+ROW   |874      |27429 |Application |Temperature                                                    |
+ROW   |875      |27430 |Application |Temperature                                                    |
+ROW   |876      |27380 |Application |CPU                                                            |
+ROW   |877      |27449 |Application |Fans                                                           |
+ROW   |878      |27368 |Application |General                                                        |
+ROW   |879      |27372 |Application |General                                                        |
+ROW   |880      |29875 |Application |General                                                        |
+ROW   |881      |29876 |Application |General                                                        |
+ROW   |882      |29877 |Application |General                                                        |
+ROW   |883      |29878 |Application |General                                                        |
+ROW   |884      |27382 |Application |Inventory                                                      |
+ROW   |885      |27383 |Application |Inventory                                                      |
+ROW   |886      |27445 |Application |Inventory                                                      |
+ROW   |887      |30099 |Application |Inventory                                                      |
+ROW   |888      |27443 |Application |Memory                                                         |
+ROW   |889      |27444 |Application |Memory                                                         |
+ROW   |890      |30103 |Application |Memory                                                         |
+ROW   |891      |27448 |Application |Power supply                                                   |
+ROW   |892      |27365 |Application |Status                                                         |
+ROW   |893      |27366 |Application |Status                                                         |
+ROW   |894      |27367 |Application |Status                                                         |
+ROW   |895      |27375 |Application |Status                                                         |
+ROW   |896      |29874 |Application |Status                                                         |
+ROW   |897      |27446 |Application |Temperature                                                    |
+ROW   |898      |27447 |Application |Temperature                                                    |
+ROW   |899      |27478 |Application |CPU                                                            |
+ROW   |900      |27480 |Application |Fans                                                           |
+ROW   |901      |27465 |Application |General                                                        |
+ROW   |902      |27469 |Application |General                                                        |
+ROW   |903      |29880 |Application |General                                                        |
+ROW   |904      |29881 |Application |General                                                        |
+ROW   |905      |29882 |Application |General                                                        |
+ROW   |906      |29883 |Application |General                                                        |
+ROW   |907      |27481 |Application |Inventory                                                      |
+ROW   |908      |27482 |Application |Inventory                                                      |
+ROW   |909      |27483 |Application |Inventory                                                      |
+ROW   |910      |27484 |Application |Inventory                                                      |
+ROW   |911      |30105 |Application |Memory                                                         |
+ROW   |912      |27479 |Application |Power supply                                                   |
+ROW   |913      |27462 |Application |Status                                                         |
+ROW   |914      |27463 |Application |Status                                                         |
+ROW   |915      |27464 |Application |Status                                                         |
+ROW   |916      |27472 |Application |Status                                                         |
+ROW   |917      |29879 |Application |Status                                                         |
+ROW   |918      |27485 |Application |Temperature                                                    |
+ROW   |919      |27511 |Application |CPU                                                            |
+ROW   |920      |27519 |Application |Fans                                                           |
+ROW   |921      |27499 |Application |General                                                        |
+ROW   |922      |27503 |Application |General                                                        |
+ROW   |923      |29885 |Application |General                                                        |
+ROW   |924      |29886 |Application |General                                                        |
+ROW   |925      |29887 |Application |General                                                        |
+ROW   |926      |29888 |Application |General                                                        |
+ROW   |927      |27508 |Application |Inventory                                                      |
+ROW   |928      |27509 |Application |Inventory                                                      |
+ROW   |929      |27510 |Application |Inventory                                                      |
+ROW   |930      |30106 |Application |Inventory                                                      |
+ROW   |931      |30107 |Application |Memory                                                         |
+ROW   |932      |27518 |Application |Power supply                                                   |
+ROW   |933      |27496 |Application |Status                                                         |
+ROW   |934      |27497 |Application |Status                                                         |
+ROW   |935      |27498 |Application |Status                                                         |
+ROW   |936      |27506 |Application |Status                                                         |
+ROW   |937      |29884 |Application |Status                                                         |
+ROW   |938      |27517 |Application |Temperature                                                    |
+ROW   |939      |27547 |Application |CPU                                                            |
+ROW   |940      |27555 |Application |Fans                                                           |
+ROW   |941      |27535 |Application |General                                                        |
+ROW   |942      |27539 |Application |General                                                        |
+ROW   |943      |29890 |Application |General                                                        |
+ROW   |944      |29891 |Application |General                                                        |
+ROW   |945      |29892 |Application |General                                                        |
+ROW   |946      |29893 |Application |General                                                        |
+ROW   |947      |27543 |Application |Inventory                                                      |
+ROW   |948      |27544 |Application |Inventory                                                      |
+ROW   |949      |27545 |Application |Inventory                                                      |
+ROW   |950      |27546 |Application |Inventory                                                      |
+ROW   |951      |30108 |Application |Memory                                                         |
+ROW   |952      |27554 |Application |Power supply                                                   |
+ROW   |953      |27532 |Application |Status                                                         |
+ROW   |954      |27533 |Application |Status                                                         |
+ROW   |955      |27534 |Application |Status                                                         |
+ROW   |956      |27542 |Application |Status                                                         |
+ROW   |957      |29889 |Application |Status                                                         |
+ROW   |958      |27553 |Application |Temperature                                                    |
+ROW   |959      |27586 |Application |CPU                                                            |
+ROW   |960      |27594 |Application |Fans                                                           |
+ROW   |961      |27595 |Application |Fans                                                           |
+ROW   |962      |27571 |Application |General                                                        |
+ROW   |963      |27575 |Application |General                                                        |
+ROW   |964      |29895 |Application |General                                                        |
+ROW   |965      |29896 |Application |General                                                        |
+ROW   |966      |29897 |Application |General                                                        |
+ROW   |967      |29898 |Application |General                                                        |
+ROW   |968      |27579 |Application |Inventory                                                      |
+ROW   |969      |27580 |Application |Inventory                                                      |
+ROW   |970      |27582 |Application |Inventory                                                      |
+ROW   |971      |27583 |Application |Inventory                                                      |
+ROW   |972      |30109 |Application |Inventory                                                      |
+ROW   |973      |27591 |Application |Memory                                                         |
+ROW   |974      |30110 |Application |Memory                                                         |
+ROW   |975      |30111 |Application |Memory                                                         |
+ROW   |976      |27593 |Application |Power supply                                                   |
+ROW   |977      |27568 |Application |Status                                                         |
+ROW   |978      |27569 |Application |Status                                                         |
+ROW   |979      |27570 |Application |Status                                                         |
+ROW   |980      |27578 |Application |Status                                                         |
+ROW   |981      |29894 |Application |Status                                                         |
+ROW   |982      |27584 |Application |Temperature                                                    |
+ROW   |983      |27585 |Application |Temperature                                                    |
+ROW   |984      |27634 |Application |General                                                        |
+ROW   |985      |27638 |Application |General                                                        |
+ROW   |986      |29900 |Application |General                                                        |
+ROW   |987      |29901 |Application |General                                                        |
+ROW   |988      |29902 |Application |General                                                        |
+ROW   |989      |29903 |Application |General                                                        |
+ROW   |990      |27631 |Application |Status                                                         |
+ROW   |991      |27632 |Application |Status                                                         |
+ROW   |992      |27633 |Application |Status                                                         |
+ROW   |993      |27641 |Application |Status                                                         |
+ROW   |994      |29899 |Application |Status                                                         |
+ROW   |995      |27671 |Application |CPU                                                            |
+ROW   |996      |27673 |Application |Fans                                                           |
+ROW   |997      |27657 |Application |General                                                        |
+ROW   |998      |27661 |Application |General                                                        |
+ROW   |999      |29905 |Application |General                                                        |
+ROW   |1000     |29906 |Application |General                                                        |
+ROW   |1001     |29907 |Application |General                                                        |
+ROW   |1002     |29908 |Application |General                                                        |
+ROW   |1003     |27675 |Application |Inventory                                                      |
+ROW   |1004     |27676 |Application |Inventory                                                      |
+ROW   |1005     |27677 |Application |Inventory                                                      |
+ROW   |1006     |27678 |Application |Inventory                                                      |
+ROW   |1007     |27679 |Application |Inventory                                                      |
+ROW   |1008     |30112 |Application |Memory                                                         |
+ROW   |1009     |27674 |Application |Power supply                                                   |
+ROW   |1010     |27654 |Application |Status                                                         |
+ROW   |1011     |27655 |Application |Status                                                         |
+ROW   |1012     |27656 |Application |Status                                                         |
+ROW   |1013     |27664 |Application |Status                                                         |
+ROW   |1014     |29904 |Application |Status                                                         |
+ROW   |1015     |27672 |Application |Temperature                                                    |
+ROW   |1016     |27753 |Application |CPU                                                            |
+ROW   |1017     |27755 |Application |Fans                                                           |
+ROW   |1018     |27737 |Application |General                                                        |
+ROW   |1019     |27741 |Application |General                                                        |
+ROW   |1020     |29910 |Application |General                                                        |
+ROW   |1021     |29911 |Application |General                                                        |
+ROW   |1022     |29912 |Application |General                                                        |
+ROW   |1023     |29913 |Application |General                                                        |
+ROW   |1024     |27748 |Application |Inventory                                                      |
+ROW   |1025     |27749 |Application |Inventory                                                      |
+ROW   |1026     |27750 |Application |Inventory                                                      |
+ROW   |1027     |27754 |Application |Inventory                                                      |
+ROW   |1028     |30116 |Application |Memory                                                         |
+ROW   |1029     |27734 |Application |Status                                                         |
+ROW   |1030     |27735 |Application |Status                                                         |
+ROW   |1031     |27736 |Application |Status                                                         |
+ROW   |1032     |27744 |Application |Status                                                         |
+ROW   |1033     |29909 |Application |Status                                                         |
+ROW   |1034     |27751 |Application |Temperature                                                    |
+ROW   |1035     |27787 |Application |Fans                                                           |
+ROW   |1036     |27769 |Application |General                                                        |
+ROW   |1037     |27773 |Application |General                                                        |
+ROW   |1038     |29915 |Application |General                                                        |
+ROW   |1039     |29916 |Application |General                                                        |
+ROW   |1040     |29917 |Application |General                                                        |
+ROW   |1041     |29918 |Application |General                                                        |
+ROW   |1042     |27777 |Application |Inventory                                                      |
+ROW   |1043     |27778 |Application |Inventory                                                      |
+ROW   |1044     |27785 |Application |Inventory                                                      |
+ROW   |1045     |27786 |Application |Power supply                                                   |
+ROW   |1046     |27766 |Application |Status                                                         |
+ROW   |1047     |27767 |Application |Status                                                         |
+ROW   |1048     |27768 |Application |Status                                                         |
+ROW   |1049     |27776 |Application |Status                                                         |
+ROW   |1050     |29914 |Application |Status                                                         |
+ROW   |1051     |27783 |Application |Temperature                                                    |
+ROW   |1052     |27784 |Application |Temperature                                                    |
+ROW   |1053     |28894 |Application |CPU                                                            |
+ROW   |1054     |27822 |Application |Fans                                                           |
+ROW   |1055     |27803 |Application |General                                                        |
+ROW   |1056     |27807 |Application |General                                                        |
+ROW   |1057     |29920 |Application |General                                                        |
+ROW   |1058     |29921 |Application |General                                                        |
+ROW   |1059     |29922 |Application |General                                                        |
+ROW   |1060     |29923 |Application |General                                                        |
+ROW   |1061     |27812 |Application |Inventory                                                      |
+ROW   |1062     |27813 |Application |Inventory                                                      |
+ROW   |1063     |30117 |Application |Inventory                                                      |
+ROW   |1064     |30118 |Application |Memory                                                         |
+ROW   |1065     |27823 |Application |Power supply                                                   |
+ROW   |1066     |27800 |Application |Status                                                         |
+ROW   |1067     |27801 |Application |Status                                                         |
+ROW   |1068     |27802 |Application |Status                                                         |
+ROW   |1069     |27810 |Application |Status                                                         |
+ROW   |1070     |27814 |Application |Status                                                         |
+ROW   |1071     |29919 |Application |Status                                                         |
+ROW   |1072     |27821 |Application |Temperature                                                    |
+ROW   |1073     |27904 |Application |CPU                                                            |
+ROW   |1074     |27885 |Application |General                                                        |
+ROW   |1075     |27889 |Application |General                                                        |
+ROW   |1076     |29925 |Application |General                                                        |
+ROW   |1077     |29926 |Application |General                                                        |
+ROW   |1078     |29927 |Application |General                                                        |
+ROW   |1079     |29928 |Application |General                                                        |
+ROW   |1080     |27893 |Application |Inventory                                                      |
+ROW   |1081     |27894 |Application |Inventory                                                      |
+ROW   |1082     |27895 |Application |Inventory                                                      |
+ROW   |1083     |30119 |Application |Inventory                                                      |
+ROW   |1084     |27898 |Application |Memory                                                         |
+ROW   |1085     |27900 |Application |Memory                                                         |
+ROW   |1086     |30120 |Application |Memory                                                         |
+ROW   |1087     |27882 |Application |Status                                                         |
+ROW   |1088     |27883 |Application |Status                                                         |
+ROW   |1089     |27884 |Application |Status                                                         |
+ROW   |1090     |27892 |Application |Status                                                         |
+ROW   |1091     |29924 |Application |Status                                                         |
+ROW   |1092     |27906 |Application |Storage                                                        |
+ROW   |1093     |27907 |Application |Storage                                                        |
+ROW   |1094     |27908 |Application |Storage                                                        |
+ROW   |1095     |27905 |Application |Temperature                                                    |
+ROW   |1096     |31560 |Application |Temperature                                                    |
+ROW   |1097     |27936 |Application |CPU                                                            |
+ROW   |1098     |27942 |Application |Fans                                                           |
+ROW   |1099     |27922 |Application |General                                                        |
+ROW   |1100     |27926 |Application |General                                                        |
+ROW   |1101     |29930 |Application |General                                                        |
+ROW   |1102     |29931 |Application |General                                                        |
+ROW   |1103     |29932 |Application |General                                                        |
+ROW   |1104     |29933 |Application |General                                                        |
+ROW   |1105     |27930 |Application |Inventory                                                      |
+ROW   |1106     |27931 |Application |Inventory                                                      |
+ROW   |1107     |30121 |Application |Inventory                                                      |
+ROW   |1108     |27935 |Application |Memory                                                         |
+ROW   |1109     |30122 |Application |Memory                                                         |
+ROW   |1110     |30123 |Application |Memory                                                         |
+ROW   |1111     |27943 |Application |Power supply                                                   |
+ROW   |1112     |27919 |Application |Status                                                         |
+ROW   |1113     |27920 |Application |Status                                                         |
+ROW   |1114     |27921 |Application |Status                                                         |
+ROW   |1115     |27929 |Application |Status                                                         |
+ROW   |1116     |29929 |Application |Status                                                         |
+ROW   |1117     |27940 |Application |Temperature                                                    |
+ROW   |1118     |27941 |Application |Temperature                                                    |
+ROW   |1119     |27975 |Application |CPU                                                            |
+ROW   |1120     |30129 |Application |Fans                                                           |
+ROW   |1121     |27959 |Application |General                                                        |
+ROW   |1122     |27963 |Application |General                                                        |
+ROW   |1123     |29935 |Application |General                                                        |
+ROW   |1124     |29936 |Application |General                                                        |
+ROW   |1125     |29937 |Application |General                                                        |
+ROW   |1126     |29938 |Application |General                                                        |
+ROW   |1127     |27967 |Application |Inventory                                                      |
+ROW   |1128     |27968 |Application |Inventory                                                      |
+ROW   |1129     |27970 |Application |Inventory                                                      |
+ROW   |1130     |27971 |Application |Inventory                                                      |
+ROW   |1131     |30125 |Application |Inventory                                                      |
+ROW   |1132     |27972 |Application |Memory                                                         |
+ROW   |1133     |27973 |Application |Memory                                                         |
+ROW   |1134     |30126 |Application |Memory                                                         |
+ROW   |1135     |30130 |Application |Power supply                                                   |
+ROW   |1136     |27956 |Application |Status                                                         |
+ROW   |1137     |27957 |Application |Status                                                         |
+ROW   |1138     |27958 |Application |Status                                                         |
+ROW   |1139     |27966 |Application |Status                                                         |
+ROW   |1140     |29934 |Application |Status                                                         |
+ROW   |1141     |30124 |Application |Temperature                                                    |
+ROW   |1142     |28003 |Application |CPU                                                            |
+ROW   |1143     |27989 |Application |General                                                        |
+ROW   |1144     |27993 |Application |General                                                        |
+ROW   |1145     |29940 |Application |General                                                        |
+ROW   |1146     |29941 |Application |General                                                        |
+ROW   |1147     |29942 |Application |General                                                        |
+ROW   |1148     |29943 |Application |General                                                        |
+ROW   |1149     |27997 |Application |Inventory                                                      |
+ROW   |1150     |27998 |Application |Inventory                                                      |
+ROW   |1151     |27999 |Application |Inventory                                                      |
+ROW   |1152     |28000 |Application |Inventory                                                      |
+ROW   |1153     |30131 |Application |Memory                                                         |
+ROW   |1154     |27986 |Application |Status                                                         |
+ROW   |1155     |27987 |Application |Status                                                         |
+ROW   |1156     |27988 |Application |Status                                                         |
+ROW   |1157     |27996 |Application |Status                                                         |
+ROW   |1158     |29939 |Application |Status                                                         |
+ROW   |1159     |28031 |Application |CPU                                                            |
+ROW   |1160     |28018 |Application |General                                                        |
+ROW   |1161     |28022 |Application |General                                                        |
+ROW   |1162     |29835 |Application |General                                                        |
+ROW   |1163     |29836 |Application |General                                                        |
+ROW   |1164     |29837 |Application |General                                                        |
+ROW   |1165     |29838 |Application |General                                                        |
+ROW   |1166     |28026 |Application |Inventory                                                      |
+ROW   |1167     |28027 |Application |Inventory                                                      |
+ROW   |1168     |30132 |Application |Memory                                                         |
+ROW   |1169     |30133 |Application |Memory                                                         |
+ROW   |1170     |30134 |Application |Memory                                                         |
+ROW   |1171     |30135 |Application |Memory                                                         |
+ROW   |1172     |30136 |Application |Memory                                                         |
+ROW   |1173     |28015 |Application |Status                                                         |
+ROW   |1174     |28016 |Application |Status                                                         |
+ROW   |1175     |28017 |Application |Status                                                         |
+ROW   |1176     |28025 |Application |Status                                                         |
+ROW   |1177     |29834 |Application |Status                                                         |
+ROW   |1178     |29002 |Application |CPU                                                            |
+ROW   |1179     |29003 |Application |CPU                                                            |
+ROW   |1180     |29004 |Application |CPU                                                            |
+ROW   |1181     |29005 |Application |CPU                                                            |
+ROW   |1182     |29006 |Application |CPU                                                            |
+ROW   |1183     |29007 |Application |CPU                                                            |
+ROW   |1184     |29034 |Application |CPU                                                            |
+ROW   |1185     |29035 |Application |CPU                                                            |
+ROW   |1186     |29036 |Application |CPU                                                            |
+ROW   |1187     |29037 |Application |CPU                                                            |
+ROW   |1188     |29038 |Application |CPU                                                            |
+ROW   |1189     |29039 |Application |CPU                                                            |
+ROW   |1190     |29040 |Application |CPU                                                            |
+ROW   |1191     |29041 |Application |CPU                                                            |
+ROW   |1192     |29042 |Application |CPU                                                            |
+ROW   |1193     |29043 |Application |CPU                                                            |
+ROW   |1194     |29049 |Application |CPU                                                            |
+ROW   |1195     |28960 |Application |General                                                        |
+ROW   |1196     |28964 |Application |General                                                        |
+ROW   |1197     |29985 |Application |General                                                        |
+ROW   |1198     |29986 |Application |General                                                        |
+ROW   |1199     |29987 |Application |General                                                        |
+ROW   |1200     |29988 |Application |General                                                        |
+ROW   |1201     |28993 |Application |Memory                                                         |
+ROW   |1202     |28994 |Application |Memory                                                         |
+ROW   |1203     |28995 |Application |Memory                                                         |
+ROW   |1204     |28996 |Application |Memory                                                         |
+ROW   |1205     |28997 |Application |Memory                                                         |
+ROW   |1206     |28998 |Application |Memory                                                         |
+ROW   |1207     |28999 |Application |Memory                                                         |
+ROW   |1208     |29000 |Application |Memory                                                         |
+ROW   |1209     |29001 |Application |Memory                                                         |
+ROW   |1210     |28957 |Application |Status                                                         |
+ROW   |1211     |28958 |Application |Status                                                         |
+ROW   |1212     |28959 |Application |Status                                                         |
+ROW   |1213     |28967 |Application |Status                                                         |
+ROW   |1214     |29984 |Application |Status                                                         |
+ROW   |1215     |30145 |Application |CPU                                                            |
+ROW   |1216     |29053 |Application |General                                                        |
+ROW   |1217     |29057 |Application |General                                                        |
+ROW   |1218     |29990 |Application |General                                                        |
+ROW   |1219     |29991 |Application |General                                                        |
+ROW   |1220     |29992 |Application |General                                                        |
+ROW   |1221     |29993 |Application |General                                                        |
+ROW   |1222     |30175 |Application |Memory                                                         |
+ROW   |1223     |30176 |Application |Memory                                                         |
+ROW   |1224     |30177 |Application |Memory                                                         |
+ROW   |1225     |29050 |Application |Status                                                         |
+ROW   |1226     |29051 |Application |Status                                                         |
+ROW   |1227     |29052 |Application |Status                                                         |
+ROW   |1228     |29060 |Application |Status                                                         |
+ROW   |1229     |29989 |Application |Status                                                         |
+ROW   |1230     |28143 |Application |CPU                                                            |
+ROW   |1231     |28154 |Application |Fans                                                           |
+ROW   |1232     |28133 |Application |General                                                        |
+ROW   |1233     |28137 |Application |General                                                        |
+ROW   |1234     |29945 |Application |General                                                        |
+ROW   |1235     |29946 |Application |General                                                        |
+ROW   |1236     |29947 |Application |General                                                        |
+ROW   |1237     |29948 |Application |General                                                        |
+ROW   |1238     |28141 |Application |Inventory                                                      |
+ROW   |1239     |28142 |Application |Inventory                                                      |
+ROW   |1240     |28157 |Application |Inventory                                                      |
+ROW   |1241     |28158 |Application |Inventory                                                      |
+ROW   |1242     |28153 |Application |Memory                                                         |
+ROW   |1243     |30113 |Application |Memory                                                         |
+ROW   |1244     |30114 |Application |Memory                                                         |
+ROW   |1245     |30115 |Application |Memory                                                         |
+ROW   |1246     |28155 |Application |Power supply                                                   |
+ROW   |1247     |28130 |Application |Status                                                         |
+ROW   |1248     |28131 |Application |Status                                                         |
+ROW   |1249     |28132 |Application |Status                                                         |
+ROW   |1250     |28140 |Application |Status                                                         |
+ROW   |1251     |29944 |Application |Status                                                         |
+ROW   |1252     |28150 |Application |Temperature                                                    |
+ROW   |1253     |28156 |Application |Temperature                                                    |
+ROW   |1254     |34154 |Application |CPU                                                            |
+ROW   |1255     |28202 |Application |Fans                                                           |
+ROW   |1256     |28203 |Application |Fans                                                           |
+ROW   |1257     |34152 |Application |General                                                        |
+ROW   |1258     |34153 |Application |General                                                        |
+ROW   |1259     |34155 |Application |General                                                        |
+ROW   |1260     |34156 |Application |General                                                        |
+ROW   |1261     |34157 |Application |General                                                        |
+ROW   |1262     |34158 |Application |General                                                        |
+ROW   |1263     |28204 |Application |Inventory                                                      |
+ROW   |1264     |28205 |Application |Inventory                                                      |
+ROW   |1265     |34176 |Application |Memory                                                         |
+ROW   |1266     |34177 |Application |Memory                                                         |
+ROW   |1267     |34178 |Application |Memory                                                         |
+ROW   |1268     |28206 |Application |Power supply                                                   |
+ROW   |1269     |34149 |Application |Status                                                         |
+ROW   |1270     |34150 |Application |Status                                                         |
+ROW   |1271     |34151 |Application |Status                                                         |
+ROW   |1272     |34159 |Application |Status                                                         |
+ROW   |1273     |34160 |Application |Status                                                         |
+ROW   |1274     |28200 |Application |Temperature                                                    |
+ROW   |1275     |28201 |Application |Temperature                                                    |
+ROW   |1276     |28246 |Application |CPU                                                            |
+ROW   |1277     |28247 |Application |CPU                                                            |
+ROW   |1278     |28215 |Application |Fans                                                           |
+ROW   |1279     |28236 |Application |General                                                        |
+ROW   |1280     |28240 |Application |General                                                        |
+ROW   |1281     |29955 |Application |General                                                        |
+ROW   |1282     |29956 |Application |General                                                        |
+ROW   |1283     |29957 |Application |General                                                        |
+ROW   |1284     |29958 |Application |General                                                        |
+ROW   |1285     |28208 |Application |Inventory                                                      |
+ROW   |1286     |28209 |Application |Inventory                                                      |
+ROW   |1287     |28210 |Application |Inventory                                                      |
+ROW   |1288     |30100 |Application |Inventory                                                      |
+ROW   |1289     |28220 |Application |Memory                                                         |
+ROW   |1290     |28222 |Application |Memory                                                         |
+ROW   |1291     |30104 |Application |Memory                                                         |
+ROW   |1292     |28216 |Application |Power supply                                                   |
+ROW   |1293     |28233 |Application |Status                                                         |
+ROW   |1294     |28234 |Application |Status                                                         |
+ROW   |1295     |28235 |Application |Status                                                         |
+ROW   |1296     |28243 |Application |Status                                                         |
+ROW   |1297     |29954 |Application |Status                                                         |
+ROW   |1298     |28217 |Application |Temperature                                                    |
+ROW   |1299     |28218 |Application |Temperature                                                    |
+ROW   |1300     |30146 |Application |CPU                                                            |
+ROW   |1301     |28325 |Application |Fans                                                           |
+ROW   |1302     |28326 |Application |Fans                                                           |
+ROW   |1303     |28285 |Application |General                                                        |
+ROW   |1304     |28289 |Application |General                                                        |
+ROW   |1305     |29960 |Application |General                                                        |
+ROW   |1306     |29961 |Application |General                                                        |
+ROW   |1307     |29962 |Application |General                                                        |
+ROW   |1308     |29963 |Application |General                                                        |
+ROW   |1309     |28327 |Application |Inventory                                                      |
+ROW   |1310     |28328 |Application |Inventory                                                      |
+ROW   |1311     |30181 |Application |Memory                                                         |
+ROW   |1312     |30182 |Application |Memory                                                         |
+ROW   |1313     |30183 |Application |Memory                                                         |
+ROW   |1314     |28329 |Application |Power supply                                                   |
+ROW   |1315     |28282 |Application |Status                                                         |
+ROW   |1316     |28283 |Application |Status                                                         |
+ROW   |1317     |28284 |Application |Status                                                         |
+ROW   |1318     |28292 |Application |Status                                                         |
+ROW   |1319     |29959 |Application |Status                                                         |
+ROW   |1320     |28323 |Application |Temperature                                                    |
+ROW   |1321     |28324 |Application |Temperature                                                    |
+ROW   |1322     |33183 |Application |Voltage                                                        |
+ROW   |1323     |33181 |Application |Zabbix raw items                                               |
+ROW   |1324     |28374 |Application |Disk arrays                                                    |
+ROW   |1325     |28375 |Application |Disk arrays                                                    |
+ROW   |1326     |28376 |Application |Disk arrays                                                    |
+ROW   |1327     |28359 |Application |Fans                                                           |
+ROW   |1328     |28360 |Application |Fans                                                           |
+ROW   |1329     |28333 |Application |General                                                        |
+ROW   |1330     |28337 |Application |General                                                        |
+ROW   |1331     |29965 |Application |General                                                        |
+ROW   |1332     |29966 |Application |General                                                        |
+ROW   |1333     |29967 |Application |General                                                        |
+ROW   |1334     |29968 |Application |General                                                        |
+ROW   |1335     |28342 |Application |Inventory                                                      |
+ROW   |1336     |28344 |Application |Inventory                                                      |
+ROW   |1337     |28345 |Application |Inventory                                                      |
+ROW   |1338     |30141 |Application |Inventory                                                      |
+ROW   |1339     |28361 |Application |Physical disks                                                 |
+ROW   |1340     |28362 |Application |Physical disks                                                 |
+ROW   |1341     |28363 |Application |Physical disks                                                 |
+ROW   |1342     |28364 |Application |Physical disks                                                 |
+ROW   |1343     |28365 |Application |Physical disks                                                 |
+ROW   |1344     |28366 |Application |Physical disks                                                 |
+ROW   |1345     |28367 |Application |Physical disks                                                 |
+ROW   |1346     |28358 |Application |Power supply                                                   |
+ROW   |1347     |28330 |Application |Status                                                         |
+ROW   |1348     |28331 |Application |Status                                                         |
+ROW   |1349     |28332 |Application |Status                                                         |
+ROW   |1350     |28340 |Application |Status                                                         |
+ROW   |1351     |28341 |Application |Status                                                         |
+ROW   |1352     |29964 |Application |Status                                                         |
+ROW   |1353     |28354 |Application |Temperature                                                    |
+ROW   |1354     |28355 |Application |Temperature                                                    |
+ROW   |1355     |28356 |Application |Temperature                                                    |
+ROW   |1356     |28357 |Application |Temperature                                                    |
+ROW   |1357     |28368 |Application |Virtual disks                                                  |
+ROW   |1358     |28369 |Application |Virtual disks                                                  |
+ROW   |1359     |28370 |Application |Virtual disks                                                  |
+ROW   |1360     |28371 |Application |Virtual disks                                                  |
+ROW   |1361     |28372 |Application |Virtual disks                                                  |
+ROW   |1362     |28373 |Application |Virtual disks                                                  |
+ROW   |1363     |28413 |Application |Disk arrays                                                    |
+ROW   |1364     |28414 |Application |Disk arrays                                                    |
+ROW   |1365     |28415 |Application |Disk arrays                                                    |
+ROW   |1366     |28416 |Application |Disk arrays                                                    |
+ROW   |1367     |28412 |Application |Fans                                                           |
+ROW   |1368     |28380 |Application |General                                                        |
+ROW   |1369     |28384 |Application |General                                                        |
+ROW   |1370     |29970 |Application |General                                                        |
+ROW   |1371     |29971 |Application |General                                                        |
+ROW   |1372     |29972 |Application |General                                                        |
+ROW   |1373     |29973 |Application |General                                                        |
+ROW   |1374     |28390 |Application |Inventory                                                      |
+ROW   |1375     |28391 |Application |Inventory                                                      |
+ROW   |1376     |28417 |Application |Physical disks                                                 |
+ROW   |1377     |28418 |Application |Physical disks                                                 |
+ROW   |1378     |28419 |Application |Physical disks                                                 |
+ROW   |1379     |28420 |Application |Physical disks                                                 |
+ROW   |1380     |28421 |Application |Physical disks                                                 |
+ROW   |1381     |28422 |Application |Physical disks                                                 |
+ROW   |1382     |28411 |Application |Power supply                                                   |
+ROW   |1383     |28377 |Application |Status                                                         |
+ROW   |1384     |28378 |Application |Status                                                         |
+ROW   |1385     |28379 |Application |Status                                                         |
+ROW   |1386     |28387 |Application |Status                                                         |
+ROW   |1387     |29969 |Application |Status                                                         |
+ROW   |1388     |29994 |Application |Status                                                         |
+ROW   |1389     |28388 |Application |Temperature                                                    |
+ROW   |1390     |28404 |Application |Temperature                                                    |
+ROW   |1391     |28405 |Application |Temperature                                                    |
+ROW   |1392     |28406 |Application |Temperature                                                    |
+ROW   |1393     |28407 |Application |Temperature                                                    |
+ROW   |1394     |28408 |Application |Temperature                                                    |
+ROW   |1395     |28409 |Application |Temperature                                                    |
+ROW   |1396     |33621 |Application |Temperature                                                    |
+ROW   |1397     |33622 |Application |Temperature                                                    |
+ROW   |1398     |33623 |Application |Temperature                                                    |
+ROW   |1399     |33624 |Application |Temperature                                                    |
+ROW   |1400     |33625 |Application |Temperature                                                    |
+ROW   |1401     |33626 |Application |Temperature                                                    |
+ROW   |1402     |33627 |Application |Temperature                                                    |
+ROW   |1403     |33628 |Application |Temperature                                                    |
+ROW   |1404     |33629 |Application |Temperature                                                    |
+ROW   |1405     |28423 |Application |Virtual disks                                                  |
+ROW   |1406     |28424 |Application |Virtual disks                                                  |
+ROW   |1407     |28425 |Application |Virtual disks                                                  |
+ROW   |1408     |28478 |Application |Fans                                                           |
+ROW   |1409     |28479 |Application |Fans                                                           |
+ROW   |1410     |28457 |Application |General                                                        |
+ROW   |1411     |28461 |Application |General                                                        |
+ROW   |1412     |29975 |Application |General                                                        |
+ROW   |1413     |29976 |Application |General                                                        |
+ROW   |1414     |29977 |Application |General                                                        |
+ROW   |1415     |29978 |Application |General                                                        |
+ROW   |1416     |28466 |Application |Inventory                                                      |
+ROW   |1417     |28467 |Application |Inventory                                                      |
+ROW   |1418     |28480 |Application |Physical disks                                                 |
+ROW   |1419     |28481 |Application |Physical disks                                                 |
+ROW   |1420     |28477 |Application |Power supply                                                   |
+ROW   |1421     |28454 |Application |Status                                                         |
+ROW   |1422     |28455 |Application |Status                                                         |
+ROW   |1423     |28456 |Application |Status                                                         |
+ROW   |1424     |28464 |Application |Status                                                         |
+ROW   |1425     |28465 |Application |Status                                                         |
+ROW   |1426     |29974 |Application |Status                                                         |
+ROW   |1427     |28474 |Application |Temperature                                                    |
+ROW   |1428     |28475 |Application |Temperature                                                    |
+ROW   |1429     |28476 |Application |Temperature                                                    |
+ROW   |1430     |28496 |Application |Fans                                                           |
+ROW   |1431     |28485 |Application |General                                                        |
+ROW   |1432     |28489 |Application |General                                                        |
+ROW   |1433     |29980 |Application |General                                                        |
+ROW   |1434     |29981 |Application |General                                                        |
+ROW   |1435     |29982 |Application |General                                                        |
+ROW   |1436     |29983 |Application |General                                                        |
+ROW   |1437     |28482 |Application |Status                                                         |
+ROW   |1438     |28483 |Application |Status                                                         |
+ROW   |1439     |28484 |Application |Status                                                         |
+ROW   |1440     |28492 |Application |Status                                                         |
+ROW   |1441     |29979 |Application |Status                                                         |
+ROW   |1442     |28495 |Application |Temperature                                                    |
+ROW   |1443     |28511 |Application |Tomcat                                                         |
+ROW   |1445     |28540 |Application |Zabbix server                                                  |
+ROW   |1446     |28541 |Application |Zabbix server                                                  |
+ROW   |1447     |28542 |Application |Zabbix server                                                  |
+ROW   |1448     |28543 |Application |Zabbix server                                                  |
+ROW   |1449     |28544 |Application |Zabbix server                                                  |
+ROW   |1450     |28545 |Application |Zabbix server                                                  |
+ROW   |1451     |28546 |Application |Zabbix server                                                  |
+ROW   |1452     |28547 |Application |Zabbix server                                                  |
+ROW   |1453     |28548 |Application |Zabbix server                                                  |
+ROW   |1454     |28549 |Application |Zabbix server                                                  |
+ROW   |1455     |28550 |Application |Zabbix server                                                  |
+ROW   |1456     |28551 |Application |Zabbix server                                                  |
+ROW   |1457     |28552 |Application |Zabbix server                                                  |
+ROW   |1458     |28553 |Application |Zabbix server                                                  |
+ROW   |1459     |28554 |Application |Zabbix server                                                  |
+ROW   |1460     |28555 |Application |Zabbix server                                                  |
+ROW   |1461     |28556 |Application |Zabbix server                                                  |
+ROW   |1462     |28557 |Application |Zabbix server                                                  |
+ROW   |1463     |28558 |Application |Zabbix server                                                  |
+ROW   |1464     |28559 |Application |Zabbix server                                                  |
+ROW   |1465     |28560 |Application |Zabbix server                                                  |
+ROW   |1466     |28561 |Application |Zabbix server                                                  |
+ROW   |1467     |28562 |Application |Zabbix server                                                  |
+ROW   |1468     |28563 |Application |Zabbix server                                                  |
+ROW   |1469     |28564 |Application |Zabbix server                                                  |
+ROW   |1470     |28565 |Application |Zabbix server                                                  |
+ROW   |1471     |28566 |Application |Zabbix server                                                  |
+ROW   |1472     |28567 |Application |Zabbix server                                                  |
+ROW   |1473     |28568 |Application |Zabbix server                                                  |
+ROW   |1474     |28569 |Application |Zabbix server                                                  |
+ROW   |1475     |28570 |Application |Zabbix server                                                  |
+ROW   |1476     |28571 |Application |Zabbix server                                                  |
+ROW   |1477     |28572 |Application |Zabbix server                                                  |
+ROW   |1478     |28573 |Application |Zabbix server                                                  |
+ROW   |1479     |28574 |Application |Zabbix server                                                  |
+ROW   |1480     |28575 |Application |Zabbix server                                                  |
+ROW   |1481     |28576 |Application |Zabbix server                                                  |
+ROW   |1482     |28577 |Application |Zabbix server                                                  |
+ROW   |1483     |28578 |Application |Zabbix server                                                  |
+ROW   |1484     |28579 |Application |Zabbix server                                                  |
+ROW   |1485     |28580 |Application |Zabbix server                                                  |
+ROW   |1486     |28581 |Application |Zabbix server                                                  |
+ROW   |1487     |28582 |Application |Zabbix server                                                  |
+ROW   |1488     |28583 |Application |Zabbix server                                                  |
+ROW   |1489     |28584 |Application |Zabbix server                                                  |
+ROW   |1490     |29821 |Application |Zabbix server                                                  |
+ROW   |1491     |31053 |Application |Zabbix server                                                  |
+ROW   |1492     |33014 |Application |Zabbix server                                                  |
+ROW   |1493     |33015 |Application |Zabbix server                                                  |
+ROW   |1494     |33016 |Application |Zabbix server                                                  |
+ROW   |1495     |33017 |Application |Zabbix server                                                  |
+ROW   |1496     |28585 |Application |Zabbix proxy                                                   |
+ROW   |1497     |28586 |Application |Zabbix proxy                                                   |
+ROW   |1498     |28587 |Application |Zabbix proxy                                                   |
+ROW   |1499     |28588 |Application |Zabbix proxy                                                   |
+ROW   |1500     |28589 |Application |Zabbix proxy                                                   |
+ROW   |1501     |28590 |Application |Zabbix proxy                                                   |
+ROW   |1502     |28591 |Application |Zabbix proxy                                                   |
+ROW   |1503     |28592 |Application |Zabbix proxy                                                   |
+ROW   |1504     |28593 |Application |Zabbix proxy                                                   |
+ROW   |1505     |28594 |Application |Zabbix proxy                                                   |
+ROW   |1506     |28595 |Application |Zabbix proxy                                                   |
+ROW   |1507     |28596 |Application |Zabbix proxy                                                   |
+ROW   |1508     |28597 |Application |Zabbix proxy                                                   |
+ROW   |1509     |28598 |Application |Zabbix proxy                                                   |
+ROW   |1510     |28599 |Application |Zabbix proxy                                                   |
+ROW   |1511     |28600 |Application |Zabbix proxy                                                   |
+ROW   |1512     |28601 |Application |Zabbix proxy                                                   |
+ROW   |1513     |28602 |Application |Zabbix proxy                                                   |
+ROW   |1514     |28603 |Application |Zabbix proxy                                                   |
+ROW   |1515     |28604 |Application |Zabbix proxy                                                   |
+ROW   |1516     |28605 |Application |Zabbix proxy                                                   |
+ROW   |1517     |28606 |Application |Zabbix proxy                                                   |
+ROW   |1518     |28607 |Application |Zabbix proxy                                                   |
+ROW   |1519     |28608 |Application |Zabbix proxy                                                   |
+ROW   |1520     |28609 |Application |Zabbix proxy                                                   |
+ROW   |1521     |28610 |Application |Zabbix proxy                                                   |
+ROW   |1522     |28611 |Application |Zabbix proxy                                                   |
+ROW   |1523     |28612 |Application |Zabbix proxy                                                   |
+ROW   |1524     |28613 |Application |Zabbix proxy                                                   |
+ROW   |1525     |28614 |Application |Zabbix proxy                                                   |
+ROW   |1526     |28615 |Application |Zabbix proxy                                                   |
+ROW   |1527     |28616 |Application |Zabbix proxy                                                   |
+ROW   |1528     |31052 |Application |Zabbix proxy                                                   |
+ROW   |1529     |33012 |Application |Zabbix proxy                                                   |
+ROW   |1530     |33013 |Application |Zabbix proxy                                                   |
+ROW   |1531     |28743 |Application |Apache                                                         |
+ROW   |1532     |28744 |Application |Apache                                                         |
+ROW   |1533     |28745 |Application |Apache                                                         |
+ROW   |1534     |28746 |Application |Apache                                                         |
+ROW   |1535     |28747 |Application |Apache                                                         |
+ROW   |1536     |28748 |Application |Apache                                                         |
+ROW   |1537     |30897 |Application |Apache                                                         |
+ROW   |1538     |30898 |Application |Apache                                                         |
+ROW   |1539     |30899 |Application |Apache                                                         |
+ROW   |1540     |30900 |Application |Apache                                                         |
+ROW   |1541     |30901 |Application |Apache                                                         |
+ROW   |1542     |30902 |Application |Apache                                                         |
+ROW   |1543     |30903 |Application |Apache                                                         |
+ROW   |1544     |30904 |Application |Apache                                                         |
+ROW   |1545     |30905 |Application |Apache                                                         |
+ROW   |1546     |30906 |Application |Apache                                                         |
+ROW   |1547     |30907 |Application |Apache                                                         |
+ROW   |1548     |30908 |Application |Apache                                                         |
+ROW   |1549     |30909 |Application |Apache                                                         |
+ROW   |1550     |30910 |Application |Apache                                                         |
+ROW   |1551     |30911 |Application |Apache                                                         |
+ROW   |1552     |30912 |Application |Apache                                                         |
+ROW   |1553     |30913 |Application |Apache                                                         |
+ROW   |1554     |30914 |Application |Apache                                                         |
+ROW   |1555     |30915 |Application |Apache                                                         |
+ROW   |1556     |30917 |Application |Apache                                                         |
+ROW   |1557     |30918 |Application |Apache                                                         |
+ROW   |1558     |30919 |Application |Apache                                                         |
+ROW   |1559     |30920 |Application |Apache                                                         |
+ROW   |1560     |30921 |Application |Apache                                                         |
+ROW   |1561     |30922 |Application |Apache                                                         |
+ROW   |1562     |30896 |Application |Zabbix raw items                                               |
+ROW   |1563     |28776 |Application |Apache                                                         |
+ROW   |1564     |28777 |Application |Apache                                                         |
+ROW   |1565     |28778 |Application |Apache                                                         |
+ROW   |1566     |28779 |Application |Apache                                                         |
+ROW   |1567     |28780 |Application |Apache                                                         |
+ROW   |1568     |28781 |Application |Apache                                                         |
+ROW   |1569     |28782 |Application |Apache                                                         |
+ROW   |1570     |28783 |Application |Apache                                                         |
+ROW   |1571     |28784 |Application |Apache                                                         |
+ROW   |1572     |28785 |Application |Apache                                                         |
+ROW   |1573     |28786 |Application |Apache                                                         |
+ROW   |1574     |28787 |Application |Apache                                                         |
+ROW   |1575     |28788 |Application |Apache                                                         |
+ROW   |1576     |28789 |Application |Apache                                                         |
+ROW   |1577     |28790 |Application |Apache                                                         |
+ROW   |1578     |28791 |Application |Apache                                                         |
+ROW   |1579     |28792 |Application |Apache                                                         |
+ROW   |1580     |28793 |Application |Apache                                                         |
+ROW   |1581     |28794 |Application |Apache                                                         |
+ROW   |1582     |28795 |Application |Apache                                                         |
+ROW   |1583     |28796 |Application |Apache                                                         |
+ROW   |1584     |28798 |Application |Apache                                                         |
+ROW   |1585     |28799 |Application |Apache                                                         |
+ROW   |1586     |28800 |Application |Apache                                                         |
+ROW   |1587     |28801 |Application |Apache                                                         |
+ROW   |1588     |28802 |Application |Apache                                                         |
+ROW   |1589     |28803 |Application |Apache                                                         |
+ROW   |1590     |28775 |Application |Zabbix raw items                                               |
+ROW   |1591     |28805 |Application |Nginx                                                          |
+ROW   |1592     |28806 |Application |Nginx                                                          |
+ROW   |1593     |28807 |Application |Nginx                                                          |
+ROW   |1594     |28808 |Application |Nginx                                                          |
+ROW   |1595     |28809 |Application |Nginx                                                          |
+ROW   |1596     |28810 |Application |Nginx                                                          |
+ROW   |1597     |28811 |Application |Nginx                                                          |
+ROW   |1598     |28812 |Application |Nginx                                                          |
+ROW   |1599     |28813 |Application |Nginx                                                          |
+ROW   |1600     |28814 |Application |Nginx                                                          |
+ROW   |1601     |28815 |Application |Nginx                                                          |
+ROW   |1602     |28816 |Application |Nginx                                                          |
+ROW   |1603     |28817 |Application |Nginx                                                          |
+ROW   |1604     |28818 |Application |Nginx                                                          |
+ROW   |1605     |28819 |Application |Nginx                                                          |
+ROW   |1606     |28820 |Application |Nginx                                                          |
+ROW   |1607     |28804 |Application |Zabbix raw items                                               |
+ROW   |1608     |28822 |Application |Nginx                                                          |
+ROW   |1609     |28823 |Application |Nginx                                                          |
+ROW   |1610     |28824 |Application |Nginx                                                          |
+ROW   |1611     |28825 |Application |Nginx                                                          |
+ROW   |1612     |28826 |Application |Nginx                                                          |
+ROW   |1613     |28827 |Application |Nginx                                                          |
+ROW   |1614     |28828 |Application |Nginx                                                          |
+ROW   |1615     |28829 |Application |Nginx                                                          |
+ROW   |1616     |28830 |Application |Nginx                                                          |
+ROW   |1617     |28831 |Application |Nginx                                                          |
+ROW   |1618     |28832 |Application |Nginx                                                          |
+ROW   |1619     |28833 |Application |Nginx                                                          |
+ROW   |1620     |28821 |Application |Zabbix raw items                                               |
+ROW   |1621     |28978 |Application |Memory                                                         |
+ROW   |1622     |28979 |Application |Memory                                                         |
+ROW   |1623     |28980 |Application |Memory                                                         |
+ROW   |1624     |28981 |Application |Memory                                                         |
+ROW   |1625     |28982 |Application |Memory                                                         |
+ROW   |1626     |28983 |Application |Memory                                                         |
+ROW   |1627     |28984 |Application |Memory                                                         |
+ROW   |1628     |28985 |Application |Memory                                                         |
+ROW   |1629     |28986 |Application |Memory                                                         |
+ROW   |1630     |28987 |Application |CPU                                                            |
+ROW   |1631     |28988 |Application |CPU                                                            |
+ROW   |1632     |28989 |Application |CPU                                                            |
+ROW   |1633     |28990 |Application |CPU                                                            |
+ROW   |1634     |28991 |Application |CPU                                                            |
+ROW   |1635     |28992 |Application |CPU                                                            |
+ROW   |1636     |29017 |Application |CPU                                                            |
+ROW   |1637     |29018 |Application |CPU                                                            |
+ROW   |1638     |29019 |Application |CPU                                                            |
+ROW   |1639     |29020 |Application |CPU                                                            |
+ROW   |1640     |29021 |Application |CPU                                                            |
+ROW   |1641     |29022 |Application |CPU                                                            |
+ROW   |1642     |29023 |Application |CPU                                                            |
+ROW   |1643     |29024 |Application |CPU                                                            |
+ROW   |1644     |29025 |Application |CPU                                                            |
+ROW   |1645     |29026 |Application |CPU                                                            |
+ROW   |1646     |29048 |Application |CPU                                                            |
+ROW   |1647     |29087 |Application |CPU                                                            |
+ROW   |1648     |29088 |Application |CPU                                                            |
+ROW   |1649     |29089 |Application |CPU                                                            |
+ROW   |1650     |29090 |Application |CPU                                                            |
+ROW   |1651     |29091 |Application |CPU                                                            |
+ROW   |1652     |29092 |Application |CPU                                                            |
+ROW   |1653     |29093 |Application |CPU                                                            |
+ROW   |1654     |29094 |Application |CPU                                                            |
+ROW   |1655     |29095 |Application |CPU                                                            |
+ROW   |1656     |29096 |Application |CPU                                                            |
+ROW   |1657     |29097 |Application |CPU                                                            |
+ROW   |1658     |29098 |Application |CPU                                                            |
+ROW   |1659     |29099 |Application |CPU                                                            |
+ROW   |1660     |29100 |Application |CPU                                                            |
+ROW   |1661     |29101 |Application |CPU                                                            |
+ROW   |1662     |29102 |Application |CPU                                                            |
+ROW   |1663     |29198 |Application |CPU                                                            |
+ROW   |1664     |29103 |Application |Memory                                                         |
+ROW   |1665     |29104 |Application |Memory                                                         |
+ROW   |1666     |29105 |Application |Memory                                                         |
+ROW   |1667     |29106 |Application |Memory                                                         |
+ROW   |1668     |29107 |Application |Memory                                                         |
+ROW   |1669     |29108 |Application |Memory                                                         |
+ROW   |1670     |31364 |Application |Memory                                                         |
+ROW   |1671     |31372 |Application |Zabbix raw items                                               |
+ROW   |1672     |31381 |Application |Zabbix raw items                                               |
+ROW   |1673     |31384 |Application |Zabbix raw items                                               |
+ROW   |1674     |29111 |Application |General                                                        |
+ROW   |1675     |29112 |Application |General                                                        |
+ROW   |1676     |29113 |Application |General                                                        |
+ROW   |1677     |29114 |Application |General                                                        |
+ROW   |1678     |29115 |Application |General                                                        |
+ROW   |1679     |29116 |Application |General                                                        |
+ROW   |1680     |29117 |Application |General                                                        |
+ROW   |1681     |29118 |Application |General                                                        |
+ROW   |1682     |29119 |Application |General                                                        |
+ROW   |1683     |29121 |Application |Inventory                                                      |
+ROW   |1684     |29122 |Application |Inventory                                                      |
+ROW   |1685     |29123 |Application |Inventory                                                      |
+ROW   |1686     |29120 |Application |Security                                                       |
+ROW   |1687     |29110 |Application |Status                                                         |
+ROW   |1688     |29399 |Application |CPU                                                            |
+ROW   |1689     |29405 |Application |CPU                                                            |
+ROW   |1690     |29406 |Application |CPU                                                            |
+ROW   |1691     |29407 |Application |CPU                                                            |
+ROW   |1692     |29408 |Application |CPU                                                            |
+ROW   |1693     |29409 |Application |CPU                                                            |
+ROW   |1694     |29410 |Application |CPU                                                            |
+ROW   |1695     |29411 |Application |CPU                                                            |
+ROW   |1696     |29412 |Application |CPU                                                            |
+ROW   |1697     |29413 |Application |CPU                                                            |
+ROW   |1698     |29416 |Application |CPU                                                            |
+ROW   |1699     |29417 |Application |CPU                                                            |
+ROW   |1700     |29418 |Application |CPU                                                            |
+ROW   |1701     |29419 |Application |CPU                                                            |
+ROW   |1702     |29420 |Application |CPU                                                            |
+ROW   |1703     |29426 |Application |CPU                                                            |
+ROW   |1704     |29427 |Application |CPU                                                            |
+ROW   |1705     |29398 |Application |General                                                        |
+ROW   |1706     |29404 |Application |General                                                        |
+ROW   |1707     |29414 |Application |General                                                        |
+ROW   |1708     |29423 |Application |General                                                        |
+ROW   |1709     |29424 |Application |General                                                        |
+ROW   |1710     |29425 |Application |General                                                        |
+ROW   |1711     |29422 |Application |Inventory                                                      |
+ROW   |1712     |29428 |Application |Inventory                                                      |
+ROW   |1713     |29396 |Application |Memory                                                         |
+ROW   |1714     |29397 |Application |Memory                                                         |
+ROW   |1715     |29400 |Application |Memory                                                         |
+ROW   |1716     |29401 |Application |Memory                                                         |
+ROW   |1717     |29402 |Application |Memory                                                         |
+ROW   |1718     |29403 |Application |Memory                                                         |
+ROW   |1719     |29415 |Application |Monitoring agent                                               |
+ROW   |1720     |29421 |Application |Status                                                         |
+ROW   |1721     |29395 |Application |Zabbix raw items                                               |
+ROW   |1722     |29450 |Application |Zabbix raw items                                               |
+ROW   |1723     |29451 |Application |Zabbix raw items                                               |
+ROW   |1724     |29454 |Application |CPU                                                            |
+ROW   |1725     |29455 |Application |CPU                                                            |
+ROW   |1726     |29456 |Application |CPU                                                            |
+ROW   |1727     |29457 |Application |CPU                                                            |
+ROW   |1728     |29458 |Application |CPU                                                            |
+ROW   |1729     |29459 |Application |CPU                                                            |
+ROW   |1730     |30137 |Application |CPU                                                            |
+ROW   |1731     |31419 |Application |CPU                                                            |
+ROW   |1732     |29460 |Application |Memory                                                         |
+ROW   |1733     |29461 |Application |Memory                                                         |
+ROW   |1734     |29462 |Application |Memory                                                         |
+ROW   |1735     |29463 |Application |Memory                                                         |
+ROW   |1736     |29466 |Application |Memory                                                         |
+ROW   |1737     |29467 |Application |Memory                                                         |
+ROW   |1738     |29468 |Application |Memory                                                         |
+ROW   |1739     |29469 |Application |Memory                                                         |
+ROW   |1740     |29470 |Application |Memory                                                         |
+ROW   |1741     |31420 |Application |Memory                                                         |
+ROW   |1742     |31421 |Application |Memory                                                         |
+ROW   |1743     |31427 |Application |Memory                                                         |
+ROW   |1744     |29473 |Application |General                                                        |
+ROW   |1745     |29474 |Application |General                                                        |
+ROW   |1746     |29475 |Application |General                                                        |
+ROW   |1747     |29476 |Application |General                                                        |
+ROW   |1748     |29477 |Application |General                                                        |
+ROW   |1749     |29478 |Application |Inventory                                                      |
+ROW   |1750     |29472 |Application |Status                                                         |
+ROW   |1751     |31422 |Application |Zabbix raw items                                               |
+ROW   |1752     |29545 |Application |Monitoring agent                                               |
+ROW   |1753     |29546 |Application |Monitoring agent                                               |
+ROW   |1754     |29547 |Application |Status                                                         |
+ROW   |1755     |30000 |Application |RabbitMQ                                                       |
+ROW   |1756     |30001 |Application |RabbitMQ                                                       |
+ROW   |1757     |30002 |Application |RabbitMQ                                                       |
+ROW   |1758     |30003 |Application |RabbitMQ                                                       |
+ROW   |1759     |30004 |Application |RabbitMQ                                                       |
+ROW   |1760     |30005 |Application |RabbitMQ                                                       |
+ROW   |1761     |30006 |Application |RabbitMQ                                                       |
+ROW   |1762     |30007 |Application |RabbitMQ                                                       |
+ROW   |1763     |30008 |Application |RabbitMQ                                                       |
+ROW   |1764     |30009 |Application |RabbitMQ                                                       |
+ROW   |1765     |30010 |Application |RabbitMQ                                                       |
+ROW   |1766     |30011 |Application |RabbitMQ                                                       |
+ROW   |1767     |30012 |Application |RabbitMQ                                                       |
+ROW   |1768     |30013 |Application |RabbitMQ                                                       |
+ROW   |1769     |30014 |Application |RabbitMQ                                                       |
+ROW   |1770     |30015 |Application |RabbitMQ                                                       |
+ROW   |1771     |30016 |Application |RabbitMQ                                                       |
+ROW   |1772     |30017 |Application |RabbitMQ                                                       |
+ROW   |1773     |30018 |Application |RabbitMQ                                                       |
+ROW   |1774     |30019 |Application |RabbitMQ                                                       |
+ROW   |1775     |30020 |Application |RabbitMQ                                                       |
+ROW   |1776     |30021 |Application |RabbitMQ                                                       |
+ROW   |1777     |30022 |Application |RabbitMQ                                                       |
+ROW   |1778     |30023 |Application |RabbitMQ                                                       |
+ROW   |1779     |33747 |Application |RabbitMQ                                                       |
+ROW   |1780     |29998 |Application |Zabbix raw items                                               |
+ROW   |1781     |29999 |Application |Zabbix raw items                                               |
+ROW   |1782     |29655 |Application |RabbitMQ                                                       |
+ROW   |1783     |29656 |Application |RabbitMQ                                                       |
+ROW   |1784     |29657 |Application |RabbitMQ                                                       |
+ROW   |1785     |29658 |Application |RabbitMQ                                                       |
+ROW   |1786     |29659 |Application |RabbitMQ                                                       |
+ROW   |1787     |29660 |Application |RabbitMQ                                                       |
+ROW   |1788     |29687 |Application |RabbitMQ                                                       |
+ROW   |1789     |29688 |Application |RabbitMQ                                                       |
+ROW   |1790     |29691 |Application |RabbitMQ                                                       |
+ROW   |1791     |29692 |Application |RabbitMQ                                                       |
+ROW   |1792     |29693 |Application |RabbitMQ                                                       |
+ROW   |1793     |29694 |Application |RabbitMQ                                                       |
+ROW   |1794     |29695 |Application |RabbitMQ                                                       |
+ROW   |1795     |29696 |Application |RabbitMQ                                                       |
+ROW   |1796     |29697 |Application |RabbitMQ                                                       |
+ROW   |1797     |29698 |Application |RabbitMQ                                                       |
+ROW   |1798     |29699 |Application |RabbitMQ                                                       |
+ROW   |1799     |29700 |Application |RabbitMQ                                                       |
+ROW   |1800     |29701 |Application |RabbitMQ                                                       |
+ROW   |1801     |30024 |Application |RabbitMQ                                                       |
+ROW   |1802     |30025 |Application |RabbitMQ                                                       |
+ROW   |1803     |33748 |Application |RabbitMQ                                                       |
+ROW   |1804     |33749 |Application |RabbitMQ                                                       |
+ROW   |1805     |33750 |Application |RabbitMQ                                                       |
+ROW   |1806     |33751 |Application |RabbitMQ                                                       |
+ROW   |1807     |33752 |Application |RabbitMQ                                                       |
+ROW   |1808     |33753 |Application |RabbitMQ                                                       |
+ROW   |1809     |29653 |Application |Zabbix raw items                                               |
+ROW   |1810     |29654 |Application |Zabbix raw items                                               |
+ROW   |1811     |29661 |Application |Zabbix raw items                                               |
+ROW   |1812     |29746 |Application |RabbitMQ                                                       |
+ROW   |1813     |29747 |Application |RabbitMQ                                                       |
+ROW   |1814     |29748 |Application |RabbitMQ                                                       |
+ROW   |1815     |29749 |Application |RabbitMQ                                                       |
+ROW   |1816     |29750 |Application |RabbitMQ                                                       |
+ROW   |1817     |29751 |Application |RabbitMQ                                                       |
+ROW   |1818     |29752 |Application |RabbitMQ                                                       |
+ROW   |1819     |29753 |Application |RabbitMQ                                                       |
+ROW   |1820     |29754 |Application |RabbitMQ                                                       |
+ROW   |1821     |29755 |Application |RabbitMQ                                                       |
+ROW   |1822     |29756 |Application |RabbitMQ                                                       |
+ROW   |1823     |29757 |Application |RabbitMQ                                                       |
+ROW   |1824     |29758 |Application |RabbitMQ                                                       |
+ROW   |1825     |29759 |Application |RabbitMQ                                                       |
+ROW   |1826     |29760 |Application |RabbitMQ                                                       |
+ROW   |1827     |29761 |Application |RabbitMQ                                                       |
+ROW   |1828     |29762 |Application |RabbitMQ                                                       |
+ROW   |1829     |29763 |Application |RabbitMQ                                                       |
+ROW   |1830     |29764 |Application |RabbitMQ                                                       |
+ROW   |1831     |29765 |Application |RabbitMQ                                                       |
+ROW   |1832     |29766 |Application |RabbitMQ                                                       |
+ROW   |1833     |29767 |Application |RabbitMQ                                                       |
+ROW   |1834     |29768 |Application |RabbitMQ                                                       |
+ROW   |1835     |29769 |Application |RabbitMQ                                                       |
+ROW   |1836     |33757 |Application |RabbitMQ                                                       |
+ROW   |1837     |29738 |Application |Zabbix raw items                                               |
+ROW   |1838     |29739 |Application |Zabbix raw items                                               |
+ROW   |1839     |29742 |Application |RabbitMQ                                                       |
+ROW   |1840     |29743 |Application |RabbitMQ                                                       |
+ROW   |1841     |29771 |Application |RabbitMQ                                                       |
+ROW   |1842     |29772 |Application |RabbitMQ                                                       |
+ROW   |1843     |29773 |Application |RabbitMQ                                                       |
+ROW   |1844     |29774 |Application |RabbitMQ                                                       |
+ROW   |1845     |29775 |Application |RabbitMQ                                                       |
+ROW   |1846     |29776 |Application |RabbitMQ                                                       |
+ROW   |1847     |29777 |Application |RabbitMQ                                                       |
+ROW   |1848     |29779 |Application |RabbitMQ                                                       |
+ROW   |1849     |29780 |Application |RabbitMQ                                                       |
+ROW   |1850     |29781 |Application |RabbitMQ                                                       |
+ROW   |1851     |29782 |Application |RabbitMQ                                                       |
+ROW   |1852     |29783 |Application |RabbitMQ                                                       |
+ROW   |1853     |29784 |Application |RabbitMQ                                                       |
+ROW   |1854     |30044 |Application |RabbitMQ                                                       |
+ROW   |1855     |30045 |Application |RabbitMQ                                                       |
+ROW   |1856     |33758 |Application |RabbitMQ                                                       |
+ROW   |1857     |33759 |Application |RabbitMQ                                                       |
+ROW   |1858     |33760 |Application |RabbitMQ                                                       |
+ROW   |1859     |33761 |Application |RabbitMQ                                                       |
+ROW   |1860     |33762 |Application |RabbitMQ                                                       |
+ROW   |1861     |33763 |Application |RabbitMQ                                                       |
+ROW   |1862     |29741 |Application |Zabbix raw items                                               |
+ROW   |1863     |29745 |Application |Zabbix raw items                                               |
+ROW   |1864     |30043 |Application |Zabbix raw items                                               |
+ROW   |1865     |30083 |Application |Disk arrays                                                    |
+ROW   |1866     |30084 |Application |Disk arrays                                                    |
+ROW   |1867     |30085 |Application |Disk arrays                                                    |
+ROW   |1868     |30075 |Application |Fans                                                           |
+ROW   |1869     |30049 |Application |General                                                        |
+ROW   |1870     |30050 |Application |General                                                        |
+ROW   |1871     |30051 |Application |General                                                        |
+ROW   |1872     |30052 |Application |General                                                        |
+ROW   |1873     |30053 |Application |General                                                        |
+ROW   |1874     |30054 |Application |General                                                        |
+ROW   |1875     |30073 |Application |Inventory                                                      |
+ROW   |1876     |30074 |Application |Inventory                                                      |
+ROW   |1877     |30076 |Application |Physical disks                                                 |
+ROW   |1878     |30077 |Application |Physical disks                                                 |
+ROW   |1879     |30078 |Application |Physical disks                                                 |
+ROW   |1880     |30079 |Application |Physical disks                                                 |
+ROW   |1881     |30071 |Application |Power supply                                                   |
+ROW   |1882     |30046 |Application |Status                                                         |
+ROW   |1883     |30047 |Application |Status                                                         |
+ROW   |1884     |30048 |Application |Status                                                         |
+ROW   |1885     |30055 |Application |Status                                                         |
+ROW   |1886     |30056 |Application |Status                                                         |
+ROW   |1887     |30072 |Application |Status                                                         |
+ROW   |1888     |30066 |Application |Temperature                                                    |
+ROW   |1889     |30067 |Application |Temperature                                                    |
+ROW   |1890     |30068 |Application |Temperature                                                    |
+ROW   |1891     |30069 |Application |Temperature                                                    |
+ROW   |1892     |30070 |Application |Temperature                                                    |
+ROW   |1893     |30080 |Application |Virtual disks                                                  |
+ROW   |1894     |30081 |Application |Virtual disks                                                  |
+ROW   |1895     |30082 |Application |Virtual disks                                                  |
+ROW   |1896     |30142 |Application |CPU                                                            |
+ROW   |1897     |30157 |Application |Memory                                                         |
+ROW   |1898     |30158 |Application |Memory                                                         |
+ROW   |1899     |30159 |Application |Memory                                                         |
+ROW   |1912     |30273 |Application |Redis                                                          |
+ROW   |1913     |30274 |Application |Redis                                                          |
+ROW   |1914     |30277 |Application |Redis                                                          |
+ROW   |1915     |30278 |Application |Redis                                                          |
+ROW   |1916     |30279 |Application |Redis                                                          |
+ROW   |1917     |30280 |Application |Redis                                                          |
+ROW   |1918     |30281 |Application |Redis                                                          |
+ROW   |1919     |30282 |Application |Redis                                                          |
+ROW   |1920     |30283 |Application |Redis                                                          |
+ROW   |1921     |30284 |Application |Redis                                                          |
+ROW   |1922     |30285 |Application |Redis                                                          |
+ROW   |1923     |30286 |Application |Redis                                                          |
+ROW   |1924     |30287 |Application |Redis                                                          |
+ROW   |1925     |30288 |Application |Redis                                                          |
+ROW   |1926     |30289 |Application |Redis                                                          |
+ROW   |1927     |30290 |Application |Redis                                                          |
+ROW   |1928     |30291 |Application |Redis                                                          |
+ROW   |1929     |30292 |Application |Redis                                                          |
+ROW   |1930     |30293 |Application |Redis                                                          |
+ROW   |1931     |30294 |Application |Redis                                                          |
+ROW   |1932     |30295 |Application |Redis                                                          |
+ROW   |1933     |30296 |Application |Redis                                                          |
+ROW   |1934     |30297 |Application |Redis                                                          |
+ROW   |1935     |30298 |Application |Redis                                                          |
+ROW   |1936     |30299 |Application |Redis                                                          |
+ROW   |1937     |30300 |Application |Redis                                                          |
+ROW   |1938     |30301 |Application |Redis                                                          |
+ROW   |1939     |30302 |Application |Redis                                                          |
+ROW   |1940     |30303 |Application |Redis                                                          |
+ROW   |1941     |30304 |Application |Redis                                                          |
+ROW   |1942     |30305 |Application |Redis                                                          |
+ROW   |1943     |30306 |Application |Redis                                                          |
+ROW   |1944     |30307 |Application |Redis                                                          |
+ROW   |1945     |30308 |Application |Redis                                                          |
+ROW   |1946     |30309 |Application |Redis                                                          |
+ROW   |1947     |30310 |Application |Redis                                                          |
+ROW   |1948     |30311 |Application |Redis                                                          |
+ROW   |1949     |30312 |Application |Redis                                                          |
+ROW   |1950     |30313 |Application |Redis                                                          |
+ROW   |1951     |30314 |Application |Redis                                                          |
+ROW   |1952     |30315 |Application |Redis                                                          |
+ROW   |1953     |30316 |Application |Redis                                                          |
+ROW   |1954     |30317 |Application |Redis                                                          |
+ROW   |1955     |30318 |Application |Redis                                                          |
+ROW   |1956     |30319 |Application |Redis                                                          |
+ROW   |1957     |30320 |Application |Redis                                                          |
+ROW   |1958     |30321 |Application |Redis                                                          |
+ROW   |1959     |30322 |Application |Redis                                                          |
+ROW   |1960     |30323 |Application |Redis                                                          |
+ROW   |1961     |30324 |Application |Redis                                                          |
+ROW   |1962     |30325 |Application |Redis                                                          |
+ROW   |1963     |30326 |Application |Redis                                                          |
+ROW   |1964     |30327 |Application |Redis                                                          |
+ROW   |1965     |30328 |Application |Redis                                                          |
+ROW   |1966     |30329 |Application |Redis                                                          |
+ROW   |1967     |30330 |Application |Redis                                                          |
+ROW   |1968     |30331 |Application |Redis                                                          |
+ROW   |1969     |30332 |Application |Redis                                                          |
+ROW   |1970     |30333 |Application |Redis                                                          |
+ROW   |1971     |30334 |Application |Redis                                                          |
+ROW   |1972     |30335 |Application |Redis                                                          |
+ROW   |1973     |30336 |Application |Redis                                                          |
+ROW   |1974     |30344 |Application |Redis                                                          |
+ROW   |1975     |30345 |Application |Redis                                                          |
+ROW   |1976     |30346 |Application |Redis                                                          |
+ROW   |1977     |30347 |Application |Redis                                                          |
+ROW   |1978     |30351 |Application |Redis                                                          |
+ROW   |1979     |30352 |Application |Redis                                                          |
+ROW   |1980     |30353 |Application |Redis                                                          |
+ROW   |1981     |30354 |Application |Redis                                                          |
+ROW   |1982     |30355 |Application |Redis                                                          |
+ROW   |1983     |30356 |Application |Redis                                                          |
+ROW   |1984     |30357 |Application |Redis                                                          |
+ROW   |1985     |30358 |Application |Redis                                                          |
+ROW   |1986     |30359 |Application |Redis                                                          |
+ROW   |1987     |30360 |Application |Redis                                                          |
+ROW   |1988     |30361 |Application |Redis                                                          |
+ROW   |1989     |30362 |Application |Redis                                                          |
+ROW   |1990     |30363 |Application |Redis                                                          |
+ROW   |1991     |30364 |Application |Redis                                                          |
+ROW   |1992     |30365 |Application |Redis                                                          |
+ROW   |1993     |30366 |Application |Redis                                                          |
+ROW   |1994     |30367 |Application |Redis                                                          |
+ROW   |1995     |30368 |Application |Redis                                                          |
+ROW   |1996     |30369 |Application |Redis                                                          |
+ROW   |1997     |30370 |Application |Redis                                                          |
+ROW   |1998     |30371 |Application |Redis                                                          |
+ROW   |1999     |30372 |Application |Redis                                                          |
+ROW   |2000     |30373 |Application |Redis                                                          |
+ROW   |2001     |30374 |Application |Redis                                                          |
+ROW   |2002     |30375 |Application |Redis                                                          |
+ROW   |2003     |30376 |Application |Redis                                                          |
+ROW   |2004     |30377 |Application |Redis                                                          |
+ROW   |2005     |30378 |Application |Redis                                                          |
+ROW   |2006     |30379 |Application |Redis                                                          |
+ROW   |2007     |30380 |Application |Redis                                                          |
+ROW   |2008     |30381 |Application |Redis                                                          |
+ROW   |2009     |30382 |Application |Redis                                                          |
+ROW   |2010     |30383 |Application |Redis                                                          |
+ROW   |2011     |30384 |Application |Redis                                                          |
+ROW   |2012     |30385 |Application |Redis                                                          |
+ROW   |2013     |30386 |Application |Redis                                                          |
+ROW   |2014     |30387 |Application |Redis                                                          |
+ROW   |2015     |30388 |Application |Redis                                                          |
+ROW   |2016     |30389 |Application |Redis                                                          |
+ROW   |2017     |30390 |Application |Redis                                                          |
+ROW   |2018     |30391 |Application |Redis                                                          |
+ROW   |2019     |30392 |Application |Redis                                                          |
+ROW   |2020     |30393 |Application |Redis                                                          |
+ROW   |2021     |30394 |Application |Redis                                                          |
+ROW   |2022     |30395 |Application |Redis                                                          |
+ROW   |2023     |30397 |Application |Redis                                                          |
+ROW   |2024     |30398 |Application |Redis                                                          |
+ROW   |2025     |30399 |Application |Redis                                                          |
+ROW   |2026     |30400 |Application |Redis                                                          |
+ROW   |2027     |30401 |Application |Redis                                                          |
+ROW   |2028     |30402 |Application |Redis                                                          |
+ROW   |2029     |30403 |Application |Redis                                                          |
+ROW   |2030     |30404 |Application |Redis                                                          |
+ROW   |2031     |30275 |Application |Zabbix raw items                                               |
+ROW   |2032     |30276 |Application |Zabbix raw items                                               |
+ROW   |2033     |30425 |Application |Services                                                       |
+ROW   |2034     |30431 |Application |MySQL                                                          |
+ROW   |2035     |30432 |Application |MySQL                                                          |
+ROW   |2036     |30434 |Application |MySQL                                                          |
+ROW   |2037     |30435 |Application |MySQL                                                          |
+ROW   |2038     |30437 |Application |MySQL                                                          |
+ROW   |2039     |30438 |Application |MySQL                                                          |
+ROW   |2040     |30439 |Application |MySQL                                                          |
+ROW   |2041     |30440 |Application |MySQL                                                          |
+ROW   |2042     |30441 |Application |MySQL                                                          |
+ROW   |2043     |30442 |Application |MySQL                                                          |
+ROW   |2044     |30444 |Application |MySQL                                                          |
+ROW   |2045     |30445 |Application |MySQL                                                          |
+ROW   |2046     |30446 |Application |MySQL                                                          |
+ROW   |2047     |30447 |Application |MySQL                                                          |
+ROW   |2048     |30449 |Application |MySQL                                                          |
+ROW   |2049     |30450 |Application |MySQL                                                          |
+ROW   |2050     |30451 |Application |MySQL                                                          |
+ROW   |2051     |30452 |Application |MySQL                                                          |
+ROW   |2052     |30453 |Application |MySQL                                                          |
+ROW   |2053     |30454 |Application |MySQL                                                          |
+ROW   |2054     |30455 |Application |MySQL                                                          |
+ROW   |2055     |30456 |Application |MySQL                                                          |
+ROW   |2056     |30457 |Application |MySQL                                                          |
+ROW   |2057     |30458 |Application |MySQL                                                          |
+ROW   |2058     |30459 |Application |MySQL                                                          |
+ROW   |2059     |30460 |Application |MySQL                                                          |
+ROW   |2060     |30461 |Application |MySQL                                                          |
+ROW   |2061     |30462 |Application |MySQL                                                          |
+ROW   |2062     |30463 |Application |MySQL                                                          |
+ROW   |2063     |30464 |Application |MySQL                                                          |
+ROW   |2064     |30465 |Application |MySQL                                                          |
+ROW   |2065     |30466 |Application |MySQL                                                          |
+ROW   |2066     |30470 |Application |MySQL                                                          |
+ROW   |2067     |30471 |Application |MySQL                                                          |
+ROW   |2068     |30474 |Application |MySQL                                                          |
+ROW   |2069     |30476 |Application |MySQL                                                          |
+ROW   |2070     |30477 |Application |MySQL                                                          |
+ROW   |2071     |30478 |Application |MySQL                                                          |
+ROW   |2072     |31168 |Application |MySQL                                                          |
+ROW   |2073     |31169 |Application |MySQL                                                          |
+ROW   |2074     |31170 |Application |MySQL                                                          |
+ROW   |2075     |31171 |Application |MySQL                                                          |
+ROW   |2076     |33126 |Application |MySQL                                                          |
+ROW   |2077     |33127 |Application |MySQL                                                          |
+ROW   |2078     |33128 |Application |MySQL                                                          |
+ROW   |2079     |33129 |Application |MySQL                                                          |
+ROW   |2080     |33130 |Application |MySQL                                                          |
+ROW   |2081     |33131 |Application |MySQL                                                          |
+ROW   |2082     |33132 |Application |MySQL                                                          |
+ROW   |2083     |33134 |Application |MySQL                                                          |
+ROW   |2084     |33135 |Application |MySQL                                                          |
+ROW   |2085     |33136 |Application |MySQL                                                          |
+ROW   |2086     |33137 |Application |MySQL                                                          |
+ROW   |2087     |33138 |Application |MySQL                                                          |
+ROW   |2088     |33139 |Application |MySQL                                                          |
+ROW   |2089     |30433 |Application |Zabbix raw items                                               |
+ROW   |2090     |30436 |Application |Zabbix raw items                                               |
+ROW   |2091     |30443 |Application |Zabbix raw items                                               |
+ROW   |2092     |30475 |Application |Zabbix raw items                                               |
+ROW   |2093     |30480 |Application |MySQL                                                          |
+ROW   |2094     |30481 |Application |MySQL                                                          |
+ROW   |2095     |30482 |Application |MySQL                                                          |
+ROW   |2096     |30483 |Application |MySQL                                                          |
+ROW   |2097     |30484 |Application |MySQL                                                          |
+ROW   |2098     |30486 |Application |MySQL                                                          |
+ROW   |2099     |30488 |Application |MySQL                                                          |
+ROW   |2100     |30489 |Application |MySQL                                                          |
+ROW   |2101     |30490 |Application |MySQL                                                          |
+ROW   |2102     |30491 |Application |MySQL                                                          |
+ROW   |2103     |30492 |Application |MySQL                                                          |
+ROW   |2104     |30493 |Application |MySQL                                                          |
+ROW   |2105     |30494 |Application |MySQL                                                          |
+ROW   |2106     |30495 |Application |MySQL                                                          |
+ROW   |2107     |30496 |Application |MySQL                                                          |
+ROW   |2108     |30497 |Application |MySQL                                                          |
+ROW   |2109     |30499 |Application |MySQL                                                          |
+ROW   |2110     |30500 |Application |MySQL                                                          |
+ROW   |2111     |30503 |Application |MySQL                                                          |
+ROW   |2112     |30504 |Application |MySQL                                                          |
+ROW   |2113     |30505 |Application |MySQL                                                          |
+ROW   |2114     |30506 |Application |MySQL                                                          |
+ROW   |2115     |30507 |Application |MySQL                                                          |
+ROW   |2116     |30508 |Application |MySQL                                                          |
+ROW   |2117     |30509 |Application |MySQL                                                          |
+ROW   |2118     |30510 |Application |MySQL                                                          |
+ROW   |2119     |30512 |Application |MySQL                                                          |
+ROW   |2120     |30513 |Application |MySQL                                                          |
+ROW   |2121     |30514 |Application |MySQL                                                          |
+ROW   |2122     |30515 |Application |MySQL                                                          |
+ROW   |2123     |30516 |Application |MySQL                                                          |
+ROW   |2124     |30517 |Application |MySQL                                                          |
+ROW   |2125     |30518 |Application |MySQL                                                          |
+ROW   |2126     |30519 |Application |MySQL                                                          |
+ROW   |2127     |30522 |Application |MySQL                                                          |
+ROW   |2128     |30524 |Application |MySQL                                                          |
+ROW   |2129     |30525 |Application |MySQL                                                          |
+ROW   |2130     |30526 |Application |MySQL                                                          |
+ROW   |2131     |31176 |Application |MySQL                                                          |
+ROW   |2132     |31177 |Application |MySQL                                                          |
+ROW   |2133     |31178 |Application |MySQL                                                          |
+ROW   |2134     |31179 |Application |MySQL                                                          |
+ROW   |2135     |33154 |Application |MySQL                                                          |
+ROW   |2136     |33155 |Application |MySQL                                                          |
+ROW   |2137     |33156 |Application |MySQL                                                          |
+ROW   |2138     |33157 |Application |MySQL                                                          |
+ROW   |2139     |33158 |Application |MySQL                                                          |
+ROW   |2140     |33159 |Application |MySQL                                                          |
+ROW   |2141     |33160 |Application |MySQL                                                          |
+ROW   |2142     |33162 |Application |MySQL                                                          |
+ROW   |2143     |33163 |Application |MySQL                                                          |
+ROW   |2144     |33164 |Application |MySQL                                                          |
+ROW   |2145     |33165 |Application |MySQL                                                          |
+ROW   |2146     |33166 |Application |MySQL                                                          |
+ROW   |2147     |33167 |Application |MySQL                                                          |
+ROW   |2148     |30479 |Application |Zabbix raw items                                               |
+ROW   |2149     |30485 |Application |Zabbix raw items                                               |
+ROW   |2150     |30487 |Application |Zabbix raw items                                               |
+ROW   |2151     |30523 |Application |Zabbix raw items                                               |
+ROW   |2152     |30530 |Application |Docker                                                         |
+ROW   |2153     |30532 |Application |Docker                                                         |
+ROW   |2154     |30533 |Application |Docker                                                         |
+ROW   |2155     |30534 |Application |Docker                                                         |
+ROW   |2156     |30535 |Application |Docker                                                         |
+ROW   |2157     |30536 |Application |Docker                                                         |
+ROW   |2158     |30537 |Application |Docker                                                         |
+ROW   |2159     |30538 |Application |Docker                                                         |
+ROW   |2160     |30539 |Application |Docker                                                         |
+ROW   |2161     |30540 |Application |Docker                                                         |
+ROW   |2162     |30541 |Application |Docker                                                         |
+ROW   |2163     |30542 |Application |Docker                                                         |
+ROW   |2164     |30543 |Application |Docker                                                         |
+ROW   |2165     |30544 |Application |Docker                                                         |
+ROW   |2166     |30545 |Application |Docker                                                         |
+ROW   |2167     |30546 |Application |Docker                                                         |
+ROW   |2168     |30547 |Application |Docker                                                         |
+ROW   |2169     |30548 |Application |Docker                                                         |
+ROW   |2170     |30549 |Application |Docker                                                         |
+ROW   |2171     |30550 |Application |Docker                                                         |
+ROW   |2172     |30551 |Application |Docker                                                         |
+ROW   |2173     |30552 |Application |Docker                                                         |
+ROW   |2174     |30553 |Application |Docker                                                         |
+ROW   |2175     |30554 |Application |Docker                                                         |
+ROW   |2176     |30555 |Application |Docker                                                         |
+ROW   |2177     |30556 |Application |Docker                                                         |
+ROW   |2178     |30557 |Application |Docker                                                         |
+ROW   |2179     |30558 |Application |Docker                                                         |
+ROW   |2180     |30559 |Application |Docker                                                         |
+ROW   |2181     |30560 |Application |Docker                                                         |
+ROW   |2182     |30561 |Application |Docker                                                         |
+ROW   |2183     |30562 |Application |Docker                                                         |
+ROW   |2184     |30563 |Application |Docker                                                         |
+ROW   |2185     |30564 |Application |Docker                                                         |
+ROW   |2186     |30565 |Application |Docker                                                         |
+ROW   |2187     |30566 |Application |Docker                                                         |
+ROW   |2188     |30567 |Application |Docker                                                         |
+ROW   |2189     |30568 |Application |Docker                                                         |
+ROW   |2190     |30569 |Application |Docker                                                         |
+ROW   |2191     |30570 |Application |Docker                                                         |
+ROW   |2192     |30527 |Application |Zabbix raw items                                               |
+ROW   |2193     |30528 |Application |Zabbix raw items                                               |
+ROW   |2194     |30529 |Application |Zabbix raw items                                               |
+ROW   |2195     |30531 |Application |Zabbix raw items                                               |
+ROW   |2196     |30611 |Application |Memcached                                                      |
+ROW   |2197     |30613 |Application |Memcached                                                      |
+ROW   |2198     |30614 |Application |Memcached                                                      |
+ROW   |2199     |30615 |Application |Memcached                                                      |
+ROW   |2200     |30616 |Application |Memcached                                                      |
+ROW   |2201     |30617 |Application |Memcached                                                      |
+ROW   |2202     |30618 |Application |Memcached                                                      |
+ROW   |2203     |30619 |Application |Memcached                                                      |
+ROW   |2204     |30620 |Application |Memcached                                                      |
+ROW   |2205     |30621 |Application |Memcached                                                      |
+ROW   |2206     |30622 |Application |Memcached                                                      |
+ROW   |2207     |30623 |Application |Memcached                                                      |
+ROW   |2208     |30624 |Application |Memcached                                                      |
+ROW   |2209     |30625 |Application |Memcached                                                      |
+ROW   |2210     |30626 |Application |Memcached                                                      |
+ROW   |2211     |30627 |Application |Memcached                                                      |
+ROW   |2212     |30628 |Application |Memcached                                                      |
+ROW   |2213     |30629 |Application |Memcached                                                      |
+ROW   |2214     |30630 |Application |Memcached                                                      |
+ROW   |2215     |30631 |Application |Memcached                                                      |
+ROW   |2216     |30632 |Application |Memcached                                                      |
+ROW   |2217     |30633 |Application |Memcached                                                      |
+ROW   |2218     |30634 |Application |Memcached                                                      |
+ROW   |2219     |30635 |Application |Memcached                                                      |
+ROW   |2220     |30636 |Application |Memcached                                                      |
+ROW   |2221     |30612 |Application |Zabbix raw items                                               |
+ROW   |2222     |30637 |Application |MySQL                                                          |
+ROW   |2223     |30638 |Application |MySQL                                                          |
+ROW   |2224     |30640 |Application |MySQL                                                          |
+ROW   |2225     |30641 |Application |MySQL                                                          |
+ROW   |2226     |30643 |Application |MySQL                                                          |
+ROW   |2227     |30644 |Application |MySQL                                                          |
+ROW   |2228     |30645 |Application |MySQL                                                          |
+ROW   |2229     |30646 |Application |MySQL                                                          |
+ROW   |2230     |30647 |Application |MySQL                                                          |
+ROW   |2231     |30648 |Application |MySQL                                                          |
+ROW   |2232     |30650 |Application |MySQL                                                          |
+ROW   |2233     |30651 |Application |MySQL                                                          |
+ROW   |2234     |30652 |Application |MySQL                                                          |
+ROW   |2235     |30653 |Application |MySQL                                                          |
+ROW   |2236     |30655 |Application |MySQL                                                          |
+ROW   |2237     |30656 |Application |MySQL                                                          |
+ROW   |2238     |30657 |Application |MySQL                                                          |
+ROW   |2239     |30658 |Application |MySQL                                                          |
+ROW   |2240     |30659 |Application |MySQL                                                          |
+ROW   |2241     |30660 |Application |MySQL                                                          |
+ROW   |2242     |30661 |Application |MySQL                                                          |
+ROW   |2243     |30662 |Application |MySQL                                                          |
+ROW   |2244     |30663 |Application |MySQL                                                          |
+ROW   |2245     |30664 |Application |MySQL                                                          |
+ROW   |2246     |30665 |Application |MySQL                                                          |
+ROW   |2247     |30666 |Application |MySQL                                                          |
+ROW   |2248     |30667 |Application |MySQL                                                          |
+ROW   |2249     |30668 |Application |MySQL                                                          |
+ROW   |2250     |30669 |Application |MySQL                                                          |
+ROW   |2251     |30670 |Application |MySQL                                                          |
+ROW   |2252     |30671 |Application |MySQL                                                          |
+ROW   |2253     |30672 |Application |MySQL                                                          |
+ROW   |2254     |30676 |Application |MySQL                                                          |
+ROW   |2255     |30677 |Application |MySQL                                                          |
+ROW   |2256     |30680 |Application |MySQL                                                          |
+ROW   |2257     |30682 |Application |MySQL                                                          |
+ROW   |2258     |30683 |Application |MySQL                                                          |
+ROW   |2259     |30684 |Application |MySQL                                                          |
+ROW   |2260     |31172 |Application |MySQL                                                          |
+ROW   |2261     |31173 |Application |MySQL                                                          |
+ROW   |2262     |31174 |Application |MySQL                                                          |
+ROW   |2263     |31175 |Application |MySQL                                                          |
+ROW   |2264     |33140 |Application |MySQL                                                          |
+ROW   |2265     |33141 |Application |MySQL                                                          |
+ROW   |2266     |33142 |Application |MySQL                                                          |
+ROW   |2267     |33143 |Application |MySQL                                                          |
+ROW   |2268     |33144 |Application |MySQL                                                          |
+ROW   |2269     |33145 |Application |MySQL                                                          |
+ROW   |2270     |33146 |Application |MySQL                                                          |
+ROW   |2271     |33148 |Application |MySQL                                                          |
+ROW   |2272     |33149 |Application |MySQL                                                          |
+ROW   |2273     |33150 |Application |MySQL                                                          |
+ROW   |2274     |33151 |Application |MySQL                                                          |
+ROW   |2275     |33152 |Application |MySQL                                                          |
+ROW   |2276     |33153 |Application |MySQL                                                          |
+ROW   |2277     |30639 |Application |Zabbix raw items                                               |
+ROW   |2278     |30642 |Application |Zabbix raw items                                               |
+ROW   |2279     |30649 |Application |Zabbix raw items                                               |
+ROW   |2280     |30681 |Application |Zabbix raw items                                               |
+ROW   |2281     |30685 |Application |Zabbix raw items                                               |
+ROW   |2282     |30690 |Application |ES cluster                                                     |
+ROW   |2283     |30692 |Application |ES cluster                                                     |
+ROW   |2284     |30695 |Application |ES cluster                                                     |
+ROW   |2285     |30696 |Application |ES cluster                                                     |
+ROW   |2286     |30697 |Application |ES cluster                                                     |
+ROW   |2287     |30698 |Application |ES cluster                                                     |
+ROW   |2288     |30699 |Application |ES cluster                                                     |
+ROW   |2289     |30700 |Application |ES cluster                                                     |
+ROW   |2290     |30701 |Application |ES cluster                                                     |
+ROW   |2291     |30702 |Application |ES cluster                                                     |
+ROW   |2292     |30703 |Application |ES cluster                                                     |
+ROW   |2293     |30704 |Application |ES cluster                                                     |
+ROW   |2294     |30705 |Application |ES cluster                                                     |
+ROW   |2295     |30706 |Application |ES cluster                                                     |
+ROW   |2296     |30707 |Application |ES cluster                                                     |
+ROW   |2297     |30708 |Application |ES cluster                                                     |
+ROW   |2298     |30709 |Application |ES cluster                                                     |
+ROW   |2299     |30710 |Application |ES cluster                                                     |
+ROW   |2300     |30711 |Application |ES cluster                                                     |
+ROW   |2301     |30712 |Application |ES cluster                                                     |
+ROW   |2302     |30691 |Application |Zabbix raw items                                               |
+ROW   |2303     |30693 |Application |Zabbix raw items                                               |
+ROW   |2304     |30694 |Application |Zabbix raw items                                               |
+ROW   |2305     |30719 |Application |Zabbix raw items                                               |
+ROW   |2306     |30739 |Application |Zabbix raw items                                               |
+ROW   |2307     |30743 |Application |Zabbix raw items                                               |
+ROW   |2308     |30744 |Application |Zabbix raw items                                               |
+ROW   |2309     |30746 |Application |Zabbix raw items                                               |
+ROW   |2310     |30747 |Application |Zabbix raw items                                               |
+ROW   |2311     |30754 |Application |Zabbix raw items                                               |
+ROW   |2312     |30756 |Application |Zabbix raw items                                               |
+ROW   |2313     |30821 |Application |ClickHouse                                                     |
+ROW   |2314     |30822 |Application |ClickHouse                                                     |
+ROW   |2315     |30827 |Application |ClickHouse                                                     |
+ROW   |2316     |30831 |Application |ClickHouse                                                     |
+ROW   |2317     |30832 |Application |ClickHouse                                                     |
+ROW   |2318     |30833 |Application |ClickHouse                                                     |
+ROW   |2319     |30834 |Application |ClickHouse                                                     |
+ROW   |2320     |30835 |Application |ClickHouse                                                     |
+ROW   |2321     |30837 |Application |ClickHouse                                                     |
+ROW   |2322     |30838 |Application |ClickHouse                                                     |
+ROW   |2323     |30839 |Application |ClickHouse                                                     |
+ROW   |2324     |30841 |Application |ClickHouse                                                     |
+ROW   |2325     |30846 |Application |ClickHouse                                                     |
+ROW   |2326     |30847 |Application |ClickHouse                                                     |
+ROW   |2327     |30848 |Application |ClickHouse                                                     |
+ROW   |2328     |30849 |Application |ClickHouse                                                     |
+ROW   |2329     |30850 |Application |ClickHouse                                                     |
+ROW   |2330     |30851 |Application |ClickHouse                                                     |
+ROW   |2331     |30852 |Application |ClickHouse                                                     |
+ROW   |2332     |30853 |Application |ClickHouse                                                     |
+ROW   |2333     |30854 |Application |ClickHouse                                                     |
+ROW   |2334     |30855 |Application |ClickHouse                                                     |
+ROW   |2335     |30856 |Application |ClickHouse                                                     |
+ROW   |2336     |30857 |Application |ClickHouse                                                     |
+ROW   |2337     |30858 |Application |ClickHouse                                                     |
+ROW   |2338     |30859 |Application |ClickHouse                                                     |
+ROW   |2339     |30860 |Application |ClickHouse                                                     |
+ROW   |2340     |30861 |Application |ClickHouse                                                     |
+ROW   |2341     |30862 |Application |ClickHouse                                                     |
+ROW   |2342     |30863 |Application |ClickHouse                                                     |
+ROW   |2343     |30864 |Application |ClickHouse                                                     |
+ROW   |2344     |30865 |Application |ClickHouse                                                     |
+ROW   |2345     |30866 |Application |ClickHouse                                                     |
+ROW   |2346     |30867 |Application |ClickHouse                                                     |
+ROW   |2347     |30868 |Application |ClickHouse                                                     |
+ROW   |2348     |30869 |Application |ClickHouse                                                     |
+ROW   |2349     |30870 |Application |ClickHouse                                                     |
+ROW   |2350     |30871 |Application |ClickHouse                                                     |
+ROW   |2351     |30872 |Application |ClickHouse                                                     |
+ROW   |2352     |31054 |Application |ClickHouse                                                     |
+ROW   |2353     |30836 |Application |ClickHouse ZooKeeper                                           |
+ROW   |2355     |30842 |Application |ClickHouse ZooKeeper                                           |
+ROW   |2356     |30843 |Application |ClickHouse ZooKeeper                                           |
+ROW   |2357     |30844 |Application |ClickHouse ZooKeeper                                           |
+ROW   |2358     |30845 |Application |ClickHouse ZooKeeper                                           |
+ROW   |2359     |30873 |Application |ClickHouse ZooKeeper                                           |
+ROW   |2360     |30823 |Application |Zabbix raw items                                               |
+ROW   |2361     |30824 |Application |Zabbix raw items                                               |
+ROW   |2362     |30825 |Application |Zabbix raw items                                               |
+ROW   |2363     |30826 |Application |Zabbix raw items                                               |
+ROW   |2364     |30828 |Application |Zabbix raw items                                               |
+ROW   |2365     |30829 |Application |Zabbix raw items                                               |
+ROW   |2366     |30830 |Application |Zabbix raw items                                               |
+ROW   |2367     |30923 |Application |Etcd                                                           |
+ROW   |2368     |30924 |Application |Etcd                                                           |
+ROW   |2369     |30927 |Application |Etcd                                                           |
+ROW   |2370     |30928 |Application |Etcd                                                           |
+ROW   |2371     |30929 |Application |Etcd                                                           |
+ROW   |2372     |30930 |Application |Etcd                                                           |
+ROW   |2373     |30931 |Application |Etcd                                                           |
+ROW   |2374     |30932 |Application |Etcd                                                           |
+ROW   |2375     |30933 |Application |Etcd                                                           |
+ROW   |2376     |30934 |Application |Etcd                                                           |
+ROW   |2377     |30935 |Application |Etcd                                                           |
+ROW   |2378     |30936 |Application |Etcd                                                           |
+ROW   |2379     |30937 |Application |Etcd                                                           |
+ROW   |2380     |30938 |Application |Etcd                                                           |
+ROW   |2381     |30939 |Application |Etcd                                                           |
+ROW   |2382     |30940 |Application |Etcd                                                           |
+ROW   |2383     |30941 |Application |Etcd                                                           |
+ROW   |2384     |30942 |Application |Etcd                                                           |
+ROW   |2385     |30943 |Application |Etcd                                                           |
+ROW   |2386     |30944 |Application |Etcd                                                           |
+ROW   |2387     |30945 |Application |Etcd                                                           |
+ROW   |2388     |30946 |Application |Etcd                                                           |
+ROW   |2389     |30947 |Application |Etcd                                                           |
+ROW   |2390     |30948 |Application |Etcd                                                           |
+ROW   |2391     |30949 |Application |Etcd                                                           |
+ROW   |2392     |30950 |Application |Etcd                                                           |
+ROW   |2393     |30951 |Application |Etcd                                                           |
+ROW   |2394     |30952 |Application |Etcd                                                           |
+ROW   |2395     |30953 |Application |Etcd                                                           |
+ROW   |2396     |30954 |Application |Etcd                                                           |
+ROW   |2397     |30955 |Application |Etcd                                                           |
+ROW   |2398     |30956 |Application |Etcd                                                           |
+ROW   |2399     |30957 |Application |Etcd                                                           |
+ROW   |2400     |30958 |Application |Etcd                                                           |
+ROW   |2401     |30959 |Application |Etcd                                                           |
+ROW   |2402     |30960 |Application |Etcd                                                           |
+ROW   |2403     |30963 |Application |Etcd                                                           |
+ROW   |2404     |30925 |Application |Zabbix raw items                                               |
+ROW   |2405     |30926 |Application |Zabbix raw items                                               |
+ROW   |2406     |30968 |Application |IIS                                                            |
+ROW   |2407     |30969 |Application |IIS                                                            |
+ROW   |2408     |30970 |Application |IIS                                                            |
+ROW   |2409     |30971 |Application |IIS                                                            |
+ROW   |2410     |30972 |Application |IIS                                                            |
+ROW   |2411     |30973 |Application |IIS                                                            |
+ROW   |2412     |30974 |Application |IIS                                                            |
+ROW   |2413     |30975 |Application |IIS                                                            |
+ROW   |2414     |30976 |Application |IIS                                                            |
+ROW   |2415     |30977 |Application |IIS                                                            |
+ROW   |2416     |30978 |Application |IIS                                                            |
+ROW   |2417     |30979 |Application |IIS                                                            |
+ROW   |2418     |30980 |Application |IIS                                                            |
+ROW   |2419     |30981 |Application |IIS                                                            |
+ROW   |2420     |30982 |Application |IIS                                                            |
+ROW   |2421     |30983 |Application |IIS                                                            |
+ROW   |2422     |30984 |Application |IIS                                                            |
+ROW   |2423     |30985 |Application |IIS                                                            |
+ROW   |2424     |30986 |Application |IIS                                                            |
+ROW   |2425     |30987 |Application |IIS                                                            |
+ROW   |2426     |30988 |Application |IIS                                                            |
+ROW   |2427     |30989 |Application |IIS                                                            |
+ROW   |2428     |30990 |Application |IIS                                                            |
+ROW   |2429     |30991 |Application |IIS                                                            |
+ROW   |2430     |30992 |Application |IIS                                                            |
+ROW   |2431     |30993 |Application |IIS                                                            |
+ROW   |2432     |30994 |Application |IIS                                                            |
+ROW   |2433     |30995 |Application |IIS                                                            |
+ROW   |2434     |30996 |Application |IIS                                                            |
+ROW   |2435     |30997 |Application |IIS                                                            |
+ROW   |2436     |30998 |Application |IIS                                                            |
+ROW   |2437     |30999 |Application |IIS                                                            |
+ROW   |2438     |31000 |Application |IIS                                                            |
+ROW   |2439     |31001 |Application |IIS                                                            |
+ROW   |2440     |31002 |Application |IIS                                                            |
+ROW   |2441     |31003 |Application |IIS                                                            |
+ROW   |2442     |31004 |Application |IIS                                                            |
+ROW   |2443     |31010 |Application |IIS                                                            |
+ROW   |2444     |31011 |Application |IIS                                                            |
+ROW   |2445     |31012 |Application |IIS                                                            |
+ROW   |2446     |31013 |Application |IIS                                                            |
+ROW   |2447     |31014 |Application |IIS                                                            |
+ROW   |2448     |31015 |Application |IIS                                                            |
+ROW   |2449     |31016 |Application |IIS                                                            |
+ROW   |2450     |31017 |Application |IIS                                                            |
+ROW   |2451     |31018 |Application |IIS                                                            |
+ROW   |2452     |31019 |Application |IIS                                                            |
+ROW   |2453     |31020 |Application |IIS                                                            |
+ROW   |2454     |31021 |Application |IIS                                                            |
+ROW   |2455     |31022 |Application |IIS                                                            |
+ROW   |2456     |31023 |Application |IIS                                                            |
+ROW   |2457     |31024 |Application |IIS                                                            |
+ROW   |2458     |31025 |Application |IIS                                                            |
+ROW   |2459     |31026 |Application |IIS                                                            |
+ROW   |2460     |31027 |Application |IIS                                                            |
+ROW   |2461     |31028 |Application |IIS                                                            |
+ROW   |2462     |31029 |Application |IIS                                                            |
+ROW   |2463     |31030 |Application |IIS                                                            |
+ROW   |2464     |31031 |Application |IIS                                                            |
+ROW   |2465     |31032 |Application |IIS                                                            |
+ROW   |2466     |31033 |Application |IIS                                                            |
+ROW   |2467     |31034 |Application |IIS                                                            |
+ROW   |2468     |31035 |Application |IIS                                                            |
+ROW   |2469     |31036 |Application |IIS                                                            |
+ROW   |2470     |31037 |Application |IIS                                                            |
+ROW   |2471     |31038 |Application |IIS                                                            |
+ROW   |2472     |31039 |Application |IIS                                                            |
+ROW   |2473     |31040 |Application |IIS                                                            |
+ROW   |2474     |31041 |Application |IIS                                                            |
+ROW   |2475     |31042 |Application |IIS                                                            |
+ROW   |2476     |31043 |Application |IIS                                                            |
+ROW   |2477     |31044 |Application |IIS                                                            |
+ROW   |2478     |31045 |Application |IIS                                                            |
+ROW   |2479     |31046 |Application |IIS                                                            |
+ROW   |2480     |31056 |Application |MSSQL                                                          |
+ROW   |2481     |31057 |Application |MSSQL                                                          |
+ROW   |2482     |31058 |Application |MSSQL                                                          |
+ROW   |2483     |31060 |Application |MSSQL                                                          |
+ROW   |2484     |31061 |Application |MSSQL                                                          |
+ROW   |2485     |31062 |Application |MSSQL                                                          |
+ROW   |2486     |31063 |Application |MSSQL                                                          |
+ROW   |2487     |31064 |Application |MSSQL                                                          |
+ROW   |2488     |31065 |Application |MSSQL                                                          |
+ROW   |2489     |31066 |Application |MSSQL                                                          |
+ROW   |2490     |31067 |Application |MSSQL                                                          |
+ROW   |2491     |31068 |Application |MSSQL                                                          |
+ROW   |2492     |31069 |Application |MSSQL                                                          |
+ROW   |2493     |31070 |Application |MSSQL                                                          |
+ROW   |2494     |31071 |Application |MSSQL                                                          |
+ROW   |2495     |31072 |Application |MSSQL                                                          |
+ROW   |2496     |31073 |Application |MSSQL                                                          |
+ROW   |2497     |31074 |Application |MSSQL                                                          |
+ROW   |2498     |31075 |Application |MSSQL                                                          |
+ROW   |2499     |31076 |Application |MSSQL                                                          |
+ROW   |2500     |31077 |Application |MSSQL                                                          |
+ROW   |2501     |31078 |Application |MSSQL                                                          |
+ROW   |2502     |31079 |Application |MSSQL                                                          |
+ROW   |2503     |31080 |Application |MSSQL                                                          |
+ROW   |2504     |31081 |Application |MSSQL                                                          |
+ROW   |2505     |31082 |Application |MSSQL                                                          |
+ROW   |2506     |31083 |Application |MSSQL                                                          |
+ROW   |2507     |31084 |Application |MSSQL                                                          |
+ROW   |2508     |31085 |Application |MSSQL                                                          |
+ROW   |2509     |31086 |Application |MSSQL                                                          |
+ROW   |2510     |31087 |Application |MSSQL                                                          |
+ROW   |2511     |31088 |Application |MSSQL                                                          |
+ROW   |2512     |31089 |Application |MSSQL                                                          |
+ROW   |2513     |31090 |Application |MSSQL                                                          |
+ROW   |2514     |31092 |Application |MSSQL                                                          |
+ROW   |2515     |31095 |Application |MSSQL                                                          |
+ROW   |2516     |31096 |Application |MSSQL                                                          |
+ROW   |2517     |31097 |Application |MSSQL                                                          |
+ROW   |2518     |31098 |Application |MSSQL                                                          |
+ROW   |2519     |31099 |Application |MSSQL                                                          |
+ROW   |2520     |31100 |Application |MSSQL                                                          |
+ROW   |2521     |31101 |Application |MSSQL                                                          |
+ROW   |2522     |31102 |Application |MSSQL                                                          |
+ROW   |2523     |31103 |Application |MSSQL                                                          |
+ROW   |2524     |31104 |Application |MSSQL                                                          |
+ROW   |2525     |31105 |Application |MSSQL                                                          |
+ROW   |2526     |31106 |Application |MSSQL                                                          |
+ROW   |2527     |31107 |Application |MSSQL                                                          |
+ROW   |2528     |31108 |Application |MSSQL                                                          |
+ROW   |2529     |31109 |Application |MSSQL                                                          |
+ROW   |2530     |31110 |Application |MSSQL                                                          |
+ROW   |2531     |31111 |Application |MSSQL                                                          |
+ROW   |2532     |31112 |Application |MSSQL                                                          |
+ROW   |2533     |31113 |Application |MSSQL                                                          |
+ROW   |2534     |31114 |Application |MSSQL                                                          |
+ROW   |2535     |31115 |Application |MSSQL                                                          |
+ROW   |2536     |31116 |Application |MSSQL                                                          |
+ROW   |2537     |31117 |Application |MSSQL                                                          |
+ROW   |2538     |31118 |Application |MSSQL                                                          |
+ROW   |2539     |31119 |Application |MSSQL                                                          |
+ROW   |2540     |31120 |Application |MSSQL                                                          |
+ROW   |2541     |31121 |Application |MSSQL                                                          |
+ROW   |2542     |31554 |Application |MSSQL                                                          |
+ROW   |2543     |31555 |Application |MSSQL                                                          |
+ROW   |2544     |31556 |Application |MSSQL                                                          |
+ROW   |2545     |31055 |Application |Zabbix raw items                                               |
+ROW   |2546     |31059 |Application |Zabbix raw items                                               |
+ROW   |2547     |31091 |Application |Zabbix raw items                                               |
+ROW   |2548     |31093 |Application |Zabbix raw items                                               |
+ROW   |2549     |31094 |Application |Zabbix raw items                                               |
+ROW   |2550     |31128 |Application |Zabbix raw items                                               |
+ROW   |2551     |31129 |Application |Zabbix raw items                                               |
+ROW   |2552     |31130 |Application |Zabbix raw items                                               |
+ROW   |2553     |31132 |Application |Zabbix raw items                                               |
+ROW   |2554     |33941 |Application |Zabbix raw items                                               |
+ROW   |2555     |31183 |Application |Oracle                                                         |
+ROW   |2556     |31184 |Application |Oracle                                                         |
+ROW   |2557     |31189 |Application |Oracle                                                         |
+ROW   |2558     |31190 |Application |Oracle                                                         |
+ROW   |2559     |31191 |Application |Oracle                                                         |
+ROW   |2560     |31192 |Application |Oracle                                                         |
+ROW   |2561     |31193 |Application |Oracle                                                         |
+ROW   |2562     |31194 |Application |Oracle                                                         |
+ROW   |2563     |31195 |Application |Oracle                                                         |
+ROW   |2564     |31196 |Application |Oracle                                                         |
+ROW   |2565     |31197 |Application |Oracle                                                         |
+ROW   |2566     |31198 |Application |Oracle                                                         |
+ROW   |2567     |31199 |Application |Oracle                                                         |
+ROW   |2568     |31200 |Application |Oracle                                                         |
+ROW   |2569     |31201 |Application |Oracle                                                         |
+ROW   |2570     |31202 |Application |Oracle                                                         |
+ROW   |2571     |31203 |Application |Oracle                                                         |
+ROW   |2572     |31204 |Application |Oracle                                                         |
+ROW   |2573     |31205 |Application |Oracle                                                         |
+ROW   |2574     |31206 |Application |Oracle                                                         |
+ROW   |2575     |31207 |Application |Oracle                                                         |
+ROW   |2576     |31208 |Application |Oracle                                                         |
+ROW   |2577     |31209 |Application |Oracle                                                         |
+ROW   |2578     |31210 |Application |Oracle                                                         |
+ROW   |2579     |31211 |Application |Oracle                                                         |
+ROW   |2580     |31212 |Application |Oracle                                                         |
+ROW   |2581     |31213 |Application |Oracle                                                         |
+ROW   |2582     |31214 |Application |Oracle                                                         |
+ROW   |2583     |31215 |Application |Oracle                                                         |
+ROW   |2584     |31216 |Application |Oracle                                                         |
+ROW   |2585     |31217 |Application |Oracle                                                         |
+ROW   |2586     |31218 |Application |Oracle                                                         |
+ROW   |2587     |31219 |Application |Oracle                                                         |
+ROW   |2588     |31220 |Application |Oracle                                                         |
+ROW   |2589     |31221 |Application |Oracle                                                         |
+ROW   |2590     |31222 |Application |Oracle                                                         |
+ROW   |2591     |31223 |Application |Oracle                                                         |
+ROW   |2592     |31224 |Application |Oracle                                                         |
+ROW   |2593     |31225 |Application |Oracle                                                         |
+ROW   |2594     |31226 |Application |Oracle                                                         |
+ROW   |2595     |31227 |Application |Oracle                                                         |
+ROW   |2596     |31228 |Application |Oracle                                                         |
+ROW   |2597     |31229 |Application |Oracle                                                         |
+ROW   |2598     |31230 |Application |Oracle                                                         |
+ROW   |2599     |31231 |Application |Oracle                                                         |
+ROW   |2600     |31232 |Application |Oracle                                                         |
+ROW   |2601     |31233 |Application |Oracle                                                         |
+ROW   |2602     |31234 |Application |Oracle                                                         |
+ROW   |2603     |31235 |Application |Oracle                                                         |
+ROW   |2604     |31236 |Application |Oracle                                                         |
+ROW   |2605     |31237 |Application |Oracle                                                         |
+ROW   |2606     |31238 |Application |Oracle                                                         |
+ROW   |2607     |31239 |Application |Oracle                                                         |
+ROW   |2608     |31240 |Application |Oracle                                                         |
+ROW   |2609     |31241 |Application |Oracle                                                         |
+ROW   |2610     |31242 |Application |Oracle                                                         |
+ROW   |2611     |31243 |Application |Oracle                                                         |
+ROW   |2612     |31244 |Application |Oracle                                                         |
+ROW   |2613     |31245 |Application |Oracle                                                         |
+ROW   |2614     |31246 |Application |Oracle                                                         |
+ROW   |2615     |31247 |Application |Oracle                                                         |
+ROW   |2616     |31248 |Application |Oracle                                                         |
+ROW   |2617     |31249 |Application |Oracle                                                         |
+ROW   |2618     |31250 |Application |Oracle                                                         |
+ROW   |2619     |31251 |Application |Oracle                                                         |
+ROW   |2620     |31252 |Application |Oracle                                                         |
+ROW   |2621     |31180 |Application |Zabbix raw items                                               |
+ROW   |2622     |31181 |Application |Zabbix raw items                                               |
+ROW   |2623     |31182 |Application |Zabbix raw items                                               |
+ROW   |2624     |31185 |Application |Zabbix raw items                                               |
+ROW   |2625     |31186 |Application |Zabbix raw items                                               |
+ROW   |2626     |31187 |Application |Zabbix raw items                                               |
+ROW   |2627     |31188 |Application |Zabbix raw items                                               |
+ROW   |2628     |31275 |Application |PostgreSQL                                                     |
+ROW   |2629     |31282 |Application |PostgreSQL                                                     |
+ROW   |2630     |31283 |Application |PostgreSQL                                                     |
+ROW   |2631     |31284 |Application |PostgreSQL                                                     |
+ROW   |2632     |31285 |Application |PostgreSQL                                                     |
+ROW   |2633     |31286 |Application |PostgreSQL                                                     |
+ROW   |2634     |31287 |Application |PostgreSQL                                                     |
+ROW   |2635     |31288 |Application |PostgreSQL                                                     |
+ROW   |2636     |31291 |Application |PostgreSQL                                                     |
+ROW   |2637     |31293 |Application |PostgreSQL                                                     |
+ROW   |2638     |31294 |Application |PostgreSQL                                                     |
+ROW   |2639     |31295 |Application |PostgreSQL                                                     |
+ROW   |2640     |31296 |Application |PostgreSQL                                                     |
+ROW   |2641     |31297 |Application |PostgreSQL                                                     |
+ROW   |2642     |31298 |Application |PostgreSQL                                                     |
+ROW   |2643     |31299 |Application |PostgreSQL                                                     |
+ROW   |2644     |31300 |Application |PostgreSQL                                                     |
+ROW   |2645     |31301 |Application |PostgreSQL                                                     |
+ROW   |2646     |31302 |Application |PostgreSQL                                                     |
+ROW   |2647     |31303 |Application |PostgreSQL                                                     |
+ROW   |2648     |31304 |Application |PostgreSQL                                                     |
+ROW   |2649     |31305 |Application |PostgreSQL                                                     |
+ROW   |2650     |31306 |Application |PostgreSQL                                                     |
+ROW   |2651     |31307 |Application |PostgreSQL                                                     |
+ROW   |2652     |31309 |Application |PostgreSQL                                                     |
+ROW   |2653     |31310 |Application |PostgreSQL                                                     |
+ROW   |2654     |31311 |Application |PostgreSQL                                                     |
+ROW   |2655     |31312 |Application |PostgreSQL                                                     |
+ROW   |2656     |31313 |Application |PostgreSQL                                                     |
+ROW   |2657     |31314 |Application |PostgreSQL                                                     |
+ROW   |2658     |31315 |Application |PostgreSQL                                                     |
+ROW   |2659     |31316 |Application |PostgreSQL                                                     |
+ROW   |2660     |31317 |Application |PostgreSQL                                                     |
+ROW   |2661     |31318 |Application |PostgreSQL                                                     |
+ROW   |2662     |31319 |Application |PostgreSQL                                                     |
+ROW   |2663     |31320 |Application |PostgreSQL                                                     |
+ROW   |2664     |31321 |Application |PostgreSQL                                                     |
+ROW   |2665     |31322 |Application |PostgreSQL                                                     |
+ROW   |2666     |31323 |Application |PostgreSQL                                                     |
+ROW   |2667     |31324 |Application |PostgreSQL                                                     |
+ROW   |2668     |31325 |Application |PostgreSQL                                                     |
+ROW   |2669     |31326 |Application |PostgreSQL                                                     |
+ROW   |2670     |31327 |Application |PostgreSQL                                                     |
+ROW   |2671     |31328 |Application |PostgreSQL                                                     |
+ROW   |2672     |31329 |Application |PostgreSQL                                                     |
+ROW   |2673     |31330 |Application |PostgreSQL                                                     |
+ROW   |2674     |31331 |Application |PostgreSQL                                                     |
+ROW   |2675     |31332 |Application |PostgreSQL                                                     |
+ROW   |2676     |31333 |Application |PostgreSQL                                                     |
+ROW   |2677     |33172 |Application |PostgreSQL                                                     |
+ROW   |2678     |33173 |Application |PostgreSQL                                                     |
+ROW   |2679     |33174 |Application |PostgreSQL                                                     |
+ROW   |2680     |33176 |Application |PostgreSQL                                                     |
+ROW   |2681     |31274 |Application |Zabbix raw items                                               |
+ROW   |2682     |31276 |Application |Zabbix raw items                                               |
+ROW   |2683     |31277 |Application |Zabbix raw items                                               |
+ROW   |2684     |31279 |Application |Zabbix raw items                                               |
+ROW   |2685     |31280 |Application |Zabbix raw items                                               |
+ROW   |2686     |31289 |Application |Zabbix raw items                                               |
+ROW   |2687     |31290 |Application |Zabbix raw items                                               |
+ROW   |2688     |33175 |Application |Zabbix raw items                                               |
+ROW   |2689     |31572 |Application |PHP-FPM                                                        |
+ROW   |2690     |31573 |Application |PHP-FPM                                                        |
+ROW   |2691     |31574 |Application |PHP-FPM                                                        |
+ROW   |2692     |31575 |Application |PHP-FPM                                                        |
+ROW   |2693     |31576 |Application |PHP-FPM                                                        |
+ROW   |2694     |31577 |Application |PHP-FPM                                                        |
+ROW   |2695     |31578 |Application |PHP-FPM                                                        |
+ROW   |2696     |31579 |Application |PHP-FPM                                                        |
+ROW   |2697     |31580 |Application |PHP-FPM                                                        |
+ROW   |2698     |31581 |Application |PHP-FPM                                                        |
+ROW   |2699     |31582 |Application |PHP-FPM                                                        |
+ROW   |2700     |31583 |Application |PHP-FPM                                                        |
+ROW   |2701     |31584 |Application |PHP-FPM                                                        |
+ROW   |2702     |31585 |Application |PHP-FPM                                                        |
+ROW   |2703     |31586 |Application |PHP-FPM                                                        |
+ROW   |2704     |31587 |Application |PHP-FPM                                                        |
+ROW   |2705     |31588 |Application |PHP-FPM                                                        |
+ROW   |2706     |31589 |Application |PHP-FPM                                                        |
+ROW   |2707     |31590 |Application |PHP-FPM                                                        |
+ROW   |2708     |31591 |Application |PHP-FPM                                                        |
+ROW   |2709     |31592 |Application |PHP-FPM                                                        |
+ROW   |2710     |31570 |Application |Zabbix raw items                                               |
+ROW   |2711     |31571 |Application |Zabbix raw items                                               |
+ROW   |2712     |31593 |Application |PHP-FPM                                                        |
+ROW   |2713     |31596 |Application |PHP-FPM                                                        |
+ROW   |2714     |31597 |Application |PHP-FPM                                                        |
+ROW   |2715     |31598 |Application |PHP-FPM                                                        |
+ROW   |2716     |31599 |Application |PHP-FPM                                                        |
+ROW   |2717     |31600 |Application |PHP-FPM                                                        |
+ROW   |2718     |31601 |Application |PHP-FPM                                                        |
+ROW   |2719     |31602 |Application |PHP-FPM                                                        |
+ROW   |2720     |31603 |Application |PHP-FPM                                                        |
+ROW   |2721     |31604 |Application |PHP-FPM                                                        |
+ROW   |2722     |31605 |Application |PHP-FPM                                                        |
+ROW   |2723     |31606 |Application |PHP-FPM                                                        |
+ROW   |2724     |31607 |Application |PHP-FPM                                                        |
+ROW   |2725     |31608 |Application |PHP-FPM                                                        |
+ROW   |2726     |31609 |Application |PHP-FPM                                                        |
+ROW   |2727     |31610 |Application |PHP-FPM                                                        |
+ROW   |2728     |31611 |Application |PHP-FPM                                                        |
+ROW   |2729     |31594 |Application |Zabbix raw items                                               |
+ROW   |2730     |31595 |Application |Zabbix raw items                                               |
+ROW   |2731     |31684 |Application |Oracle                                                         |
+ROW   |2732     |31685 |Application |Oracle                                                         |
+ROW   |2733     |31687 |Application |Oracle                                                         |
+ROW   |2734     |31695 |Application |Oracle                                                         |
+ROW   |2735     |31696 |Application |Oracle                                                         |
+ROW   |2736     |31701 |Application |Oracle                                                         |
+ROW   |2737     |31702 |Application |Oracle                                                         |
+ROW   |2738     |31703 |Application |Oracle                                                         |
+ROW   |2739     |31704 |Application |Oracle                                                         |
+ROW   |2740     |31705 |Application |Oracle                                                         |
+ROW   |2741     |31706 |Application |Oracle                                                         |
+ROW   |2742     |31707 |Application |Oracle                                                         |
+ROW   |2743     |31708 |Application |Oracle                                                         |
+ROW   |2744     |31709 |Application |Oracle                                                         |
+ROW   |2745     |31710 |Application |Oracle                                                         |
+ROW   |2746     |31711 |Application |Oracle                                                         |
+ROW   |2747     |31712 |Application |Oracle                                                         |
+ROW   |2748     |31713 |Application |Oracle                                                         |
+ROW   |2749     |31714 |Application |Oracle                                                         |
+ROW   |2750     |31715 |Application |Oracle                                                         |
+ROW   |2751     |31716 |Application |Oracle                                                         |
+ROW   |2752     |31717 |Application |Oracle                                                         |
+ROW   |2753     |31718 |Application |Oracle                                                         |
+ROW   |2754     |31719 |Application |Oracle                                                         |
+ROW   |2755     |31720 |Application |Oracle                                                         |
+ROW   |2756     |31721 |Application |Oracle                                                         |
+ROW   |2757     |31722 |Application |Oracle                                                         |
+ROW   |2758     |31723 |Application |Oracle                                                         |
+ROW   |2759     |31724 |Application |Oracle                                                         |
+ROW   |2760     |31725 |Application |Oracle                                                         |
+ROW   |2761     |31726 |Application |Oracle                                                         |
+ROW   |2762     |31727 |Application |Oracle                                                         |
+ROW   |2763     |31728 |Application |Oracle                                                         |
+ROW   |2764     |31729 |Application |Oracle                                                         |
+ROW   |2765     |31730 |Application |Oracle                                                         |
+ROW   |2766     |31731 |Application |Oracle                                                         |
+ROW   |2767     |31732 |Application |Oracle                                                         |
+ROW   |2768     |31733 |Application |Oracle                                                         |
+ROW   |2769     |31734 |Application |Oracle                                                         |
+ROW   |2770     |31735 |Application |Oracle                                                         |
+ROW   |2771     |31736 |Application |Oracle                                                         |
+ROW   |2772     |31737 |Application |Oracle                                                         |
+ROW   |2773     |31738 |Application |Oracle                                                         |
+ROW   |2774     |31739 |Application |Oracle                                                         |
+ROW   |2775     |31740 |Application |Oracle                                                         |
+ROW   |2776     |31741 |Application |Oracle                                                         |
+ROW   |2777     |31742 |Application |Oracle                                                         |
+ROW   |2778     |31743 |Application |Oracle                                                         |
+ROW   |2779     |31744 |Application |Oracle                                                         |
+ROW   |2780     |31745 |Application |Oracle                                                         |
+ROW   |2781     |31746 |Application |Oracle                                                         |
+ROW   |2782     |31747 |Application |Oracle                                                         |
+ROW   |2783     |31748 |Application |Oracle                                                         |
+ROW   |2784     |31749 |Application |Oracle                                                         |
+ROW   |2785     |31750 |Application |Oracle                                                         |
+ROW   |2786     |31751 |Application |Oracle                                                         |
+ROW   |2787     |31752 |Application |Oracle                                                         |
+ROW   |2788     |31753 |Application |Oracle                                                         |
+ROW   |2789     |31754 |Application |Oracle                                                         |
+ROW   |2790     |31755 |Application |Oracle                                                         |
+ROW   |2791     |31756 |Application |Oracle                                                         |
+ROW   |2792     |31757 |Application |Oracle                                                         |
+ROW   |2793     |31758 |Application |Oracle                                                         |
+ROW   |2794     |31759 |Application |Oracle                                                         |
+ROW   |2795     |31760 |Application |Oracle                                                         |
+ROW   |2796     |31686 |Application |Zabbix raw items                                               |
+ROW   |2797     |31688 |Application |Zabbix raw items                                               |
+ROW   |2798     |31689 |Application |Zabbix raw items                                               |
+ROW   |2799     |31690 |Application |Zabbix raw items                                               |
+ROW   |2800     |31691 |Application |Zabbix raw items                                               |
+ROW   |2801     |31692 |Application |Zabbix raw items                                               |
+ROW   |2802     |31693 |Application |Zabbix raw items                                               |
+ROW   |2803     |31694 |Application |Zabbix raw items                                               |
+ROW   |2804     |31697 |Application |Zabbix raw items                                               |
+ROW   |2805     |31698 |Application |Zabbix raw items                                               |
+ROW   |2806     |31699 |Application |Zabbix raw items                                               |
+ROW   |2807     |31700 |Application |Zabbix raw items                                               |
+ROW   |2808     |31782 |Application |Asterisk                                                       |
+ROW   |2809     |31783 |Application |Asterisk                                                       |
+ROW   |2810     |31785 |Application |Asterisk                                                       |
+ROW   |2811     |31786 |Application |Asterisk                                                       |
+ROW   |2812     |31787 |Application |Asterisk                                                       |
+ROW   |2813     |31788 |Application |Asterisk                                                       |
+ROW   |2814     |31789 |Application |Asterisk                                                       |
+ROW   |2815     |31790 |Application |Asterisk                                                       |
+ROW   |2816     |31791 |Application |Asterisk                                                       |
+ROW   |2817     |31792 |Application |Asterisk                                                       |
+ROW   |2818     |31793 |Application |Asterisk                                                       |
+ROW   |2819     |31794 |Application |Asterisk                                                       |
+ROW   |2820     |31795 |Application |Asterisk                                                       |
+ROW   |2821     |31796 |Application |Asterisk                                                       |
+ROW   |2822     |31797 |Application |Asterisk                                                       |
+ROW   |2823     |31798 |Application |Asterisk                                                       |
+ROW   |2824     |31799 |Application |Asterisk                                                       |
+ROW   |2825     |31800 |Application |Asterisk                                                       |
+ROW   |2826     |31801 |Application |Asterisk                                                       |
+ROW   |2827     |31802 |Application |Asterisk                                                       |
+ROW   |2828     |33389 |Application |Asterisk                                                       |
+ROW   |2829     |33390 |Application |Asterisk                                                       |
+ROW   |2830     |31784 |Application |Zabbix raw items                                               |
+ROW   |2831     |31904 |Application |Zabbix raw items                                               |
+ROW   |2832     |31934 |Application |Zabbix raw items                                               |
+ROW   |2833     |31937 |Application |Zabbix raw items                                               |
+ROW   |2834     |31820 |Application |CPU                                                            |
+ROW   |2835     |31821 |Application |CPU                                                            |
+ROW   |2836     |31822 |Application |CPU                                                            |
+ROW   |2837     |31823 |Application |CPU                                                            |
+ROW   |2838     |31824 |Application |CPU                                                            |
+ROW   |2839     |31825 |Application |CPU                                                            |
+ROW   |2840     |31826 |Application |CPU                                                            |
+ROW   |2841     |31827 |Application |CPU                                                            |
+ROW   |2842     |31828 |Application |CPU                                                            |
+ROW   |2843     |31829 |Application |CPU                                                            |
+ROW   |2844     |31830 |Application |CPU                                                            |
+ROW   |2845     |31831 |Application |CPU                                                            |
+ROW   |2846     |31832 |Application |CPU                                                            |
+ROW   |2847     |31833 |Application |CPU                                                            |
+ROW   |2848     |31834 |Application |CPU                                                            |
+ROW   |2849     |31835 |Application |CPU                                                            |
+ROW   |2850     |31892 |Application |CPU                                                            |
+ROW   |2851     |31836 |Application |General                                                        |
+ROW   |2852     |31837 |Application |General                                                        |
+ROW   |2853     |31838 |Application |General                                                        |
+ROW   |2854     |31839 |Application |General                                                        |
+ROW   |2855     |31840 |Application |General                                                        |
+ROW   |2856     |31841 |Application |General                                                        |
+ROW   |2857     |31842 |Application |General                                                        |
+ROW   |2858     |31846 |Application |General                                                        |
+ROW   |2859     |31848 |Application |General                                                        |
+ROW   |2860     |31843 |Application |Inventory                                                      |
+ROW   |2861     |31844 |Application |Inventory                                                      |
+ROW   |2862     |31845 |Application |Inventory                                                      |
+ROW   |2863     |31849 |Application |Security                                                       |
+ROW   |2864     |31847 |Application |Status                                                         |
+ROW   |2865     |31850 |Application |Memory                                                         |
+ROW   |2866     |31851 |Application |Memory                                                         |
+ROW   |2867     |31852 |Application |Memory                                                         |
+ROW   |2868     |31853 |Application |Memory                                                         |
+ROW   |2869     |31854 |Application |Memory                                                         |
+ROW   |2870     |31855 |Application |Memory                                                         |
+ROW   |2871     |31893 |Application |Memory                                                         |
+ROW   |2872     |31856 |Application |CPU                                                            |
+ROW   |2873     |31857 |Application |CPU                                                            |
+ROW   |2874     |31858 |Application |CPU                                                            |
+ROW   |2875     |31859 |Application |CPU                                                            |
+ROW   |2876     |31860 |Application |CPU                                                            |
+ROW   |2877     |31861 |Application |CPU                                                            |
+ROW   |2878     |31862 |Application |CPU                                                            |
+ROW   |2879     |31863 |Application |CPU                                                            |
+ROW   |2880     |31864 |Application |CPU                                                            |
+ROW   |2881     |31865 |Application |CPU                                                            |
+ROW   |2882     |31866 |Application |CPU                                                            |
+ROW   |2883     |31867 |Application |CPU                                                            |
+ROW   |2884     |31868 |Application |CPU                                                            |
+ROW   |2885     |31869 |Application |CPU                                                            |
+ROW   |2886     |31870 |Application |CPU                                                            |
+ROW   |2887     |31871 |Application |CPU                                                            |
+ROW   |2888     |31894 |Application |CPU                                                            |
+ROW   |2889     |31872 |Application |General                                                        |
+ROW   |2890     |31873 |Application |General                                                        |
+ROW   |2891     |31874 |Application |General                                                        |
+ROW   |2892     |31875 |Application |General                                                        |
+ROW   |2893     |31876 |Application |General                                                        |
+ROW   |2894     |31877 |Application |General                                                        |
+ROW   |2895     |31878 |Application |General                                                        |
+ROW   |2896     |31882 |Application |General                                                        |
+ROW   |2897     |31884 |Application |General                                                        |
+ROW   |2898     |31879 |Application |Inventory                                                      |
+ROW   |2899     |31880 |Application |Inventory                                                      |
+ROW   |2900     |31881 |Application |Inventory                                                      |
+ROW   |2901     |31886 |Application |Memory                                                         |
+ROW   |2902     |31887 |Application |Memory                                                         |
+ROW   |2903     |31888 |Application |Memory                                                         |
+ROW   |2904     |31889 |Application |Memory                                                         |
+ROW   |2905     |31890 |Application |Memory                                                         |
+ROW   |2906     |31891 |Application |Memory                                                         |
+ROW   |2907     |31895 |Application |Memory                                                         |
+ROW   |2908     |31816 |Application |Monitoring agent                                               |
+ROW   |2909     |31817 |Application |Monitoring agent                                               |
+ROW   |2910     |31818 |Application |Monitoring agent                                               |
+ROW   |2911     |31885 |Application |Security                                                       |
+ROW   |2912     |31819 |Application |Status                                                         |
+ROW   |2913     |31883 |Application |Status                                                         |
+ROW   |2914     |31919 |Application |Zabbix raw items                                               |
+ROW   |2915     |31940 |Application |Zabbix raw items                                               |
+ROW   |2916     |31943 |Application |Zabbix raw items                                               |
+ROW   |2917     |31948 |Application |CPU                                                            |
+ROW   |2918     |31949 |Application |CPU                                                            |
+ROW   |2919     |31950 |Application |CPU                                                            |
+ROW   |2920     |31951 |Application |CPU                                                            |
+ROW   |2921     |31952 |Application |CPU                                                            |
+ROW   |2922     |31953 |Application |CPU                                                            |
+ROW   |2923     |31954 |Application |CPU                                                            |
+ROW   |2924     |31955 |Application |CPU                                                            |
+ROW   |2925     |31956 |Application |General                                                        |
+ROW   |2926     |31957 |Application |General                                                        |
+ROW   |2927     |31958 |Application |General                                                        |
+ROW   |2928     |31959 |Application |General                                                        |
+ROW   |2929     |31961 |Application |General                                                        |
+ROW   |2930     |31960 |Application |Inventory                                                      |
+ROW   |2931     |31962 |Application |Status                                                         |
+ROW   |2932     |31963 |Application |Memory                                                         |
+ROW   |2933     |31964 |Application |Memory                                                         |
+ROW   |2934     |31965 |Application |Memory                                                         |
+ROW   |2935     |31966 |Application |Memory                                                         |
+ROW   |2936     |31967 |Application |Memory                                                         |
+ROW   |2937     |31968 |Application |Memory                                                         |
+ROW   |2938     |31969 |Application |Memory                                                         |
+ROW   |2939     |31970 |Application |Memory                                                         |
+ROW   |2940     |31971 |Application |Memory                                                         |
+ROW   |2941     |31972 |Application |Memory                                                         |
+ROW   |2942     |31973 |Application |Memory                                                         |
+ROW   |2943     |32002 |Application |Memory                                                         |
+ROW   |2944     |31974 |Application |Zabbix raw items                                               |
+ROW   |2945     |32025 |Application |Services                                                       |
+ROW   |2946     |31975 |Application |CPU                                                            |
+ROW   |2947     |31976 |Application |CPU                                                            |
+ROW   |2948     |31977 |Application |CPU                                                            |
+ROW   |2949     |31978 |Application |CPU                                                            |
+ROW   |2950     |31979 |Application |CPU                                                            |
+ROW   |2951     |31980 |Application |CPU                                                            |
+ROW   |2952     |31981 |Application |CPU                                                            |
+ROW   |2953     |31982 |Application |CPU                                                            |
+ROW   |2954     |31983 |Application |General                                                        |
+ROW   |2955     |31984 |Application |General                                                        |
+ROW   |2956     |31985 |Application |General                                                        |
+ROW   |2957     |31986 |Application |General                                                        |
+ROW   |2958     |31988 |Application |General                                                        |
+ROW   |2959     |31987 |Application |Inventory                                                      |
+ROW   |2960     |31990 |Application |Memory                                                         |
+ROW   |2961     |31991 |Application |Memory                                                         |
+ROW   |2962     |31992 |Application |Memory                                                         |
+ROW   |2963     |31993 |Application |Memory                                                         |
+ROW   |2964     |31994 |Application |Memory                                                         |
+ROW   |2965     |31995 |Application |Memory                                                         |
+ROW   |2966     |31996 |Application |Memory                                                         |
+ROW   |2967     |31997 |Application |Memory                                                         |
+ROW   |2968     |31998 |Application |Memory                                                         |
+ROW   |2969     |31999 |Application |Memory                                                         |
+ROW   |2970     |32000 |Application |Memory                                                         |
+ROW   |2971     |32003 |Application |Memory                                                         |
+ROW   |2972     |31944 |Application |Monitoring agent                                               |
+ROW   |2973     |31945 |Application |Monitoring agent                                               |
+ROW   |2974     |31946 |Application |Monitoring agent                                               |
+ROW   |2975     |32039 |Application |Services                                                       |
+ROW   |2976     |31947 |Application |Status                                                         |
+ROW   |2977     |31989 |Application |Status                                                         |
+ROW   |2978     |32001 |Application |Zabbix raw items                                               |
+ROW   |2979     |32120 |Application |Ceph                                                           |
+ROW   |2980     |32122 |Application |Ceph                                                           |
+ROW   |2981     |32123 |Application |Ceph                                                           |
+ROW   |2982     |32124 |Application |Ceph                                                           |
+ROW   |2983     |32125 |Application |Ceph                                                           |
+ROW   |2984     |32126 |Application |Ceph                                                           |
+ROW   |2985     |32127 |Application |Ceph                                                           |
+ROW   |2986     |32128 |Application |Ceph                                                           |
+ROW   |2987     |32129 |Application |Ceph                                                           |
+ROW   |2988     |32130 |Application |Ceph                                                           |
+ROW   |2989     |32131 |Application |Ceph                                                           |
+ROW   |2990     |32132 |Application |Ceph                                                           |
+ROW   |2991     |32133 |Application |Ceph                                                           |
+ROW   |2992     |32134 |Application |Ceph                                                           |
+ROW   |2993     |32135 |Application |Ceph                                                           |
+ROW   |2994     |32136 |Application |Ceph                                                           |
+ROW   |2995     |32137 |Application |Ceph                                                           |
+ROW   |2996     |32138 |Application |Ceph                                                           |
+ROW   |2997     |32139 |Application |Ceph                                                           |
+ROW   |2998     |32140 |Application |Ceph                                                           |
+ROW   |2999     |32141 |Application |Ceph                                                           |
+ROW   |3000     |32142 |Application |Ceph                                                           |
+ROW   |3001     |32143 |Application |Ceph                                                           |
+ROW   |3002     |32144 |Application |Ceph                                                           |
+ROW   |3003     |32145 |Application |Ceph                                                           |
+ROW   |3004     |32146 |Application |Ceph                                                           |
+ROW   |3005     |32147 |Application |Ceph                                                           |
+ROW   |3006     |32148 |Application |Ceph                                                           |
+ROW   |3007     |32149 |Application |Ceph                                                           |
+ROW   |3008     |32150 |Application |Ceph                                                           |
+ROW   |3009     |32151 |Application |Ceph                                                           |
+ROW   |3010     |32152 |Application |Ceph                                                           |
+ROW   |3011     |32153 |Application |Ceph                                                           |
+ROW   |3012     |32154 |Application |Ceph                                                           |
+ROW   |3013     |32155 |Application |Ceph                                                           |
+ROW   |3014     |32156 |Application |Ceph                                                           |
+ROW   |3015     |32157 |Application |Ceph                                                           |
+ROW   |3016     |32158 |Application |Ceph                                                           |
+ROW   |3017     |32159 |Application |Ceph                                                           |
+ROW   |3018     |32160 |Application |Ceph                                                           |
+ROW   |3019     |32161 |Application |Ceph                                                           |
+ROW   |3020     |32162 |Application |Ceph                                                           |
+ROW   |3021     |32163 |Application |Ceph                                                           |
+ROW   |3022     |32164 |Application |Ceph                                                           |
+ROW   |3023     |32165 |Application |Ceph                                                           |
+ROW   |3024     |32166 |Application |Ceph                                                           |
+ROW   |3025     |32167 |Application |Ceph                                                           |
+ROW   |3026     |32117 |Application |Zabbix raw items                                               |
+ROW   |3027     |32118 |Application |Zabbix raw items                                               |
+ROW   |3028     |32119 |Application |Zabbix raw items                                               |
+ROW   |3029     |32121 |Application |Zabbix raw items                                               |
+ROW   |3030     |32239 |Application |Squid                                                          |
+ROW   |3031     |32240 |Application |Squid                                                          |
+ROW   |3032     |32241 |Application |Squid                                                          |
+ROW   |3033     |32242 |Application |Squid                                                          |
+ROW   |3034     |32243 |Application |Squid                                                          |
+ROW   |3035     |32244 |Application |Squid                                                          |
+ROW   |3036     |32245 |Application |Squid                                                          |
+ROW   |3037     |32246 |Application |Squid                                                          |
+ROW   |3038     |32247 |Application |Squid                                                          |
+ROW   |3039     |32248 |Application |Squid                                                          |
+ROW   |3040     |32249 |Application |Squid                                                          |
+ROW   |3041     |32250 |Application |Squid                                                          |
+ROW   |3042     |32251 |Application |Squid                                                          |
+ROW   |3043     |32252 |Application |Squid                                                          |
+ROW   |3044     |32253 |Application |Squid                                                          |
+ROW   |3045     |32254 |Application |Squid                                                          |
+ROW   |3046     |32255 |Application |Squid                                                          |
+ROW   |3047     |32256 |Application |Squid                                                          |
+ROW   |3048     |32257 |Application |Squid                                                          |
+ROW   |3049     |32258 |Application |Squid                                                          |
+ROW   |3050     |32259 |Application |Squid                                                          |
+ROW   |3051     |32260 |Application |Squid                                                          |
+ROW   |3052     |32261 |Application |Squid                                                          |
+ROW   |3053     |32262 |Application |Squid                                                          |
+ROW   |3054     |32263 |Application |Squid                                                          |
+ROW   |3055     |32264 |Application |Squid                                                          |
+ROW   |3056     |32265 |Application |Squid                                                          |
+ROW   |3057     |32266 |Application |Squid                                                          |
+ROW   |3058     |32267 |Application |Squid                                                          |
+ROW   |3059     |32268 |Application |Squid                                                          |
+ROW   |3060     |32269 |Application |Squid                                                          |
+ROW   |3061     |32270 |Application |Squid                                                          |
+ROW   |3062     |32271 |Application |Squid                                                          |
+ROW   |3063     |32272 |Application |Squid                                                          |
+ROW   |3064     |32273 |Application |Squid                                                          |
+ROW   |3065     |32274 |Application |Squid                                                          |
+ROW   |3066     |32275 |Application |Squid                                                          |
+ROW   |3067     |32276 |Application |Squid                                                          |
+ROW   |3068     |32277 |Application |Squid                                                          |
+ROW   |3069     |32278 |Application |Squid                                                          |
+ROW   |3070     |32279 |Application |Squid                                                          |
+ROW   |3071     |32280 |Application |Squid                                                          |
+ROW   |3072     |32281 |Application |Squid                                                          |
+ROW   |3073     |32282 |Application |Squid                                                          |
+ROW   |3074     |32283 |Application |Squid                                                          |
+ROW   |3075     |32284 |Application |Squid                                                          |
+ROW   |3076     |32285 |Application |Squid                                                          |
+ROW   |3077     |32286 |Application |Squid                                                          |
+ROW   |3078     |32287 |Application |Squid                                                          |
+ROW   |3079     |32288 |Application |Squid                                                          |
+ROW   |3080     |32289 |Application |Squid                                                          |
+ROW   |3081     |32290 |Application |Squid                                                          |
+ROW   |3082     |32291 |Application |Squid                                                          |
+ROW   |3083     |32292 |Application |Squid                                                          |
+ROW   |3084     |32366 |Application |PostgreSQL                                                     |
+ROW   |3085     |32367 |Application |PostgreSQL                                                     |
+ROW   |3086     |32369 |Application |PostgreSQL                                                     |
+ROW   |3087     |32370 |Application |PostgreSQL                                                     |
+ROW   |3088     |32371 |Application |PostgreSQL                                                     |
+ROW   |3089     |32372 |Application |PostgreSQL                                                     |
+ROW   |3090     |32373 |Application |PostgreSQL                                                     |
+ROW   |3091     |32374 |Application |PostgreSQL                                                     |
+ROW   |3092     |32377 |Application |PostgreSQL                                                     |
+ROW   |3093     |32378 |Application |PostgreSQL                                                     |
+ROW   |3094     |32381 |Application |PostgreSQL                                                     |
+ROW   |3095     |32382 |Application |PostgreSQL                                                     |
+ROW   |3096     |32383 |Application |PostgreSQL                                                     |
+ROW   |3097     |32384 |Application |PostgreSQL                                                     |
+ROW   |3098     |32385 |Application |PostgreSQL                                                     |
+ROW   |3099     |32386 |Application |PostgreSQL                                                     |
+ROW   |3100     |32387 |Application |PostgreSQL                                                     |
+ROW   |3101     |32388 |Application |PostgreSQL                                                     |
+ROW   |3102     |32389 |Application |PostgreSQL                                                     |
+ROW   |3103     |32390 |Application |PostgreSQL                                                     |
+ROW   |3104     |32391 |Application |PostgreSQL                                                     |
+ROW   |3105     |32392 |Application |PostgreSQL                                                     |
+ROW   |3106     |32393 |Application |PostgreSQL                                                     |
+ROW   |3107     |32394 |Application |PostgreSQL                                                     |
+ROW   |3108     |32395 |Application |PostgreSQL                                                     |
+ROW   |3109     |32396 |Application |PostgreSQL                                                     |
+ROW   |3110     |32397 |Application |PostgreSQL                                                     |
+ROW   |3111     |32398 |Application |PostgreSQL                                                     |
+ROW   |3112     |32399 |Application |PostgreSQL                                                     |
+ROW   |3113     |32400 |Application |PostgreSQL                                                     |
+ROW   |3114     |32401 |Application |PostgreSQL                                                     |
+ROW   |3115     |32402 |Application |PostgreSQL                                                     |
+ROW   |3116     |32403 |Application |PostgreSQL                                                     |
+ROW   |3117     |32364 |Application |Zabbix raw items                                               |
+ROW   |3118     |32365 |Application |Zabbix raw items                                               |
+ROW   |3119     |32368 |Application |Zabbix raw items                                               |
+ROW   |3120     |32375 |Application |Zabbix raw items                                               |
+ROW   |3121     |32376 |Application |Zabbix raw items                                               |
+ROW   |3122     |32379 |Application |Zabbix raw items                                               |
+ROW   |3123     |32380 |Application |Zabbix raw items                                               |
+ROW   |3124     |32406 |Application |Zabbix raw items                                               |
+ROW   |3125     |32407 |Application |Zabbix raw items                                               |
+ROW   |3126     |32463 |Application |Zabbix raw items                                               |
+ROW   |3127     |32464 |Application |Zabbix raw items                                               |
+ROW   |3128     |32516 |Application |MS Exchange                                                    |
+ROW   |3129     |32517 |Application |MS Exchange                                                    |
+ROW   |3130     |32518 |Application |MS Exchange                                                    |
+ROW   |3131     |32519 |Application |MS Exchange                                                    |
+ROW   |3132     |32520 |Application |MS Exchange                                                    |
+ROW   |3133     |32521 |Application |MS Exchange                                                    |
+ROW   |3134     |32522 |Application |MS Exchange                                                    |
+ROW   |3135     |32523 |Application |MS Exchange                                                    |
+ROW   |3136     |32524 |Application |MS Exchange                                                    |
+ROW   |3137     |32543 |Application |MS Exchange                                                    |
+ROW   |3138     |32544 |Application |MS Exchange                                                    |
+ROW   |3139     |32545 |Application |MS Exchange                                                    |
+ROW   |3140     |32546 |Application |MS Exchange                                                    |
+ROW   |3141     |32547 |Application |MS Exchange                                                    |
+ROW   |3142     |32548 |Application |MS Exchange                                                    |
+ROW   |3143     |32549 |Application |MS Exchange                                                    |
+ROW   |3144     |32550 |Application |MS Exchange                                                    |
+ROW   |3145     |32551 |Application |MS Exchange                                                    |
+ROW   |3146     |32552 |Application |MS Exchange                                                    |
+ROW   |3147     |32553 |Application |MS Exchange                                                    |
+ROW   |3148     |32554 |Application |MS Exchange                                                    |
+ROW   |3149     |32573 |Application |MS Exchange                                                    |
+ROW   |3150     |32574 |Application |MS Exchange                                                    |
+ROW   |3151     |32575 |Application |MS Exchange                                                    |
+ROW   |3152     |32576 |Application |GitLab                                                         |
+ROW   |3153     |32577 |Application |GitLab                                                         |
+ROW   |3154     |32579 |Application |GitLab                                                         |
+ROW   |3155     |32580 |Application |GitLab                                                         |
+ROW   |3156     |32581 |Application |GitLab                                                         |
+ROW   |3157     |32582 |Application |GitLab                                                         |
+ROW   |3158     |32583 |Application |GitLab                                                         |
+ROW   |3159     |32584 |Application |GitLab                                                         |
+ROW   |3160     |32585 |Application |GitLab                                                         |
+ROW   |3161     |32586 |Application |GitLab                                                         |
+ROW   |3162     |32587 |Application |GitLab                                                         |
+ROW   |3163     |32588 |Application |GitLab                                                         |
+ROW   |3164     |32589 |Application |GitLab                                                         |
+ROW   |3165     |32590 |Application |GitLab                                                         |
+ROW   |3166     |32591 |Application |GitLab                                                         |
+ROW   |3167     |32592 |Application |GitLab                                                         |
+ROW   |3168     |32593 |Application |GitLab                                                         |
+ROW   |3169     |32594 |Application |GitLab                                                         |
+ROW   |3170     |32595 |Application |GitLab                                                         |
+ROW   |3171     |32596 |Application |GitLab                                                         |
+ROW   |3172     |32597 |Application |GitLab                                                         |
+ROW   |3173     |32598 |Application |GitLab                                                         |
+ROW   |3174     |32599 |Application |GitLab                                                         |
+ROW   |3175     |32600 |Application |GitLab                                                         |
+ROW   |3176     |32601 |Application |GitLab                                                         |
+ROW   |3177     |32602 |Application |GitLab                                                         |
+ROW   |3178     |32603 |Application |GitLab                                                         |
+ROW   |3179     |32604 |Application |GitLab                                                         |
+ROW   |3180     |32605 |Application |GitLab                                                         |
+ROW   |3181     |32606 |Application |GitLab                                                         |
+ROW   |3182     |32607 |Application |GitLab                                                         |
+ROW   |3183     |32608 |Application |GitLab                                                         |
+ROW   |3184     |32609 |Application |GitLab                                                         |
+ROW   |3185     |32610 |Application |GitLab                                                         |
+ROW   |3186     |32611 |Application |GitLab                                                         |
+ROW   |3187     |32612 |Application |GitLab                                                         |
+ROW   |3188     |32613 |Application |GitLab                                                         |
+ROW   |3189     |32614 |Application |GitLab                                                         |
+ROW   |3190     |32615 |Application |GitLab                                                         |
+ROW   |3191     |32616 |Application |GitLab                                                         |
+ROW   |3192     |32617 |Application |GitLab                                                         |
+ROW   |3193     |32618 |Application |GitLab                                                         |
+ROW   |3194     |32621 |Application |GitLab: Puma stats                                             |
+ROW   |3195     |32622 |Application |GitLab: Puma stats                                             |
+ROW   |3196     |32623 |Application |GitLab: Puma stats                                             |
+ROW   |3197     |32624 |Application |GitLab: Puma stats                                             |
+ROW   |3198     |32625 |Application |GitLab: Puma stats                                             |
+ROW   |3199     |32626 |Application |GitLab: Puma stats                                             |
+ROW   |3200     |32627 |Application |GitLab: Puma stats                                             |
+ROW   |3201     |32628 |Application |GitLab: Puma stats                                             |
+ROW   |3202     |32629 |Application |GitLab: Puma stats                                             |
+ROW   |3203     |32630 |Application |GitLab: Puma stats                                             |
+ROW   |3204     |32631 |Application |GitLab: Unicorn stats                                          |
+ROW   |3205     |32632 |Application |GitLab: Unicorn stats                                          |
+ROW   |3206     |32633 |Application |GitLab: Unicorn stats                                          |
+ROW   |3207     |32578 |Application |Zabbix raw items                                               |
+ROW   |3208     |32636 |Application |Hadoop                                                         |
+ROW   |3209     |32637 |Application |Hadoop                                                         |
+ROW   |3210     |32638 |Application |Hadoop                                                         |
+ROW   |3211     |32640 |Application |Hadoop                                                         |
+ROW   |3212     |32642 |Application |Hadoop                                                         |
+ROW   |3213     |32643 |Application |Hadoop                                                         |
+ROW   |3214     |32644 |Application |Hadoop                                                         |
+ROW   |3215     |32645 |Application |Hadoop                                                         |
+ROW   |3216     |32646 |Application |Hadoop                                                         |
+ROW   |3217     |32647 |Application |Hadoop                                                         |
+ROW   |3218     |32648 |Application |Hadoop                                                         |
+ROW   |3219     |32649 |Application |Hadoop                                                         |
+ROW   |3220     |32650 |Application |Hadoop                                                         |
+ROW   |3221     |32651 |Application |Hadoop                                                         |
+ROW   |3222     |32652 |Application |Hadoop                                                         |
+ROW   |3223     |32653 |Application |Hadoop                                                         |
+ROW   |3224     |32654 |Application |Hadoop                                                         |
+ROW   |3225     |32655 |Application |Hadoop                                                         |
+ROW   |3226     |32656 |Application |Hadoop                                                         |
+ROW   |3227     |32657 |Application |Hadoop                                                         |
+ROW   |3228     |32658 |Application |Hadoop                                                         |
+ROW   |3229     |32659 |Application |Hadoop                                                         |
+ROW   |3230     |32660 |Application |Hadoop                                                         |
+ROW   |3231     |32661 |Application |Hadoop                                                         |
+ROW   |3232     |32662 |Application |Hadoop                                                         |
+ROW   |3233     |32663 |Application |Hadoop                                                         |
+ROW   |3234     |32664 |Application |Hadoop                                                         |
+ROW   |3235     |32665 |Application |Hadoop                                                         |
+ROW   |3236     |32666 |Application |Hadoop                                                         |
+ROW   |3237     |32667 |Application |Hadoop                                                         |
+ROW   |3238     |32634 |Application |Zabbix raw items                                               |
+ROW   |3239     |32635 |Application |Zabbix raw items                                               |
+ROW   |3240     |32639 |Application |Zabbix raw items                                               |
+ROW   |3241     |32641 |Application |Zabbix raw items                                               |
+ROW   |3242     |32670 |Application |Zabbix raw items                                               |
+ROW   |3243     |32671 |Application |Zabbix raw items                                               |
+ROW   |3244     |32693 |Application |Kafka                                                          |
+ROW   |3245     |32694 |Application |Kafka                                                          |
+ROW   |3246     |32695 |Application |Kafka                                                          |
+ROW   |3247     |32696 |Application |Kafka                                                          |
+ROW   |3248     |32697 |Application |Kafka                                                          |
+ROW   |3249     |32698 |Application |Kafka                                                          |
+ROW   |3250     |32699 |Application |Kafka                                                          |
+ROW   |3251     |32700 |Application |Kafka                                                          |
+ROW   |3252     |32701 |Application |Kafka                                                          |
+ROW   |3253     |32702 |Application |Kafka                                                          |
+ROW   |3254     |32703 |Application |Kafka                                                          |
+ROW   |3255     |32704 |Application |Kafka                                                          |
+ROW   |3256     |32705 |Application |Kafka                                                          |
+ROW   |3257     |32706 |Application |Kafka                                                          |
+ROW   |3258     |32707 |Application |Kafka                                                          |
+ROW   |3259     |32708 |Application |Kafka                                                          |
+ROW   |3260     |32709 |Application |Kafka                                                          |
+ROW   |3261     |32710 |Application |Kafka                                                          |
+ROW   |3262     |32711 |Application |Kafka                                                          |
+ROW   |3263     |32712 |Application |Kafka                                                          |
+ROW   |3264     |32713 |Application |Kafka                                                          |
+ROW   |3265     |32714 |Application |Kafka                                                          |
+ROW   |3266     |32715 |Application |Kafka                                                          |
+ROW   |3267     |32716 |Application |Kafka                                                          |
+ROW   |3268     |32717 |Application |Kafka                                                          |
+ROW   |3269     |32718 |Application |Kafka                                                          |
+ROW   |3270     |32719 |Application |Kafka                                                          |
+ROW   |3271     |32720 |Application |Kafka                                                          |
+ROW   |3272     |32721 |Application |Kafka                                                          |
+ROW   |3273     |32722 |Application |Kafka                                                          |
+ROW   |3274     |32723 |Application |Kafka                                                          |
+ROW   |3275     |32724 |Application |Kafka                                                          |
+ROW   |3276     |32725 |Application |Kafka                                                          |
+ROW   |3277     |32726 |Application |Kafka                                                          |
+ROW   |3278     |32727 |Application |Kafka                                                          |
+ROW   |3279     |32728 |Application |Kafka                                                          |
+ROW   |3280     |32729 |Application |Kafka                                                          |
+ROW   |3281     |32730 |Application |Kafka                                                          |
+ROW   |3282     |32731 |Application |Kafka                                                          |
+ROW   |3283     |32732 |Application |Kafka                                                          |
+ROW   |3284     |32733 |Application |Kafka                                                          |
+ROW   |3285     |32734 |Application |Kafka                                                          |
+ROW   |3286     |32735 |Application |Kafka                                                          |
+ROW   |3287     |32736 |Application |Kafka                                                          |
+ROW   |3288     |32737 |Application |Kafka                                                          |
+ROW   |3289     |32738 |Application |Kafka                                                          |
+ROW   |3290     |32739 |Application |Kafka                                                          |
+ROW   |3291     |32740 |Application |Kafka                                                          |
+ROW   |3292     |32741 |Application |Kafka                                                          |
+ROW   |3293     |32742 |Application |Kafka                                                          |
+ROW   |3294     |32743 |Application |Kafka                                                          |
+ROW   |3295     |32744 |Application |Kafka                                                          |
+ROW   |3296     |32745 |Application |Kafka                                                          |
+ROW   |3297     |32746 |Application |Kafka                                                          |
+ROW   |3298     |32747 |Application |Kafka                                                          |
+ROW   |3299     |32748 |Application |Kafka                                                          |
+ROW   |3300     |32749 |Application |Kafka                                                          |
+ROW   |3301     |32750 |Application |Kafka                                                          |
+ROW   |3302     |32751 |Application |Kafka                                                          |
+ROW   |3303     |32752 |Application |Kafka                                                          |
+ROW   |3304     |32753 |Application |Kafka                                                          |
+ROW   |3305     |32754 |Application |Kafka                                                          |
+ROW   |3306     |32784 |Application |Vault                                                          |
+ROW   |3307     |32785 |Application |Vault                                                          |
+ROW   |3308     |32786 |Application |Vault                                                          |
+ROW   |3309     |32787 |Application |Vault                                                          |
+ROW   |3310     |32788 |Application |Vault                                                          |
+ROW   |3311     |32789 |Application |Vault                                                          |
+ROW   |3312     |32790 |Application |Vault                                                          |
+ROW   |3313     |32791 |Application |Vault                                                          |
+ROW   |3314     |32792 |Application |Vault                                                          |
+ROW   |3315     |32793 |Application |Vault                                                          |
+ROW   |3316     |32794 |Application |Vault                                                          |
+ROW   |3317     |32796 |Application |Vault                                                          |
+ROW   |3318     |32797 |Application |Vault                                                          |
+ROW   |3319     |32798 |Application |Vault                                                          |
+ROW   |3320     |32799 |Application |Vault                                                          |
+ROW   |3321     |32800 |Application |Vault                                                          |
+ROW   |3322     |32801 |Application |Vault                                                          |
+ROW   |3323     |32802 |Application |Vault                                                          |
+ROW   |3324     |32804 |Application |Vault                                                          |
+ROW   |3325     |32805 |Application |Vault                                                          |
+ROW   |3326     |32806 |Application |Vault                                                          |
+ROW   |3327     |32807 |Application |Vault                                                          |
+ROW   |3328     |32808 |Application |Vault                                                          |
+ROW   |3329     |32809 |Application |Vault                                                          |
+ROW   |3330     |32810 |Application |Vault                                                          |
+ROW   |3331     |32811 |Application |Vault                                                          |
+ROW   |3332     |32812 |Application |Vault                                                          |
+ROW   |3333     |32813 |Application |Vault                                                          |
+ROW   |3334     |32814 |Application |Vault                                                          |
+ROW   |3335     |32815 |Application |Vault                                                          |
+ROW   |3336     |32816 |Application |Vault                                                          |
+ROW   |3337     |32817 |Application |Vault                                                          |
+ROW   |3338     |32818 |Application |Vault                                                          |
+ROW   |3339     |32819 |Application |Vault                                                          |
+ROW   |3340     |32820 |Application |Vault                                                          |
+ROW   |3341     |32821 |Application |Vault                                                          |
+ROW   |3342     |32822 |Application |Vault                                                          |
+ROW   |3343     |32823 |Application |Vault                                                          |
+ROW   |3344     |32824 |Application |Vault                                                          |
+ROW   |3345     |32825 |Application |Vault                                                          |
+ROW   |3346     |32826 |Application |Vault                                                          |
+ROW   |3347     |32827 |Application |Vault                                                          |
+ROW   |3348     |32828 |Application |Vault                                                          |
+ROW   |3349     |32829 |Application |Vault                                                          |
+ROW   |3350     |32830 |Application |Vault                                                          |
+ROW   |3351     |32831 |Application |Vault                                                          |
+ROW   |3352     |32832 |Application |Vault                                                          |
+ROW   |3353     |32833 |Application |Vault                                                          |
+ROW   |3354     |32834 |Application |Vault                                                          |
+ROW   |3355     |32835 |Application |Vault                                                          |
+ROW   |3356     |32836 |Application |Vault                                                          |
+ROW   |3357     |32837 |Application |Vault                                                          |
+ROW   |3358     |32838 |Application |Vault                                                          |
+ROW   |3359     |32839 |Application |Vault                                                          |
+ROW   |3360     |32840 |Application |Vault                                                          |
+ROW   |3361     |32841 |Application |Vault                                                          |
+ROW   |3362     |32842 |Application |Vault                                                          |
+ROW   |3363     |32843 |Application |Vault                                                          |
+ROW   |3364     |32844 |Application |Vault                                                          |
+ROW   |3365     |32847 |Application |Vault                                                          |
+ROW   |3366     |32848 |Application |Vault                                                          |
+ROW   |3367     |32849 |Application |Vault                                                          |
+ROW   |3368     |32851 |Application |Vault                                                          |
+ROW   |3369     |32852 |Application |Vault                                                          |
+ROW   |3370     |32853 |Application |Vault                                                          |
+ROW   |3371     |32854 |Application |Vault                                                          |
+ROW   |3372     |32855 |Application |Vault                                                          |
+ROW   |3373     |32856 |Application |Vault                                                          |
+ROW   |3374     |32857 |Application |Vault                                                          |
+ROW   |3375     |32858 |Application |Vault                                                          |
+ROW   |3376     |32859 |Application |Vault                                                          |
+ROW   |3377     |32860 |Application |Vault                                                          |
+ROW   |3378     |32861 |Application |Vault                                                          |
+ROW   |3379     |32862 |Application |Vault                                                          |
+ROW   |3380     |32863 |Application |Vault                                                          |
+ROW   |3381     |32864 |Application |Vault                                                          |
+ROW   |3382     |32865 |Application |Vault                                                          |
+ROW   |3383     |32780 |Application |Zabbix raw items                                               |
+ROW   |3384     |32781 |Application |Zabbix raw items                                               |
+ROW   |3385     |32782 |Application |Zabbix raw items                                               |
+ROW   |3386     |32783 |Application |Zabbix raw items                                               |
+ROW   |3387     |32795 |Application |Zabbix raw items                                               |
+ROW   |3388     |32803 |Application |Zabbix raw items                                               |
+ROW   |3389     |32845 |Application |Zabbix raw items                                               |
+ROW   |3390     |32846 |Application |Zabbix raw items                                               |
+ROW   |3391     |32850 |Application |Zabbix raw items                                               |
+ROW   |3392     |32951 |Application |VMware                                                         |
+ROW   |3393     |32952 |Application |VMware                                                         |
+ROW   |3394     |32953 |Application |VMware                                                         |
+ROW   |3395     |32958 |Application |VMware                                                         |
+ROW   |3396     |32959 |Application |VMware                                                         |
+ROW   |3397     |32960 |Application |VMware                                                         |
+ROW   |3398     |32961 |Application |VMware                                                         |
+ROW   |3399     |32962 |Application |VMware                                                         |
+ROW   |3400     |32963 |Application |Zabbix raw items                                               |
+ROW   |3401     |32964 |Application |Zabbix raw items                                               |
+ROW   |3402     |32965 |Application |Zookeeper                                                      |
+ROW   |3403     |32966 |Application |Zookeeper                                                      |
+ROW   |3404     |32967 |Application |Zookeeper                                                      |
+ROW   |3405     |32968 |Application |Zookeeper                                                      |
+ROW   |3406     |32969 |Application |Zookeeper                                                      |
+ROW   |3407     |32970 |Application |Zookeeper                                                      |
+ROW   |3408     |32971 |Application |Zookeeper                                                      |
+ROW   |3409     |32972 |Application |Zookeeper                                                      |
+ROW   |3410     |32973 |Application |Zookeeper                                                      |
+ROW   |3411     |32974 |Application |Zookeeper                                                      |
+ROW   |3412     |32975 |Application |Zookeeper                                                      |
+ROW   |3413     |32976 |Application |Zookeeper                                                      |
+ROW   |3414     |32977 |Application |Zookeeper                                                      |
+ROW   |3415     |32978 |Application |Zookeeper                                                      |
+ROW   |3416     |32979 |Application |Zookeeper                                                      |
+ROW   |3417     |32980 |Application |Zookeeper                                                      |
+ROW   |3418     |32981 |Application |Zookeeper                                                      |
+ROW   |3419     |32982 |Application |Zookeeper                                                      |
+ROW   |3420     |32983 |Application |Zookeeper                                                      |
+ROW   |3421     |32984 |Application |Zookeeper                                                      |
+ROW   |3422     |32985 |Application |Zookeeper                                                      |
+ROW   |3423     |32986 |Application |Zookeeper                                                      |
+ROW   |3424     |32987 |Application |Zookeeper                                                      |
+ROW   |3425     |32988 |Application |Zookeeper                                                      |
+ROW   |3426     |32989 |Application |Zookeeper                                                      |
+ROW   |3427     |32990 |Application |Zookeeper                                                      |
+ROW   |3428     |32991 |Application |Zookeeper                                                      |
+ROW   |3429     |32992 |Application |Zookeeper                                                      |
+ROW   |3430     |32993 |Application |Zookeeper                                                      |
+ROW   |3431     |32994 |Application |Zookeeper                                                      |
+ROW   |3432     |32995 |Application |Zookeeper                                                      |
+ROW   |3433     |32996 |Application |Zookeeper                                                      |
+ROW   |3434     |32997 |Application |Zookeeper                                                      |
+ROW   |3435     |33006 |Application |Zookeeper                                                      |
+ROW   |3436     |33007 |Application |Zookeeper                                                      |
+ROW   |3437     |33008 |Application |Zookeeper                                                      |
+ROW   |3438     |33009 |Application |Zookeeper                                                      |
+ROW   |3439     |33010 |Application |Zookeeper                                                      |
+ROW   |3440     |33011 |Application |Zookeeper                                                      |
+ROW   |3441     |33028 |Application |Cassandra                                                      |
+ROW   |3442     |33029 |Application |Cassandra                                                      |
+ROW   |3443     |33030 |Application |Cassandra                                                      |
+ROW   |3444     |33031 |Application |Cassandra                                                      |
+ROW   |3445     |33032 |Application |Cassandra                                                      |
+ROW   |3446     |33033 |Application |Cassandra                                                      |
+ROW   |3447     |33034 |Application |Cassandra                                                      |
+ROW   |3448     |33035 |Application |Cassandra                                                      |
+ROW   |3449     |33036 |Application |Cassandra                                                      |
+ROW   |3450     |33037 |Application |Cassandra                                                      |
+ROW   |3451     |33038 |Application |Cassandra                                                      |
+ROW   |3452     |33039 |Application |Cassandra                                                      |
+ROW   |3453     |33040 |Application |Cassandra                                                      |
+ROW   |3454     |33041 |Application |Cassandra                                                      |
+ROW   |3455     |33042 |Application |Cassandra                                                      |
+ROW   |3456     |33043 |Application |Cassandra                                                      |
+ROW   |3457     |33044 |Application |Cassandra                                                      |
+ROW   |3458     |33045 |Application |Cassandra                                                      |
+ROW   |3459     |33046 |Application |Cassandra                                                      |
+ROW   |3460     |33047 |Application |Cassandra                                                      |
+ROW   |3461     |33048 |Application |Cassandra                                                      |
+ROW   |3462     |33049 |Application |Cassandra                                                      |
+ROW   |3463     |33050 |Application |Cassandra                                                      |
+ROW   |3464     |33051 |Application |Cassandra                                                      |
+ROW   |3465     |33052 |Application |Cassandra                                                      |
+ROW   |3466     |33053 |Application |Cassandra                                                      |
+ROW   |3467     |33054 |Application |Cassandra                                                      |
+ROW   |3468     |33055 |Application |Cassandra                                                      |
+ROW   |3469     |33056 |Application |Cassandra                                                      |
+ROW   |3470     |33057 |Application |Cassandra                                                      |
+ROW   |3471     |33058 |Application |Cassandra                                                      |
+ROW   |3472     |33059 |Application |Cassandra                                                      |
+ROW   |3473     |33060 |Application |Cassandra                                                      |
+ROW   |3474     |33061 |Application |Cassandra                                                      |
+ROW   |3475     |33062 |Application |Cassandra                                                      |
+ROW   |3476     |33063 |Application |Cassandra                                                      |
+ROW   |3477     |33064 |Application |Cassandra                                                      |
+ROW   |3478     |33065 |Application |Cassandra                                                      |
+ROW   |3479     |33066 |Application |Cassandra                                                      |
+ROW   |3480     |33067 |Application |Cassandra                                                      |
+ROW   |3481     |33068 |Application |Cassandra                                                      |
+ROW   |3482     |33069 |Application |Cassandra                                                      |
+ROW   |3483     |33070 |Application |Cassandra                                                      |
+ROW   |3484     |33071 |Application |Cassandra                                                      |
+ROW   |3485     |33072 |Application |Cassandra                                                      |
+ROW   |3486     |33073 |Application |Cassandra                                                      |
+ROW   |3487     |33074 |Application |Cassandra                                                      |
+ROW   |3488     |33075 |Application |Cassandra                                                      |
+ROW   |3489     |33076 |Application |Cassandra                                                      |
+ROW   |3490     |33077 |Application |Cassandra                                                      |
+ROW   |3491     |33078 |Application |Cassandra                                                      |
+ROW   |3492     |33079 |Application |Cassandra                                                      |
+ROW   |3493     |33080 |Application |Cassandra                                                      |
+ROW   |3494     |33081 |Application |Cassandra                                                      |
+ROW   |3495     |33082 |Application |Cassandra                                                      |
+ROW   |3496     |33083 |Application |Cassandra                                                      |
+ROW   |3497     |33084 |Application |Cassandra                                                      |
+ROW   |3498     |33085 |Application |Cassandra                                                      |
+ROW   |3499     |33086 |Application |Cassandra                                                      |
+ROW   |3500     |33087 |Application |Cassandra                                                      |
+ROW   |3501     |33088 |Application |Cassandra                                                      |
+ROW   |3502     |33089 |Application |Cassandra                                                      |
+ROW   |3503     |33090 |Application |Cassandra                                                      |
+ROW   |3504     |33091 |Application |Cassandra                                                      |
+ROW   |3505     |33092 |Application |Cassandra                                                      |
+ROW   |3506     |33093 |Application |Cassandra                                                      |
+ROW   |3507     |33094 |Application |Cassandra                                                      |
+ROW   |3508     |33184 |Application |Array                                                          |
+ROW   |3509     |33195 |Application |Array                                                          |
+ROW   |3510     |33202 |Application |Array                                                          |
+ROW   |3511     |33203 |Application |Array                                                          |
+ROW   |3512     |33188 |Application |Battery                                                        |
+ROW   |3513     |33199 |Application |Battery                                                        |
+ROW   |3514     |33200 |Application |Battery                                                        |
+ROW   |3515     |33206 |Application |Battery                                                        |
+ROW   |3516     |33196 |Application |Counter                                                        |
+ROW   |3517     |33197 |Application |Counter                                                        |
+ROW   |3518     |33198 |Application |Counter                                                        |
+ROW   |3519     |33185 |Application |Load                                                           |
+ROW   |3520     |33193 |Application |Load                                                           |
+ROW   |3521     |33194 |Application |Load                                                           |
+ROW   |3522     |33189 |Application |Status                                                         |
+ROW   |3523     |33190 |Application |Status                                                         |
+ROW   |3524     |33191 |Application |Status                                                         |
+ROW   |3525     |33192 |Application |Status                                                         |
+ROW   |3526     |33186 |Application |Temperature                                                    |
+ROW   |3527     |33187 |Application |Temperature                                                    |
+ROW   |3528     |33204 |Application |Temperature                                                    |
+ROW   |3529     |33201 |Application |Zabbix raw items                                               |
+ROW   |3530     |33207 |Application |Array                                                          |
+ROW   |3531     |33211 |Application |Battery                                                        |
+ROW   |3532     |33222 |Application |Battery                                                        |
+ROW   |3533     |33223 |Application |Battery                                                        |
+ROW   |3534     |33226 |Application |Battery                                                        |
+ROW   |3535     |33219 |Application |Counter                                                        |
+ROW   |3536     |33220 |Application |Counter                                                        |
+ROW   |3537     |33221 |Application |Counter                                                        |
+ROW   |3538     |33215 |Application |Load                                                           |
+ROW   |3539     |33217 |Application |Load                                                           |
+ROW   |3540     |33218 |Application |Load                                                           |
+ROW   |3541     |33208 |Application |Status                                                         |
+ROW   |3542     |33212 |Application |Status                                                         |
+ROW   |3543     |33213 |Application |Status                                                         |
+ROW   |3544     |33214 |Application |Status                                                         |
+ROW   |3545     |33209 |Application |Temperature                                                    |
+ROW   |3546     |33210 |Application |Temperature                                                    |
+ROW   |3547     |33224 |Application |Temperature                                                    |
+ROW   |3548     |33216 |Application |Zabbix raw items                                               |
+ROW   |3549     |33227 |Application |Array                                                          |
+ROW   |3550     |33238 |Application |Array                                                          |
+ROW   |3551     |33245 |Application |Array                                                          |
+ROW   |3552     |33246 |Application |Array                                                          |
+ROW   |3553     |33231 |Application |Battery                                                        |
+ROW   |3554     |33242 |Application |Battery                                                        |
+ROW   |3555     |33243 |Application |Battery                                                        |
+ROW   |3556     |33249 |Application |Battery                                                        |
+ROW   |3557     |33239 |Application |Counter                                                        |
+ROW   |3558     |33240 |Application |Counter                                                        |
+ROW   |3559     |33241 |Application |Counter                                                        |
+ROW   |3560     |33228 |Application |Load                                                           |
+ROW   |3561     |33236 |Application |Load                                                           |
+ROW   |3562     |33237 |Application |Load                                                           |
+ROW   |3563     |33232 |Application |Status                                                         |
+ROW   |3564     |33233 |Application |Status                                                         |
+ROW   |3565     |33234 |Application |Status                                                         |
+ROW   |3566     |33235 |Application |Status                                                         |
+ROW   |3567     |33229 |Application |Temperature                                                    |
+ROW   |3568     |33230 |Application |Temperature                                                    |
+ROW   |3569     |33247 |Application |Temperature                                                    |
+ROW   |3570     |33244 |Application |Zabbix raw items                                               |
+ROW   |3571     |33258 |Application |Battery                                                        |
+ROW   |3572     |33251 |Application |Load                                                           |
+ROW   |3573     |33252 |Application |Load                                                           |
+ROW   |3574     |33253 |Application |Status                                                         |
+ROW   |3575     |33254 |Application |Status                                                         |
+ROW   |3576     |33255 |Application |Status                                                         |
+ROW   |3577     |33256 |Application |Temperature                                                    |
+ROW   |3578     |33250 |Application |Zabbix raw items                                               |
+ROW   |3579     |33259 |Application |Array                                                          |
+ROW   |3580     |33268 |Application |Array                                                          |
+ROW   |3581     |33272 |Application |Array                                                          |
+ROW   |3582     |33273 |Application |Array                                                          |
+ROW   |3583     |33274 |Application |Array                                                          |
+ROW   |3584     |33262 |Application |Battery                                                        |
+ROW   |3585     |33267 |Application |Battery                                                        |
+ROW   |3586     |33269 |Application |Battery                                                        |
+ROW   |3587     |33270 |Application |Battery                                                        |
+ROW   |3588     |33277 |Application |Battery                                                        |
+ROW   |3589     |33260 |Application |Counter                                                        |
+ROW   |3590     |33266 |Application |Counter                                                        |
+ROW   |3591     |33263 |Application |Status                                                         |
+ROW   |3592     |33264 |Application |Status                                                         |
+ROW   |3593     |33265 |Application |Status                                                         |
+ROW   |3594     |33261 |Application |Temperature                                                    |
+ROW   |3595     |33275 |Application |Temperature                                                    |
+ROW   |3596     |33271 |Application |Zabbix raw items                                               |
+ROW   |3597     |33278 |Application |Array                                                          |
+ROW   |3598     |33287 |Application |Array                                                          |
+ROW   |3599     |33291 |Application |Array                                                          |
+ROW   |3600     |33292 |Application |Array                                                          |
+ROW   |3601     |33293 |Application |Array                                                          |
+ROW   |3602     |33281 |Application |Battery                                                        |
+ROW   |3603     |33286 |Application |Battery                                                        |
+ROW   |3604     |33288 |Application |Battery                                                        |
+ROW   |3605     |33289 |Application |Battery                                                        |
+ROW   |3606     |33296 |Application |Battery                                                        |
+ROW   |3607     |33279 |Application |Counter                                                        |
+ROW   |3608     |33285 |Application |Counter                                                        |
+ROW   |3609     |33282 |Application |Status                                                         |
+ROW   |3610     |33283 |Application |Status                                                         |
+ROW   |3611     |33284 |Application |Status                                                         |
+ROW   |3612     |33280 |Application |Temperature                                                    |
+ROW   |3613     |33294 |Application |Temperature                                                    |
+ROW   |3614     |33290 |Application |Zabbix raw items                                               |
+ROW   |3615     |33313 |Application |Array                                                          |
+ROW   |3616     |33312 |Application |Battery                                                        |
+ROW   |3617     |33314 |Application |Battery                                                        |
+ROW   |3618     |33315 |Application |Battery                                                        |
+ROW   |3619     |33316 |Application |Battery                                                        |
+ROW   |3620     |33299 |Application |Counter                                                        |
+ROW   |3621     |33300 |Application |Counter                                                        |
+ROW   |3622     |33317 |Application |Load                                                           |
+ROW   |3623     |33318 |Application |Load                                                           |
+ROW   |3624     |33319 |Application |Load                                                           |
+ROW   |3625     |33320 |Application |Load                                                           |
+ROW   |3626     |33298 |Application |Status                                                         |
+ROW   |3627     |33301 |Application |Status                                                         |
+ROW   |3628     |33302 |Application |Status                                                         |
+ROW   |3629     |33303 |Application |Status                                                         |
+ROW   |3630     |33304 |Application |Temperature                                                    |
+ROW   |3631     |33305 |Application |Temperature                                                    |
+ROW   |3632     |33297 |Application |Zabbix raw items                                               |
+ROW   |3633     |33340 |Application |General                                                        |
+ROW   |3634     |33341 |Application |General                                                        |
+ROW   |3635     |33342 |Application |General                                                        |
+ROW   |3636     |33343 |Application |General                                                        |
+ROW   |3637     |33344 |Application |General                                                        |
+ROW   |3638     |33345 |Application |General                                                        |
+ROW   |3639     |33348 |Application |NetApp FAS3220                                                 |
+ROW   |3640     |33349 |Application |NetApp FAS3220                                                 |
+ROW   |3641     |33350 |Application |NetApp FAS3220                                                 |
+ROW   |3642     |33351 |Application |NetApp FAS3220                                                 |
+ROW   |3643     |33337 |Application |Status                                                         |
+ROW   |3644     |33338 |Application |Status                                                         |
+ROW   |3645     |33339 |Application |Status                                                         |
+ROW   |3646     |33346 |Application |Status                                                         |
+ROW   |3647     |33347 |Application |Status                                                         |
+ROW   |3648     |33392 |Application |Jenkins                                                        |
+ROW   |3649     |33396 |Application |Jenkins                                                        |
+ROW   |3650     |33397 |Application |Jenkins                                                        |
+ROW   |3651     |33398 |Application |Jenkins                                                        |
+ROW   |3652     |33399 |Application |Jenkins                                                        |
+ROW   |3653     |33400 |Application |Jenkins                                                        |
+ROW   |3654     |33401 |Application |Jenkins                                                        |
+ROW   |3655     |33402 |Application |Jenkins                                                        |
+ROW   |3656     |33403 |Application |Jenkins                                                        |
+ROW   |3657     |33404 |Application |Jenkins                                                        |
+ROW   |3658     |33405 |Application |Jenkins                                                        |
+ROW   |3659     |33406 |Application |Jenkins                                                        |
+ROW   |3660     |33407 |Application |Jenkins                                                        |
+ROW   |3661     |33408 |Application |Jenkins                                                        |
+ROW   |3662     |33409 |Application |Jenkins                                                        |
+ROW   |3663     |33410 |Application |Jenkins                                                        |
+ROW   |3664     |33411 |Application |Jenkins                                                        |
+ROW   |3665     |33412 |Application |Jenkins                                                        |
+ROW   |3666     |33413 |Application |Jenkins                                                        |
+ROW   |3667     |33414 |Application |Jenkins                                                        |
+ROW   |3668     |33415 |Application |Jenkins                                                        |
+ROW   |3669     |33416 |Application |Jenkins                                                        |
+ROW   |3670     |33417 |Application |Jenkins                                                        |
+ROW   |3671     |33418 |Application |Jenkins                                                        |
+ROW   |3672     |33419 |Application |Jenkins                                                        |
+ROW   |3673     |33420 |Application |Jenkins                                                        |
+ROW   |3674     |33421 |Application |Jenkins                                                        |
+ROW   |3675     |33422 |Application |Jenkins                                                        |
+ROW   |3676     |33423 |Application |Jenkins                                                        |
+ROW   |3677     |33424 |Application |Jenkins                                                        |
+ROW   |3678     |33425 |Application |Jenkins                                                        |
+ROW   |3679     |33426 |Application |Jenkins                                                        |
+ROW   |3680     |33427 |Application |Jenkins                                                        |
+ROW   |3681     |33428 |Application |Jenkins                                                        |
+ROW   |3682     |33429 |Application |Jenkins                                                        |
+ROW   |3683     |33430 |Application |Jenkins                                                        |
+ROW   |3684     |33431 |Application |Jenkins                                                        |
+ROW   |3685     |33432 |Application |Jenkins                                                        |
+ROW   |3686     |33433 |Application |Jenkins                                                        |
+ROW   |3687     |33434 |Application |Jenkins                                                        |
+ROW   |3688     |33435 |Application |Jenkins                                                        |
+ROW   |3689     |33436 |Application |Jenkins                                                        |
+ROW   |3690     |33437 |Application |Jenkins                                                        |
+ROW   |3691     |33438 |Application |Jenkins                                                        |
+ROW   |3692     |33439 |Application |Jenkins                                                        |
+ROW   |3693     |33440 |Application |Jenkins                                                        |
+ROW   |3694     |33441 |Application |Jenkins                                                        |
+ROW   |3695     |33442 |Application |Jenkins                                                        |
+ROW   |3696     |33443 |Application |Jenkins                                                        |
+ROW   |3697     |33444 |Application |Jenkins                                                        |
+ROW   |3698     |33445 |Application |Jenkins                                                        |
+ROW   |3699     |33446 |Application |Jenkins                                                        |
+ROW   |3700     |33447 |Application |Jenkins                                                        |
+ROW   |3701     |33448 |Application |Jenkins                                                        |
+ROW   |3702     |33449 |Application |Jenkins                                                        |
+ROW   |3703     |33450 |Application |Jenkins                                                        |
+ROW   |3704     |33451 |Application |Jenkins                                                        |
+ROW   |3705     |33452 |Application |Jenkins                                                        |
+ROW   |3706     |33453 |Application |Jenkins                                                        |
+ROW   |3707     |33454 |Application |Jenkins                                                        |
+ROW   |3708     |33455 |Application |Jenkins                                                        |
+ROW   |3709     |33456 |Application |Jenkins                                                        |
+ROW   |3710     |33457 |Application |Jenkins                                                        |
+ROW   |3711     |33458 |Application |Jenkins                                                        |
+ROW   |3712     |33459 |Application |Jenkins                                                        |
+ROW   |3713     |33460 |Application |Jenkins                                                        |
+ROW   |3714     |33461 |Application |Jenkins                                                        |
+ROW   |3715     |33462 |Application |Jenkins                                                        |
+ROW   |3716     |33463 |Application |Jenkins                                                        |
+ROW   |3717     |33464 |Application |Jenkins                                                        |
+ROW   |3718     |33391 |Application |Zabbix raw items                                               |
+ROW   |3719     |33393 |Application |Zabbix raw items                                               |
+ROW   |3720     |33394 |Application |Zabbix raw items                                               |
+ROW   |3721     |33395 |Application |Zabbix raw items                                               |
+ROW   |3722     |33518 |Application |CPU                                                            |
+ROW   |3723     |33494 |Application |Hikvision camera                                               |
+ROW   |3724     |33495 |Application |Hikvision camera                                               |
+ROW   |3725     |33496 |Application |Hikvision camera                                               |
+ROW   |3726     |33497 |Application |Hikvision camera                                               |
+ROW   |3727     |33498 |Application |Hikvision camera                                               |
+ROW   |3728     |33499 |Application |Hikvision camera                                               |
+ROW   |3729     |33500 |Application |Hikvision camera                                               |
+ROW   |3730     |33502 |Application |Hikvision camera                                               |
+ROW   |3731     |33503 |Application |Hikvision camera                                               |
+ROW   |3732     |33507 |Application |Hikvision camera                                               |
+ROW   |3733     |33508 |Application |Hikvision camera                                               |
+ROW   |3734     |33509 |Application |Hikvision camera                                               |
+ROW   |3735     |33510 |Application |Hikvision camera                                               |
+ROW   |3736     |33511 |Application |Hikvision camera                                               |
+ROW   |3737     |33512 |Application |Hikvision camera                                               |
+ROW   |3738     |33513 |Application |Hikvision camera                                               |
+ROW   |3739     |33514 |Application |Hikvision camera                                               |
+ROW   |3740     |33515 |Application |Hikvision camera                                               |
+ROW   |3741     |33516 |Application |Hikvision camera                                               |
+ROW   |3742     |33517 |Application |Hikvision camera                                               |
+ROW   |3743     |33501 |Application |Memory                                                         |
+ROW   |3744     |33504 |Application |Status                                                         |
+ROW   |3745     |33505 |Application |Status                                                         |
+ROW   |3746     |33506 |Application |Status                                                         |
+ROW   |3747     |33519 |Application |Status                                                         |
+ROW   |3748     |33491 |Application |Zabbix raw items                                               |
+ROW   |3749     |33492 |Application |Zabbix raw items                                               |
+ROW   |3750     |33493 |Application |Zabbix raw items                                               |
+ROW   |3751     |33522 |Application |Zabbix raw items                                               |
+ROW   |3752     |33523 |Application |Zabbix raw items                                               |
+ROW   |3753     |33631 |Application |Sharepoint                                                     |
+ROW   |3754     |33632 |Application |Sharepoint                                                     |
+ROW   |3755     |33633 |Application |Sharepoint                                                     |
+ROW   |3756     |33630 |Application |Zabbix raw items                                               |
+ROW   |3757     |33656 |Application |Zabbix raw items                                               |
+ROW   |3758     |33668 |Application |Zabbix raw items                                               |
+ROW   |3759     |33683 |Application |General                                                        |
+ROW   |3760     |33684 |Application |General                                                        |
+ROW   |3761     |33685 |Application |General                                                        |
+ROW   |3762     |33686 |Application |General                                                        |
+ROW   |3763     |33687 |Application |General                                                        |
+ROW   |3764     |33688 |Application |General                                                        |
+ROW   |3765     |33691 |Application |Huawei                                                         |
+ROW   |3766     |33692 |Application |Huawei                                                         |
+ROW   |3767     |33693 |Application |Huawei                                                         |
+ROW   |3768     |33694 |Application |Huawei                                                         |
+ROW   |3769     |33680 |Application |Status                                                         |
+ROW   |3770     |33681 |Application |Status                                                         |
+ROW   |3771     |33682 |Application |Status                                                         |
+ROW   |3772     |33689 |Application |Status                                                         |
+ROW   |3773     |33690 |Application |Status                                                         |
+ROW   |3774     |33766 |Application |MongoDB                                                        |
+ROW   |3775     |33769 |Application |MongoDB                                                        |
+ROW   |3776     |33770 |Application |MongoDB                                                        |
+ROW   |3777     |33771 |Application |MongoDB                                                        |
+ROW   |3778     |33772 |Application |MongoDB                                                        |
+ROW   |3779     |33773 |Application |MongoDB                                                        |
+ROW   |3780     |33774 |Application |MongoDB                                                        |
+ROW   |3781     |33775 |Application |MongoDB                                                        |
+ROW   |3782     |33776 |Application |MongoDB                                                        |
+ROW   |3783     |33777 |Application |MongoDB                                                        |
+ROW   |3784     |33778 |Application |MongoDB                                                        |
+ROW   |3785     |33779 |Application |MongoDB                                                        |
+ROW   |3786     |33780 |Application |MongoDB                                                        |
+ROW   |3787     |33781 |Application |MongoDB                                                        |
+ROW   |3788     |33782 |Application |MongoDB                                                        |
+ROW   |3789     |33783 |Application |MongoDB                                                        |
+ROW   |3790     |33784 |Application |MongoDB                                                        |
+ROW   |3791     |33785 |Application |MongoDB                                                        |
+ROW   |3792     |33786 |Application |MongoDB                                                        |
+ROW   |3793     |33787 |Application |MongoDB                                                        |
+ROW   |3794     |33788 |Application |MongoDB                                                        |
+ROW   |3795     |33789 |Application |MongoDB                                                        |
+ROW   |3796     |33790 |Application |MongoDB                                                        |
+ROW   |3797     |33791 |Application |MongoDB                                                        |
+ROW   |3798     |33792 |Application |MongoDB                                                        |
+ROW   |3799     |33793 |Application |MongoDB                                                        |
+ROW   |3800     |33794 |Application |MongoDB                                                        |
+ROW   |3801     |33795 |Application |MongoDB                                                        |
+ROW   |3802     |33796 |Application |MongoDB                                                        |
+ROW   |3803     |33797 |Application |MongoDB                                                        |
+ROW   |3804     |33798 |Application |MongoDB                                                        |
+ROW   |3805     |33799 |Application |MongoDB                                                        |
+ROW   |3806     |33800 |Application |MongoDB                                                        |
+ROW   |3807     |33801 |Application |MongoDB                                                        |
+ROW   |3808     |33802 |Application |MongoDB                                                        |
+ROW   |3809     |33803 |Application |MongoDB                                                        |
+ROW   |3810     |33804 |Application |MongoDB                                                        |
+ROW   |3811     |33805 |Application |MongoDB                                                        |
+ROW   |3812     |33806 |Application |MongoDB                                                        |
+ROW   |3813     |33807 |Application |MongoDB                                                        |
+ROW   |3814     |33869 |Application |MongoDB                                                        |
+ROW   |3815     |33870 |Application |MongoDB                                                        |
+ROW   |3816     |33871 |Application |MongoDB                                                        |
+ROW   |3817     |33872 |Application |MongoDB                                                        |
+ROW   |3818     |33873 |Application |MongoDB                                                        |
+ROW   |3819     |33874 |Application |MongoDB                                                        |
+ROW   |3820     |33875 |Application |MongoDB                                                        |
+ROW   |3821     |33876 |Application |MongoDB                                                        |
+ROW   |3822     |33877 |Application |MongoDB                                                        |
+ROW   |3823     |33878 |Application |MongoDB                                                        |
+ROW   |3824     |33879 |Application |MongoDB                                                        |
+ROW   |3825     |33880 |Application |MongoDB                                                        |
+ROW   |3826     |33881 |Application |MongoDB                                                        |
+ROW   |3827     |33882 |Application |MongoDB                                                        |
+ROW   |3828     |33883 |Application |MongoDB                                                        |
+ROW   |3829     |33884 |Application |MongoDB                                                        |
+ROW   |3830     |33885 |Application |MongoDB                                                        |
+ROW   |3831     |33764 |Application |Zabbix raw items                                               |
+ROW   |3832     |33765 |Application |Zabbix raw items                                               |
+ROW   |3833     |33767 |Application |Zabbix raw items                                               |
+ROW   |3834     |33768 |Application |Zabbix raw items                                               |
+ROW   |3835     |33812 |Application |Zabbix raw items                                               |
+ROW   |3836     |33813 |Application |Zabbix raw items                                               |
+ROW   |3837     |33886 |Application |MongoDB sharded cluster                                        |
+ROW   |3838     |33888 |Application |MongoDB sharded cluster                                        |
+ROW   |3840     |33891 |Application |MongoDB sharded cluster                                        |
+ROW   |3841     |33892 |Application |MongoDB sharded cluster                                        |
+ROW   |3842     |33893 |Application |MongoDB sharded cluster                                        |
+ROW   |3843     |33894 |Application |MongoDB sharded cluster                                        |
+ROW   |3844     |33895 |Application |MongoDB sharded cluster                                        |
+ROW   |3845     |33896 |Application |MongoDB sharded cluster                                        |
+ROW   |3846     |33897 |Application |MongoDB sharded cluster                                        |
+ROW   |3847     |33898 |Application |MongoDB sharded cluster                                        |
+ROW   |3848     |33899 |Application |MongoDB sharded cluster                                        |
+ROW   |3849     |33900 |Application |MongoDB sharded cluster                                        |
+ROW   |3850     |33901 |Application |MongoDB sharded cluster                                        |
+ROW   |3851     |33902 |Application |MongoDB sharded cluster                                        |
+ROW   |3852     |33903 |Application |MongoDB sharded cluster                                        |
+ROW   |3853     |33904 |Application |MongoDB sharded cluster                                        |
+ROW   |3854     |33905 |Application |MongoDB sharded cluster                                        |
+ROW   |3855     |33906 |Application |MongoDB sharded cluster                                        |
+ROW   |3856     |33907 |Application |MongoDB sharded cluster                                        |
+ROW   |3857     |33908 |Application |MongoDB sharded cluster                                        |
+ROW   |3858     |33909 |Application |MongoDB sharded cluster                                        |
+ROW   |3859     |33910 |Application |MongoDB sharded cluster                                        |
+ROW   |3860     |33911 |Application |MongoDB sharded cluster                                        |
+ROW   |3861     |33912 |Application |MongoDB sharded cluster                                        |
+ROW   |3862     |33913 |Application |MongoDB sharded cluster                                        |
+ROW   |3863     |33914 |Application |MongoDB sharded cluster                                        |
+ROW   |3864     |33915 |Application |MongoDB sharded cluster                                        |
+ROW   |3865     |33916 |Application |MongoDB sharded cluster                                        |
+ROW   |3866     |33917 |Application |MongoDB sharded cluster                                        |
+ROW   |3867     |33918 |Application |MongoDB sharded cluster                                        |
+ROW   |3868     |33919 |Application |MongoDB sharded cluster                                        |
+ROW   |3869     |33887 |Application |Zabbix raw items                                               |
+ROW   |3870     |33889 |Application |Zabbix raw items                                               |
+ROW   |3871     |33924 |Application |Zabbix raw items                                               |
+ROW   |3872     |33925 |Application |Zabbix raw items                                               |
+ROW   |3873     |33966 |Application |CPU                                                            |
+ROW   |3874     |33968 |Application |Fans                                                           |
+ROW   |3875     |33947 |Application |General                                                        |
+ROW   |3876     |33948 |Application |General                                                        |
+ROW   |3877     |33949 |Application |General                                                        |
+ROW   |3878     |33952 |Application |General                                                        |
+ROW   |3879     |33953 |Application |General                                                        |
+ROW   |3880     |33954 |Application |General                                                        |
+ROW   |3881     |33950 |Application |Inventory                                                      |
+ROW   |3882     |33951 |Application |Inventory                                                      |
+ROW   |3883     |33955 |Application |Inventory                                                      |
+ROW   |3884     |33967 |Application |Inventory                                                      |
+ROW   |3885     |33969 |Application |Memory                                                         |
+ROW   |3886     |33970 |Application |Memory                                                         |
+ROW   |3887     |33971 |Application |Memory                                                         |
+ROW   |3888     |33982 |Application |Power supply                                                   |
+ROW   |3889     |33944 |Application |Status                                                         |
+ROW   |3890     |33945 |Application |Status                                                         |
+ROW   |3891     |33946 |Application |Status                                                         |
+ROW   |3892     |33956 |Application |Status                                                         |
+ROW   |3893     |33957 |Application |Status                                                         |
+ROW   |3894     |33983 |Application |Temperature                                                    |
+ROW   |3895     |33984 |Application |Temperature                                                    |
+ROW   |3896     |34007 |Application |CPU                                                            |
+ROW   |3897     |34009 |Application |Fans                                                           |
+ROW   |3898     |33988 |Application |General                                                        |
+ROW   |3899     |33989 |Application |General                                                        |
+ROW   |3900     |33990 |Application |General                                                        |
+ROW   |3901     |33993 |Application |General                                                        |
+ROW   |3902     |33994 |Application |General                                                        |
+ROW   |3903     |33995 |Application |General                                                        |
+ROW   |3904     |33991 |Application |Inventory                                                      |
+ROW   |3905     |33992 |Application |Inventory                                                      |
+ROW   |3906     |33996 |Application |Inventory                                                      |
+ROW   |3907     |34008 |Application |Inventory                                                      |
+ROW   |3908     |34010 |Application |Memory                                                         |
+ROW   |3909     |34011 |Application |Memory                                                         |
+ROW   |3910     |34012 |Application |Memory                                                         |
+ROW   |3911     |34023 |Application |Power supply                                                   |
+ROW   |3912     |33985 |Application |Status                                                         |
+ROW   |3913     |33986 |Application |Status                                                         |
+ROW   |3914     |33987 |Application |Status                                                         |
+ROW   |3915     |33997 |Application |Status                                                         |
+ROW   |3916     |33998 |Application |Status                                                         |
+ROW   |3917     |34024 |Application |Temperature                                                    |
+ROW   |3918     |34025 |Application |Temperature                                                    |
+ROW   |3919     |34048 |Application |CPU                                                            |
+ROW   |3920     |34050 |Application |Fans                                                           |
+ROW   |3921     |34029 |Application |General                                                        |
+ROW   |3922     |34030 |Application |General                                                        |
+ROW   |3923     |34031 |Application |General                                                        |
+ROW   |3924     |34034 |Application |General                                                        |
+ROW   |3925     |34035 |Application |General                                                        |
+ROW   |3926     |34036 |Application |General                                                        |
+ROW   |3927     |34032 |Application |Inventory                                                      |
+ROW   |3928     |34033 |Application |Inventory                                                      |
+ROW   |3929     |34037 |Application |Inventory                                                      |
+ROW   |3930     |34049 |Application |Inventory                                                      |
+ROW   |3931     |34051 |Application |Memory                                                         |
+ROW   |3932     |34052 |Application |Memory                                                         |
+ROW   |3933     |34053 |Application |Memory                                                         |
+ROW   |3934     |34064 |Application |Power supply                                                   |
+ROW   |3935     |34026 |Application |Status                                                         |
+ROW   |3936     |34027 |Application |Status                                                         |
+ROW   |3937     |34028 |Application |Status                                                         |
+ROW   |3938     |34038 |Application |Status                                                         |
+ROW   |3939     |34039 |Application |Status                                                         |
+ROW   |3940     |34065 |Application |Temperature                                                    |
+ROW   |3941     |34066 |Application |Temperature                                                    |
+ROW   |3942     |34089 |Application |CPU                                                            |
+ROW   |3943     |34091 |Application |Fans                                                           |
+ROW   |3944     |34070 |Application |General                                                        |
+ROW   |3945     |34071 |Application |General                                                        |
+ROW   |3946     |34072 |Application |General                                                        |
+ROW   |3947     |34075 |Application |General                                                        |
+ROW   |3948     |34076 |Application |General                                                        |
+ROW   |3949     |34077 |Application |General                                                        |
+ROW   |3950     |34073 |Application |Inventory                                                      |
+ROW   |3951     |34074 |Application |Inventory                                                      |
+ROW   |3952     |34078 |Application |Inventory                                                      |
+ROW   |3953     |34090 |Application |Inventory                                                      |
+ROW   |3954     |34092 |Application |Memory                                                         |
+ROW   |3955     |34093 |Application |Memory                                                         |
+ROW   |3956     |34094 |Application |Memory                                                         |
+ROW   |3957     |34105 |Application |Power supply                                                   |
+ROW   |3958     |34067 |Application |Status                                                         |
+ROW   |3959     |34068 |Application |Status                                                         |
+ROW   |3960     |34069 |Application |Status                                                         |
+ROW   |3961     |34079 |Application |Status                                                         |
+ROW   |3962     |34080 |Application |Status                                                         |
+ROW   |3963     |34106 |Application |Temperature                                                    |
+ROW   |3964     |34107 |Application |Temperature                                                    |
+ROW   |3965     |34130 |Application |CPU                                                            |
+ROW   |3966     |34132 |Application |Fans                                                           |
+ROW   |3967     |34111 |Application |General                                                        |
+ROW   |3968     |34112 |Application |General                                                        |
+ROW   |3969     |34113 |Application |General                                                        |
+ROW   |3970     |34116 |Application |General                                                        |
+ROW   |3971     |34117 |Application |General                                                        |
+ROW   |3972     |34118 |Application |General                                                        |
+ROW   |3973     |34114 |Application |Inventory                                                      |
+ROW   |3974     |34115 |Application |Inventory                                                      |
+ROW   |3975     |34119 |Application |Inventory                                                      |
+ROW   |3976     |34131 |Application |Inventory                                                      |
+ROW   |3977     |34133 |Application |Memory                                                         |
+ROW   |3978     |34134 |Application |Memory                                                         |
+ROW   |3979     |34135 |Application |Memory                                                         |
+ROW   |3980     |34146 |Application |Power supply                                                   |
+ROW   |3981     |34108 |Application |Status                                                         |
+ROW   |3982     |34109 |Application |Status                                                         |
+ROW   |3983     |34110 |Application |Status                                                         |
+ROW   |3984     |34120 |Application |Status                                                         |
+ROW   |3985     |34121 |Application |Status                                                         |
+ROW   |3986     |34147 |Application |Temperature                                                    |
+ROW   |3987     |34148 |Application |Temperature                                                    |
+ROW   |4030     |34227 |Application |General                                                        |
+ROW   |4031     |34236 |Application |General                                                        |
+ROW   |4032     |34237 |Application |General                                                        |
+ROW   |4033     |34239 |Application |General                                                        |
+ROW   |4034     |34240 |Application |General                                                        |
+ROW   |4035     |34241 |Application |General                                                        |
+ROW   |4036     |34242 |Application |General                                                        |
+ROW   |4037     |34243 |Application |General                                                        |
+ROW   |4038     |34244 |Application |General                                                        |
+ROW   |4039     |34245 |Application |General                                                        |
+ROW   |4040     |34246 |Application |General                                                        |
+ROW   |4041     |34248 |Application |General                                                        |
+ROW   |4042     |34249 |Application |General                                                        |
+ROW   |4043     |34251 |Application |General                                                        |
+ROW   |4044     |34252 |Application |General                                                        |
+ROW   |4045     |34253 |Application |General                                                        |
+ROW   |4046     |34226 |Application |Zabbix raw items                                               |
+ROW   |4047     |34228 |Application |Zabbix raw items                                               |
+ROW   |4048     |34229 |Application |Zabbix raw items                                               |
+ROW   |4049     |34230 |Application |Zabbix raw items                                               |
+ROW   |4050     |34231 |Application |Zabbix raw items                                               |
+ROW   |4051     |34232 |Application |Zabbix raw items                                               |
+ROW   |4052     |34233 |Application |Zabbix raw items                                               |
+ROW   |4053     |34234 |Application |Zabbix raw items                                               |
+ROW   |4054     |34235 |Application |Zabbix raw items                                               |
+ROW   |4055     |34238 |Application |Zabbix raw items                                               |
+ROW   |4056     |34247 |Application |Zabbix raw items                                               |
+ROW   |4057     |34250 |Application |Zabbix raw items                                               |
+ROW   |4058     |34254 |Application |Zabbix raw items                                               |
+ROW   |4059     |34255 |Application |Zabbix raw items                                               |
+ROW   |4060     |34256 |Application |Zabbix raw items                                               |
+ROW   |4061     |34257 |Application |Zabbix raw items                                               |
+ROW   |4062     |34258 |Application |Zabbix raw items                                               |
+ROW   |4063     |34259 |Application |Zabbix raw items                                               |
+ROW   |4064     |34296 |Application |Zabbix raw items                                               |
+ROW   |4065     |34297 |Application |Zabbix raw items                                               |
+ROW   |4066     |34298 |Application |Zabbix raw items                                               |
+ROW   |4067     |34299 |Application |Zabbix raw items                                               |
+ROW   |4068     |34302 |Application |Zabbix raw items                                               |
+ROW   |4069     |34303 |Application |Zabbix raw items                                               |
+ROW   |4070     |34304 |Application |Zabbix raw items                                               |
+ROW   |4071     |34305 |Application |Zabbix raw items                                               |
+ROW   |4072     |29014 |Application |Disk {#DEVNAME}                                                |
+ROW   |4073     |29015 |Application |Disk {#DEVNAME}                                                |
+ROW   |4074     |29016 |Application |Disk {#DEVNAME}                                                |
+ROW   |4075     |29027 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4076     |29028 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4077     |29029 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4078     |29030 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4079     |29031 |Application |Disk {#DEVNAME}                                                |
+ROW   |4080     |29032 |Application |Disk {#DEVNAME}                                                |
+ROW   |4081     |29033 |Application |Disk {#DEVNAME}                                                |
+ROW   |4082     |29044 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4083     |29045 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4084     |29046 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4085     |29047 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4086     |29210 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4087     |29211 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4088     |29212 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4089     |29213 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4090     |29216 |Application |Interface {#IFNAME}                                            |
+ROW   |4091     |29217 |Application |Interface {#IFNAME}                                            |
+ROW   |4092     |29218 |Application |Interface {#IFNAME}                                            |
+ROW   |4093     |29219 |Application |Interface {#IFNAME}                                            |
+ROW   |4094     |29220 |Application |Interface {#IFNAME}                                            |
+ROW   |4095     |29221 |Application |Interface {#IFNAME}                                            |
+ROW   |4096     |29222 |Application |Interface {#IFNAME}                                            |
+ROW   |4097     |29223 |Application |Interface {#IFNAME}                                            |
+ROW   |4098     |29224 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4099     |29225 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4100     |29226 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4101     |29227 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4102     |29230 |Application |Interface {#IFNAME}                                            |
+ROW   |4103     |29231 |Application |Interface {#IFNAME}                                            |
+ROW   |4104     |29232 |Application |Interface {#IFNAME}                                            |
+ROW   |4105     |29233 |Application |Interface {#IFNAME}                                            |
+ROW   |4106     |29234 |Application |Interface {#IFNAME}                                            |
+ROW   |4107     |29235 |Application |Interface {#IFNAME}                                            |
+ROW   |4108     |29236 |Application |Interface {#IFNAME}                                            |
+ROW   |4109     |29237 |Application |Interface {#IFNAME}                                            |
+ROW   |4110     |29238 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4111     |29239 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4112     |29240 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4113     |29241 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4114     |29244 |Application |Interface {#IFNAME}                                            |
+ROW   |4115     |29245 |Application |Interface {#IFNAME}                                            |
+ROW   |4116     |29246 |Application |Interface {#IFNAME}                                            |
+ROW   |4117     |29247 |Application |Interface {#IFNAME}                                            |
+ROW   |4118     |29248 |Application |Interface {#IFNAME}                                            |
+ROW   |4119     |29249 |Application |Interface {#IFNAME}                                            |
+ROW   |4120     |29250 |Application |Interface {#IFNAME}                                            |
+ROW   |4121     |29251 |Application |Interface {#IFNAME}                                            |
+ROW   |4122     |29432 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4123     |29433 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4124     |29445 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4125     |29446 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4126     |29447 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4127     |29434 |Application |Disk {#DEVNAME}                                                |
+ROW   |4128     |29435 |Application |Disk {#DEVNAME}                                                |
+ROW   |4129     |29448 |Application |Disk {#DEVNAME}                                                |
+ROW   |4130     |29449 |Application |Disk {#DEVNAME}                                                |
+ROW   |4131     |29452 |Application |Disk {#DEVNAME}                                                |
+ROW   |4132     |29453 |Application |Disk {#DEVNAME}                                                |
+ROW   |4133     |29436 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4134     |29437 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4135     |29438 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4136     |29439 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4137     |29440 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4138     |29441 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4139     |29442 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4140     |29443 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4141     |29444 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4142     |29512 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4143     |29513 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4144     |29514 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4145     |29521 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4146     |29522 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4147     |29523 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4148     |29720 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4149     |29721 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4150     |29722 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4151     |29723 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4152     |29724 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4153     |29725 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4154     |29726 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4155     |29727 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4156     |29728 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4157     |29729 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4158     |29730 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4159     |29731 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4160     |29732 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4161     |29733 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4162     |29734 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4163     |29735 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4164     |29736 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4165     |29737 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4166     |29787 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4167     |29788 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4168     |29789 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4169     |29790 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4170     |29791 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4171     |29792 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4172     |29793 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4173     |29794 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4174     |29795 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4175     |29796 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4176     |29797 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4177     |29798 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4178     |29799 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4179     |29800 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4180     |29801 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4181     |29802 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4182     |29803 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4183     |29804 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4184     |29805 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4185     |29806 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4186     |29807 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4187     |29808 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4188     |29809 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4189     |29810 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4190     |29811 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4191     |29812 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4192     |29813 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4193     |29814 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4194     |29815 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4195     |29816 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4196     |29817 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4197     |29818 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4198     |29819 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4199     |29820 |Application |RabbitMQ: Queue "{#VHOST}/{#QUEUE}"                            |
+ROW   |4200     |27032 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4201     |27191 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4202     |27332 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4203     |27461 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4204     |27531 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4205     |27567 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4206     |27630 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4207     |27653 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4208     |27733 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4209     |27799 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4210     |27955 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4211     |28129 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4212     |28281 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4213     |28956 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4214     |27099 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4215     |27100 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4216     |27101 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4217     |27102 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4218     |27103 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4219     |27104 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4220     |27105 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4221     |27106 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4222     |27107 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4223     |27181 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4224     |27182 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4225     |27183 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4226     |27184 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4227     |27185 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4228     |27186 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4229     |27187 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4230     |27188 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4231     |27189 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4232     |27216 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4233     |27217 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4234     |27218 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4235     |27219 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4236     |27220 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4237     |27221 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4238     |27222 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4239     |27223 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4240     |27224 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4241     |27252 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4242     |27253 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4243     |27254 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4244     |27255 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4245     |27256 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4246     |27257 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4247     |27258 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4248     |27259 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4249     |27260 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4250     |27273 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4251     |27274 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4252     |27275 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4253     |27276 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4254     |27277 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4255     |27278 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4256     |27279 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4257     |27280 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4258     |27281 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4259     |27322 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4260     |27323 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4261     |27324 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4262     |27325 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4263     |27326 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4264     |27327 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4265     |27328 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4266     |27329 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4267     |27330 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4268     |27451 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4269     |27452 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4270     |27453 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4271     |27454 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4272     |27455 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4273     |27456 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4274     |27457 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4275     |27458 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4276     |27459 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4277     |27487 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4278     |27488 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4279     |27489 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4280     |27490 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4281     |27491 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4282     |27492 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4283     |27493 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4284     |27494 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4285     |27495 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4286     |27521 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4287     |27522 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4288     |27523 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4289     |27524 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4290     |27525 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4291     |27526 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4292     |27527 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4293     |27528 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4294     |27529 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4295     |27557 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4296     |27558 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4297     |27559 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4298     |27560 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4299     |27561 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4300     |27562 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4301     |27563 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4302     |27564 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4303     |27565 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4304     |27643 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4305     |27644 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4306     |27645 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4307     |27646 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4308     |27647 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4309     |27648 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4310     |27649 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4311     |27650 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4312     |27651 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4313     |27723 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4314     |27724 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4315     |27725 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4316     |27726 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4317     |27727 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4318     |27728 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4319     |27729 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4320     |27730 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4321     |27731 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4322     |27757 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4323     |27758 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4324     |27759 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4325     |27760 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4326     |27761 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4327     |27762 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4328     |27763 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4329     |27764 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4330     |27765 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4331     |27789 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4332     |27790 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4333     |27791 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4334     |27792 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4335     |27793 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4336     |27794 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4337     |27795 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4338     |27796 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4339     |27797 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4340     |27873 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4341     |27874 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4342     |27875 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4343     |27876 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4344     |27877 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4345     |27878 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4346     |27879 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4347     |27880 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4348     |27881 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4349     |27910 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4350     |27911 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4351     |27912 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4352     |27913 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4353     |27914 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4354     |27915 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4355     |27916 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4356     |27917 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4357     |27918 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4358     |27945 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4359     |27946 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4360     |27947 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4361     |27948 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4362     |27949 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4363     |27950 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4364     |27951 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4365     |27952 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4366     |27953 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4367     |28119 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4368     |28120 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4369     |28121 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4370     |28122 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4371     |28123 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4372     |28124 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4373     |28125 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4374     |28126 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4375     |28127 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4376     |28224 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4377     |28225 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4378     |28226 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4379     |28227 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4380     |28228 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4381     |28229 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4382     |28230 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4383     |28231 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4384     |28232 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4385     |28294 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4386     |28295 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4387     |28296 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4388     |28297 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4389     |28298 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4390     |28299 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4391     |28300 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4392     |28301 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4393     |28302 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4394     |28969 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4395     |28970 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4396     |28971 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4397     |28972 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4398     |28973 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4399     |28974 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4400     |28975 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4401     |28976 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4402     |28977 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4403     |28006 |Application |Interface {#IFDESCR}                                           |
+ROW   |4404     |28007 |Application |Interface {#IFDESCR}                                           |
+ROW   |4405     |28008 |Application |Interface {#IFDESCR}                                           |
+ROW   |4406     |28009 |Application |Interface {#IFDESCR}                                           |
+ROW   |4407     |28010 |Application |Interface {#IFDESCR}                                           |
+ROW   |4408     |28011 |Application |Interface {#IFDESCR}                                           |
+ROW   |4409     |28012 |Application |Interface {#IFDESCR}                                           |
+ROW   |4410     |28013 |Application |Interface {#IFDESCR}                                           |
+ROW   |4411     |28014 |Application |Interface {#IFDESCR}                                           |
+ROW   |4412     |27079 |Application |Interface {#IFDESCR}                                           |
+ROW   |4413     |27080 |Application |Interface {#IFDESCR}                                           |
+ROW   |4414     |27081 |Application |Interface {#IFDESCR}                                           |
+ROW   |4415     |27082 |Application |Interface {#IFDESCR}                                           |
+ROW   |4416     |27083 |Application |Interface {#IFDESCR}                                           |
+ROW   |4417     |27084 |Application |Interface {#IFDESCR}                                           |
+ROW   |4418     |27085 |Application |Interface {#IFDESCR}                                           |
+ROW   |4419     |27086 |Application |Interface {#IFDESCR}                                           |
+ROW   |4420     |27087 |Application |Interface {#IFDESCR}                                           |
+ROW   |4421     |27620 |Application |Interface {#IFDESCR}                                           |
+ROW   |4422     |27621 |Application |Interface {#IFDESCR}                                           |
+ROW   |4423     |27622 |Application |Interface {#IFDESCR}                                           |
+ROW   |4424     |27623 |Application |Interface {#IFDESCR}                                           |
+ROW   |4425     |27624 |Application |Interface {#IFDESCR}                                           |
+ROW   |4426     |27625 |Application |Interface {#IFDESCR}                                           |
+ROW   |4427     |27626 |Application |Interface {#IFDESCR}                                           |
+ROW   |4428     |27627 |Application |Interface {#IFDESCR}                                           |
+ROW   |4429     |27628 |Application |Interface {#IFDESCR}                                           |
+ROW   |4430     |27977 |Application |Interface {#IFDESCR}                                           |
+ROW   |4431     |27978 |Application |Interface {#IFDESCR}                                           |
+ROW   |4432     |27979 |Application |Interface {#IFDESCR}                                           |
+ROW   |4433     |27980 |Application |Interface {#IFDESCR}                                           |
+ROW   |4434     |27981 |Application |Interface {#IFDESCR}                                           |
+ROW   |4435     |27982 |Application |Interface {#IFDESCR}                                           |
+ROW   |4436     |27983 |Application |Interface {#IFDESCR}                                           |
+ROW   |4437     |27984 |Application |Interface {#IFDESCR}                                           |
+ROW   |4438     |27985 |Application |Interface {#IFDESCR}                                           |
+ROW   |4439     |27119 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4440     |27120 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4441     |27121 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4442     |27122 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4443     |27123 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4444     |27124 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4445     |27125 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4446     |27126 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4447     |27127 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4448     |29078 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4449     |29079 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4450     |29080 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4451     |29081 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4452     |29082 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4453     |29083 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4454     |29084 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4455     |29085 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4456     |29086 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4457     |30027 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4458     |30028 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4459     |30029 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4460     |30030 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4461     |30031 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4462     |30032 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4463     |30033 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4464     |30034 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4465     |30035 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4466     |30036 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4467     |30037 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4468     |30038 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4469     |30039 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4470     |30040 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4471     |30041 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4472     |30042 |Application |RabbitMQ: Exchange "{#VHOST}/{#EXCHANGE}/{#TYPE}"              |
+ROW   |4473     |30160 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4474     |30161 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4475     |30162 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4476     |30166 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4477     |30167 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4478     |30168 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4479     |30178 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4480     |30179 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4481     |30180 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4482     |30184 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4483     |30185 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4484     |30186 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4553     |30348 |Application |Redis: DB {#DB}                                                |
+ROW   |4554     |30349 |Application |Redis: DB {#DB}                                                |
+ROW   |4555     |30350 |Application |Redis: DB {#DB}                                                |
+ROW   |4556     |30396 |Application |Redis: Slave {#SLAVE_IP}:{#SLAVE_PORT}                         |
+ROW   |4557     |30573 |Application |Docker: Container {#NAME}                                      |
+ROW   |4558     |30574 |Application |Docker: Container {#NAME}                                      |
+ROW   |4559     |30575 |Application |Docker: Container {#NAME}                                      |
+ROW   |4560     |30576 |Application |Docker: Container {#NAME}                                      |
+ROW   |4561     |30577 |Application |Docker: Container {#NAME}                                      |
+ROW   |4562     |30578 |Application |Docker: Container {#NAME}                                      |
+ROW   |4563     |30579 |Application |Docker: Container {#NAME}                                      |
+ROW   |4564     |30580 |Application |Docker: Container {#NAME}                                      |
+ROW   |4565     |30581 |Application |Docker: Container {#NAME}                                      |
+ROW   |4566     |30582 |Application |Docker: Container {#NAME}                                      |
+ROW   |4567     |30583 |Application |Docker: Container {#NAME}                                      |
+ROW   |4568     |30584 |Application |Docker: Container {#NAME}                                      |
+ROW   |4569     |30585 |Application |Docker: Container {#NAME}                                      |
+ROW   |4570     |30586 |Application |Docker: Container {#NAME}                                      |
+ROW   |4571     |30587 |Application |Docker: Container {#NAME}                                      |
+ROW   |4572     |30588 |Application |Docker: Container {#NAME}                                      |
+ROW   |4573     |30589 |Application |Docker: Container {#NAME}                                      |
+ROW   |4574     |30590 |Application |Docker: Container {#NAME}                                      |
+ROW   |4575     |30591 |Application |Docker: Container {#NAME}                                      |
+ROW   |4576     |30592 |Application |Docker: Container {#NAME}                                      |
+ROW   |4577     |30593 |Application |Docker: Container {#NAME}                                      |
+ROW   |4578     |30594 |Application |Docker: Container {#NAME}                                      |
+ROW   |4579     |30595 |Application |Docker: Container {#NAME}                                      |
+ROW   |4580     |30596 |Application |Docker: Container {#NAME}                                      |
+ROW   |4581     |30597 |Application |Docker: Container {#NAME}                                      |
+ROW   |4582     |30598 |Application |Docker: Container {#NAME}                                      |
+ROW   |4583     |30599 |Application |Docker: Container {#NAME}                                      |
+ROW   |4584     |30600 |Application |Docker: Container {#NAME}                                      |
+ROW   |4585     |30601 |Application |Docker: Container {#NAME}                                      |
+ROW   |4586     |30602 |Application |Docker: Container {#NAME}                                      |
+ROW   |4587     |30603 |Application |Docker: Container {#NAME}                                      |
+ROW   |4588     |30604 |Application |Docker: Container {#NAME}                                      |
+ROW   |4589     |30605 |Application |Docker: Container {#NAME}                                      |
+ROW   |4590     |30606 |Application |Docker: Container {#NAME}                                      |
+ROW   |4591     |30607 |Application |Docker: Container {#NAME}                                      |
+ROW   |4592     |30608 |Application |Docker: Container {#NAME}                                      |
+ROW   |4593     |30609 |Application |Docker: Image {#NAME}                                          |
+ROW   |4594     |30610 |Application |Docker: Image {#NAME}                                          |
+ROW   |4595     |30688 |Application |IPMI {#SENSOR_TYPE}                                            |
+ROW   |4596     |30689 |Application |IPMI {#SENSOR_TYPE}                                            |
+ROW   |4597     |30714 |Application |ES {#ES.NODE}                                                  |
+ROW   |4598     |30715 |Application |ES {#ES.NODE}                                                  |
+ROW   |4599     |30716 |Application |ES {#ES.NODE}                                                  |
+ROW   |4600     |30717 |Application |ES {#ES.NODE}                                                  |
+ROW   |4601     |30718 |Application |ES {#ES.NODE}                                                  |
+ROW   |4602     |30720 |Application |ES {#ES.NODE}                                                  |
+ROW   |4603     |30721 |Application |ES {#ES.NODE}                                                  |
+ROW   |4604     |30722 |Application |ES {#ES.NODE}                                                  |
+ROW   |4605     |30723 |Application |ES {#ES.NODE}                                                  |
+ROW   |4606     |30724 |Application |ES {#ES.NODE}                                                  |
+ROW   |4607     |30725 |Application |ES {#ES.NODE}                                                  |
+ROW   |4608     |30726 |Application |ES {#ES.NODE}                                                  |
+ROW   |4609     |30727 |Application |ES {#ES.NODE}                                                  |
+ROW   |4610     |30728 |Application |ES {#ES.NODE}                                                  |
+ROW   |4611     |30729 |Application |ES {#ES.NODE}                                                  |
+ROW   |4612     |30730 |Application |ES {#ES.NODE}                                                  |
+ROW   |4613     |30731 |Application |ES {#ES.NODE}                                                  |
+ROW   |4614     |30732 |Application |ES {#ES.NODE}                                                  |
+ROW   |4615     |30733 |Application |ES {#ES.NODE}                                                  |
+ROW   |4616     |30734 |Application |ES {#ES.NODE}                                                  |
+ROW   |4617     |30735 |Application |ES {#ES.NODE}                                                  |
+ROW   |4618     |30736 |Application |ES {#ES.NODE}                                                  |
+ROW   |4619     |30737 |Application |ES {#ES.NODE}                                                  |
+ROW   |4620     |30738 |Application |ES {#ES.NODE}                                                  |
+ROW   |4621     |30740 |Application |ES {#ES.NODE}                                                  |
+ROW   |4622     |30741 |Application |ES {#ES.NODE}                                                  |
+ROW   |4623     |30742 |Application |ES {#ES.NODE}                                                  |
+ROW   |4624     |30745 |Application |ES {#ES.NODE}                                                  |
+ROW   |4625     |30748 |Application |ES {#ES.NODE}                                                  |
+ROW   |4626     |30749 |Application |ES {#ES.NODE}                                                  |
+ROW   |4627     |30750 |Application |ES {#ES.NODE}                                                  |
+ROW   |4628     |30751 |Application |ES {#ES.NODE}                                                  |
+ROW   |4629     |30752 |Application |ES {#ES.NODE}                                                  |
+ROW   |4630     |30753 |Application |ES {#ES.NODE}                                                  |
+ROW   |4631     |30755 |Application |ES {#ES.NODE}                                                  |
+ROW   |4632     |30757 |Application |ES {#ES.NODE}                                                  |
+ROW   |4633     |30758 |Application |ES {#ES.NODE}                                                  |
+ROW   |4688     |30877 |Application |ClickHouse: Dictionary "{#NAME}"                               |
+ROW   |4689     |30878 |Application |ClickHouse: Dictionary "{#NAME}"                               |
+ROW   |4690     |30879 |Application |ClickHouse: Dictionary "{#NAME}"                               |
+ROW   |4691     |30880 |Application |ClickHouse: "{#DB}.{#TABLE}" replica status                    |
+ROW   |4692     |30881 |Application |ClickHouse: "{#DB}.{#TABLE}" replica status                    |
+ROW   |4693     |30882 |Application |ClickHouse: "{#DB}.{#TABLE}" replica status                    |
+ROW   |4694     |30883 |Application |ClickHouse: "{#DB}.{#TABLE}" replica status                    |
+ROW   |4695     |30884 |Application |ClickHouse: "{#DB}.{#TABLE}" replica status                    |
+ROW   |4696     |30885 |Application |ClickHouse: "{#DB}.{#TABLE}" replica status                    |
+ROW   |4697     |30886 |Application |ClickHouse: "{#DB}.{#TABLE}" replica status                    |
+ROW   |4698     |30887 |Application |ClickHouse: "{#DB}.{#TABLE}" replica status                    |
+ROW   |4699     |30888 |Application |ClickHouse: "{#DB}.{#TABLE}" replica status                    |
+ROW   |4700     |30889 |Application |ClickHouse: "{#DB}.{#TABLE}" replica status                    |
+ROW   |4701     |30890 |Application |ClickHouse: "{#DB}.{#TABLE}" replica status                    |
+ROW   |4702     |30891 |Application |ClickHouse: "{#DB}.{#TABLE}" replica status                    |
+ROW   |4703     |30892 |Application |ClickHouse: DB "{#DB}"                                         |
+ROW   |4704     |30893 |Application |ClickHouse: Table "{#DB}.{#TABLE}"                             |
+ROW   |4705     |30894 |Application |ClickHouse: Table "{#DB}.{#TABLE}"                             |
+ROW   |4706     |30895 |Application |ClickHouse: Table "{#DB}.{#TABLE}"                             |
+ROW   |4707     |30964 |Application |Etcd peer {#ETCD.PEER}                                         |
+ROW   |4708     |30965 |Application |Etcd peer {#ETCD.PEER}                                         |
+ROW   |4709     |30966 |Application |Etcd peer {#ETCD.PEER}                                         |
+ROW   |4710     |30967 |Application |Etcd peer {#ETCD.PEER}                                         |
+ROW   |4711     |31006 |Application |{#APPPOOL}                                                     |
+ROW   |4712     |31007 |Application |{#APPPOOL}                                                     |
+ROW   |4713     |31008 |Application |{#APPPOOL}                                                     |
+ROW   |4714     |31009 |Application |{#APPPOOL}                                                     |
+ROW   |4715     |31048 |Application |{#APPPOOL}                                                     |
+ROW   |4716     |31049 |Application |{#APPPOOL}                                                     |
+ROW   |4717     |31050 |Application |{#APPPOOL}                                                     |
+ROW   |4718     |31051 |Application |{#APPPOOL}                                                     |
+ROW   |4752     |31258 |Application |Oracle Archivelog                                              |
+ROW   |4753     |31259 |Application |Oracle Archivelog                                              |
+ROW   |4754     |31260 |Application |Oracle Archivelog                                              |
+ROW   |4755     |31261 |Application |Oracle ASM                                                     |
+ROW   |4756     |31262 |Application |Oracle ASM                                                     |
+ROW   |4757     |31263 |Application |Oracle ASM                                                     |
+ROW   |4758     |31264 |Application |Oracle {#TYPE}                                                 |
+ROW   |4759     |31265 |Application |Oracle {#TYPE}                                                 |
+ROW   |4760     |31266 |Application |Oracle {#TYPE}                                                 |
+ROW   |4761     |31267 |Application |Oracle {#TYPE}                                                 |
+ROW   |4762     |31268 |Application |Oracle PDB                                                     |
+ROW   |4763     |31269 |Application |Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
+ROW   |4764     |31270 |Application |Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
+ROW   |4765     |31271 |Application |Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
+ROW   |4766     |31272 |Application |Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
+ROW   |4767     |31273 |Application |Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
+ROW   |4768     |33170 |Application |Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
+ROW   |4769     |33171 |Application |Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
+ROW   |4770     |31335 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4771     |31336 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4772     |31337 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4773     |31338 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4774     |31339 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4775     |31340 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4776     |31341 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4777     |31342 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4778     |31343 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4779     |31344 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4780     |31345 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4781     |31346 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4782     |31347 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4783     |31348 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4784     |31349 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4785     |31350 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4786     |31351 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4787     |31352 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4788     |31353 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4789     |31354 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4790     |31355 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4791     |31356 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4792     |31357 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4793     |31358 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4794     |31359 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4795     |31360 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4796     |31361 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4797     |31362 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4798     |31363 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4799     |31370 |Application |Disk {#DEVNAME}                                                |
+ROW   |4800     |31371 |Application |Disk {#DEVNAME}                                                |
+ROW   |4801     |31379 |Application |Disk {#DEVNAME}                                                |
+ROW   |4802     |31380 |Application |Disk {#DEVNAME}                                                |
+ROW   |4803     |31382 |Application |Disk {#DEVNAME}                                                |
+ROW   |4804     |31383 |Application |Disk {#DEVNAME}                                                |
+ROW   |4805     |31373 |Application |Disk {#DEVNAME}                                                |
+ROW   |4806     |31374 |Application |Disk {#DEVNAME}                                                |
+ROW   |4807     |31385 |Application |Disk {#DEVNAME}                                                |
+ROW   |4808     |31386 |Application |Disk {#DEVNAME}                                                |
+ROW   |4809     |31388 |Application |Disk {#DEVNAME}                                                |
+ROW   |4810     |31389 |Application |Disk {#DEVNAME}                                                |
+ROW   |4811     |31376 |Application |Disk {#DEVNAME}                                                |
+ROW   |4812     |31377 |Application |Disk {#DEVNAME}                                                |
+ROW   |4813     |31391 |Application |Disk {#DEVNAME}                                                |
+ROW   |4814     |31392 |Application |Disk {#DEVNAME}                                                |
+ROW   |4815     |31394 |Application |Disk {#DEVNAME}                                                |
+ROW   |4816     |31395 |Application |Disk {#DEVNAME}                                                |
+ROW   |4817     |31433 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4818     |31434 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4819     |31435 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4820     |31436 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4821     |31437 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4822     |31438 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4823     |31453 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4824     |31454 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4825     |31455 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4826     |31439 |Application |Disk {#DEVNAME}                                                |
+ROW   |4827     |31440 |Application |Disk {#DEVNAME}                                                |
+ROW   |4828     |31441 |Application |Disk {#DEVNAME}                                                |
+ROW   |4829     |31442 |Application |Disk {#DEVNAME}                                                |
+ROW   |4830     |33321 |Application |Disk {#DEVNAME}                                                |
+ROW   |4831     |33322 |Application |Disk {#DEVNAME}                                                |
+ROW   |4832     |33323 |Application |Disk {#DEVNAME}                                                |
+ROW   |4833     |33324 |Application |Disk {#DEVNAME}                                                |
+ROW   |4834     |31443 |Application |Disk {#DEVNAME}                                                |
+ROW   |4835     |31444 |Application |Disk {#DEVNAME}                                                |
+ROW   |4836     |31445 |Application |Disk {#DEVNAME}                                                |
+ROW   |4837     |31446 |Application |Disk {#DEVNAME}                                                |
+ROW   |4838     |33325 |Application |Disk {#DEVNAME}                                                |
+ROW   |4839     |33326 |Application |Disk {#DEVNAME}                                                |
+ROW   |4840     |33327 |Application |Disk {#DEVNAME}                                                |
+ROW   |4841     |33328 |Application |Disk {#DEVNAME}                                                |
+ROW   |4842     |31447 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4843     |31448 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4844     |31449 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4845     |31450 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4846     |31451 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4847     |31452 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4848     |31456 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4849     |31457 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4850     |31458 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4851     |31561 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4852     |31562 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4853     |31563 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4854     |31564 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4855     |31565 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4856     |31566 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4857     |31567 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4858     |31568 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4859     |31569 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4860     |31766 |Application |Oracle Archivelog                                              |
+ROW   |4861     |31767 |Application |Oracle Archivelog                                              |
+ROW   |4862     |31768 |Application |Oracle Archivelog                                              |
+ROW   |4863     |31769 |Application |Oracle {#TYPE}                                                 |
+ROW   |4864     |31770 |Application |Oracle {#TYPE}                                                 |
+ROW   |4865     |31771 |Application |Oracle {#TYPE}                                                 |
+ROW   |4866     |31772 |Application |Oracle {#TYPE}                                                 |
+ROW   |4867     |31773 |Application |Oracle ASM                                                     |
+ROW   |4868     |31774 |Application |Oracle ASM                                                     |
+ROW   |4869     |31775 |Application |Oracle ASM                                                     |
+ROW   |4870     |31776 |Application |Oracle PDB                                                     |
+ROW   |4871     |31777 |Application |Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
+ROW   |4872     |31778 |Application |Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
+ROW   |4873     |31779 |Application |Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
+ROW   |4874     |31780 |Application |Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
+ROW   |4875     |31781 |Application |Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
+ROW   |4876     |33168 |Application |Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
+ROW   |4877     |33169 |Application |Oracle {#CONTENTS} Tablespaces. {#TABLESPACE}                  |
+ROW   |4878     |31807 |Application |Asterisk IAX trunks                                            |
+ROW   |4879     |31808 |Application |Asterisk IAX trunks                                            |
+ROW   |4880     |31809 |Application |Asterisk PJSIP trunks                                          |
+ROW   |4881     |31810 |Application |Asterisk PJSIP trunks                                          |
+ROW   |4882     |31811 |Application |Asterisk queue "{#QUEUE}"                                      |
+ROW   |4883     |31812 |Application |Asterisk queue "{#QUEUE}"                                      |
+ROW   |4884     |31813 |Application |Asterisk queue "{#QUEUE}"                                      |
+ROW   |4885     |31814 |Application |Asterisk SIP trunks                                            |
+ROW   |4886     |31815 |Application |Asterisk SIP trunks                                            |
+ROW   |4887     |31902 |Application |Disk {#DEVNAME}                                                |
+ROW   |4888     |31903 |Application |Disk {#DEVNAME}                                                |
+ROW   |4889     |31932 |Application |Disk {#DEVNAME}                                                |
+ROW   |4890     |31933 |Application |Disk {#DEVNAME}                                                |
+ROW   |4891     |31935 |Application |Disk {#DEVNAME}                                                |
+ROW   |4892     |31936 |Application |Disk {#DEVNAME}                                                |
+ROW   |4893     |31905 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4894     |31906 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4895     |31907 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4896     |31908 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4897     |31909 |Application |Interface {#IFNAME}                                            |
+ROW   |4898     |31910 |Application |Interface {#IFNAME}                                            |
+ROW   |4899     |31911 |Application |Interface {#IFNAME}                                            |
+ROW   |4900     |31912 |Application |Interface {#IFNAME}                                            |
+ROW   |4901     |31913 |Application |Interface {#IFNAME}                                            |
+ROW   |4902     |31914 |Application |Interface {#IFNAME}                                            |
+ROW   |4903     |31915 |Application |Interface {#IFNAME}                                            |
+ROW   |4904     |31916 |Application |Interface {#IFNAME}                                            |
+ROW   |4905     |31917 |Application |Disk {#DEVNAME}                                                |
+ROW   |4906     |31918 |Application |Disk {#DEVNAME}                                                |
+ROW   |4907     |31938 |Application |Disk {#DEVNAME}                                                |
+ROW   |4908     |31939 |Application |Disk {#DEVNAME}                                                |
+ROW   |4909     |31941 |Application |Disk {#DEVNAME}                                                |
+ROW   |4910     |31942 |Application |Disk {#DEVNAME}                                                |
+ROW   |4911     |31920 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4912     |31921 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4913     |31922 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4914     |31923 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4915     |31924 |Application |Interface {#IFNAME}                                            |
+ROW   |4916     |31925 |Application |Interface {#IFNAME}                                            |
+ROW   |4917     |31926 |Application |Interface {#IFNAME}                                            |
+ROW   |4918     |31927 |Application |Interface {#IFNAME}                                            |
+ROW   |4919     |31928 |Application |Interface {#IFNAME}                                            |
+ROW   |4920     |31929 |Application |Interface {#IFNAME}                                            |
+ROW   |4921     |31930 |Application |Interface {#IFNAME}                                            |
+ROW   |4922     |31931 |Application |Interface {#IFNAME}                                            |
+ROW   |4923     |32012 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4924     |32013 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4925     |32014 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4926     |32015 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4927     |32016 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4928     |32017 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4929     |32018 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4930     |32019 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4931     |32020 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4932     |32040 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4933     |32041 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4934     |32042 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4935     |32021 |Application |Disk {#DEVNAME}                                                |
+ROW   |4936     |32022 |Application |Disk {#DEVNAME}                                                |
+ROW   |4937     |32023 |Application |Disk {#DEVNAME}                                                |
+ROW   |4938     |32024 |Application |Disk {#DEVNAME}                                                |
+ROW   |4939     |33329 |Application |Disk {#DEVNAME}                                                |
+ROW   |4940     |33330 |Application |Disk {#DEVNAME}                                                |
+ROW   |4941     |33331 |Application |Disk {#DEVNAME}                                                |
+ROW   |4942     |33332 |Application |Disk {#DEVNAME}                                                |
+ROW   |4943     |32026 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4944     |32027 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4945     |32028 |Application |Filesystem {#FSNAME}                                           |
+ROW   |4946     |32029 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4947     |32030 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4948     |32031 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4949     |32032 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4950     |32033 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4951     |32034 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4952     |32043 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4953     |32044 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4954     |32045 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4955     |32035 |Application |Disk {#DEVNAME}                                                |
+ROW   |4956     |32036 |Application |Disk {#DEVNAME}                                                |
+ROW   |4957     |32037 |Application |Disk {#DEVNAME}                                                |
+ROW   |4958     |32038 |Application |Disk {#DEVNAME}                                                |
+ROW   |4959     |33333 |Application |Disk {#DEVNAME}                                                |
+ROW   |4960     |33334 |Application |Disk {#DEVNAME}                                                |
+ROW   |4961     |33335 |Application |Disk {#DEVNAME}                                                |
+ROW   |4962     |33336 |Application |Disk {#DEVNAME}                                                |
+ROW   |4963     |32405 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4964     |32408 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4965     |32409 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4966     |32410 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4967     |32411 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4968     |32412 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4969     |32413 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4970     |32414 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4971     |32415 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4972     |32416 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4973     |32417 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4974     |32418 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4975     |32419 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4976     |32420 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4977     |32421 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4978     |32422 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4979     |32423 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4980     |32424 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4981     |32425 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4982     |32426 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4983     |32427 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4984     |32428 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4985     |32429 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4986     |32430 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4987     |32431 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4988     |32432 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4989     |32433 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4990     |32434 |Application |PostgreSQL: DB {#DBNAME}                                       |
+ROW   |4991     |32436 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4992     |32437 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4993     |32438 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4994     |32439 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |4995     |32442 |Application |{#JMXBROKERNAME}                                               |
+ROW   |4996     |32443 |Application |{#JMXBROKERNAME}                                               |
+ROW   |4997     |32444 |Application |{#JMXBROKERNAME}                                               |
+ROW   |4998     |32445 |Application |{#JMXBROKERNAME}                                               |
+ROW   |4999     |32446 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5000     |32447 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5001     |32448 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5002     |32449 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5003     |32450 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5004     |32451 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5005     |32452 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5006     |32453 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5007     |32454 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5008     |32455 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5009     |32456 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5010     |32457 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5011     |32458 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5012     |32459 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5013     |32460 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5014     |32461 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5015     |32462 |Application |{#JMXBROKERNAME}                                               |
+ROW   |5016     |32486 |Application |{#METRIC}                                                      |
+ROW   |5017     |32487 |Application |{#METRIC}                                                      |
+ROW   |5018     |32488 |Application |{#METRIC}                                                      |
+ROW   |5019     |32489 |Application |{#METRIC}                                                      |
+ROW   |5020     |32490 |Application |{#METRIC}                                                      |
+ROW   |5021     |32491 |Application |{#METRIC}                                                      |
+ROW   |5022     |32492 |Application |{#METRIC}                                                      |
+ROW   |5023     |32493 |Application |{#METRIC}                                                      |
+ROW   |5024     |32494 |Application |{#METRIC}                                                      |
+ROW   |5025     |32495 |Application |{#METRIC}                                                      |
+ROW   |5026     |32496 |Application |{#METRIC}                                                      |
+ROW   |5027     |32497 |Application |{#METRIC}                                                      |
+ROW   |5028     |32498 |Application |{#METRIC}                                                      |
+ROW   |5029     |32499 |Application |{#METRIC}                                                      |
+ROW   |5030     |32500 |Application |{#METRIC}                                                      |
+ROW   |5031     |32501 |Application |{#METRIC}                                                      |
+ROW   |5032     |32502 |Application |{#METRIC}                                                      |
+ROW   |5033     |32503 |Application |{#METRIC}                                                      |
+ROW   |5034     |32504 |Application |{#METRIC}                                                      |
+ROW   |5035     |32505 |Application |{#METRIC}                                                      |
+ROW   |5036     |32506 |Application |{#METRIC}                                                      |
+ROW   |5037     |32507 |Application |Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
+ROW   |5038     |32508 |Application |Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
+ROW   |5039     |32509 |Application |Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
+ROW   |5040     |32510 |Application |Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
+ROW   |5041     |32511 |Application |Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
+ROW   |5042     |32512 |Application |Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
+ROW   |5043     |32513 |Application |Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
+ROW   |5044     |32514 |Application |Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
+ROW   |5045     |32515 |Application |Ceph CRUSH [{#CRUSHRULE}] Pool                                 |
+ROW   |5046     |32170 |Application |Ceph {#HOST} OSD [{#CLASS}]                                    |
+ROW   |5047     |32171 |Application |Ceph {#HOST} OSD [{#CLASS}]                                    |
+ROW   |5048     |32172 |Application |Ceph {#HOST} OSD [{#CLASS}]                                    |
+ROW   |5049     |32173 |Application |Ceph {#HOST} OSD [{#CLASS}]                                    |
+ROW   |5050     |32174 |Application |Ceph {#HOST} OSD [{#CLASS}]                                    |
+ROW   |5051     |32175 |Application |Ceph {#HOST} OSD [{#CLASS}]                                    |
+ROW   |5052     |32528 |Application |Database {#INSTANCE}                                           |
+ROW   |5053     |32529 |Application |Database {#INSTANCE}                                           |
+ROW   |5054     |32530 |Application |Database {#INSTANCE}                                           |
+ROW   |5055     |32531 |Application |Database {#INSTANCE}                                           |
+ROW   |5056     |32532 |Application |Database {#INSTANCE}                                           |
+ROW   |5057     |32533 |Application |Database {#INSTANCE}                                           |
+ROW   |5058     |32534 |Application |Database {#INSTANCE}                                           |
+ROW   |5059     |32535 |Application |Database {#INSTANCE}                                           |
+ROW   |5060     |32536 |Application |Database {#INSTANCE}                                           |
+ROW   |5061     |32537 |Application |Database {#INSTANCE}                                           |
+ROW   |5062     |32538 |Application |Database {#INSTANCE}                                           |
+ROW   |5063     |32539 |Application |Database {#INSTANCE}                                           |
+ROW   |5064     |32540 |Application |Database {#INSTANCE}                                           |
+ROW   |5065     |32541 |Application |Database {#INSTANCE}                                           |
+ROW   |5066     |32542 |Application |Database {#INSTANCE}                                           |
+ROW   |5067     |32558 |Application |Database {#INSTANCE}                                           |
+ROW   |5068     |32559 |Application |Database {#INSTANCE}                                           |
+ROW   |5069     |32560 |Application |Database {#INSTANCE}                                           |
+ROW   |5070     |32561 |Application |Database {#INSTANCE}                                           |
+ROW   |5071     |32562 |Application |Database {#INSTANCE}                                           |
+ROW   |5072     |32563 |Application |Database {#INSTANCE}                                           |
+ROW   |5073     |32564 |Application |Database {#INSTANCE}                                           |
+ROW   |5074     |32565 |Application |Database {#INSTANCE}                                           |
+ROW   |5075     |32566 |Application |Database {#INSTANCE}                                           |
+ROW   |5076     |32567 |Application |Database {#INSTANCE}                                           |
+ROW   |5077     |32568 |Application |Database {#INSTANCE}                                           |
+ROW   |5078     |32569 |Application |Database {#INSTANCE}                                           |
+ROW   |5079     |32570 |Application |Database {#INSTANCE}                                           |
+ROW   |5080     |32571 |Application |Database {#INSTANCE}                                           |
+ROW   |5081     |32572 |Application |Database {#INSTANCE}                                           |
+ROW   |5082     |32672 |Application |Hadoop DataNode {#HOSTNAME}                                    |
+ROW   |5083     |32673 |Application |Hadoop DataNode {#HOSTNAME}                                    |
+ROW   |5084     |32674 |Application |Hadoop DataNode {#HOSTNAME}                                    |
+ROW   |5085     |32675 |Application |Hadoop DataNode {#HOSTNAME}                                    |
+ROW   |5086     |32676 |Application |Hadoop DataNode {#HOSTNAME}                                    |
+ROW   |5087     |32677 |Application |Hadoop DataNode {#HOSTNAME}                                    |
+ROW   |5088     |32678 |Application |Hadoop DataNode {#HOSTNAME}                                    |
+ROW   |5089     |32679 |Application |Hadoop DataNode {#HOSTNAME}                                    |
+ROW   |5090     |32680 |Application |Hadoop DataNode {#HOSTNAME}                                    |
+ROW   |5091     |32681 |Application |Hadoop DataNode {#HOSTNAME}                                    |
+ROW   |5092     |32682 |Application |Hadoop NodeManager {#HOSTNAME}                                 |
+ROW   |5093     |32683 |Application |Hadoop NodeManager {#HOSTNAME}                                 |
+ROW   |5094     |32684 |Application |Hadoop NodeManager {#HOSTNAME}                                 |
+ROW   |5095     |32685 |Application |Hadoop NodeManager {#HOSTNAME}                                 |
+ROW   |5096     |32686 |Application |Hadoop NodeManager {#HOSTNAME}                                 |
+ROW   |5097     |32687 |Application |Hadoop NodeManager {#HOSTNAME}                                 |
+ROW   |5098     |32688 |Application |Hadoop NodeManager {#HOSTNAME}                                 |
+ROW   |5099     |32689 |Application |Hadoop NodeManager {#HOSTNAME}                                 |
+ROW   |5100     |32690 |Application |Hadoop NodeManager {#HOSTNAME}                                 |
+ROW   |5101     |32691 |Application |Hadoop NodeManager {#HOSTNAME}                                 |
+ROW   |5102     |32692 |Application |Hadoop NodeManager {#HOSTNAME}                                 |
+ROW   |5103     |32758 |Application |Kafka topic [{#JMXTOPIC}]                                      |
+ROW   |5104     |32759 |Application |Kafka topic [{#JMXTOPIC}]                                      |
+ROW   |5105     |32760 |Application |Kafka topic [{#JMXTOPIC}]                                      |
+ROW   |5106     |32761 |Application |Kafka topic [{#JMXTOPIC}]                                      |
+ROW   |5107     |32766 |Application |Tomcat: ProtocolHandler {#JMXVALUE}                            |
+ROW   |5108     |32767 |Application |Tomcat: {#JMXTYPE} {#JMXNAME}                                  |
+ROW   |5109     |32768 |Application |Tomcat: {#JMXTYPE} {#JMXNAME}                                  |
+ROW   |5110     |32769 |Application |Tomcat: {#JMXTYPE} {#JMXNAME}                                  |
+ROW   |5111     |32770 |Application |Tomcat: {#JMXTYPE} {#JMXNAME}                                  |
+ROW   |5112     |32771 |Application |Tomcat: {#JMXTYPE} {#JMXNAME}                                  |
+ROW   |5113     |32772 |Application |Tomcat: Context {#JMXHOST}{#JMXCONTEXT}                        |
+ROW   |5114     |32773 |Application |Tomcat: Context {#JMXHOST}{#JMXCONTEXT}                        |
+ROW   |5115     |32774 |Application |Tomcat: Context {#JMXHOST}{#JMXCONTEXT}                        |
+ROW   |5116     |32775 |Application |Tomcat: Context {#JMXHOST}{#JMXCONTEXT}                        |
+ROW   |5117     |32776 |Application |Tomcat: Context {#JMXHOST}{#JMXCONTEXT}                        |
+ROW   |5118     |32777 |Application |Tomcat: {#JMXTYPE} {#JMXNAME}                                  |
+ROW   |5119     |32778 |Application |Tomcat: {#JMXTYPE} {#JMXNAME}                                  |
+ROW   |5120     |32779 |Application |Tomcat: {#JMXTYPE} {#JMXNAME}                                  |
+ROW   |5121     |32871 |Application |Vault: Token {#TOKEN_NAME}                                     |
+ROW   |5122     |32872 |Application |Vault: Token {#TOKEN_NAME}                                     |
+ROW   |5123     |32873 |Application |Vault: Token {#TOKEN_NAME}                                     |
+ROW   |5124     |32874 |Application |Vault: Mountpoint {#MOUNTPOINT}                                |
+ROW   |5125     |32875 |Application |Vault: Mountpoint {#MOUNTPOINT}                                |
+ROW   |5126     |32876 |Application |Vault: Replication                                             |
+ROW   |5127     |32877 |Application |Vault: Replication                                             |
+ROW   |5128     |32878 |Application |Vault: Replication                                             |
+ROW   |5129     |32879 |Application |Vault: Replication                                             |
+ROW   |5130     |32880 |Application |Vault: Replication                                             |
+ROW   |5131     |32881 |Application |Vault: Replication                                             |
+ROW   |5132     |32882 |Application |Vault: Replication                                             |
+ROW   |5133     |32883 |Application |Vault: Storage {#STORAGE}                                      |
+ROW   |5134     |32884 |Application |Vault: WAL                                                     |
+ROW   |5135     |32885 |Application |Vault: WAL                                                     |
+ROW   |5136     |32886 |Application |Vault: WAL                                                     |
+ROW   |5137     |32887 |Application |Vault: WAL                                                     |
+ROW   |5138     |32888 |Application |Vault: WAL                                                     |
+ROW   |5139     |32889 |Application |Vault: WAL                                                     |
+ROW   |5140     |33000 |Application |Zookeeper {#TYPE} {#CLIENT}                                    |
+ROW   |5141     |33001 |Application |Zookeeper {#TYPE} {#CLIENT}                                    |
+ROW   |5142     |33002 |Application |Zookeeper {#TYPE} {#CLIENT}                                    |
+ROW   |5143     |33003 |Application |Zookeeper {#TYPE} {#CLIENT}                                    |
+ROW   |5144     |33004 |Application |Zookeeper {#TYPE} {#CLIENT}                                    |
+ROW   |5145     |33005 |Application |Zookeeper {#TYPE} {#CLIENT}                                    |
+ROW   |5146     |33096 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5147     |33097 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5148     |33098 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5149     |33099 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5150     |33100 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5151     |33101 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5152     |33102 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5153     |33103 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5154     |33104 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5155     |33105 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5156     |33106 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5157     |33107 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5158     |33108 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5159     |33109 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5160     |33110 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5161     |33111 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5162     |33112 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5163     |33113 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5164     |33114 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5165     |33115 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5166     |33116 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5167     |33117 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5168     |33118 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5169     |33119 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5170     |33120 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5171     |33121 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5172     |33122 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5173     |33123 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5174     |33124 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5175     |33125 |Application |Cassandra table {#JMXKEYSPACE}.{#JMXSCOPE}                     |
+ROW   |5176     |33178 |Application |PostgreSQL: Application {#APPLICATION}                         |
+ROW   |5177     |33179 |Application |PostgreSQL: Application {#APPLICATION}                         |
+ROW   |5178     |33180 |Application |PostgreSQL: Application {#APPLICATION}                         |
+ROW   |5179     |33357 |Application |Node {#NODE.NAME} Health                                       |
+ROW   |5180     |33358 |Application |Node {#NODE.NAME} Health                                       |
+ROW   |5181     |33359 |Application |Node {#NODE.NAME} Health                                       |
+ROW   |5182     |33360 |Application |Node {#NODE.NAME} Health                                       |
+ROW   |5183     |33361 |Application |Node {#NODE.NAME} Health                                       |
+ROW   |5184     |33362 |Application |Node {#NODE.NAME} Health                                       |
+ROW   |5185     |33365 |Application |Node {#NODE.NAME} Health                                       |
+ROW   |5186     |33367 |Application |Node {#NODE.NAME} Health                                       |
+ROW   |5187     |33363 |Application |Node {#NODE.NAME} Inventory                                    |
+ROW   |5188     |33364 |Application |Node {#NODE.NAME} Inventory                                    |
+ROW   |5189     |33366 |Application |Node {#NODE.NAME} Inventory                                    |
+ROW   |5190     |33368 |Application |Node {#NODE.NAME} CPU                                          |
+ROW   |5191     |33369 |Application |{#VSERVER}{#FSNAME}                                            |
+ROW   |5192     |33370 |Application |{#VSERVER}{#FSNAME}                                            |
+ROW   |5193     |33371 |Application |{#VSERVER}{#FSNAME}                                            |
+ROW   |5194     |33372 |Application |{#VSERVER}{#FSNAME}                                            |
+ROW   |5195     |33373 |Application |{#VSERVER}{#FSNAME}                                            |
+ROW   |5196     |33374 |Application |{#VSERVER}{#FSNAME}                                            |
+ROW   |5197     |33375 |Application |Node {#NODE.NAME} HA                                           |
+ROW   |5198     |33376 |Application |Node {#NODE.NAME} HA                                           |
+ROW   |5199     |33377 |Application |{#IFDESCR}                                                     |
+ROW   |5200     |33378 |Application |{#IFDESCR}                                                     |
+ROW   |5201     |33379 |Application |{#IFDESCR}                                                     |
+ROW   |5202     |33380 |Application |{#IFDESCR}                                                     |
+ROW   |5203     |33381 |Application |{#IFDESCR}                                                     |
+ROW   |5204     |33382 |Application |{#IFDESCR}                                                     |
+ROW   |5205     |33383 |Application |{#IFDESCR}                                                     |
+ROW   |5206     |33384 |Application |{#IFDESCR}                                                     |
+ROW   |5207     |33385 |Application |{#IFDESCR}                                                     |
+ROW   |5208     |33386 |Application |{#IFDESCR}                                                     |
+ROW   |5209     |33387 |Application |{#IFDESCR}                                                     |
+ROW   |5210     |33388 |Application |{#IFDESCR}                                                     |
+ROW   |5211     |33467 |Application |Jenkins: Computer [{#DISPLAY_NAME}]                            |
+ROW   |5212     |33468 |Application |Jenkins: Computer [{#DISPLAY_NAME}]                            |
+ROW   |5213     |33469 |Application |Jenkins: Computer [{#DISPLAY_NAME}]                            |
+ROW   |5214     |33470 |Application |Jenkins: Computer [{#DISPLAY_NAME}]                            |
+ROW   |5215     |33471 |Application |Jenkins: Computer [{#DISPLAY_NAME}]                            |
+ROW   |5216     |33472 |Application |Jenkins: Computer [{#DISPLAY_NAME}]                            |
+ROW   |5217     |33473 |Application |Jenkins: Computer [{#DISPLAY_NAME}]                            |
+ROW   |5218     |33474 |Application |Jenkins: Computer [{#DISPLAY_NAME}]                            |
+ROW   |5219     |33475 |Application |Jenkins: Computer [{#DISPLAY_NAME}]                            |
+ROW   |5220     |33476 |Application |Jenkins: Computer [{#DISPLAY_NAME}]                            |
+ROW   |5221     |33477 |Application |Jenkins: Computer [{#DISPLAY_NAME}]                            |
+ROW   |5222     |33478 |Application |Jenkins: Computer [{#DISPLAY_NAME}]                            |
+ROW   |5223     |33479 |Application |Jenkins: Computer [{#DISPLAY_NAME}]                            |
+ROW   |5224     |33480 |Application |Jenkins job [{#NAME}]                                          |
+ROW   |5225     |33481 |Application |Jenkins job [{#NAME}]                                          |
+ROW   |5226     |33482 |Application |Jenkins job [{#NAME}]                                          |
+ROW   |5227     |33483 |Application |Jenkins job [{#NAME}]                                          |
+ROW   |5228     |33484 |Application |Jenkins job [{#NAME}]                                          |
+ROW   |5229     |33485 |Application |Jenkins job [{#NAME}]                                          |
+ROW   |5230     |33486 |Application |Jenkins job [{#NAME}]                                          |
+ROW   |5231     |33487 |Application |Jenkins job [{#NAME}]                                          |
+ROW   |5232     |33488 |Application |Jenkins job [{#NAME}]                                          |
+ROW   |5233     |33489 |Application |Jenkins job [{#NAME}]                                          |
+ROW   |5234     |33490 |Application |Jenkins job [{#NAME}]                                          |
+ROW   |5235     |33524 |Application |Hikvision camera: PTZ channel "{#PTZ_CHANNEL_ID}"              |
+ROW   |5236     |33525 |Application |Hikvision camera: PTZ channel "{#PTZ_CHANNEL_ID}"              |
+ROW   |5237     |33526 |Application |Hikvision camera: PTZ channel "{#PTZ_CHANNEL_ID}"              |
+ROW   |5238     |33527 |Application |Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
+ROW   |5239     |33528 |Application |Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
+ROW   |5240     |33529 |Application |Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
+ROW   |5241     |33530 |Application |Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
+ROW   |5242     |33531 |Application |Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
+ROW   |5243     |33532 |Application |Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
+ROW   |5244     |33533 |Application |Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
+ROW   |5245     |33534 |Application |Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
+ROW   |5246     |33535 |Application |Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
+ROW   |5247     |33536 |Application |Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
+ROW   |5248     |33537 |Application |Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
+ROW   |5249     |33538 |Application |Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
+ROW   |5250     |33539 |Application |Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
+ROW   |5251     |33540 |Application |Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
+ROW   |5252     |33541 |Application |Hikvision camera: Streaming channel "{#CHANNEL_ID}"            |
+ROW   |5253     |33552 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
+ROW   |5254     |33553 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
+ROW   |5255     |33554 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
+ROW   |5256     |33555 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
+ROW   |5257     |33556 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
+ROW   |5258     |33557 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
+ROW   |5259     |33558 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
+ROW   |5260     |33559 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
+ROW   |5261     |33560 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
+ROW   |5262     |33561 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
+ROW   |5263     |33562 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]    |
+ROW   |5264     |33563 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5265     |33564 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5266     |33565 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5267     |33566 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5268     |33567 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5269     |33568 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5270     |33569 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5271     |33570 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5272     |33571 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5273     |33572 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5274     |33573 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5275     |33574 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5276     |33575 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5277     |33576 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5278     |33577 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5279     |33578 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5280     |33579 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5281     |33580 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5282     |33581 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5283     |33582 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5284     |33584 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5285     |33585 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5286     |33586 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5287     |33587 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5288     |33588 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5289     |33589 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5290     |33590 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5291     |33591 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5292     |33592 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5293     |33593 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5294     |33594 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5295     |33595 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5296     |33596 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5297     |33597 |Application |Ignite instance [{#JMXIGNITEINSTANCENAME}]                     |
+ROW   |5298     |33598 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
+ROW   |5299     |33599 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
+ROW   |5300     |33600 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
+ROW   |5301     |33601 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
+ROW   |5302     |33602 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
+ROW   |5303     |33603 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
+ROW   |5304     |33604 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
+ROW   |5305     |33605 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
+ROW   |5306     |33606 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]    |
+ROW   |5307     |33607 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]    |
+ROW   |5308     |33608 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]    |
+ROW   |5309     |33609 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]    |
+ROW   |5310     |33610 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]    |
+ROW   |5311     |33611 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
+ROW   |5312     |33612 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
+ROW   |5313     |33613 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
+ROW   |5314     |33614 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
+ROW   |5315     |33615 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
+ROW   |5316     |33616 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
+ROW   |5317     |33617 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
+ROW   |5318     |33618 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
+ROW   |5319     |33619 |Application |Ignite [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}]   |
+ROW   |5320     |33635 |Application |Sharepoint object [{#SHAREPOINT.LLD.FULL_PATH}]"               |
+ROW   |5321     |33636 |Application |Sharepoint object [{#SHAREPOINT.LLD.FULL_PATH}]"               |
+ROW   |5322     |33637 |Application |Sharepoint object [{#SHAREPOINT.LLD.FULL_PATH}]"               |
+ROW   |5323     |33659 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5324     |33660 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5325     |33661 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5326     |33662 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5327     |33663 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5328     |33664 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5329     |33665 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5330     |33666 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5331     |33667 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5332     |33671 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5333     |33672 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5334     |33673 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5335     |33674 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5336     |33675 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5337     |33676 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5338     |33677 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5339     |33678 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5340     |33679 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |5341     |33703 |Application |BBU {#ID}                                                      |
+ROW   |5342     |33704 |Application |BBU {#ID}                                                      |
+ROW   |5343     |33705 |Application |Controller {#ID}                                               |
+ROW   |5344     |33706 |Application |Controller {#ID}                                               |
+ROW   |5345     |33707 |Application |Controller {#ID}                                               |
+ROW   |5346     |33708 |Application |Controller {#ID}                                               |
+ROW   |5347     |33709 |Application |Controller {#ID}                                               |
+ROW   |5348     |33710 |Application |Disk {#MODEL}                                                  |
+ROW   |5349     |33712 |Application |Disk {#MODEL}                                                  |
+ROW   |5350     |33713 |Application |Disk {#MODEL}                                                  |
+ROW   |5351     |33711 |Application |Disk {#NAME}                                                   |
+ROW   |5352     |33714 |Application |Enclosure {#NAME}                                              |
+ROW   |5353     |33715 |Application |Enclosure {#NAME}                                              |
+ROW   |5354     |33716 |Application |Enclosure {#NAME}                                              |
+ROW   |5355     |33717 |Application |FAN {#ID}                                                      |
+ROW   |5356     |33718 |Application |FAN {#ID}                                                      |
+ROW   |5357     |33719 |Application |LUN {#NAME}                                                    |
+ROW   |5358     |33720 |Application |LUN {#NAME}                                                    |
+ROW   |5359     |33721 |Application |LUN {#NAME}                                                    |
+ROW   |5360     |33722 |Application |LUN {#NAME}                                                    |
+ROW   |5361     |33723 |Application |LUN {#NAME}                                                    |
+ROW   |5362     |33724 |Application |LUN {#NAME}                                                    |
+ROW   |5363     |33725 |Application |LUN {#NAME}                                                    |
+ROW   |5364     |33726 |Application |LUN {#NAME}                                                    |
+ROW   |5365     |33727 |Application |LUN {#NAME}                                                    |
+ROW   |5366     |33728 |Application |LUN {#NAME}                                                    |
+ROW   |5367     |33729 |Application |LUN {#NAME}                                                    |
+ROW   |5368     |33730 |Application |Node {#NODE}                                                   |
+ROW   |5369     |33731 |Application |Node {#NODE}                                                   |
+ROW   |5370     |33732 |Application |Node {#NODE}                                                   |
+ROW   |5371     |33733 |Application |Node {#NODE}                                                   |
+ROW   |5372     |33734 |Application |Node {#NODE}                                                   |
+ROW   |5373     |33735 |Application |Node {#NODE}                                                   |
+ROW   |5374     |33736 |Application |Node {#NODE}                                                   |
+ROW   |5375     |33737 |Application |Node {#NODE}                                                   |
+ROW   |5376     |33738 |Application |Pool {#MODEL}                                                  |
+ROW   |5377     |33739 |Application |Pool {#MODEL}                                                  |
+ROW   |5378     |33741 |Application |Pool {#MODEL}                                                  |
+ROW   |5379     |33742 |Application |Pool {#MODEL}                                                  |
+ROW   |5380     |33743 |Application |Pool {#MODEL}                                                  |
+ROW   |5381     |33740 |Application |Pool {#NAME}                                                   |
+ROW   |5382     |33814 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5383     |33815 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5384     |33816 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5385     |33817 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5386     |33818 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5387     |33819 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5388     |33820 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5389     |33821 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5390     |33822 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5391     |33823 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5392     |33824 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5393     |33825 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5394     |33826 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5395     |33827 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5396     |33828 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5397     |33829 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5398     |33830 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5399     |33831 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5400     |33832 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5401     |33833 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5402     |33834 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5403     |33835 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5404     |33836 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5405     |33837 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5406     |33838 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5407     |33839 |Application |MongoDB: {#DBNAME}.{#COLLECTION}                               |
+ROW   |5408     |33840 |Application |MongoDB: {#DBNAME}                                             |
+ROW   |5409     |33841 |Application |MongoDB: {#DBNAME}                                             |
+ROW   |5410     |33842 |Application |MongoDB: {#DBNAME}                                             |
+ROW   |5411     |33843 |Application |MongoDB: {#DBNAME}                                             |
+ROW   |5412     |33844 |Application |MongoDB: {#DBNAME}                                             |
+ROW   |5413     |33845 |Application |MongoDB: {#DBNAME}                                             |
+ROW   |5414     |33846 |Application |MongoDB: {#DBNAME}                                             |
+ROW   |5415     |33847 |Application |MongoDB: {#DBNAME}                                             |
+ROW   |5416     |33848 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5417     |33849 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5418     |33850 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5419     |33851 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5420     |33852 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5421     |33853 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5422     |33854 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5423     |33855 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5424     |33856 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5425     |33857 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5426     |33858 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5427     |33859 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5428     |33860 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5429     |33861 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5430     |33862 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5431     |33863 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5432     |33864 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5433     |33865 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5434     |33866 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5435     |33867 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5436     |33868 |Application |MongoDB Replica Set: {#RS_NAME}                                |
+ROW   |5437     |33926 |Application |MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}               |
+ROW   |5438     |33927 |Application |MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}               |
+ROW   |5439     |33928 |Application |MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}               |
+ROW   |5440     |33929 |Application |MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}               |
+ROW   |5441     |33930 |Application |MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}               |
+ROW   |5442     |33931 |Application |MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}               |
+ROW   |5443     |33932 |Application |MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}               |
+ROW   |5444     |33933 |Application |MongoDB sharded cluster: {#DBNAME}.{#COLLECTION}               |
+ROW   |5445     |33934 |Application |MongoDB sharded cluster: {#DBNAME}                             |
+ROW   |5446     |33935 |Application |MongoDB sharded cluster: {#DBNAME}                             |
+ROW   |5447     |33936 |Application |MongoDB sharded cluster: {#DBNAME}                             |
+ROW   |5448     |33937 |Application |MongoDB sharded cluster: {#DBNAME}                             |
+ROW   |5449     |33938 |Application |MongoDB sharded cluster: {#DBNAME}                             |
+ROW   |5450     |33939 |Application |MongoDB sharded cluster: {#DBNAME}                             |
+ROW   |5451     |33940 |Application |MongoDB sharded cluster: {#DBNAME}                             |
+ROW   |5454     |33972 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5455     |33973 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5456     |33974 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5457     |33975 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5458     |33976 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5459     |33977 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5460     |33978 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5461     |33979 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5462     |33980 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5463     |33981 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5464     |34013 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5465     |34014 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5466     |34015 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5467     |34016 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5468     |34017 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5469     |34018 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5470     |34019 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5471     |34020 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5472     |34021 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5473     |34022 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5474     |34054 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5475     |34055 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5476     |34056 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5477     |34057 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5478     |34058 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5479     |34059 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5480     |34060 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5481     |34061 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5482     |34062 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5483     |34063 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5484     |34095 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5485     |34096 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5486     |34097 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5487     |34098 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5488     |34099 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5489     |34100 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5490     |34101 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5491     |34102 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5492     |34103 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5493     |34104 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5494     |34136 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5495     |34137 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5496     |34138 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5497     |34139 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5498     |34140 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5499     |34141 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5500     |34142 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5501     |34143 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5502     |34144 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5503     |34145 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5504     |34164 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5505     |34165 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5506     |34166 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5507     |34167 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5508     |34168 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5509     |34169 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5510     |34170 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5511     |34171 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5512     |34172 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |5513     |34173 |Application |Filesystem {#FSNAME}                                           |
+ROW   |5514     |34174 |Application |Filesystem {#FSNAME}                                           |
+ROW   |5515     |34175 |Application |Filesystem {#FSNAME}                                           |
+ROW   |5516     |34269 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5517     |34270 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5518     |34271 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5519     |34272 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5520     |34291 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5521     |34292 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5522     |34293 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5523     |34294 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5524     |34295 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5525     |34300 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5526     |34301 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5527     |34306 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5528     |34307 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5529     |34308 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5530     |34309 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5531     |34310 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5532     |34311 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5533     |34312 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5534     |34313 |Application |Volume "{#VOLUMENAME}"                                         |
+ROW   |5535     |34273 |Application |Chassis "{#ID}"                                                |
+ROW   |5536     |34274 |Application |Node "{#NODENAME}" disks                                       |
+ROW   |5537     |34275 |Application |Chassis "{#CHASSISID}"                                         |
+ROW   |5538     |34276 |Application |SVM "{#SVMNAME}"                                               |
+ROW   |5539     |34277 |Application |SVM "{#SVMNAME}"                                               |
+ROW   |5540     |34278 |Application |SVM "{#SVMNAME}"                                               |
+ROW   |5541     |34279 |Application |SVM "{#SVMNAME}"                                               |
+ROW   |5542     |34280 |Application |Node "{#NODENAME}"                                             |
+ROW   |5543     |34281 |Application |Node "{#NODENAME}"                                             |
+ROW   |5544     |34282 |Application |Node "{#NODENAME}"                                             |
+ROW   |5545     |34283 |Application |Node "{#NODENAME}"                                             |
+ROW   |5546     |34284 |Application |Node "{#NODENAME}"                                             |
+ROW   |5547     |34285 |Application |Node "{#NODENAME}"                                             |
+ROW   |5548     |34286 |Application |Node "{#NODENAME}" Ethernet ports                              |
+ROW   |5549     |34287 |Application |Node "{#NODENAME}" FC ports                                    |
+ROW   |5550     |34288 |Application |Node "{#NODENAME}" FC ports                                    |
+ROW   |5551     |34289 |Application |SVM "{#SVMNAME}"                                               |
+ROW   |5552     |34290 |Application |SVM "{#SVMNAME}"                                               |
+ROW   |5553     |34314 |Application |Zabbix server                                                  |
+ROW   |5554     |34315 |Application |Zabbix server                                                  |
+ROW   |5555     |34316 |Application |Zabbix server                                                  |
+ROW   |5556     |34317 |Application |Zabbix server                                                  |
+ROW   |5557     |34318 |Application |Zabbix server                                                  |
+ROW   |5558     |34319 |Application |Zabbix server                                                  |
+ROW   |5559     |34320 |Application |ClickHouse ZooKeeper                                           |
+ROW   |5560     |34321 |Application |MongoDB sharded cluster                                        |
+ROW   |5561     |34322 |Application |Zabbix raw items                                               |
+ROW   |5562     |34323 |Application |Zabbix raw items                                               |
+ROW   |5563     |34325 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5564     |34326 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5565     |34327 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5566     |34328 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5567     |34329 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5568     |34330 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5569     |34331 |Application |MSSQL Job '{#JOBNAME}'                                         |
+ROW   |5570     |34332 |Application |MSSQL Job '{#JOBNAME}'                                         |
+ROW   |5571     |34333 |Application |MSSQL Job '{#JOBNAME}'                                         |
+ROW   |5572     |34334 |Application |MSSQL Job '{#JOBNAME}'                                         |
+ROW   |5573     |34335 |Application |MSSQL Job '{#JOBNAME}'                                         |
+ROW   |5574     |31133 |Application |MSSQL Availability Group '{#GROUP_NAME}'                       |
+ROW   |5575     |31134 |Application |MSSQL Availability Group '{#GROUP_NAME}'                       |
+ROW   |5576     |31135 |Application |MSSQL Availability Group '{#GROUP_NAME}'                       |
+ROW   |5577     |31136 |Application |MSSQL Availability Group '{#GROUP_NAME}'                       |
+ROW   |5578     |31137 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5579     |31138 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5580     |31139 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5581     |31140 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5582     |31141 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5583     |31142 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5584     |31143 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5585     |31144 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5586     |31145 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5587     |31146 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5588     |31147 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5589     |31148 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5590     |31149 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5591     |31150 |Application |MSSQL Database '{#DBNAME}'                                     |
+ROW   |5592     |31151 |Application |MSSQL Available Group '{#GROUP_NAME}' Local DB '{#DBNAME}'     |
+ROW   |5593     |31152 |Application |MSSQL Available Group '{#GROUP_NAME}' Local DB '{#DBNAME}'     |
+ROW   |5594     |31153 |Application |MSSQL Available Group '{#GROUP_NAME}' Local DB '{#DBNAME}'     |
+ROW   |5595     |31154 |Application |MSSQL Mirroring '{#DBNAME}'                                    |
+ROW   |5596     |31155 |Application |MSSQL Mirroring '{#DBNAME}'                                    |
+ROW   |5597     |31156 |Application |MSSQL Mirroring '{#DBNAME}'                                    |
+ROW   |5598     |31157 |Application |MSSQL Mirroring '{#DBNAME}'                                    |
+ROW   |5599     |31158 |Application |MSSQL Mirroring '{#DBNAME}'                                    |
+ROW   |5600     |31161 |Application |MSSQL Available Group '{#GROUP_NAME}' Replica '{#REPLICA_NAME}'|
+ROW   |5601     |31162 |Application |MSSQL Available Group '{#GROUP_NAME}' Replica '{#REPLICA_NAME}'|
+ROW   |5602     |31163 |Application |MSSQL Available Group '{#GROUP_NAME}' Replica '{#REPLICA_NAME}'|
+ROW   |5603     |31164 |Application |MSSQL Available Group '{#GROUP_NAME}' Replica '{#REPLICA_NAME}'|
+ROW   |5604     |31165 |Application |MSSQL Available Group '{#GROUP_NAME}' Replica '{#REPLICA_NAME}'|
+ROW   |5605     |31166 |Application |MSSQL Available Group '{#GROUP_NAME}' Replica '{#REPLICA_NAME}'|
+ROW   |5606     |31167 |Application |MSSQL Available Group '{#GROUP_NAME}' Replica '{#REPLICA_NAME}'|
+ROW   |5607     |33942 |Application |MSSQL Available Group '{#GROUP_NAME}' Non-Local DB '{#DBNAME}' |
+ROW   |5608     |33943 |Application |MSSQL Available Group '{#GROUP_NAME}' Non-Local DB '{#DBNAME}' |
+ROW   |5609     |34336 |Application |Zabbix raw items                                               |
+ROW   |5610     |34337 |Application |Zabbix raw items                                               |
+ROW   |5611     |34338 |Application |PD instance                                                    |
+ROW   |5612     |34339 |Application |PD instance                                                    |
+ROW   |5613     |34340 |Application |PD instance                                                    |
+ROW   |5614     |34341 |Application |PD instance                                                    |
+ROW   |5615     |34348 |Application |TiDB cluster                                                   |
+ROW   |5616     |34349 |Application |TiDB cluster                                                   |
+ROW   |5617     |34350 |Application |TiDB cluster                                                   |
+ROW   |5618     |34351 |Application |TiDB cluster                                                   |
+ROW   |5619     |34352 |Application |TiDB cluster                                                   |
+ROW   |5620     |34353 |Application |TiDB cluster                                                   |
+ROW   |5621     |34354 |Application |TiDB cluster                                                   |
+ROW   |5622     |34355 |Application |TiDB cluster                                                   |
+ROW   |5623     |34356 |Application |TiDB cluster                                                   |
+ROW   |5624     |34357 |Application |TiDB cluster                                                   |
+ROW   |5625     |34358 |Application |TiDB cluster                                                   |
+ROW   |5626     |34359 |Application |PD instance                                                    |
+ROW   |5627     |34360 |Application |TiDB Store [{#STORE_ADDRESS}]                                  |
+ROW   |5628     |34361 |Application |TiDB Store [{#STORE_ADDRESS}]                                  |
+ROW   |5629     |34362 |Application |TiDB Store [{#STORE_ADDRESS}]                                  |
+ROW   |5630     |34363 |Application |TiDB Store [{#STORE_ADDRESS}]                                  |
+ROW   |5631     |34364 |Application |TiDB cluster                                                   |
+ROW   |5632     |34365 |Application |TiDB cluster                                                   |
+ROW   |5633     |34366 |Application |TiDB cluster                                                   |
+ROW   |5634     |34367 |Application |Zabbix raw items                                               |
+ROW   |5635     |34368 |Application |Zabbix raw items                                               |
+ROW   |5636     |34369 |Application |TiDB node                                                      |
+ROW   |5637     |34370 |Application |TiDB node                                                      |
+ROW   |5638     |34371 |Application |TiDB node                                                      |
+ROW   |5639     |34372 |Application |TiDB node                                                      |
+ROW   |5640     |34373 |Application |TiDB node                                                      |
+ROW   |5641     |34374 |Application |TiDB node                                                      |
+ROW   |5642     |34375 |Application |TiDB node                                                      |
+ROW   |5643     |34376 |Application |TiDB node                                                      |
+ROW   |5644     |34377 |Application |TiDB node                                                      |
+ROW   |5645     |34378 |Application |TiDB node                                                      |
+ROW   |5646     |34379 |Application |TiDB node                                                      |
+ROW   |5647     |34380 |Application |TiDB node                                                      |
+ROW   |5648     |34381 |Application |TiDB node                                                      |
+ROW   |5649     |34382 |Application |TiDB node                                                      |
+ROW   |5650     |34383 |Application |TiDB node                                                      |
+ROW   |5651     |34384 |Application |TiDB node                                                      |
+ROW   |5652     |34385 |Application |TiDB node                                                      |
+ROW   |5653     |34386 |Application |TiDB node                                                      |
+ROW   |5654     |34387 |Application |TiDB node                                                      |
+ROW   |5655     |34388 |Application |TiDB node                                                      |
+ROW   |5656     |34389 |Application |TiDB node                                                      |
+ROW   |5657     |34390 |Application |TiDB node                                                      |
+ROW   |5658     |34391 |Application |TiDB node                                                      |
+ROW   |5659     |34392 |Application |TiDB node                                                      |
+ROW   |5660     |34393 |Application |TiDB node                                                      |
+ROW   |5661     |34394 |Application |TiDB node                                                      |
+ROW   |5662     |34395 |Application |TiDB node                                                      |
+ROW   |5663     |34396 |Application |TiDB node                                                      |
+ROW   |5664     |34397 |Application |TiDB node                                                      |
+ROW   |5665     |34398 |Application |TiDB node                                                      |
+ROW   |5666     |34405 |Application |TiDB node                                                      |
+ROW   |5667     |34406 |Application |TiDB node                                                      |
+ROW   |5668     |34407 |Application |TiDB node                                                      |
+ROW   |5669     |34408 |Application |TiDB node                                                      |
+ROW   |5670     |34409 |Application |TiDB node                                                      |
+ROW   |5671     |34410 |Application |TiDB node                                                      |
+ROW   |5672     |34411 |Application |TiDB node                                                      |
+ROW   |5673     |34412 |Application |Zabbix raw items                                               |
+ROW   |5674     |34413 |Application |TiKV node                                                      |
+ROW   |5675     |34414 |Application |TiKV node                                                      |
+ROW   |5676     |34415 |Application |TiKV node                                                      |
+ROW   |5677     |34416 |Application |TiKV node                                                      |
+ROW   |5678     |34417 |Application |TiKV node                                                      |
+ROW   |5679     |34418 |Application |TiKV node                                                      |
+ROW   |5680     |34419 |Application |TiKV node                                                      |
+ROW   |5681     |34420 |Application |TiKV node                                                      |
+ROW   |5682     |34421 |Application |TiKV node                                                      |
+ROW   |5683     |34422 |Application |TiKV node                                                      |
+ROW   |5684     |34423 |Application |TiKV node                                                      |
+ROW   |5685     |34424 |Application |TiKV node                                                      |
+ROW   |5686     |34425 |Application |TiKV node                                                      |
+ROW   |5687     |34426 |Application |TiKV node                                                      |
+ROW   |5688     |34427 |Application |TiKV node                                                      |
+ROW   |5689     |34428 |Application |TiKV node                                                      |
+ROW   |5690     |34429 |Application |TiKV node                                                      |
+ROW   |5691     |34430 |Application |TiKV node                                                      |
+ROW   |5692     |34431 |Application |TiKV node                                                      |
+ROW   |5693     |34432 |Application |TiKV node                                                      |
+ROW   |5694     |34433 |Application |TiKV node                                                      |
+ROW   |5695     |34434 |Application |TiKV node                                                      |
+ROW   |5696     |34435 |Application |TiKV node                                                      |
+ROW   |5697     |34436 |Application |TiKV node                                                      |
+ROW   |5698     |34437 |Application |TiKV node                                                      |
+ROW   |5699     |34438 |Application |TiKV node                                                      |
+ROW   |5700     |34439 |Application |TiKV node                                                      |
+ROW   |5701     |34444 |Application |TiKV node                                                      |
+ROW   |5702     |34445 |Application |TiKV node                                                      |
+ROW   |5703     |34446 |Application |TiKV node                                                      |
+ROW   |5704     |34447 |Application |TiKV node                                                      |
+ROW   |5705     |34448 |Application |TiKV node                                                      |
+ROW   |5706     |34449 |Application |TiKV node                                                      |
+ROW   |5707     |34450 |Application |TiKV node                                                      |
+ROW   |5708     |34451 |Status      |                                                               |
+ROW   |5709     |34452 |Status      |                                                               |
+ROW   |5710     |34453 |Status      |                                                               |
+ROW   |5711     |34454 |General     |                                                               |
+ROW   |5712     |34455 |General     |                                                               |
+ROW   |5713     |34456 |General     |                                                               |
+ROW   |5714     |34457 |General     |                                                               |
+ROW   |5715     |34458 |General     |                                                               |
+ROW   |5716     |34459 |General     |                                                               |
+ROW   |5717     |34460 |General     |                                                               |
+ROW   |5718     |34461 |General     |                                                               |
+ROW   |5719     |34462 |Status      |                                                               |
+ROW   |5720     |34463 |Status      |                                                               |
+ROW   |5721     |34464 |Status      |                                                               |
+ROW   |5722     |34465 |Status      |                                                               |
+ROW   |5723     |34466 |Status      |                                                               |
+ROW   |5724     |34467 |Status      |                                                               |
+ROW   |5725     |34468 |Status      |                                                               |
+ROW   |5726     |34469 |Status      |                                                               |
+ROW   |5727     |34470 |Status      |                                                               |
+ROW   |5728     |34471 |Status      |                                                               |
+ROW   |5729     |34472 |Status      |                                                               |
+ROW   |5730     |34473 |Status      |                                                               |
+ROW   |5731     |34474 |Status      |                                                               |
+ROW   |5732     |34475 |Status      |                                                               |
+ROW   |5733     |34482 |Status      |                                                               |
+ROW   |5734     |34483 |Status      |                                                               |
+ROW   |5735     |34484 |Status      |                                                               |
+ROW   |5736     |34485 |Status      |                                                               |
+ROW   |5737     |34486 |Status      |                                                               |
+ROW   |5738     |34487 |General     |                                                               |
+ROW   |5739     |34488 |Status      |                                                               |
+ROW   |5740     |34489 |Status      |                                                               |
+ROW   |5741     |34490 |Status      |                                                               |
+ROW   |5742     |34491 |Status      |                                                               |
+ROW   |5743     |34492 |Status      |                                                               |
+ROW   |5744     |34493 |Status      |                                                               |
+ROW   |5745     |34494 |Status      |                                                               |
+ROW   |5746     |34495 |Status      |                                                               |
+ROW   |5747     |34496 |Status      |                                                               |
+ROW   |5748     |34497 |Status      |                                                               |
+ROW   |5749     |34498 |Status      |                                                               |
+ROW   |5750     |34499 |Status      |                                                               |
+ROW   |5751     |34500 |Status      |                                                               |
+ROW   |5752     |34501 |Status      |                                                               |
+ROW   |5753     |34502 |General     |                                                               |
+ROW   |5754     |34503 |General     |                                                               |
+ROW   |5755     |34504 |General     |                                                               |
+ROW   |5756     |34505 |General     |                                                               |
+ROW   |5757     |34506 |General     |                                                               |
+ROW   |5758     |34507 |General     |                                                               |
+ROW   |5759     |34508 |General     |                                                               |
+ROW   |5760     |34509 |General     |                                                               |
+ROW   |5761     |34510 |Status      |                                                               |
+ROW   |5762     |34511 |Status      |                                                               |
+ROW   |5763     |34512 |Status      |                                                               |
+ROW   |5764     |34513 |Status      |                                                               |
+ROW   |5765     |34514 |Status      |                                                               |
+ROW   |5766     |34515 |Status      |                                                               |
+ROW   |5767     |34516 |Status      |                                                               |
+ROW   |5768     |34517 |Status      |                                                               |
+ROW   |5769     |34518 |Status      |                                                               |
+ROW   |5770     |34519 |Status      |                                                               |
+ROW   |5771     |34520 |Status      |                                                               |
+ROW   |5772     |34521 |Status      |                                                               |
+ROW   |5773     |34522 |Status      |                                                               |
+ROW   |5774     |34523 |Status      |                                                               |
+ROW   |5775     |34530 |Status      |                                                               |
+ROW   |5776     |34531 |Status      |                                                               |
+ROW   |5777     |34532 |Status      |                                                               |
+ROW   |5778     |34533 |Status      |                                                               |
+ROW   |5779     |34534 |Status      |                                                               |
+ROW   |5780     |34535 |General     |                                                               |
+ROW   |5781     |34536 |Status      |                                                               |
+ROW   |5782     |34537 |Status      |                                                               |
+ROW   |5783     |34538 |Status      |                                                               |
+ROW   |5784     |34539 |Status      |                                                               |
+ROW   |5785     |34540 |Status      |                                                               |
+ROW   |5786     |34541 |Status      |                                                               |
+ROW   |5787     |34542 |Status      |                                                               |
+ROW   |5788     |34543 |Status      |                                                               |
+ROW   |5789     |34544 |Status      |                                                               |
+ROW   |5790     |34545 |Status      |                                                               |
+ROW   |5791     |34546 |Status      |                                                               |
+ROW   |5792     |34547 |Status      |                                                               |
+ROW   |5793     |34548 |Status      |                                                               |
+ROW   |5794     |34549 |Status      |                                                               |
+ROW   |5795     |34550 |General     |                                                               |
+ROW   |5796     |34551 |General     |                                                               |
+ROW   |5797     |34552 |General     |                                                               |
+ROW   |5798     |34553 |General     |                                                               |
+ROW   |5799     |34554 |General     |                                                               |
+ROW   |5800     |34555 |General     |                                                               |
+ROW   |5801     |34556 |General     |                                                               |
+ROW   |5802     |34557 |General     |                                                               |
+ROW   |5803     |34558 |Status      |                                                               |
+ROW   |5804     |34559 |Status      |                                                               |
+ROW   |5805     |34560 |Status      |                                                               |
+ROW   |5806     |34561 |Status      |                                                               |
+ROW   |5807     |34562 |Status      |                                                               |
+ROW   |5808     |34563 |Status      |                                                               |
+ROW   |5809     |34564 |Status      |                                                               |
+ROW   |5810     |34565 |Status      |                                                               |
+ROW   |5811     |34566 |Status      |                                                               |
+ROW   |5812     |34567 |Status      |                                                               |
+ROW   |5813     |34568 |Status      |                                                               |
+ROW   |5814     |34569 |Status      |                                                               |
+ROW   |5815     |34570 |Status      |                                                               |
+ROW   |5816     |34571 |Status      |                                                               |
+ROW   |5817     |34578 |Status      |                                                               |
+ROW   |5818     |34579 |Status      |                                                               |
+ROW   |5819     |34580 |Status      |                                                               |
+ROW   |5820     |34581 |Status      |                                                               |
+ROW   |5821     |34582 |Status      |                                                               |
+ROW   |5822     |34583 |General     |                                                               |
+ROW   |5823     |34584 |Status      |                                                               |
+ROW   |5824     |34585 |Status      |                                                               |
+ROW   |5825     |34586 |Status      |                                                               |
+ROW   |5826     |34587 |Status      |                                                               |
+ROW   |5827     |34588 |Status      |                                                               |
+ROW   |5828     |34589 |Status      |                                                               |
+ROW   |5829     |34590 |Status      |                                                               |
+ROW   |5830     |34591 |Status      |                                                               |
+ROW   |5831     |34592 |Status      |                                                               |
+ROW   |5832     |34593 |Status      |                                                               |
+ROW   |5833     |34594 |Status      |                                                               |
+ROW   |5834     |34595 |Status      |                                                               |
+ROW   |5835     |34596 |Status      |                                                               |
+ROW   |5836     |34597 |Status      |                                                               |
+ROW   |5837     |34598 |General     |                                                               |
+ROW   |5838     |34599 |General     |                                                               |
+ROW   |5839     |34600 |General     |                                                               |
+ROW   |5840     |34601 |General     |                                                               |
+ROW   |5841     |34602 |General     |                                                               |
+ROW   |5842     |34603 |General     |                                                               |
+ROW   |5843     |34604 |General     |                                                               |
+ROW   |5844     |34605 |General     |                                                               |
+ROW   |5845     |34606 |Status      |                                                               |
+ROW   |5846     |34607 |Status      |                                                               |
+ROW   |5847     |34608 |Status      |                                                               |
+ROW   |5848     |34609 |Status      |                                                               |
+ROW   |5849     |34610 |Status      |                                                               |
+ROW   |5850     |34611 |Status      |                                                               |
+ROW   |5851     |34612 |Status      |                                                               |
+ROW   |5852     |34613 |Status      |                                                               |
+ROW   |5853     |34614 |Status      |                                                               |
+ROW   |5854     |34615 |Status      |                                                               |
+ROW   |5855     |34616 |Status      |                                                               |
+ROW   |5856     |34617 |Status      |                                                               |
+ROW   |5857     |34618 |Status      |                                                               |
+ROW   |5858     |34619 |Status      |                                                               |
+ROW   |5859     |34626 |Status      |                                                               |
+ROW   |5860     |34627 |Status      |                                                               |
+ROW   |5861     |34628 |Status      |                                                               |
+ROW   |5862     |34629 |Status      |                                                               |
+ROW   |5863     |34630 |Status      |                                                               |
+ROW   |5864     |34631 |General     |                                                               |
+ROW   |5865     |34632 |Status      |                                                               |
+ROW   |5866     |34633 |Status      |                                                               |
+ROW   |5867     |34634 |Status      |                                                               |
+ROW   |5868     |34635 |Status      |                                                               |
+ROW   |5869     |34636 |Status      |                                                               |
+ROW   |5870     |34637 |Status      |                                                               |
+ROW   |5871     |34638 |Status      |                                                               |
+ROW   |5872     |34639 |Status      |                                                               |
+ROW   |5873     |34640 |Status      |                                                               |
+ROW   |5874     |34641 |Status      |                                                               |
+ROW   |5875     |34642 |Status      |                                                               |
+ROW   |5876     |34643 |Status      |                                                               |
+ROW   |5877     |34644 |Status      |                                                               |
+ROW   |5878     |34645 |Status      |                                                               |
+ROW   |5879     |34646 |General     |                                                               |
+ROW   |5880     |34647 |General     |                                                               |
+ROW   |5881     |34648 |General     |                                                               |
+ROW   |5882     |34649 |General     |                                                               |
+ROW   |5883     |34650 |General     |                                                               |
+ROW   |5884     |34651 |General     |                                                               |
+ROW   |5885     |34652 |General     |                                                               |
+ROW   |5886     |34653 |General     |                                                               |
+ROW   |5887     |34654 |Status      |                                                               |
+ROW   |5888     |34655 |Status      |                                                               |
+ROW   |5889     |34656 |Status      |                                                               |
+ROW   |5890     |34657 |Status      |                                                               |
+ROW   |5891     |34658 |Status      |                                                               |
+ROW   |5892     |34659 |Status      |                                                               |
+ROW   |5893     |34660 |Status      |                                                               |
+ROW   |5894     |34661 |Status      |                                                               |
+ROW   |5895     |34662 |Status      |                                                               |
+ROW   |5896     |34663 |Status      |                                                               |
+ROW   |5897     |34664 |Status      |                                                               |
+ROW   |5898     |34665 |Status      |                                                               |
+ROW   |5899     |34666 |Status      |                                                               |
+ROW   |5900     |34667 |Status      |                                                               |
+ROW   |5901     |34674 |Status      |                                                               |
+ROW   |5902     |34675 |Status      |                                                               |
+ROW   |5903     |34676 |Status      |                                                               |
+ROW   |5904     |34677 |Status      |                                                               |
+ROW   |5905     |34678 |Status      |                                                               |
+ROW   |5906     |34679 |General     |                                                               |
+ROW   |5907     |34680 |Status      |                                                               |
+ROW   |5908     |34681 |Status      |                                                               |
+ROW   |5909     |34682 |Status      |                                                               |
+ROW   |5910     |34683 |Status      |                                                               |
+ROW   |5911     |34684 |Status      |                                                               |
+ROW   |5912     |34685 |Status      |                                                               |
+ROW   |5913     |34686 |Status      |                                                               |
+ROW   |5914     |34687 |Status      |                                                               |
+ROW   |5915     |34688 |Status      |                                                               |
+ROW   |5916     |34689 |Status      |                                                               |
+ROW   |5917     |34690 |Status      |                                                               |
+ROW   |5918     |34691 |Status      |                                                               |
+ROW   |5919     |34692 |Status      |                                                               |
+ROW   |5920     |34693 |Status      |                                                               |
+ROW   |5921     |34694 |General     |                                                               |
+ROW   |5922     |34695 |General     |                                                               |
+ROW   |5923     |34696 |General     |                                                               |
+ROW   |5924     |34697 |General     |                                                               |
+ROW   |5925     |34698 |General     |                                                               |
+ROW   |5926     |34699 |General     |                                                               |
+ROW   |5927     |34700 |General     |                                                               |
+ROW   |5928     |34701 |General     |                                                               |
+ROW   |5929     |34702 |Status      |                                                               |
+ROW   |5930     |34703 |Status      |                                                               |
+ROW   |5931     |34704 |Status      |                                                               |
+ROW   |5932     |34705 |Status      |                                                               |
+ROW   |5933     |34706 |Status      |                                                               |
+ROW   |5934     |34707 |Status      |                                                               |
+ROW   |5935     |34708 |Status      |                                                               |
+ROW   |5936     |34709 |Status      |                                                               |
+ROW   |5937     |34710 |Status      |                                                               |
+ROW   |5938     |34711 |Status      |                                                               |
+ROW   |5939     |34712 |Status      |                                                               |
+ROW   |5940     |34713 |Status      |                                                               |
+ROW   |5941     |34714 |Status      |                                                               |
+ROW   |5942     |34715 |Status      |                                                               |
+ROW   |5943     |34722 |Status      |                                                               |
+ROW   |5944     |34723 |Status      |                                                               |
+ROW   |5945     |34724 |Status      |                                                               |
+ROW   |5946     |34725 |Status      |                                                               |
+ROW   |5947     |34726 |Status      |                                                               |
+ROW   |5948     |34727 |General     |                                                               |
+ROW   |5949     |34728 |Status      |                                                               |
+ROW   |5950     |34729 |Status      |                                                               |
+ROW   |5951     |34730 |Status      |                                                               |
+ROW   |5952     |34731 |Status      |                                                               |
+ROW   |5953     |34732 |Status      |                                                               |
+ROW   |5954     |34733 |Status      |                                                               |
+ROW   |5955     |34734 |Status      |                                                               |
+ROW   |5956     |34735 |Status      |                                                               |
+ROW   |5957     |34736 |Status      |                                                               |
+ROW   |5958     |34737 |Status      |                                                               |
+ROW   |5959     |34738 |Status      |                                                               |
+ROW   |5960     |34739 |Status      |                                                               |
+ROW   |5961     |34740 |Status      |                                                               |
+ROW   |5962     |34741 |Status      |                                                               |
+ROW   |5963     |34742 |General     |                                                               |
+ROW   |5964     |34743 |General     |                                                               |
+ROW   |5965     |34744 |General     |                                                               |
+ROW   |5966     |34745 |General     |                                                               |
+ROW   |5967     |34746 |General     |                                                               |
+ROW   |5968     |34747 |General     |                                                               |
+ROW   |5969     |34748 |General     |                                                               |
+ROW   |5970     |34749 |General     |                                                               |
+ROW   |5971     |34750 |Status      |                                                               |
+ROW   |5972     |34751 |Status      |                                                               |
+ROW   |5973     |34752 |Status      |                                                               |
+ROW   |5974     |34753 |Status      |                                                               |
+ROW   |5975     |34754 |Status      |                                                               |
+ROW   |5976     |34755 |Status      |                                                               |
+ROW   |5977     |34756 |Status      |                                                               |
+ROW   |5978     |34757 |Status      |                                                               |
+ROW   |5979     |34758 |Status      |                                                               |
+ROW   |5980     |34759 |Status      |                                                               |
+ROW   |5981     |34760 |Status      |                                                               |
+ROW   |5982     |34761 |Status      |                                                               |
+ROW   |5983     |34762 |Status      |                                                               |
+ROW   |5984     |34763 |Status      |                                                               |
+ROW   |5985     |34770 |Status      |                                                               |
+ROW   |5986     |34771 |Status      |                                                               |
+ROW   |5987     |34772 |Status      |                                                               |
+ROW   |5988     |34773 |Status      |                                                               |
+ROW   |5989     |34774 |Status      |                                                               |
+ROW   |5990     |34775 |General     |                                                               |
+ROW   |5991     |34776 |Status      |                                                               |
+ROW   |5992     |34777 |Status      |                                                               |
+ROW   |5993     |34778 |Status      |                                                               |
+ROW   |5994     |34779 |Status      |                                                               |
+ROW   |5995     |34780 |Status      |                                                               |
+ROW   |5996     |34781 |Status      |                                                               |
+ROW   |5997     |34782 |Status      |                                                               |
+ROW   |5998     |34783 |Status      |                                                               |
+ROW   |5999     |34784 |Status      |                                                               |
+ROW   |6000     |34785 |Status      |                                                               |
+ROW   |6001     |34786 |Status      |                                                               |
+ROW   |6002     |34787 |Status      |                                                               |
+ROW   |6003     |34788 |General     |                                                               |
+ROW   |6004     |34180 |Status      |                                                               |
+ROW   |6005     |34181 |Status      |                                                               |
+ROW   |6006     |34182 |General     |                                                               |
+ROW   |6007     |34183 |General     |                                                               |
+ROW   |6008     |34185 |General     |                                                               |
+ROW   |6009     |34186 |General     |                                                               |
+ROW   |6010     |34187 |General     |                                                               |
+ROW   |6011     |34188 |General     |                                                               |
+ROW   |6012     |34189 |General     |                                                               |
+ROW   |6013     |34190 |Status      |                                                               |
+ROW   |6014     |34191 |Status      |                                                               |
+ROW   |6015     |34192 |Status      |                                                               |
+ROW   |6016     |34193 |Status      |                                                               |
+ROW   |6017     |34194 |Status      |                                                               |
+ROW   |6018     |34195 |Status      |                                                               |
+ROW   |6019     |34196 |Status      |                                                               |
+ROW   |6020     |34200 |Status      |                                                               |
+ROW   |6021     |34201 |Status      |                                                               |
+ROW   |6022     |34202 |Status      |                                                               |
+ROW   |6023     |34203 |Status      |                                                               |
+ROW   |6024     |34204 |Status      |                                                               |
+ROW   |6025     |34205 |Status      |                                                               |
+ROW   |6026     |34206 |Status      |                                                               |
+ROW   |6027     |34790 |Status      |                                                               |
+ROW   |6028     |34791 |Status      |                                                               |
+ROW   |6029     |34792 |Status      |                                                               |
+ROW   |6030     |34212 |Status      |                                                               |
+ROW   |6031     |34213 |Status      |                                                               |
+ROW   |6032     |34214 |Status      |                                                               |
+ROW   |6033     |34215 |Status      |                                                               |
+ROW   |6034     |34216 |Status      |                                                               |
+ROW   |6035     |34217 |General     |                                                               |
+ROW   |6036     |34218 |Status      |                                                               |
+ROW   |6037     |34219 |Status      |                                                               |
+ROW   |6038     |34220 |Status      |                                                               |
+ROW   |6039     |34221 |Status      |                                                               |
+ROW   |6040     |34222 |Status      |                                                               |
+ROW   |6041     |34223 |Status      |                                                               |
+ROW   |6042     |34224 |Status      |                                                               |
+ROW   |6043     |34225 |Status      |                                                               |
+ROW   |6044     |34793 |Status      |                                                               |
+ROW   |6045     |34794 |Status      |                                                               |
+ROW   |6046     |34795 |Status      |                                                               |
+ROW   |6047     |34796 |General     |                                                               |
+ROW   |6048     |34797 |General     |                                                               |
+ROW   |6049     |34798 |General     |                                                               |
+ROW   |6050     |34799 |General     |                                                               |
+ROW   |6051     |34800 |General     |                                                               |
+ROW   |6052     |34801 |General     |                                                               |
+ROW   |6053     |34802 |General     |                                                               |
+ROW   |6054     |34803 |General     |                                                               |
+ROW   |6055     |34804 |Status      |                                                               |
+ROW   |6056     |34805 |Status      |                                                               |
+ROW   |6057     |34806 |Status      |                                                               |
+ROW   |6058     |34807 |Status      |                                                               |
+ROW   |6059     |34808 |Status      |                                                               |
+ROW   |6060     |34809 |Status      |                                                               |
+ROW   |6061     |34810 |Status      |                                                               |
+ROW   |6062     |34811 |Status      |                                                               |
+ROW   |6063     |34812 |Status      |                                                               |
+ROW   |6064     |34813 |Status      |                                                               |
+ROW   |6065     |34814 |Status      |                                                               |
+ROW   |6066     |34815 |Status      |                                                               |
+ROW   |6067     |34816 |Status      |                                                               |
+ROW   |6068     |34817 |Status      |                                                               |
+ROW   |6069     |34824 |Status      |                                                               |
+ROW   |6070     |34825 |Status      |                                                               |
+ROW   |6071     |34826 |Status      |                                                               |
+ROW   |6072     |34827 |Status      |                                                               |
+ROW   |6073     |34828 |Status      |                                                               |
+ROW   |6074     |34829 |General     |                                                               |
+ROW   |6075     |34830 |Status      |                                                               |
+ROW   |6076     |34831 |Status      |                                                               |
+ROW   |6077     |34832 |Status      |                                                               |
+ROW   |6078     |34833 |Status      |                                                               |
+ROW   |6079     |34834 |Status      |                                                               |
+ROW   |6080     |34835 |Status      |                                                               |
+ROW   |6081     |34836 |Status      |                                                               |
+ROW   |6082     |34837 |Status      |                                                               |
+ROW   |6083     |34838 |Status      |                                                               |
+ROW   |6084     |34839 |Status      |                                                               |
+ROW   |6085     |34840 |Status      |                                                               |
+ROW   |6086     |34841 |Status      |                                                               |
+ROW   |6087     |34842 |Status      |                                                               |
+ROW   |6088     |34843 |Status      |                                                               |
+ROW   |6089     |34844 |General     |                                                               |
+ROW   |6090     |34845 |General     |                                                               |
+ROW   |6091     |34846 |General     |                                                               |
+ROW   |6092     |34847 |General     |                                                               |
+ROW   |6093     |34848 |General     |                                                               |
+ROW   |6094     |34849 |General     |                                                               |
+ROW   |6095     |34850 |General     |                                                               |
+ROW   |6096     |34851 |General     |                                                               |
+ROW   |6097     |34852 |Status      |                                                               |
+ROW   |6098     |34853 |Status      |                                                               |
+ROW   |6099     |34854 |Status      |                                                               |
+ROW   |6100     |34855 |Status      |                                                               |
+ROW   |6101     |34856 |Status      |                                                               |
+ROW   |6102     |34857 |Status      |                                                               |
+ROW   |6103     |34858 |Status      |                                                               |
+ROW   |6104     |34859 |Status      |                                                               |
+ROW   |6105     |34860 |Status      |                                                               |
+ROW   |6106     |34861 |Status      |                                                               |
+ROW   |6107     |34862 |Status      |                                                               |
+ROW   |6108     |34863 |Status      |                                                               |
+ROW   |6109     |34864 |Status      |                                                               |
+ROW   |6110     |34865 |Status      |                                                               |
+ROW   |6111     |34872 |Status      |                                                               |
+ROW   |6112     |34873 |Status      |                                                               |
+ROW   |6113     |34874 |Status      |                                                               |
+ROW   |6114     |34875 |Status      |                                                               |
+ROW   |6115     |34876 |Status      |                                                               |
+ROW   |6116     |34877 |General     |                                                               |
+ROW   |6117     |34878 |Status      |                                                               |
+ROW   |6118     |34879 |Status      |                                                               |
+ROW   |6119     |34880 |Status      |                                                               |
+ROW   |6120     |34881 |Status      |                                                               |
+ROW   |6121     |34882 |Status      |                                                               |
+ROW   |6122     |34883 |Status      |                                                               |
+ROW   |6123     |34884 |Status      |                                                               |
+ROW   |6124     |34885 |Status      |                                                               |
+ROW   |6125     |34886 |Status      |                                                               |
+ROW   |6126     |34887 |Status      |                                                               |
+ROW   |6127     |34888 |Status      |                                                               |
+ROW   |6128     |34889 |Status      |                                                               |
+ROW   |6129     |34890 |Status      |                                                               |
+ROW   |6130     |34891 |Status      |                                                               |
+ROW   |6131     |34892 |General     |                                                               |
+ROW   |6132     |34893 |General     |                                                               |
+ROW   |6133     |34894 |General     |                                                               |
+ROW   |6134     |34895 |General     |                                                               |
+ROW   |6135     |34896 |General     |                                                               |
+ROW   |6136     |34897 |General     |                                                               |
+ROW   |6137     |34898 |General     |                                                               |
+ROW   |6138     |34899 |General     |                                                               |
+ROW   |6139     |34900 |Status      |                                                               |
+ROW   |6140     |34901 |Status      |                                                               |
+ROW   |6141     |34902 |Status      |                                                               |
+ROW   |6142     |34903 |Status      |                                                               |
+ROW   |6143     |34904 |Status      |                                                               |
+ROW   |6144     |34905 |Status      |                                                               |
+ROW   |6145     |34906 |Status      |                                                               |
+ROW   |6146     |34907 |Status      |                                                               |
+ROW   |6147     |34908 |Status      |                                                               |
+ROW   |6148     |34909 |Status      |                                                               |
+ROW   |6149     |34910 |Status      |                                                               |
+ROW   |6150     |34911 |Status      |                                                               |
+ROW   |6151     |34912 |Status      |                                                               |
+ROW   |6152     |34913 |Status      |                                                               |
+ROW   |6153     |34920 |Status      |                                                               |
+ROW   |6154     |34921 |Status      |                                                               |
+ROW   |6155     |34922 |Status      |                                                               |
+ROW   |6156     |34923 |Status      |                                                               |
+ROW   |6157     |34924 |Status      |                                                               |
+ROW   |6158     |34925 |General     |                                                               |
+ROW   |6159     |34926 |Status      |                                                               |
+ROW   |6160     |34927 |Status      |                                                               |
+ROW   |6161     |34928 |Status      |                                                               |
+ROW   |6162     |34929 |Status      |                                                               |
+ROW   |6163     |34930 |Status      |                                                               |
+ROW   |6164     |34931 |Status      |                                                               |
+ROW   |6165     |34932 |Status      |                                                               |
+ROW   |6166     |34933 |Status      |                                                               |
+ROW   |6167     |34934 |Status      |                                                               |
+ROW   |6168     |34935 |Status      |                                                               |
+ROW   |6169     |34936 |Status      |                                                               |
+ROW   |6170     |34937 |Application |WildFly                                                        |
+ROW   |6171     |34938 |Application |WildFly                                                        |
+ROW   |6172     |34939 |Application |WildFly                                                        |
+ROW   |6173     |34940 |Application |WildFly                                                        |
+ROW   |6174     |34941 |Application |WildFly                                                        |
+ROW   |6175     |34944 |Application |WildFly deployment [{#DEPLOYMENT}]                             |
+ROW   |6176     |34945 |Application |WildFly deployment [{#DEPLOYMENT}]                             |
+ROW   |6177     |34946 |Application |WildFly domain: Server [{#SERVER}]                             |
+ROW   |6178     |34947 |Application |WildFly domain: Server [{#SERVER}]                             |
+ROW   |6179     |34948 |Application |WildFly domain: Server [{#SERVER}]                             |
+ROW   |6180     |34949 |Application |WildFly                                                        |
+ROW   |6181     |34950 |Application |WildFly                                                        |
+ROW   |6182     |34951 |Application |WildFly                                                        |
+ROW   |6183     |34952 |Application |WildFly                                                        |
+ROW   |6184     |34953 |Application |WildFly                                                        |
+ROW   |6185     |34954 |Application |WildFly                                                        |
+ROW   |6186     |34955 |Application |WildFly                                                        |
+ROW   |6187     |34956 |Application |WildFly                                                        |
+ROW   |6188     |34957 |Application |WildFly                                                        |
+ROW   |6189     |34958 |Application |WildFly                                                        |
+ROW   |6190     |34959 |Application |WildFly                                                        |
+ROW   |6191     |34960 |Application |WildFly                                                        |
+ROW   |6192     |34961 |Application |WildFly                                                        |
+ROW   |6193     |34962 |Application |WildFly                                                        |
+ROW   |6194     |34963 |Application |WildFly                                                        |
+ROW   |6195     |34964 |Application |WildFly                                                        |
+ROW   |6196     |34965 |Application |WildFly                                                        |
+ROW   |6197     |34970 |Application |WildFly deployment [{#DEPLOYMENT}]                             |
+ROW   |6198     |34971 |Application |WildFly deployment [{#DEPLOYMENT}]                             |
+ROW   |6199     |34972 |Application |WildFly deployment [{#DEPLOYMENT}]                             |
+ROW   |6200     |34973 |Application |WildFly deployment [{#DEPLOYMENT}]                             |
+ROW   |6201     |34974 |Application |WildFly deployment [{#DEPLOYMENT}]                             |
+ROW   |6202     |34975 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6203     |34976 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6204     |34977 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6205     |34978 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6206     |34979 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6207     |34980 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6208     |34981 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6209     |34982 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6210     |34983 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6211     |34984 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6212     |34985 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6213     |34986 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6214     |34987 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6215     |34988 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6216     |34989 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6217     |34990 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6218     |34991 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6219     |34992 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6220     |34993 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6221     |34994 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6222     |34995 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6223     |34996 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6224     |34997 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6225     |34998 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6226     |34999 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6227     |35000 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6228     |35001 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6229     |35002 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6230     |35003 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6231     |35004 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6232     |35005 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6233     |35006 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6234     |35007 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6235     |35008 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6236     |35009 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6237     |35010 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6238     |35011 |Application |WildFly datasource [{#JMX_DATA_SOURCE}]                        |
+ROW   |6239     |35012 |Application |WildFly listener [{#SERVER}.{#HTTP_LISTENER}]                  |
+ROW   |6240     |35013 |Application |WildFly listener [{#SERVER}.{#HTTP_LISTENER}]                  |
+ROW   |6241     |35014 |Application |WildFly listener [{#SERVER}.{#HTTP_LISTENER}]                  |
+ROW   |6242     |35015 |Application |WildFly listener [{#SERVER}.{#HTTP_LISTENER}]                  |
+ROW   |6243     |35016 |Application |Status                                                         |
+ROW   |6244     |35017 |Application |Status                                                         |
+ROW   |6245     |35018 |Application |Status                                                         |
+ROW   |6246     |35019 |Application |General                                                        |
+ROW   |6247     |35020 |Application |General                                                        |
+ROW   |6248     |35021 |Application |General                                                        |
+ROW   |6249     |35022 |Application |General                                                        |
+ROW   |6250     |35023 |Application |General                                                        |
+ROW   |6251     |35024 |Application |General                                                        |
+ROW   |6252     |35025 |Application |General                                                        |
+ROW   |6253     |35026 |Application |General                                                        |
+ROW   |6254     |35027 |Application |Status                                                         |
+ROW   |6255     |35028 |Application |Status                                                         |
+ROW   |6256     |35029 |Application |Status                                                         |
+ROW   |6257     |35030 |Application |Status                                                         |
+ROW   |6258     |35031 |Application |Status                                                         |
+ROW   |6259     |35032 |Application |Status                                                         |
+ROW   |6260     |35033 |Application |Status                                                         |
+ROW   |6261     |35034 |Application |Status                                                         |
+ROW   |6262     |35035 |Application |Status                                                         |
+ROW   |6263     |35036 |Application |Status                                                         |
+ROW   |6264     |35037 |Application |Status                                                         |
+ROW   |6265     |35038 |Application |Status                                                         |
+ROW   |6266     |35039 |Application |Status                                                         |
+ROW   |6267     |35040 |Application |Status                                                         |
+ROW   |6268     |35047 |Application |Status                                                         |
+ROW   |6269     |35048 |Application |Status                                                         |
+ROW   |6270     |35049 |Application |Status                                                         |
+ROW   |6271     |35050 |Application |Status                                                         |
+ROW   |6272     |35051 |Application |Status                                                         |
+ROW   |6273     |35052 |Application |General                                                        |
+ROW   |6274     |35053 |Application |Status                                                         |
+ROW   |6275     |35054 |Application |Status                                                         |
+ROW   |6276     |35055 |Application |Status                                                         |
+ROW   |6277     |35056 |Application |Status                                                         |
+ROW   |6278     |35057 |Application |Status                                                         |
+ROW   |6279     |35058 |Application |Status                                                         |
+ROW   |6280     |35059 |Application |Status                                                         |
+ROW   |6281     |35060 |Application |Status                                                         |
+ROW   |6282     |35061 |Application |Status                                                         |
+ROW   |6283     |35062 |Application |Status                                                         |
+ROW   |6284     |35063 |Application |Status                                                         |
+ROW   |6285     |35064 |data        |raw                                                            |
+ROW   |6286     |35064 |target      |cert                                                           |
+ROW   |6287     |35064 |transport   |agent                                                          |
+ROW   |6288     |35065 |resource    |general                                                        |
+ROW   |6289     |35065 |target      |cert                                                           |
+ROW   |6290     |35065 |transport   |dependent                                                      |
+ROW   |6291     |35065 |type        |gauge                                                          |
+ROW   |6292     |35066 |resource    |general                                                        |
+ROW   |6293     |35066 |target      |cert                                                           |
+ROW   |6294     |35066 |transport   |dependent                                                      |
+ROW   |6295     |35066 |type        |gauge                                                          |
+ROW   |6296     |35067 |resource    |general                                                        |
+ROW   |6297     |35067 |target      |cert                                                           |
+ROW   |6298     |35067 |transport   |dependent                                                      |
+ROW   |6299     |35067 |type        |gauge                                                          |
+ROW   |6300     |35068 |resource    |general                                                        |
+ROW   |6301     |35068 |target      |cert                                                           |
+ROW   |6302     |35068 |transport   |dependent                                                      |
+ROW   |6303     |35068 |type        |gauge                                                          |
+ROW   |6304     |35069 |resource    |general                                                        |
+ROW   |6305     |35069 |target      |cert                                                           |
+ROW   |6306     |35069 |transport   |dependent                                                      |
+ROW   |6307     |35069 |type        |gauge                                                          |
+ROW   |6308     |35070 |resource    |general                                                        |
+ROW   |6309     |35070 |target      |cert                                                           |
+ROW   |6310     |35070 |transport   |dependent                                                      |
+ROW   |6311     |35070 |type        |gauge                                                          |
+ROW   |6312     |35071 |resource    |general                                                        |
+ROW   |6313     |35071 |target      |cert                                                           |
+ROW   |6314     |35071 |transport   |dependent                                                      |
+ROW   |6315     |35071 |type        |gauge                                                          |
+ROW   |6316     |35072 |resource    |general                                                        |
+ROW   |6317     |35072 |target      |cert                                                           |
+ROW   |6318     |35072 |transport   |dependent                                                      |
+ROW   |6319     |35072 |type        |gauge                                                          |
+ROW   |6320     |35073 |resource    |general                                                        |
+ROW   |6321     |35073 |target      |cert                                                           |
+ROW   |6322     |35073 |transport   |dependent                                                      |
+ROW   |6323     |35073 |type        |gauge                                                          |
+ROW   |6324     |35074 |resource    |general                                                        |
+ROW   |6325     |35074 |target      |cert                                                           |
+ROW   |6326     |35074 |transport   |dependent                                                      |
+ROW   |6327     |35074 |type        |gauge                                                          |
+ROW   |6328     |35075 |resource    |general                                                        |
+ROW   |6329     |35075 |target      |cert                                                           |
+ROW   |6330     |35075 |transport   |dependent                                                      |
+ROW   |6331     |35075 |type        |gauge                                                          |
+ROW   |6332     |35076 |resource    |general                                                        |
+ROW   |6333     |35076 |target      |cert                                                           |
+ROW   |6334     |35076 |transport   |dependent                                                      |
+ROW   |6335     |35076 |type        |gauge                                                          |
+ROW   |6336     |35077 |data        |raw                                                            |
+ROW   |6337     |35077 |target      |cloudflare                                                     |
+ROW   |6338     |35077 |transport   |Script                                                         |
+ROW   |6339     |35078 |resource    |bandwidth                                                      |
+ROW   |6340     |35078 |target      |cloudflare                                                     |
+ROW   |6341     |35078 |type        |gauge                                                          |
+ROW   |6342     |35079 |resource    |requests                                                       |
+ROW   |6343     |35079 |target      |cloudflare                                                     |
+ROW   |6344     |35079 |type        |ratio                                                          |
+ROW   |6345     |35080 |resource    |threats                                                        |
+ROW   |6346     |35080 |target      |cloudflare                                                     |
+ROW   |6347     |35080 |type        |gauge                                                          |
+ROW   |6348     |35081 |resource    |requests                                                       |
+ROW   |6349     |35081 |target      |cloudflare                                                     |
+ROW   |6350     |35081 |type        |gauge                                                          |
+ROW   |6351     |35082 |resource    |requests                                                       |
+ROW   |6352     |35082 |target      |cloudflare                                                     |
+ROW   |6353     |35082 |type        |ratio                                                          |
+ROW   |6354     |35083 |resource    |requests                                                       |
+ROW   |6355     |35083 |target      |cloudflare                                                     |
+ROW   |6356     |35083 |type        |gauge                                                          |
+ROW   |6357     |35084 |resource    |requests                                                       |
+ROW   |6358     |35084 |target      |cloudflare                                                     |
+ROW   |6359     |35084 |type        |gauge                                                          |
+ROW   |6360     |35085 |resource    |requests                                                       |
+ROW   |6361     |35085 |target      |cloudflare                                                     |
+ROW   |6362     |35085 |type        |gauge                                                          |
+ROW   |6363     |35086 |resource    |requests                                                       |
+ROW   |6364     |35086 |target      |cloudflare                                                     |
+ROW   |6365     |35086 |type        |gauge                                                          |
+ROW   |6366     |35087 |resource    |requests                                                       |
+ROW   |6367     |35087 |target      |cloudflare                                                     |
+ROW   |6368     |35087 |type        |gauge                                                          |
+ROW   |6369     |35088 |resource    |requests                                                       |
+ROW   |6370     |35088 |target      |cloudflare                                                     |
+ROW   |6371     |35088 |type        |gauge                                                          |
+ROW   |6372     |35089 |resource    |requests                                                       |
+ROW   |6373     |35089 |target      |cloudflare                                                     |
+ROW   |6374     |35089 |type        |gauge                                                          |
+ROW   |6375     |35090 |resource    |requests                                                       |
+ROW   |6376     |35090 |target      |cloudflare                                                     |
+ROW   |6377     |35090 |type        |ratio                                                          |
+ROW   |6378     |35091 |resource    |bandwidth                                                      |
+ROW   |6379     |35091 |target      |cloudflare                                                     |
+ROW   |6380     |35091 |type        |gauge                                                          |
+ROW   |6381     |35092 |resource    |requests                                                       |
+ROW   |6382     |35092 |target      |cloudflare                                                     |
+ROW   |6383     |35092 |type        |gauge                                                          |
+ROW   |6384     |35093 |resource    |requests                                                       |
+ROW   |6385     |35093 |target      |cloudflare                                                     |
+ROW   |6386     |35093 |type        |gauge                                                          |
+ROW   |6387     |35094 |resource    |pageviews                                                      |
+ROW   |6388     |35094 |target      |cloudflare                                                     |
+ROW   |6389     |35094 |type        |gauge                                                          |
+ROW   |6390     |35095 |resource    |dns                                                            |
+ROW   |6391     |35095 |target      |cloudflare                                                     |
+ROW   |6392     |35095 |type        |gauge                                                          |
+ROW   |6393     |35096 |resource    |dns                                                            |
+ROW   |6394     |35096 |target      |cloudflare                                                     |
+ROW   |6395     |35096 |type        |gauge                                                          |
+ROW   |6396     |35097 |resource    |dns                                                            |
+ROW   |6397     |35097 |target      |cloudflare                                                     |
+ROW   |6398     |35097 |type        |gauge                                                          |
+ROW   |6399     |35098 |resource    |bandwidth                                                      |
+ROW   |6400     |35098 |target      |cloudflare                                                     |
+ROW   |6401     |35098 |type        |gauge                                                          |
+ROW   |6402     |35099 |resource    |bandwidth                                                      |
+ROW   |6403     |35099 |target      |cloudflare                                                     |
+ROW   |6404     |35099 |type        |gauge                                                          |
+ROW   |6405     |35100 |resource    |bandwidth                                                      |
+ROW   |6406     |35100 |target      |cloudflare                                                     |
+ROW   |6407     |35100 |type        |gauge                                                          |
+ROW   |6408     |35101 |resource    |bandwidth                                                      |
+ROW   |6409     |35101 |target      |cloudflare                                                     |
+ROW   |6410     |35101 |type        |ratio                                                          |
+ROW   |6411     |35102 |resource    |uniques                                                        |
+ROW   |6412     |35102 |target      |cloudflare                                                     |
+ROW   |6413     |35102 |type        |gauge                                                          |
+ROW   |6414     |30187 |resource    |general                                                        |
+ROW   |6415     |30187 |target      |haproxy                                                        |
+ROW   |6416     |30187 |transport   |agent                                                          |
+ROW   |6417     |30187 |type        |gauge                                                          |
+ROW   |6418     |30188 |resource    |general                                                        |
+ROW   |6419     |30188 |target      |haproxy                                                        |
+ROW   |6420     |30188 |transport   |agent                                                          |
+ROW   |6421     |30188 |type        |gauge                                                          |
+ROW   |6422     |30189 |data        |raw                                                            |
+ROW   |6423     |30189 |target      |haproxy                                                        |
+ROW   |6424     |30189 |transport   |agent                                                          |
+ROW   |6425     |30190 |data        |raw                                                            |
+ROW   |6426     |30190 |target      |haproxy                                                        |
+ROW   |6427     |30190 |transport   |agent                                                          |
+ROW   |6428     |30191 |resource    |general                                                        |
+ROW   |6429     |30191 |target      |haproxy                                                        |
+ROW   |6430     |30191 |transport   |dependent                                                      |
+ROW   |6431     |30191 |type        |gauge                                                          |
+ROW   |6432     |30192 |resource    |general                                                        |
+ROW   |6433     |30192 |target      |haproxy                                                        |
+ROW   |6434     |30192 |transport   |dependent                                                      |
+ROW   |6435     |30192 |type        |gauge                                                          |
+ROW   |6436     |35103 |data        |raw                                                            |
+ROW   |6437     |35103 |target      |haproxy                                                        |
+ROW   |6438     |35103 |transport   |dependent                                                      |
+ROW   |6439     |30196 |frontend    |{#PXNAME}                                                      |
+ROW   |6440     |30196 |resource    |frontend                                                       |
+ROW   |6441     |30196 |target      |haproxy                                                        |
+ROW   |6442     |30196 |transport   |calculated                                                     |
+ROW   |6443     |30196 |type        |gauge                                                          |
+ROW   |6444     |30197 |backend     |{#PXNAME}                                                      |
+ROW   |6445     |30197 |resource    |backend                                                        |
+ROW   |6446     |30197 |target      |haproxy                                                        |
+ROW   |6447     |30197 |transport   |dependent                                                      |
+ROW   |6448     |30197 |type        |rate                                                           |
+ROW   |6449     |30198 |backend     |{#PXNAME}                                                      |
+ROW   |6450     |30198 |resource    |backend                                                        |
+ROW   |6451     |30198 |target      |haproxy                                                        |
+ROW   |6452     |30198 |transport   |dependent                                                      |
+ROW   |6453     |30198 |type        |rate                                                           |
+ROW   |6454     |30199 |backend     |{#PXNAME}                                                      |
+ROW   |6455     |30199 |resource    |backend                                                        |
+ROW   |6456     |30199 |target      |haproxy                                                        |
+ROW   |6457     |30199 |transport   |dependent                                                      |
+ROW   |6458     |30199 |type        |rate                                                           |
+ROW   |6459     |30200 |backend     |{#PXNAME}                                                      |
+ROW   |6460     |30200 |resource    |backend                                                        |
+ROW   |6461     |30200 |target      |haproxy                                                        |
+ROW   |6462     |30200 |transport   |dependent                                                      |
+ROW   |6463     |30200 |type        |gauge                                                          |
+ROW   |6464     |30201 |backend     |{#PXNAME}                                                      |
+ROW   |6465     |30201 |resource    |backend                                                        |
+ROW   |6466     |30201 |target      |haproxy                                                        |
+ROW   |6467     |30201 |transport   |dependent                                                      |
+ROW   |6468     |30201 |type        |gauge                                                          |
+ROW   |6469     |30202 |backend     |{#PXNAME}                                                      |
+ROW   |6470     |30202 |resource    |backend                                                        |
+ROW   |6471     |30202 |target      |haproxy                                                        |
+ROW   |6472     |30202 |transport   |dependent                                                      |
+ROW   |6473     |30202 |type        |gauge                                                          |
+ROW   |6474     |30203 |backend     |{#PXNAME}                                                      |
+ROW   |6475     |30203 |resource    |backend                                                        |
+ROW   |6476     |30203 |target      |haproxy                                                        |
+ROW   |6477     |30203 |transport   |dependent                                                      |
+ROW   |6478     |30203 |type        |state                                                          |
+ROW   |6479     |30204 |backend     |{#PXNAME}                                                      |
+ROW   |6480     |30204 |resource    |backend                                                        |
+ROW   |6481     |30204 |target      |haproxy                                                        |
+ROW   |6482     |30204 |transport   |dependent                                                      |
+ROW   |6483     |30204 |type        |rate                                                           |
+ROW   |6484     |30205 |backend     |{#PXNAME}                                                      |
+ROW   |6485     |30205 |resource    |backend                                                        |
+ROW   |6486     |30205 |target      |haproxy                                                        |
+ROW   |6487     |30205 |transport   |dependent                                                      |
+ROW   |6488     |30205 |type        |rate                                                           |
+ROW   |6489     |30206 |frontend    |{#PXNAME}                                                      |
+ROW   |6490     |30206 |resource    |frontend                                                       |
+ROW   |6491     |30206 |target      |haproxy                                                        |
+ROW   |6492     |30206 |transport   |dependent                                                      |
+ROW   |6493     |30206 |type        |rate                                                           |
+ROW   |6494     |30207 |frontend    |{#PXNAME}                                                      |
+ROW   |6495     |30207 |resource    |frontend                                                       |
+ROW   |6496     |30207 |target      |haproxy                                                        |
+ROW   |6497     |30207 |transport   |dependent                                                      |
+ROW   |6498     |30207 |type        |rate                                                           |
+ROW   |6499     |30208 |frontend    |{#PXNAME}                                                      |
+ROW   |6500     |30208 |resource    |frontend                                                       |
+ROW   |6501     |30208 |target      |haproxy                                                        |
+ROW   |6502     |30208 |transport   |dependent                                                      |
+ROW   |6503     |30208 |type        |rate                                                           |
+ROW   |6504     |30209 |frontend    |{#PXNAME}                                                      |
+ROW   |6505     |30209 |resource    |frontend                                                       |
+ROW   |6506     |30209 |target      |haproxy                                                        |
+ROW   |6507     |30209 |transport   |dependent                                                      |
+ROW   |6508     |30209 |type        |rate                                                           |
+ROW   |6509     |30210 |frontend    |{#PXNAME}                                                      |
+ROW   |6510     |30210 |resource    |frontend                                                       |
+ROW   |6511     |30210 |target      |haproxy                                                        |
+ROW   |6512     |30210 |transport   |dependent                                                      |
+ROW   |6513     |30210 |type        |rate                                                           |
+ROW   |6514     |30211 |frontend    |{#PXNAME}                                                      |
+ROW   |6515     |30211 |resource    |frontend                                                       |
+ROW   |6516     |30211 |target      |haproxy                                                        |
+ROW   |6517     |30211 |transport   |dependent                                                      |
+ROW   |6518     |30211 |type        |rate                                                           |
+ROW   |6519     |30212 |frontend    |{#PXNAME}                                                      |
+ROW   |6520     |30212 |resource    |frontend                                                       |
+ROW   |6521     |30212 |target      |haproxy                                                        |
+ROW   |6522     |30212 |transport   |dependent                                                      |
+ROW   |6523     |30212 |type        |rate                                                           |
+ROW   |6524     |30213 |frontend    |{#PXNAME}                                                      |
+ROW   |6525     |30213 |resource    |frontend                                                       |
+ROW   |6526     |30213 |target      |haproxy                                                        |
+ROW   |6527     |30213 |transport   |dependent                                                      |
+ROW   |6528     |30213 |type        |rate                                                           |
+ROW   |6529     |30214 |frontend    |{#PXNAME}                                                      |
+ROW   |6530     |30214 |resource    |frontend                                                       |
+ROW   |6531     |30214 |target      |haproxy                                                        |
+ROW   |6532     |30214 |transport   |dependent                                                      |
+ROW   |6533     |30214 |type        |rate                                                           |
+ROW   |6534     |30215 |frontend    |{#PXNAME}                                                      |
+ROW   |6535     |30215 |resource    |frontend                                                       |
+ROW   |6536     |30215 |target      |haproxy                                                        |
+ROW   |6537     |30215 |transport   |dependent                                                      |
+ROW   |6538     |30215 |type        |gauge                                                          |
+ROW   |6539     |30216 |frontend    |{#PXNAME}                                                      |
+ROW   |6540     |30216 |resource    |frontend                                                       |
+ROW   |6541     |30216 |target      |haproxy                                                        |
+ROW   |6542     |30216 |transport   |dependent                                                      |
+ROW   |6543     |30216 |type        |gauge                                                          |
+ROW   |6544     |30217 |frontend    |{#PXNAME}                                                      |
+ROW   |6545     |30217 |resource    |frontend                                                       |
+ROW   |6546     |30217 |target      |haproxy                                                        |
+ROW   |6547     |30217 |transport   |dependent                                                      |
+ROW   |6548     |30217 |type        |gauge                                                          |
+ROW   |6549     |30218 |frontend    |{#PXNAME}                                                      |
+ROW   |6550     |30218 |resource    |frontend                                                       |
+ROW   |6551     |30218 |target      |haproxy                                                        |
+ROW   |6552     |30218 |transport   |dependent                                                      |
+ROW   |6553     |30218 |type        |gauge                                                          |
+ROW   |6554     |30219 |resource    |server                                                         |
+ROW   |6555     |30219 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6556     |30219 |target      |haproxy                                                        |
+ROW   |6557     |30219 |transport   |dependent                                                      |
+ROW   |6558     |30219 |type        |rate                                                           |
+ROW   |6559     |30220 |resource    |server                                                         |
+ROW   |6560     |30220 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6561     |30220 |target      |haproxy                                                        |
+ROW   |6562     |30220 |transport   |dependent                                                      |
+ROW   |6563     |30220 |type        |rate                                                           |
+ROW   |6564     |30221 |resource    |server                                                         |
+ROW   |6565     |30221 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6566     |30221 |target      |haproxy                                                        |
+ROW   |6567     |30221 |transport   |dependent                                                      |
+ROW   |6568     |30221 |type        |rate                                                           |
+ROW   |6569     |30222 |resource    |server                                                         |
+ROW   |6570     |30222 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6571     |30222 |target      |haproxy                                                        |
+ROW   |6572     |30222 |transport   |dependent                                                      |
+ROW   |6573     |30222 |type        |rate                                                           |
+ROW   |6574     |30223 |resource    |server                                                         |
+ROW   |6575     |30223 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6576     |30223 |target      |haproxy                                                        |
+ROW   |6577     |30223 |transport   |dependent                                                      |
+ROW   |6578     |30223 |type        |rate                                                           |
+ROW   |6579     |30224 |resource    |server                                                         |
+ROW   |6580     |30224 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6581     |30224 |target      |haproxy                                                        |
+ROW   |6582     |30224 |transport   |dependent                                                      |
+ROW   |6583     |30224 |type        |gauge                                                          |
+ROW   |6584     |30225 |resource    |server                                                         |
+ROW   |6585     |30225 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6586     |30225 |target      |haproxy                                                        |
+ROW   |6587     |30225 |transport   |dependent                                                      |
+ROW   |6588     |30225 |type        |gauge                                                          |
+ROW   |6589     |30226 |resource    |server                                                         |
+ROW   |6590     |30226 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6591     |30226 |target      |haproxy                                                        |
+ROW   |6592     |30226 |transport   |dependent                                                      |
+ROW   |6593     |30226 |type        |gauge                                                          |
+ROW   |6594     |30227 |resource    |server                                                         |
+ROW   |6595     |30227 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6596     |30227 |target      |haproxy                                                        |
+ROW   |6597     |30227 |transport   |dependent                                                      |
+ROW   |6598     |30227 |type        |state                                                          |
+ROW   |6599     |30228 |resource    |server                                                         |
+ROW   |6600     |30228 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6601     |30228 |target      |haproxy                                                        |
+ROW   |6602     |30228 |transport   |dependent                                                      |
+ROW   |6603     |30228 |type        |rate                                                           |
+ROW   |6604     |30229 |resource    |server                                                         |
+ROW   |6605     |30229 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6606     |30229 |target      |haproxy                                                        |
+ROW   |6607     |30229 |transport   |dependent                                                      |
+ROW   |6608     |30229 |type        |rate                                                           |
+ROW   |6609     |35104 |backend     |{#PXNAME}                                                      |
+ROW   |6610     |35104 |resource    |backend                                                        |
+ROW   |6611     |35104 |target      |haproxy                                                        |
+ROW   |6612     |35104 |transport   |dependent                                                      |
+ROW   |6613     |35104 |type        |gauge                                                          |
+ROW   |6614     |35105 |backend     |{#PXNAME}                                                      |
+ROW   |6615     |35105 |resource    |backend                                                        |
+ROW   |6616     |35105 |target      |haproxy                                                        |
+ROW   |6617     |35105 |transport   |dependent                                                      |
+ROW   |6618     |35105 |type        |rate                                                           |
+ROW   |6619     |35106 |backend     |{#PXNAME}                                                      |
+ROW   |6620     |35106 |resource    |backend                                                        |
+ROW   |6621     |35106 |target      |haproxy                                                        |
+ROW   |6622     |35106 |transport   |dependent                                                      |
+ROW   |6623     |35106 |type        |gauge                                                          |
+ROW   |6624     |35107 |backend     |{#PXNAME}                                                      |
+ROW   |6625     |35107 |resource    |backend                                                        |
+ROW   |6626     |35107 |target      |haproxy                                                        |
+ROW   |6627     |35107 |transport   |dependent                                                      |
+ROW   |6628     |35107 |type        |rate                                                           |
+ROW   |6629     |35108 |backend     |{#PXNAME}                                                      |
+ROW   |6630     |35108 |resource    |backend                                                        |
+ROW   |6631     |35108 |target      |haproxy                                                        |
+ROW   |6632     |35108 |transport   |dependent                                                      |
+ROW   |6633     |35108 |type        |rate                                                           |
+ROW   |6634     |35109 |backend     |{#PXNAME}                                                      |
+ROW   |6635     |35109 |resource    |backend                                                        |
+ROW   |6636     |35109 |target      |haproxy                                                        |
+ROW   |6637     |35109 |transport   |dependent                                                      |
+ROW   |6638     |35109 |type        |gauge                                                          |
+ROW   |6639     |35110 |backend     |{#PXNAME}                                                      |
+ROW   |6640     |35110 |resource    |backend                                                        |
+ROW   |6641     |35110 |target      |haproxy                                                        |
+ROW   |6642     |35110 |transport   |dependent                                                      |
+ROW   |6643     |35110 |type        |rate                                                           |
+ROW   |6644     |35111 |backend     |{#PXNAME}                                                      |
+ROW   |6645     |35111 |resource    |backend                                                        |
+ROW   |6646     |35111 |target      |haproxy                                                        |
+ROW   |6647     |35111 |transport   |dependent                                                      |
+ROW   |6648     |35111 |type        |rate                                                           |
+ROW   |6649     |35112 |backend     |{#PXNAME}                                                      |
+ROW   |6650     |35112 |resource    |backend                                                        |
+ROW   |6651     |35112 |target      |haproxy                                                        |
+ROW   |6652     |35112 |transport   |dependent                                                      |
+ROW   |6653     |35112 |type        |rate                                                           |
+ROW   |6654     |35113 |backend     |{#PXNAME}                                                      |
+ROW   |6655     |35113 |resource    |backend                                                        |
+ROW   |6656     |35113 |target      |haproxy                                                        |
+ROW   |6657     |35113 |transport   |dependent                                                      |
+ROW   |6658     |35113 |type        |rate                                                           |
+ROW   |6659     |35114 |backend     |{#PXNAME}                                                      |
+ROW   |6660     |35114 |resource    |backend                                                        |
+ROW   |6661     |35114 |target      |haproxy                                                        |
+ROW   |6662     |35114 |transport   |dependent                                                      |
+ROW   |6663     |35114 |type        |rate                                                           |
+ROW   |6664     |35115 |frontend    |{#PXNAME}                                                      |
+ROW   |6665     |35115 |resource    |frontend                                                       |
+ROW   |6666     |35115 |target      |haproxy                                                        |
+ROW   |6667     |35115 |transport   |dependent                                                      |
+ROW   |6668     |35115 |type        |state                                                          |
+ROW   |6669     |35116 |resource    |server                                                         |
+ROW   |6670     |35116 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6671     |35116 |target      |haproxy                                                        |
+ROW   |6672     |35116 |transport   |dependent                                                      |
+ROW   |6673     |35116 |type        |gauge                                                          |
+ROW   |6674     |35117 |resource    |server                                                         |
+ROW   |6675     |35117 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6676     |35117 |target      |haproxy                                                        |
+ROW   |6677     |35117 |transport   |dependent                                                      |
+ROW   |6678     |35117 |type        |gauge                                                          |
+ROW   |6679     |35118 |resource    |server                                                         |
+ROW   |6680     |35118 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6681     |35118 |target      |haproxy                                                        |
+ROW   |6682     |35118 |transport   |dependent                                                      |
+ROW   |6683     |35118 |type        |rate                                                           |
+ROW   |6684     |35119 |resource    |server                                                         |
+ROW   |6685     |35119 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6686     |35119 |target      |haproxy                                                        |
+ROW   |6687     |35119 |transport   |dependent                                                      |
+ROW   |6688     |35119 |type        |gauge                                                          |
+ROW   |6689     |35120 |resource    |server                                                         |
+ROW   |6690     |35120 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6691     |35120 |target      |haproxy                                                        |
+ROW   |6692     |35120 |transport   |dependent                                                      |
+ROW   |6693     |35120 |type        |rate                                                           |
+ROW   |6694     |35121 |resource    |server                                                         |
+ROW   |6695     |35121 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6696     |35121 |target      |haproxy                                                        |
+ROW   |6697     |35121 |transport   |dependent                                                      |
+ROW   |6698     |35121 |type        |gauge                                                          |
+ROW   |6699     |35122 |resource    |server                                                         |
+ROW   |6700     |35122 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6701     |35122 |target      |haproxy                                                        |
+ROW   |6702     |35122 |transport   |dependent                                                      |
+ROW   |6703     |35122 |type        |rate                                                           |
+ROW   |6704     |35123 |resource    |server                                                         |
+ROW   |6705     |35123 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6706     |35123 |target      |haproxy                                                        |
+ROW   |6707     |35123 |transport   |dependent                                                      |
+ROW   |6708     |35123 |type        |rate                                                           |
+ROW   |6709     |35124 |resource    |server                                                         |
+ROW   |6710     |35124 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6711     |35124 |target      |haproxy                                                        |
+ROW   |6712     |35124 |transport   |dependent                                                      |
+ROW   |6713     |35124 |type        |rate                                                           |
+ROW   |6714     |35125 |resource    |server                                                         |
+ROW   |6715     |35125 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6716     |35125 |target      |haproxy                                                        |
+ROW   |6717     |35125 |transport   |dependent                                                      |
+ROW   |6718     |35125 |type        |state                                                          |
+ROW   |6719     |35126 |resource    |server                                                         |
+ROW   |6720     |35126 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6721     |35126 |target      |haproxy                                                        |
+ROW   |6722     |35126 |transport   |dependent                                                      |
+ROW   |6723     |35126 |type        |rate                                                           |
+ROW   |6724     |35127 |resource    |server                                                         |
+ROW   |6725     |35127 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6726     |35127 |target      |haproxy                                                        |
+ROW   |6727     |35127 |transport   |dependent                                                      |
+ROW   |6728     |35127 |type        |rate                                                           |
+ROW   |6729     |30230 |data        |raw                                                            |
+ROW   |6730     |30230 |target      |haproxy                                                        |
+ROW   |6731     |30230 |transport   |http                                                           |
+ROW   |6732     |30231 |data        |raw                                                            |
+ROW   |6733     |30231 |target      |haproxy                                                        |
+ROW   |6734     |30231 |transport   |http                                                           |
+ROW   |6735     |30789 |resource    |general                                                        |
+ROW   |6736     |30789 |target      |haproxy                                                        |
+ROW   |6737     |30789 |transport   |simple                                                         |
+ROW   |6738     |30789 |type        |gauge                                                          |
+ROW   |6739     |30790 |resource    |general                                                        |
+ROW   |6740     |30790 |target      |haproxy                                                        |
+ROW   |6741     |30790 |transport   |simple                                                         |
+ROW   |6742     |30790 |type        |gauge                                                          |
+ROW   |6743     |30234 |resource    |general                                                        |
+ROW   |6744     |30234 |target      |haproxy                                                        |
+ROW   |6745     |30234 |transport   |dependent                                                      |
+ROW   |6746     |30234 |type        |gauge                                                          |
+ROW   |6747     |30235 |resource    |general                                                        |
+ROW   |6748     |30235 |target      |haproxy                                                        |
+ROW   |6749     |30235 |transport   |dependent                                                      |
+ROW   |6750     |30235 |type        |gauge                                                          |
+ROW   |6751     |35128 |data        |raw                                                            |
+ROW   |6752     |35128 |target      |haproxy                                                        |
+ROW   |6753     |35128 |transport   |dependent                                                      |
+ROW   |6754     |30239 |frontend    |{#PXNAME}                                                      |
+ROW   |6755     |30239 |resource    |frontend                                                       |
+ROW   |6756     |30239 |target      |haproxy                                                        |
+ROW   |6757     |30239 |transport   |calculated                                                     |
+ROW   |6758     |30239 |type        |gauge                                                          |
+ROW   |6759     |30240 |backend     |{#PXNAME}                                                      |
+ROW   |6760     |30240 |resource    |backend                                                        |
+ROW   |6761     |30240 |target      |haproxy                                                        |
+ROW   |6762     |30240 |transport   |dependent                                                      |
+ROW   |6763     |30240 |type        |rate                                                           |
+ROW   |6764     |30241 |backend     |{#PXNAME}                                                      |
+ROW   |6765     |30241 |resource    |backend                                                        |
+ROW   |6766     |30241 |target      |haproxy                                                        |
+ROW   |6767     |30241 |transport   |dependent                                                      |
+ROW   |6768     |30241 |type        |rate                                                           |
+ROW   |6769     |30242 |backend     |{#PXNAME}                                                      |
+ROW   |6770     |30242 |resource    |backend                                                        |
+ROW   |6771     |30242 |target      |haproxy                                                        |
+ROW   |6772     |30242 |transport   |dependent                                                      |
+ROW   |6773     |30242 |type        |rate                                                           |
+ROW   |6774     |30243 |backend     |{#PXNAME}                                                      |
+ROW   |6775     |30243 |resource    |backend                                                        |
+ROW   |6776     |30243 |target      |haproxy                                                        |
+ROW   |6777     |30243 |transport   |dependent                                                      |
+ROW   |6778     |30243 |type        |gauge                                                          |
+ROW   |6779     |30244 |backend     |{#PXNAME}                                                      |
+ROW   |6780     |30244 |resource    |backend                                                        |
+ROW   |6781     |30244 |target      |haproxy                                                        |
+ROW   |6782     |30244 |transport   |dependent                                                      |
+ROW   |6783     |30244 |type        |gauge                                                          |
+ROW   |6784     |30245 |backend     |{#PXNAME}                                                      |
+ROW   |6785     |30245 |resource    |backend                                                        |
+ROW   |6786     |30245 |target      |haproxy                                                        |
+ROW   |6787     |30245 |transport   |dependent                                                      |
+ROW   |6788     |30245 |type        |gauge                                                          |
+ROW   |6789     |30246 |backend     |{#PXNAME}                                                      |
+ROW   |6790     |30246 |resource    |backend                                                        |
+ROW   |6791     |30246 |target      |haproxy                                                        |
+ROW   |6792     |30246 |transport   |dependent                                                      |
+ROW   |6793     |30246 |type        |state                                                          |
+ROW   |6794     |30247 |backend     |{#PXNAME}                                                      |
+ROW   |6795     |30247 |resource    |backend                                                        |
+ROW   |6796     |30247 |target      |haproxy                                                        |
+ROW   |6797     |30247 |transport   |dependent                                                      |
+ROW   |6798     |30247 |type        |rate                                                           |
+ROW   |6799     |30248 |backend     |{#PXNAME}                                                      |
+ROW   |6800     |30248 |resource    |backend                                                        |
+ROW   |6801     |30248 |target      |haproxy                                                        |
+ROW   |6802     |30248 |transport   |dependent                                                      |
+ROW   |6803     |30248 |type        |rate                                                           |
+ROW   |6804     |30249 |frontend    |{#PXNAME}                                                      |
+ROW   |6805     |30249 |resource    |frontend                                                       |
+ROW   |6806     |30249 |target      |haproxy                                                        |
+ROW   |6807     |30249 |transport   |dependent                                                      |
+ROW   |6808     |30249 |type        |rate                                                           |
+ROW   |6809     |30250 |frontend    |{#PXNAME}                                                      |
+ROW   |6810     |30250 |resource    |frontend                                                       |
+ROW   |6811     |30250 |target      |haproxy                                                        |
+ROW   |6812     |30250 |transport   |dependent                                                      |
+ROW   |6813     |30250 |type        |rate                                                           |
+ROW   |6814     |30251 |frontend    |{#PXNAME}                                                      |
+ROW   |6815     |30251 |resource    |frontend                                                       |
+ROW   |6816     |30251 |target      |haproxy                                                        |
+ROW   |6817     |30251 |transport   |dependent                                                      |
+ROW   |6818     |30251 |type        |rate                                                           |
+ROW   |6819     |30252 |frontend    |{#PXNAME}                                                      |
+ROW   |6820     |30252 |resource    |frontend                                                       |
+ROW   |6821     |30252 |target      |haproxy                                                        |
+ROW   |6822     |30252 |transport   |dependent                                                      |
+ROW   |6823     |30252 |type        |rate                                                           |
+ROW   |6824     |30253 |frontend    |{#PXNAME}                                                      |
+ROW   |6825     |30253 |resource    |frontend                                                       |
+ROW   |6826     |30253 |target      |haproxy                                                        |
+ROW   |6827     |30253 |transport   |dependent                                                      |
+ROW   |6828     |30253 |type        |rate                                                           |
+ROW   |6829     |30254 |frontend    |{#PXNAME}                                                      |
+ROW   |6830     |30254 |resource    |frontend                                                       |
+ROW   |6831     |30254 |target      |haproxy                                                        |
+ROW   |6832     |30254 |transport   |dependent                                                      |
+ROW   |6833     |30254 |type        |rate                                                           |
+ROW   |6834     |30255 |frontend    |{#PXNAME}                                                      |
+ROW   |6835     |30255 |resource    |frontend                                                       |
+ROW   |6836     |30255 |target      |haproxy                                                        |
+ROW   |6837     |30255 |transport   |dependent                                                      |
+ROW   |6838     |30255 |type        |rate                                                           |
+ROW   |6839     |30256 |frontend    |{#PXNAME}                                                      |
+ROW   |6840     |30256 |resource    |frontend                                                       |
+ROW   |6841     |30256 |target      |haproxy                                                        |
+ROW   |6842     |30256 |transport   |dependent                                                      |
+ROW   |6843     |30256 |type        |rate                                                           |
+ROW   |6844     |30257 |frontend    |{#PXNAME}                                                      |
+ROW   |6845     |30257 |resource    |frontend                                                       |
+ROW   |6846     |30257 |target      |haproxy                                                        |
+ROW   |6847     |30257 |transport   |dependent                                                      |
+ROW   |6848     |30257 |type        |rate                                                           |
+ROW   |6849     |30258 |frontend    |{#PXNAME}                                                      |
+ROW   |6850     |30258 |resource    |frontend                                                       |
+ROW   |6851     |30258 |target      |haproxy                                                        |
+ROW   |6852     |30258 |transport   |dependent                                                      |
+ROW   |6853     |30258 |type        |gauge                                                          |
+ROW   |6854     |30259 |frontend    |{#PXNAME}                                                      |
+ROW   |6855     |30259 |resource    |frontend                                                       |
+ROW   |6856     |30259 |target      |haproxy                                                        |
+ROW   |6857     |30259 |transport   |dependent                                                      |
+ROW   |6858     |30259 |type        |gauge                                                          |
+ROW   |6859     |30260 |frontend    |{#PXNAME}                                                      |
+ROW   |6860     |30260 |resource    |frontend                                                       |
+ROW   |6861     |30260 |target      |haproxy                                                        |
+ROW   |6862     |30260 |transport   |dependent                                                      |
+ROW   |6863     |30260 |type        |gauge                                                          |
+ROW   |6864     |30261 |frontend    |{#PXNAME}                                                      |
+ROW   |6865     |30261 |resource    |frontend                                                       |
+ROW   |6866     |30261 |target      |haproxy                                                        |
+ROW   |6867     |30261 |transport   |dependent                                                      |
+ROW   |6868     |30261 |type        |gauge                                                          |
+ROW   |6869     |30262 |resource    |server                                                         |
+ROW   |6870     |30262 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6871     |30262 |target      |haproxy                                                        |
+ROW   |6872     |30262 |transport   |dependent                                                      |
+ROW   |6873     |30262 |type        |rate                                                           |
+ROW   |6874     |30263 |resource    |server                                                         |
+ROW   |6875     |30263 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6876     |30263 |target      |haproxy                                                        |
+ROW   |6877     |30263 |transport   |dependent                                                      |
+ROW   |6878     |30263 |type        |rate                                                           |
+ROW   |6879     |30264 |resource    |server                                                         |
+ROW   |6880     |30264 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6881     |30264 |target      |haproxy                                                        |
+ROW   |6882     |30264 |transport   |dependent                                                      |
+ROW   |6883     |30264 |type        |rate                                                           |
+ROW   |6884     |30265 |resource    |server                                                         |
+ROW   |6885     |30265 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6886     |30265 |target      |haproxy                                                        |
+ROW   |6887     |30265 |transport   |dependent                                                      |
+ROW   |6888     |30265 |type        |rate                                                           |
+ROW   |6889     |30266 |resource    |server                                                         |
+ROW   |6890     |30266 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6891     |30266 |target      |haproxy                                                        |
+ROW   |6892     |30266 |transport   |dependent                                                      |
+ROW   |6893     |30266 |type        |rate                                                           |
+ROW   |6894     |30267 |resource    |server                                                         |
+ROW   |6895     |30267 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6896     |30267 |target      |haproxy                                                        |
+ROW   |6897     |30267 |transport   |dependent                                                      |
+ROW   |6898     |30267 |type        |gauge                                                          |
+ROW   |6899     |30268 |resource    |server                                                         |
+ROW   |6900     |30268 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6901     |30268 |target      |haproxy                                                        |
+ROW   |6902     |30268 |transport   |dependent                                                      |
+ROW   |6903     |30268 |type        |gauge                                                          |
+ROW   |6904     |30269 |resource    |server                                                         |
+ROW   |6905     |30269 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6906     |30269 |target      |haproxy                                                        |
+ROW   |6907     |30269 |transport   |dependent                                                      |
+ROW   |6908     |30269 |type        |gauge                                                          |
+ROW   |6909     |30270 |resource    |server                                                         |
+ROW   |6910     |30270 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6911     |30270 |target      |haproxy                                                        |
+ROW   |6912     |30270 |transport   |dependent                                                      |
+ROW   |6913     |30270 |type        |state                                                          |
+ROW   |6914     |30271 |resource    |server                                                         |
+ROW   |6915     |30271 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6916     |30271 |target      |haproxy                                                        |
+ROW   |6917     |30271 |transport   |dependent                                                      |
+ROW   |6918     |30271 |type        |rate                                                           |
+ROW   |6919     |30272 |resource    |server                                                         |
+ROW   |6920     |30272 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6921     |30272 |target      |haproxy                                                        |
+ROW   |6922     |30272 |transport   |dependent                                                      |
+ROW   |6923     |30272 |type        |rate                                                           |
+ROW   |6924     |35129 |backend     |{#PXNAME}                                                      |
+ROW   |6925     |35129 |resource    |backend                                                        |
+ROW   |6926     |35129 |target      |haproxy                                                        |
+ROW   |6927     |35129 |transport   |dependent                                                      |
+ROW   |6928     |35129 |type        |gauge                                                          |
+ROW   |6929     |35130 |backend     |{#PXNAME}                                                      |
+ROW   |6930     |35130 |resource    |backend                                                        |
+ROW   |6931     |35130 |target      |haproxy                                                        |
+ROW   |6932     |35130 |transport   |dependent                                                      |
+ROW   |6933     |35130 |type        |rate                                                           |
+ROW   |6934     |35131 |backend     |{#PXNAME}                                                      |
+ROW   |6935     |35131 |resource    |backend                                                        |
+ROW   |6936     |35131 |target      |haproxy                                                        |
+ROW   |6937     |35131 |transport   |dependent                                                      |
+ROW   |6938     |35131 |type        |gauge                                                          |
+ROW   |6939     |35132 |backend     |{#PXNAME}                                                      |
+ROW   |6940     |35132 |resource    |backend                                                        |
+ROW   |6941     |35132 |target      |haproxy                                                        |
+ROW   |6942     |35132 |transport   |dependent                                                      |
+ROW   |6943     |35132 |type        |rate                                                           |
+ROW   |6944     |35133 |backend     |{#PXNAME}                                                      |
+ROW   |6945     |35133 |resource    |backend                                                        |
+ROW   |6946     |35133 |target      |haproxy                                                        |
+ROW   |6947     |35133 |transport   |dependent                                                      |
+ROW   |6948     |35133 |type        |rate                                                           |
+ROW   |6949     |35134 |backend     |{#PXNAME}                                                      |
+ROW   |6950     |35134 |resource    |backend                                                        |
+ROW   |6951     |35134 |target      |haproxy                                                        |
+ROW   |6952     |35134 |transport   |dependent                                                      |
+ROW   |6953     |35134 |type        |gauge                                                          |
+ROW   |6954     |35135 |backend     |{#PXNAME}                                                      |
+ROW   |6955     |35135 |resource    |backend                                                        |
+ROW   |6956     |35135 |target      |haproxy                                                        |
+ROW   |6957     |35135 |transport   |dependent                                                      |
+ROW   |6958     |35135 |type        |rate                                                           |
+ROW   |6959     |35136 |backend     |{#PXNAME}                                                      |
+ROW   |6960     |35136 |resource    |backend                                                        |
+ROW   |6961     |35136 |target      |haproxy                                                        |
+ROW   |6962     |35136 |transport   |dependent                                                      |
+ROW   |6963     |35136 |type        |rate                                                           |
+ROW   |6964     |35137 |backend     |{#PXNAME}                                                      |
+ROW   |6965     |35137 |resource    |backend                                                        |
+ROW   |6966     |35137 |target      |haproxy                                                        |
+ROW   |6967     |35137 |transport   |dependent                                                      |
+ROW   |6968     |35137 |type        |rate                                                           |
+ROW   |6969     |35138 |backend     |{#PXNAME}                                                      |
+ROW   |6970     |35138 |resource    |backend                                                        |
+ROW   |6971     |35138 |target      |haproxy                                                        |
+ROW   |6972     |35138 |transport   |dependent                                                      |
+ROW   |6973     |35138 |type        |rate                                                           |
+ROW   |6974     |35139 |backend     |{#PXNAME}                                                      |
+ROW   |6975     |35139 |resource    |backend                                                        |
+ROW   |6976     |35139 |target      |haproxy                                                        |
+ROW   |6977     |35139 |transport   |dependent                                                      |
+ROW   |6978     |35139 |type        |rate                                                           |
+ROW   |6979     |35140 |frontend    |{#PXNAME}                                                      |
+ROW   |6980     |35140 |resource    |frontend                                                       |
+ROW   |6981     |35140 |target      |haproxy                                                        |
+ROW   |6982     |35140 |transport   |dependent                                                      |
+ROW   |6983     |35140 |type        |state                                                          |
+ROW   |6984     |35141 |resource    |server                                                         |
+ROW   |6985     |35141 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6986     |35141 |target      |haproxy                                                        |
+ROW   |6987     |35141 |transport   |dependent                                                      |
+ROW   |6988     |35141 |type        |gauge                                                          |
+ROW   |6989     |35142 |resource    |server                                                         |
+ROW   |6990     |35142 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6991     |35142 |target      |haproxy                                                        |
+ROW   |6992     |35142 |transport   |dependent                                                      |
+ROW   |6993     |35142 |type        |gauge                                                          |
+ROW   |6994     |35143 |resource    |server                                                         |
+ROW   |6995     |35143 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |6996     |35143 |target      |haproxy                                                        |
+ROW   |6997     |35143 |transport   |dependent                                                      |
+ROW   |6998     |35143 |type        |rate                                                           |
+ROW   |6999     |35144 |resource    |server                                                         |
+ROW   |7000     |35144 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |7001     |35144 |target      |haproxy                                                        |
+ROW   |7002     |35144 |transport   |dependent                                                      |
+ROW   |7003     |35144 |type        |gauge                                                          |
+ROW   |7004     |35145 |resource    |server                                                         |
+ROW   |7005     |35145 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |7006     |35145 |target      |haproxy                                                        |
+ROW   |7007     |35145 |transport   |dependent                                                      |
+ROW   |7008     |35145 |type        |rate                                                           |
+ROW   |7009     |35146 |resource    |server                                                         |
+ROW   |7010     |35146 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |7011     |35146 |target      |haproxy                                                        |
+ROW   |7012     |35146 |transport   |dependent                                                      |
+ROW   |7013     |35146 |type        |gauge                                                          |
+ROW   |7014     |35147 |resource    |server                                                         |
+ROW   |7015     |35147 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |7016     |35147 |target      |haproxy                                                        |
+ROW   |7017     |35147 |transport   |dependent                                                      |
+ROW   |7018     |35147 |type        |rate                                                           |
+ROW   |7019     |35148 |resource    |server                                                         |
+ROW   |7020     |35148 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |7021     |35148 |target      |haproxy                                                        |
+ROW   |7022     |35148 |transport   |dependent                                                      |
+ROW   |7023     |35148 |type        |rate                                                           |
+ROW   |7024     |35149 |resource    |server                                                         |
+ROW   |7025     |35149 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |7026     |35149 |target      |haproxy                                                        |
+ROW   |7027     |35149 |transport   |dependent                                                      |
+ROW   |7028     |35149 |type        |rate                                                           |
+ROW   |7029     |35150 |resource    |server                                                         |
+ROW   |7030     |35150 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |7031     |35150 |target      |haproxy                                                        |
+ROW   |7032     |35150 |transport   |dependent                                                      |
+ROW   |7033     |35150 |type        |state                                                          |
+ROW   |7034     |35151 |resource    |server                                                         |
+ROW   |7035     |35151 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |7036     |35151 |target      |haproxy                                                        |
+ROW   |7037     |35151 |transport   |dependent                                                      |
+ROW   |7038     |35151 |type        |rate                                                           |
+ROW   |7039     |35152 |resource    |server                                                         |
+ROW   |7040     |35152 |server      |{#PXNAME} {#SVNAME}                                            |
+ROW   |7041     |35152 |target      |haproxy                                                        |
+ROW   |7042     |35152 |transport   |dependent                                                      |
+ROW   |7043     |35152 |type        |rate                                                           |
+ROW   |7044     |35153 |Application |Zabbix raw items                                               |
+ROW   |7045     |35154 |Application |Zabbix raw items                                               |
+ROW   |7046     |35155 |Application |Zabbix raw items                                               |
+ROW   |7047     |35156 |Application |Zabbix raw items                                               |
+ROW   |7048     |35157 |Application |Zabbix raw items                                               |
+ROW   |7049     |35158 |Application |Zabbix raw items                                               |
+ROW   |7050     |35159 |Application |Zabbix raw items                                               |
+ROW   |7051     |35160 |Application |Zabbix raw items                                               |
+ROW   |7052     |35161 |Application |Zabbix raw items                                               |
+ROW   |7053     |35162 |Application |Zabbix raw items                                               |
+ROW   |7054     |35163 |Application |Nginx                                                          |
+ROW   |7055     |35164 |Application |Nginx                                                          |
+ROW   |7056     |35165 |Application |Nginx                                                          |
+ROW   |7057     |35166 |Application |Nginx                                                          |
+ROW   |7058     |35167 |Application |Nginx                                                          |
+ROW   |7059     |35168 |Application |Nginx                                                          |
+ROW   |7060     |35169 |Application |Nginx                                                          |
+ROW   |7061     |35170 |Application |Nginx                                                          |
+ROW   |7062     |35171 |Application |Nginx                                                          |
+ROW   |7063     |35172 |Application |Nginx                                                          |
+ROW   |7064     |35173 |Application |Nginx                                                          |
+ROW   |7065     |35174 |Application |Nginx                                                          |
+ROW   |7066     |35175 |Application |Nginx                                                          |
+ROW   |7067     |35176 |Application |Nginx                                                          |
+ROW   |7068     |35185 |Application |Nginx: HTTP location zone [{#NAME}]                            |
+ROW   |7069     |35186 |Application |Nginx: HTTP location zone [{#NAME}]                            |
+ROW   |7070     |35187 |Application |Nginx: HTTP location zone [{#NAME}]                            |
+ROW   |7071     |35188 |Application |Nginx: HTTP location zone [{#NAME}]                            |
+ROW   |7072     |35189 |Application |Nginx: HTTP location zone [{#NAME}]                            |
+ROW   |7073     |35190 |Application |Nginx: HTTP location zone [{#NAME}]                            |
+ROW   |7074     |35191 |Application |Nginx: HTTP location zone [{#NAME}]                            |
+ROW   |7075     |35192 |Application |Nginx: HTTP location zone [{#NAME}]                            |
+ROW   |7076     |35193 |Application |Nginx: HTTP location zone [{#NAME}]                            |
+ROW   |7077     |35194 |Application |Nginx: HTTP location zone [{#NAME}]                            |
+ROW   |7078     |35195 |Application |Nginx: HTTP zone [{#NAME}]                                     |
+ROW   |7079     |35196 |Application |Nginx: HTTP zone [{#NAME}]                                     |
+ROW   |7080     |35197 |Application |Nginx: HTTP zone [{#NAME}]                                     |
+ROW   |7081     |35198 |Application |Nginx: HTTP zone [{#NAME}]                                     |
+ROW   |7082     |35199 |Application |Nginx: HTTP zone [{#NAME}]                                     |
+ROW   |7083     |35200 |Application |Nginx: HTTP zone [{#NAME}]                                     |
+ROW   |7084     |35201 |Application |Nginx: HTTP zone [{#NAME}]                                     |
+ROW   |7085     |35202 |Application |Nginx: HTTP zone [{#NAME}]                                     |
+ROW   |7086     |35203 |Application |Nginx: HTTP zone [{#NAME}]                                     |
+ROW   |7087     |35204 |Application |Nginx: HTTP zone [{#NAME}]                                     |
+ROW   |7088     |35205 |Application |Nginx: HTTP zone [{#NAME}]                                     |
+ROW   |7089     |35206 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7090     |35207 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7091     |35208 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7092     |35209 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7093     |35210 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7094     |35211 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7095     |35212 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7096     |35213 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7097     |35214 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7098     |35215 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7099     |35216 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7100     |35217 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7101     |35218 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7102     |35219 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7103     |35220 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7104     |35221 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7105     |35222 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7106     |35223 |Application |Nginx: HTTP upstream [{#UPSTREAM}] peer [{#PEER}]              |
+ROW   |7107     |35224 |Application |Nginx: HTTP upstream [{#NAME}]                                 |
+ROW   |7108     |35225 |Application |Nginx: HTTP upstream [{#NAME}]                                 |
+ROW   |7109     |35226 |Application |Nginx: HTTP upstream [{#NAME}]                                 |
+ROW   |7110     |35227 |Application |Nginx: Resolver [{#NAME}]                                      |
+ROW   |7111     |35228 |Application |Nginx: Resolver [{#NAME}]                                      |
+ROW   |7112     |35229 |Application |Nginx: Resolver [{#NAME}]                                      |
+ROW   |7113     |35230 |Application |Nginx: Resolver [{#NAME}]                                      |
+ROW   |7114     |35231 |Application |Nginx: Resolver [{#NAME}]                                      |
+ROW   |7115     |35232 |Application |Nginx: Resolver [{#NAME}]                                      |
+ROW   |7116     |35233 |Application |Nginx: Resolver [{#NAME}]                                      |
+ROW   |7117     |35234 |Application |Nginx: Resolver [{#NAME}]                                      |
+ROW   |7118     |35235 |Application |Nginx: Resolver [{#NAME}]                                      |
+ROW   |7119     |35236 |Application |Nginx: Resolver [{#NAME}]                                      |
+ROW   |7120     |35237 |Application |Nginx: Resolver [{#NAME}]                                      |
+ROW   |7121     |35238 |Application |Nginx: Stream zone [{#NAME}]                                   |
+ROW   |7122     |35239 |Application |Nginx: Stream zone [{#NAME}]                                   |
+ROW   |7123     |35240 |Application |Nginx: Stream zone [{#NAME}]                                   |
+ROW   |7124     |35241 |Application |Nginx: Stream zone [{#NAME}]                                   |
+ROW   |7125     |35242 |Application |Nginx: Stream zone [{#NAME}]                                   |
+ROW   |7126     |35243 |Application |Nginx: Stream zone [{#NAME}]                                   |
+ROW   |7127     |35244 |Application |Nginx: Stream zone [{#NAME}]                                   |
+ROW   |7128     |35245 |Application |Nginx: Stream zone [{#NAME}]                                   |
+ROW   |7129     |35246 |Application |Nginx: Stream zone [{#NAME}]                                   |
+ROW   |7130     |35247 |Application |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
+ROW   |7131     |35248 |Application |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
+ROW   |7132     |35249 |Application |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
+ROW   |7133     |35250 |Application |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
+ROW   |7134     |35251 |Application |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
+ROW   |7135     |35252 |Application |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
+ROW   |7136     |35253 |Application |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
+ROW   |7137     |35254 |Application |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
+ROW   |7138     |35255 |Application |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
+ROW   |7139     |35256 |Application |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
+ROW   |7140     |35257 |Application |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
+ROW   |7141     |35258 |Application |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
+ROW   |7142     |35259 |Application |Nginx: Stream upstream [{#UPSTREAM}] peer [{#PEER}]            |
+ROW   |7143     |35260 |Application |Nginx: Stream upstream [{#NAME}]                               |
+ROW   |7144     |35261 |Application |Nginx: Stream upstream [{#NAME}]                               |
+ROW   |7145     |35264 |Application |Zabbix raw items                                               |
+ROW   |7146     |35265 |Application |Zabbix raw items                                               |
+ROW   |7147     |35266 |Application |Systemd service: {#UNIT.NAME}                                  |
+ROW   |7148     |35267 |Application |Systemd service: {#UNIT.NAME}                                  |
+ROW   |7149     |35268 |Application |Systemd service: {#UNIT.NAME}                                  |
+ROW   |7150     |35269 |Application |Systemd service: {#UNIT.NAME}                                  |
+ROW   |7151     |35270 |Application |Systemd socket: {#UNIT.NAME}                                   |
+ROW   |7152     |35271 |Application |Systemd socket: {#UNIT.NAME}                                   |
+ROW   |7153     |35272 |Application |Zabbix server                                                  |
+ROW   |7154     |35273 |Application |Zabbix server                                                  |
+ROW   |7155     |35274 |Application |Zabbix server                                                  |
+ROW   |7156     |35275 |Application |Zabbix server                                                  |
+ROW   |7157     |35276 |Application |Zabbix server                                                  |
+ROW   |7158     |35277 |Application |Zabbix server                                                  |
+ROW   |7159     |28539 |Application |Zabbix raw items                                               |
+ROW   |7160     |35278 |Application |Zabbix server                                                  |
+ROW   |7161     |35279 |Application |Zabbix server                                                  |
+ROW   |7162     |35290 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
+ROW   |7163     |35291 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
+ROW   |7164     |35292 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
+ROW   |7165     |35293 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
+ROW   |7166     |35294 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
+ROW   |7167     |35295 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
+ROW   |7168     |35296 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
+ROW   |7169     |35297 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
+ROW   |7170     |35298 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
+ROW   |7171     |35299 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
+ROW   |7172     |35300 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Data region [{#JMXNAME}]  |
+ROW   |7173     |35301 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7174     |35302 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7175     |35303 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7176     |35304 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7177     |35305 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7178     |35306 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7179     |35307 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7180     |35308 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7181     |35309 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7182     |35310 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7183     |35311 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7184     |35312 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7185     |35313 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7186     |35314 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7187     |35315 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7188     |35316 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7189     |35317 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7190     |35318 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7191     |35319 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7192     |35320 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7193     |35321 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7194     |35322 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7195     |35323 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7196     |35324 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7197     |35325 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7198     |35326 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7199     |35327 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7200     |35328 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7201     |35329 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7202     |35330 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7203     |35331 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7204     |35332 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7205     |35333 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7206     |35334 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7207     |35335 |Application |GridGain instance [{#JMXIGNITEINSTANCENAME}]                   |
+ROW   |7208     |35336 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
+ROW   |7209     |35337 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
+ROW   |7210     |35338 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
+ROW   |7211     |35339 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
+ROW   |7212     |35340 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
+ROW   |7213     |35341 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
+ROW   |7214     |35342 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
+ROW   |7215     |35343 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
+ROW   |7216     |35344 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXNAME}]  |
+ROW   |7217     |35345 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]  |
+ROW   |7218     |35346 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]  |
+ROW   |7219     |35347 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]  |
+ROW   |7220     |35348 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Thread pool [{#JMXNAME}]  |
+ROW   |7221     |35349 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
+ROW   |7222     |35350 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
+ROW   |7223     |35351 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
+ROW   |7224     |35352 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
+ROW   |7225     |35353 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
+ROW   |7226     |35354 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
+ROW   |7227     |35355 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
+ROW   |7228     |35356 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
+ROW   |7229     |35357 |Application |GridGain [{#JMXIGNITEINSTANCENAME}]: Cache group [{#JMXGROUP}] |
+ROW   |7230     |35358 |Application |Inventory                                                      |
+ROW   |7231     |35359 |Application |Inventory                                                      |
+ROW   |7232     |35360 |Application |Inventory                                                      |
+ROW   |7233     |35361 |Application |Inventory                                                      |
+ROW   |7234     |35362 |Application |Status                                                         |
+ROW   |7235     |35363 |Application |Status                                                         |
+ROW   |7236     |35369 |Application |CPU                                                            |
+ROW   |7237     |35370 |Application |Memory                                                         |
+ROW   |7238     |35371 |Application |Memory                                                         |
+ROW   |7239     |35372 |Application |Memory                                                         |
+ROW   |7240     |35373 |Application |{#CISCO.IF.NAME}                                               |
+ROW   |7241     |35374 |Application |{#CISCO.IF.NAME}                                               |
+ROW   |7242     |35375 |Application |{#CISCO.IF.NAME}                                               |
+ROW   |7243     |35376 |Application |{#CISCO.IF.NAME}                                               |
+ROW   |7244     |35377 |Application |{#CISCO.IF.NAME}                                               |
+ROW   |7245     |35378 |Application |{#CISCO.IF.NAME}                                               |
+ROW   |7246     |35379 |Application |{#CISCO.IF.NAME}                                               |
+ROW   |7247     |35380 |Application |{#CISCO.IF.NAME}                                               |
+ROW   |7248     |35381 |Application |{#CISCO.IF.NAME}                                               |
+ROW   |7249     |35382 |Application |{#CISCO.IF.NAME}                                               |
+ROW   |7250     |35383 |Application |{#CISCO.IF.NAME}                                               |
+ROW   |7251     |35384 |Application |{#CISCO.IF.NAME}                                               |
+ROW   |7252     |35385 |Application |{#CISCO.IF.NAME}                                               |
+ROW   |7253     |35386 |Application |{#CISCO.IF.NAME}                                               |
+ROW   |7254     |35387 |Application |{#CISCO.IF.NAME}                                               |
+ROW   |7255     |35388 |Application |{#CISCO.ASAV.PHYS.NAME}                                        |
+ROW   |7256     |35389 |Application |{#CISCO.ASAV.PHYS.NAME}                                        |
+ROW   |7257     |35390 |Application |{#CISCO.ASAV.PHYS.NAME}                                        |
+ROW   |7258     |35391 |Application |{#CISCO.ASAV.PHYS.NAME}                                        |
+ROW   |7259     |35392 |Application |{#CISCO.ASAV.PHYS.NAME}                                        |
+ROW   |7260     |35393 |Application |{#CISCO.ASAV.PHYS.NAME}                                        |
+ROW   |7261     |35394 |Application |{#CISCO.ASAV.PHYS.NAME}                                        |
+ROW   |7262     |35395 |Application |{#CISCO.ASAV.PHYS.NAME}                                        |
+ROW   |7263     |35396 |Application |{#CISCO.CRAS.USER}                                             |
+ROW   |7264     |35397 |Application |{#CISCO.CRAS.USER}                                             |
+ROW   |7265     |35398 |Application |{#CISCO.CRAS.USER}                                             |
+ROW   |7266     |35399 |Application |{#CISCO.CRAS.USER}                                             |
+ROW   |7267     |35400 |Application |{#CISCO.CRAS.USER}                                             |
+ROW   |7268     |35401 |Application |{#CISCO.CRAS.USER}                                             |
+ROW   |7269     |35402 |Application |{#CISCO.CRAS.USER}                                             |
+ROW   |7270     |35403 |Application |{#CISCO.CRAS.USER}                                             |
+ROW   |7271     |35404 |Application |{#CISCO.CRAS.USER}                                             |
+ROW   |7272     |35405 |Application |{#CISCO.CRAS.USER}                                             |
+ROW   |7273     |35406 |Application |Inventory                                                      |
+ROW   |7274     |35407 |Application |TCP/UDP stat                                                   |
+ROW   |7275     |35408 |Application |Status                                                         |
+ROW   |7276     |35409 |Application |TCP/UDP stat                                                   |
+ROW   |7277     |35410 |Application |TCP/UDP stat                                                   |
+ROW   |7278     |35411 |Application |TCP/UDP stat                                                   |
+ROW   |7279     |35412 |Application |TCP/UDP stat                                                   |
+ROW   |7280     |35413 |Application |TCP/UDP stat                                                   |
+ROW   |7281     |35414 |Application |Inventory                                                      |
+ROW   |7282     |35415 |Application |Inventory                                                      |
+ROW   |7283     |35416 |Application |Inventory                                                      |
+ROW   |7284     |35417 |Application |Inventory                                                      |
+ROW   |7285     |35418 |Application |Inventory                                                      |
+ROW   |7286     |35419 |Application |Inventory                                                      |
+ROW   |7287     |35420 |Application |Inventory                                                      |
+ROW   |7288     |35421 |Application |Inventory                                                      |
+ROW   |7289     |35422 |Application |Inventory                                                      |
+ROW   |7290     |35423 |Application |Status                                                         |
+ROW   |7291     |35439 |Application |Temperature                                                    |
+ROW   |7292     |35440 |Application |Voltage                                                        |
+ROW   |7293     |35441 |Application |Voltage                                                        |
+ROW   |7294     |35442 |Application |Security                                                       |
+ROW   |7295     |35443 |Application |Fans                                                           |
+ROW   |7296     |35444 |Application |Fans                                                           |
+ROW   |7297     |35445 |Application |Power supply                                                   |
+ROW   |7298     |35446 |Application |Temperature                                                    |
+ROW   |7299     |35447 |Application |CPU                                                            |
+ROW   |7300     |35448 |Application |CPU                                                            |
+ROW   |7301     |35449 |Application |CPU                                                            |
+ROW   |7302     |35450 |Application |CPU                                                            |
+ROW   |7303     |35451 |Application |CPU                                                            |
+ROW   |7304     |35452 |Application |CPU                                                            |
+ROW   |7305     |35453 |Application |CPU                                                            |
+ROW   |7306     |35454 |Application |CPU                                                            |
+ROW   |7307     |35455 |Application |CPU                                                            |
+ROW   |7308     |35456 |Application |CPU                                                            |
+ROW   |7309     |35457 |Application |CPU                                                            |
+ROW   |7310     |35458 |Application |CPU                                                            |
+ROW   |7311     |35459 |Application |CPU                                                            |
+ROW   |7312     |35460 |Application |CPU                                                            |
+ROW   |7313     |35461 |Application |CPU                                                            |
+ROW   |7314     |35462 |Application |CPU                                                            |
+ROW   |7315     |35463 |Application |CPU                                                            |
+ROW   |7316     |35464 |Application |CPU                                                            |
+ROW   |7317     |35465 |Application |CPU                                                            |
+ROW   |7318     |35466 |Application |CPU                                                            |
+ROW   |7319     |35467 |Application |CPU                                                            |
+ROW   |7320     |35468 |Application |CPU                                                            |
+ROW   |7321     |35469 |Application |CPU                                                            |
+ROW   |7322     |35470 |Application |CPU                                                            |
+ROW   |7323     |35471 |Application |CPU                                                            |
+ROW   |7324     |35472 |Application |CPU                                                            |
+ROW   |7325     |35473 |Application |CPU                                                            |
+ROW   |7326     |35474 |Application |CPU                                                            |
+ROW   |7327     |35475 |Application |CPU                                                            |
+ROW   |7328     |35476 |Application |CPU                                                            |
+ROW   |7329     |35477 |Application |Mount point [{#PART.NAME}]                                     |
+ROW   |7330     |35478 |Application |Mount point [{#PART.NAME}]                                     |
+ROW   |7331     |35479 |Application |Mount point [{#PART.NAME}]                                     |
+ROW   |7332     |35480 |Application |Mount point [{#PART.NAME}]                                     |
+ROW   |7333     |35481 |Application |Mount point [{#PART.NAME}]                                     |
+ROW   |7334     |35482 |Application |Memory                                                         |
+ROW   |7335     |35483 |Application |Memory                                                         |
+ROW   |7336     |35484 |Application |Memory                                                         |
+ROW   |7337     |35485 |Application |Memory                                                         |
+ROW   |7338     |35486 |Application |Memory                                                         |
+ROW   |7339     |35487 |Application |Memory                                                         |
+ROW   |7340     |35488 |Application |Modules                                                        |
+ROW   |7341     |35489 |Application |Modules                                                        |
+ROW   |7342     |35490 |Application |Modules                                                        |
+ROW   |7343     |35491 |Application |Modules                                                        |
+ROW   |7344     |35492 |Application |Interface [{#IF.NAME}]                                         |
+ROW   |7345     |35493 |Application |Interface [{#IF.NAME}]                                         |
+ROW   |7346     |35494 |Application |Interface [{#IF.NAME}]                                         |
+ROW   |7347     |35495 |Application |Interface [{#IF.NAME}]                                         |
+ROW   |7348     |35496 |Application |Interface [{#IF.NAME}]                                         |
+ROW   |7349     |35497 |Application |Interface [{#IF.NAME}]                                         |
+ROW   |7350     |35498 |Application |Interface [{#IF.NAME}]                                         |
+ROW   |7351     |35499 |Application |Interface [{#IF.NAME}]                                         |
+ROW   |7352     |35500 |Application |Interface [{#IF.NAME}]                                         |
+ROW   |7353     |35501 |Application |Interface [{#IF.NAME}]                                         |
+ROW   |7354     |35502 |Application |Interface [{#IF.NAME}]                                         |
+ROW   |7355     |35503 |Application |Interface [{#IF.NAME}]                                         |
+ROW   |7356     |35504 |Application |Interface [{#IF.NAME}]                                         |
+ROW   |7357     |35505 |Application |Interface [{#IF.NAME}]                                         |
+ROW   |7358     |35506 |Application |Node [{#NODE.NAME}]                                            |
+ROW   |7359     |35507 |Application |Node [{#NODE.NAME}]                                            |
+ROW   |7360     |35508 |Application |Node [{#NODE.NAME}]                                            |
+ROW   |7361     |35509 |Application |Node [{#NODE.NAME}]                                            |
+ROW   |7362     |35510 |Application |Node [{#NODE.NAME}]                                            |
+ROW   |7363     |35511 |Application |Node [{#NODE.NAME}]                                            |
+ROW   |7364     |35512 |Application |Node [{#NODE.NAME}]                                            |
+ROW   |7365     |35513 |Application |Node [{#NODE.NAME}]                                            |
+ROW   |7366     |35514 |Application |Pool [{#POOL.NAME}]                                            |
+ROW   |7367     |35515 |Application |Pool [{#POOL.NAME}]                                            |
+ROW   |7368     |35516 |Application |Pool [{#POOL.NAME}]                                            |
+ROW   |7369     |35517 |Application |Pool [{#POOL.NAME}]                                            |
+ROW   |7370     |35518 |Application |Pool [{#POOL.NAME}]                                            |
+ROW   |7371     |35519 |Application |Pool [{#POOL.NAME}]                                            |
+ROW   |7372     |35520 |Application |Pool [{#POOL.NAME}]                                            |
+ROW   |7373     |35521 |Application |Pool [{#POOL.NAME}]                                            |
+ROW   |7374     |35522 |Application |Virtual server [{#VSERVER.NAME}]                               |
+ROW   |7375     |35523 |Application |Virtual server [{#VSERVER.NAME}]                               |
+ROW   |7376     |35524 |Application |Virtual server [{#VSERVER.NAME}]                               |
+ROW   |7377     |35525 |Application |Virtual server [{#VSERVER.NAME}]                               |
+ROW   |7378     |35526 |Application |Virtual server [{#VSERVER.NAME}]                               |
+ROW   |7379     |35527 |Application |Virtual server [{#VSERVER.NAME}]                               |
+ROW   |7380     |35528 |Application |Virtual server [{#VSERVER.NAME}]                               |
+ROW   |7381     |35529 |Application |Virtual server [{#VSERVER.NAME}]                               |
+ROW   |7382     |35530 |Application |Virtual server [{#VSERVER.NAME}]                               |
+ROW   |7383     |35531 |Application |Virtual server [{#VSERVER.NAME}]                               |
+ROW   |7384     |35532 |Application |Status                                                         |
+ROW   |7385     |35533 |Application |Inventory                                                      |
+ROW   |7386     |35534 |Application |Inventory                                                      |
+ROW   |7387     |35535 |Application |Inventory                                                      |
+ROW   |7388     |35536 |Application |Inventory                                                      |
+ROW   |7389     |35537 |Application |Inventory                                                      |
+ROW   |7390     |35538 |Application |Inventory                                                      |
+ROW   |7391     |35539 |Application |Inventory                                                      |
+ROW   |7392     |35540 |Application |Status                                                         |
+ROW   |7393     |35541 |Application |Status                                                         |
+ROW   |7394     |35546 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7395     |35547 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7396     |35548 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7397     |35549 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7398     |35550 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7399     |35551 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7400     |35552 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7401     |35553 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7402     |35554 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7403     |35555 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7404     |35556 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7405     |35557 |Application |Port {#ZYXEL.IF.NAME}                                          |
+ROW   |7406     |35558 |Application |Port {#ZYXEL.IF.NAME}                                          |
+ROW   |7407     |35559 |Application |Port {#ZYXEL.IF.NAME}                                          |
+ROW   |7408     |35560 |Application |Port {#ZYXEL.IF.NAME}                                          |
+ROW   |7409     |35561 |Application |Port {#ZYXEL.IF.NAME}                                          |
+ROW   |7410     |35562 |Application |Temperature                                                    |
+ROW   |7411     |35563 |Application |Power supply                                                   |
+ROW   |7412     |35564 |Application |Status                                                         |
+ROW   |7413     |35565 |Application |Inventory                                                      |
+ROW   |7414     |35566 |Application |CPU                                                            |
+ROW   |7415     |35567 |Application |Inventory                                                      |
+ROW   |7416     |35568 |Application |Inventory                                                      |
+ROW   |7417     |35569 |Application |Inventory                                                      |
+ROW   |7418     |35570 |Application |Inventory                                                      |
+ROW   |7419     |35571 |Application |Inventory                                                      |
+ROW   |7420     |35572 |Application |Inventory                                                      |
+ROW   |7421     |35573 |Application |Status                                                         |
+ROW   |7422     |35580 |Application |Memory                                                         |
+ROW   |7423     |35581 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7424     |35582 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7425     |35583 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7426     |35584 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7427     |35585 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7428     |35586 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7429     |35587 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7430     |35588 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7431     |35589 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7432     |35590 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7433     |35591 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7434     |35592 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7435     |35593 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7436     |35594 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7437     |35595 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7438     |35596 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7439     |35597 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7440     |35598 |Application |Port {#ZYXEL.SFP.PORT}                                         |
+ROW   |7441     |35599 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7442     |35600 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7443     |35601 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7444     |35602 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7445     |35603 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7446     |35604 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7447     |35605 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7448     |35606 |Application |Temperature                                                    |
+ROW   |7449     |35607 |Application |Power supply                                                   |
+ROW   |7450     |35608 |Application |Status                                                         |
+ROW   |7451     |35609 |Application |Inventory                                                      |
+ROW   |7452     |35610 |Application |CPU                                                            |
+ROW   |7453     |35611 |Application |Inventory                                                      |
+ROW   |7454     |35612 |Application |Inventory                                                      |
+ROW   |7455     |35613 |Application |Inventory                                                      |
+ROW   |7456     |35614 |Application |Inventory                                                      |
+ROW   |7457     |35615 |Application |Inventory                                                      |
+ROW   |7458     |35616 |Application |Inventory                                                      |
+ROW   |7459     |35617 |Application |Status                                                         |
+ROW   |7460     |35622 |Application |Fans                                                           |
+ROW   |7461     |35623 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7462     |35624 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7463     |35625 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7464     |35626 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7465     |35627 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7466     |35628 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7467     |35629 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7468     |35630 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7469     |35631 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7470     |35632 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7471     |35633 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7472     |35634 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7473     |35635 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7474     |35636 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7475     |35637 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7476     |35638 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7477     |35639 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7478     |35640 |Application |Temperature                                                    |
+ROW   |7479     |35641 |Application |Power supply                                                   |
+ROW   |7480     |35642 |Application |Status                                                         |
+ROW   |7481     |35643 |Application |Inventory                                                      |
+ROW   |7482     |35644 |Application |Inventory                                                      |
+ROW   |7483     |35645 |Application |Inventory                                                      |
+ROW   |7484     |35646 |Application |Inventory                                                      |
+ROW   |7485     |35647 |Application |Inventory                                                      |
+ROW   |7486     |35648 |Application |Status                                                         |
+ROW   |7487     |35658 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7488     |35659 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7489     |35660 |Application |Fans                                                           |
+ROW   |7490     |35661 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7491     |35662 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7492     |35663 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7493     |35664 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7494     |35665 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7495     |35666 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7496     |35667 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7497     |35668 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7498     |35669 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7499     |35670 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7500     |35671 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7501     |35672 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7502     |35673 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7503     |35674 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7504     |35675 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7505     |35676 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7506     |35677 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7507     |35678 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7508     |35679 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7509     |35680 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7510     |35681 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7511     |35682 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7512     |35683 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7513     |35684 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7514     |35685 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7515     |35686 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7516     |35687 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7517     |35688 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7518     |35689 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7519     |35690 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7520     |35691 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7521     |35692 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7522     |35693 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7523     |35694 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7524     |35695 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7525     |35696 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7526     |35697 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7527     |35698 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7528     |35699 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7529     |35700 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7530     |35701 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7531     |35702 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7532     |35703 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7533     |35704 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7534     |35705 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7535     |35706 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7536     |35707 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7537     |35708 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7538     |35709 |Application |Status                                                         |
+ROW   |7539     |35710 |Application |Inventory                                                      |
+ROW   |7540     |35711 |Application |Inventory                                                      |
+ROW   |7541     |35712 |Application |Inventory                                                      |
+ROW   |7542     |35713 |Application |Inventory                                                      |
+ROW   |7543     |35714 |Application |Inventory                                                      |
+ROW   |7544     |35715 |Application |Status                                                         |
+ROW   |7545     |35725 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7546     |35726 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7547     |35727 |Application |Fans                                                           |
+ROW   |7548     |35728 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7549     |35729 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7550     |35730 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7551     |35731 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7552     |35732 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7553     |35733 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7554     |35734 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7555     |35735 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7556     |35736 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7557     |35737 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7558     |35738 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7559     |35739 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7560     |35740 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7561     |35741 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7562     |35742 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7563     |35743 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7564     |35744 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7565     |35745 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7566     |35746 |Application |Slot {#ZYXEL.SLOT.ID} Port {#ZYXEL.PORTID}                     |
+ROW   |7567     |35747 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7568     |35748 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7569     |35749 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7570     |35750 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7571     |35751 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7572     |35752 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7573     |35753 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7574     |35754 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7575     |35755 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7576     |35756 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7577     |35757 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7578     |35758 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7579     |35759 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7580     |35760 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7581     |35761 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7582     |35762 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7583     |35763 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7584     |35764 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7585     |35765 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7586     |35766 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7587     |35767 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7588     |35768 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7589     |35769 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7590     |35770 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7591     |35771 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7592     |35772 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7593     |35773 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7594     |35774 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7595     |35775 |Application |Slot {#ZYXEL.SLOT.ID}                                          |
+ROW   |7596     |35776 |Application |Status                                                         |
+ROW   |7597     |35777 |Application |Inventory                                                      |
+ROW   |7598     |35778 |Application |Inventory                                                      |
+ROW   |7599     |35779 |Application |Inventory                                                      |
+ROW   |7600     |35780 |Application |Inventory                                                      |
+ROW   |7601     |35781 |Application |Inventory                                                      |
+ROW   |7602     |35782 |Application |Inventory                                                      |
+ROW   |7603     |35783 |Application |Inventory                                                      |
+ROW   |7604     |35784 |Application |Status                                                         |
+ROW   |7605     |35785 |Application |Status                                                         |
+ROW   |7606     |35791 |Application |Fans                                                           |
+ROW   |7607     |35792 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7608     |35793 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7609     |35794 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7610     |35795 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7611     |35796 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7612     |35797 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7613     |35798 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7614     |35799 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7615     |35800 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7616     |35801 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7617     |35802 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7618     |35803 |Application |Port {#ZYXEL.IF.NAME}                                          |
+ROW   |7619     |35804 |Application |Port {#ZYXEL.IF.NAME}                                          |
+ROW   |7620     |35805 |Application |Port {#ZYXEL.IF.NAME}                                          |
+ROW   |7621     |35806 |Application |Port {#ZYXEL.IF.NAME}                                          |
+ROW   |7622     |35807 |Application |Port {#ZYXEL.IF.NAME}                                          |
+ROW   |7623     |35808 |Application |Temperature                                                    |
+ROW   |7624     |35809 |Application |Power supply                                                   |
+ROW   |7625     |35810 |Application |Status                                                         |
+ROW   |7626     |35811 |Application |Inventory                                                      |
+ROW   |7627     |35812 |Application |CPU                                                            |
+ROW   |7628     |35813 |Application |Inventory                                                      |
+ROW   |7629     |35814 |Application |Inventory                                                      |
+ROW   |7630     |35815 |Application |Inventory                                                      |
+ROW   |7631     |35816 |Application |Inventory                                                      |
+ROW   |7632     |35817 |Application |Inventory                                                      |
+ROW   |7633     |35818 |Application |Inventory                                                      |
+ROW   |7634     |35819 |Application |Status                                                         |
+ROW   |7635     |35823 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7636     |35824 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7637     |35825 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7638     |35826 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7639     |35827 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7640     |35828 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7641     |35829 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7642     |35830 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7643     |35831 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7644     |35832 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7645     |35833 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7646     |35834 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7647     |35835 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7648     |35836 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7649     |35837 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7650     |35838 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7651     |35839 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7652     |35840 |Application |Port {#ZYXEL.SFP.PORT}                                         |
+ROW   |7653     |35841 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7654     |35842 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7655     |35843 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7656     |35844 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7657     |35845 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7658     |35846 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7659     |35847 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7660     |35848 |Application |Status                                                         |
+ROW   |7661     |35849 |Application |Inventory                                                      |
+ROW   |7662     |35850 |Application |CPU                                                            |
+ROW   |7663     |35851 |Application |Inventory                                                      |
+ROW   |7664     |35852 |Application |Inventory                                                      |
+ROW   |7665     |35853 |Application |Inventory                                                      |
+ROW   |7666     |35854 |Application |Inventory                                                      |
+ROW   |7667     |35855 |Application |Inventory                                                      |
+ROW   |7668     |35856 |Application |Inventory                                                      |
+ROW   |7669     |35857 |Application |Status                                                         |
+ROW   |7670     |35864 |Application |Memory                                                         |
+ROW   |7671     |35865 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7672     |35866 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7673     |35867 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7674     |35868 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7675     |35869 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7676     |35870 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7677     |35871 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7678     |35872 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7679     |35873 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7680     |35874 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7681     |35875 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7682     |35876 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7683     |35877 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7684     |35878 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7685     |35879 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7686     |35880 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7687     |35881 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7688     |35882 |Application |Port {#ZYXEL.SFP.PORT}                                         |
+ROW   |7689     |35883 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7690     |35884 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7691     |35885 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7692     |35886 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7693     |35887 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7694     |35888 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7695     |35889 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7696     |35890 |Application |Temperature                                                    |
+ROW   |7697     |35891 |Application |Power supply                                                   |
+ROW   |7698     |35892 |Application |Status                                                         |
+ROW   |7699     |35893 |Application |Inventory                                                      |
+ROW   |7700     |35894 |Application |CPU                                                            |
+ROW   |7701     |35895 |Application |Inventory                                                      |
+ROW   |7702     |35896 |Application |Inventory                                                      |
+ROW   |7703     |35897 |Application |Inventory                                                      |
+ROW   |7704     |35898 |Application |Inventory                                                      |
+ROW   |7705     |35899 |Application |Inventory                                                      |
+ROW   |7706     |35900 |Application |Inventory                                                      |
+ROW   |7707     |35901 |Application |Status                                                         |
+ROW   |7708     |35908 |Application |Memory                                                         |
+ROW   |7709     |35909 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7710     |35910 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7711     |35911 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7712     |35912 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7713     |35913 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7714     |35914 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7715     |35915 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7716     |35916 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7717     |35917 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7718     |35918 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7719     |35919 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7720     |35920 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7721     |35921 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7722     |35922 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7723     |35923 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7724     |35924 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7725     |35925 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7726     |35926 |Application |Port {#ZYXEL.SFP.PORT}                                         |
+ROW   |7727     |35927 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7728     |35928 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7729     |35929 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7730     |35930 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7731     |35931 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7732     |35932 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7733     |35933 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7734     |35934 |Application |Temperature                                                    |
+ROW   |7735     |35935 |Application |Power supply                                                   |
+ROW   |7736     |35936 |Application |Status                                                         |
+ROW   |7737     |35937 |Application |Inventory                                                      |
+ROW   |7738     |35938 |Application |CPU                                                            |
+ROW   |7739     |35939 |Application |Inventory                                                      |
+ROW   |7740     |35940 |Application |Inventory                                                      |
+ROW   |7741     |35941 |Application |Inventory                                                      |
+ROW   |7742     |35942 |Application |Inventory                                                      |
+ROW   |7743     |35943 |Application |Inventory                                                      |
+ROW   |7744     |35944 |Application |Inventory                                                      |
+ROW   |7745     |35945 |Application |Status                                                         |
+ROW   |7746     |35952 |Application |Fans                                                           |
+ROW   |7747     |35953 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7748     |35954 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7749     |35955 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7750     |35956 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7751     |35957 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7752     |35958 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7753     |35959 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7754     |35960 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7755     |35961 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7756     |35962 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7757     |35963 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7758     |35964 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7759     |35965 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7760     |35966 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7761     |35967 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7762     |35968 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7763     |35969 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7764     |35970 |Application |Port {#ZYXEL.SFP.PORT}                                         |
+ROW   |7765     |35971 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7766     |35972 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7767     |35973 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7768     |35974 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7769     |35975 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7770     |35976 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7771     |35977 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7772     |35978 |Application |Temperature                                                    |
+ROW   |7773     |35979 |Application |Power supply                                                   |
+ROW   |7774     |35980 |Application |Status                                                         |
+ROW   |7775     |35981 |Application |Inventory                                                      |
+ROW   |7776     |35982 |Application |CPU                                                            |
+ROW   |7777     |35983 |Application |Inventory                                                      |
+ROW   |7778     |35984 |Application |Inventory                                                      |
+ROW   |7779     |35985 |Application |Inventory                                                      |
+ROW   |7780     |35986 |Application |Inventory                                                      |
+ROW   |7781     |35987 |Application |Inventory                                                      |
+ROW   |7782     |35988 |Application |Inventory                                                      |
+ROW   |7783     |35989 |Application |Status                                                         |
+ROW   |7784     |35996 |Application |Fans                                                           |
+ROW   |7785     |35997 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7786     |35998 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7787     |35999 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7788     |36000 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7789     |36001 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7790     |36002 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7791     |36003 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7792     |36004 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7793     |36005 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7794     |36006 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7795     |36007 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7796     |36008 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7797     |36009 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7798     |36010 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7799     |36011 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7800     |36012 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7801     |36013 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7802     |36014 |Application |Port {#ZYXEL.SFP.PORT}                                         |
+ROW   |7803     |36015 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7804     |36016 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7805     |36017 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7806     |36018 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7807     |36019 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7808     |36020 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7809     |36021 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7810     |36022 |Application |Temperature                                                    |
+ROW   |7811     |36023 |Application |Power supply                                                   |
+ROW   |7812     |36024 |Application |Status                                                         |
+ROW   |7813     |36025 |Application |Inventory                                                      |
+ROW   |7814     |36026 |Application |CPU                                                            |
+ROW   |7815     |36027 |Application |Inventory                                                      |
+ROW   |7816     |36028 |Application |Inventory                                                      |
+ROW   |7817     |36029 |Application |Inventory                                                      |
+ROW   |7818     |36030 |Application |Memory                                                         |
+ROW   |7819     |36031 |Application |Inventory                                                      |
+ROW   |7820     |36032 |Application |Inventory                                                      |
+ROW   |7821     |36033 |Application |Inventory                                                      |
+ROW   |7822     |36034 |Application |Status                                                         |
+ROW   |7823     |36041 |Application |Fans                                                           |
+ROW   |7824     |36042 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7825     |36043 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7826     |36044 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7827     |36045 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7828     |36046 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7829     |36047 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7830     |36048 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7831     |36049 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7832     |36050 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7833     |36051 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7834     |36052 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7835     |36053 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7836     |36054 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7837     |36055 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7838     |36056 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7839     |36057 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7840     |36058 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7841     |36059 |Application |Port {#ZYXEL.SFP.PORT}                                         |
+ROW   |7842     |36060 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7843     |36061 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7844     |36062 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7845     |36063 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7846     |36064 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7847     |36065 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7848     |36066 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7849     |36067 |Application |Temperature                                                    |
+ROW   |7850     |36068 |Application |Power supply                                                   |
+ROW   |7851     |36069 |Application |Status                                                         |
+ROW   |7852     |36070 |Application |Inventory                                                      |
+ROW   |7853     |36071 |Application |CPU                                                            |
+ROW   |7854     |36072 |Application |Inventory                                                      |
+ROW   |7855     |36073 |Application |Inventory                                                      |
+ROW   |7856     |36074 |Application |Inventory                                                      |
+ROW   |7857     |36075 |Application |Memory                                                         |
+ROW   |7858     |36076 |Application |Inventory                                                      |
+ROW   |7859     |36077 |Application |Inventory                                                      |
+ROW   |7860     |36078 |Application |Inventory                                                      |
+ROW   |7861     |36079 |Application |Status                                                         |
+ROW   |7862     |36086 |Application |Fans                                                           |
+ROW   |7863     |36087 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7864     |36088 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7865     |36089 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7866     |36090 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7867     |36091 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7868     |36092 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7869     |36093 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7870     |36094 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7871     |36095 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7872     |36096 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7873     |36097 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7874     |36098 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7875     |36099 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7876     |36100 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7877     |36101 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7878     |36102 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7879     |36103 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7880     |36104 |Application |Port {#ZYXEL.SFP.PORT}                                         |
+ROW   |7881     |36105 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7882     |36106 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7883     |36107 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7884     |36108 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7885     |36109 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7886     |36110 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7887     |36111 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7888     |36112 |Application |Temperature                                                    |
+ROW   |7889     |36113 |Application |Power supply                                                   |
+ROW   |7890     |36114 |Application |Status                                                         |
+ROW   |7891     |36115 |Application |Inventory                                                      |
+ROW   |7892     |36116 |Application |CPU                                                            |
+ROW   |7893     |36117 |Application |Inventory                                                      |
+ROW   |7894     |36118 |Application |Inventory                                                      |
+ROW   |7895     |36119 |Application |Inventory                                                      |
+ROW   |7896     |36120 |Application |Inventory                                                      |
+ROW   |7897     |36121 |Application |Inventory                                                      |
+ROW   |7898     |36122 |Application |Inventory                                                      |
+ROW   |7899     |36123 |Application |Status                                                         |
+ROW   |7900     |36131 |Application |Fans                                                           |
+ROW   |7901     |36132 |Application |Memory                                                         |
+ROW   |7902     |36133 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7903     |36134 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7904     |36135 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7905     |36136 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7906     |36137 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7907     |36138 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7908     |36139 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7909     |36140 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7910     |36141 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7911     |36142 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7912     |36143 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7913     |36144 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7914     |36145 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7915     |36146 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7916     |36147 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7917     |36148 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7918     |36149 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7919     |36150 |Application |Port {#ZYXEL.SFP.PORT}                                         |
+ROW   |7920     |36151 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7921     |36152 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7922     |36153 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7923     |36154 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7924     |36155 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7925     |36156 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7926     |36157 |Application |Port {#SNMPINDEX}                                              |
+ROW   |7927     |36158 |Application |Temperature                                                    |
+ROW   |7928     |36159 |Application |Power supply                                                   |
+ROW   |7929     |36160 |Application |General                                                        |
+ROW   |7930     |36161 |Application |General                                                        |
+ROW   |7931     |36162 |Application |General                                                        |
+ROW   |7932     |36163 |Application |General                                                        |
+ROW   |7933     |36164 |Application |General                                                        |
+ROW   |7934     |36165 |Application |Status                                                         |
+ROW   |7935     |36166 |Application |General                                                        |
+ROW   |7936     |36167 |Application |Status                                                         |
+ROW   |7937     |36178 |Application |Disk arrays                                                    |
+ROW   |7938     |36179 |Application |Disk arrays                                                    |
+ROW   |7939     |36180 |Application |Disk arrays                                                    |
+ROW   |7940     |36181 |Application |Fans                                                           |
+ROW   |7941     |36182 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |7942     |36183 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |7943     |36184 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |7944     |36185 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |7945     |36186 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |7946     |36187 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |7947     |36188 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |7948     |36189 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |7949     |36190 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |7950     |36191 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |7951     |36192 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |7952     |36193 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |7953     |36194 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |7954     |36195 |Application |Interface {#IFNAME}({#IFALIAS})                                |
+ROW   |7955     |36196 |Application |Physical disks                                                 |
+ROW   |7956     |36197 |Application |Physical disks                                                 |
+ROW   |7957     |36198 |Application |Physical disks                                                 |
+ROW   |7958     |36199 |Application |Physical disks                                                 |
+ROW   |7959     |36200 |Application |Physical disks                                                 |
+ROW   |7960     |36201 |Application |Power supply                                                   |
+ROW   |7961     |36202 |Application |Temperature                                                    |
+ROW   |7962     |36203 |Application |Temperature                                                    |
+ROW   |7963     |36204 |Application |Temperature                                                    |
+ROW   |7964     |36205 |Application |Temperature                                                    |
+ROW   |7965     |36206 |Application |Temperature                                                    |
+ROW   |7966     |36207 |Application |Inventory                                                      |
+ROW   |7967     |36208 |Application |Inventory                                                      |
+ROW   |7968     |36209 |Application |Status                                                         |
+ROW   |7969     |36210 |Application |Virtual disks                                                  |
+ROW   |7970     |36211 |Application |Virtual disks                                                  |
+ROW   |7971     |36212 |Application |Virtual disks                                                  |
+ROW   |7972     |36213 |Application |Zabbix raw items                                               |
+ROW   |7973     |36214 |Application |Status                                                         |
+ROW   |7974     |36215 |Application |Inventory                                                      |
+ROW   |7975     |36216 |Application |Inventory                                                      |
+ROW   |7976     |36217 |Application |Inventory                                                      |
+ROW   |7977     |36218 |Application |Status                                                         |
+ROW   |7978     |36227 |Application |Zabbix raw items                                               |
+ROW   |7979     |36228 |Application |Zabbix raw items                                               |
+ROW   |7980     |36229 |Application |Zabbix raw items                                               |
+ROW   |7981     |36230 |Application |Zabbix raw items                                               |
+ROW   |7982     |36231 |Application |Zabbix raw items                                               |
+ROW   |7983     |36232 |Application |Zabbix raw items                                               |
+ROW   |7984     |36233 |Application |Zabbix raw items                                               |
+ROW   |7985     |36234 |Application |Zabbix raw items                                               |
+ROW   |7986     |36235 |Application |Fans                                                           |
+ROW   |7987     |36236 |Application |Fans                                                           |
+ROW   |7988     |36237 |Application |Network interfaces                                             |
+ROW   |7989     |36238 |Application |Network interfaces                                             |
+ROW   |7990     |36239 |Application |Network interfaces                                             |
+ROW   |7991     |36240 |Application |Network interfaces                                             |
+ROW   |7992     |36241 |Application |Physical disks                                                 |
+ROW   |7993     |36242 |Application |Physical disks                                                 |
+ROW   |7994     |36243 |Application |Physical disks                                                 |
+ROW   |7995     |36244 |Application |Physical disks                                                 |
+ROW   |7996     |36245 |Application |Physical disks                                                 |
+ROW   |7997     |36246 |Application |Power supply                                                   |
+ROW   |7998     |36247 |Application |Temperature                                                    |
+ROW   |7999     |36248 |Application |Temperature                                                    |
+ROW   |8000     |36249 |Application |Virtual disks                                                  |
+ROW   |8001     |36250 |Application |Virtual disks                                                  |
+ROW   |8002     |36251 |Application |Virtual disks                                                  |
+ROW   |8003     |36252 |Application |Virtual disks                                                  |
+ROW   |8004     |36253 |Application |Virtual disks                                                  |
+ROW   |8005     |36254 |Application |Virtual disks                                                  |
+ROW   |8006     |36255 |Application |General                                                        |
+ROW   |8007     |36256 |Application |General                                                        |
+ROW   |8008     |36257 |Application |Inventory                                                      |
+ROW   |8009     |36258 |Application |Inventory                                                      |
+ROW   |8010     |36259 |Application |Inventory                                                      |
+ROW   |8011     |36260 |Application |General                                                        |
+ROW   |8012     |36261 |Application |General                                                        |
+ROW   |8013     |36262 |Application |General                                                        |
+ROW   |8014     |36263 |Application |Status                                                         |
+ROW   |8015     |36264 |Application |Inventory                                                      |
+ROW   |8016     |36265 |Application |Status                                                         |
+ROW   |8017     |36266 |Application |General                                                        |
+ROW   |8018     |36267 |Application |Status                                                         |
+ROW   |8019     |36275 |Application |Disk arrays                                                    |
+ROW   |8020     |36276 |Application |Disk arrays                                                    |
+ROW   |8021     |36277 |Application |Disk arrays                                                    |
+ROW   |8022     |36278 |Application |Fans                                                           |
+ROW   |8023     |36279 |Application |Fans                                                           |
+ROW   |8024     |36280 |Application |Physical disks                                                 |
+ROW   |8025     |36281 |Application |Physical disks                                                 |
+ROW   |8026     |36282 |Application |Physical disks                                                 |
+ROW   |8027     |36283 |Application |Physical disks                                                 |
+ROW   |8028     |36284 |Application |Physical disks                                                 |
+ROW   |8029     |36285 |Application |Physical disks                                                 |
+ROW   |8030     |36286 |Application |Power supply                                                   |
+ROW   |8031     |36287 |Application |Temperature                                                    |
+ROW   |8032     |36288 |Application |Temperature                                                    |
+ROW   |8033     |36289 |Application |Virtual disks                                                  |
+ROW   |8034     |36290 |Application |Virtual disks                                                  |
+ROW   |8035     |36291 |Application |Virtual disks                                                  |
+ROW   |8036     |36292 |Application |Virtual disks                                                  |
+ROW   |8037     |36293 |Application |Virtual disks                                                  |
+ROW   |8038     |36294 |Application |Virtual disks                                                  |
+ROW   |8039     |36295 |Application |Zabbix raw items                                               |
+ROW   |8040     |36296 |Application |Status                                                         |
+ROW   |8041     |36297 |Application |Inventory                                                      |
+ROW   |8042     |36298 |Application |Inventory                                                      |
+ROW   |8043     |36299 |Application |Inventory                                                      |
+ROW   |8044     |36300 |Application |Status                                                         |
+ROW   |8045     |36309 |Application |Zabbix raw items                                               |
+ROW   |8046     |36310 |Application |Zabbix raw items                                               |
+ROW   |8047     |36311 |Application |Zabbix raw items                                               |
+ROW   |8048     |36312 |Application |Zabbix raw items                                               |
+ROW   |8049     |36313 |Application |Zabbix raw items                                               |
+ROW   |8050     |36314 |Application |Zabbix raw items                                               |
+ROW   |8051     |36315 |Application |Zabbix raw items                                               |
+ROW   |8052     |36316 |Application |Zabbix raw items                                               |
+ROW   |8053     |36317 |Application |Fans                                                           |
+ROW   |8054     |36318 |Application |Fans                                                           |
+ROW   |8055     |36319 |Application |Network interfaces                                             |
+ROW   |8056     |36320 |Application |Network interfaces                                             |
+ROW   |8057     |36321 |Application |Network interfaces                                             |
+ROW   |8058     |36322 |Application |Network interfaces                                             |
+ROW   |8059     |36323 |Application |Physical disks                                                 |
+ROW   |8060     |36324 |Application |Physical disks                                                 |
+ROW   |8061     |36325 |Application |Physical disks                                                 |
+ROW   |8062     |36326 |Application |Physical disks                                                 |
+ROW   |8063     |36327 |Application |Physical disks                                                 |
+ROW   |8064     |36328 |Application |Power supply                                                   |
+ROW   |8065     |36329 |Application |Temperature                                                    |
+ROW   |8066     |36330 |Application |Temperature                                                    |
+ROW   |8067     |36331 |Application |Virtual disks                                                  |
+ROW   |8068     |36332 |Application |Virtual disks                                                  |
+ROW   |8069     |36333 |Application |Virtual disks                                                  |
+ROW   |8070     |36334 |Application |Virtual disks                                                  |
+ROW   |8071     |36335 |Application |Virtual disks                                                  |
+ROW   |8072     |36336 |Application |Virtual disks                                                  |
+ROW   |8073     |36337 |Application |General                                                        |
+ROW   |8074     |36338 |Application |General                                                        |
+ROW   |8075     |36339 |Application |Inventory                                                      |
+ROW   |8076     |36340 |Application |Inventory                                                      |
+ROW   |8077     |36341 |Application |Inventory                                                      |
+ROW   |8078     |36342 |Application |General                                                        |
+ROW   |8079     |36343 |Application |General                                                        |
+ROW   |8080     |36344 |Application |General                                                        |
+ROW   |8081     |36345 |Application |Status                                                         |
+ROW   |8082     |36346 |Application |Inventory                                                      |
+ROW   |8083     |36347 |Application |Status                                                         |
+ROW   |8084     |36348 |Application |General                                                        |
+ROW   |8085     |36349 |Application |Status                                                         |
+ROW   |8086     |36357 |Application |Disk arrays                                                    |
+ROW   |8087     |36358 |Application |Disk arrays                                                    |
+ROW   |8088     |36359 |Application |Disk arrays                                                    |
+ROW   |8089     |36360 |Application |Fans                                                           |
+ROW   |8090     |36361 |Application |Fans                                                           |
+ROW   |8091     |36362 |Application |Physical disks                                                 |
+ROW   |8092     |36363 |Application |Physical disks                                                 |
+ROW   |8093     |36364 |Application |Physical disks                                                 |
+ROW   |8094     |36365 |Application |Physical disks                                                 |
+ROW   |8095     |36366 |Application |Physical disks                                                 |
+ROW   |8096     |36367 |Application |Physical disks                                                 |
+ROW   |8097     |36368 |Application |Power supply                                                   |
+ROW   |8098     |36369 |Application |Temperature                                                    |
+ROW   |8099     |36370 |Application |Temperature                                                    |
+ROW   |8100     |36371 |Application |Virtual disks                                                  |
+ROW   |8101     |36372 |Application |Virtual disks                                                  |
+ROW   |8102     |36373 |Application |Virtual disks                                                  |
+ROW   |8103     |36374 |Application |Virtual disks                                                  |
+ROW   |8104     |36375 |Application |Virtual disks                                                  |
+ROW   |8105     |36376 |Application |Virtual disks                                                  |
+ROW   |8106     |36377 |Application |Zabbix raw items                                               |
+ROW   |8107     |36378 |Application |Status                                                         |
+ROW   |8108     |36379 |Application |Inventory                                                      |
+ROW   |8109     |36380 |Application |Inventory                                                      |
+ROW   |8110     |36381 |Application |Inventory                                                      |
+ROW   |8111     |36382 |Application |Status                                                         |
+ROW   |8112     |36391 |Application |Zabbix raw items                                               |
+ROW   |8113     |36392 |Application |Zabbix raw items                                               |
+ROW   |8114     |36393 |Application |Zabbix raw items                                               |
+ROW   |8115     |36394 |Application |Zabbix raw items                                               |
+ROW   |8116     |36395 |Application |Zabbix raw items                                               |
+ROW   |8117     |36396 |Application |Zabbix raw items                                               |
+ROW   |8118     |36397 |Application |Zabbix raw items                                               |
+ROW   |8119     |36398 |Application |Zabbix raw items                                               |
+ROW   |8120     |36399 |Application |Fans                                                           |
+ROW   |8121     |36400 |Application |Fans                                                           |
+ROW   |8122     |36401 |Application |Network interfaces                                             |
+ROW   |8123     |36402 |Application |Network interfaces                                             |
+ROW   |8124     |36403 |Application |Network interfaces                                             |
+ROW   |8125     |36404 |Application |Network interfaces                                             |
+ROW   |8126     |36405 |Application |Physical disks                                                 |
+ROW   |8127     |36406 |Application |Physical disks                                                 |
+ROW   |8128     |36407 |Application |Physical disks                                                 |
+ROW   |8129     |36408 |Application |Physical disks                                                 |
+ROW   |8130     |36409 |Application |Physical disks                                                 |
+ROW   |8131     |36410 |Application |Power supply                                                   |
+ROW   |8132     |36411 |Application |Temperature                                                    |
+ROW   |8133     |36412 |Application |Temperature                                                    |
+ROW   |8134     |36413 |Application |Virtual disks                                                  |
+ROW   |8135     |36414 |Application |Virtual disks                                                  |
+ROW   |8136     |36415 |Application |Virtual disks                                                  |
+ROW   |8137     |36416 |Application |Virtual disks                                                  |
+ROW   |8138     |36417 |Application |Virtual disks                                                  |
+ROW   |8139     |36418 |Application |Virtual disks                                                  |
+ROW   |8140     |36419 |Application |General                                                        |
+ROW   |8141     |36420 |Application |General                                                        |
+ROW   |8142     |36421 |Application |Inventory                                                      |
+ROW   |8143     |36422 |Application |Inventory                                                      |
+ROW   |8144     |36423 |Application |Inventory                                                      |
+ROW   |8145     |36424 |Application |General                                                        |
+ROW   |8146     |36425 |Application |General                                                        |
+ROW   |8147     |36426 |Application |General                                                        |
+ROW   |8148     |36427 |Application |Status                                                         |
+ROW   |8149     |36428 |Application |Inventory                                                      |
+ROW   |8150     |36429 |Application |Status                                                         |
+ROW   |8151     |36430 |Application |General                                                        |
+ROW   |8152     |36431 |Application |Status                                                         |
+ROW   |8153     |36439 |Application |Disk arrays                                                    |
+ROW   |8154     |36440 |Application |Disk arrays                                                    |
+ROW   |8155     |36441 |Application |Disk arrays                                                    |
+ROW   |8156     |36442 |Application |Fans                                                           |
+ROW   |8157     |36443 |Application |Fans                                                           |
+ROW   |8158     |36444 |Application |Physical disks                                                 |
+ROW   |8159     |36445 |Application |Physical disks                                                 |
+ROW   |8160     |36446 |Application |Physical disks                                                 |
+ROW   |8161     |36447 |Application |Physical disks                                                 |
+ROW   |8162     |36448 |Application |Physical disks                                                 |
+ROW   |8163     |36449 |Application |Physical disks                                                 |
+ROW   |8164     |36450 |Application |Power supply                                                   |
+ROW   |8165     |36451 |Application |Temperature                                                    |
+ROW   |8166     |36452 |Application |Temperature                                                    |
+ROW   |8167     |36453 |Application |Virtual disks                                                  |
+ROW   |8168     |36454 |Application |Virtual disks                                                  |
+ROW   |8169     |36455 |Application |Virtual disks                                                  |
+ROW   |8170     |36456 |Application |Virtual disks                                                  |
+ROW   |8171     |36457 |Application |Virtual disks                                                  |
+ROW   |8172     |36458 |Application |Virtual disks                                                  |
+ROW   |8173     |36459 |Application |Zabbix raw items                                               |
+ROW   |8174     |36460 |Application |Status                                                         |
+ROW   |8175     |36461 |Application |Inventory                                                      |
+ROW   |8176     |36462 |Application |Inventory                                                      |
+ROW   |8177     |36463 |Application |Inventory                                                      |
+ROW   |8178     |36464 |Application |Status                                                         |
+ROW   |8179     |36473 |Application |Zabbix raw items                                               |
+ROW   |8180     |36474 |Application |Zabbix raw items                                               |
+ROW   |8181     |36475 |Application |Zabbix raw items                                               |
+ROW   |8182     |36476 |Application |Zabbix raw items                                               |
+ROW   |8183     |36477 |Application |Zabbix raw items                                               |
+ROW   |8184     |36478 |Application |Zabbix raw items                                               |
+ROW   |8185     |36479 |Application |Zabbix raw items                                               |
+ROW   |8186     |36480 |Application |Zabbix raw items                                               |
+ROW   |8187     |36481 |Application |Fans                                                           |
+ROW   |8188     |36482 |Application |Fans                                                           |
+ROW   |8189     |36483 |Application |Network interfaces                                             |
+ROW   |8190     |36484 |Application |Network interfaces                                             |
+ROW   |8191     |36485 |Application |Network interfaces                                             |
+ROW   |8192     |36486 |Application |Network interfaces                                             |
+ROW   |8193     |36487 |Application |Physical disks                                                 |
+ROW   |8194     |36488 |Application |Physical disks                                                 |
+ROW   |8195     |36489 |Application |Physical disks                                                 |
+ROW   |8196     |36490 |Application |Physical disks                                                 |
+ROW   |8197     |36491 |Application |Physical disks                                                 |
+ROW   |8198     |36492 |Application |Power supply                                                   |
+ROW   |8199     |36493 |Application |Temperature                                                    |
+ROW   |8200     |36494 |Application |Temperature                                                    |
+ROW   |8201     |36495 |Application |Virtual disks                                                  |
+ROW   |8202     |36496 |Application |Virtual disks                                                  |
+ROW   |8203     |36497 |Application |Virtual disks                                                  |
+ROW   |8204     |36498 |Application |Virtual disks                                                  |
+ROW   |8205     |36499 |Application |Virtual disks                                                  |
+ROW   |8206     |36500 |Application |Virtual disks                                                  |
+ROW   |8207     |36501 |Application |General                                                        |
+ROW   |8208     |36502 |Application |General                                                        |
+ROW   |8209     |36503 |Application |Inventory                                                      |
+ROW   |8210     |36504 |Application |Inventory                                                      |
+ROW   |8211     |36505 |Application |Inventory                                                      |
+ROW   |8212     |36506 |Application |General                                                        |
+ROW   |8213     |36507 |Application |General                                                        |
+ROW   |8214     |36508 |Application |General                                                        |
+ROW   |8215     |36509 |Application |Status                                                         |
+ROW   |8216     |36510 |Application |Inventory                                                      |
+ROW   |8217     |36511 |Application |Status                                                         |
+ROW   |8218     |36512 |Application |General                                                        |
+ROW   |8219     |36513 |Application |Status                                                         |
+ROW   |8220     |36521 |Application |Disk arrays                                                    |
+ROW   |8221     |36522 |Application |Disk arrays                                                    |
+ROW   |8222     |36523 |Application |Disk arrays                                                    |
+ROW   |8223     |36524 |Application |Fans                                                           |
+ROW   |8224     |36525 |Application |Fans                                                           |
+ROW   |8225     |36526 |Application |Physical disks                                                 |
+ROW   |8226     |36527 |Application |Physical disks                                                 |
+ROW   |8227     |36528 |Application |Physical disks                                                 |
+ROW   |8228     |36529 |Application |Physical disks                                                 |
+ROW   |8229     |36530 |Application |Physical disks                                                 |
+ROW   |8230     |36531 |Application |Physical disks                                                 |
+ROW   |8231     |36532 |Application |Power supply                                                   |
+ROW   |8232     |36533 |Application |Temperature                                                    |
+ROW   |8233     |36534 |Application |Temperature                                                    |
+ROW   |8234     |36535 |Application |Virtual disks                                                  |
+ROW   |8235     |36536 |Application |Virtual disks                                                  |
+ROW   |8236     |36537 |Application |Virtual disks                                                  |
+ROW   |8237     |36538 |Application |Virtual disks                                                  |
+ROW   |8238     |36539 |Application |Virtual disks                                                  |
+ROW   |8239     |36540 |Application |Virtual disks                                                  |
+ROW   |8240     |36541 |Application |General                                                        |
+ROW   |8241     |36542 |Application |General                                                        |
+ROW   |8242     |36543 |Application |Inventory                                                      |
+ROW   |8243     |36544 |Application |Inventory                                                      |
+ROW   |8244     |36545 |Application |General                                                        |
+ROW   |8245     |36546 |Application |General                                                        |
+ROW   |8246     |36547 |Application |General                                                        |
+ROW   |8247     |36548 |Application |Temperature                                                    |
+ROW   |8248     |36549 |Application |Status                                                         |
+ROW   |8249     |36550 |Application |Status                                                         |
+ROW   |8250     |36551 |Application |General                                                        |
+ROW   |8251     |36552 |Application |Status                                                         |
+ROW   |8252     |36567 |Application |Disk arrays                                                    |
+ROW   |8253     |36568 |Application |Disk arrays                                                    |
+ROW   |8254     |36569 |Application |Disk arrays                                                    |
+ROW   |8255     |36570 |Application |Disk arrays                                                    |
+ROW   |8256     |36571 |Application |Fans                                                           |
+ROW   |8257     |36572 |Application |Network interfaces                                             |
+ROW   |8258     |36573 |Application |Physical disks                                                 |
+ROW   |8259     |36574 |Application |Physical disks                                                 |
+ROW   |8260     |36575 |Application |Physical disks                                                 |
+ROW   |8261     |36576 |Application |Physical disks                                                 |
+ROW   |8262     |36577 |Application |Physical disks                                                 |
+ROW   |8263     |36578 |Application |Physical disks                                                 |
+ROW   |8264     |36579 |Application |Power supply                                                   |
+ROW   |8265     |36580 |Application |Temperature                                                    |
+ROW   |8266     |36581 |Application |Temperature                                                    |
+ROW   |8267     |36582 |Application |Temperature                                                    |
+ROW   |8268     |36583 |Application |Temperature                                                    |
+ROW   |8269     |36584 |Application |Temperature                                                    |
+ROW   |8270     |36585 |Application |Temperature                                                    |
+ROW   |8271     |36586 |Application |Temperature                                                    |
+ROW   |8272     |36587 |Application |Temperature                                                    |
+ROW   |8273     |36588 |Application |Temperature                                                    |
+ROW   |8274     |36589 |Application |Temperature                                                    |
+ROW   |8275     |36590 |Application |Temperature                                                    |
+ROW   |8276     |36591 |Application |Temperature                                                    |
+ROW   |8277     |36592 |Application |Temperature                                                    |
+ROW   |8278     |36593 |Application |Temperature                                                    |
+ROW   |8279     |36594 |Application |Temperature                                                    |
+ROW   |8280     |36595 |Application |Virtual disks                                                  |
+ROW   |8281     |36596 |Application |Virtual disks                                                  |
+ROW   |8282     |36597 |Application |Virtual disks                                                  |
+ROW   |8283     |36598 |Application |General                                                        |
+ROW   |8284     |36599 |Application |General                                                        |
+ROW   |8285     |36600 |Application |Inventory                                                      |
+ROW   |8286     |36601 |Application |Inventory                                                      |
+ROW   |8287     |36602 |Application |General                                                        |
+ROW   |8288     |36603 |Application |General                                                        |
+ROW   |8289     |36604 |Application |General                                                        |
+ROW   |8290     |36605 |Application |Temperature                                                    |
+ROW   |8291     |36606 |Application |Status                                                         |
+ROW   |8292     |36607 |Application |Status                                                         |
+ROW   |8293     |36608 |Application |General                                                        |
+ROW   |8294     |36609 |Application |Status                                                         |
+ROW   |8295     |36624 |Application |Disk arrays                                                    |
+ROW   |8296     |36625 |Application |Disk arrays                                                    |
+ROW   |8297     |36626 |Application |Disk arrays                                                    |
+ROW   |8298     |36627 |Application |Disk arrays                                                    |
+ROW   |8299     |36628 |Application |Fans                                                           |
+ROW   |8300     |36629 |Application |Network interfaces                                             |
+ROW   |8301     |36630 |Application |Physical disks                                                 |
+ROW   |8302     |36631 |Application |Physical disks                                                 |
+ROW   |8303     |36632 |Application |Physical disks                                                 |
+ROW   |8304     |36633 |Application |Physical disks                                                 |
+ROW   |8305     |36634 |Application |Physical disks                                                 |
+ROW   |8306     |36635 |Application |Physical disks                                                 |
+ROW   |8307     |36636 |Application |Power supply                                                   |
+ROW   |8308     |36637 |Application |Temperature                                                    |
+ROW   |8309     |36638 |Application |Temperature                                                    |
+ROW   |8310     |36639 |Application |Temperature                                                    |
+ROW   |8311     |36640 |Application |Temperature                                                    |
+ROW   |8312     |36641 |Application |Temperature                                                    |
+ROW   |8313     |36642 |Application |Temperature                                                    |
+ROW   |8314     |36643 |Application |Temperature                                                    |
+ROW   |8315     |36644 |Application |Temperature                                                    |
+ROW   |8316     |36645 |Application |Temperature                                                    |
+ROW   |8317     |36646 |Application |Temperature                                                    |
+ROW   |8318     |36647 |Application |Temperature                                                    |
+ROW   |8319     |36648 |Application |Temperature                                                    |
+ROW   |8320     |36649 |Application |Temperature                                                    |
+ROW   |8321     |36650 |Application |Temperature                                                    |
+ROW   |8322     |36651 |Application |Temperature                                                    |
+ROW   |8323     |36652 |Application |Virtual disks                                                  |
+ROW   |8324     |36653 |Application |Virtual disks                                                  |
+ROW   |8325     |36654 |Application |Virtual disks                                                  |
+ROW   |8326     |36655 |Application |General                                                        |
+ROW   |8327     |36656 |Application |General                                                        |
+ROW   |8328     |36657 |Application |Inventory                                                      |
+ROW   |8329     |36658 |Application |Inventory                                                      |
+ROW   |8330     |36659 |Application |General                                                        |
+ROW   |8331     |36660 |Application |General                                                        |
+ROW   |8332     |36661 |Application |General                                                        |
+ROW   |8333     |36662 |Application |Temperature                                                    |
+ROW   |8334     |36663 |Application |Status                                                         |
+ROW   |8335     |36664 |Application |Status                                                         |
+ROW   |8336     |36665 |Application |General                                                        |
+ROW   |8337     |36666 |Application |Status                                                         |
+ROW   |8338     |36681 |Application |Disk arrays                                                    |
+ROW   |8339     |36682 |Application |Disk arrays                                                    |
+ROW   |8340     |36683 |Application |Disk arrays                                                    |
+ROW   |8341     |36684 |Application |Disk arrays                                                    |
+ROW   |8342     |36685 |Application |Fans                                                           |
+ROW   |8343     |36686 |Application |Network interfaces                                             |
+ROW   |8344     |36687 |Application |Physical disks                                                 |
+ROW   |8345     |36688 |Application |Physical disks                                                 |
+ROW   |8346     |36689 |Application |Physical disks                                                 |
+ROW   |8347     |36690 |Application |Physical disks                                                 |
+ROW   |8348     |36691 |Application |Physical disks                                                 |
+ROW   |8349     |36692 |Application |Physical disks                                                 |
+ROW   |8350     |36693 |Application |Power supply                                                   |
+ROW   |8351     |36694 |Application |Temperature                                                    |
+ROW   |8352     |36695 |Application |Temperature                                                    |
+ROW   |8353     |36696 |Application |Temperature                                                    |
+ROW   |8354     |36697 |Application |Temperature                                                    |
+ROW   |8355     |36698 |Application |Temperature                                                    |
+ROW   |8356     |36699 |Application |Temperature                                                    |
+ROW   |8357     |36700 |Application |Temperature                                                    |
+ROW   |8358     |36701 |Application |Temperature                                                    |
+ROW   |8359     |36702 |Application |Temperature                                                    |
+ROW   |8360     |36703 |Application |Temperature                                                    |
+ROW   |8361     |36704 |Application |Temperature                                                    |
+ROW   |8362     |36705 |Application |Temperature                                                    |
+ROW   |8363     |36706 |Application |Temperature                                                    |
+ROW   |8364     |36707 |Application |Temperature                                                    |
+ROW   |8365     |36708 |Application |Temperature                                                    |
+ROW   |8366     |36709 |Application |Virtual disks                                                  |
+ROW   |8367     |36710 |Application |Virtual disks                                                  |
+ROW   |8368     |36711 |Application |Virtual disks                                                  |
+ROW   |8369     |36712 |Application |General                                                        |
+ROW   |8370     |36713 |Application |General                                                        |
+ROW   |8371     |36714 |Application |Inventory                                                      |
+ROW   |8372     |36715 |Application |Inventory                                                      |
+ROW   |8373     |36716 |Application |General                                                        |
+ROW   |8374     |36717 |Application |General                                                        |
+ROW   |8375     |36718 |Application |General                                                        |
+ROW   |8376     |36719 |Application |Temperature                                                    |
+ROW   |8377     |36720 |Application |Status                                                         |
+ROW   |8378     |36721 |Application |Status                                                         |
+ROW   |8379     |36722 |Application |General                                                        |
+ROW   |8380     |36723 |Application |Status                                                         |
+ROW   |8381     |36738 |Application |Disk arrays                                                    |
+ROW   |8382     |36739 |Application |Disk arrays                                                    |
+ROW   |8383     |36740 |Application |Disk arrays                                                    |
+ROW   |8384     |36741 |Application |Disk arrays                                                    |
+ROW   |8385     |36742 |Application |Fans                                                           |
+ROW   |8386     |36743 |Application |Network interfaces                                             |
+ROW   |8387     |36744 |Application |Physical disks                                                 |
+ROW   |8388     |36745 |Application |Physical disks                                                 |
+ROW   |8389     |36746 |Application |Physical disks                                                 |
+ROW   |8390     |36747 |Application |Physical disks                                                 |
+ROW   |8391     |36748 |Application |Physical disks                                                 |
+ROW   |8392     |36749 |Application |Physical disks                                                 |
+ROW   |8393     |36750 |Application |Power supply                                                   |
+ROW   |8394     |36751 |Application |Temperature                                                    |
+ROW   |8395     |36752 |Application |Temperature                                                    |
+ROW   |8396     |36753 |Application |Temperature                                                    |
+ROW   |8397     |36754 |Application |Temperature                                                    |
+ROW   |8398     |36755 |Application |Temperature                                                    |
+ROW   |8399     |36756 |Application |Temperature                                                    |
+ROW   |8400     |36757 |Application |Temperature                                                    |
+ROW   |8401     |36758 |Application |Temperature                                                    |
+ROW   |8402     |36759 |Application |Temperature                                                    |
+ROW   |8403     |36760 |Application |Temperature                                                    |
+ROW   |8404     |36761 |Application |Temperature                                                    |
+ROW   |8405     |36762 |Application |Temperature                                                    |
+ROW   |8406     |36763 |Application |Temperature                                                    |
+ROW   |8407     |36764 |Application |Temperature                                                    |
+ROW   |8408     |36765 |Application |Temperature                                                    |
+ROW   |8409     |36766 |Application |Virtual disks                                                  |
+ROW   |8410     |36767 |Application |Virtual disks                                                  |
+ROW   |8411     |36768 |Application |Virtual disks                                                  |
+ROW   |8412     |36769 |Application |Asterisk                                                       |
+ROW   |8413     |36770 |Application |Asterisk                                                       |
+ROW   |8414     |36771 |Application |Asterisk                                                       |
+ROW   |8415     |36772 |Application |Zabbix raw items                                               |
+ROW   |8416     |36773 |Application |Travis                                                         |
+ROW   |8417     |36774 |Application |Zabbix raw items                                               |
+ROW   |8418     |36775 |Application |Zabbix raw items                                               |
+ROW   |8419     |36776 |Application |Travis                                                         |
+ROW   |8420     |36777 |Application |Travis                                                         |
+ROW   |8421     |36778 |Application |Travis                                                         |
+ROW   |8422     |36779 |Application |Travis                                                         |
+ROW   |8423     |36780 |Application |Travis                                                         |
+ROW   |8424     |36782 |Application |Travis: Repo [{#SLUG}]                                         |
+ROW   |8425     |36783 |Application |Zabbix raw items                                               |
+ROW   |8426     |36784 |Application |Zabbix raw items                                               |
+ROW   |8427     |36785 |Application |Travis: Repo [{#SLUG}]                                         |
+ROW   |8428     |36786 |Application |Travis: Repo [{#SLUG}]                                         |
+ROW   |8429     |36787 |Application |Travis: Repo [{#SLUG}]                                         |
+ROW   |8430     |36788 |Application |Travis: Repo [{#SLUG}]                                         |
+ROW   |8431     |36789 |Application |Travis: Repo [{#SLUG}]                                         |
+ROW   |8432     |36790 |Application |Travis: Repo [{#SLUG}]                                         |
+ROW   |8433     |36791 |Application |Travis: Repo [{#SLUG}]                                         |
+ROW   |8434     |36792 |Application |Travis: Repo [{#SLUG}]                                         |
+ROW   |8435     |36793 |Application |Travis: Repo [{#SLUG}]                                         |
+ROW   |8436     |36794 |Application |Travis: Repo [{#SLUG}]                                         |
+ROW   |8437     |36795 |Data        |Raw                                                            |
+ROW   |8438     |36795 |target      |InfluxDB                                                       |
+ROW   |8439     |36795 |transport   |HTTP                                                           |
+ROW   |8440     |36796 |target      |InfluxDB                                                       |
+ROW   |8441     |36796 |transport   |HTTP                                                           |
+ROW   |8442     |36796 |type        |State                                                          |
+ROW   |8443     |36797 |resource    |tokens                                                         |
+ROW   |8444     |36797 |target      |InfluxDB                                                       |
+ROW   |8445     |36797 |transport   |dependent                                                      |
+ROW   |8446     |36797 |type        |gauge                                                          |
+ROW   |8447     |36798 |resource    |uptime                                                         |
+ROW   |8448     |36798 |target      |InfluxDB                                                       |
+ROW   |8449     |36798 |transport   |dependent                                                      |
+ROW   |8450     |36798 |type        |gauge                                                          |
+ROW   |8451     |36799 |resource    |tokens                                                         |
+ROW   |8452     |36799 |target      |InfluxDB                                                       |
+ROW   |8453     |36799 |transport   |dependent                                                      |
+ROW   |8454     |36799 |type        |gauge                                                          |
+ROW   |8455     |36800 |resource    |telegraf                                                       |
+ROW   |8456     |36800 |target      |InfluxDB                                                       |
+ROW   |8457     |36800 |transport   |dependent                                                      |
+ROW   |8458     |36800 |type        |gauge                                                          |
+ROW   |8459     |36801 |resource    |telegraf                                                       |
+ROW   |8460     |36801 |target      |InfluxDB                                                       |
+ROW   |8461     |36801 |transport   |dependent                                                      |
+ROW   |8462     |36801 |type        |gauge                                                          |
+ROW   |8463     |36802 |resource    |tasks                                                          |
+ROW   |8464     |36802 |target      |InfluxDB                                                       |
+ROW   |8465     |36802 |transport   |dependent                                                      |
+ROW   |8466     |36802 |type        |gauge                                                          |
+ROW   |8467     |36803 |resource    |tasks                                                          |
+ROW   |8468     |36803 |target      |InfluxDB                                                       |
+ROW   |8469     |36803 |transport   |dependent                                                      |
+ROW   |8470     |36803 |type        |gauge                                                          |
+ROW   |8471     |36804 |resource    |tasks                                                          |
+ROW   |8472     |36804 |target      |InfluxDB                                                       |
+ROW   |8473     |36804 |transport   |dependent                                                      |
+ROW   |8474     |36804 |type        |rate                                                           |
+ROW   |8475     |36805 |resource    |tasks                                                          |
+ROW   |8476     |36805 |target      |InfluxDB                                                       |
+ROW   |8477     |36805 |transport   |dependent                                                      |
+ROW   |8478     |36805 |type        |rate                                                           |
+ROW   |8479     |36806 |resource    |scrapers                                                       |
+ROW   |8480     |36806 |target      |InfluxDB                                                       |
+ROW   |8481     |36806 |transport   |dependent                                                      |
+ROW   |8482     |36806 |type        |gauge                                                          |
+ROW   |8483     |36807 |resource    |organizations                                                  |
+ROW   |8484     |36807 |target      |InfluxDB                                                       |
+ROW   |8485     |36807 |transport   |dependent                                                      |
+ROW   |8486     |36807 |type        |gauge                                                          |
+ROW   |8487     |36808 |resource    |dashboards                                                     |
+ROW   |8488     |36808 |target      |InfluxDB                                                       |
+ROW   |8489     |36808 |transport   |dependent                                                      |
+ROW   |8490     |36808 |type        |gauge                                                          |
+ROW   |8491     |36809 |resource    |buckets                                                        |
+ROW   |8492     |36809 |target      |InfluxDB                                                       |
+ROW   |8493     |36809 |transport   |dependent                                                      |
+ROW   |8494     |36809 |type        |gauge                                                          |
+ROW   |8495     |36810 |resource    |boltdb                                                         |
+ROW   |8496     |36810 |target      |InfluxDB                                                       |
+ROW   |8497     |36810 |transport   |dependent                                                      |
+ROW   |8498     |36810 |type        |rate                                                           |
+ROW   |8499     |36811 |resource    |boltdb                                                         |
+ROW   |8500     |36811 |target      |InfluxDB                                                       |
+ROW   |8501     |36811 |transport   |dependent                                                      |
+ROW   |8502     |36811 |type        |rate                                                           |
+ROW   |8503     |36812 |resource    |version                                                        |
+ROW   |8504     |36812 |target      |InfluxDB                                                       |
+ROW   |8505     |36812 |transport   |dependent                                                      |
+ROW   |8506     |36812 |type        |text                                                           |
+ROW   |8507     |36814 |organization|{#ORG_NAME}                                                    |
+ROW   |8508     |36814 |resource    |queries                                                        |
+ROW   |8509     |36814 |target      |InfluxDB                                                       |
+ROW   |8510     |36814 |transport   |dependent                                                      |
+ROW   |8511     |36814 |type        |rate                                                           |
+ROW   |8512     |36815 |organization|{#ORG_NAME}                                                    |
+ROW   |8513     |36815 |resource    |queries                                                        |
+ROW   |8514     |36815 |target      |InfluxDB                                                       |
+ROW   |8515     |36815 |transport   |dependent                                                      |
+ROW   |8516     |36815 |type        |rate                                                           |
+ROW   |8517     |36816 |organization|{#ORG_NAME}                                                    |
+ROW   |8518     |36816 |resource    |queries                                                        |
+ROW   |8519     |36816 |target      |InfluxDB                                                       |
+ROW   |8520     |36816 |transport   |dependent                                                      |
+ROW   |8521     |36816 |type        |rate                                                           |
+ROW   |8522     |36817 |organization|{#ORG_NAME}                                                    |
+ROW   |8523     |36817 |resource    |queries                                                        |
+ROW   |8524     |36817 |target      |InfluxDB                                                       |
+ROW   |8525     |36817 |transport   |dependent                                                      |
+ROW   |8526     |36817 |type        |rate                                                           |
+ROW   |8527     |36818 |organization|{#ORG_NAME}                                                    |
+ROW   |8528     |36818 |resource    |queries                                                        |
+ROW   |8529     |36818 |target      |InfluxDB                                                       |
+ROW   |8530     |36818 |transport   |dependent                                                      |
+ROW   |8531     |36818 |type        |rate                                                           |
+ROW   |8532     |36819 |organization|{#ORG_NAME}                                                    |
+ROW   |8533     |36819 |resource    |queries                                                        |
+ROW   |8534     |36819 |target      |InfluxDB                                                       |
+ROW   |8535     |36819 |transport   |dependent                                                      |
+ROW   |8536     |36819 |type        |rate                                                           |
+ROW   |8537     |36820 |Application |{#DISKTYPE} {#NAME}                                            |
+ROW   |8538     |36821 |Application |{#DISKTYPE} {#NAME}                                            |
 
diff --git a/include/version.h b/include/version.h
index bdf0bf02b4f..f8aa5028b6f 100644
--- a/include/version.h
+++ b/include/version.h
@@ -24,7 +24,7 @@
 #define ZBX_STR(str)	ZBX_STR2(str)
 
 #define APPLICATION_NAME	"Zabbix Agent"
-#define ZABBIX_REVDATE		"20 September 2021"
+#define ZABBIX_REVDATE		"6 October 2021"
 #define ZABBIX_VERSION_MAJOR	6
 #define ZABBIX_VERSION_MINOR	0
 #define ZABBIX_VERSION_PATCH	0
@@ -36,7 +36,7 @@
 #		define ZABBIX_VERSION_RC_NUM	{ZABBIX_RC_NUM}
 #	endif
 #endif
-#define ZABBIX_VERSION_RC	"alpha4"
+#define ZABBIX_VERSION_RC	"alpha5"
 #define ZABBIX_VERSION		ZBX_STR(ZABBIX_VERSION_MAJOR) "." ZBX_STR(ZABBIX_VERSION_MINOR) "." \
 				ZBX_STR(ZABBIX_VERSION_PATCH) ZABBIX_VERSION_RC
 #define ZABBIX_REVISION		ZBX_STR(ZABBIX_VERSION_REVISION)
diff --git a/include/zbxalgo.h b/include/zbxalgo.h
index 70e54b82b5d..6117287faa8 100644
--- a/include/zbxalgo.h
+++ b/include/zbxalgo.h
@@ -59,6 +59,7 @@ int	zbx_default_uint64_ptr_compare_func(const void *d1, const void *d2);
 int	zbx_default_str_compare_func(const void *d1, const void *d2);
 int	zbx_default_ptr_compare_func(const void *d1, const void *d2);
 int	zbx_default_uint64_pair_compare_func(const void *d1, const void *d2);
+int	zbx_default_dbl_compare_func(const void *d1, const void *d2);
 
 #define ZBX_DEFAULT_INT_COMPARE_FUNC		zbx_default_int_compare_func
 #define ZBX_DEFAULT_UINT64_COMPARE_FUNC		zbx_default_uint64_compare_func
@@ -66,6 +67,7 @@ int	zbx_default_uint64_pair_compare_func(const void *d1, const void *d2);
 #define ZBX_DEFAULT_STR_COMPARE_FUNC		zbx_default_str_compare_func
 #define ZBX_DEFAULT_PTR_COMPARE_FUNC		zbx_default_ptr_compare_func
 #define ZBX_DEFAULT_UINT64_PAIR_COMPARE_FUNC	zbx_default_uint64_pair_compare_func
+#define ZBX_DEFAULT_DBL_COMPARE_FUNC		zbx_default_dbl_compare_func
 
 typedef void *(*zbx_mem_malloc_func_t)(void *old, size_t size);
 typedef void *(*zbx_mem_realloc_func_t)(void *old, size_t size);
@@ -88,6 +90,16 @@ typedef void (*zbx_clean_func_t)(void *data);
 	if ((a) > (b))			\
 		return +1
 
+#define ZBX_RETURN_IF_DBL_NOT_EQUAL(a, b)	\
+						\
+	if (FAIL == zbx_double_compare(a, b))	\
+	{					\
+		if ((a) < (b))			\
+			return -1;		\
+		else				\
+			return +1;		\
+	}
+
 int	is_prime(int n);
 int	next_prime(int n);
 
diff --git a/include/zbxdb.h b/include/zbxdb.h
index cb0b452fa9e..91323fdc4e1 100644
--- a/include/zbxdb.h
+++ b/include/zbxdb.h
@@ -165,8 +165,8 @@ int		zbx_db_strlen_n(const char *text_loc, size_t maxlen);
 #define ZBX_POSTGRESQL_MIN_VERSION_FRIENDLY		"10.9"
 #define ZBX_POSTGRESQL_MIN_SUPPORTED_VERSION		130000
 #define ZBX_POSTGRESQL_MIN_SUPPORTED_VERSION_FRIENDLY	"13.0"
-#define ZBX_POSTGRESQL_MAX_VERSION			139999
-#define ZBX_POSTGRESQL_MAX_VERSION_FRIENDLY		"13.x"
+#define ZBX_POSTGRESQL_MAX_VERSION			149999
+#define ZBX_POSTGRESQL_MAX_VERSION_FRIENDLY		"14.x"
 
 #define ZBX_ORACLE_MIN_VERSION				1201000200
 #define ZBX_ORACLE_MIN_VERSION_FRIENDLY			"Database 12c Release 12.01.00.02.x"
diff --git a/include/zbxeval.h b/include/zbxeval.h
index a4eb07ecd82..006fa0c753c 100644
--- a/include/zbxeval.h
+++ b/include/zbxeval.h
@@ -276,5 +276,7 @@ int	zbx_eval_calc_stddevsamp(zbx_vector_dbl_t *values, double *result, char **er
 int	zbx_eval_calc_sumofsquares(zbx_vector_dbl_t *values, double *result, char **error);
 int	zbx_eval_calc_varpop(zbx_vector_dbl_t *values, double *result, char **error);
 int	zbx_eval_calc_varsamp(zbx_vector_dbl_t *values, double *result, char **error);
+int	zbx_eval_calc_histogram_quantile(const double q, const zbx_vector_dbl_t *values, const char *err_fn,
+		double *result, char **error);
 
 #endif
diff --git a/sass/stylesheets/sass/components/_buttons.scss b/sass/stylesheets/sass/components/_buttons.scss
index d4788751ac8..d4788751ac8 100755..100644
--- a/sass/stylesheets/sass/components/_buttons.scss
+++ b/sass/stylesheets/sass/components/_buttons.scss
diff --git a/sass/stylesheets/sass/components/_dashboard.scss b/sass/stylesheets/sass/components/_dashboard.scss
index 359aacf83f8..359aacf83f8 100755..100644
--- a/sass/stylesheets/sass/components/_dashboard.scss
+++ b/sass/stylesheets/sass/components/_dashboard.scss
diff --git a/sass/stylesheets/sass/components/_diff.scss b/sass/stylesheets/sass/components/_diff.scss
index 24ddfb55dd1..24ddfb55dd1 100755..100644
--- a/sass/stylesheets/sass/components/_diff.scss
+++ b/sass/stylesheets/sass/components/_diff.scss
diff --git a/sass/stylesheets/sass/components/_inline-filter.scss b/sass/stylesheets/sass/components/_inline-filter.scss
new file mode 100644
index 00000000000..10bc26d69ae
--- /dev/null
+++ b/sass/stylesheets/sass/components/_inline-filter.scss
@@ -0,0 +1,25 @@
+.inline-filter {
+	text-align: right;
+
+	> li {
+		display: inline-block;
+
+		&:not(:last-child) {
+			margin-right: 3px;
+		}
+
+		&.inline-filter-label {
+			margin-right: 10px;
+		}
+	}
+}
+
+.inline-filter-footer {
+	display: flex;
+	align-items: baseline;
+	justify-content: space-between;
+
+	> li.inline-filter-stats {
+		color: $font-alt-color;
+	}
+}
diff --git a/sass/stylesheets/sass/components/_radio-list-control.scss b/sass/stylesheets/sass/components/_radio-list-control.scss
index 001233ac171..001233ac171 100755..100644
--- a/sass/stylesheets/sass/components/_radio-list-control.scss
+++ b/sass/stylesheets/sass/components/_radio-list-control.scss
diff --git a/sass/stylesheets/sass/components/_toc.scss b/sass/stylesheets/sass/components/_toc.scss
index b0c9f3fd36b..b0c9f3fd36b 100755..100644
--- a/sass/stylesheets/sass/components/_toc.scss
+++ b/sass/stylesheets/sass/components/_toc.scss
diff --git a/sass/stylesheets/sass/hc-dark.scss b/sass/stylesheets/sass/hc-dark.scss
index 034b776edc6..3c296890b27 100644
--- a/sass/stylesheets/sass/hc-dark.scss
+++ b/sass/stylesheets/sass/hc-dark.scss
@@ -1107,10 +1107,6 @@ td.log-disaster-bg {
 	margin: 0 0 0 -42px;
 }
 
-.notif-indic-container {
-	margin: 0 0 0 -42px;
-}
-
 td.inactive-bg {
 	padding-left: 42px !important;
 	color: $font-color;
diff --git a/sass/stylesheets/sass/hc-light.scss b/sass/stylesheets/sass/hc-light.scss
index 74001e5e6fa..aa288e39cfc 100644
--- a/sass/stylesheets/sass/hc-light.scss
+++ b/sass/stylesheets/sass/hc-light.scss
@@ -992,10 +992,6 @@ td.log-disaster-bg {
 	margin: 0 0 0 -42px;
 }
 
-.notif-indic-container {
-	margin: 0 0 0 -42px;
-}
-
 td.inactive-bg {
 	padding-left: 42px !important;
 	color: $font-color;
diff --git a/sass/stylesheets/sass/screen.scss b/sass/stylesheets/sass/screen.scss
index ab3fd7e4278..54183eb1b0b 100644
--- a/sass/stylesheets/sass/screen.scss
+++ b/sass/stylesheets/sass/screen.scss
@@ -31,6 +31,7 @@ $browser-sprite-path: '../img/browser-sprite.png?20200407';
 @import "components/dashboard";
 @import "components/diff";
 @import "components/form-search";
+@import "components/inline-filter";
 @import "components/menu-main";
 @import "components/menu-user";
 @import "components/message-box";
@@ -3030,6 +3031,12 @@ $form-icon-btn: (
 					padding-left: 5px;
 				}
 			}
+
+			.inline-filter {
+				li {
+					padding-left: 0;
+				}
+			}
 		}
 
 		> .overlay-close-btn {
@@ -3517,7 +3524,6 @@ $form-icon-btn: (
 			}
 		}
 	}
-
 }
 
 .notif-body {
@@ -3560,19 +3566,6 @@ $form-icon-btn: (
 		margin-top: 20px;
 		background: url($sprite-path) no-repeat -11px -587px;
 	}
-
-}
-
-.notif-indic-container {
-	border-top: 1px solid $table-border-color;
-	margin: 0 0 0 -19px;
-	padding: 14px 0 0;
-
-	.notif-indic {
-		float: none;
-		display: inline-block;
-		margin: 0 2px 0 0;
-	}
 }
 
 .dashed-border {
@@ -5303,7 +5296,6 @@ button {
 	&.icon-action-severity-changed,
 	&.icon-action-message,
 	&.icon-action-ack,
-	&.icon-invisible,
 	&.icon-problem-generated,
 	&.icon-problem-recovery,
 	&.icon-actions-number-gray,
diff --git a/sass/stylesheets/sass/utils/_resizable.scss b/sass/stylesheets/sass/utils/_resizable.scss
index 685132e2e1d..685132e2e1d 100755..100644
--- a/sass/stylesheets/sass/utils/_resizable.scss
+++ b/sass/stylesheets/sass/utils/_resizable.scss
diff --git a/src/go/Makefile.am b/src/go/Makefile.am
index aa56de7b895..0addb1ec053 100644
--- a/src/go/Makefile.am
+++ b/src/go/Makefile.am
@@ -54,6 +54,12 @@ clean:
 install-zabbix.com/cmd/zabbix_agent2:
 	CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=${GOBIN} \
 		go install -ldflags="${AGENT_GOLDFLAGS}" ${TARGETS}
+	$(MKDIR_P) "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)"
+	test -f "$(DESTDIR)$(AGENT2_CONFIG_FILE)" || cp "conf/zabbix_agent2.conf" "$(DESTDIR)$(AGENT2_CONFIG_FILE)"
+	for cfg in conf/zabbix_agent2.d/plugins.d/*.conf; do \
+		test -f "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg` || \
+		cp "$$cfg" "$(DESTDIR)$(AGENT2_CONFIG_PLUGINS_PATH)/"`basename $$cfg`; \
+	done
 
 install-zabbix.com/cmd/zabbix_web_service:
 	GOBIN=${GOBIN} go install -ldflags="${WEBSERVICE_GOLDFLAGS}" zabbix.com/cmd/zabbix_web_service
@@ -62,4 +68,3 @@ install-exec-local: ${INSTALL_TARGETS}
 
 check:
 	CGO_CFLAGS="${CGO_CFLAGS}" CGO_LDFLAGS="${CGO_LDFLAGS}" go test ./...
-
diff --git a/src/go/cmd/zabbix_web_service/config.go b/src/go/cmd/zabbix_web_service/config.go
index c745b2a9edf..dcbd413d12d 100644
--- a/src/go/cmd/zabbix_web_service/config.go
+++ b/src/go/cmd/zabbix_web_service/config.go
@@ -33,4 +33,5 @@ type serviceOptions struct {
 	TLSCAFile   string `conf:"optional"`
 	TLSCertFile string `conf:"optional"`
 	TLSKeyFile  string `conf:"optional"`
+	IgnoreURLCertErrors int `conf:"optional,range=0:1,default=0"`
 }
diff --git a/src/go/cmd/zabbix_web_service/pdf_report_creator.go b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
index 799e5384ffc..3ee948f024f 100644
--- a/src/go/cmd/zabbix_web_service/pdf_report_creator.go
+++ b/src/go/cmd/zabbix_web_service/pdf_report_creator.go
@@ -93,7 +93,16 @@ func (h *handler) report(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	ctx, cancel := chromedp.NewContext(context.Background())
+	opts := chromedp.DefaultExecAllocatorOptions[:]
+
+	if options.IgnoreURLCertErrors == 1 {
+		opts = append(opts, chromedp.Flag("ignore-certificate-errors", "1"))
+	}
+
+	allocCtx, cancel := chromedp.NewExecAllocator(context.Background(), opts...)
+	defer cancel()
+
+	ctx, cancel := chromedp.NewContext(allocCtx)
 	defer cancel()
 
 	width, err := strconv.ParseInt(req.Parameters["width"], 10, 64)
diff --git a/src/go/conf/zabbix_agent2.conf b/src/go/conf/zabbix_agent2.conf
index 272842555e6..4558d40f59c 100644
--- a/src/go/conf/zabbix_agent2.conf
+++ b/src/go/conf/zabbix_agent2.conf
@@ -259,9 +259,9 @@ Hostname=Zabbix server
 # Default:
 # Include=
 
-# Include=/usr/local/etc/zabbix_agentd.userparams.conf
-# Include=/usr/local/etc/zabbix_agentd.conf.d/
-# Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf
+# Include=/usr/local/etc/zabbix_agent2.userparams.conf
+# Include=/usr/local/etc/zabbix_agent2.conf.d/
+# Include=/usr/local/etc/zabbix_agent2.conf.d/*.conf
 
 ####### USER-DEFINED MONITORED PARAMETERS #######
 
@@ -439,483 +439,5 @@ ControlSocket=/tmp/agent.sock
 # Default:
 # Plugins.SystemRun.LogRemoteCommands=0
 
-### Option: Plugins.Docker.Endpoint
-#	Docker API endpoint.
-#
-# Mandatory: no
-# Default: unix:///var/run/docker.sock
-# Plugins.Docker.Endpoint=unix:///var/run/docker.sock
-
-### Option: Plugins.Ceph.InsecureSkipVerify
-#	InsecureSkipVerify controls whether an http client verifies the	server's certificate chain and host name.
-#	If InsecureSkipVerify is true, TLS accepts any certificate presented by the server and any host name
-#	in that certificate. In this mode, TLS is susceptible to man-in-the-middle attacks.
-#	This should be used only for testing.
-#
-# Mandatory: no
-# Range: false | true
-# Default:
-# Plugins.Ceph.InsecureSkipVerify=false
-
-### Option: Plugins.Ceph.KeepAlive
-#	Time in seconds for waiting before unused connections will be closed.
-#
-# Mandatory: no
-# Range: 60-900
-# Default:
-# Plugins.Ceph.KeepAlive=300
-
-### Option: Plugins.Ceph.Timeout
-#	The maximum time in seconds for waiting when a request has to be done.
-#	The timeout includes connection time, any redirects, and reading the response body.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Ceph.Timeout=<Global timeout>
-
-### Option: Plugins.Ceph.Sessions.*.ApiKey
-#	ApiKey to be used for connectione. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Ceph.Sessions.*.ApiKey=
-
-### Option: Plugins.Ceph.Sessions.*.User
-#	Username to be used for connection. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Ceph.Sessions.*.User=
-
-### Option: Plugins.Ceph.Sessions.*.Uri
-#	Uri to connect. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range:
-#   Must matches the URI format.
-#   The only supported schema is "https".
-#   Embedded credentials will be ignored.
-# Default:
-# Plugins.Ceph.Sessions.*.Uri=
-
-### Option: Plugins.Docker.Timeout
-#	The maximum time (in seconds) for waiting when a request has to be done.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Docker.Timeout=<Global timeout>
-
-### Option: Plugins.Memcached.Timeout
-#	The maximum time (in seconds) for waiting when a request has to be done.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Memcached.Timeout=<Global timeout>
-
-### Option: Plugins.Memcached.KeepAlive
-#	Time in seconds for waiting before unused connections will be closed.
-#
-# Mandatory: no
-# Range: 60-900
-# Default:
-# Plugins.Memcached.KeepAlive=300
-
-### Option: Plugins.Memcached.Sessions.*.Uri
-#	Uri to connect. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range:
-#   Must matches the URI format.
-#   Supported schemas: "tcp" and "unix".
-#   Embedded credentials will be ignored.
-# Default:
-# Plugins.Memcached.Sessions.*.Uri=
-
-### Option: Plugins.Memcached.Sessions.*.User
-#	Username to send to protected Memcached server. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Memcached.Sessions.*.User=
-
-### Option: Plugins.Memcached.Sessions.*.Password
-#	Password to send to protected Memcached server. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Memcached.Sessions.*.Password=
-
-### Option: Plugins.Modbus.Timeout
-#	The maximum time (in seconds) for connections.
-#
-# Mandatory: no
-# Range: 1-30
-# Default: global timeout
-
-### Option: Plugins.Modbus.Sessions.*.Endpoint
-#	Endpoint is a connection string consisting of a protocol scheme, a host address and a port or seral port name and attributes.
-#
-# Mandatory: no
-
-### Option: Plugins.Modbus.Sessions.*.SlaveID
-#	Slave ID of modbus devices.
-#
-# Mandatory: no
-
-### Option: Plugins.Modbus.Sessions.*.Timeout
-#	The maximum time (in seconds) for connections.
-#
-# Mandatory: no
-# Range: 1-30
-# Default: plugin modbus timeout
-
-### Option: Plugins.Mongo.Timeout
-#	Amount of time to wait for a server to respond when first connecting and on
-#   follow up operations in the session.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Mongo.Timeout=<Global timeout>
-
-### Option: Plugins.Mongo.KeepAlive
-#	Time in seconds for waiting before unused connections will be closed.
-#
-# Mandatory: no
-# Range: 60-900
-# Default:
-# Plugins.Mongo.KeepAlive=300
-
-### Option: Plugins.Mongo.Sessions.*.Uri
-#	Uri to connect. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range:
-#   Must matches the URI format.
-#   The only supported schema is "tcp".
-#   Embedded credentials will be ignored.
-# Default:
-# Plugins.Mongo.Sessions.*.Uri=
-
-### Option: Plugins.Mongo.Sessions.*.User
-#	Username to send to protected MongoDB server. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Mongo.Sessions.*.User=
-
-### Option: Plugins.Mongo.Sessions.*.Password
-#	Password to send to protected MongoDB server. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Mongo.Sessions.*.Password=
-
-### Option: Plugins.MQTT.Timeout
-#	The maximum time (in seconds) for connections, disconnections and subscribtions.
-#
-# Mandatory: no
-# Range: 1-30
-# Default: global timeout
-
-### Option: Plugins.Mysql.CallTimeout
-#	The maximum time in seconds for waiting when a request has to be done.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Mysql.CallTimeout=<Global timeout>
-
-### Option: Plugins.Mysql.Timeout
-#	The maximum time in seconds for waiting when a connection has to be established.
-#
-# Mandatory: no
-# Range: 1-30
-# Default: global timeout
-
-### Option: Plugins.Mysql.KeepAlive
-#	Time (in seconds) to wait before unused connections will be closed.
-#
-# Mandatory: no
-# Range: 60-900
-# Default:
-# Plugins.Mysql.KeepAlive=300
-
-### Option: Plugins.Mysql.Sessions.*.Uri
-#	Connection string. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range: Must matches the URI format.
-# Default:
-# Plugins.Mysql.Sessions.*.Uri=
-
-### Option: Plugins.Mysql.Sessions.*.User
-#	Username to be used for MySQL authentication. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Mysql.Sessions.*.User=
-
-### Option: Plugins.Mysql.Sessions.*.Password
-#	Password to be used for MySQL authentication. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Mysql.Sessions.*.Password=
-
-### Option: Plugins.Mysql.Sessions.*.TLSConnect
-#	Encryption type for MySQL connection. "*" should be replaced with a session name.
-#		tls connection required     - required
-#		verifies certificates       - verify_ca
-#		verify certificates and ip  - verify_full
-#
-# Mandatory: no
-# Default:
-# Plugins.Mysql.Sessions.*.TLSConnect=
-
-### Option: Plugins.Mysql.Sessions.*.TLSCAFile
-#	Full pathname of a file containing the top-level CA(s) certificates for mysql
-#	peer certificate verification.
-#
-# Mandatory: no
-# Default:
-# Plugins.Mysql.Sessions.*.TLSCAFile=
-
-### Option: Plugins.Mysql.Sessions.*.TLSCertFile
-#	Full pathname of a file containing the mysql certificate or certificate chain.
-#
-# Mandatory: no
-# Default:
-# Plugins.Mysql.Sessions.*.TLSCertFile=
-
-### Option: Plugins.Mysql.Sessions.*.TLSKeyFile
-#	Full pathname of a file containing the mysql private key.
-#
-# Mandatory: no
-# Default:
-# Plugins.Mysql.Sessions.*.TLSKeyFile=
-
-### Option: Plugins.Oracle.CallTimeout
-#	The maximum time in seconds for waiting when a request has to be done.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Oracle.CallTimeout=<Global timeout>
-
-### Option: Plugins.Oracle.ConnectTimeout
-#	The maximum time in seconds for waiting when a connection has to be established.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Oracle.ConnectTimeout=<Global timeout>
-
-### Option: Plugins.Oracle.CustomQueriesPath
-#	Full pathname of a directory containing *.sql* files with custom queries.
-#
-# Mandatory: no
-# Default:
-# Plugins.Oracle.CustomQueriesPath=
-
-### Option: Plugins.Oracle.KeepAlive
-#	Time in seconds for waiting before unused connections will be closed.
-#
-# Mandatory: no
-# Range: 60-900
-# Default:
-# Plugins.Oracle.KeepAlive=300
-
-### Option: Plugins.Oracle.Sessions.*.Uri
-#	Uri to connect. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range:
-#   Must matches the URI format.
-#   The only supported schema is "tcp".
-#   Embedded credentials will be ignored.
-# Default:
-# Plugins.Oracle.Sessions.*.Uri=
-
-### Option: Plugins.Oracle.Sessions.*.Service
-#	Service name to be used for connection. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range: SID is not supported.
-# Default:
-# Plugins.Oracle.Sessions.*.Service=
-
-### Option: Plugins.Oracle.Sessions.*.User
-#	Username to be used for connection. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Oracle.Sessions.*.User=
-
-### Option: Plugins.Oracle.Sessions.*.Password
-#	Password to be used for connectione. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Oracle.Sessions.*.Password=
-
-### Option: Plugins.Postgres.CallTimeout
-#	The maximum time in seconds for waiting when a request has to be done.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Postgres.CallTimeout=<Global timeout>
-
-### Option: Plugins.Postgres.Timeout
-#	The maximum time in seconds for waiting when a connection has to be established.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Postgres.Timeout=<Global timeout>
-
-### Option: Plugins.Postgres.KeepAlive
-#   Time in seconds for waiting before unused connections will be closed.
-#
-# Mandatory: no
-# Range: 60-900
-# Default:
-# Plugins.Postgres.KeepAlive=300
-
-### Option: Plugins.Postgres.CustomQueriesPath
-#	Full pathname of a directory containing *.sql* files with custom queries.
-#
-# Mandatory: no
-# Default:
-# Plugins.Postgres.CustomQueriesPath=
-
-### Option: Plugins.Postgres.Sessions.*.Uri
-#	Uri to connect. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range:
-#   Must matches the URI format.
-#   Supported schemas: "tcp" and "unix".
-#   Embedded credentials will be ignored.
-# Default:
-# Plugins.Postgres.Sessions.*.Uri=
-
-### Option: Plugins.Postgres.Sessions.*.User
-#	Username for session connection. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range: Must matches PostgreSQL user name.
-# Default:
-# Plugins.Postgres.Sessions.*.User=
-
-### Option: Plugins.Postgres.Sessions.*.Password
-#	Password for session connection. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range: Must matches the Password format.
-# Default:
-# Plugins.Postgres.Sessions.*.Password=
-
-### Option: Plugins.Postgres.Sessions.*.Database
-#	Database for session connection. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Postgres.Sessions.*.Database=
-
-### Option: Plugins.Postgres.Sessions.*.TLSConnect
-#	Encryption type for Postgres connection. "*" should be replaced with a session name.
-#		tls connection required     - required
-#		verifies certificates       - verify_ca
-#		verify certificates and ip  - verify_full
-#
-# Mandatory: no
-# Default:
-# Plugins.Postgres.Sessions.*.TLSConnect=
-
-### Option: Plugins.Postgres.Sessions.*.TLSCAFile
-#	Full pathname of a file containing the top-level CA(s) certificate
-#	peer certificate verification.
-#
-# Mandatory: no
-# Default:
-# Plugins.Postgres.Sessions.*.TLSCAFile=
-
-### Option: Plugins.Postgres.Sessions.*.TLSCertFile
-#	Full pathname of a file containing the postgres certificate or certificate chain.
-#
-# Mandatory: no
-# Default:
-# Plugins.Postgres.Sessions.*.TLSCertFile=
-
-### Option: Plugins.Postgres.Sessions.*.TLSKeyFile
-#	Full pathname of a file containing the postgres private key.
-#
-# Mandatory: no
-# Default:
-# Plugins.Postgres.Sessions.*.TLSKeyFile=
-
-### Option: Plugins.Redis.Uri
-#	Uri to connect. Can be overwritten by the first parameter of an item's key.
-#
-# Mandatory: no
-# Range:
-#   Must matches the URI format.
-#   Supported schemas: "tcp" and "unix".
-#   Embedded credentials will be ignored.
-# Default:
-# Plugins.Redis.Uri=tcp://localhost:6379
-
-### Option: Plugins.Redis.Timeout
-#	The maximum time (in seconds) for waiting when a request has to be done.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Redis.Timeout=<Global timeout>
-
-### Option: Plugins.Redis.KeepAlive
-#	Time in seconds for waiting before unused connections will be closed.
-#
-# Mandatory: no
-# Range: 60-900
-# Default:
-# Plugins.Redis.KeepAlive=300
-
-### Option: Plugins.Redis.Sessions.*.Uri
-#	Uri to connect. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range:
-#   Must matches the URI format.
-#   Supported schemas: "tcp" and "unix".
-#   Embedded credentials will be ignored.
-# Default:
-# Plugins.Redis.Sessions.*.Uri=
-
-### Option: Plugins.Redis.Sessions.*.Password
-#	Password to send to protected Redis server. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Redis.Sessions.*.Password=
-
-### Option: Plugins.Smart.Timeout
-#	The maximum time in seconds for waiting before smartctl execution is terminated.
-#	The timeout is for a single smartctl command line execution.
-#
-# Mandatory: no
-# Range: 1-30
-# Default: <Global timeout>
-# Plugins.Smart.Timeout=
-
-### Option: Plugins.Smart.Path
-#	Path to smartctl executable.
-#
-# Mandatory: no
-# Default: smartctl
-# Plugins.Smart.Path=
+# Include configuration files for plugins
+Include=./zabbix_agent2.d/plugins.d/*.conf
diff --git a/src/go/conf/zabbix_agent2.d/plugins.d/ceph.conf b/src/go/conf/zabbix_agent2.d/plugins.d/ceph.conf
new file mode 100644
index 00000000000..1cf7e3e26f3
--- /dev/null
+++ b/src/go/conf/zabbix_agent2.d/plugins.d/ceph.conf
@@ -0,0 +1,52 @@
+### Option: Plugins.Ceph.InsecureSkipVerify
+#	InsecureSkipVerify controls whether an HTTP client verifies the	server's certificate chain and host name.
+#	If InsecureSkipVerify is true, TLS accepts any certificate presented by the server and any host name
+#	in that certificate. In this mode, TLS is susceptible to man-in-the-middle attacks.
+#	This should be used only for testing.
+#
+# Mandatory: no
+# Range: false | true
+# Default:
+# Plugins.Ceph.InsecureSkipVerify=false
+
+### Option: Plugins.Ceph.KeepAlive
+#	The amount of time a connection can remain idle before it is closed.
+#
+# Mandatory: no
+# Range: 60-900
+# Default:
+# Plugins.Ceph.KeepAlive=300
+
+### Option: Plugins.Ceph.Timeout
+#	The maximum amount of time in seconds to wait for a request to be done.
+#	The timeout includes connection time, any redirects, and reading the response body.
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Plugins.Ceph.Timeout=<Global timeout>
+
+### Option: Plugins.Ceph.Sessions.*.ApiKey
+#	ApiKey to be used for connection. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Default:
+# Plugins.Ceph.Sessions.*.ApiKey=
+
+### Option: Plugins.Ceph.Sessions.*.User
+#	Username to be used for connection. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Default:
+# Plugins.Ceph.Sessions.*.User=
+
+### Option: Plugins.Ceph.Sessions.*.Uri
+#	Uri to connect. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Range:
+#   Must matches the URI format.
+#   The only supported schema is "https".
+#   Embedded credentials will be ignored.
+# Default:
+# Plugins.Ceph.Sessions.*.Uri=
diff --git a/src/go/conf/zabbix_agent2.d/plugins.d/docker.conf b/src/go/conf/zabbix_agent2.d/plugins.d/docker.conf
new file mode 100644
index 00000000000..edc7daf4f6a
--- /dev/null
+++ b/src/go/conf/zabbix_agent2.d/plugins.d/docker.conf
@@ -0,0 +1,67 @@
+### Option: Plugins.Docker.Endpoint
+#	Docker API endpoint.
+#
+# Mandatory: no
+# Default: unix:///var/run/docker.sock
+# Plugins.Docker.Endpoint=unix:///var/run/docker.sock
+
+### Option: Plugins.Ceph.InsecureSkipVerify
+#	InsecureSkipVerify controls whether an http client verifies the	server's certificate chain and host name.
+#	If InsecureSkipVerify is true, TLS accepts any certificate presented by the server and any host name
+#	in that certificate. In this mode, TLS is susceptible to man-in-the-middle attacks.
+#	This should be used only for testing.
+#
+# Mandatory: no
+# Range: false | true
+# Default:
+# Plugins.Ceph.InsecureSkipVerify=false
+
+### Option: Plugins.Ceph.KeepAlive
+#	Time in seconds for waiting before unused connections will be closed.
+#
+# Mandatory: no
+# Range: 60-900
+# Default:
+# Plugins.Ceph.KeepAlive=300
+
+### Option: Plugins.Ceph.Timeout
+#	The maximum time in seconds for waiting when a request has to be done.
+#	The timeout includes connection time, any redirects, and reading the response body.
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Plugins.Ceph.Timeout=<Global timeout>
+
+### Option: Plugins.Ceph.Sessions.*.ApiKey
+#	ApiKey to be used for connectione. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Default:
+# Plugins.Ceph.Sessions.*.ApiKey=
+
+### Option: Plugins.Ceph.Sessions.*.User
+#	Username to be used for connection. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Default:
+# Plugins.Ceph.Sessions.*.User=
+
+### Option: Plugins.Ceph.Sessions.*.Uri
+#	Uri to connect. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Range:
+#   Must matches the URI format.
+#   The only supported schema is "https".
+#   Embedded credentials will be ignored.
+# Default:
+# Plugins.Ceph.Sessions.*.Uri=
+
+### Option: Plugins.Docker.Timeout
+#	The maximum time (in seconds) for waiting when a request has to be done.
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Plugins.Docker.Timeout=<Global timeout>
diff --git a/src/go/conf/zabbix_agent2.d/plugins.d/memcached.conf b/src/go/conf/zabbix_agent2.d/plugins.d/memcached.conf
new file mode 100644
index 00000000000..58f39ade700
--- /dev/null
+++ b/src/go/conf/zabbix_agent2.d/plugins.d/memcached.conf
@@ -0,0 +1,40 @@
+### Option: Plugins.Memcached.Timeout
+#	The maximum time (in seconds) for waiting when a request has to be done.
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Plugins.Memcached.Timeout=<Global timeout>
+
+### Option: Plugins.Memcached.KeepAlive
+#	Time in seconds for waiting before unused connections will be closed.
+#
+# Mandatory: no
+# Range: 60-900
+# Default:
+# Plugins.Memcached.KeepAlive=300
+
+### Option: Plugins.Memcached.Sessions.*.Uri
+#	Uri to connect. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Range:
+#   Must matches the URI format.
+#   Supported schemas: "tcp" and "unix".
+#   Embedded credentials will be ignored.
+# Default:
+# Plugins.Memcached.Sessions.*.Uri=
+
+### Option: Plugins.Memcached.Sessions.*.User
+#	Username to send to protected Memcached server. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Default:
+# Plugins.Memcached.Sessions.*.User=
+
+### Option: Plugins.Memcached.Sessions.*.Password
+#	Password to send to protected Memcached server. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Default:
+# Plugins.Memcached.Sessions.*.Password=
diff --git a/src/go/conf/zabbix_agent2.d/plugins.d/modbus.conf b/src/go/conf/zabbix_agent2.d/plugins.d/modbus.conf
new file mode 100644
index 00000000000..4be527673d4
--- /dev/null
+++ b/src/go/conf/zabbix_agent2.d/plugins.d/modbus.conf
@@ -0,0 +1,23 @@
+### Option: Plugins.Modbus.Timeout
+#	The maximum time (in seconds) for connections.
+#
+# Mandatory: no
+# Range: 1-30
+# Default: global timeout
+
+### Option: Plugins.Modbus.Sessions.*.Endpoint
+#	Endpoint is a connection string consisting of a protocol scheme, a host address and a port or seral port name and attributes.
+#
+# Mandatory: no
+
+### Option: Plugins.Modbus.Sessions.*.SlaveID
+#	Slave ID of modbus devices.
+#
+# Mandatory: no
+
+### Option: Plugins.Modbus.Sessions.*.Timeout
+#	The maximum time (in seconds) for connections.
+#
+# Mandatory: no
+# Range: 1-30
+# Default: plugin modbus timeout
diff --git a/src/go/conf/zabbix_agent2.d/plugins.d/mongodb.conf b/src/go/conf/zabbix_agent2.d/plugins.d/mongodb.conf
new file mode 100644
index 00000000000..7b31fc2980c
--- /dev/null
+++ b/src/go/conf/zabbix_agent2.d/plugins.d/mongodb.conf
@@ -0,0 +1,41 @@
+### Option: Plugins.Mongo.Timeout
+#	Amount of time to wait for a server to respond when first connecting and on
+#   follow up operations in the session.
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Plugins.Mongo.Timeout=<Global timeout>
+
+### Option: Plugins.Mongo.KeepAlive
+#	Time in seconds for waiting before unused connections will be closed.
+#
+# Mandatory: no
+# Range: 60-900
+# Default:
+# Plugins.Mongo.KeepAlive=300
+
+### Option: Plugins.Mongo.Sessions.*.Uri
+#	Uri to connect. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Range:
+#   Must matches the URI format.
+#   The only supported schema is "tcp".
+#   Embedded credentials will be ignored.
+# Default:
+# Plugins.Mongo.Sessions.*.Uri=
+
+### Option: Plugins.Mongo.Sessions.*.User
+#	Username to send to protected MongoDB server. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Default:
+# Plugins.Mongo.Sessions.*.User=
+
+### Option: Plugins.Mongo.Sessions.*.Password
+#	Password to send to protected MongoDB server. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Default:
+# Plugins.Mongo.Sessions.*.Password=
diff --git a/src/go/conf/zabbix_agent2.d/plugins.d/mqtt.conf b/src/go/conf/zabbix_agent2.d/plugins.d/mqtt.conf
new file mode 100644
index 00000000000..2260e71f6eb
--- /dev/null
+++ b/src/go/conf/zabbix_agent2.d/plugins.d/mqtt.conf
@@ -0,0 +1,6 @@
+### Option: Plugins.MQTT.Timeout
+#	The maximum time (in seconds) for connections, disconnections and subscribtions.
+#
+# Mandatory: no
+# Range: 1-30
+# Default: global timeout
diff --git a/src/go/conf/zabbix_agent2.d/plugins.d/mysql.conf b/src/go/conf/zabbix_agent2.d/plugins.d/mysql.conf
new file mode 100644
index 00000000000..8fa5c39fdfb
--- /dev/null
+++ b/src/go/conf/zabbix_agent2.d/plugins.d/mysql.conf
@@ -0,0 +1,76 @@
+### Option: Plugins.Mysql.CallTimeout
+#	The maximum time in seconds for waiting when a request has to be done.
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Plugins.Mysql.CallTimeout=<Global timeout>
+
+### Option: Plugins.Mysql.Timeout
+#	The maximum time in seconds for waiting when a connection has to be established.
+#
+# Mandatory: no
+# Range: 1-30
+# Default: global timeout
+
+### Option: Plugins.Mysql.KeepAlive
+#	Time (in seconds) to wait before unused connections will be closed.
+#
+# Mandatory: no
+# Range: 60-900
+# Default:
+# Plugins.Mysql.KeepAlive=300
+
+### Option: Plugins.Mysql.Sessions.*.Uri
+#	Connection string. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Range: Must matches the URI format.
+# Default:
+# Plugins.Mysql.Sessions.*.Uri=
+
+### Option: Plugins.Mysql.Sessions.*.User
+#	Username to be used for MySQL authentication. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Default:
+# Plugins.Mysql.Sessions.*.User=
+
+### Option: Plugins.Mysql.Sessions.*.Password
+#	Password to be used for MySQL authentication. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Default:
+# Plugins.Mysql.Sessions.*.Password=
+
+### Option: Plugins.Mysql.Sessions.*.TLSConnect
+#	Encryption type for MySQL connection. "*" should be replaced with a session name.
+#		tls connection required     - required
+#		verifies certificates       - verify_ca
+#		verify certificates and ip  - verify_full
+#
+# Mandatory: no
+# Default:
+# Plugins.Mysql.Sessions.*.TLSConnect=
+
+### Option: Plugins.Mysql.Sessions.*.TLSCAFile
+#	Full pathname of a file containing the top-level CA(s) certificates for mysql
+#	peer certificate verification.
+#
+# Mandatory: no
+# Default:
+# Plugins.Mysql.Sessions.*.TLSCAFile=
+
+### Option: Plugins.Mysql.Sessions.*.TLSCertFile
+#	Full pathname of a file containing the mysql certificate or certificate chain.
+#
+# Mandatory: no
+# Default:
+# Plugins.Mysql.Sessions.*.TLSCertFile=
+
+### Option: Plugins.Mysql.Sessions.*.TLSKeyFile
+#	Full pathname of a file containing the mysql private key.
+#
+# Mandatory: no
+# Default:
+# Plugins.Mysql.Sessions.*.TLSKeyFile=
diff --git a/src/go/conf/zabbix_agent2.d/plugins.d/oracle.conf b/src/go/conf/zabbix_agent2.d/plugins.d/oracle.conf
new file mode 100644
index 00000000000..a20e59fbab7
--- /dev/null
+++ b/src/go/conf/zabbix_agent2.d/plugins.d/oracle.conf
@@ -0,0 +1,63 @@
+### Option: Plugins.Oracle.CallTimeout
+#	The maximum time in seconds for waiting when a request has to be done.
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Plugins.Oracle.CallTimeout=<Global timeout>
+
+### Option: Plugins.Oracle.ConnectTimeout
+#	The maximum time in seconds for waiting when a connection has to be established.
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Plugins.Oracle.ConnectTimeout=<Global timeout>
+
+### Option: Plugins.Oracle.CustomQueriesPath
+#	Full pathname of a directory containing *.sql* files with custom queries.
+#
+# Mandatory: no
+# Default:
+# Plugins.Oracle.CustomQueriesPath=
+
+### Option: Plugins.Oracle.KeepAlive
+#	Time in seconds for waiting before unused connections will be closed.
+#
+# Mandatory: no
+# Range: 60-900
+# Default:
+# Plugins.Oracle.KeepAlive=300
+
+### Option: Plugins.Oracle.Sessions.*.Uri
+#	Uri to connect. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Range:
+#   Must matches the URI format.
+#   The only supported schema is "tcp".
+#   Embedded credentials will be ignored.
+# Default:
+# Plugins.Oracle.Sessions.*.Uri=
+
+### Option: Plugins.Oracle.Sessions.*.Service
+#	Service name to be used for connection. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Range: SID is not supported.
+# Default:
+# Plugins.Oracle.Sessions.*.Service=
+
+### Option: Plugins.Oracle.Sessions.*.User
+#	Username to be used for connection. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Default:
+# Plugins.Oracle.Sessions.*.User=
+
+### Option: Plugins.Oracle.Sessions.*.Password
+#	Password to be used for connectione. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Default:
+# Plugins.Oracle.Sessions.*.Password=
diff --git a/src/go/conf/zabbix_agent2.d/plugins.d/postgres.conf b/src/go/conf/zabbix_agent2.d/plugins.d/postgres.conf
new file mode 100644
index 00000000000..6c0be4c6eb3
--- /dev/null
+++ b/src/go/conf/zabbix_agent2.d/plugins.d/postgres.conf
@@ -0,0 +1,96 @@
+### Option: Plugins.Postgres.CallTimeout
+#	The maximum time in seconds for waiting when a request has to be done.
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Plugins.Postgres.CallTimeout=<Global timeout>
+
+### Option: Plugins.Postgres.Timeout
+#	The maximum time in seconds for waiting when a connection has to be established.
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Plugins.Postgres.Timeout=<Global timeout>
+
+### Option: Plugins.Postgres.KeepAlive
+#   Time in seconds for waiting before unused connections will be closed.
+#
+# Mandatory: no
+# Range: 60-900
+# Default:
+# Plugins.Postgres.KeepAlive=300
+
+### Option: Plugins.Postgres.CustomQueriesPath
+#	Full pathname of a directory containing *.sql* files with custom queries.
+#
+# Mandatory: no
+# Default:
+# Plugins.Postgres.CustomQueriesPath=
+
+### Option: Plugins.Postgres.Sessions.*.Uri
+#	Uri to connect. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Range:
+#   Must matches the URI format.
+#   Supported schemas: "tcp" and "unix".
+#   Embedded credentials will be ignored.
+# Default:
+# Plugins.Postgres.Sessions.*.Uri=
+
+### Option: Plugins.Postgres.Sessions.*.User
+#	Username for session connection. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Range: Must matches PostgreSQL user name.
+# Default:
+# Plugins.Postgres.Sessions.*.User=
+
+### Option: Plugins.Postgres.Sessions.*.Password
+#	Password for session connection. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Range: Must matches the Password format.
+# Default:
+# Plugins.Postgres.Sessions.*.Password=
+
+### Option: Plugins.Postgres.Sessions.*.Database
+#	Database for session connection. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Default:
+# Plugins.Postgres.Sessions.*.Database=
+
+### Option: Plugins.Postgres.Sessions.*.TLSConnect
+#	Encryption type for Postgres connection. "*" should be replaced with a session name.
+#		tls connection required     - required
+#		verifies certificates       - verify_ca
+#		verify certificates and ip  - verify_full
+#
+# Mandatory: no
+# Default:
+# Plugins.Postgres.Sessions.*.TLSConnect=
+
+### Option: Plugins.Postgres.Sessions.*.TLSCAFile
+#	Full pathname of a file containing the top-level CA(s) certificate
+#	peer certificate verification.
+#
+# Mandatory: no
+# Default:
+# Plugins.Postgres.Sessions.*.TLSCAFile=
+
+### Option: Plugins.Postgres.Sessions.*.TLSCertFile
+#	Full pathname of a file containing the postgres certificate or certificate chain.
+#
+# Mandatory: no
+# Default:
+# Plugins.Postgres.Sessions.*.TLSCertFile=
+
+### Option: Plugins.Postgres.Sessions.*.TLSKeyFile
+#	Full pathname of a file containing the postgres private key.
+#
+# Mandatory: no
+# Default:
+# Plugins.Postgres.Sessions.*.TLSKeyFile=
diff --git a/src/go/conf/zabbix_agent2.d/plugins.d/redis.conf b/src/go/conf/zabbix_agent2.d/plugins.d/redis.conf
new file mode 100644
index 00000000000..bec2032b3af
--- /dev/null
+++ b/src/go/conf/zabbix_agent2.d/plugins.d/redis.conf
@@ -0,0 +1,44 @@
+### Option: Plugins.Redis.Uri
+#	Uri to connect. Can be overwritten by the first parameter of an item's key.
+#
+# Mandatory: no
+# Range:
+#   Must matches the URI format.
+#   Supported schemas: "tcp" and "unix".
+#   Embedded credentials will be ignored.
+# Default:
+# Plugins.Redis.Uri=tcp://localhost:6379
+
+### Option: Plugins.Redis.Timeout
+#	The maximum time (in seconds) for waiting when a request has to be done.
+#
+# Mandatory: no
+# Range: 1-30
+# Default:
+# Plugins.Redis.Timeout=<Global timeout>
+
+### Option: Plugins.Redis.KeepAlive
+#	Time in seconds for waiting before unused connections will be closed.
+#
+# Mandatory: no
+# Range: 60-900
+# Default:
+# Plugins.Redis.KeepAlive=300
+
+### Option: Plugins.Redis.Sessions.*.Uri
+#	Uri to connect. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Range:
+#   Must matches the URI format.
+#   Supported schemas: "tcp" and "unix".
+#   Embedded credentials will be ignored.
+# Default:
+# Plugins.Redis.Sessions.*.Uri=
+
+### Option: Plugins.Redis.Sessions.*.Password
+#	Password to send to protected Redis server. "*" should be replaced with a session name.
+#
+# Mandatory: no
+# Default:
+# Plugins.Redis.Sessions.*.Password=
diff --git a/src/go/conf/zabbix_agent2.d/plugins.d/smart.conf b/src/go/conf/zabbix_agent2.d/plugins.d/smart.conf
new file mode 100644
index 00000000000..f29c3a92bb0
--- /dev/null
+++ b/src/go/conf/zabbix_agent2.d/plugins.d/smart.conf
@@ -0,0 +1,15 @@
+### Option: Plugins.Smart.Timeout
+#	The maximum time in seconds for waiting before smartctl execution is terminated.
+#	The timeout is for a single smartctl command line execution.
+#
+# Mandatory: no
+# Range: 1-30
+# Default: <Global timeout>
+# Plugins.Smart.Timeout=
+
+### Option: Plugins.Smart.Path
+#	Path to smartctl executable.
+#
+# Mandatory: no
+# Default: smartctl
+# Plugins.Smart.Path=
diff --git a/src/go/conf/zabbix_agent2.win.conf b/src/go/conf/zabbix_agent2.win.conf
index afa7c82fca7..de0619ed57e 100644
--- a/src/go/conf/zabbix_agent2.win.conf
+++ b/src/go/conf/zabbix_agent2.win.conf
@@ -443,452 +443,5 @@ ControlSocket=\\.\pipe\agent.sock
 # Default:
 # Plugins.SystemRun.LogRemoteCommands=0
 
-### Option: Plugins.Ceph.InsecureSkipVerify
-#	InsecureSkipVerify controls whether an http client verifies the	server's certificate chain and host name.
-#	If InsecureSkipVerify is true, TLS accepts any certificate presented by the server and any host name
-#	in that certificate. In this mode, TLS is susceptible to man-in-the-middle attacks.
-#	This should be used only for testing.
-#
-# Mandatory: no
-# Range: false | true
-# Default:
-# Plugins.Ceph.InsecureSkipVerify=false
-
-### Option: Plugins.Ceph.KeepAlive
-#	Time in seconds for waiting before unused connections will be closed.
-#
-# Mandatory: no
-# Range: 60-900
-# Default:
-# Plugins.Ceph.KeepAlive=300
-
-### Option: Plugins.Ceph.Timeout
-#	The maximum time in seconds for waiting when a request has to be done.
-#	The timeout includes connection time, any redirects, and reading the response body.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Ceph.Timeout=<Global timeout>
-
-### Option: Plugins.Ceph.Sessions.*.ApiKey
-#	ApiKey to be used for connectione. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Ceph.Sessions.*.ApiKey=
-
-### Option: Plugins.Ceph.Sessions.*.User
-#	Username to be used for connection. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Ceph.Sessions.*.User=
-
-### Option: Plugins.Ceph.Sessions.*.Uri
-#	Uri to connect. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range:
-#   Must matches the URI format.
-#   The only supported schema is "https".
-#   Embedded credentials will be ignored.
-# Default:
-# Plugins.Ceph.Sessions.*.Uri=
-
-### Option: Plugins.Memcached.Timeout
-#	The maximum time (in seconds) for waiting when a request has to be done.
-#
-# Mandatory: no
-# Range: 1-30
-# Default: global timeout
-
-### Option: Plugins.Memcached.KeepAlive
-#	Time (in seconds) to wait before unused connections will be closed.
-#
-# Mandatory: no
-# Range: 60-900
-# Default:
-# Plugins.Memcached.KeepAlive=300
-
-### Option: Plugins.Memcached.Sessions.*.Uri
-#	Connection string. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range: Must matches the URI format.
-# Default:
-# Plugins.Memcached.Sessions.*.Uri=
-
-### Option: Plugins.Memcached.Sessions.*.User
-#	Username to send to protected Memcached server. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Memcached.Sessions.*.User=
-
-### Option: Plugins.Memcached.Sessions.*.Password
-#	Password to send to protected Memcached server. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Memcached.Sessions.*.Password=
-
-### Option: Plugins.Mongo.Timeout
-#	Amount of time to wait for a server to respond when first connecting and on
-#   follow up operations in the session.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Mongo.Timeout=<Global timeout>
-
-### Option: Plugins.Mongo.KeepAlive
-#	Time in seconds for waiting before unused connections will be closed.
-#
-# Mandatory: no
-# Range: 60-900
-# Default:
-# Plugins.Mongo.KeepAlive=300
-
-### Option: Plugins.Mongo.Sessions.*.Uri
-#	Uri to connect. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range:
-#   Must matches the URI format.
-#   The only supported schema is "tcp".
-#   Embedded credentials will be ignored.
-# Default:
-# Plugins.Mongo.Sessions.*.Uri=
-
-### Option: Plugins.Mongo.Sessions.*.User
-#	Username to send to protected MongoDB server. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Mongo.Sessions.*.User=
-
-### Option: Plugins.Mongo.Sessions.*.Password
-#	Password to send to protected MongoDB server. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Mongo.Sessions.*.Password=
-
-### Option: Plugins.Mysql.CallTimeout
-#	The maximum time in seconds for waiting when a request has to be done.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Mysql.CallTimeout=<Global timeout>
-
-### Option: Plugins.Mysql.Timeout
-#	The maximum time in seconds for waiting when a connection has to be established.
-#
-# Mandatory: no
-# Range: 1-30
-# Default: global timeout
-
-### Option: Plugins.Mysql.KeepAlive
-#	Time (in seconds) to wait before unused connections will be closed.
-#
-# Mandatory: no
-# Range: 60-900
-# Default:
-# Plugins.Mysql.KeepAlive=300
-
-### Option: Plugins.Mysql.Sessions.*.Uri
-#	Connection string. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range: Must matches the URI format.
-# Default:
-# Plugins.Mysql.Sessions.*.Uri=
-
-### Option: Plugins.Mysql.Sessions.*.User
-#	Username to be used for MySQL authentication. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Mysql.Sessions.*.User=
-
-### Option: Plugins.Mysql.Sessions.*.Password
-#	Password to be used for MySQL authentication. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Mysql.Sessions.*.Password=
-
-### Option: Plugins.Mysql.Sessions.*.TLSConnect
-#	Encryption type for MySQL connection. "*" should be replaced with a session name.
-#		tls connection required     - required
-#		verifies certificates       - verify_ca
-#		verify certificates and ip  - verify_full
-#
-# Mandatory: no
-# Default:
-# Plugins.Mysql.Sessions.*.TLSConnect=
-
-### Option: Plugins.Mysql.Sessions.*.TLSCAFile
-#	Full pathname of a file containing the top-level CA(s) certificates for mysql
-#	peer certificate verification.
-#
-# Mandatory: no
-# Default:
-# Plugins.Mysql.Sessions.*.TLSCAFile=
-
-### Option: Plugins.Mysql.Sessions.*.TLSCertFile
-#	Full pathname of a file containing the mysql certificate or certificate chain.
-#
-# Mandatory: no
-# Default:
-# Plugins.Mysql.Sessions.*.TLSCertFile=
-
-### Option: Plugins.Mysql.Sessions.*.TLSKeyFile
-#	Full pathname of a file containing the mysql private key.
-#
-# Mandatory: no
-# Default:
-# Plugins.Mysql.Sessions.*.TLSKeyFile=
-
-### Option: Plugins.Oracle.CallTimeout
-#	The maximum time in seconds for waiting when a request has to be done.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Oracle.CallTimeout=<Global timeout>
-
-### Option: Plugins.Oracle.ConnectTimeout
-#	The maximum time in seconds for waiting when a connection has to be established.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Oracle.ConnectTimeout=<Global timeout>
-
-### Option: Plugins.Oracle.CustomQueriesPath
-#	Full pathname of a directory containing *.sql* files with custom queries.
-#
-# Mandatory: no
-# Default:
-# Plugins.Oracle.CustomQueriesPath=
-
-### Option: Plugins.Oracle.KeepAlive
-#	Time in seconds for waiting before unused connections will be closed.
-#
-# Mandatory: no
-# Range: 60-900
-# Default:
-# Plugins.Oracle.KeepAlive=300
-
-### Option: Plugins.Oracle.Sessions.*.Uri
-#	Uri to connect. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range:
-#   Must matches the URI format.
-#   The only supported schema is "tcp".
-#   Embedded credentials will be ignored.
-# Default:
-# Plugins.Oracle.Sessions.*.Uri=
-
-### Option: Plugins.Oracle.Sessions.*.Service
-#	Service name to be used for connection. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range: SID is not supported.
-# Default:
-# Plugins.Oracle.Sessions.*.Service=
-
-### Option: Plugins.Oracle.Sessions.*.User
-#	Username to be used for connection. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Oracle.Sessions.*.User=
-
-### Option: Plugins.Oracle.Sessions.*.Password
-#	Password to be used for connectione. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Oracle.Sessions.*.Password=
-
-### Option: Plugins.Redis.Timeout
-#	The maximum time (in seconds) for waiting when a request has to be done.
-#
-# Mandatory: no
-# Range: 1-30
-# Default: global timeout
-
-### Option: Plugins.Redis.KeepAlive
-#	Time (in seconds) to wait before unused connections will be closed.
-#
-# Mandatory: no
-# Range: 60-900
-# Default:
-# Plugins.Redis.KeepAlive=300
-
-### Option: Plugins.Redis.Sessions.*.Uri
-#	Connection string. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range: Must matches the URI format.
-# Default:
-# Plugins.Redis.Sessions.*.Uri=
-
-### Option: Plugins.Redis.Sessions.*.Password
-#	Password to send to protected Redis server. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Redis.Sessions.*.Password=
-
-### Option: Plugins.Postgres.CallTimeout
-#	The maximum time in seconds for waiting when a request has to be done.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Postgres.CallTimeout=<Global timeout>
-
-### Option: Plugins.Postgres.Timeout
-#	The maximum time in seconds for waiting when a connection has to be established.
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Plugins.Postgres.Timeout=<Global timeout>
-
-### Option: Plugins.Postgres.KeepAlive
-#   Time in seconds for waiting before unused connections will be closed.
-#
-# Mandatory: no
-# Range: 60-900
-# Default:
-# Plugins.Postgres.KeepAlive=300
-
-### Option: Plugins.Postgres.CustomQueriesPath
-#	Full pathname of a directory containing *.sql* files with custom queries.
-#
-# Mandatory: no
-# Default:
-# Plugins.Postgres.CustomQueriesPath=
-
-### Option: Plugins.Postgres.Sessions.*.Uri
-#	Connection string. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Postgres.Sessions.*.Uri=
-
-### Option: Plugins.Postgres.Sessions.*.User
-#	Username for session connection. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range: Must matches PostgreSQL user name.
-# Default:
-# Plugins.Postgres.Sessions.*.User=
-
-### Option: Plugins.Postgres.Sessions.*.Password
-#	Password for session connection. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Range: Must matches the Password format.
-# Default:
-# Plugins.Postgres.Sessions.*.Password=
-
-### Option: Plugins.Postgres.Sessions.*.Database
-#	Database for session connection. "*" should be replaced with a session name.
-#
-# Mandatory: no
-# Default:
-# Plugins.Postgres.Sessions.*.Database=
-
-### Option: Plugins.Postgres.Sessions.*.TLSConnect
-#	Encryption type for Postgres connection. "*" should be replaced with a session name.
-#		tls connection required     - required
-#		verifies certificates       - verify_ca
-#		verify certificates and ip  - verify_full
-#
-# Mandatory: no
-# Default:
-# Plugins.Postgres.Sessions.*.TLSConnect=
-
-### Option: Plugins.Postgres.Sessions.*.TLSCAFile
-#	Full pathname of a file containing the top-level CA(s) certificate
-#	peer certificate verification.
-#
-# Mandatory: no
-# Default:
-# Plugins.Postgres.Sessions.*.TLSCAFile=
-
-### Option: Plugins.Postgres.Sessions.*.TLSCertFile
-#	Full pathname of a file containing the postgres certificate or certificate chain.
-#
-# Mandatory: no
-# Default:
-# Plugins.Postgres.Sessions.*.TLSCertFile=
-
-### Option: Plugins.Postgres.Sessions.*.TLSKeyFile
-#	Full pathname of a file containing the postgres private key.
-#
-# Mandatory: no
-# Default:
-# Plugins.Postgres.Sessions.*.TLSKeyFile=
-
-### Option: Plugins.Postgres.Timeout
-#       The maximum time (in seconds) for waiting when a request has to be done.
-#
-# Mandatory: no
-# Range: 1-30
-# Default: global timeout
-
-### Option: Plugins.MQTT.Timeout
-#	The maximum time (in seconds) for connections, disconnections and subscribtions.
-#
-# Mandatory: no
-# Range: 1-30
-# Default: global timeout
-
-### Option: Plugins.Modbus.Timeout
-#	The maximum time (in seconds) for connections.
-#
-# Mandatory: no
-# Range: 1-30
-# Default: global timeout
-
-### Option: Plugins.Modbus.Sessions.*.Endpoint
-#	Endpoint is a connection string consisting of a protocol scheme, a host address and a port or seral port name and attributes.
-#
-# Mandatory: no
-
-### Option: Plugins.Modbus.Sessions.*.SlaveID
-#	Slave ID of modbus devices.
-#
-# Mandatory: no
-
-### Option: Plugins.Modbus.Sessions.*.Timeout
-#	The maximum time (in seconds) for connections.
-#
-# Mandatory: no
-# Range: 1-30
-# Default: plugin modbus timeout
-
-### Option: Plugins.Smart.Timeout
-#	The maximum time in seconds for waiting before smartctl execution is terminated.
-#	The timeout is for a single smartctl command line execution.
-#
-# Mandatory: no
-# Range: 1-30
-# Default: <Global timeout>
-# Plugins.Smart.Timeout=
-
-### Option: Plugins.Smart.Path
-#	Path to smartctl executable.
-#
-# Mandatory: no
-# Default: smartctl
-# Plugins.Smart.Path=
+# Include configuration files for plugins
+Include=.\zabbix_agent2.d\plugins.d\*.conf
diff --git a/src/go/conf/zabbix_web_service.conf b/src/go/conf/zabbix_web_service.conf
index 97a826b62ab..da449def13d 100644
--- a/src/go/conf/zabbix_web_service.conf
+++ b/src/go/conf/zabbix_web_service.conf
@@ -104,3 +104,12 @@ AllowedIP=127.0.0.1,::1
 # Mandatory: no
 # Default:
 # TLSKeyFile=
+
+### Option: IgnoreURLCertErrors
+#	Ignore TLS certificate errors when accessing Frontend URL
+#		0 - do not ignore
+#		1 - ignore
+#
+# Mandatory: no
+# Default:
+# IgnoreURLCertErrors=0
diff --git a/src/go/pkg/conf/conf.go b/src/go/pkg/conf/conf.go
index 266cd7d89da..95461c25b84 100644
--- a/src/go/pkg/conf/conf.go
+++ b/src/go/pkg/conf/conf.go
@@ -48,6 +48,18 @@ type Suffix struct {
 	factor int
 }
 
+var currentConfigPath string
+
+// setCurrentConfigPath sets a path of the current config file.
+func setCurrentConfigPath(path string) {
+	currentConfigPath = path
+}
+
+// GetCurrentConfigPath returns a path of the current config file.
+func GetCurrentConfigPath() string {
+	return currentConfigPath
+}
+
 func validateParameterName(key []byte) (err error) {
 	for i, b := range key {
 		if ('A' > b || b > 'Z') && ('a' > b || b > 'z') && ('0' > b || b > '9') && b != '_' && b != '.' {
@@ -393,6 +405,22 @@ func hasMeta(path string) bool {
 }
 
 func loadInclude(root *Node, path string) (err error) {
+	path = filepath.Clean(path)
+	if err := checkGlobPattern(path); err != nil {
+		return newIncludeError(root, &path, err.Error())
+	}
+
+	absPath, err := filepath.Abs(path)
+	if err != nil {
+		return newIncludeError(root, &path, err.Error())
+	}
+
+	// If a path is relative, pad it with a directory of the current config file
+	if path != absPath {
+		confDir := filepath.Dir(GetCurrentConfigPath())
+		path = filepath.Join(confDir, path)
+	}
+
 	if hasMeta(filepath.Dir(path)) {
 		return newIncludeError(root, &path, "glob pattern is supported only in file names")
 	}
@@ -432,9 +460,6 @@ func loadInclude(root *Node, path string) (err error) {
 		if fi.IsDir() {
 			continue
 		}
-		if !filepath.IsAbs(path) {
-			return newIncludeError(root, &path, "relative paths are not supported")
-		}
 
 		var file std.File
 		if file, err = stdOs.Open(path); err != nil {
@@ -454,6 +479,34 @@ func loadInclude(root *Node, path string) (err error) {
 	return
 }
 
+func checkGlobPattern(path string) error {
+	if strings.HasPrefix(path, "*") {
+		return errors.New("path should be absolute")
+	}
+
+	var isGlob, hasSepLeft, hasSepRight bool
+
+	for _, p := range path {
+		switch p {
+		case '*':
+			isGlob = true
+		case filepath.Separator:
+			switch isGlob {
+			case true:
+				hasSepRight = true
+			case false:
+				hasSepLeft = true
+			}
+		}
+	}
+
+	if (isGlob && !hasSepLeft && hasSepRight) || (isGlob && !hasSepLeft && !hasSepRight) {
+		return errors.New("path should be absolute")
+	}
+
+	return nil
+}
+
 func parseConfig(root *Node, data []byte) (err error) {
 	const maxStringLen = 2048
 	var line []byte
@@ -483,11 +536,11 @@ func parseConfig(root *Node, data []byte) (err error) {
 		if key, value, err = parseLine(line); err != nil {
 			return fmt.Errorf("cannot parse configuration at line %d: %s", num, err.Error())
 		}
+
 		if string(key) == "Include" {
 			if root.level == 10 {
 				return fmt.Errorf("include depth exceeded limits")
 			}
-
 			if err = loadInclude(root, string(value)); err != nil {
 				return
 			}
@@ -570,6 +623,8 @@ func Load(filename string, v interface{}) (err error) {
 		return fmt.Errorf("cannot load configuration: %s", err.Error())
 	}
 
+	setCurrentConfigPath(filename)
+
 	return Unmarshal(buf.Bytes(), v)
 }
 
diff --git a/src/go/pkg/conf/conf_test.go b/src/go/pkg/conf/conf_test.go
index 4c62fc440fd..9fd0176fa6b 100644
--- a/src/go/pkg/conf/conf_test.go
+++ b/src/go/pkg/conf/conf_test.go
@@ -1,3 +1,4 @@
+//go:build linux && amd64
 // +build linux,amd64
 
 /*
@@ -506,3 +507,32 @@ func TestRawAccess(t *testing.T) {
 		t.Errorf("Expected '%+v' while got '%+v'", expectedOpts, returnedOpts)
 	}
 }
+
+func Test_checkGlobPattern(t *testing.T) {
+	type args struct {
+		path string
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{"+no_glob", args{"/foo/bar"}, false},
+		{"+glob", args{"/foo/bar/*.conf"}, false},
+		{"+glob_only", args{"/foo/bar/*"}, false},
+		{"+glob_in_name", args{"/foo/bar/foo*bar.conf"}, false},
+		{"+relative_name_with_glob", args{"./foo*bar"}, false},
+		{"+empty", args{""}, false},
+		{"-name_only_with_glob", args{"foo*bar"}, true},
+		{"-name_start_glob", args{"*bar"}, true},
+		{"-invalid_prefix", args{"*/foo/bar"}, true},
+		{"-invalid_string", args{"*"}, true},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := checkGlobPattern(tt.args.path); (err != nil) != tt.wantErr {
+				t.Errorf("checkGlobPattern() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
diff --git a/src/go/pkg/procfs/procfs.go b/src/go/pkg/procfs/procfs.go
index 649a014d0ce..1cdb32a5c80 100644
--- a/src/go/pkg/procfs/procfs.go
+++ b/src/go/pkg/procfs/procfs.go
@@ -38,7 +38,7 @@ const (
 )
 
 // GetMemory reads /proc/meminfo file and returns and returns the value in bytes for the
-// specific memory type. Returns an error if the value was not found, or if theres is an issue
+// specific memory type. Returns an error if the value was not found, or if there is an issue
 // with reading the file or parsing the value.
 func GetMemory(memType string) (mem uint64, err error) {
 	meminfo, err := ReadAll("/proc/meminfo")
@@ -89,7 +89,7 @@ func ReadAll(filename string) (data []byte, err error) {
 
 // ByteFromProcFileData returns the value in bytes of the provided value name from the provided
 // process file data. Returns true if the value is found, and false if it is not or if there is an
-// error. Returns an error if the theres is an issue with parsing values.
+// error. Returns an error if the there is an issue with parsing values.
 func ByteFromProcFileData(data []byte, valueName string) (uint64, bool, error) {
 	for _, line := range strings.Split(string(data), "\n") {
 		i := strings.Index(line, ":")
diff --git a/src/go/pkg/uri/uri.go b/src/go/pkg/uri/uri.go
index 772d99c6edc..50a4a095d06 100644
--- a/src/go/pkg/uri/uri.go
+++ b/src/go/pkg/uri/uri.go
@@ -38,6 +38,7 @@ type URI struct {
 	user     string
 	password string
 	rawUri   string
+	path     string
 }
 
 func (u *URI) Scheme() string {
@@ -56,6 +57,14 @@ func (u *URI) Port() string {
 	return u.port
 }
 
+func (u *URI) Query() string {
+	return u.rawQuery
+}
+
+func (u *URI) Path() string {
+	return u.path
+}
+
 func (u *URI) GetParam(key string) string {
 	params, err := url.ParseQuery(u.rawQuery)
 	if err != nil {
@@ -109,7 +118,6 @@ func (u *URI) String() string {
 		} else {
 			t.User = url.User(u.user)
 		}
-
 	}
 
 	return t.String()
@@ -192,6 +200,7 @@ func New(rawUri string, defaults *Defaults) (res *URI, err error) {
 
 		res.host = u.Hostname()
 		res.port = port
+		res.path = u.Path
 	}
 
 	res.rawQuery = u.RawQuery
@@ -235,3 +244,40 @@ func (v URIValidator) Validate(value *string) error {
 
 	return nil
 }
+
+func IsHostnameOnly(host string) error {
+	if strings.Contains(host, ":/") {
+		return fmt.Errorf("must not contain scheme")
+	}
+
+	uri, err := New(host, &Defaults{Port: "", Scheme: ""})
+	if err != nil {
+		return err
+	}
+
+	if uri.Port() != "" {
+		return fmt.Errorf("must not contain port")
+	}
+
+	if uri.Socket() != "" {
+		return fmt.Errorf("must not contain socket")
+	}
+
+	if uri.User() != "" {
+		return fmt.Errorf("must not contain user")
+	}
+
+	if uri.Password() != "" {
+		return fmt.Errorf("must not contain password")
+	}
+
+	if uri.Query() != "" {
+		return fmt.Errorf("must not contain query")
+	}
+
+	if uri.Path() != "" {
+		return fmt.Errorf("must not contain path")
+	}
+
+	return nil
+}
diff --git a/src/go/pkg/uri/uri_test.go b/src/go/pkg/uri/uri_test.go
index 25ac0bf6f89..8ce81588ad8 100644
--- a/src/go/pkg/uri/uri_test.go
+++ b/src/go/pkg/uri/uri_test.go
@@ -179,6 +179,12 @@ func TestNew(t *testing.T) {
 			false,
 		},
 		{
+			"Parse URI with scheme, path and port, defaults are not set",
+			args{"http://localhost:80/foo/bar", nil},
+			&URI{scheme: "http", host: "localhost", port: "80", rawUri: "http://localhost:80/foo/bar", path: "/foo/bar"},
+			false,
+		},
+		{
 			"Parse URI without scheme and port, defaults are not set",
 			args{"localhost", nil},
 			&URI{scheme: "tcp", host: "localhost", rawUri: "localhost"},
@@ -411,3 +417,32 @@ func TestURIValidator_Validate(t *testing.T) {
 		})
 	}
 }
+
+func TestIsHostnameOnly(t *testing.T) {
+	type args struct {
+		host string
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		{"valid_hostname", args{"example.com"}, false},
+		{"valid_hostname_2", args{"www.example.com"}, false},
+		{"ip", args{"1.2.3.4"}, false},
+		{"full_url", args{"https://www.example.com/foo/bar.tst?foo=example&bar=test"}, true},
+		{"scheme_url", args{"https://www.example.com"}, true},
+		{"path", args{"www.example.com/foo/bar.tst"}, true},
+		{"query", args{"www.example.com?foo=example&bar=test"}, true},
+		{"user_and_password", args{"username:password@example.com/"}, true},
+		{"port", args{"example.com:443"}, true},
+		{"fake_port", args{"example.com:abc"}, true},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if err := IsHostnameOnly(tt.args.host); (err != nil) != tt.wantErr {
+				t.Errorf("IsHostnameOnly() error = %v, wantErr %v", err, tt.wantErr)
+			}
+		})
+	}
+}
diff --git a/src/go/pkg/version/version.go b/src/go/pkg/version/version.go
index 83ed5d39fc2..d8ae4feb809 100644
--- a/src/go/pkg/version/version.go
+++ b/src/go/pkg/version/version.go
@@ -26,11 +26,11 @@ import (
 )
 
 const (
-	ZABBIX_REVDATE          = "20 September 2021"
+	ZABBIX_REVDATE          = "6 October 2021"
 	ZABBIX_VERSION_MAJOR    = 6
 	ZABBIX_VERSION_MINOR    = 0
 	ZABBIX_VERSION_PATCH    = 0
-	ZABBIX_VERSION_RC       = "alpha4"
+	ZABBIX_VERSION_RC       = "alpha5"
 	ZABBIX_VERSION_RC_NUM   = "{ZABBIX_RC_NUM}"
 	ZABBIX_VERSION_REVISION = "{ZABBIX_REVISION}"
 	copyrightMessage        = "Copyright (C) 2021 Zabbix SIA\n" +
diff --git a/src/go/pkg/zbxcomms/comms_test.go b/src/go/pkg/zbxcomms/comms_test.go
index eb83ab70a13..846c9c38905 100644
--- a/src/go/pkg/zbxcomms/comms_test.go
+++ b/src/go/pkg/zbxcomms/comms_test.go
@@ -103,7 +103,7 @@ func TestReceive(t *testing.T) {
 			data, err := c.read(m, nil)
 			if err == nil {
 				if result.failed {
-					t.Errorf("Expcted error while got success")
+					t.Errorf("Expected error while got success")
 				} else {
 					var buffer bytes.Buffer
 					for j := 0; j < len(result.data); j++ {
diff --git a/src/go/plugins/ceph/README.md b/src/go/plugins/ceph/README.md
index c5fe623fd46..7b5f97b3cff 100644
--- a/src/go/plugins/ceph/README.md
+++ b/src/go/plugins/ceph/README.md
@@ -13,7 +13,7 @@ You can extend it or create your template for your specific needs.
 * Ceph, version 14+
 
 ## Installation
-* Configure the Ceph RESTful Module according to [documentation.](https://docs.ceph.com/en/latest/mgr/restful/)  
+* Configure the Ceph RESTful Module according to [documentation.](https://docs.ceph.com/en/latest/mgr/restful/)
 * Make sure a RESTful API endpoint is available for connection.  
 
 ## Configuration
@@ -21,9 +21,9 @@ The Zabbix agent 2 configuration file is used to configure plugins.
 
 **Plugins.Ceph.InsecureSkipVerify** — InsecureSkipVerify controls whether an http client verifies the
 server's certificate chain and host name. If InsecureSkipVerify is true, TLS accepts any certificate presented by 
-the server and any host name in that certificate. In this mode, TLS is susceptible to man-in-the-middle attacks.  
+the server and any host name in that certificate. In this mode, TLS is susceptible to man-in-the-middle attacks. 
 **This should be used only for testing.**  
-*Default value:* false  
+*Default value:* false
 *Limits:* false | true
 
 **Plugins.Ceph.Timeout** — The maximum time in seconds for waiting when a request has to be done. The timeout includes 
@@ -31,8 +31,8 @@ connection time, any redirects, and reading the response body.
 *Default value:* equals the global Timeout configuration parameter.  
 *Limits:* 1-30
 
-**Plugins.Ceph.KeepAlive** — Sets a time for waiting before unused connections will be closed.  
-*Default value:* 300 sec.  
+**Plugins.Ceph.KeepAlive** — Sets a time for waiting before unused connections will be closed. 
+*Default value:* 300 sec.
 *Limits:* 60-900
 
 ### Configuring connection
diff --git a/src/go/plugins/postgres/conn.go b/src/go/plugins/postgres/conn.go
index de9a22188c2..041a6584e22 100755
--- a/src/go/plugins/postgres/conn.go
+++ b/src/go/plugins/postgres/conn.go
@@ -73,7 +73,7 @@ func (conn *PGConn) Query(ctx context.Context, query string, args ...interface{}
 	return
 }
 
-// QueryByName executes a query from queryStorage by its name and returns a singe row.
+// QueryByName executes a query from queryStorage by its name and returns a single row.
 func (conn *PGConn) QueryByName(ctx context.Context, queryName string, args ...interface{}) (rows *sql.Rows, err error) {
 	if sql, ok := (*conn.queryStorage).Get(queryName + sqlExt); ok {
 		normalizedSQL := strings.TrimRight(strings.TrimSpace(sql), ";")
@@ -95,7 +95,7 @@ func (conn *PGConn) QueryRow(ctx context.Context, query string, args ...interfac
 	return
 }
 
-// QueryRowByName executes a query from queryStorage by its name and returns a singe row.
+// QueryRowByName executes a query from queryStorage by its name and returns a single row.
 func (conn *PGConn) QueryRowByName(ctx context.Context, queryName string, args ...interface{}) (row *sql.Row, err error) {
 	if sql, ok := (*conn.queryStorage).Get(queryName + sqlExt); ok {
 		normalizedSQL := strings.TrimRight(strings.TrimSpace(sql), ";")
diff --git a/src/go/plugins/web/certificate/certificate.go b/src/go/plugins/web/certificate/certificate.go
index 50a332d6eb5..93f065abe6a 100644
--- a/src/go/plugins/web/certificate/certificate.go
+++ b/src/go/plugins/web/certificate/certificate.go
@@ -27,6 +27,7 @@ import (
 	"errors"
 	"fmt"
 	"net"
+	"strings"
 	"time"
 
 	"zabbix.com/pkg/conf"
@@ -102,12 +103,12 @@ func (p *Plugin) Export(key string, params []string, ctx plugin.ContextProvider)
 }
 
 func (p *Plugin) webCertificateGet(params []string) (interface{}, error) {
-	hostname, port, domain, err := getParameters(params)
+	address, port, domain, err := getParameters(params)
 	if err != nil {
 		return nil, zbxerr.ErrorInvalidParams.Wrap(err)
 	}
 
-	certs, err := getCertificatesPEM(fmt.Sprintf("%s:%s", hostname, port), domain, p.options.Timeout)
+	certs, err := getCertificatesPEM(fmt.Sprintf("%s:%s", address, port), domain, p.options.Timeout)
 	if err != nil {
 		return nil, zbxerr.ErrorCannotFetchData.Wrap(err)
 	}
@@ -180,41 +181,100 @@ func getValidationResult(leaf *x509.Certificate, opts x509.VerifyOptions, subjec
 	return out
 }
 
-func getParameters(params []string) (hostname, port, domain string, err error) {
+func getParameters(params []string) (address, port, domain string, err error) {
 	switch len(params) {
 	case allParameters:
-		hostname, port, err = parseURL(params[0], params[1])
-		domain = hostname
-
-		if params[2] != "" {
-			hostname, port, err = parseURL(params[2], params[1])
-		}
+		address, port, domain, err = getParsedParameters(params)
 	case noThirdParameter:
-		hostname, port, err = parseURL(params[0], params[1])
-		domain = hostname
+		address, port, err = parseURL(params[0], params[1])
+		domain = address
 	case onlyFirstParameter:
-		hostname, port, err = parseURL(params[0], "")
-		domain = hostname
+		address, port, err = parseURL(params[0], "")
+		domain = address
 	case emptyParameters:
-		err = zbxerr.ErrorTooFewParameters
+		return "", "", "", zbxerr.ErrorTooFewParameters
 	default:
-		err = zbxerr.ErrorTooManyParameters
+		return "", "", "", zbxerr.ErrorTooManyParameters
+	}
+
+	return
+}
+
+func checkForIPv6(address string) error {
+	if isIpV6(net.ParseIP(cutBrackets(address))) {
+		return zbxerr.New(fmt.Sprintf("%s can not be ipv6", address))
+	}
+
+	return nil
+}
+
+func getParsedParameters(params []string) (address, port, domain string, err error) {
+	address, port, err = parseURL(params[0], params[1])
+	if err != nil {
+		return
+	}
+
+	domain = address
+
+	if params[2] == "" {
+		return
+	}
+
+	if ip := net.ParseIP(cutBrackets(params[2])); ip != nil {
+		address, port, err = parseURL(params[2], params[1])
+		if err != nil {
+			return "", "", "", fmt.Errorf("failed to parse ip %s, and port %s, %s", params[2], params[1], err.Error())
+		}
+
+		return
+	}
+
+	if err = uri.IsHostnameOnly(params[2]); err != nil {
+		return "", "", "", fmt.Errorf("failed to parse host %s, %s, required: hostname or IPv4", params[2], err.Error())
 	}
 
+	domain = params[2]
+
 	return
 }
 
+func cutBrackets(in string) string {
+	return strings.TrimSuffix(strings.TrimPrefix(in, "["), "]")
+}
+
+func isIpV6(ip net.IP) bool {
+	if ip.To4() != nil {
+		return false
+	}
+
+	if ip.To16() != nil {
+		return true
+	}
+
+	return false
+}
+
 func parseURL(url, port string) (string, string, error) {
-	uri, err := uri.New(url, &uri.Defaults{Port: port, Scheme: "https"})
+	// must be checked before url.New because url.New can not parse `::1` .
+	if err := checkForIPv6(url); err != nil {
+		return "", "", err
+	}
+
+	u, err := uri.New(url, &uri.Defaults{Port: port, Scheme: "https"})
 	if err != nil {
 		return "", "", err
 	}
 
-	if uri.Scheme() != "" && uri.Scheme() != "https" {
+	// must be checked after the url is created to rule out full IPv6 with scheme.
+	if err := checkForIPv6(u.Host()); err != nil {
+		return "", "", err
+	}
+
+	if u.Scheme() != "" && u.Scheme() != "https" {
 		return "", "", errors.New("scheme must be https")
 	}
 
-	return getHostAndPort(uri, port)
+	return getHostAndPort(u, port)
 }
 
 func getHostAndPort(uri *uri.URI, port string) (string, string, error) {
diff --git a/src/go/plugins/web/certificate/certificate_test.go b/src/go/plugins/web/certificate/certificate_test.go
index af68c815af9..395505b83d7 100644
--- a/src/go/plugins/web/certificate/certificate_test.go
+++ b/src/go/plugins/web/certificate/certificate_test.go
@@ -41,6 +41,11 @@ func Test_getParameters(t *testing.T) {
 		{"+full", args{[]string{"example.com", "443", "127.0.0.1"}}, "127.0.0.1", "443", "example.com", false},
 		{"+empty_port", args{[]string{"example.com", "", "127.0.0.1"}}, "127.0.0.1", "443", "example.com", false},
 		{"+empty_port_and_ip", args{[]string{"example.com", "", ""}}, "example.com", "443", "example.com", false},
+		{"+two_params", args{[]string{"example.com", "443"}}, "example.com", "443", "example.com", false},
+		{"+two_params_port_with_host", args{[]string{"example.com:443", ""}}, "example.com", "443", "example.com", false},
+		{"+two_params_full", args{[]string{"example.com:443", "443"}}, "example.com", "443", "example.com", false},
+		{"-full_ipv6", args{[]string{"example.com", "443", "::1"}}, "", "", "", true},
+		{"-full_ipv6_first", args{[]string{"::1", "443", ""}}, "", "", "", true},
 		{"-too_many_params", args{[]string{"example.com", "443", "127.0.0.1", "foobar"}}, "", "", "", true},
 		{"-too_few_params", args{[]string{}}, "", "", "", true},
 	}
@@ -65,7 +70,78 @@ func Test_getParameters(t *testing.T) {
 	}
 }
 
-func Test_validateURL(t *testing.T) {
+func Test_parseParameters(t *testing.T) {
+	type args struct {
+		params []string
+	}
+	tests := []struct {
+		name        string
+		args        args
+		wantAddress string
+		wantPort    string
+		wantDomain  string
+		wantErr     bool
+	}{
+		{"+1st_param_hostname", args{[]string{"example.com", "443", "1.2.3.4"}}, "1.2.3.4", "443", "example.com", false},
+		{"+1st_param_hostname_full",
+			args{[]string{"https://www.example.com", "443", "1.2.3.4"}}, "1.2.3.4", "443", "www.example.com", false,
+		},
+		{"+3rd_param_hostname", args{[]string{"1.2.3.4", "443", "example.com"}}, "1.2.3.4", "443", "example.com", false},
+		{"+1st_param_full",
+			args{[]string{"https://1.2.3.4:443", "443", "example.com"}}, "1.2.3.4", "443", "example.com", false,
+		},
+		{"+empty_3rdParam", args{[]string{"example.com", "443", ""}}, "example.com", "443", "example.com", false},
+		{"-ipv6", args{[]string{"example.com", "443", "::1"}}, "", "", "", true},
+		{"-ipv6_brackets", args{[]string{"example.com", "443", "[::1]"}}, "", "", "", true},
+		{"-not_ip", args{[]string{"example.com", "443", "www.example.com"}}, "example.com", "443", "www.example.com", false},
+		{"-3rd_param_not_hostname", args{[]string{"1.2.3.4", "443", "https://www.example.com"}}, "", "", "", true},
+		{"-1st_param_http", args{[]string{"http://1.2.3.4:443", "443", "example.com"}}, "", "", "", true},
+		{"-not_http", args{[]string{"http://1.2.3.4:443", "443", "example.com"}}, "", "", "", true},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotHost, gotPort, gotDomain, err := getParsedParameters(tt.args.params)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("parseParameters() error = %v, wantErr %v", err, tt.wantErr)
+
+				return
+			}
+			if gotHost != tt.wantAddress {
+				t.Errorf("parseParameters() gotAddress = %v, want %v", gotHost, tt.wantAddress)
+			}
+			if gotPort != tt.wantPort {
+				t.Errorf("parseParameters() gotPort = %v, want %v", gotPort, tt.wantPort)
+			}
+			if gotDomain != tt.wantDomain {
+				t.Errorf("parseParameters() gotDomain = %v, want %v", gotDomain, tt.wantDomain)
+			}
+		})
+	}
+}
+
+func Test_cutBrackets(t *testing.T) {
+	type args struct {
+		in string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{"+ipv6", args{"[::1]"}, "::1"},
+		{"+ipv4", args{"127.0.0.1"}, "127.0.0.1"},
+		{"+empty", args{""}, ""},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := cutBrackets(tt.args.in); got != tt.want {
+				t.Errorf("cutBrackets() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_parseURL(t *testing.T) {
 	type args struct {
 		url  string
 		port string
@@ -91,6 +167,11 @@ func Test_validateURL(t *testing.T) {
 		{"+path_port", args{"www.google.com:443/foo/bar", "443"}, "www.google.com", "443", false},
 		{"+full_path", args{"https://www.google.com:443/foo/bar", "443"}, "www.google.com", "443", false},
 		{"+ip", args{"https://127.0.0.1:443", "443"}, "127.0.0.1", "443", false},
+		{"+ipv6_full", args{"https://::1:443", "443"}, "", "", true},
+		{"+ipv6_full_brackets", args{"https://[::1]:443", "443"}, "", "", true},
+		{"+ipv6_brackets", args{"[::1]", "443"}, "", "", true},
+		{"+ipv6_port_both_brackets", args{"[::1]:443", "443"}, "", "", true},
+		{"+ip", args{"https://127.0.0.1:443", "443"}, "127.0.0.1", "443", false},
 		{"-mismatch_port", args{"www.google.com:123", "443"}, "", "", true},
 		{"-invalid_url", args{"www.google.com:999999", ""}, "", "", true},
 		{"-invalid_scheme", args{"http://www.google.com", ""}, "", "", true},
diff --git a/src/libs/zbxalgo/algodefs.c b/src/libs/zbxalgo/algodefs.c
index 0b2a5c7d852..66e4913ccde 100644
--- a/src/libs/zbxalgo/algodefs.c
+++ b/src/libs/zbxalgo/algodefs.c
@@ -330,6 +330,16 @@ int	zbx_default_uint64_pair_compare_func(const void *d1, const void *d2)
 	return 0;
 }
 
+int	zbx_default_dbl_compare_func(const void *d1, const void *d2)
+{
+	const double	*p1 = (const double *)d1;
+	const double	*p2 = (const double *)d2;
+
+	ZBX_RETURN_IF_DBL_NOT_EQUAL(*p1, *p2);
+
+	return 0;
+}
+
 /* default memory management functions */
 
 void	*zbx_default_mem_malloc_func(void *old, size_t size)
diff --git a/src/libs/zbxalgo/prediction.c b/src/libs/zbxalgo/prediction.c
index 62ad1617728..d5ddd293445 100644
--- a/src/libs/zbxalgo/prediction.c
+++ b/src/libs/zbxalgo/prediction.c
@@ -737,9 +737,9 @@ static int	zbx_polynomial_minmax(double now, double time, zbx_mode_t mode, zbx_m
 	if (SUCCEED != (res = zbx_polynomial_roots(derivative, derivative_roots)))
 		goto out;
 
-	/* choose min and max among now, now + time and derivative roots inbetween (these are potential local extrema) */
-	/* we ignore imaginary part of roots, this means that more calculations will be made, */
-	/* but result will not be affected and we wont need a boundary on minimal imaginary part that differs from zero */
+	/* Choose min and max among now, now + time and derivative roots in between (these are potential local      */
+	/* extrema). We ignore imaginary part of roots. This means that more calculations will be made, but result  */
+	/* will not be affected and we won't need a boundary on minimal imaginary part that differs from zero.      */
 
 	min = zbx_polynomial_value(now, coefficients);
 	tmp = zbx_polynomial_value(now + time, coefficients);
diff --git a/src/libs/zbxaudit/audit.c b/src/libs/zbxaudit/audit.c
index 061f53bd15c..0ae7b0907e9 100644
--- a/src/libs/zbxaudit/audit.c
+++ b/src/libs/zbxaudit/audit.c
@@ -40,22 +40,25 @@ zbx_hashset_t	*zbx_get_audit_hashset(void)
 	return &zbx_audit;
 }
 
-zbx_audit_entry_t	*zbx_audit_entry_init(zbx_uint64_t id, const char *name, int audit_action, int resource_type)
+zbx_audit_entry_t	*zbx_audit_entry_init(zbx_uint64_t id, const int id_table, const char *name, int audit_action,
+		int resource_type)
 {
 	zbx_audit_entry_t	*audit_entry;
 
 	audit_entry = (zbx_audit_entry_t*)zbx_malloc(NULL, sizeof(zbx_audit_entry_t));
 	audit_entry->id = id;
 	audit_entry->cuid = NULL;
+	audit_entry->id_table = id_table;
 	audit_entry->name = zbx_strdup(NULL, name);
 	audit_entry->audit_action = audit_action;
 	audit_entry->resource_type = resource_type;
+	zbx_new_cuid(audit_entry->audit_cuid);
 	zbx_json_init(&(audit_entry->details_json), ZBX_JSON_STAT_BUF_LEN);
 
 	return audit_entry;
 }
 
-zbx_audit_entry_t	*zbx_audit_entry_init_cuid(const char *cuid, const char *name, int audit_action,
+zbx_audit_entry_t	*zbx_audit_entry_init_cuid(const char *cuid, const int id_table, const char *name, int audit_action,
 		int resource_type)
 {
 	zbx_audit_entry_t	*audit_entry;
@@ -63,9 +66,11 @@ zbx_audit_entry_t	*zbx_audit_entry_init_cuid(const char *cuid, const char *name,
 	audit_entry = (zbx_audit_entry_t*)zbx_malloc(NULL, sizeof(zbx_audit_entry_t));
 	audit_entry->id = 0;
 	audit_entry->cuid = zbx_strdup(NULL, cuid);
+	audit_entry->id_table = id_table;
 	audit_entry->name = zbx_strdup(NULL, name);
 	audit_entry->audit_action = audit_action;
 	audit_entry->resource_type = resource_type;
+	zbx_new_cuid(audit_entry->audit_cuid);
 	zbx_json_init(&(audit_entry->details_json), ZBX_JSON_STAT_BUF_LEN);
 
 	return audit_entry;
@@ -168,10 +173,10 @@ int	zbx_auditlog_global_script(unsigned char script_type, unsigned char script_e
 		zbx_uint64_t proxy_hostid, zbx_uint64_t userid, const char *username, const char *clientip,
 		const char *output, const char *error)
 {
-	int	ret = SUCCEED;
-	char	auditid_cuid[CUID_LEN], execute_on_s[MAX_ID_LEN + 1], hostid_s[MAX_ID_LEN + 1],
-		eventid_s[MAX_ID_LEN + 1], proxy_hostid_s[MAX_ID_LEN + 1];
-
+	int		ret = SUCCEED;
+	char		auditid_cuid[CUID_LEN], execute_on_s[MAX_ID_LEN + 1], hostid_s[MAX_ID_LEN + 1],
+			eventid_s[MAX_ID_LEN + 1], proxy_hostid_s[MAX_ID_LEN + 1];
+	char		*details_esc;
 	struct zbx_json	details_json;
 	zbx_config_t	cfg;
 
@@ -209,27 +214,24 @@ int	zbx_auditlog_global_script(unsigned char script_type, unsigned char script_e
 		append_str_json(&details_json, AUDIT_DETAILS_ACTION_ADD, "script.command", script_command_orig);
 
 	if (NULL != output)
-	{
-		char	*output_esc;
-
-		output_esc = zbx_strdup(NULL, output);
-		zbx_json_escape(&output_esc);
-		append_str_json(&details_json, AUDIT_DETAILS_ACTION_ADD, "script.output", output_esc);
-		zbx_free(output_esc);
-	}
+		append_str_json(&details_json, AUDIT_DETAILS_ACTION_ADD, "script.output", output);
 
 	if (NULL != error)
 		append_str_json(&details_json, AUDIT_DETAILS_ACTION_ADD, "script.error", error);
 
+	details_esc = DBdyn_escape_string(details_json.buffer);
+
 	if (ZBX_DB_OK > DBexecute("insert into auditlog (auditid,userid,username,clock,action,ip,resourceid,"
 			"resourcename,resourcetype,recordsetid,details) values ('%s'," ZBX_FS_UI64 ",'%s',%d,'%d','%s',"
 			ZBX_FS_UI64 ",'%s',%d,'%s','%s')", auditid_cuid, userid, username, (int)time(NULL),
 			AUDIT_ACTION_EXECUTE, clientip, hostid, hostname, AUDIT_RESOURCE_SCRIPT, auditid_cuid,
-			details_json.buffer))
+			details_esc))
 	{
 		ret = FAIL;
 	}
 
+	zbx_free(details_esc);
+
 	zbx_json_free(&details_json);
 out:
 	zabbix_log(LOG_LEVEL_TRACE, "End of %s():%s", __func__, zbx_result_string(ret));
@@ -239,15 +241,15 @@ out:
 
 static unsigned	zbx_audit_hash_func(const void *data)
 {
-	const zbx_audit_entry_t	* const *audit_entry = (const zbx_audit_entry_t * const *)data;
 	zbx_hash_t	hash;
+	const zbx_audit_entry_t	* const *audit_entry = (const zbx_audit_entry_t * const *)data;
 
 	hash = ZBX_DEFAULT_UINT64_HASH_FUNC(&(*audit_entry)->id);
 
 	if (NULL != (*audit_entry)->cuid)
 		hash = ZBX_DEFAULT_STRING_HASH_ALGO((*audit_entry)->cuid, strlen((*audit_entry)->cuid), hash);
 
-	return hash;
+	return ZBX_DEFAULT_UINT64_HASH_ALGO(&((*audit_entry)->id_table), sizeof((*audit_entry)->id_table), hash);
 }
 
 static int	zbx_audit_compare_func(const void *d1, const void *d2)
@@ -256,6 +258,7 @@ static int	zbx_audit_compare_func(const void *d1, const void *d2)
 	const zbx_audit_entry_t	* const *audit_entry_2 = (const zbx_audit_entry_t * const *)d2;
 
 	ZBX_RETURN_IF_NOT_EQUAL((*audit_entry_1)->id, (*audit_entry_2)->id);
+	ZBX_RETURN_IF_NOT_EQUAL((*audit_entry_1)->id_table, (*audit_entry_2)->id_table);
 
 	return zbx_strcmp_null((*audit_entry_1)->cuid, (*audit_entry_2)->cuid);
 }
@@ -299,7 +302,7 @@ int	zbx_audit_initialized(void)
 
 void	zbx_audit_flush(void)
 {
-	char			audit_cuid[CUID_LEN], recsetid_cuid[CUID_LEN];
+	char			recsetid_cuid[CUID_LEN];
 	zbx_hashset_iter_t	iter;
 	zbx_audit_entry_t	**audit_entry;
 	zbx_db_insert_t		db_insert_audit;
@@ -314,15 +317,18 @@ void	zbx_audit_flush(void)
 
 	while (NULL != (audit_entry = (zbx_audit_entry_t **)zbx_hashset_iter_next(&iter)))
 	{
-		zbx_new_cuid(audit_cuid);
 		if (AUDIT_ACTION_DELETE == (*audit_entry)->audit_action ||
 				0 != strcmp((*audit_entry)->details_json.buffer, "{}"))
 		{
-			zbx_db_insert_add_values(&db_insert_audit, audit_cuid, AUDIT_USERID, AUDIT_USERNAME,
-					(int)time(NULL), (*audit_entry)->audit_action, AUDIT_IP, (*audit_entry)->id,
-					(*audit_entry)->name, (*audit_entry)->resource_type,
-					recsetid_cuid, 0 == strcmp((*audit_entry)->details_json.buffer, "{}") ? "" :
-					(*audit_entry)->details_json.buffer);
+			char	*details_esc;
+
+			details_esc = DBdyn_escape_string((*audit_entry)->details_json.buffer);
+
+			zbx_db_insert_add_values(&db_insert_audit, (*audit_entry)->audit_cuid, AUDIT_USERID,
+					AUDIT_USERNAME, (int)time(NULL), (*audit_entry)->audit_action, AUDIT_IP,
+					(*audit_entry)->id, (*audit_entry)->name, (*audit_entry)->resource_type,
+					recsetid_cuid, 0 == strcmp(details_esc, "{}") ? "" : details_esc);
+			zbx_free(details_esc);
 		}
 	}
 
@@ -334,7 +340,7 @@ void	zbx_audit_flush(void)
 
 int	zbx_audit_flush_once(void)
 {
-	char			audit_cuid[CUID_LEN], recsetid_cuid[CUID_LEN];
+	char			recsetid_cuid[CUID_LEN];
 	int			ret = ZBX_DB_OK;
 	zbx_hashset_iter_t	iter;
 	zbx_audit_entry_t	**audit_entry;
@@ -347,7 +353,7 @@ int	zbx_audit_flush_once(void)
 
 	while (NULL != (audit_entry = (zbx_audit_entry_t **)zbx_hashset_iter_next(&iter)))
 	{
-		char id[ZBX_MAX_UINT64_LEN + 1], *pfield, *pvalue, *name_esc;
+		char id[ZBX_MAX_UINT64_LEN + 1], *pfield, *pvalue, *name_esc, *details_esc;
 
 		if (AUDIT_ACTION_DELETE != (*audit_entry)->audit_action &&
 				0 == strcmp((*audit_entry)->details_json.buffer, "{}"))
@@ -355,8 +361,6 @@ int	zbx_audit_flush_once(void)
 			continue;
 		}
 
-		zbx_new_cuid(audit_cuid);
-
 		if (0 != (*audit_entry)->id)
 		{
 			zbx_snprintf(id, sizeof(id), ZBX_FS_UI64, (*audit_entry)->id);
@@ -370,15 +374,16 @@ int	zbx_audit_flush_once(void)
 		}
 
 		name_esc = DBdyn_escape_string((*audit_entry)->name);
+		details_esc = DBdyn_escape_string((*audit_entry)->details_json.buffer);
 
 		ret = DBexecute_once("insert into auditlog (auditid,userid,username,"
 				"clock,action,ip,%s,resourcename,resourcetype,recordsetid,details) values"
 				" ('%s',%d,'%s','%d','%d','%s','%s','%s',%d,'%s','%s')",
-				pfield, audit_cuid, AUDIT_USERID, AUDIT_USERNAME, (int)time(NULL),
+				pfield, (*audit_entry)->audit_cuid, AUDIT_USERID, AUDIT_USERNAME, (int)time(NULL),
 				(*audit_entry)->audit_action, AUDIT_IP, pvalue, name_esc, (*audit_entry)->resource_type,
-				recsetid_cuid, 0 == strcmp((*audit_entry)->details_json.buffer, "{}") ? "" :
-						(*audit_entry)->details_json.buffer);
+				recsetid_cuid, 0 == strcmp(details_esc, "{}") ? "" : details_esc);
 
+		zbx_free(details_esc);
 		zbx_free(name_esc);
 
 		if (ZBX_DB_OK > ret)
@@ -390,15 +395,65 @@ int	zbx_audit_flush_once(void)
 	return ret;
 }
 
-void	zbx_audit_update_json_append_string(const zbx_uint64_t id, const char *audit_op, const char *key,
-		const char *value)
+static int	audit_field_default(const char *table_name, const char *field_name, const char *value, uint64_t id)
+{
+	static ZBX_THREAD_LOCAL char		cached_table_name[ZBX_TABLENAME_LEN_MAX];
+	static ZBX_THREAD_LOCAL const ZBX_TABLE	*table = NULL;
+	const ZBX_FIELD				*field;
+
+	if (NULL == table_name)
+		return FAIL;
+
+	/* Often 'table_name' stays the same and only 'field_name' changes in successive calls of this function. */
+	/* Here a simple caching of DBget_table() result is implemented. We rely on static array 'cached_table_name' */
+	/* initialization with zero bytes, i.e. with empty string. */
+
+	if ('\0' == cached_table_name[0] || 0 != strcmp(cached_table_name, table_name))
+	{
+		if (NULL == (table = DBget_table(table_name)))
+		{
+			zabbix_log(LOG_LEVEL_CRIT, "%s(): cannot find table '%s'", __func__, table_name);
+			THIS_SHOULD_NEVER_HAPPEN;
+			return FAIL;
+		}
+
+		zbx_strlcpy(cached_table_name, table_name, sizeof(cached_table_name));
+	}
+
+	if (NULL == (field = DBget_field(table, field_name)))
+	{
+		zabbix_log(LOG_LEVEL_CRIT, "%s(): table '%s', cannot find field '%s'", __func__, table_name,
+				field_name);
+		THIS_SHOULD_NEVER_HAPPEN;
+		return FAIL;
+	}
+
+	if (NULL != field->default_value)
+	{
+		if (NULL != value && (0 == strcmp(value, field->default_value) ||
+				(ZBX_TYPE_FLOAT == field->type && SUCCEED == zbx_double_compare(atof(value),
+				atof(field->default_value)))))
+		{
+			return SUCCEED;
+		}
+	}
+	else if (NULL == value || (ZBX_TYPE_ID == field->type && 0 == id))
+		return SUCCEED;
+
+	return FAIL;
+}
+
+void	zbx_audit_update_json_append_string(const zbx_uint64_t id, const int id_table, const char *audit_op,
+		const char *key, const char *value, const char *table, const char *field)
 {
 	zbx_audit_entry_t	local_audit_entry, **found_audit_entry;
 	zbx_audit_entry_t	*local_audit_entry_x = &local_audit_entry;
 
-	local_audit_entry.id = id;
-	local_audit_entry.cuid = NULL;
+	if (SUCCEED == audit_field_default(table, field, value, 0))
+		return;
 
+	local_audit_entry.id = id;
+	local_audit_entry.id_table = id_table;
 	found_audit_entry = (zbx_audit_entry_t**)zbx_hashset_search(&zbx_audit, &(local_audit_entry_x));
 
 	if (NULL == found_audit_entry)
@@ -410,15 +465,41 @@ void	zbx_audit_update_json_append_string(const zbx_uint64_t id, const char *audi
 	append_str_json(&((*found_audit_entry)->details_json), audit_op, key, value);
 }
 
-void	zbx_audit_update_json_append_uint64(const zbx_uint64_t id, const char *audit_op, const char *key,
-		uint64_t value)
+void	zbx_audit_update_json_append_string_secret(const zbx_uint64_t id, const int id_table, const char *audit_op,
+		const char *key, const char *value, const char *table, const char *field)
 {
 	zbx_audit_entry_t	local_audit_entry, **found_audit_entry;
 	zbx_audit_entry_t	*local_audit_entry_x = &local_audit_entry;
 
+	if (SUCCEED == audit_field_default(table, field, value, 0))
+		return;
+
 	local_audit_entry.id = id;
-	local_audit_entry.cuid = NULL;
+	local_audit_entry.id_table = id_table;
+	found_audit_entry = (zbx_audit_entry_t**)zbx_hashset_search(&zbx_audit, &(local_audit_entry_x));
+
+	if (NULL == found_audit_entry)
+	{
+		THIS_SHOULD_NEVER_HAPPEN;
+		exit(EXIT_FAILURE);
+	}
+
+	append_str_json(&((*found_audit_entry)->details_json), audit_op, key, ZBX_MACRO_SECRET_MASK);
+}
+
+void	zbx_audit_update_json_append_uint64(const zbx_uint64_t id, const int id_table, const char *audit_op,
+		const char *key, uint64_t value, const char *table, const char *field)
+{
+	char			buffer[MAX_ID_LEN];
+	zbx_audit_entry_t	local_audit_entry, **found_audit_entry;
+	zbx_audit_entry_t	*local_audit_entry_x = &local_audit_entry;
+
+	zbx_snprintf(buffer, sizeof(buffer), ZBX_FS_UI64, value);
+	if (SUCCEED == audit_field_default(table, field, buffer, value))
+		return;
 
+	local_audit_entry.id = id;
+	local_audit_entry.id_table = id_table;
 	found_audit_entry = (zbx_audit_entry_t**)zbx_hashset_search(&zbx_audit, &(local_audit_entry_x));
 
 	if (NULL == found_audit_entry)
@@ -435,8 +516,7 @@ void	zbx_audit_update_json_append_uint64(const zbx_uint64_t id, const char *audi
 	zbx_audit_entry_t	*local_audit_entry_x = &local_audit_entry;	\
 										\
 	local_audit_entry.id = id;						\
-	local_audit_entry.cuid = NULL;						\
-										\
+	local_audit_entry.id_table = id_table;					\
 	found_audit_entry = (zbx_audit_entry_t**)zbx_hashset_search(&zbx_audit,	\
 			&(local_audit_entry_x));				\
 	if (NULL == found_audit_entry)						\
@@ -445,64 +525,90 @@ void	zbx_audit_update_json_append_uint64(const zbx_uint64_t id, const char *audi
 		exit(EXIT_FAILURE);						\
 	}									\
 
-void	zbx_audit_update_json_append_no_value(const zbx_uint64_t id, const char *audit_op, const char *key)
+void	zbx_audit_update_json_append_no_value(const zbx_uint64_t id, const int id_table, const char *audit_op,
+		const char *key)
 {
 	PREPARE_UPDATE_JSON_APPEND_OP();
 	append_json_no_value(&((*found_audit_entry)->details_json), audit_op, key);
 }
 
-void	zbx_audit_update_json_append_int(const zbx_uint64_t id, const char *audit_op, const char *key, int value)
+void	zbx_audit_update_json_append_int(const zbx_uint64_t id, const int id_table, const char *audit_op,
+		const char *key, int value, const char *table, const char *field)
 {
-	PREPARE_UPDATE_JSON_APPEND_OP();
-	append_int_json(&((*found_audit_entry)->details_json), audit_op, key, value);
+	char	buffer[MAX_ID_LEN];
+
+	zbx_snprintf(buffer, sizeof(buffer), "%d", value);
+
+	if (SUCCEED == audit_field_default(table, field, buffer, 0))
+	{
+		return;
+	}
+	else
+	{
+		PREPARE_UPDATE_JSON_APPEND_OP();
+		append_int_json(&((*found_audit_entry)->details_json), audit_op, key, value);
+	}
 }
 
-void	zbx_audit_update_json_append_double(const zbx_uint64_t id, const char *audit_op, const char *key, double value)
+void	zbx_audit_update_json_append_double(const zbx_uint64_t id, const int id_table, const char *audit_op,
+		const char *key, double value, const char *table, const char *field)
 {
-	PREPARE_UPDATE_JSON_APPEND_OP();
-	append_double_json(&((*found_audit_entry)->details_json), audit_op, key, value);
+	char	buffer[MAX_ID_LEN];
+
+	zbx_snprintf(buffer, sizeof(buffer), ZBX_FS_DBL, value);
+
+	if (SUCCEED == audit_field_default(table, field, buffer, 0))
+	{
+		return;
+	}
+	else
+	{
+		PREPARE_UPDATE_JSON_APPEND_OP();
+		append_double_json(&((*found_audit_entry)->details_json), audit_op, key, value);
+	}
 }
 
-void	zbx_audit_update_json_update_string(const zbx_uint64_t id, const char *key, const char *value_old,
-		const char *value_new)
+void	zbx_audit_update_json_update_string(const zbx_uint64_t id, const int id_table, const char *key,
+		const char *value_old, const char *value_new)
 {
 	PREPARE_UPDATE_JSON_APPEND_OP();
 	update_str_json(&((*found_audit_entry)->details_json), key, value_old, value_new);
 }
 
-void	zbx_audit_update_json_update_uint64(const zbx_uint64_t id, const char *key, uint64_t value_old,
-		uint64_t value_new)
+void	zbx_audit_update_json_update_uint64(const zbx_uint64_t id, const int id_table, const char *key,
+		uint64_t value_old, uint64_t value_new)
 {
 	PREPARE_UPDATE_JSON_APPEND_OP();
 	update_uint64_json(&((*found_audit_entry)->details_json), key, value_old, value_new);
 }
 
-void	zbx_audit_update_json_update_int(const zbx_uint64_t id, const char *key, int value_old,
+void	zbx_audit_update_json_update_int(const zbx_uint64_t id, const int id_table, const char *key, int value_old,
 		int value_new)
 {
 	PREPARE_UPDATE_JSON_APPEND_OP();
 	update_int_json(&((*found_audit_entry)->details_json), key, value_old, value_new);
 }
 
-void	zbx_audit_update_json_update_double(const zbx_uint64_t id, const char *key, double value_old,
-		double value_new)
+void	zbx_audit_update_json_update_double(const zbx_uint64_t id, const int id_table, const char *key,
+		double value_old, double value_new)
 {
 	PREPARE_UPDATE_JSON_APPEND_OP();
 	update_double_json(&((*found_audit_entry)->details_json), key, value_old, value_new);
 }
 
-void	zbx_audit_update_json_delete(const zbx_uint64_t id, const char *audit_op, const char *key)
+void	zbx_audit_update_json_delete(const zbx_uint64_t id, const int id_table, const char *audit_op, const char *key)
 {
 	PREPARE_UPDATE_JSON_APPEND_OP();
 	delete_json(&((*found_audit_entry)->details_json), audit_op, key);
 }
 
-zbx_audit_entry_t	*zbx_audit_get_entry(zbx_uint64_t id, const char *cuid)
+zbx_audit_entry_t	*zbx_audit_get_entry(zbx_uint64_t id, const char *cuid, int id_table)
 {
 	zbx_audit_entry_t	local_audit_entry, *plocal_audit_entry = &local_audit_entry, **paudit_entry;
 
 	local_audit_entry.id = id;
 	local_audit_entry.cuid = (char *)cuid;
+	local_audit_entry.id_table = id_table;
 
 	if (NULL == (paudit_entry = (zbx_audit_entry_t**)zbx_hashset_search(&zbx_audit, &plocal_audit_entry)))
 	{
diff --git a/src/libs/zbxaudit/audit.h b/src/libs/zbxaudit/audit.h
index 89f9adcfff2..3c742f96cfc 100644
--- a/src/libs/zbxaudit/audit.h
+++ b/src/libs/zbxaudit/audit.h
@@ -31,8 +31,6 @@
 #define AUDIT_DETAILS_ACTION_UPDATE	"update"
 #define AUDIT_DETAILS_ACTION_DELETE	"delete"
 
-#define AUDIT_SECRET_MASK		"******"
-
 #define	AUDIT_DETAILS_KEY_LEN		100
 
 #define AUDIT_RESOURCE_HOST			4
@@ -53,6 +51,15 @@
 
 #define AUDIT_RESOURCE_HA_NODE			47
 
+#define AUDIT_HOST_ID		1
+#define AUDIT_HOSTGRP_ID	2
+#define AUDIT_ITEM_ID		3
+#define AUDIT_TRIGGER_ID	4
+#define AUDIT_GRAPH_ID		5
+#define AUDIT_HTTPTEST_ID	6
+#define AUDIT_HA_NODE_ID	7
+#define AUDIT_CONFIG_ID		8
+
 #define RETURN_IF_AUDIT_OFF()					\
 	if (ZBX_AUDITLOG_ENABLED != zbx_get_audit_mode())	\
 		return						\
@@ -64,17 +71,19 @@ typedef struct zbx_audit_entry
 {
 	zbx_uint64_t	id;
 	char		*cuid;
+	int		id_table;
 	char		*name;
 	struct zbx_json	details_json;
 	int		audit_action;
 	int		resource_type;
+	char		audit_cuid[CUID_LEN];
 }
 zbx_audit_entry_t;
 
-zbx_audit_entry_t	*zbx_audit_entry_init(zbx_uint64_t id, const char *name, int audit_action, int resource_type);
-zbx_audit_entry_t	*zbx_audit_entry_init_cuid(const char *cuid, const char *name, int audit_action,
+zbx_audit_entry_t	*zbx_audit_entry_init(zbx_uint64_t id, const int id_table, const char *name, int audit_action,
 		int resource_type);
-
+zbx_audit_entry_t	*zbx_audit_entry_init_cuid(const char *cuid, const int id_table,const char *name,
+		int audit_action, int resource_type);
 
 int	zbx_auditlog_global_script(unsigned char script_type, unsigned char script_execute_on,
 		const char *script_command_orig, zbx_uint64_t hostid, const char *hostname, zbx_uint64_t eventid,
@@ -86,22 +95,29 @@ void	zbx_audit_clean(void);
 void	zbx_audit_flush(void);
 int	zbx_audit_flush_once(void);
 int	zbx_audit_initialized(void);
-void	zbx_audit_update_json_append_string(const zbx_uint64_t id, const char *audit_op, const char *key,
-		const char *value);
-void	zbx_audit_update_json_append_uint64(const zbx_uint64_t id, const char *audit_op, const char *key,
-		uint64_t value);
-void	zbx_audit_update_json_append_no_value(const zbx_uint64_t id, const char *audit_op, const char *key);
-void	zbx_audit_update_json_append_int(const zbx_uint64_t id, const char *audit_op, const char *key, int value);
-void	zbx_audit_update_json_append_double(const zbx_uint64_t id, const char *audit_op, const char *key, double value);
-void	zbx_audit_update_json_update_string(const zbx_uint64_t id, const char *key, const char *value_old,
-		const char *value_new);
-void	zbx_audit_update_json_update_uint64(const zbx_uint64_t id, const char *key, uint64_t value_old,
-		uint64_t value_new);
-void	zbx_audit_update_json_update_int(const zbx_uint64_t id, const char *key, int value_old, int value_new);
-void	zbx_audit_update_json_update_double(const zbx_uint64_t id, const char *key, double value_old, double value_new);
-void	zbx_audit_update_json_delete(const zbx_uint64_t id, const char *audit_op, const char *key);
-
-zbx_audit_entry_t	*zbx_audit_get_entry(zbx_uint64_t id, const char *cuid);
+void	zbx_audit_update_json_append_string(const zbx_uint64_t id, const int id_table, const char *audit_op,
+		const char *key, const char *value, const char *table, const char *field);
+void	zbx_audit_update_json_append_string_secret(const zbx_uint64_t id, const int id_table, const char *audit_op,
+		const char *key, const char *value, const char *table, const char *field);
+void	zbx_audit_update_json_append_uint64(const zbx_uint64_t id, const int id_table, const char *audit_op,
+		const char *key, uint64_t value, const char *table, const char *field);
+void	zbx_audit_update_json_append_no_value(const zbx_uint64_t id, const int id_table, const char *audit_op,
+		const char *key);
+void	zbx_audit_update_json_append_int(const zbx_uint64_t id, const int id_table, const char *audit_op,
+		const char *key, int value, const char *table, const char *field);
+void	zbx_audit_update_json_append_double(const zbx_uint64_t id, const int id_table, const char *audit_op,
+		const char *key, double value, const char *table, const char *field);
+void	zbx_audit_update_json_update_string(const zbx_uint64_t id, const int id_table, const char *key,
+		const char *value_old, const char *value_new);
+void	zbx_audit_update_json_update_uint64(const zbx_uint64_t id, const int id_table, const char *key,
+		uint64_t value_old, uint64_t value_new);
+void	zbx_audit_update_json_update_int(const zbx_uint64_t id, const int id_table, const char *key, int value_old,
+		int value_new);
+void	zbx_audit_update_json_update_double(const zbx_uint64_t id, const int id_table, const char *key,
+		double value_old, double value_new);
+void	zbx_audit_update_json_delete(const zbx_uint64_t id, const int id_table, const char *audit_op, const char *key);
+
+zbx_audit_entry_t	*zbx_audit_get_entry(zbx_uint64_t id, const char *cuid, int id_table);
 void	zbx_audit_entry_append_int(zbx_audit_entry_t *entry, int audit_op, const char *key, ...);
 void	zbx_audit_entry_append_string(zbx_audit_entry_t *entry, int audit_op, const char *key, ...);
 
diff --git a/src/libs/zbxaudit/audit_graph.c b/src/libs/zbxaudit/audit_graph.c
index 3d7d1efc232..b4971eda8b8 100644
--- a/src/libs/zbxaudit/audit_graph.c
+++ b/src/libs/zbxaudit/audit_graph.c
@@ -52,6 +52,7 @@ void	zbx_audit_graph_create_entry(int audit_action, zbx_uint64_t graphid, const
 	resource_type = graph_flag_to_resource_type(flags);
 
 	local_audit_graph_entry.id = graphid;
+	local_audit_graph_entry.id_table = AUDIT_GRAPH_ID;
 
 	found_audit_graph_entry = (zbx_audit_entry_t**)zbx_hashset_search(zbx_get_audit_hashset(),
 			&(local_audit_graph_entry_x));
@@ -60,25 +61,26 @@ void	zbx_audit_graph_create_entry(int audit_action, zbx_uint64_t graphid, const
 	{
 		zbx_audit_entry_t	*local_audit_graph_entry_insert;
 
-		local_audit_graph_entry_insert = zbx_audit_entry_init(graphid, name, audit_action, resource_type);
+		local_audit_graph_entry_insert = zbx_audit_entry_init(graphid, AUDIT_GRAPH_ID, name, audit_action,
+				resource_type);
 
 		zbx_hashset_insert(zbx_get_audit_hashset(), &local_audit_graph_entry_insert,
 				sizeof(local_audit_graph_entry_insert));
 
 		if (AUDIT_ACTION_ADD == audit_action)
 		{
-			zbx_audit_update_json_append_uint64(graphid, AUDIT_DETAILS_ACTION_ADD, GR_OR_GRP(graphid),
-					graphid);
+			zbx_audit_update_json_append_uint64(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD,
+					GR_OR_GRP(graphid), graphid, "graphs", "graphid");
 		}
 	}
 }
 
-void	zbx_audit_graph_update_json_add_data(zbx_uint64_t graphid, const char *graph_copy_name, int width, int height,
+void	zbx_audit_graph_update_json_add_data(zbx_uint64_t graphid, const char *name, int width, int height,
 		double yaxismin, double yaxismax, zbx_uint64_t templateid, int show_work_period, int show_triggers,
 		int graphtype, int show_legend, int show_3d, double percent_left, double percent_right, int ymin_type,
 		int ymax_type, zbx_uint64_t ymin_itemid, zbx_uint64_t ymax_itemid, int flags, int discover)
 {
-	char	audit_key[AUDIT_DETAILS_KEY_LEN], audit_key_graph_copy_name[AUDIT_DETAILS_KEY_LEN],
+	char	audit_key[AUDIT_DETAILS_KEY_LEN], audit_key_name[AUDIT_DETAILS_KEY_LEN],
 		audit_key_width[AUDIT_DETAILS_KEY_LEN], audit_key_height[AUDIT_DETAILS_KEY_LEN],
 		audit_key_yaxismin[AUDIT_DETAILS_KEY_LEN], audit_key_yaxismax[AUDIT_DETAILS_KEY_LEN],
 		audit_key_templateid[AUDIT_DETAILS_KEY_LEN], audit_key_show_work_period[AUDIT_DETAILS_KEY_LEN],
@@ -97,7 +99,7 @@ void	zbx_audit_graph_update_json_add_data(zbx_uint64_t graphid, const char *grap
 	zbx_snprintf(audit_key, sizeof(audit_key), (AUDIT_RESOURCE_GRAPH == resource_type) ? "graph" :
 			"graphprototype");
 #define AUDIT_KEY_SNPRINTF(r) zbx_snprintf(audit_key_##r, sizeof(audit_key_##r), GR_OR_GRP(r));
-	AUDIT_KEY_SNPRINTF(graph_copy_name)
+	AUDIT_KEY_SNPRINTF(name)
 	AUDIT_KEY_SNPRINTF(width)
 	AUDIT_KEY_SNPRINTF(height)
 	AUDIT_KEY_SNPRINTF(yaxismin)
@@ -117,43 +119,51 @@ void	zbx_audit_graph_update_json_add_data(zbx_uint64_t graphid, const char *grap
 	AUDIT_KEY_SNPRINTF(flags)
 	AUDIT_KEY_SNPRINTF(discover)
 #undef AUDIT_KEY_SNPRINTF
-	zbx_audit_update_json_append_no_value(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-#define ADD_STR(r) zbx_audit_update_json_append_string(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r);
-#define ADD_UINT64(r) zbx_audit_update_json_append_uint64(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r);
-#define ADD_INT(r) zbx_audit_update_json_append_int(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r);
-#define ADD_DOUBLE(r) zbx_audit_update_json_append_double(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r);
-	ADD_STR(graph_copy_name)
-	ADD_INT(width)
-	ADD_INT(height)
-	ADD_DOUBLE(yaxismin)
-	ADD_DOUBLE(yaxismax)
-	ADD_UINT64(templateid)
-	ADD_INT(show_work_period)
-	ADD_INT(show_triggers)
-	ADD_INT(graphtype)
-	ADD_INT(show_legend)
-	ADD_INT(show_3d)
-	ADD_DOUBLE(percent_left)
-	ADD_DOUBLE(percent_right)
-	ADD_INT(ymin_type)
-	ADD_INT(ymax_type)
-	ADD_UINT64(ymin_itemid)
-	ADD_UINT64(ymax_itemid)
-	ADD_INT(flags)
-	ADD_INT(discover)
+	zbx_audit_update_json_append_no_value(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+#define ADD_STR(r, t, f) zbx_audit_update_json_append_string(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, \
+		audit_key_##r, r, t, f);
+#define ADD_UINT64(r, t, f) zbx_audit_update_json_append_uint64(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, \
+		audit_key_##r, r, t, f);
+#define ADD_INT(r, t, f) zbx_audit_update_json_append_int(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, \
+		audit_key_##r, r, t, f);
+#define ADD_DOUBLE(r, t, f) zbx_audit_update_json_append_double(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, \
+		audit_key_##r, r, t, f);
+#define	AUDIT_TABLE_NAME	"graphs"
+	ADD_STR(name, AUDIT_TABLE_NAME, "name")
+	ADD_INT(width, AUDIT_TABLE_NAME, "width")
+	ADD_INT(height, AUDIT_TABLE_NAME, "height")
+	ADD_DOUBLE(yaxismin, AUDIT_TABLE_NAME, "yaxismin")
+	ADD_DOUBLE(yaxismax, AUDIT_TABLE_NAME, "yaxismax")
+	ADD_UINT64(templateid, AUDIT_TABLE_NAME, "templateid")
+	ADD_INT(show_work_period, AUDIT_TABLE_NAME, "show_work_period")
+	ADD_INT(show_triggers, AUDIT_TABLE_NAME, "show_triggers")
+	ADD_INT(graphtype, AUDIT_TABLE_NAME, "graphtype")
+	ADD_INT(show_legend, AUDIT_TABLE_NAME, "show_legend")
+	ADD_INT(show_3d, AUDIT_TABLE_NAME, "show_3d")
+	ADD_DOUBLE(percent_left, AUDIT_TABLE_NAME, "percent_left")
+	ADD_DOUBLE(percent_right, AUDIT_TABLE_NAME, "percent_right")
+	ADD_INT(ymin_type, AUDIT_TABLE_NAME, "ymin_type")
+	ADD_INT(ymax_type, AUDIT_TABLE_NAME, "ymax_type")
+	ADD_UINT64(ymin_itemid, AUDIT_TABLE_NAME, "ymin_itemid")
+	ADD_UINT64(ymax_itemid, AUDIT_TABLE_NAME, "ymax_itemid")
+	ADD_INT(flags, AUDIT_TABLE_NAME, "flags")
+	if (AUDIT_RESOURCE_GRAPH_PROTOTYPE == resource_type)
+		ADD_INT(discover, AUDIT_TABLE_NAME, "discover")
 #undef ADD_STR
 #undef ADD_UINT64
 #undef ADD_INT
 #undef ADD_DOUBLE
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_graph_update_json_add_gitems(zbx_uint64_t graphid, int flags, zbx_uint64_t gitemid, int drawtype,
-		int sortorder, const char *color, int yaxisside, int calc_fnc, int type)
+		int sortorder, const char *color, int yaxisside, int calc_fnc, int type, zbx_uint64_t itemid)
 {
 	char	audit_key_[AUDIT_DETAILS_KEY_LEN], audit_key_drawtype[AUDIT_DETAILS_KEY_LEN],
 		audit_key_sortorder[AUDIT_DETAILS_KEY_LEN],
 		audit_key_color[AUDIT_DETAILS_KEY_LEN], audit_key_yaxisside[AUDIT_DETAILS_KEY_LEN],
-		audit_key_calc_fnc[AUDIT_DETAILS_KEY_LEN], audit_key_type[AUDIT_DETAILS_KEY_LEN];
+		audit_key_calc_fnc[AUDIT_DETAILS_KEY_LEN], audit_key_type[AUDIT_DETAILS_KEY_LEN],
+		audit_key_itemid[AUDIT_DETAILS_KEY_LEN];
 	int	resource_type;
 
 	RETURN_IF_AUDIT_OFF();
@@ -170,18 +180,26 @@ void	zbx_audit_graph_update_json_add_gitems(zbx_uint64_t graphid, int flags, zbx
 	AUDIT_KEY_GITEMS_SNPRINTF(yaxisside, .)
 	AUDIT_KEY_GITEMS_SNPRINTF(calc_fnc, .)
 	AUDIT_KEY_GITEMS_SNPRINTF(type, .)
-
-	zbx_audit_update_json_append_no_value(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key_);
-#define ADD_STR(r) zbx_audit_update_json_append_string(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r);
-#define ADD_INT(r) zbx_audit_update_json_append_int(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r);
-	ADD_INT(drawtype)
-	ADD_INT(sortorder)
-	ADD_STR(color);
-	ADD_INT(yaxisside)
-	ADD_INT(calc_fnc)
-	ADD_INT(type)
+	AUDIT_KEY_GITEMS_SNPRINTF(itemid, .)
+
+	zbx_audit_update_json_append_no_value(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_);
+#define ADD_STR(r, t, f) zbx_audit_update_json_append_string(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD,	\
+		audit_key_##r, r, t, f);
+#define ADD_INT(r, t, f) zbx_audit_update_json_append_int(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD,	\
+		audit_key_##r, r, t, f);
+#define ADD_UINT64(r, t, f) zbx_audit_update_json_append_uint64(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, \
+		audit_key_##r, r, t, f);
+#define	AUDIT_TABLE_NAME	"graphs_items"
+	ADD_INT(drawtype, AUDIT_TABLE_NAME, "drawtype")
+	ADD_INT(sortorder, AUDIT_TABLE_NAME, "sortorder")
+	ADD_STR(color, AUDIT_TABLE_NAME, "color");
+	ADD_INT(yaxisside, AUDIT_TABLE_NAME, "yaxisside")
+	ADD_INT(calc_fnc, AUDIT_TABLE_NAME, "calc_fnc")
+	ADD_INT(type, AUDIT_TABLE_NAME, "type")
+	ADD_UINT64(itemid, AUDIT_TABLE_NAME, "itemid")
 #undef ADD_STR
 #undef ADD_INT
+#undef AUDIT_TABLE_NAME
 }
 
 #define PREPARE_AUDIT_GRAPH_UPDATE(resource, type1, type2)							\
@@ -197,7 +215,7 @@ void	zbx_audit_graph_update_json_update_##resource(zbx_uint64_t graphid, int fla
 														\
 	zbx_snprintf(buf, sizeof(buf), GR_OR_GRP(resource));							\
 														\
-	zbx_audit_update_json_update_##type2(graphid, buf, resource##_old, resource##_new);			\
+	zbx_audit_update_json_update_##type2(graphid, AUDIT_GRAPH_ID, buf, resource##_old, resource##_new);	\
 }
 
 PREPARE_AUDIT_GRAPH_UPDATE(name, const char*, string)
@@ -214,10 +232,10 @@ PREPARE_AUDIT_GRAPH_UPDATE(percent_left, double, double)
 PREPARE_AUDIT_GRAPH_UPDATE(percent_right, double, double)
 PREPARE_AUDIT_GRAPH_UPDATE(ymin_type, int, int)
 PREPARE_AUDIT_GRAPH_UPDATE(ymax_type, int, int)
-PREPARE_AUDIT_GRAPH_UPDATE(ymin_itemid, uint64_t, uint64)
-PREPARE_AUDIT_GRAPH_UPDATE(ymax_itemid, uint64_t, uint64)
+PREPARE_AUDIT_GRAPH_UPDATE(ymin_itemid, zbx_uint64_t, uint64)
+PREPARE_AUDIT_GRAPH_UPDATE(ymax_itemid, zbx_uint64_t, uint64)
 PREPARE_AUDIT_GRAPH_UPDATE(discover, int, int)
-PREPARE_AUDIT_GRAPH_UPDATE(templateid, uint64_t, uint64)
+PREPARE_AUDIT_GRAPH_UPDATE(templateid, zbx_uint64_t, uint64)
 
 #undef PREPARE_AUDIT_GRAPH_UPDATE
 #undef GR_OR_GRP
@@ -233,7 +251,7 @@ void	zbx_audit_graph_update_json_update_gitem_create_entry(zbx_uint64_t graphid,
 
 	AUDIT_KEY_GITEMS_SNPRINTF(,)
 
-	zbx_audit_update_json_append_no_value(graphid, AUDIT_DETAILS_ACTION_UPDATE, audit_key_);
+	zbx_audit_update_json_append_no_value(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_UPDATE, audit_key_);
 }
 
 #define PREPARE_AUDIT_GRAPH_UPDATE(resource, type1, type2)							\
@@ -249,8 +267,10 @@ void	zbx_audit_graph_update_json_update_gitem_update_##resource(zbx_uint64_t gra
 														\
 	AUDIT_KEY_GITEMS_SNPRINTF(resource, .)									\
 														\
-	zbx_audit_update_json_update_##type2(graphid, audit_key_##resource, resource##_old, resource##_new);	\
+	zbx_audit_update_json_update_##type2(graphid, AUDIT_GRAPH_ID, audit_key_##resource, resource##_old,	\
+			resource##_new);									\
 }
+PREPARE_AUDIT_GRAPH_UPDATE(itemid, zbx_uint64_t, uint64)
 PREPARE_AUDIT_GRAPH_UPDATE(drawtype,int, int)
 PREPARE_AUDIT_GRAPH_UPDATE(sortorder, int, int)
 PREPARE_AUDIT_GRAPH_UPDATE(color, const char*, string)
@@ -261,6 +281,23 @@ PREPARE_AUDIT_GRAPH_UPDATE(type, int, int)
 #undef PREPARE_AUDIT_GRAPH_UPDATE
 #undef AUDIT_KEY_GITEMS_SNPRINTF
 
+void	zbx_audit_graph_update_json_delete_gitems(zbx_uint64_t graphid, int flags, zbx_uint64_t gitemid)
+{
+	char	audit_key[AUDIT_DETAILS_KEY_LEN];
+	int	resource_type;
+
+	RETURN_IF_AUDIT_OFF();
+
+	resource_type = graph_flag_to_resource_type(flags);
+
+	if (AUDIT_RESOURCE_GRAPH == resource_type)
+		zbx_snprintf(audit_key, sizeof(audit_key), "graph.gitems[" ZBX_FS_UI64 "]", gitemid);
+	else
+		zbx_snprintf(audit_key, sizeof(audit_key), "graphprototype.gitems[" ZBX_FS_UI64 "]", gitemid);
+
+	zbx_audit_update_json_append_no_value(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_DELETE, audit_key);
+}
+
 void	zbx_audit_DBselect_delete_for_graph(const char *sql, zbx_vector_uint64_t *ids)
 {
 	DB_RESULT	result;
diff --git a/src/libs/zbxaudit/audit_graph.h b/src/libs/zbxaudit/audit_graph.h
index e602b5f94fb..09bc9c5dd16 100644
--- a/src/libs/zbxaudit/audit_graph.h
+++ b/src/libs/zbxaudit/audit_graph.h
@@ -27,13 +27,13 @@
 
 void	zbx_audit_graph_create_entry(int audit_action, zbx_uint64_t graphid, const char *name, int flags);
 
-void	zbx_audit_graph_update_json_add_data(zbx_uint64_t graphid, const char *graph_copy_name, int width, int height,
+void	zbx_audit_graph_update_json_add_data(zbx_uint64_t graphid, const char *name, int width, int height,
 		double yaxismin, double yaxismax, zbx_uint64_t templateid, int show_work_period, int show_triggers,
 		int graphtype, int show_legend, int show_3d, double percent_left, double percent_right, int ymin_type,
 		int ymax_type, zbx_uint64_t ymin_itemid, zbx_uint64_t ymax_itemid, int flags, int discover);
 
 void	zbx_audit_graph_update_json_add_gitems(zbx_uint64_t graphid, int flags, zbx_uint64_t gitemid, int drawtype,
-		int sortorder, const char *color, int yaxisside, int calc_fnc, int type);
+		int sortorder, const char *color, int yaxisside, int calc_fnc, int type, zbx_uint64_t itemid);
 
 #define PREPARE_AUDIT_GRAPH_UPDATE(resource, type1)								\
 void	zbx_audit_graph_update_json_update_##resource(zbx_uint64_t graphid, int flags,				\
@@ -53,10 +53,10 @@ PREPARE_AUDIT_GRAPH_UPDATE(percent_left, double)
 PREPARE_AUDIT_GRAPH_UPDATE(percent_right, double)
 PREPARE_AUDIT_GRAPH_UPDATE(ymin_type, int)
 PREPARE_AUDIT_GRAPH_UPDATE(ymax_type, int)
-PREPARE_AUDIT_GRAPH_UPDATE(ymin_itemid, uint64_t)
-PREPARE_AUDIT_GRAPH_UPDATE(ymax_itemid, uint64_t)
+PREPARE_AUDIT_GRAPH_UPDATE(ymin_itemid, zbx_uint64_t)
+PREPARE_AUDIT_GRAPH_UPDATE(ymax_itemid, zbx_uint64_t)
 PREPARE_AUDIT_GRAPH_UPDATE(discover, int)
-PREPARE_AUDIT_GRAPH_UPDATE(templateid, uint64_t)
+PREPARE_AUDIT_GRAPH_UPDATE(templateid, zbx_uint64_t)
 #undef PREPARE_AUDIT_GRAPH_UPDATE
 
 void	zbx_audit_graph_update_json_update_gitem_create_entry(zbx_uint64_t graphid, int flags, zbx_uint64_t gitemid);
@@ -64,6 +64,7 @@ void	zbx_audit_graph_update_json_update_gitem_create_entry(zbx_uint64_t graphid,
 #define PREPARE_AUDIT_GRAPH_UPDATE(resource, type1)								\
 void	zbx_audit_graph_update_json_update_gitem_update_##resource(zbx_uint64_t graphid, int flags,		\
 		zbx_uint64_t gitemid, type1 resource##_old, type1 resource##_new);
+PREPARE_AUDIT_GRAPH_UPDATE(itemid, zbx_uint64_t)
 PREPARE_AUDIT_GRAPH_UPDATE(drawtype, int)
 PREPARE_AUDIT_GRAPH_UPDATE(sortorder, int)
 PREPARE_AUDIT_GRAPH_UPDATE(color, const char*)
@@ -72,6 +73,8 @@ PREPARE_AUDIT_GRAPH_UPDATE(calc_fnc, int)
 PREPARE_AUDIT_GRAPH_UPDATE(type, int)
 #undef PREPARE_AUDIT_GRAPH_UPDATE
 
+void	zbx_audit_graph_update_json_delete_gitems(zbx_uint64_t graphid, int flags, zbx_uint64_t gitemid);
+
 void	zbx_audit_DBselect_delete_for_graph(const char *sql, zbx_vector_uint64_t *ids);
 
 #endif	/* ZABBIX_AUDIT_GRAPH_H */
diff --git a/src/libs/zbxaudit/audit_ha.c b/src/libs/zbxaudit/audit_ha.c
index 511f0123716..26fd7f2290e 100644
--- a/src/libs/zbxaudit/audit_ha.c
+++ b/src/libs/zbxaudit/audit_ha.c
@@ -30,12 +30,14 @@ void	zbx_audit_ha_create_entry(int audit_action, const char *nodeid, const char
 
 	local_audit_entry.id = 0;
 	local_audit_entry.cuid = (char *)nodeid;
+	local_audit_entry.id_table = AUDIT_HA_NODE_ID;
 
 	if (NULL == zbx_hashset_search(zbx_get_audit_hashset(), &plocal_audit_entry))
 	{
 		zbx_audit_entry_t	*new_entry;
 
-		new_entry = zbx_audit_entry_init_cuid(nodeid, name, audit_action, AUDIT_RESOURCE_HA_NODE);
+		new_entry = zbx_audit_entry_init_cuid(nodeid, AUDIT_HA_NODE_ID, name, audit_action,
+				AUDIT_RESOURCE_HA_NODE);
 		zbx_hashset_insert(zbx_get_audit_hashset(), &new_entry, sizeof(new_entry));
 	}
 }
@@ -46,7 +48,7 @@ void	zbx_audit_ha_add_create_fields(const char *nodeid, const char *name, int st
 
 	RETURN_IF_AUDIT_OFF();
 
-	entry = zbx_audit_get_entry(0, nodeid);
+	entry = zbx_audit_get_entry(0, nodeid, AUDIT_HA_NODE_ID);
 
 	zbx_audit_entry_append_string(entry, AUDIT_ACTION_ADD, ZBX_AUDIT_HA_NODEID, nodeid);
 	zbx_audit_entry_append_string(entry, AUDIT_ACTION_ADD, ZBX_AUDIT_HA_NAME, name);
@@ -60,7 +62,7 @@ void	zbx_audit_ha_update_field_string(const char *nodeid, const char *key, const
 
 	RETURN_IF_AUDIT_OFF();
 
-	entry = zbx_audit_get_entry(0, nodeid);
+	entry = zbx_audit_get_entry(0, nodeid, AUDIT_HA_NODE_ID);
 	zbx_audit_entry_append_string(entry, AUDIT_ACTION_UPDATE, key, old_value, new_value);
 }
 
@@ -70,7 +72,7 @@ void	zbx_audit_ha_update_field_int(const char *nodeid, const char *key, int old_
 
 	RETURN_IF_AUDIT_OFF();
 
-	entry = zbx_audit_get_entry(0, nodeid);
+	entry = zbx_audit_get_entry(0, nodeid, AUDIT_HA_NODE_ID);
 	zbx_audit_entry_append_int(entry, AUDIT_ACTION_UPDATE, key, old_value, new_value);
 }
 
diff --git a/src/libs/zbxaudit/audit_host.c b/src/libs/zbxaudit/audit_host.c
index 625c95aca18..730fe4797e8 100644
--- a/src/libs/zbxaudit/audit_host.c
+++ b/src/libs/zbxaudit/audit_host.c
@@ -62,24 +62,27 @@ void	zbx_audit_##funcname##_update_json_add_snmp_interface(zbx_uint64_t hostid,
 		zbx_uint64_t privprotocol, const char *contextname, zbx_uint64_t interfaceid)			\
 {														\
 PREPARE_UPDATE_JSON_SNMP_INTERFACE_OP(auditentry)								\
-	zbx_audit_update_json_append_no_value(hostid,        AUDIT_DETAILS_ACTION_ADD, audit_key);		\
-	zbx_audit_update_json_append_uint64(hostid,   AUDIT_DETAILS_ACTION_ADD, audit_key_version, version);	\
-	zbx_audit_update_json_append_uint64(hostid,   AUDIT_DETAILS_ACTION_ADD, audit_key_bulk, bulk);		\
-	zbx_audit_update_json_append_string(hostid,   AUDIT_DETAILS_ACTION_ADD, audit_key_community, community);\
-	zbx_audit_update_json_append_string(hostid,   AUDIT_DETAILS_ACTION_ADD, audit_key_securityname,		\
-			securityname);										\
-	zbx_audit_update_json_append_uint64(hostid,   AUDIT_DETAILS_ACTION_ADD, audit_key_securitylevel,	\
-			securitylevel);										\
-	zbx_audit_update_json_append_string(hostid,   AUDIT_DETAILS_ACTION_ADD, audit_key_authpassphrase,	\
-			authpassphrase);									\
-	zbx_audit_update_json_append_string(hostid,   AUDIT_DETAILS_ACTION_ADD, audit_key_privpassphrase,	\
-			privpassphrase);									\
-	zbx_audit_update_json_append_uint64(hostid,   AUDIT_DETAILS_ACTION_ADD, audit_key_authprotocol,		\
-			authprotocol);										\
-	zbx_audit_update_json_append_uint64(hostid,   AUDIT_DETAILS_ACTION_ADD, audit_key_privprotocol,		\
-			privprotocol);										\
-	zbx_audit_update_json_append_string(hostid,   AUDIT_DETAILS_ACTION_ADD, audit_key_contextname,		\
-			contextname);										\
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);	\
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_version,	\
+			version, "interface_snmp", "version");							\
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_bulk,	\
+			bulk, "interface_snmp", "bulk");							\
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD,			\
+			audit_key_community, community, "interface_snmp", "community");				\
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD,			\
+			audit_key_securityname, securityname, "interface_snmp", "securityname");		\
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD,			\
+			audit_key_securitylevel, securitylevel, "interface_snmp", "securitylevel");		\
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD,			\
+			audit_key_authpassphrase, authpassphrase, "interface_snmp", "authpassphrase");		\
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD,			\
+			audit_key_privpassphrase, privpassphrase, "interface_snmp", "privpassphrase");		\
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD,			\
+			audit_key_authprotocol, authprotocol, "interface_snmp", "authprotocol");		\
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD,			\
+			audit_key_privprotocol, privprotocol, "interface_snmp", "privprotocol");		\
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD,			\
+			audit_key_contextname, contextname, "interface_snmp", "contextname");			\
 }														\
 														\
 void	zbx_audit_##funcname##_update_json_update_snmp_interface(zbx_uint64_t hostid, zbx_uint64_t version_old,	\
@@ -92,50 +95,75 @@ void	zbx_audit_##funcname##_update_json_update_snmp_interface(zbx_uint64_t hosti
 		const char *contextname_new, zbx_uint64_t interfaceid)						\
 {														\
 PREPARE_UPDATE_JSON_SNMP_INTERFACE_OP(funcname)									\
-	zbx_audit_update_json_append_no_value(hostid, AUDIT_DETAILS_ACTION_UPDATE, audit_key);			\
-	zbx_audit_update_json_update_uint64(hostid, audit_key_version, version_old, version_new);		\
-	zbx_audit_update_json_update_uint64(hostid, audit_key_bulk, bulk_old, bulk_new);			\
-	zbx_audit_update_json_update_string(hostid, audit_key_community, community_old, community_new);		\
-	zbx_audit_update_json_update_string(hostid, audit_key_securityname, securityname_old, securityname_new);\
-	zbx_audit_update_json_update_uint64(hostid, audit_key_securitylevel, securitylevel_old,			\
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_UPDATE, audit_key);	\
+	zbx_audit_update_json_update_uint64(hostid, AUDIT_HOST_ID, audit_key_version, version_old, version_new);\
+	zbx_audit_update_json_update_uint64(hostid, AUDIT_HOST_ID, audit_key_bulk, bulk_old, bulk_new);		\
+	zbx_audit_update_json_update_string(hostid, AUDIT_HOST_ID, audit_key_community, community_old,		\
+			community_new);										\
+	zbx_audit_update_json_update_string(hostid, AUDIT_HOST_ID, audit_key_securityname, securityname_old,	\
+			securityname_new);									\
+	zbx_audit_update_json_update_uint64(hostid, AUDIT_HOST_ID, audit_key_securitylevel, securitylevel_old,	\
 			securitylevel_new);									\
-	zbx_audit_update_json_update_string(hostid, audit_key_authpassphrase, authpassphrase_old,		\
+	zbx_audit_update_json_update_string(hostid, AUDIT_HOST_ID, audit_key_authpassphrase, authpassphrase_old,\
 			authpassphrase_new);									\
-	zbx_audit_update_json_update_string(hostid, audit_key_privpassphrase, privpassphrase_old,		\
+	zbx_audit_update_json_update_string(hostid, AUDIT_HOST_ID, audit_key_privpassphrase, privpassphrase_old,\
 			privpassphrase_new);									\
-	zbx_audit_update_json_update_uint64(hostid, audit_key_authprotocol, authprotocol_old, authprotocol_new);\
-	zbx_audit_update_json_update_uint64(hostid, audit_key_privprotocol, privprotocol_old, privprotocol_new);\
-	zbx_audit_update_json_update_string(hostid, audit_key_contextname, contextname_old, contextname_new);	\
+	zbx_audit_update_json_update_uint64(hostid, AUDIT_HOST_ID, audit_key_authprotocol, authprotocol_old,	\
+			authprotocol_new);									\
+	zbx_audit_update_json_update_uint64(hostid, AUDIT_HOST_ID, audit_key_privprotocol, privprotocol_old,	\
+			privprotocol_new);									\
+	zbx_audit_update_json_update_string(hostid, AUDIT_HOST_ID, audit_key_contextname, contextname_old,	\
+			contextname_new);									\
 }														\
 
 PREPARE_AUDIT_SNMP_INTERFACE(host, host)
 PREPARE_AUDIT_SNMP_INTERFACE(host_prototype, hostprototype)
 
-void	zbx_audit_host_update_json_add_proxy_hostid_and_hostname(zbx_uint64_t hostid, zbx_uint64_t proxy_hostid,
-		const char *hostname)
+void	zbx_audit_host_update_json_add_proxy_hostid_and_hostname_and_inventory_mode(zbx_uint64_t hostid,
+		zbx_uint64_t proxy_hostid, const char *hostname, int inventory_mode)
 {
 	RETURN_IF_AUDIT_OFF();
 
-	zbx_audit_update_json_append_uint64(hostid, AUDIT_DETAILS_ACTION_ADD, "host.proxy_hostid", proxy_hostid);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, "host.host", hostname);
+#define	AUDIT_TABLE_NAME	"hosts"
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.proxy_hostid",
+			proxy_hostid, AUDIT_TABLE_NAME, "proxy_hostid");
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.host", hostname,
+			AUDIT_TABLE_NAME, "host");
+
+	/*
+	 * Currently there are 3 valid values for inventory_mode: HOST_INVENTORY_DISABLED (-1), the default value
+	 * HOST_INVENTORY_MANUAL (0), and HOST_INVENTORY_AUTOMATIC (1). In database we write only 2 of them:
+	 * HOST_INVENTORY_MANUAL and HOST_INVENTORY_AUTOMATIC. From the other side in auditlog we must write all of
+	 * them except the default, i.e. HOST_INVENTORY_DISABLED and HOST_INVENTORY_AUTOMATIC.
+	 */
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.inventory_mode",
+			inventory_mode, "host_inventory", "inventory_mode");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_host_update_json_add_tls_and_psk(zbx_uint64_t hostid, int tls_connect, int tls_accept,
-		const char *psk_identity, const char *psk)
+		const char *tls_psk_identity, const char *tls_psk)
 {
 	RETURN_IF_AUDIT_OFF();
 
-	zbx_audit_update_json_append_int(hostid, AUDIT_DETAILS_ACTION_ADD, "host.tls_connect", tls_connect);
-	zbx_audit_update_json_append_int(hostid, AUDIT_DETAILS_ACTION_ADD, "host.tls_accept", tls_accept);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, "host.psk_identity", psk_identity);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, "host.psk", psk);
+#define AUDIT_TABLE_NAME	"hosts"
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.tls_connect",
+			tls_connect, AUDIT_TABLE_NAME, "tls_connect");
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.tls_accept", tls_accept,
+			AUDIT_TABLE_NAME, "tls_accept");
+	zbx_audit_update_json_append_string_secret(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD,
+			"host.tls_psk_identity", tls_psk_identity, AUDIT_TABLE_NAME, "tls_psk_identity");
+	zbx_audit_update_json_append_string_secret(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.tls_psk",
+			tls_psk, AUDIT_TABLE_NAME, "tls_psk");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_host_update_json_add_inventory_mode(zbx_uint64_t hostid, int inventory_mode)
 {
 	RETURN_IF_AUDIT_OFF();
 
-	zbx_audit_update_json_append_int(hostid, AUDIT_DETAILS_ACTION_ADD, "host.inventory_mode", inventory_mode);
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.inventory_mode",
+			inventory_mode, "host_inventory", "inventory_mode");
 }
 
 void	zbx_audit_host_update_json_update_inventory_mode(zbx_uint64_t hostid, int inventory_mode_old,
@@ -143,7 +171,8 @@ void	zbx_audit_host_update_json_update_inventory_mode(zbx_uint64_t hostid, int i
 {
 	RETURN_IF_AUDIT_OFF();
 
-	zbx_audit_update_json_update_int(hostid, "host.inventory_mode", inventory_mode_old, inventory_mode_new);
+	zbx_audit_update_json_update_int(hostid, AUDIT_HOST_ID, "host.inventory_mode", inventory_mode_old,
+			inventory_mode_new);
 }
 
 void	zbx_audit_host_update_json_update_host_status(zbx_uint64_t hostid, int host_status_old,
@@ -151,7 +180,7 @@ void	zbx_audit_host_update_json_update_host_status(zbx_uint64_t hostid, int host
 {
 	RETURN_IF_AUDIT_OFF();
 
-	zbx_audit_update_json_update_int(hostid, "host.status", host_status_old, host_status_new);
+	zbx_audit_update_json_update_int(hostid, AUDIT_HOST_ID, "host.status", host_status_old, host_status_new);
 }
 
 void	zbx_audit_host_prototype_update_json_update_interface_details_create_entry(zbx_uint64_t hostid,
@@ -163,7 +192,7 @@ void	zbx_audit_host_prototype_update_json_update_interface_details_create_entry(
 
 	zbx_snprintf(buf, sizeof(buf), "hostprototype.interfaces[" ZBX_FS_UI64 "].details", interfaceid);
 
-	zbx_audit_update_json_append_no_value(hostid, AUDIT_DETAILS_ACTION_UPDATE, buf);
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_UPDATE, buf);
 }
 
 
@@ -177,7 +206,8 @@ void	zbx_audit_##funcname##_update_json_update_interface_##interface_resource(zb
 														\
 	zbx_snprintf(buf, sizeof(buf), #auditentry".interfaces[" ZBX_FS_UI64 "].details."#interface_resource,	\
 			interfaceid);										\
-	zbx_audit_update_json_update_##type2(hostid, buf, interface_resource##_old, interface_resource##_new);	\
+	zbx_audit_update_json_update_##type2(hostid, AUDIT_HOST_ID, buf, interface_resource##_old,		\
+			interface_resource##_new);								\
 }														\
 
 #define	PREPARE_AUDIT_HOST(funcname, auditentry, audit_resource_flag)						\
@@ -190,22 +220,22 @@ void	zbx_audit_##funcname##_create_entry(int audit_action, zbx_uint64_t hostid,
 														\
 	local_audit_host_entry.id = hostid;									\
 	local_audit_host_entry.cuid = NULL;									\
-														\
+	local_audit_host_entry.id_table = AUDIT_HOST_ID;							\
 	found_audit_host_entry = (zbx_audit_entry_t**)zbx_hashset_search(zbx_get_audit_hashset(),		\
 			&(local_audit_host_entry_x));								\
 	if (NULL == found_audit_host_entry)									\
 	{													\
 		zbx_audit_entry_t	*local_audit_host_entry_insert;						\
 														\
-		local_audit_host_entry_insert = zbx_audit_entry_init(hostid, name, audit_action,		\
+		local_audit_host_entry_insert = zbx_audit_entry_init(hostid, AUDIT_HOST_ID, name, audit_action, \
 				audit_resource_flag);								\
 		zbx_hashset_insert(zbx_get_audit_hashset(), &local_audit_host_entry_insert,			\
 				sizeof(local_audit_host_entry_insert));						\
 														\
 		if (AUDIT_ACTION_ADD == audit_action)								\
 		{												\
-			zbx_audit_update_json_append_uint64(hostid, AUDIT_DETAILS_ACTION_ADD,			\
-					#auditentry".hostid", hostid);						\
+			zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD,	\
+					#auditentry".hostid", hostid, "hosts", "hostid");			\
 		}												\
 	}													\
 }														\
@@ -235,13 +265,19 @@ void	zbx_audit_##funcname##_update_json_add_interfaces(zbx_uint64_t hostid, zbx_
 	zbx_snprintf(audit_key_port,  sizeof(audit_key_port),  #auditentry".interfaces[" ZBX_FS_UI64		\
 			"].port", interfaceid);									\
 														\
-	zbx_audit_update_json_append_no_value(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key);			\
-	zbx_audit_update_json_append_uint64(hostid,   AUDIT_DETAILS_ACTION_ADD, audit_key_main, main_);		\
-	zbx_audit_update_json_append_uint64(hostid,   AUDIT_DETAILS_ACTION_ADD, audit_key_type, type);		\
-	zbx_audit_update_json_append_uint64(hostid,   AUDIT_DETAILS_ACTION_ADD, audit_key_useip, useip);	\
-	zbx_audit_update_json_append_string(hostid,   AUDIT_DETAILS_ACTION_ADD, audit_key_ip, ip);		\
-	zbx_audit_update_json_append_string(hostid,   AUDIT_DETAILS_ACTION_ADD, audit_key_dns, dns);		\
-	zbx_audit_update_json_append_int(hostid,      AUDIT_DETAILS_ACTION_ADD, audit_key_port, port);		\
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);	\
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_main,	\
+			main_, "interface", "main");								\
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_type,	\
+			type, "interface", "type");								\
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_useip,	\
+			useip, "interface", "useip");								\
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_ip, ip,	\
+			"interface", "ip");									\
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_dns, dns,\
+			"interface", "dns");									\
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_port, port,	\
+			"interface", "port");									\
 }														\
 														\
 PREPARE_AUDIT_HOST_INTERFACE(funcname, auditentry, useip, zbx_uint64_t, uint64)					\
@@ -273,7 +309,8 @@ void	zbx_audit_host_update_json_update_##resource(zbx_uint64_t hostid, type1 old
 {														\
 	RETURN_IF_AUDIT_OFF();											\
 														\
-	zbx_audit_update_json_update_##type2(hostid, "host."#resource, old_##resource, new_##resource);		\
+	zbx_audit_update_json_update_##type2(hostid, AUDIT_HOST_ID, "host."#resource, old_##resource,		\
+			new_##resource);									\
 }
 
 PREPARE_AUDIT_HOST_UPDATE(host, const char*, string)
@@ -300,7 +337,7 @@ void	zbx_audit_host_update_json_delete_interface(zbx_uint64_t hostid, zbx_uint64
 
 	zbx_snprintf(buf, sizeof(buf), "host.interfaces[" ZBX_FS_UI64 "]", interfaceid);
 
-	zbx_audit_update_json_delete(hostid, AUDIT_DETAILS_ACTION_DELETE, buf);
+	zbx_audit_update_json_delete(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_DELETE, buf);
 }
 
 void	zbx_audit_host_update_json_add_hostmacro(zbx_uint64_t hostid, zbx_uint64_t macroid,
@@ -319,11 +356,17 @@ void	zbx_audit_host_update_json_add_hostmacro(zbx_uint64_t hostid, zbx_uint64_t
 			"].description", macroid);
 	zbx_snprintf(audit_key_type, sizeof(audit_key_type), "host.macros[" ZBX_FS_UI64 "].type", macroid);
 
-	zbx_audit_update_json_append_no_value(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_name, macro);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_description, description);
-	zbx_audit_update_json_append_int(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_type, type);
+#define	AUDIT_TABLE_NAME	"hostmacro"
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_name, macro,
+			AUDIT_TABLE_NAME, "macro");
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value,
+			AUDIT_TABLE_NAME, "value");
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_description,
+			description, AUDIT_TABLE_NAME, "description");
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_type, type,
+			AUDIT_TABLE_NAME, "type");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_host_update_json_update_hostmacro_create_entry(zbx_uint64_t hostid,
@@ -335,20 +378,20 @@ void	zbx_audit_host_update_json_update_hostmacro_create_entry(zbx_uint64_t hosti
 
 	zbx_snprintf(buf, sizeof(buf), "host.macros[" ZBX_FS_UI64 "]", hostmacroid);
 
-	zbx_audit_update_json_append_no_value(hostid, AUDIT_DETAILS_ACTION_UPDATE, buf);
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_UPDATE, buf);
 }
 
-#define PREPARE_AUDIT_HOST_UPDATE_HOSTMACRO(resource, type1, type2)					\
-void	zbx_audit_host_update_json_update_hostmacro_##resource(zbx_uint64_t hostid,			\
+#define PREPARE_AUDIT_HOST_UPDATE_HOSTMACRO(resource, type1, type2)						\
+void	zbx_audit_host_update_json_update_hostmacro_##resource(zbx_uint64_t hostid,				\
 		zbx_uint64_t hostmacroid, type1 old_##resource, type1 new_##resource)				\
 {														\
 	char	buf[AUDIT_DETAILS_KEY_LEN];									\
 														\
 	RETURN_IF_AUDIT_OFF();											\
 														\
-	zbx_snprintf(buf, sizeof(buf), "host.macros[" ZBX_FS_UI64 "]."#resource, hostmacroid);	\
+	zbx_snprintf(buf, sizeof(buf), "host.macros[" ZBX_FS_UI64 "]."#resource, hostmacroid);			\
 														\
-	zbx_audit_update_json_update_##type2(hostid, buf, old_##resource, new_##resource);			\
+	zbx_audit_update_json_update_##type2(hostid, AUDIT_HOST_ID, buf, old_##resource, new_##resource);	\
 }														\
 
 PREPARE_AUDIT_HOST_UPDATE_HOSTMACRO(value, const char*, string)
@@ -364,7 +407,7 @@ void	zbx_audit_host_update_json_delete_hostmacro(zbx_uint64_t hostid, zbx_uint64
 
 	zbx_snprintf(buf, sizeof(buf), "host.macros[" ZBX_FS_UI64 "]", hostmacroid);
 
-	zbx_audit_update_json_delete(hostid, AUDIT_DETAILS_ACTION_DELETE, buf);
+	zbx_audit_update_json_delete(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_DELETE, buf);
 }
 
 void	zbx_audit_hostgroup_update_json_add_group(zbx_uint64_t hostid, zbx_uint64_t hostgroupid, zbx_uint64_t groupid)
@@ -378,19 +421,25 @@ void	zbx_audit_hostgroup_update_json_add_group(zbx_uint64_t hostid, zbx_uint64_t
 	zbx_snprintf(audit_key_hostid, sizeof(audit_key_hostid), "host.groups[" ZBX_FS_UI64 "].hostid", hostgroupid);
 	zbx_snprintf(audit_key_groupid, sizeof(audit_key_groupid), "host.groups[" ZBX_FS_UI64 "].groupid", hostgroupid);
 
-	zbx_audit_update_json_append_no_value(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_uint64(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_hostid, hostid);
-	zbx_audit_update_json_append_uint64(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_groupid, groupid);
+#define	AUDIT_TABLE_NAME	"hosts_groups"
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_hostid, hostid,
+			AUDIT_TABLE_NAME, "hostid");
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_groupid, groupid,
+			AUDIT_TABLE_NAME, "groupid");
+#undef AUDIT_TABLE_NAME
 }
 
-void	zbx_audit_hostgroup_update_json_delete_group(zbx_uint64_t hostid, zbx_uint64_t hostgroupid, zbx_uint64_t groupid)
+void	zbx_audit_hostgroup_update_json_delete_group(zbx_uint64_t hostid, zbx_uint64_t hostgroupid,
+		zbx_uint64_t groupid)
 {
 	char	audit_key[AUDIT_DETAILS_KEY_LEN];
 
 	RETURN_IF_AUDIT_OFF();
 
 	zbx_snprintf(audit_key, sizeof(audit_key), "host.groups[" ZBX_FS_UI64 "]", hostgroupid);
-	zbx_audit_update_json_append_uint64(hostid, AUDIT_DETAILS_ACTION_DELETE, audit_key, groupid);
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_DELETE, audit_key, groupid,
+			NULL, NULL);
 }
 
 void	zbx_audit_host_hostgroup_delete(zbx_uint64_t hostid, const char* hostname, zbx_vector_uint64_t *hostgroupids,
@@ -406,8 +455,8 @@ void	zbx_audit_host_hostgroup_delete(zbx_uint64_t hostid, const char* hostname,
 	for (i = 0; i < groupids->values_num; i++)
 	{
 		zbx_snprintf(buf, sizeof(buf), "host.groups[" ZBX_FS_UI64 "].groupid", hostgroupids->values[i]);
-		zbx_audit_update_json_append_uint64(hostid, AUDIT_DETAILS_ACTION_DELETE, buf,
-				groupids->values[i]);
+		zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_DELETE, buf,
+				groupids->values[i], NULL, NULL);
 	}
 }
 
@@ -421,26 +470,39 @@ void	zbx_audit_host_del(zbx_uint64_t hostid, const char *hostname)
 void	zbx_audit_host_update_json_add_details(zbx_uint64_t hostid, const char *host, zbx_uint64_t proxy_hostid,
 		int ipmi_authtype, int ipmi_privilege, const char *ipmi_username, const char *ipmi_password,
 		int status, int flags, int tls_connect, int tls_accept, const char *tls_issuer, const char *tls_subject,
-		const char *tls_psk_identity, const char *tls_psk, int custom_interfaces)
-{
-	RETURN_IF_AUDIT_OFF();
-
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, "host.host", host);
-	zbx_audit_update_json_append_uint64(hostid, AUDIT_DETAILS_ACTION_ADD, "host.proxy_hostid", proxy_hostid);
-	zbx_audit_update_json_append_int(hostid, AUDIT_DETAILS_ACTION_ADD, "host.ipmi_authtype", ipmi_authtype);
-	zbx_audit_update_json_append_int(hostid, AUDIT_DETAILS_ACTION_ADD, "host.ipmi_privilege", ipmi_privilege);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, "host.ipmi_username", ipmi_username);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, "host.ipmi_password", ipmi_password);
-	zbx_audit_update_json_append_int(hostid, AUDIT_DETAILS_ACTION_ADD, "host.status", status);
-	zbx_audit_update_json_append_int(hostid, AUDIT_DETAILS_ACTION_ADD, "host.flags", flags);
-	zbx_audit_update_json_append_int(hostid, AUDIT_DETAILS_ACTION_ADD, "host.tls_connect", tls_connect);
-	zbx_audit_update_json_append_int(hostid, AUDIT_DETAILS_ACTION_ADD, "host.tls_accept", tls_accept);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, "host.tls_issuer", tls_issuer);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, "host.tls_subject", tls_subject);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, "host.tls_psk_identity",
-			tls_psk_identity);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, "host.tls_psk", tls_psk);
-	zbx_audit_update_json_append_int(hostid, AUDIT_DETAILS_ACTION_ADD, "host.custom_interfaces", custom_interfaces);
+		const char *tls_psk_identity, const char *tls_psk, int custom_interfaces, int inventory_mode)
+{
+	RETURN_IF_AUDIT_OFF();
+
+#define	AUDIT_TABLE_NAME	"hosts"
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.host", host,
+			AUDIT_TABLE_NAME, "host");
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.proxy_hostid",
+			proxy_hostid, AUDIT_TABLE_NAME, "proxy_hostid");
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.ipmi_authtype",
+			ipmi_authtype, AUDIT_TABLE_NAME, "ipmi_authtype");
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.ipmi_privilege",
+			ipmi_privilege, AUDIT_TABLE_NAME, "ipmi_privilege");
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.ipmi_username",
+			ipmi_username, AUDIT_TABLE_NAME, "ipmi_username");
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.ipmi_password",
+			ipmi_password, AUDIT_TABLE_NAME, "ipmi_password");
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.status", status,
+			AUDIT_TABLE_NAME, "status");
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.flags", flags,
+			AUDIT_TABLE_NAME, "flags");
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.tls_issuer",
+			tls_issuer, AUDIT_TABLE_NAME, "tls_issuer");
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.tls_subject",
+			tls_subject, AUDIT_TABLE_NAME, "tls_subject");
+
+	zbx_audit_host_update_json_add_tls_and_psk(hostid, tls_connect, tls_accept, tls_psk_identity, tls_psk);
+
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.custom_interfaces",
+			custom_interfaces, AUDIT_TABLE_NAME, "custom_interfaces");
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "host.inventory_mode",
+			inventory_mode, "host_inventory", "inventory_mode");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_host_update_json_add_tag(zbx_uint64_t hostid, zbx_uint64_t tagid, const char* tag,
@@ -455,9 +517,13 @@ void	zbx_audit_host_update_json_add_tag(zbx_uint64_t hostid, zbx_uint64_t tagid,
 	zbx_snprintf(audit_key_tag, sizeof(audit_key_tag), "host.tags[" ZBX_FS_UI64 "].tag", tagid);
 	zbx_snprintf(audit_key_value, sizeof(audit_key_value), "host.tags[" ZBX_FS_UI64 "].value", tagid);
 
-	zbx_audit_update_json_append_no_value(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_tag, tag);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+#define	AUDIT_TABLE_NAME	"host_tag"
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_tag, tag,
+			AUDIT_TABLE_NAME, "tag");
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value,
+			AUDIT_TABLE_NAME, "value");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_host_update_json_update_tag_create_entry(zbx_uint64_t hostid, zbx_uint64_t tagid)
@@ -468,7 +534,7 @@ void	zbx_audit_host_update_json_update_tag_create_entry(zbx_uint64_t hostid, zbx
 
 	zbx_snprintf(buf, sizeof(buf), "host.tags[" ZBX_FS_UI64 "]", tagid);
 
-	zbx_audit_update_json_append_no_value(hostid, AUDIT_DETAILS_ACTION_UPDATE, buf);
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_UPDATE, buf);
 }
 
 void	zbx_audit_host_update_json_update_tag_tag(zbx_uint64_t hostid, zbx_uint64_t tagid,
@@ -480,7 +546,7 @@ void	zbx_audit_host_update_json_update_tag_tag(zbx_uint64_t hostid, zbx_uint64_t
 
 	zbx_snprintf(buf, AUDIT_DETAILS_KEY_LEN, "host.tags[" ZBX_FS_UI64 "].tag", tagid);
 
-	zbx_audit_update_json_update_string(hostid, buf, tag_old, tag_new);
+	zbx_audit_update_json_update_string(hostid, AUDIT_HOST_ID, buf, tag_old, tag_new);
 }
 
 void	zbx_audit_host_update_json_update_tag_value(zbx_uint64_t hostid, zbx_uint64_t tagid,
@@ -492,7 +558,7 @@ void	zbx_audit_host_update_json_update_tag_value(zbx_uint64_t hostid, zbx_uint64
 
 	zbx_snprintf(buf, AUDIT_DETAILS_KEY_LEN, "host.tags[" ZBX_FS_UI64 "].value", tagid);
 
-	zbx_audit_update_json_update_string(hostid, buf, value_old, value_new);
+	zbx_audit_update_json_update_string(hostid, AUDIT_HOST_ID, buf, value_old, value_new);
 }
 
 void	zbx_audit_host_update_json_delete_tag(zbx_uint64_t hostid, zbx_uint64_t tagid)
@@ -503,7 +569,7 @@ void	zbx_audit_host_update_json_delete_tag(zbx_uint64_t hostid, zbx_uint64_t tag
 
 	zbx_snprintf(buf, AUDIT_DETAILS_KEY_LEN, "host.tags[" ZBX_FS_UI64 "]", tagid);
 
-	zbx_audit_update_json_delete(hostid, AUDIT_DETAILS_ACTION_DELETE, buf);
+	zbx_audit_update_json_delete(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_DELETE, buf);
 }
 
 void	zbx_audit_host_prototype_del(zbx_uint64_t hostid, const char *hostname)
@@ -514,17 +580,24 @@ void	zbx_audit_host_prototype_del(zbx_uint64_t hostid, const char *hostname)
 }
 
 void	zbx_audit_host_prototype_update_json_add_details(zbx_uint64_t hostid, zbx_uint64_t templateid,
-		const char *name, int status, int discover, int custom_interfaces)
+		const char *name, int status, int discover, int custom_interfaces, int inventory_mode)
 {
 	RETURN_IF_AUDIT_OFF();
 
-	zbx_audit_update_json_append_uint64(hostid, AUDIT_DETAILS_ACTION_ADD, "hostprototype.templateid",
-			templateid);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, "hostprototype.name", name);
-	zbx_audit_update_json_append_int(hostid, AUDIT_DETAILS_ACTION_ADD, "hostprototype.status", status);
-	zbx_audit_update_json_append_int(hostid, AUDIT_DETAILS_ACTION_ADD, "hostprototype.discover", discover);
-	zbx_audit_update_json_append_int(hostid, AUDIT_DETAILS_ACTION_ADD, "hostprototype.custom_interfaces",
-			custom_interfaces);
+#define	AUDIT_TABLE_NAME	"hosts"
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "hostprototype.templateid",
+			templateid, AUDIT_TABLE_NAME, "templateid");
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "hostprototype.name", name,
+			AUDIT_TABLE_NAME, "name");
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "hostprototype.status", status,
+			AUDIT_TABLE_NAME, "status");
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, "hostprototype.discover",
+			discover, AUDIT_TABLE_NAME, "discover");
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD,
+			"hostprototype.custom_interfaces", custom_interfaces, AUDIT_TABLE_NAME, "custom_interfaces");
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD,
+			"hostprototype.inventory_mode", inventory_mode, "host_inventory", "inventory_mode");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_host_prototype_update_json_update_templateid(zbx_uint64_t hostid, zbx_uint64_t templateid_orig,
@@ -532,7 +605,8 @@ void	zbx_audit_host_prototype_update_json_update_templateid(zbx_uint64_t hostid,
 {
 	RETURN_IF_AUDIT_OFF();
 
-	zbx_audit_update_json_update_uint64(hostid, "hostprototype.templateid", templateid_orig, templateid);
+	zbx_audit_update_json_update_uint64(hostid, AUDIT_HOST_ID, "hostprototype.templateid", templateid_orig,
+			templateid);
 }
 
 #define PREPARE_AUDIT_HOST_PROTOTYPE_UPDATE(resource, type1, type2)						\
@@ -541,13 +615,15 @@ void	zbx_audit_host_prototype_update_json_update_##resource(zbx_uint64_t hostid,
 {														\
 	RETURN_IF_AUDIT_OFF();											\
 														\
-	zbx_audit_update_json_update_##type2(hostid, "hostprototype."#resource, old_##resource, new_##resource);\
+	zbx_audit_update_json_update_##type2(hostid, AUDIT_HOST_ID, "hostprototype."#resource, old_##resource,	\
+			new_##resource);									\
 }														\
 
 PREPARE_AUDIT_HOST_PROTOTYPE_UPDATE(name, const char*, string)
 PREPARE_AUDIT_HOST_PROTOTYPE_UPDATE(status, int, int)
 PREPARE_AUDIT_HOST_PROTOTYPE_UPDATE(discover, int, int)
 PREPARE_AUDIT_HOST_PROTOTYPE_UPDATE(custom_interfaces, int, int)
+PREPARE_AUDIT_HOST_PROTOTYPE_UPDATE(inventory_mode, int, int)
 #undef PREPARE_AUDIT_HOST_PROTOTYPE_UPDATE
 
 void	zbx_audit_host_prototype_update_json_add_group_details(zbx_uint64_t hostid, zbx_uint64_t group_prototypeid,
@@ -559,6 +635,7 @@ void	zbx_audit_host_prototype_update_json_add_group_details(zbx_uint64_t hostid,
 
 	RETURN_IF_AUDIT_OFF();
 
+#define	AUDIT_TABLE_NAME	"group_prototype"
 	if (0 != strlen(name))
 	{
 		zbx_snprintf(audit_key, sizeof(audit_key), "hostprototype.groupPrototypes[" ZBX_FS_UI64 "]",
@@ -569,7 +646,8 @@ void	zbx_audit_host_prototype_update_json_add_group_details(zbx_uint64_t hostid,
 				"].name", group_prototypeid);
 		zbx_snprintf(audit_key_templateid, sizeof(audit_key_templateid), "hostprototype.groupPrototypes["
 				ZBX_FS_UI64 "].templateid", group_prototypeid);
-		zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_name, name);
+		zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_name,
+				name, AUDIT_TABLE_NAME, "name");
 	}
 	else if (0 != groupid)
 	{
@@ -581,12 +659,16 @@ void	zbx_audit_host_prototype_update_json_add_group_details(zbx_uint64_t hostid,
 				"].groupid", group_prototypeid);
 		zbx_snprintf(audit_key_templateid, sizeof(audit_key_templateid), "hostprototype.groupLinks[" ZBX_FS_UI64
 				"].templateid", group_prototypeid);
-		zbx_audit_update_json_append_uint64(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_groupid, groupid);
+		zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_groupid,
+				groupid, AUDIT_TABLE_NAME, "groupid");
 	}
 
-	zbx_audit_update_json_append_no_value(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_uint64(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_hostid, hostid);
-	zbx_audit_update_json_append_uint64(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_templateid, templateid);
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_hostid, hostid,
+			AUDIT_TABLE_NAME, "hostid");
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_templateid,
+			templateid, AUDIT_TABLE_NAME, "templateid");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_host_prototype_update_json_update_group_details(zbx_uint64_t hostid, zbx_uint64_t group_prototypeid,
@@ -614,8 +696,10 @@ void	zbx_audit_host_prototype_update_json_update_group_details(zbx_uint64_t host
 
 		return;
 	}
-	zbx_audit_update_json_append_no_value(hostid, AUDIT_DETAILS_ACTION_UPDATE, audit_key);
-	zbx_audit_update_json_update_uint64(hostid, audit_key_templateid, templateid_old, templateid_new);
+
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_UPDATE, audit_key);
+	zbx_audit_update_json_update_uint64(hostid, AUDIT_HOST_ID, audit_key_templateid, templateid_old,
+			templateid_new);
 }
 
 #define PREPARE_AUDIT_TEMPLATE_ADD(funcname, auditentry)							\
@@ -633,10 +717,11 @@ void	zbx_audit_##funcname##_update_json_add_parent_template(zbx_uint64_t hostid,
 	zbx_snprintf(audit_key_templateid, sizeof(audit_key_templateid), #auditentry".templates[" ZBX_FS_UI64	\
 			"].templateid", hosttemplateid);							\
 														\
-	zbx_audit_update_json_append_no_value(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key);			\
-	zbx_audit_update_json_append_uint64(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_hostid, hostid);	\
-	zbx_audit_update_json_append_uint64(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_templateid,		\
-			templateid);										\
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);	\
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_hostid,	\
+			hostid, "hosts", "hostid");								\
+	zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD,			\
+			audit_key_templateid, templateid, "hosts", "templateid");				\
 }														\
 
 #define PREPARE_AUDIT_TEMPLATE_DELETE(funcname, auditentry)							\
@@ -650,7 +735,8 @@ void	zbx_audit_##funcname##_update_json_delete_parent_template(zbx_uint64_t host
 	zbx_snprintf(audit_key_templateid, sizeof(audit_key_templateid), #auditentry".templates[" ZBX_FS_UI64	\
 			"]", hosttemplateid);									\
 														\
-	zbx_audit_update_json_append_no_value(hostid, AUDIT_DETAILS_ACTION_DELETE, audit_key_templateid);	\
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_DELETE,		\
+			audit_key_templateid);									\
 }														\
 
 PREPARE_AUDIT_TEMPLATE_ADD(host, host)
@@ -666,7 +752,7 @@ void	zbx_audit_host_prototype_update_json_delete_interface(zbx_uint64_t hostid,
 
 	zbx_snprintf(buf, sizeof(buf), "hostprototype.interfaces[" ZBX_FS_UI64 "]", interfaceid);
 
-	zbx_audit_update_json_delete(hostid, AUDIT_DETAILS_ACTION_DELETE, buf);
+	zbx_audit_update_json_delete(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_DELETE, buf);
 }
 
 void	zbx_audit_host_prototype_update_json_add_hostmacro(zbx_uint64_t hostid, zbx_uint64_t macroid,
@@ -685,11 +771,17 @@ void	zbx_audit_host_prototype_update_json_add_hostmacro(zbx_uint64_t hostid, zbx
 			"].description", macroid);
 	zbx_snprintf(audit_key_type, sizeof(audit_key_type), "hostprototype.macros[" ZBX_FS_UI64 "].type", macroid);
 
-	zbx_audit_update_json_append_no_value(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_name, macro);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_description, description);
-	zbx_audit_update_json_append_int(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_type, type);
+#define	AUDIT_TABLE_NAME	"hostmacro"
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_name, macro,
+			AUDIT_TABLE_NAME, "macro");
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value,
+			AUDIT_TABLE_NAME, "value");
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_description,
+			description, AUDIT_TABLE_NAME, "description");
+	zbx_audit_update_json_append_int(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_type, type,
+			AUDIT_TABLE_NAME, "type");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_host_prototype_update_json_update_hostmacro_create_entry(zbx_uint64_t hostid,
@@ -701,7 +793,7 @@ void	zbx_audit_host_prototype_update_json_update_hostmacro_create_entry(zbx_uint
 
 	zbx_snprintf(buf, sizeof(buf), "hostprototype.macros[" ZBX_FS_UI64 "]", hostmacroid);
 
-	zbx_audit_update_json_append_no_value(hostid, AUDIT_DETAILS_ACTION_UPDATE, buf);
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_UPDATE, buf);
 }
 
 #define PREPARE_AUDIT_HOST_PROTOTYPE_UPDATE_HOSTMACRO(resource, type1, type2)					\
@@ -714,7 +806,7 @@ void	zbx_audit_host_prototype_update_json_update_hostmacro_##resource(zbx_uint64
 														\
 	zbx_snprintf(buf, sizeof(buf), "hostprototype.macros[" ZBX_FS_UI64 "]."#resource, hostmacroid);		\
 														\
-	zbx_audit_update_json_update_##type2(hostid, buf, old_##resource, new_##resource);			\
+	zbx_audit_update_json_update_##type2(hostid, AUDIT_HOST_ID, buf, old_##resource, new_##resource);	\
 }														\
 
 PREPARE_AUDIT_HOST_PROTOTYPE_UPDATE_HOSTMACRO(value, const char*, string)
@@ -730,7 +822,7 @@ void	zbx_audit_host_prototype_update_json_delete_hostmacro(zbx_uint64_t hostid,
 
 	zbx_snprintf(buf, sizeof(buf), "hostprototype.macros[" ZBX_FS_UI64 "]", hostmacroid);
 
-	zbx_audit_update_json_delete(hostid, AUDIT_DETAILS_ACTION_DELETE, buf);
+	zbx_audit_update_json_delete(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_DELETE, buf);
 }
 
 void	zbx_audit_host_prototype_update_json_add_tag(zbx_uint64_t hostid, zbx_uint64_t tagid, const char* tag,
@@ -745,9 +837,13 @@ void	zbx_audit_host_prototype_update_json_add_tag(zbx_uint64_t hostid, zbx_uint6
 	zbx_snprintf(audit_key_tag, sizeof(audit_key_tag), "hostprototype.tags[" ZBX_FS_UI64 "].tag", tagid);
 	zbx_snprintf(audit_key_value, sizeof(audit_key_value), "hostprototype.tags[" ZBX_FS_UI64 "].value", tagid);
 
-	zbx_audit_update_json_append_no_value(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_tag, tag);
-	zbx_audit_update_json_append_string(hostid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+#define	AUDIT_TABLE_NAME	"host_tag"
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_tag, tag,
+			AUDIT_TABLE_NAME, "tag");
+	zbx_audit_update_json_append_string(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value,
+			AUDIT_TABLE_NAME, "value");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_host_prototype_update_json_update_tag_create_entry(zbx_uint64_t hostid, zbx_uint64_t tagid)
@@ -758,7 +854,7 @@ void	zbx_audit_host_prototype_update_json_update_tag_create_entry(zbx_uint64_t h
 
 	zbx_snprintf(buf, sizeof(buf), "hostprototype.tags[" ZBX_FS_UI64 "]", tagid);
 
-	zbx_audit_update_json_append_no_value(hostid, AUDIT_DETAILS_ACTION_UPDATE, buf);
+	zbx_audit_update_json_append_no_value(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_UPDATE, buf);
 }
 
 void	zbx_audit_host_prototype_update_json_update_tag_tag(zbx_uint64_t hostid, zbx_uint64_t tagid,
@@ -770,7 +866,7 @@ void	zbx_audit_host_prototype_update_json_update_tag_tag(zbx_uint64_t hostid, zb
 
 	zbx_snprintf(buf, sizeof(buf), "hostprototype.tags[" ZBX_FS_UI64 "].tag", tagid);
 
-	zbx_audit_update_json_update_string(hostid, buf, tag_old, tag_new);
+	zbx_audit_update_json_update_string(hostid, AUDIT_HOST_ID, buf, tag_old, tag_new);
 }
 
 void	zbx_audit_host_prototype_update_json_update_tag_value(zbx_uint64_t hostid, zbx_uint64_t tagid,
@@ -782,7 +878,7 @@ void	zbx_audit_host_prototype_update_json_update_tag_value(zbx_uint64_t hostid,
 
 	zbx_snprintf(buf, sizeof(buf), "hostprototype.tags[" ZBX_FS_UI64 "].value", tagid);
 
-	zbx_audit_update_json_update_string(hostid, buf, value_old, value_new);
+	zbx_audit_update_json_update_string(hostid, AUDIT_HOST_ID, buf, value_old, value_new);
 }
 
 void	zbx_audit_host_prototype_update_json_delete_tag(zbx_uint64_t hostid, zbx_uint64_t tagid)
@@ -793,7 +889,7 @@ void	zbx_audit_host_prototype_update_json_delete_tag(zbx_uint64_t hostid, zbx_ui
 
 	zbx_snprintf(buf, sizeof(buf), "hostprototype.tags[" ZBX_FS_UI64 "]", tagid);
 
-	zbx_audit_update_json_delete(hostid, AUDIT_DETAILS_ACTION_DELETE, buf);
+	zbx_audit_update_json_delete(hostid, AUDIT_HOST_ID, AUDIT_DETAILS_ACTION_DELETE, buf);
 }
 
 void	zbx_audit_host_group_create_entry(int audit_action, zbx_uint64_t groupid, const char *name)
@@ -805,6 +901,7 @@ void	zbx_audit_host_group_create_entry(int audit_action, zbx_uint64_t groupid, c
 
 	local_audit_group_entry.id = groupid;
 	local_audit_group_entry.cuid = NULL;
+	local_audit_group_entry.id_table = AUDIT_HOSTGRP_ID;
 
 	found_audit_group_entry = (zbx_audit_entry_t**)zbx_hashset_search(zbx_get_audit_hashset(),
 			&(local_audit_group_entry_x));
@@ -812,7 +909,7 @@ void	zbx_audit_host_group_create_entry(int audit_action, zbx_uint64_t groupid, c
 	{
 		zbx_audit_entry_t	*local_audit_group_entry_insert;
 
-		local_audit_group_entry_insert = zbx_audit_entry_init(groupid, name, audit_action,
+		local_audit_group_entry_insert = zbx_audit_entry_init(groupid, AUDIT_HOSTGRP_ID, name, audit_action,
 				AUDIT_RESOURCE_HOST_GROUP);
 		zbx_hashset_insert(zbx_get_audit_hashset(), &local_audit_group_entry_insert,
 				sizeof(local_audit_group_entry_insert));
@@ -830,8 +927,12 @@ void	zbx_audit_host_group_update_json_add_details(zbx_uint64_t groupid, const ch
 {
 	RETURN_IF_AUDIT_OFF();
 
-	zbx_audit_update_json_append_string(groupid, AUDIT_DETAILS_ACTION_ADD, "group.name", name);
-	zbx_audit_update_json_append_int(groupid, AUDIT_DETAILS_ACTION_ADD, "group.flags", flags);
+#define	AUDIT_TABLE_NAME	"hstgrp"
+	zbx_audit_update_json_append_string(groupid, AUDIT_HOSTGRP_ID, AUDIT_DETAILS_ACTION_ADD, "group.name", name,
+			AUDIT_TABLE_NAME, "name");
+	zbx_audit_update_json_append_int(groupid, AUDIT_HOSTGRP_ID, AUDIT_DETAILS_ACTION_ADD, "group.flags", flags,
+			AUDIT_TABLE_NAME, "flags");
+#undef AUDIT_TABLE_NAME
 }
 
 #define PREPARE_AUDIT_HOST_GROUP_UPDATE(resource, type1, type2)							\
@@ -840,7 +941,8 @@ void	zbx_audit_host_group_update_json_update_##resource(zbx_uint64_t groupid, ty
 {														\
 	RETURN_IF_AUDIT_OFF();											\
 														\
-	zbx_audit_update_json_update_##type2(groupid, "group."#resource, old_##resource, new_##resource);	\
+	zbx_audit_update_json_update_##type2(groupid, AUDIT_HOSTGRP_ID, "group."#resource, old_##resource,	\
+			new_##resource);									\
 }														\
 
 PREPARE_AUDIT_HOST_GROUP_UPDATE(name, const char*, string)
diff --git a/src/libs/zbxaudit/audit_host.h b/src/libs/zbxaudit/audit_host.h
index f3e3fb8316f..ab448cae35d 100644
--- a/src/libs/zbxaudit/audit_host.h
+++ b/src/libs/zbxaudit/audit_host.h
@@ -41,10 +41,10 @@ void	zbx_audit_##funcname##_update_json_update_snmp_interface(zbx_uint64_t hosti
 PREPARE_AUDIT_SNMP_INTERFACE_H(host)
 PREPARE_AUDIT_SNMP_INTERFACE_H(host_prototype)
 
-void	zbx_audit_host_update_json_add_proxy_hostid_and_hostname(zbx_uint64_t hostid, zbx_uint64_t proxy_hostid,
-		const char *hostname);
+void	zbx_audit_host_update_json_add_proxy_hostid_and_hostname_and_inventory_mode(zbx_uint64_t hostid,
+		zbx_uint64_t proxy_hostid, const char *hostname, int inventory_mode);
 void	zbx_audit_host_update_json_add_tls_and_psk(zbx_uint64_t hostid, int tls_connect, int tls_accept,
-		const char *psk_identity, const char *psk);
+		const char *tls_psk_identity, const char *tls_psk);
 void	zbx_audit_host_update_json_add_inventory_mode(zbx_uint64_t hostid, int inventory_mode);
 void	zbx_audit_host_update_json_update_inventory_mode(zbx_uint64_t hostid, int inventory_mode_old,
 		int inventory_mode_new);
@@ -83,7 +83,7 @@ PREPARE_AUDIT_HOST_INTERFACE_H(funcname, contextname, const char*)						\
 PREPARE_AUDIT_HOST_H(host, AUDIT_RESOURCE_HOST)
 PREPARE_AUDIT_HOST_H(host_prototype, AUDIT_RESOURCE_HOST_PROTOTYPE)
 
-#define PREPARE_AUDIT_HOST_UPDATE_H(resource, type1)						\
+#define PREPARE_AUDIT_HOST_UPDATE_H(resource, type1)							\
 void	zbx_audit_host_update_json_update_##resource(zbx_uint64_t hostid, type1 old_##resource,		\
 		type1 new_##resource);									\
 
@@ -104,7 +104,6 @@ PREPARE_AUDIT_HOST_UPDATE_H(custom_interfaces, int)
 #undef PREPARE_AUDIT_HOST_UPDATE_H
 
 void	zbx_audit_host_update_json_delete_interface(zbx_uint64_t hostid, zbx_uint64_t interfaceid);
-
 void	zbx_audit_host_update_json_add_hostmacro(zbx_uint64_t hostid, zbx_uint64_t macroid,
 		const char *macro, const char *value, const char *description, int type);
 
@@ -137,10 +136,10 @@ void	zbx_audit_host_del(zbx_uint64_t hostid, const char *hostname);
 void	zbx_audit_host_update_json_add_details(zbx_uint64_t hostid, const char *host, zbx_uint64_t proxy_hostid,
 		int ipmi_authtype, int ipmi_privilege, const char *ipmi_username, const char *ipmi_password,
 		int status, int flags, int tls_connect, int tls_accept, const char *tls_issuer, const char *tls_subject,
-		const char *tls_psk_identity, const char *tls_psk, int custom_interfaces);
+		const char *tls_psk_identity, const char *tls_psk, int custom_interfaces, int inventory_mode);
 void	zbx_audit_host_prototype_del(zbx_uint64_t hostid, const char *hostname);
 void	zbx_audit_host_prototype_update_json_add_details(zbx_uint64_t hostid, zbx_uint64_t templateid, const char *name,
-		int status, int discover, int custom_interfaces);
+		int status, int discover, int custom_interfaces, int inventory_mode);
 void	zbx_audit_host_prototype_update_json_update_templateid(zbx_uint64_t hostid, zbx_uint64_t templateid_orig,
 		zbx_uint64_t templateid);
 
@@ -152,6 +151,7 @@ PREPARE_AUDIT_HOST_PROTOTYPE_UPDATE_H(name, const char*)
 PREPARE_AUDIT_HOST_PROTOTYPE_UPDATE_H(status, int)
 PREPARE_AUDIT_HOST_PROTOTYPE_UPDATE_H(discover, int)
 PREPARE_AUDIT_HOST_PROTOTYPE_UPDATE_H(custom_interfaces, int)
+PREPARE_AUDIT_HOST_PROTOTYPE_UPDATE_H(inventory_mode, int)
 
 void	zbx_audit_host_prototype_update_json_add_group_details(zbx_uint64_t hostid, zbx_uint64_t group_prototypeid,
 		const char* name, zbx_uint64_t groupid, zbx_uint64_t templateid);
@@ -202,7 +202,7 @@ void	zbx_audit_host_group_create_entry(int audit_action, zbx_uint64_t groupid, c
 void	zbx_audit_host_group_del(zbx_uint64_t groupid, const char *name);
 void	zbx_audit_host_group_update_json_add_details(zbx_uint64_t groupid, const char *name, int flags);
 
-#define PREPARE_AUDIT_HOST_GROUP_UPDATE_H(resource, type1)						\
+#define PREPARE_AUDIT_HOST_GROUP_UPDATE_H(resource, type1)							\
 void	zbx_audit_host_group_update_json_update_##resource(zbx_uint64_t groupid, type1 old_##resource,		\
 		type1 new_##resource);										\
 
diff --git a/src/libs/zbxaudit/audit_httptest.c b/src/libs/zbxaudit/audit_httptest.c
index 877c8f52205..4db08cec07b 100644
--- a/src/libs/zbxaudit/audit_httptest.c
+++ b/src/libs/zbxaudit/audit_httptest.c
@@ -31,6 +31,7 @@ void	zbx_audit_httptest_create_entry(int audit_action, zbx_uint64_t httptestid,
 
 	local_audit_httptest_entry.id = httptestid;
 	local_audit_httptest_entry.cuid = NULL;
+	local_audit_httptest_entry.id_table = AUDIT_HTTPTEST_ID;
 
 	found_audit_httptest_entry = (zbx_audit_entry_t**)zbx_hashset_search(zbx_get_audit_hashset(),
 			&(local_audit_httptest_entry_x));
@@ -39,14 +40,8 @@ void	zbx_audit_httptest_create_entry(int audit_action, zbx_uint64_t httptestid,
 	{
 		zbx_audit_entry_t	*local_audit_httptest_entry_insert;
 
-		local_audit_httptest_entry_insert = (zbx_audit_entry_t*)zbx_malloc(NULL,
-				sizeof(zbx_audit_entry_t));
-
-		local_audit_httptest_entry_insert->id = httptestid;
-		local_audit_httptest_entry_insert->name = zbx_strdup(NULL, name);
-		local_audit_httptest_entry_insert->audit_action = audit_action;
-		local_audit_httptest_entry_insert->resource_type = AUDIT_RESOURCE_SCENARIO;
-		zbx_json_init(&(local_audit_httptest_entry_insert->details_json), ZBX_JSON_STAT_BUF_LEN);
+		local_audit_httptest_entry_insert = zbx_audit_entry_init(httptestid, AUDIT_HTTPTEST_ID, name,
+				audit_action, AUDIT_RESOURCE_SCENARIO);
 
 		zbx_hashset_insert(zbx_get_audit_hashset(), &local_audit_httptest_entry_insert,
 				sizeof(local_audit_httptest_entry_insert));
@@ -55,8 +50,9 @@ void	zbx_audit_httptest_create_entry(int audit_action, zbx_uint64_t httptestid,
 
 void	zbx_audit_httptest_update_json_add_data(zbx_uint64_t httptestid, zbx_uint64_t templateid, const char *name,
 		const char *delay, unsigned char status, const char *agent, unsigned char authentication,
-		const char *httpuser, const char *http_proxy, int retries,  const char *ssl_cert_file,
-		const char *ssl_key_file, int verify_peer, int verify_host, zbx_uint64_t hostid)
+		const char *httpuser, const char *httppassword, const char *http_proxy, int retries,
+		const char *ssl_cert_file, const char *ssl_key_file, const char *ssl_key_password, int verify_peer,
+		int verify_host, zbx_uint64_t hostid)
 {
 	char	audit_key_templateid[AUDIT_DETAILS_KEY_LEN], audit_key_name[AUDIT_DETAILS_KEY_LEN],
 		audit_key_delay[AUDIT_DETAILS_KEY_LEN], audit_key_status[AUDIT_DETAILS_KEY_LEN],
@@ -69,7 +65,9 @@ void	zbx_audit_httptest_update_json_add_data(zbx_uint64_t httptestid, zbx_uint64
 	RETURN_IF_AUDIT_OFF();
 
 #define AUDIT_KEY_SNPRINTF(r) zbx_snprintf(audit_key_##r, sizeof(audit_key_##r), "httptest."#r);
-	zbx_audit_update_json_append_uint64(httptestid, AUDIT_DETAILS_ACTION_ADD, "httptest.httptestid", httptestid);
+#define AUDIT_TABLE_NAME	"httptest"
+	zbx_audit_update_json_append_uint64(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD,
+			"httptest.httptestid", httptestid, AUDIT_TABLE_NAME, "httptestid");
 	AUDIT_KEY_SNPRINTF(templateid)
 	AUDIT_KEY_SNPRINTF(name)
 	AUDIT_KEY_SNPRINTF(delay)
@@ -85,27 +83,31 @@ void	zbx_audit_httptest_update_json_add_data(zbx_uint64_t httptestid, zbx_uint64
 	AUDIT_KEY_SNPRINTF(verify_host)
 	AUDIT_KEY_SNPRINTF(hostid)
 #undef AUDIT_KEY_SNPRINTF
-#define ADD_STR(r) zbx_audit_update_json_append_string(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r);
-#define ADD_UINT64(r) zbx_audit_update_json_append_uint64(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r);
-#define ADD_INT(r) zbx_audit_update_json_append_int(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r);
-	ADD_UINT64(templateid)
-	ADD_STR(name)
-	ADD_STR(delay)
-	ADD_INT(status)
-	ADD_STR(agent)
-	ADD_INT(authentication)
-	ADD_STR(httpuser)
-	zbx_audit_update_json_append_string(httptestid, AUDIT_DETAILS_ACTION_ADD, "httptest.httppassword",
-				ZBX_MACRO_SECRET_MASK);
-	ADD_STR(http_proxy)
-	ADD_INT(retries)
-	ADD_STR(ssl_cert_file)
-	ADD_STR(ssl_key_file)
-	zbx_audit_update_json_append_string(httptestid, AUDIT_DETAILS_ACTION_ADD, "httptest.ssl_key_password",
-			ZBX_MACRO_SECRET_MASK);
-	ADD_INT(verify_peer)
-	ADD_INT(verify_host)
-	ADD_UINT64(hostid)
+#define ADD_STR(r, t, f) zbx_audit_update_json_append_string(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD, \
+		audit_key_##r, r, t, f);
+#define ADD_UINT64(r, t, f) zbx_audit_update_json_append_uint64(httptestid, AUDIT_HTTPTEST_ID, \
+		AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r, t, f);
+#define ADD_INT(r, t, f) zbx_audit_update_json_append_int(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD, \
+		audit_key_##r, r, t, f);
+	ADD_UINT64(templateid, AUDIT_TABLE_NAME, "templateid")
+	ADD_STR(name, AUDIT_TABLE_NAME, "name")
+	ADD_STR(delay, AUDIT_TABLE_NAME, "delay")
+	ADD_INT(status, AUDIT_TABLE_NAME, "status")
+	ADD_STR(agent, AUDIT_TABLE_NAME, "agent")
+	ADD_INT(authentication, AUDIT_TABLE_NAME, "authentication")
+	ADD_STR(httpuser, AUDIT_TABLE_NAME, "http_user")
+	zbx_audit_update_json_append_string_secret(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD,
+			"httptest.httppassword", httppassword, AUDIT_TABLE_NAME, "http_password");
+	ADD_STR(http_proxy, AUDIT_TABLE_NAME, "http_proxy")
+	ADD_INT(retries, AUDIT_TABLE_NAME, "retries")
+	ADD_STR(ssl_cert_file, AUDIT_TABLE_NAME, "ssl_cert_file")
+	ADD_STR(ssl_key_file, AUDIT_TABLE_NAME, "ssl_key_file")
+	zbx_audit_update_json_append_string_secret(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD,
+			"httptest.ssl_key_password", ssl_key_password, AUDIT_TABLE_NAME, "ssl_key_password");
+	ADD_INT(verify_peer, AUDIT_TABLE_NAME, "verify_peer")
+	ADD_INT(verify_host, AUDIT_TABLE_NAME, "verify_host")
+	ADD_UINT64(hostid, AUDIT_TABLE_NAME, "hostid")
+#undef AUDIT_TABLE_NAME
 #undef ADD_STR
 #undef ADD_UINT64
 #undef ADD_INT
@@ -121,7 +123,8 @@ void	zbx_audit_httptest_update_json_update_##resource(zbx_uint64_t httptestid, t
 														\
 	zbx_snprintf(buf, sizeof(buf), "httptest."#resource);							\
 														\
-	zbx_audit_update_json_update_##type2(httptestid, buf, resource##_old, resource##_new);			\
+	zbx_audit_update_json_update_##type2(httptestid, AUDIT_HTTPTEST_ID, buf, resource##_old,		\
+			resource##_new);									\
 }
 
 PREPARE_AUDIT_HTTPTEST_UPDATE(templateid, zbx_uint64_t, uint64)
@@ -178,9 +181,13 @@ void	zbx_audit_httptest_update_json_add_httptest_tag(zbx_uint64_t httptestid, zb
 	zbx_snprintf(audit_key_tag, sizeof(audit_key_tag), "httptest.tags[" ZBX_FS_UI64 "].tag", tagid);
 	zbx_snprintf(audit_key_value, sizeof(audit_key_value), "httptest.tags[" ZBX_FS_UI64 "].value", tagid);
 
-	zbx_audit_update_json_append_no_value(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_string(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_tag, tag);
-	zbx_audit_update_json_append_string(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+#define AUDIT_TABLE_NAME	"httptest_tag"
+	zbx_audit_update_json_append_no_value(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_string(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_tag,
+			tag, AUDIT_TABLE_NAME, "tag");
+	zbx_audit_update_json_append_string(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_value,
+			value, AUDIT_TABLE_NAME, "value");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_httptest_update_json_delete_tags(zbx_uint64_t httptestid, zbx_uint64_t tagid)
@@ -191,7 +198,7 @@ void	zbx_audit_httptest_update_json_delete_tags(zbx_uint64_t httptestid, zbx_uin
 
 	zbx_snprintf(buf, sizeof(buf), "httptest.tags[" ZBX_FS_UI64 "]", tagid);
 
-	zbx_audit_update_json_append_no_value(httptestid, AUDIT_DETAILS_ACTION_DELETE, buf);
+	zbx_audit_update_json_append_no_value(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_DELETE, buf);
 }
 
 void	zbx_audit_httptest_update_json_add_httptest_httpstep(zbx_uint64_t httptestid, zbx_uint64_t httpstepid,
@@ -211,7 +218,8 @@ void	zbx_audit_httptest_update_json_add_httptest_httpstep(zbx_uint64_t httptesti
 	zbx_snprintf(audit_key_name, sizeof(audit_key_name), "httptest.steps[" ZBX_FS_UI64 "].name", httpstepid);
 	zbx_snprintf(audit_key_no, sizeof(audit_key_no), "httptest.steps[" ZBX_FS_UI64 "].no", httpstepid);
 	zbx_snprintf(audit_key_url, sizeof(audit_key_url), "httptest.steps[" ZBX_FS_UI64 "].url", httpstepid);
-	zbx_snprintf(audit_key_timeout, sizeof(audit_key_timeout), "httptest.steps[" ZBX_FS_UI64 "].timeout", httpstepid);
+	zbx_snprintf(audit_key_timeout, sizeof(audit_key_timeout), "httptest.steps[" ZBX_FS_UI64 "].timeout",
+			httpstepid);
 	zbx_snprintf(audit_key_posts, sizeof(audit_key_posts), "httptest.steps[" ZBX_FS_UI64 "].posts", httpstepid);
 	zbx_snprintf(audit_key_required, sizeof(audit_key_required), "httptest.steps[" ZBX_FS_UI64 "].required",
 			httpstepid);
@@ -224,22 +232,32 @@ void	zbx_audit_httptest_update_json_add_httptest_httpstep(zbx_uint64_t httptesti
 	zbx_snprintf(audit_key_post_type, sizeof(audit_key_post_type), "httptest.steps[" ZBX_FS_UI64 "].post_type",
 			httpstepid);
 
-	zbx_audit_update_json_append_no_value(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_string(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_name, name);
-	zbx_audit_update_json_append_int(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_no, no);
-	zbx_audit_update_json_append_string(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_url, url);
-	zbx_audit_update_json_append_string(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_timeout, timeout);
-	zbx_audit_update_json_append_string(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_posts, posts);
-	zbx_audit_update_json_append_string(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_required, required);
-	zbx_audit_update_json_append_string(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_status_codes, status_codes);
-	zbx_audit_update_json_append_int(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_follow_redirects,
-			follow_redirects);
-	zbx_audit_update_json_append_int(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_retrieve_mode, retrieve_mode);
-	zbx_audit_update_json_append_int(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_post_type, post_type);
+#define AUDIT_TABLE_NAME	"httpstep"
+	zbx_audit_update_json_append_string(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_name,
+			name, AUDIT_TABLE_NAME, "name");
+	zbx_audit_update_json_append_int(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_no, no,
+			AUDIT_TABLE_NAME, "no");
+	zbx_audit_update_json_append_string(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_url,
+			url, AUDIT_TABLE_NAME, "url");
+	zbx_audit_update_json_append_string(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_timeout,
+			timeout, AUDIT_TABLE_NAME, "timeout");
+	zbx_audit_update_json_append_string(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_posts,
+			posts, AUDIT_TABLE_NAME, "posts");
+	zbx_audit_update_json_append_string(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD,
+			audit_key_required, required, AUDIT_TABLE_NAME, "required");
+	zbx_audit_update_json_append_string(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD,
+			audit_key_status_codes, status_codes, AUDIT_TABLE_NAME, "status_codes");
+	zbx_audit_update_json_append_int(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD,
+			audit_key_follow_redirects, follow_redirects, AUDIT_TABLE_NAME, "follow_redirects");
+	zbx_audit_update_json_append_int(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD,
+			audit_key_retrieve_mode, retrieve_mode, AUDIT_TABLE_NAME, "retrieve_mode");
+	zbx_audit_update_json_append_int(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD,
+			audit_key_post_type, post_type, AUDIT_TABLE_NAME, "post_type");
+#undef AUDIT_TABLE_NAME
 }
 
 #define PREPARE_AUDIT_HTTPSTEP_UPDATE(resource, type1, type2)							\
-void	zbx_audit_httptest_update_json_httpstep_update_##resource(zbx_uint64_t httptestid, 			\
+void	zbx_audit_httptest_update_json_httpstep_update_##resource(zbx_uint64_t httptestid,			\
 		zbx_uint64_t httpstepid, type1 resource##_old, type1 resource##_new)				\
 {														\
 	char	buf[AUDIT_DETAILS_KEY_LEN];									\
@@ -248,7 +266,8 @@ void	zbx_audit_httptest_update_json_httpstep_update_##resource(zbx_uint64_t http
 														\
 	zbx_snprintf(buf, sizeof(buf), "httptest.steps[" ZBX_FS_UI64 "]."#resource, httpstepid);		\
 														\
-	zbx_audit_update_json_update_##type2(httptestid, buf, resource##_old, resource##_new);			\
+	zbx_audit_update_json_update_##type2(httptestid, AUDIT_HTTPTEST_ID, buf, resource##_old,		\
+			resource##_new);									\
 }
 
 PREPARE_AUDIT_HTTPSTEP_UPDATE(url, const char*, string)
@@ -303,9 +322,13 @@ void	zbx_audit_httptest_update_json_add_httptest_field(zbx_uint64_t httptestid,
 	zbx_snprintf(audit_key_value, sizeof(audit_key_value), "httptest.%s[" ZBX_FS_UI64 "].value", audit_key_type,
 			httptestfieldid);
 
-	zbx_audit_update_json_append_no_value(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_string(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_name, name);
-	zbx_audit_update_json_append_string(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+#define AUDIT_TABLE_NAME	"httpstep_field"
+	zbx_audit_update_json_append_no_value(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_string(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_name,
+			name, AUDIT_TABLE_NAME, "name");
+	zbx_audit_update_json_append_string(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_value,
+			value, AUDIT_TABLE_NAME, "value");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_httptest_update_json_delete_httptest_field(zbx_uint64_t httptestid, zbx_uint64_t fieldid, int type)
@@ -317,7 +340,7 @@ void	zbx_audit_httptest_update_json_delete_httptest_field(zbx_uint64_t httptesti
 	zbx_snprintf(audit_key_type, sizeof(audit_key_type), "%s", field_type_to_name(type));
 	zbx_snprintf(audit_key, sizeof(audit_key), "httptest.%s[" ZBX_FS_UI64 "]",audit_key_type, fieldid);
 
-	zbx_audit_update_json_append_no_value(httptestid, AUDIT_DETAILS_ACTION_DELETE, audit_key);
+	zbx_audit_update_json_append_no_value(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_DELETE, audit_key);
 }
 
 void	zbx_audit_httptest_update_json_add_httpstep_field(zbx_uint64_t httptestid, zbx_uint64_t httpstepid,
@@ -336,10 +359,13 @@ void	zbx_audit_httptest_update_json_add_httpstep_field(zbx_uint64_t httptestid,
 	zbx_snprintf(audit_key_value, sizeof(audit_key_value),
 			"httptest.steps[" ZBX_FS_UI64 "].%s[" ZBX_FS_UI64 "].value", httpstepid, audit_key_type,
 			httpstepfieldid);
-
-	zbx_audit_update_json_append_no_value(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_string(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_name, name);
-	zbx_audit_update_json_append_string(httptestid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+#define AUDIT_TABLE_NAME	"httpstep_field"
+	zbx_audit_update_json_append_no_value(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_string(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_name,
+			name, AUDIT_TABLE_NAME, "name");
+	zbx_audit_update_json_append_string(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_value,
+			value, AUDIT_TABLE_NAME, "value");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_httptest_update_json_delete_httpstep_field(zbx_uint64_t httptestid, zbx_uint64_t httpstepid,
@@ -353,5 +379,5 @@ void	zbx_audit_httptest_update_json_delete_httpstep_field(zbx_uint64_t httptesti
 	zbx_snprintf(audit_key, sizeof(audit_key), "httptest.steps[" ZBX_FS_UI64 "].%s[" ZBX_FS_UI64 "]",
 			httpstepid, audit_key_type, fieldid);
 
-	zbx_audit_update_json_append_no_value(httptestid, AUDIT_DETAILS_ACTION_DELETE, audit_key);
+	zbx_audit_update_json_append_no_value(httptestid, AUDIT_HTTPTEST_ID, AUDIT_DETAILS_ACTION_DELETE, audit_key);
 }
diff --git a/src/libs/zbxaudit/audit_httptest.h b/src/libs/zbxaudit/audit_httptest.h
index 79de31a6073..2850da900cd 100644
--- a/src/libs/zbxaudit/audit_httptest.h
+++ b/src/libs/zbxaudit/audit_httptest.h
@@ -29,8 +29,9 @@ void	zbx_audit_httptest_create_entry(int audit_action, zbx_uint64_t httptestid,
 
 void	zbx_audit_httptest_update_json_add_data(zbx_uint64_t httptestid, zbx_uint64_t templateid, const char *name,
 		const char *delay, unsigned char status, const char *agent, unsigned char authentication,
-		const char *httpuser, const char *http_proxy, int retries,  const char *ssl_cert_file,
-		const char *ssl_key_file, int verify_peer, int verify_host, zbx_uint64_t hostid);
+		const char *httpuser, const char *httppassword, const char *http_proxy, int retries,
+		const char *ssl_cert_file, const char *ssl_key_file, const char *ssl_key_password, int verify_peer,
+		int verify_host, zbx_uint64_t hostid);
 
 #define PREPARE_AUDIT_HTTPTEST_UPDATE_H(resource, type1)						\
 void	zbx_audit_httptest_update_json_update_##resource(zbx_uint64_t httptestid, type1 resource##_old,	\
diff --git a/src/libs/zbxaudit/audit_item.c b/src/libs/zbxaudit/audit_item.c
index 30dff344caf..1eadbc106cc 100644
--- a/src/libs/zbxaudit/audit_item.c
+++ b/src/libs/zbxaudit/audit_item.c
@@ -57,14 +57,15 @@ void	zbx_audit_item_create_entry(int audit_action, zbx_uint64_t itemid, const ch
 
 	local_audit_item_entry.id = itemid;
 	local_audit_item_entry.cuid = NULL;
-
+	local_audit_item_entry.id_table = AUDIT_ITEM_ID;
 	found_audit_item_entry = (zbx_audit_entry_t**)zbx_hashset_search(zbx_get_audit_hashset(),
 			&(local_audit_item_entry_x));
 	if (NULL == found_audit_item_entry)
 	{
 		zbx_audit_entry_t	*local_audit_item_entry_insert;
 
-		local_audit_item_entry_insert = zbx_audit_entry_init(itemid, name, audit_action, resource_type);
+		local_audit_item_entry_insert = zbx_audit_entry_init(itemid, AUDIT_ITEM_ID, name, audit_action,
+				resource_type);
 
 		zbx_hashset_insert(zbx_get_audit_hashset(), &local_audit_item_entry_insert,
 				sizeof(local_audit_item_entry_insert));
@@ -86,123 +87,134 @@ void	zbx_audit_item_update_json_add_data(zbx_uint64_t itemid, const zbx_template
 
 #define ONLY_ITEM_AND_ITEM_PROTOTYPE (AUDIT_RESOURCE_ITEM == resource_type || \
 		AUDIT_RESOURCE_ITEM_PROTOTYPE == resource_type)
-#define ADD_JSON_S(x)	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, IT_OR_ITP_OR_DR(x),\
-		item->x)
-#define ADD_JSON_UI(x)	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, IT_OR_ITP_OR_DR(x),\
-		item->x)
-	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, IT_OR_ITP_OR_DR(itemid), itemid);
-	ADD_JSON_S(delay);
-	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, IT_OR_ITP_OR_DR(hostid), hostid);
-	ADD_JSON_UI(interfaceid);
-	ADD_JSON_S(key); // API HAS 'key_' , but SQL 'key'
-	ADD_JSON_S(name);
-	ADD_JSON_UI(type);
-	ADD_JSON_S(url);
+#define ADD_JSON_S(x, t, f)	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD,\
+		IT_OR_ITP_OR_DR(x), item->x, t, f)
+#define ADD_JSON_UI(x, t, f)	zbx_audit_update_json_append_uint64(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD,\
+		IT_OR_ITP_OR_DR(x), item->x, t, f)
+#define AUDIT_TABLE_NAME	"items"
+	zbx_audit_update_json_append_uint64(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, IT_OR_ITP_OR_DR(itemid),
+			itemid, AUDIT_TABLE_NAME, "itemid");
+	ADD_JSON_S(delay, AUDIT_TABLE_NAME, "delay");
+	zbx_audit_update_json_append_uint64(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, IT_OR_ITP_OR_DR(hostid),
+			hostid, AUDIT_TABLE_NAME, "hostid");
+	ADD_JSON_UI(interfaceid, AUDIT_TABLE_NAME, "interfaceid");
+	ADD_JSON_S(key, AUDIT_TABLE_NAME, "key_");
+	ADD_JSON_S(name, AUDIT_TABLE_NAME, "name");
+	ADD_JSON_UI(type, AUDIT_TABLE_NAME, "type");
+	ADD_JSON_S(url, AUDIT_TABLE_NAME, "url");
 
 	if ONLY_ITEM_AND_ITEM_PROTOTYPE
 	{
-		zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ? "item.value_type" :
-				"itemprototype.value_type", item->value_type);
+		zbx_audit_update_json_append_uint64(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ?
+				"item.value_type" : "itemprototype.value_type", item->value_type, AUDIT_TABLE_NAME,
+				"value_type");
 	}
 
-	ADD_JSON_UI(allow_traps);
-	ADD_JSON_UI(authtype);
-	ADD_JSON_S(description);
+	ADD_JSON_UI(allow_traps, AUDIT_TABLE_NAME, "allow_traps");
+	ADD_JSON_UI(authtype, AUDIT_TABLE_NAME, "authtype");
+	ADD_JSON_S(description, AUDIT_TABLE_NAME, "description");
 
 	if ONLY_ITEM
-		zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, "item.flags", item->flags);
+	{
+		zbx_audit_update_json_append_uint64(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, "item.flags",
+				item->flags, AUDIT_TABLE_NAME, "flags");
+	}
 
-	ADD_JSON_UI(follow_redirects);
-	ADD_JSON_S(headers);
+	ADD_JSON_UI(follow_redirects, AUDIT_TABLE_NAME, "follow_redirects");
+	ADD_JSON_S(headers, AUDIT_TABLE_NAME, "headers");
 
 	if ONLY_ITEM_AND_ITEM_PROTOTYPE
 	{
-		zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ? "item.history" :
-				"itemprototype.history", item->history);
+		zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ?
+				"item.history" : "itemprototype.history", item->history, AUDIT_TABLE_NAME, "history");
 	}
 
-	ADD_JSON_S(http_proxy);
+	ADD_JSON_S(http_proxy, AUDIT_TABLE_NAME, "http_proxy");
 
 	if ONLY_ITEM
 	{
-		zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, "item.inventory_link",
-				item->inventory_link);
+		zbx_audit_update_json_append_uint64(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD,
+				"item.inventory_link", item->inventory_link, AUDIT_TABLE_NAME, "inventory_link");
 	}
 
-	ADD_JSON_S(ipmi_sensor);
-	ADD_JSON_S(jmx_endpoint);
+	ADD_JSON_S(ipmi_sensor, AUDIT_TABLE_NAME, "ipmi_sensor");
+	ADD_JSON_S(jmx_endpoint, AUDIT_TABLE_NAME, "jmx_endpoint");
 
 	if ONLY_LLD_RULE
 	{
-		zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, "discoveryrule.lifetime",
-				item->lifetime);
+		zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD,
+				"discoveryrule.lifetime", item->lifetime, AUDIT_TABLE_NAME, "lifetime");
 	}
 
 	if ONLY_ITEM_AND_ITEM_PROTOTYPE
 	{
-		zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ? "item.logtimefmt" :
-				"itemprototype.logtimefmt", item->logtimefmt);
+		zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ?
+				"item.logtimefmt" : "itemprototype.logtimefmt", item->logtimefmt, AUDIT_TABLE_NAME,
+				"logtimefmt");
 	}
 
-	ADD_JSON_UI(master_itemid);
-	ADD_JSON_UI(output_format);
-	ADD_JSON_S(params);
-
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, IT_OR_ITP_OR_DR(password),
-			ZBX_MACRO_SECRET_MASK);
-
-	ADD_JSON_UI(post_type);
-	ADD_JSON_S(posts);
-	ADD_JSON_S(privatekey);
-	ADD_JSON_S(publickey);
-	ADD_JSON_S(query_fields);
-	ADD_JSON_UI(request_method);
-	ADD_JSON_UI(retrieve_mode);
-	ADD_JSON_S(snmp_oid);
-	ADD_JSON_S(ssl_cert_file);
-	ADD_JSON_S(ssl_key_file);
-
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, IT_OR_ITP_OR_DR(ssl_key_password),
-			ZBX_MACRO_SECRET_MASK);
-
-	ADD_JSON_UI(status);
-	ADD_JSON_S(status_codes);
-	ADD_JSON_UI(templateid);
-	ADD_JSON_S(timeout);
-	ADD_JSON_S(trapper_hosts);
+	ADD_JSON_UI(master_itemid, AUDIT_TABLE_NAME, "master_itemid");
+	ADD_JSON_UI(output_format, AUDIT_TABLE_NAME, "output_format");
+	ADD_JSON_S(params, AUDIT_TABLE_NAME, "params");
+
+	zbx_audit_update_json_append_string_secret(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD,
+			IT_OR_ITP_OR_DR(password), item->password, AUDIT_TABLE_NAME, "password");
+
+	ADD_JSON_UI(post_type, AUDIT_TABLE_NAME, "post_type");
+	ADD_JSON_S(posts, AUDIT_TABLE_NAME, "posts");
+	ADD_JSON_S(privatekey, AUDIT_TABLE_NAME, "privatekey");
+	ADD_JSON_S(publickey, AUDIT_TABLE_NAME, "publickey");
+	ADD_JSON_S(query_fields, AUDIT_TABLE_NAME, "query_fields");
+	ADD_JSON_UI(request_method, AUDIT_TABLE_NAME, "request_method");
+	ADD_JSON_UI(retrieve_mode, AUDIT_TABLE_NAME, "retrieve_mode");
+	ADD_JSON_S(snmp_oid, AUDIT_TABLE_NAME, "snmp_oid");
+	ADD_JSON_S(ssl_cert_file, AUDIT_TABLE_NAME, "ssl_cert_file");
+	ADD_JSON_S(ssl_key_file, AUDIT_TABLE_NAME, "ssl_key_file");
+
+	zbx_audit_update_json_append_string_secret(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD,
+			IT_OR_ITP_OR_DR(ssl_key_password), item->ssl_key_password, AUDIT_TABLE_NAME,
+			"ssl_key_password");
+
+	ADD_JSON_UI(status, AUDIT_TABLE_NAME, "status");
+	ADD_JSON_S(status_codes, AUDIT_TABLE_NAME, "status_codes");
+	ADD_JSON_UI(templateid, AUDIT_TABLE_NAME, "templateid");
+	ADD_JSON_S(timeout, AUDIT_TABLE_NAME, "timeout");
+	ADD_JSON_S(trapper_hosts, AUDIT_TABLE_NAME, "trapper_hosts");
 
 	if ONLY_ITEM_AND_ITEM_PROTOTYPE
 	{
-		zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ? "item.trends" :
-				"itemprototype.trends", item->trends);
-		zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ? "item.units" :
-				"itemprototype.units", item->units);
+		zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ?
+				"item.trends" : "itemprototype.trends", item->trends, AUDIT_TABLE_NAME, "trends");
+		zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ?
+				"item.units" : "itemprototype.units", item->units, AUDIT_TABLE_NAME, "units");
 	}
 
-	ADD_JSON_S(username);
+	ADD_JSON_S(username, AUDIT_TABLE_NAME, "username");
 
 	if ONLY_ITEM_AND_ITEM_PROTOTYPE
 	{
-		zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ? "item.valuemapid" :
-				"itemprototype.valuemapid", item->valuemapid);
+		zbx_audit_update_json_append_uint64(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, ONLY_ITEM ?
+				"item.valuemapid" : "itemprototype.valuemapid", item->valuemapid, AUDIT_TABLE_NAME,
+				"valuemapid");
 	}
 
-	ADD_JSON_UI(verify_host);
-	ADD_JSON_UI(verify_peer);
+	ADD_JSON_UI(verify_host, AUDIT_TABLE_NAME, "verify_host");
+	ADD_JSON_UI(verify_peer, AUDIT_TABLE_NAME, "verify_peer");
 
 	if ONLY_ITEM_PROTOTYPE
 	{
-		zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, "itemprototype.discover",
-				item->discover);
+		zbx_audit_update_json_append_uint64(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD,
+				"itemprototype.discover", item->discover, AUDIT_TABLE_NAME, "discover");
 	}
 
 	if ONLY_LLD_RULE
 	{
-		zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD,
-				"discoveryrule.filter.formula", item->formula);
-		zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD,
-				"discoveryrule.filter.evaltype", item->evaltype);
+		zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD,
+				"discoveryrule.filter.formula", item->formula, AUDIT_TABLE_NAME, "formula");
+		zbx_audit_update_json_append_uint64(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD,
+				"discoveryrule.filter.evaltype", item->evaltype, AUDIT_TABLE_NAME, "evaltype");
 	}
+#undef AUDIT_TABLE_NAME
 #undef ADD_JSON_UI
 #undef ADD_JSON_S
 }
@@ -213,59 +225,68 @@ void	zbx_audit_item_update_json_add_lld_data(zbx_uint64_t itemid, const zbx_lld_
 	RETURN_IF_AUDIT_OFF();
 
 #define IT(s) "item."#s
-#define ADD_JSON_S(x)	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, IT(x), item->x)
-#define ADD_JSON_UI(x)	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, IT(x), item->x)
-#define ADD_JSON_P_S(x)	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, IT(x), item_prototype->x)
-#define ADD_JSON_P_UI(x)	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, IT(x),\
-		item_prototype->x)
-	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, IT(itemid), itemid);
-	ADD_JSON_S(delay);
-	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, IT(hostid), hostid);
-	ADD_JSON_S(name);
-	ADD_JSON_S(key);
-	ADD_JSON_P_UI(type);
-	ADD_JSON_P_UI(value_type);
-	ADD_JSON_S(history);
-	ADD_JSON_S(trends);
-	ADD_JSON_UI(status);
-	ADD_JSON_P_S(trapper_hosts);
-	ADD_JSON_S(units);
-	ADD_JSON_P_S(formula);
-	ADD_JSON_P_S(logtimefmt);
-	ADD_JSON_P_UI(valuemapid);
-	ADD_JSON_S(params);
-	ADD_JSON_S(ipmi_sensor);
-	ADD_JSON_S(snmp_oid);
-	ADD_JSON_P_UI(authtype);
-	ADD_JSON_S(username);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, IT(password), ZBX_MACRO_SECRET_MASK);
-	ADD_JSON_P_S(publickey);
-	ADD_JSON_P_S(privatekey);
-	ADD_JSON_S(description);
-	ADD_JSON_P_UI(interfaceid);
-	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, "item.flags", ZBX_FLAG_DISCOVERY_CREATED);
-	ADD_JSON_S(jmx_endpoint);
-	ADD_JSON_UI(master_itemid);
-	ADD_JSON_S(timeout);
-	ADD_JSON_S(url);
-	ADD_JSON_S(query_fields);
-	ADD_JSON_S(posts);
-	ADD_JSON_S(status_codes);
-	ADD_JSON_P_UI(follow_redirects);
-	ADD_JSON_P_UI(post_type);
-	ADD_JSON_S(http_proxy);
-	ADD_JSON_S(headers);
-	ADD_JSON_P_UI(retrieve_mode);
-	ADD_JSON_P_UI(request_method);
-	ADD_JSON_P_UI(output_format);
-	ADD_JSON_S(ssl_cert_file);
-	ADD_JSON_S(ssl_key_file);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, IT(ssl_key_password),
-			ZBX_MACRO_SECRET_MASK);
-	ADD_JSON_P_UI(verify_peer);
-	ADD_JSON_P_UI(verify_host);
-	ADD_JSON_P_UI(allow_traps);
-
+#define ADD_JSON_S(x, t, f)	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, \
+		IT(x), item->x, t, f)
+#define ADD_JSON_UI(x, t, f)	zbx_audit_update_json_append_uint64(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, \
+		IT(x), item->x, t, f)
+#define ADD_JSON_P_S(x, t, f)	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, \
+		IT(x), item_prototype->x, t, f)
+#define ADD_JSON_P_UI(x, t, f)	zbx_audit_update_json_append_uint64(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, \
+		IT(x), item_prototype->x, t, f)
+#define AUDIT_TABLE_NAME	"items"
+	zbx_audit_update_json_append_uint64(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, IT(itemid), itemid, \
+			AUDIT_TABLE_NAME, "itemid");
+	ADD_JSON_S(delay, AUDIT_TABLE_NAME, "delay");
+	zbx_audit_update_json_append_uint64(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, IT(hostid), hostid, \
+			AUDIT_TABLE_NAME, "hostid");
+	ADD_JSON_S(name, AUDIT_TABLE_NAME, "name");
+	ADD_JSON_S(key, AUDIT_TABLE_NAME, "key_");
+	ADD_JSON_P_UI(type, AUDIT_TABLE_NAME, "type");
+	ADD_JSON_P_UI(value_type, AUDIT_TABLE_NAME, "value_type");
+	ADD_JSON_S(history, AUDIT_TABLE_NAME, "history");
+	ADD_JSON_S(trends, AUDIT_TABLE_NAME, "trends");
+	ADD_JSON_UI(status, AUDIT_TABLE_NAME, "status");
+	ADD_JSON_P_S(trapper_hosts, AUDIT_TABLE_NAME, "trapper_hosts");
+	ADD_JSON_S(units, AUDIT_TABLE_NAME, "units");
+	ADD_JSON_P_S(formula, AUDIT_TABLE_NAME, "formula");
+	ADD_JSON_P_S(logtimefmt, AUDIT_TABLE_NAME, "logtimefmt");
+	ADD_JSON_P_UI(valuemapid, AUDIT_TABLE_NAME, "valuemapid");
+	ADD_JSON_S(params, AUDIT_TABLE_NAME, "params");
+	ADD_JSON_S(ipmi_sensor, AUDIT_TABLE_NAME, "ipmi_sensor");
+	ADD_JSON_S(snmp_oid, AUDIT_TABLE_NAME, "snmp_oid");
+	ADD_JSON_P_UI(authtype, AUDIT_TABLE_NAME, "authtype");
+	ADD_JSON_S(username, AUDIT_TABLE_NAME, "username");
+	zbx_audit_update_json_append_string_secret(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, IT(password),
+			item->password, AUDIT_TABLE_NAME, "password");
+	ADD_JSON_P_S(publickey, AUDIT_TABLE_NAME, "publickey");
+	ADD_JSON_P_S(privatekey, AUDIT_TABLE_NAME, "privatekey");
+	ADD_JSON_S(description, AUDIT_TABLE_NAME, "description");
+	ADD_JSON_P_UI(interfaceid, AUDIT_TABLE_NAME, "interfaceid");
+	zbx_audit_update_json_append_uint64(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, "item.flags",
+			ZBX_FLAG_DISCOVERY_CREATED, AUDIT_TABLE_NAME, "flags");
+	ADD_JSON_S(jmx_endpoint, AUDIT_TABLE_NAME, "jmx_endpoint");
+	ADD_JSON_UI(master_itemid, AUDIT_TABLE_NAME, "master_itemid");
+	ADD_JSON_S(timeout, AUDIT_TABLE_NAME, "timeout");
+	ADD_JSON_S(url, AUDIT_TABLE_NAME, "url");
+	ADD_JSON_S(query_fields, AUDIT_TABLE_NAME, "query_fields");
+	ADD_JSON_S(posts, AUDIT_TABLE_NAME, "posts");
+	ADD_JSON_S(status_codes, AUDIT_TABLE_NAME, "status_codes");
+	ADD_JSON_P_UI(follow_redirects, AUDIT_TABLE_NAME, "follow_redirects");
+	ADD_JSON_P_UI(post_type, AUDIT_TABLE_NAME, "post_type");
+	ADD_JSON_S(http_proxy, AUDIT_TABLE_NAME, "http_proxy");
+	ADD_JSON_S(headers, AUDIT_TABLE_NAME, "headers");
+	ADD_JSON_P_UI(retrieve_mode, AUDIT_TABLE_NAME, "retrieve_mode");
+	ADD_JSON_P_UI(request_method, AUDIT_TABLE_NAME, "request_method");
+	ADD_JSON_P_UI(output_format, AUDIT_TABLE_NAME, "output_format");
+	ADD_JSON_S(ssl_cert_file, AUDIT_TABLE_NAME, "ssl_cert_file");
+	ADD_JSON_S(ssl_key_file, AUDIT_TABLE_NAME, "ssl_key_file");
+	zbx_audit_update_json_append_string_secret(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD,
+			IT(ssl_key_password), item->ssl_key_password, AUDIT_TABLE_NAME, "ssl_key_password");
+	ADD_JSON_P_UI(verify_peer, AUDIT_TABLE_NAME, "verify_peer");
+	ADD_JSON_P_UI(verify_host, AUDIT_TABLE_NAME, "verify_host");
+	ADD_JSON_P_UI(allow_traps, AUDIT_TABLE_NAME, "allow_traps");
+
+#undef AUDIT_TABLE_NAME
 #undef ADD_JSON_UI
 #undef ADD_JSON_S
 #undef ADD_JSON_P_UI
@@ -282,7 +303,8 @@ void	zbx_audit_item_update_json_update_##resource(zbx_uint64_t itemid, int flags
 	RETURN_IF_AUDIT_OFF();											\
 														\
 	resource_type = item_flag_to_resource_type(flags);							\
-	zbx_audit_update_json_update_##type2(itemid, IT_OR_ITP_OR_DR(resource), resource##_old, resource##_new);\
+	zbx_audit_update_json_update_##type2(itemid, AUDIT_ITEM_ID, IT_OR_ITP_OR_DR(resource), resource##_old,	\
+			resource##_new);									\
 }
 
 PREPARE_AUDIT_ITEM_UPDATE(interfaceid,		zbx_uint64_t,	uint64)
@@ -363,6 +385,7 @@ void	zbx_audit_item_create_entry_for_delete(zbx_uint64_t id, const char *name, i
 
 	local_audit_item_entry.id = id;
 	local_audit_item_entry.cuid = NULL;
+	local_audit_item_entry.id_table = AUDIT_ITEM_ID;
 
 	found_audit_item_entry = (zbx_audit_entry_t**)zbx_hashset_search(zbx_get_audit_hashset(),
 			&(local_audit_item_entry_x));
@@ -370,7 +393,8 @@ void	zbx_audit_item_create_entry_for_delete(zbx_uint64_t id, const char *name, i
 	{
 		zbx_audit_entry_t	*local_audit_item_entry_insert;
 
-		local_audit_item_entry_insert = zbx_audit_entry_init(id, name, AUDIT_ACTION_DELETE, resource_type);
+		local_audit_item_entry_insert = zbx_audit_entry_init(id, AUDIT_ITEM_ID, name, AUDIT_ACTION_DELETE,
+				resource_type);
 		zbx_hashset_insert(zbx_get_audit_hashset(), &local_audit_item_entry_insert,
 				sizeof(local_audit_item_entry_insert));
 	}
@@ -429,10 +453,15 @@ void	zbx_audit_discovery_rule_update_json_add_filter_conditions(zbx_uint64_t ite
 	zbx_snprintf(audit_key_value, sizeof(audit_key_value),
 			"discoveryrule.filter[" ZBX_FS_UI64 "].conditions.value", rule_conditionid);
 
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_operator, op);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_macro, macro);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+#define	AUDIT_TABLE_NAME	"item_condition"
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_uint64(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_operator, op,
+			AUDIT_TABLE_NAME, "operator");
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_macro, macro,
+			AUDIT_TABLE_NAME, "macro");
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value,
+			AUDIT_TABLE_NAME, "value");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_discovery_rule_update_json_update_filter_conditions_create_entry(zbx_uint64_t itemid,
@@ -444,7 +473,7 @@ void	zbx_audit_discovery_rule_update_json_update_filter_conditions_create_entry(
 
 	zbx_snprintf(buf, sizeof(buf), "discoveryrule.filter[" ZBX_FS_UI64 "].conditions", item_conditionid);
 
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_UPDATE, buf);
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_UPDATE, buf);
 }
 
 #define PREPARE_AUDIT_DISCOVERY_RULE_UPDATE(resource, type1, type2)						\
@@ -458,7 +487,7 @@ void	zbx_audit_discovery_rule_update_json_update_filter_conditions_##resource(zb
 	zbx_snprintf(buf, sizeof(buf), "discoveryrule.filter[" ZBX_FS_UI64 "].conditions."#resource,		\
 			item_conditionid);									\
 														\
-	zbx_audit_update_json_update_##type2(itemid, buf, resource##_old, resource##_new);			\
+	zbx_audit_update_json_update_##type2(itemid, AUDIT_ITEM_ID, buf, resource##_old, resource##_new);	\
 }
 PREPARE_AUDIT_DISCOVERY_RULE_UPDATE(operator, int, int)
 PREPARE_AUDIT_DISCOVERY_RULE_UPDATE(macro, const char*, string)
@@ -474,7 +503,7 @@ void	zbx_audit_discovery_rule_update_json_delete_filter_conditions(zbx_uint64_t
 
 	zbx_snprintf(buf, sizeof(buf), "discoveryrule.filter[" ZBX_FS_UI64 "].conditions", item_conditionid);
 
-	zbx_audit_update_json_delete(itemid, AUDIT_DETAILS_ACTION_DELETE, buf);
+	zbx_audit_update_json_delete(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_DELETE, buf);
 }
 
 #define ITEM_RESOURCE_KEY_RESOLVE_PREPROC(resource, nested)							\
@@ -518,13 +547,19 @@ void	zbx_audit_item_update_json_add_item_preproc(zbx_uint64_t itemid, zbx_uint64
 	ITEM_RESOURCE_KEY_RESOLVE_PREPROC(error_handler, .)
 	ITEM_RESOURCE_KEY_RESOLVE_PREPROC(error_handler_params, .)
 
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_);
-	zbx_audit_update_json_append_int(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_step, step);
-	zbx_audit_update_json_append_int(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_type, type);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_params, params);
-	zbx_audit_update_json_append_int(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_error_handler, error_handler);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_error_handler_params,
-			error_handler_params);
+#define AUDIT_TABLE_NAME	"item_preproc"
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_);
+	zbx_audit_update_json_append_int(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_step, step,
+			AUDIT_TABLE_NAME, "step");
+	zbx_audit_update_json_append_int(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_type, type,
+			AUDIT_TABLE_NAME, "type");
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_params, params,
+			AUDIT_TABLE_NAME, "params");
+	zbx_audit_update_json_append_int(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_error_handler,
+			error_handler, AUDIT_TABLE_NAME, "error_handler");
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD,
+			audit_key_error_handler_params, error_handler_params, AUDIT_TABLE_NAME, "error_handler_params");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_item_update_json_update_item_preproc_create_entry(zbx_uint64_t itemid, int item_flags,
@@ -539,7 +574,7 @@ void	zbx_audit_item_update_json_update_item_preproc_create_entry(zbx_uint64_t it
 
 	ITEM_RESOURCE_KEY_RESOLVE_PREPROC(,)
 
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_UPDATE, audit_key_);
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_UPDATE, audit_key_);
 }
 
 #define PREPARE_AUDIT_ITEM_UPDATE_PREPROC(resource, type1, type2)						\
@@ -554,7 +589,8 @@ void	zbx_audit_item_update_json_update_item_preproc_##resource(zbx_uint64_t item
 														\
 	ITEM_RESOURCE_KEY_RESOLVE_PREPROC(resource,.)								\
 														\
-	zbx_audit_update_json_update_##type2(itemid, audit_key_##resource, resource##_old, resource##_new);	\
+	zbx_audit_update_json_update_##type2(itemid, AUDIT_ITEM_ID, audit_key_##resource, resource##_old,	\
+			resource##_new);									\
 }
 PREPARE_AUDIT_ITEM_UPDATE_PREPROC(type, int, int)
 PREPARE_AUDIT_ITEM_UPDATE_PREPROC(params, const char*, string)
@@ -573,7 +609,7 @@ void	zbx_audit_item_delete_preproc(zbx_uint64_t itemid, int item_flags, zbx_uint
 
 	ITEM_RESOURCE_KEY_RESOLVE_PREPROC(,)
 
-	zbx_audit_update_json_delete(itemid, AUDIT_DETAILS_ACTION_DELETE, audit_key_);
+	zbx_audit_update_json_delete(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_DELETE, audit_key_);
 }
 
 #define ITEM_RESOURCE_KEY_RESOLVE_TAG(resource, nested)								\
@@ -613,9 +649,13 @@ void	zbx_audit_item_update_json_add_item_tag(zbx_uint64_t itemid, zbx_uint64_t t
 	ITEM_RESOURCE_KEY_RESOLVE_TAG(tag, .)
 	ITEM_RESOURCE_KEY_RESOLVE_TAG(value, .)
 
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_tag, tag);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+#define AUDIT_TABLE_NAME	"item_tag"
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_);
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_tag, tag,
+			AUDIT_TABLE_NAME, "tag");
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value,
+			AUDIT_TABLE_NAME, "value");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_item_update_json_update_item_tag_create_entry(zbx_uint64_t itemid, int item_flags,
@@ -630,7 +670,7 @@ void	zbx_audit_item_update_json_update_item_tag_create_entry(zbx_uint64_t itemid
 
 	ITEM_RESOURCE_KEY_RESOLVE_TAG(,)
 
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_UPDATE, audit_key_);
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_UPDATE, audit_key_);
 }
 
 #define PREPARE_AUDIT_ITEM_UPDATE_TAG(resource, type1, type2)							\
@@ -645,7 +685,8 @@ void	zbx_audit_item_update_json_update_item_tag_##resource(zbx_uint64_t itemid,
 														\
 	ITEM_RESOURCE_KEY_RESOLVE_TAG(resource,.)								\
 														\
-	zbx_audit_update_json_update_##type2(itemid, audit_key_##resource, resource##_old, resource##_new);	\
+	zbx_audit_update_json_update_##type2(itemid, AUDIT_ITEM_ID, audit_key_##resource, resource##_old,	\
+			resource##_new);									\
 }
 PREPARE_AUDIT_ITEM_UPDATE_TAG(tag, const char*, string)
 PREPARE_AUDIT_ITEM_UPDATE_TAG(value, const char*, string)
@@ -662,7 +703,7 @@ void	zbx_audit_item_delete_tag(zbx_uint64_t itemid, int item_flags, zbx_uint64_t
 
 	ITEM_RESOURCE_KEY_RESOLVE_TAG(,)
 
-	zbx_audit_update_json_delete(itemid, AUDIT_DETAILS_ACTION_DELETE, audit_key_);
+	zbx_audit_update_json_delete(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_DELETE, audit_key_);
 }
 
 #define ITEM_RESOURCE_KEY_RESOLVE(resource, nested)								\
@@ -702,9 +743,13 @@ void	zbx_audit_item_update_json_add_params(zbx_uint64_t itemid, int item_flags,
 	ITEM_RESOURCE_KEY_RESOLVE(name, .)
 	ITEM_RESOURCE_KEY_RESOLVE(value, .)
 
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_name, name);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+#define AUDIT_TABLE_NAME	"item_parameter"
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_);
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_name, name,
+			AUDIT_TABLE_NAME, "name");
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value,
+			AUDIT_TABLE_NAME, "value");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_item_update_json_update_params_create_entry(zbx_uint64_t itemid, int item_flags,
@@ -718,7 +763,7 @@ void	zbx_audit_item_update_json_update_params_create_entry(zbx_uint64_t itemid,
 	resource_type = item_flag_to_resource_type(item_flags);
 
 	ITEM_RESOURCE_KEY_RESOLVE(,)
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_UPDATE, audit_key_);
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_UPDATE, audit_key_);
 }
 
 #define PREPARE_AUDIT_ITEM_PARAMS_UPDATE(resource)								\
@@ -733,7 +778,8 @@ void	zbx_audit_item_update_json_update_params_##resource(zbx_uint64_t itemid, in
 	resource_type = item_flag_to_resource_type(item_flags);							\
 	ITEM_RESOURCE_KEY_RESOLVE(resource, .)									\
 														\
-	zbx_audit_update_json_update_string(itemid, audit_key_##resource, resource##_orig, resource);		\
+	zbx_audit_update_json_update_string(itemid, AUDIT_ITEM_ID, audit_key_##resource, resource##_orig,	\
+			resource);										\
 }
 
 PREPARE_AUDIT_ITEM_PARAMS_UPDATE(name)
@@ -750,7 +796,7 @@ void	zbx_audit_item_delete_params(zbx_uint64_t itemid, int item_flags, zbx_uint6
 
 	ITEM_RESOURCE_KEY_RESOLVE(,)
 
-	zbx_audit_update_json_delete(itemid, AUDIT_DETAILS_ACTION_DELETE, audit_key_);
+	zbx_audit_update_json_delete(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_DELETE, audit_key_);
 }
 
 void	zbx_audit_discovery_rule_update_json_add_lld_macro_path(zbx_uint64_t itemid,
@@ -768,9 +814,13 @@ void	zbx_audit_discovery_rule_update_json_add_lld_macro_path(zbx_uint64_t itemid
 	zbx_snprintf(audit_key_path, sizeof(audit_key_lld_macro),
 			"discoveryrule.lld_macro_paths[" ZBX_FS_UI64 "].path", lld_macro_pathid);
 
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_lld_macro, lld_macro);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_path, path);
+#define AUDIT_TABLE_NAME	"lld_macro_path"
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_lld_macro,
+			lld_macro, AUDIT_TABLE_NAME, "lld_macro");
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_path, path,
+			AUDIT_TABLE_NAME, "path");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_discovery_rule_update_json_lld_macro_path_create_update_entry(zbx_uint64_t itemid,
@@ -782,7 +832,7 @@ void	zbx_audit_discovery_rule_update_json_lld_macro_path_create_update_entry(zbx
 
 	zbx_snprintf(buf, sizeof(buf), "discoveryrule.lld_macro_paths[" ZBX_FS_UI64 "]", lld_macro_pathid);
 
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_UPDATE, buf);
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_UPDATE, buf);
 }
 
 #define PREPARE_AUDIT_DISCOVERY_RULE_UPDATE_LLD_MACRO_PATH(resource)						\
@@ -796,7 +846,8 @@ void	zbx_audit_discovery_rule_update_json_update_lld_macro_path_##resource(zbx_u
 	zbx_snprintf(audit_key_##resource, sizeof(audit_key_##resource),					\
 			"discoveryrule.lld_macro_paths[" ZBX_FS_UI64 "]."#resource, lld_macro_pathid);		\
 														\
-	zbx_audit_update_json_update_string(itemid, audit_key_##resource, resource##_old, resource##_new);	\
+	zbx_audit_update_json_update_string(itemid, AUDIT_ITEM_ID, audit_key_##resource, resource##_old,	\
+			resource##_new);									\
 }
 PREPARE_AUDIT_DISCOVERY_RULE_UPDATE_LLD_MACRO_PATH(lld_macro)
 PREPARE_AUDIT_DISCOVERY_RULE_UPDATE_LLD_MACRO_PATH(path)
@@ -811,7 +862,7 @@ void	zbx_audit_discovery_rule_update_json_delete_lld_macro_path(zbx_uint64_t ite
 
 	zbx_snprintf(buf, sizeof(buf),"discoveryrule.lld_macro_paths[" ZBX_FS_UI64 "]", lld_macro_pathid);
 
-	zbx_audit_update_json_delete(itemid, AUDIT_DETAILS_ACTION_DELETE, buf);
+	zbx_audit_update_json_delete(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_DELETE, buf);
 }
 
 void	zbx_audit_discovery_rule_update_json_add_lld_override(zbx_uint64_t itemid, zbx_uint64_t overrideid,
@@ -830,10 +881,15 @@ void	zbx_audit_discovery_rule_update_json_add_lld_override(zbx_uint64_t itemid,
 	zbx_snprintf(audit_key_stop, sizeof(audit_key_stop), "discoveryrule.overrides[" ZBX_FS_UI64 "].stop",
 			overrideid);
 
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_name, name);
-	zbx_audit_update_json_append_int(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_step, step);
-	zbx_audit_update_json_append_int(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_stop, stop);
+#define AUDIT_TABLE_NAME	"lld_override"
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_name, name,
+			AUDIT_TABLE_NAME, "name");
+	zbx_audit_update_json_append_int(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_step, step,
+			AUDIT_TABLE_NAME, "step");
+	zbx_audit_update_json_append_int(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_stop, stop,
+			AUDIT_TABLE_NAME, "stop");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_discovery_rule_update_json_delete_lld_override(zbx_uint64_t itemid, zbx_uint64_t overrideid)
@@ -844,7 +900,7 @@ void	zbx_audit_discovery_rule_update_json_delete_lld_override(zbx_uint64_t itemi
 
 	zbx_snprintf(buf, sizeof(buf), "discoveryrule.overrides[" ZBX_FS_UI64 "]", overrideid);
 
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_DELETE, buf);
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_DELETE, buf);
 }
 
 void	zbx_audit_discovery_rule_update_json_add_lld_override_filter(zbx_uint64_t itemid, zbx_uint64_t overrideid,
@@ -863,9 +919,13 @@ void	zbx_audit_discovery_rule_update_json_add_lld_override_filter(zbx_uint64_t i
 	zbx_snprintf(audit_key_formula, sizeof(audit_key_formula), "discoveryrule.overrides[" ZBX_FS_UI64
 			"].filter.formula", overrideid);
 
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_int(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_evaltype, evaltype);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_formula, formula);
+#define	AUDIT_TABLE_NAME	"lld_override"
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_int(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_evaltype, evaltype,
+			AUDIT_TABLE_NAME, "evaltype");
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_formula, formula,
+			AUDIT_TABLE_NAME, "formula");
+#undef 	AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_discovery_rule_update_json_add_lld_override_condition(zbx_uint64_t itemid, zbx_uint64_t overrideid,
@@ -885,10 +945,15 @@ void	zbx_audit_discovery_rule_update_json_add_lld_override_condition(zbx_uint64_
 	zbx_snprintf(audit_key_value, sizeof(audit_key_value), "discoveryrule.overrides[" ZBX_FS_UI64 "].conditions["
 			ZBX_FS_UI64 "].value", overrideid, override_conditionid);
 
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_int(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_operator, condition_operator);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_macro, macro);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+#define AUDIT_TABLE_NAME	"lld_override_condition"
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_int(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_operator,
+			condition_operator, AUDIT_TABLE_NAME, "operator");
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_macro, macro,
+			AUDIT_TABLE_NAME, "macro");
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value,
+			AUDIT_TABLE_NAME, "value");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_discovery_rule_update_json_add_lld_override_operation(zbx_uint64_t itemid, zbx_uint64_t overrideid,
@@ -906,12 +971,16 @@ void	zbx_audit_discovery_rule_update_json_add_lld_override_operation(zbx_uint64_
 	zbx_snprintf(audit_key_value, sizeof(audit_key_value), "discoveryrule.overrides[" ZBX_FS_UI64 "].operations["
 			ZBX_FS_UI64 "].value", overrideid, override_operationid);
 
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_int(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_operator, condition_operator);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+#define	AUDIT_TABLE_NAME	"lld_override_operation"
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_int(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_operator,
+			condition_operator, AUDIT_TABLE_NAME, "operator");
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value,
+			AUDIT_TABLE_NAME, "value");
+#undef AUDIT_TABLE_NAME
 }
 
-#define PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(resource, type, type2)					\
+#define PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(resource, type, type2, table, field)				\
 void	zbx_audit_discovery_rule_update_json_add_lld_override_##resource(zbx_uint64_t itemid,			\
 		zbx_uint64_t overrideid, zbx_uint64_t resource##_id, type resource)				\
 {														\
@@ -922,16 +991,17 @@ void	zbx_audit_discovery_rule_update_json_add_lld_override_##resource(zbx_uint64
 	zbx_snprintf(buf, sizeof(buf), "discoveryrule.overrides[" ZBX_FS_UI64					\
 			"].operations[" ZBX_FS_UI64 "]."#resource, overrideid, resource##_id);			\
 														\
-	zbx_audit_update_json_append_##type2(itemid, AUDIT_DETAILS_ACTION_ADD, buf, resource);			\
+	zbx_audit_update_json_append_##type2(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, buf, resource,	\
+			table, field);										\
 }
 
-PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(opstatus, int, int)
-PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(opdiscover, int, int)
-PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(opperiod, const char*, string)
-PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(optrends, const char*, string)
-PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(ophistory, const char*, string)
-PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(opseverity, int, int)
-PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(opinventory, int, int)
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(opstatus, int, int, "lld_override_opstatus", "status")
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(opdiscover, int, int, "lld_override_opdiscover", "discover")
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(opperiod, const char*, string, "lld_override_opperiod", "delay")
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(optrends, const char*, string, "lld_override_optrends", "trends")
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(ophistory, const char*, string, "lld_override_ophistory", "history")
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(opseverity, int, int, "lld_override_opseverity", "severity")
+PREPARE_AUDIT_DISCOVERY_RULE_OVERRIDE_ADD(opinventory, int, int, "lld_override_opinventory", "inventory_mode")
 
 void	zbx_audit_discovery_rule_update_json_add_lld_override_optag(zbx_uint64_t itemid, zbx_uint64_t overrideid,
 		zbx_uint64_t lld_override_optagid, const char *tag, const char *value)
@@ -948,9 +1018,13 @@ void	zbx_audit_discovery_rule_update_json_add_lld_override_optag(zbx_uint64_t it
 	zbx_snprintf(audit_key_value, sizeof(audit_key_value), "discoveryrule.overrides[" ZBX_FS_UI64
 			"].optag[" ZBX_FS_UI64 "].value", overrideid, lld_override_optagid);
 
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_tag, tag);
-	zbx_audit_update_json_append_string(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+#define	AUDIT_TABLE_NAME	"lld_override_optag"
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_tag, tag,
+			AUDIT_TABLE_NAME, "tag");
+	zbx_audit_update_json_append_string(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value,
+			AUDIT_TABLE_NAME, "value");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_discovery_rule_update_json_add_lld_override_optemplate(zbx_uint64_t itemid, zbx_uint64_t overrideid,
@@ -965,6 +1039,7 @@ void	zbx_audit_discovery_rule_update_json_add_lld_override_optemplate(zbx_uint64
 	zbx_snprintf(audit_key_templateid, sizeof(audit_key_templateid), "discoveryrule.overrides[" ZBX_FS_UI64
 			"].optemplateid[" ZBX_FS_UI64 "].templateid", overrideid, lld_override_optemplateid);
 
-	zbx_audit_update_json_append_no_value(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_uint64(itemid, AUDIT_DETAILS_ACTION_ADD, audit_key_templateid, templateid);
+	zbx_audit_update_json_append_no_value(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_uint64(itemid, AUDIT_ITEM_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_templateid,
+			templateid, "lld_override_optemplate", "templateid");
 }
diff --git a/src/libs/zbxaudit/audit_settings.c b/src/libs/zbxaudit/audit_settings.c
index 5cb5a752d2d..699f8bc468e 100644
--- a/src/libs/zbxaudit/audit_settings.c
+++ b/src/libs/zbxaudit/audit_settings.c
@@ -30,12 +30,13 @@ void	zbx_audit_settings_create_entry(int audit_action, zbx_uint64_t configid)
 
 	local_audit_entry.id = configid;
 	local_audit_entry.cuid = NULL;
+	local_audit_entry.id_table = AUDIT_CONFIG_ID;
 
 	if (NULL == zbx_hashset_search(zbx_get_audit_hashset(), &plocal_audit_entry))
 	{
 		zbx_audit_entry_t	*new_entry;
 
-		new_entry = zbx_audit_entry_init(configid, "", audit_action, AUDIT_RESOURCE_SETTINGS);
+		new_entry = zbx_audit_entry_init(configid, AUDIT_CONFIG_ID, "", audit_action, AUDIT_RESOURCE_SETTINGS);
 		zbx_hashset_insert(zbx_get_audit_hashset(), &new_entry, sizeof(new_entry));
 	}
 }
diff --git a/src/libs/zbxaudit/audit_trigger.c b/src/libs/zbxaudit/audit_trigger.c
index 50008ca03a9..7a6e6199ce8 100644
--- a/src/libs/zbxaudit/audit_trigger.c
+++ b/src/libs/zbxaudit/audit_trigger.c
@@ -54,6 +54,7 @@ void	zbx_audit_trigger_create_entry(int audit_action, zbx_uint64_t triggerid, co
 
 	local_audit_trigger_entry.id = triggerid;
 	local_audit_trigger_entry.cuid = NULL;
+	local_audit_trigger_entry.id_table = AUDIT_TRIGGER_ID;
 
 	found_audit_trigger_entry = (zbx_audit_entry_t**)zbx_hashset_search(zbx_get_audit_hashset(),
 			&(local_audit_trigger_entry_x));
@@ -62,14 +63,15 @@ void	zbx_audit_trigger_create_entry(int audit_action, zbx_uint64_t triggerid, co
 	{
 		zbx_audit_entry_t	*local_audit_trigger_entry_insert;
 
-		local_audit_trigger_entry_insert = zbx_audit_entry_init(triggerid, name, audit_action, resource_type);
+		local_audit_trigger_entry_insert = zbx_audit_entry_init(triggerid, AUDIT_TRIGGER_ID, name, audit_action,
+				resource_type);
 		zbx_hashset_insert(zbx_get_audit_hashset(), &local_audit_trigger_entry_insert,
 				sizeof(local_audit_trigger_entry_insert));
 
 		if (AUDIT_ACTION_ADD == audit_action)
 		{
-			zbx_audit_update_json_append_uint64(triggerid, AUDIT_DETAILS_ACTION_ADD,
-					TR_OR_TRP(triggerid), triggerid);
+			zbx_audit_update_json_append_uint64(triggerid, AUDIT_TRIGGER_ID, AUDIT_DETAILS_ACTION_ADD,
+					TR_OR_TRP(triggerid), triggerid, "triggers", "triggerid");
 		}
 	}
 }
@@ -116,29 +118,34 @@ void	zbx_audit_trigger_update_json_add_data(zbx_uint64_t triggerid, zbx_uint64_t
 	if (AUDIT_RESOURCE_TRIGGER_PROTOTYPE == resource_type)
 		AUDIT_KEY_SNPRINTF(discover)
 #undef AUDIT_KEY_SNPRINTF
-	zbx_audit_update_json_append_no_value(triggerid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-#define ADD_STR(r) zbx_audit_update_json_append_string(triggerid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r);
-#define ADD_UINT64(r) zbx_audit_update_json_append_uint64(triggerid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r);
-#define ADD_INT(r) zbx_audit_update_json_append_int(triggerid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r);
-	ADD_STR(event_name)
-	ADD_STR(opdata)
-	ADD_STR(comments)
-	ADD_INT(flags)
-	ADD_INT(priority)
-	ADD_UINT64(state)
-	ADD_INT(status)
-	ADD_UINT64(templateid)
-	ADD_INT(type)
-	ADD_STR(url)
-	ADD_UINT64(value)
-	ADD_INT(recovery_mode)
-	ADD_INT(correlation_mode)
-	ADD_STR(correlation_tag)
-	ADD_INT(manual_close)
+	zbx_audit_update_json_append_no_value(triggerid, AUDIT_TRIGGER_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+#define ADD_STR(r, t, f) zbx_audit_update_json_append_string(triggerid, AUDIT_TRIGGER_ID, AUDIT_DETAILS_ACTION_ADD, \
+		audit_key_##r, r, t, f);
+#define ADD_UINT64(r,t, f) zbx_audit_update_json_append_uint64(triggerid, AUDIT_TRIGGER_ID, AUDIT_DETAILS_ACTION_ADD, \
+		audit_key_##r, r, t, f);
+#define ADD_INT(r, t, f) zbx_audit_update_json_append_int(triggerid, AUDIT_TRIGGER_ID, AUDIT_DETAILS_ACTION_ADD, \
+		audit_key_##r, r, t, f);
+#define AUDIT_TABLE_NAME	"triggers"
+	ADD_STR(event_name, AUDIT_TABLE_NAME, "event_name")
+	ADD_STR(opdata, AUDIT_TABLE_NAME, "opdata")
+	ADD_STR(comments, AUDIT_TABLE_NAME, "comments")
+	ADD_INT(flags, AUDIT_TABLE_NAME, "flags")
+	ADD_INT(priority, AUDIT_TABLE_NAME, "priority")
+	ADD_UINT64(state, AUDIT_TABLE_NAME, "state")
+	ADD_INT(status, AUDIT_TABLE_NAME, "status")
+	ADD_UINT64(templateid, AUDIT_TABLE_NAME, "templateid")
+	ADD_INT(type, AUDIT_TABLE_NAME, "type")
+	ADD_STR(url, AUDIT_TABLE_NAME, "url")
+	ADD_UINT64(value, AUDIT_TABLE_NAME, "value")
+	ADD_INT(recovery_mode, AUDIT_TABLE_NAME, "recovery_mode")
+	ADD_INT(correlation_mode, AUDIT_TABLE_NAME, "correlation_mode")
+	ADD_STR(correlation_tag, AUDIT_TABLE_NAME, "correlation_tag")
+	ADD_INT(manual_close, AUDIT_TABLE_NAME, "manual_close")
 
 	if (AUDIT_RESOURCE_TRIGGER_PROTOTYPE == resource_type)
-		ADD_UINT64(discover)
+		ADD_UINT64(discover, AUDIT_TABLE_NAME, "discover")
 
+#undef AUDIT_TABLE_NAME
 #undef ADD_STR
 #undef ADD_UINT64
 #undef ADD_INT
@@ -154,7 +161,8 @@ void	zbx_audit_trigger_update_json_add_expr(zbx_uint64_t triggerid, int flags, c
 	resource_type = trigger_flag_to_resource_type(flags);
 
 	zbx_snprintf(buf, sizeof(buf), TR_OR_TRP(expression));
-	zbx_audit_update_json_append_string(triggerid, AUDIT_DETAILS_ACTION_ADD, buf, expression);
+	zbx_audit_update_json_append_string(triggerid, AUDIT_TRIGGER_ID, AUDIT_DETAILS_ACTION_ADD, buf, expression,
+			"triggers", "expression");
 }
 
 void	zbx_audit_trigger_update_json_add_rexpr(zbx_uint64_t triggerid, int flags, const char *recovery_expression)
@@ -167,7 +175,8 @@ void	zbx_audit_trigger_update_json_add_rexpr(zbx_uint64_t triggerid, int flags,
 	resource_type = trigger_flag_to_resource_type(flags);
 
 	zbx_snprintf(buf, sizeof(buf), TR_OR_TRP(recovery_expression));
-	zbx_audit_update_json_append_string(triggerid, AUDIT_DETAILS_ACTION_ADD, buf, recovery_expression);
+	zbx_audit_update_json_append_string(triggerid, AUDIT_TRIGGER_ID, AUDIT_DETAILS_ACTION_ADD, buf,
+			recovery_expression, "triggers", "recovery_expression");
 }
 
 #define PREPARE_AUDIT_TRIGGER_UPDATE(resource, type1, type2)							\
@@ -180,10 +189,10 @@ void	zbx_audit_trigger_update_json_update_##resource(zbx_uint64_t triggerid, int
 	RETURN_IF_AUDIT_OFF();											\
 														\
 	resource_type = trigger_flag_to_resource_type(flags);							\
-													\
+														\
 	zbx_snprintf(buf, sizeof(buf), TR_OR_TRP(resource));							\
 														\
-	zbx_audit_update_json_update_##type2(triggerid, buf, resource##_old, resource##_new);			\
+	zbx_audit_update_json_update_##type2(triggerid, AUDIT_TRIGGER_ID, buf, resource##_old, resource##_new);	\
 }
 
 PREPARE_AUDIT_TRIGGER_UPDATE(recovery_mode, int, int)
@@ -193,8 +202,14 @@ PREPARE_AUDIT_TRIGGER_UPDATE(manual_close, int, int)
 PREPARE_AUDIT_TRIGGER_UPDATE(opdata, const char*, string)
 PREPARE_AUDIT_TRIGGER_UPDATE(discover, int, int)
 PREPARE_AUDIT_TRIGGER_UPDATE(event_name, const char*, string)
+PREPARE_AUDIT_TRIGGER_UPDATE(priority, int, int)
+PREPARE_AUDIT_TRIGGER_UPDATE(comments, const char*, string)
+PREPARE_AUDIT_TRIGGER_UPDATE(url, const char*, string)
 PREPARE_AUDIT_TRIGGER_UPDATE(type, int, int)
 PREPARE_AUDIT_TRIGGER_UPDATE(templateid, zbx_uint64_t, uint64)
+PREPARE_AUDIT_TRIGGER_UPDATE(description, const char*, string)
+PREPARE_AUDIT_TRIGGER_UPDATE(expression, const char*, string)
+PREPARE_AUDIT_TRIGGER_UPDATE(recovery_expression, const char*, string)
 
 #undef PREPARE_AUDIT_ITEM_UPDATE
 #undef TR_OR_TRP
@@ -232,8 +247,8 @@ void	zbx_audit_DBselect_delete_for_trigger(const char *sql, zbx_vector_uint64_t
 	zbx_vector_uint64_sort(ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
 }
 
-void	zbx_audit_trigger_update_json_add_dependency(int flags, zbx_uint64_t triggerdepid,
-		zbx_uint64_t triggerid, zbx_uint64_t triggerid_up)
+void	zbx_audit_trigger_update_json_add_dependency(int flags, zbx_uint64_t triggerdepid, zbx_uint64_t triggerid,
+		zbx_uint64_t triggerid_up)
 {
 	char	audit_key[AUDIT_DETAILS_KEY_LEN], audit_key_triggerid_up[AUDIT_DETAILS_KEY_LEN];
 	int	resource_type;
@@ -256,8 +271,24 @@ void	zbx_audit_trigger_update_json_add_dependency(int flags, zbx_uint64_t trigge
 				ZBX_FS_UI64 "].dependsOnTriggerid", triggerdepid);
 	}
 
-	zbx_audit_update_json_append_no_value(triggerid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_uint64(triggerid, AUDIT_DETAILS_ACTION_ADD, audit_key_triggerid_up, triggerid_up);
+	zbx_audit_update_json_append_no_value(triggerid, AUDIT_TRIGGER_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_uint64(triggerid, AUDIT_TRIGGER_ID, AUDIT_DETAILS_ACTION_ADD,
+			audit_key_triggerid_up, triggerid_up, "trigger_depends", "triggerid_up");
+}
+
+void	zbx_audit_trigger_update_json_remove_dependency(int flags, zbx_uint64_t triggerdepid, zbx_uint64_t triggerid)
+{
+	char	audit_key[AUDIT_DETAILS_KEY_LEN];
+	int	resource_type;
+
+	RETURN_IF_AUDIT_OFF();
+
+	resource_type = trigger_flag_to_resource_type(flags);
+
+	zbx_snprintf(audit_key, sizeof(audit_key), "trigger%s.dependencies[" ZBX_FS_UI64 "]",
+			(AUDIT_RESOURCE_TRIGGER == resource_type) ? "" : "prototype", triggerdepid);
+
+	zbx_audit_update_json_append_no_value(triggerid, AUDIT_TRIGGER_ID, AUDIT_DETAILS_ACTION_DELETE, audit_key);
 }
 
 void	zbx_audit_trigger_update_json_add_tags_and_values(zbx_uint64_t triggerid, int flags, zbx_uint64_t triggertagid,
@@ -273,17 +304,17 @@ void	zbx_audit_trigger_update_json_add_tags_and_values(zbx_uint64_t triggerid, i
 
 	if (AUDIT_RESOURCE_TRIGGER == resource_type)
 	{
-		zbx_snprintf(audit_key, AUDIT_DETAILS_KEY_LEN, "trigger.tags[" ZBX_FS_UI64 "]", triggertagid);
-		zbx_snprintf(audit_key_tag, AUDIT_DETAILS_KEY_LEN, "trigger.tags[" ZBX_FS_UI64 "].tag", triggertagid);
-		zbx_snprintf(audit_key_value, AUDIT_DETAILS_KEY_LEN, "trigger.tags[" ZBX_FS_UI64 "].value",
+		zbx_snprintf(audit_key, sizeof(audit_key), "trigger.tags[" ZBX_FS_UI64 "]", triggertagid);
+		zbx_snprintf(audit_key_tag, sizeof(audit_key_tag), "trigger.tags[" ZBX_FS_UI64 "].tag", triggertagid);
+		zbx_snprintf(audit_key_value, sizeof(audit_key_value), "trigger.tags[" ZBX_FS_UI64 "].value",
 				triggertagid);
 	}
 	else if(AUDIT_RESOURCE_TRIGGER_PROTOTYPE == resource_type)
 	{
-		zbx_snprintf(audit_key, AUDIT_DETAILS_KEY_LEN, "triggerprototype.tags[" ZBX_FS_UI64 "]", triggertagid);
-		zbx_snprintf(audit_key_tag, AUDIT_DETAILS_KEY_LEN, "triggerprototype.tags[" ZBX_FS_UI64 "].tag",
+		zbx_snprintf(audit_key, sizeof(audit_key), "triggerprototype.tags[" ZBX_FS_UI64 "]", triggertagid);
+		zbx_snprintf(audit_key_tag, sizeof(audit_key_tag), "triggerprototype.tags[" ZBX_FS_UI64 "].tag",
 				triggertagid);
-		zbx_snprintf(audit_key_value, AUDIT_DETAILS_KEY_LEN, "triggerprototype.tags[" ZBX_FS_UI64 "].value",
+		zbx_snprintf(audit_key_value, sizeof(audit_key_value), "triggerprototype.tags[" ZBX_FS_UI64 "].value",
 				triggertagid);
 	}
 	else
@@ -293,9 +324,13 @@ void	zbx_audit_trigger_update_json_add_tags_and_values(zbx_uint64_t triggerid, i
 		exit(EXIT_FAILURE);
 	}
 
-	zbx_audit_update_json_append_no_value(triggerid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-	zbx_audit_update_json_append_string(triggerid, AUDIT_DETAILS_ACTION_ADD, audit_key_tag, tag);
-	zbx_audit_update_json_append_string(triggerid, AUDIT_DETAILS_ACTION_ADD, audit_key_value, value);
+#define AUDIT_TABLE_NAME	"trigger_tag"
+	zbx_audit_update_json_append_no_value(triggerid, AUDIT_TRIGGER_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+	zbx_audit_update_json_append_string(triggerid, AUDIT_TRIGGER_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_tag,
+			tag, AUDIT_TABLE_NAME, "tag");
+	zbx_audit_update_json_append_string(triggerid, AUDIT_TRIGGER_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_value,
+			value, AUDIT_TABLE_NAME, "value");
+#undef AUDIT_TABLE_NAME
 }
 
 void	zbx_audit_trigger_update_json_delete_tags(zbx_uint64_t triggerid, int flags, zbx_uint64_t triggertagid)
@@ -308,9 +343,27 @@ void	zbx_audit_trigger_update_json_delete_tags(zbx_uint64_t triggerid, int flags
 	resource_type = trigger_flag_to_resource_type(flags);
 
 	if (AUDIT_RESOURCE_TRIGGER == resource_type)
-		zbx_snprintf(audit_key, AUDIT_DETAILS_KEY_LEN, "trigger.tags[" ZBX_FS_UI64 "]", triggertagid);
+		zbx_snprintf(audit_key, sizeof(audit_key), "trigger.tags[" ZBX_FS_UI64 "]", triggertagid);
 	else
-		zbx_snprintf(audit_key, AUDIT_DETAILS_KEY_LEN, "triggerprototype.tags[" ZBX_FS_UI64 "]", triggertagid);
+		zbx_snprintf(audit_key, sizeof(audit_key), "triggerprototype.tags[" ZBX_FS_UI64 "]", triggertagid);
 
-	zbx_audit_update_json_append_no_value(triggerid, AUDIT_DETAILS_ACTION_DELETE, audit_key);
+	zbx_audit_update_json_append_no_value(triggerid, AUDIT_TRIGGER_ID, AUDIT_DETAILS_ACTION_DELETE, audit_key);
 }
+
+#define PREPARE_AUDIT_TRIGGER_UPDATE_TAG(resource, type1, type2)						\
+void	zbx_audit_trigger_update_json_update_tag_##resource(zbx_uint64_t triggerid, zbx_uint64_t triggertagid,	\
+		type1 resource##_old, type1 resource##_new)							\
+{														\
+	char	buf[AUDIT_DETAILS_KEY_LEN];									\
+														\
+	RETURN_IF_AUDIT_OFF();											\
+														\
+	zbx_snprintf(buf, sizeof(buf), "trigger.tags[" ZBX_FS_UI64 "]", triggertagid);				\
+														\
+	zbx_audit_update_json_update_##type2(triggerid, AUDIT_TRIGGER_ID, buf, resource##_old, resource##_new);	\
+}
+
+PREPARE_AUDIT_TRIGGER_UPDATE_TAG(tag, const char*, string)
+PREPARE_AUDIT_TRIGGER_UPDATE_TAG(value, const char*, string)
+
+#undef PREPARE_AUDIT_TRIGGER_UPDATE_TAG
diff --git a/src/libs/zbxaudit/audit_trigger.h b/src/libs/zbxaudit/audit_trigger.h
index 938ee15aa58..3e75377f24e 100644
--- a/src/libs/zbxaudit/audit_trigger.h
+++ b/src/libs/zbxaudit/audit_trigger.h
@@ -47,14 +47,27 @@ PREPARE_AUDIT_TRIGGER_UPDATE_H(manual_close, int)
 PREPARE_AUDIT_TRIGGER_UPDATE_H(opdata, const char*)
 PREPARE_AUDIT_TRIGGER_UPDATE_H(discover, int)
 PREPARE_AUDIT_TRIGGER_UPDATE_H(event_name, const char*)
+PREPARE_AUDIT_TRIGGER_UPDATE_H(priority, int)
+PREPARE_AUDIT_TRIGGER_UPDATE_H(comments, const char*)
+PREPARE_AUDIT_TRIGGER_UPDATE_H(url, const char*)
 PREPARE_AUDIT_TRIGGER_UPDATE_H(type, int)
 PREPARE_AUDIT_TRIGGER_UPDATE_H(templateid, zbx_uint64_t)
+PREPARE_AUDIT_TRIGGER_UPDATE_H(description, const char*)
+PREPARE_AUDIT_TRIGGER_UPDATE_H(expression, const char*)
+PREPARE_AUDIT_TRIGGER_UPDATE_H(recovery_expression, const char*)
 
 void	zbx_audit_DBselect_delete_for_trigger(const char *sql, zbx_vector_uint64_t *ids);
 void	zbx_audit_trigger_update_json_add_dependency(int flags, zbx_uint64_t triggerdepid,
 		zbx_uint64_t triggerid, zbx_uint64_t triggerid_up);
+void	zbx_audit_trigger_update_json_remove_dependency(int flags, zbx_uint64_t triggerdepid, zbx_uint64_t triggerid);
 void	zbx_audit_trigger_update_json_add_tags_and_values(zbx_uint64_t triggerid, int flags, zbx_uint64_t triggertagid,
 		const char *tag, const char *value);
 void	zbx_audit_trigger_update_json_delete_tags(zbx_uint64_t triggerid, int flags, zbx_uint64_t triggertagid);
 
+#define PREPARE_AUDIT_TRIGGER_UPDATE_TAG_H(resource, type1)							\
+void	zbx_audit_trigger_update_json_update_tag_##resource(zbx_uint64_t triggerid, zbx_uint64_t triggertagid,	\
+		type1 resource##_old, type1 resource##_new);
+PREPARE_AUDIT_TRIGGER_UPDATE_TAG_H(tag, const char*)
+PREPARE_AUDIT_TRIGGER_UPDATE_TAG_H(value, const char*)
+
 #endif	/* ZABBIX_AUDIT_TRIGGER_H */
diff --git a/src/libs/zbxcommon/time.c b/src/libs/zbxcommon/time.c
index 170d7c26f90..50fbb9a078e 100644
--- a/src/libs/zbxcommon/time.c
+++ b/src/libs/zbxcommon/time.c
@@ -204,7 +204,7 @@ void	zbx_tm_add(struct tm *tm, int multiplier, zbx_time_unit_t base)
  *                                                                            *
  * Function: neg_to_pos_wrap                                                  *
  *                                                                            *
- * Purpose: convert negative number to postive by wrapping around the base    *
+ * Purpose: convert negative number to positive by wrapping around the base   *
  *                                                                            *
  * Parameter: value - [IN/OUT] the value to convert                           *
  *            base  - [IN] the wrap base                                      *
diff --git a/src/libs/zbxcrypto/sha256crypt.c b/src/libs/zbxcrypto/sha256crypt.c
index 96c21c55b13..f61dedc47e9 100644
--- a/src/libs/zbxcrypto/sha256crypt.c
+++ b/src/libs/zbxcrypto/sha256crypt.c
@@ -12,7 +12,7 @@ Released into the Public Domain by Ulrich Drepper <drepper@redhat.com>.  */
 #elif defined(_WINDOWS) || defined(__MINGW32__)
 /* Nothing to do in Windows */
 #else
-	#if defined(DUK_F_OLD_SOLARIS)
+	#if defined(ZBX_OLD_SOLARIS)
 		#include <sys/isa_defs.h>
 	#else
 		#include <machine/endian.h>
diff --git a/src/libs/zbxdb/db.c b/src/libs/zbxdb/db.c
index a0e3fc4d86b..2d1c5b25da1 100644
--- a/src/libs/zbxdb/db.c
+++ b/src/libs/zbxdb/db.c
@@ -1236,6 +1236,7 @@ static sb4 db_bind_dynamic_cb(dvoid *ctxp, OCIBind *bindp, ub4 iter, ub4 index,
 		case ZBX_TYPE_TEXT:
 		case ZBX_TYPE_SHORTTEXT:
 		case ZBX_TYPE_LONGTEXT:
+		case ZBX_TYPE_CUID:
 			*bufpp = context->rows[iter][context->position].str;
 			*alenp = ((size_t *)context->data)[iter];
 			break;
@@ -1312,6 +1313,7 @@ int	zbx_db_bind_parameter_dyn(zbx_db_bind_context_t *context, int position, unsi
 		case ZBX_TYPE_TEXT:
 		case ZBX_TYPE_SHORTTEXT:
 		case ZBX_TYPE_LONGTEXT:
+		case ZBX_TYPE_CUID:
 			sizes = (size_t *)zbx_malloc(NULL, sizeof(size_t) * rows_num);
 			context->size_max = 0;
 
@@ -2793,6 +2795,8 @@ out:
 
 #else
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+	version_info->flag = DB_VERSION_SUPPORTED;
+	version_info->friendly_current_version = NULL;
 #endif
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s() version:%lu", __func__, (unsigned long)zbx_dbms_version_get());
 }
diff --git a/src/libs/zbxdbcache/dbconfig.c b/src/libs/zbxdbcache/dbconfig.c
index ad53b13ccfd..1cf3d0a5211 100644
--- a/src/libs/zbxdbcache/dbconfig.c
+++ b/src/libs/zbxdbcache/dbconfig.c
@@ -9107,7 +9107,7 @@ void	zbx_dc_reschedule_trigger_timers(zbx_vector_ptr_t *timers, int now)
 	int	i;
 
 	/* calculate new execution/evaluation time for the evaluated triggers */
-	/* (timers with reseted execution time)                               */
+	/* (timers with reset execution time)                                 */
 	for (i = 0; i < timers->values_num; i++)
 	{
 		zbx_trigger_timer_t	*timer = (zbx_trigger_timer_t *)timers->values[i];
diff --git a/src/libs/zbxdbcache/dbconfig_maintenance.c b/src/libs/zbxdbcache/dbconfig_maintenance.c
index 43dccd68331..bed3a796a95 100644
--- a/src/libs/zbxdbcache/dbconfig_maintenance.c
+++ b/src/libs/zbxdbcache/dbconfig_maintenance.c
@@ -500,9 +500,9 @@ void	DCsync_maintenance_hosts(zbx_dbsync_t *sync)
 
 /******************************************************************************
  *                                                                            *
- * Function: dc_substract_time                                                *
+ * Function: dc_subtract_time                                                 *
  *                                                                            *
- * Purpose: substract two local times with DST correction                     *
+ * Purpose: subtract two local times with DST correction                      *
  *                                                                            *
  * Parameter: minuend       - [IN] the minuend time                           *
  *            subtrahend    - [IN] the subtrahend time (may be negative)      *
@@ -511,7 +511,7 @@ void	DCsync_maintenance_hosts(zbx_dbsync_t *sync)
  * Return value: the resulting time difference in seconds                     *
  *                                                                            *
  ******************************************************************************/
-static time_t dc_substract_time(time_t minuend, int subtrahend, struct tm *tm)
+static time_t dc_subtract_time(time_t minuend, int subtrahend, struct tm *tm)
 {
 	time_t	diff, offset_min, offset_diff;
 
@@ -565,11 +565,11 @@ static int	dc_calculate_maintenance_period(const zbx_dc_maintenance_t *maintenan
 				return FAIL;
 
 			tm = *localtime(&active_since);
-			active_since = dc_substract_time(active_since,
+			active_since = dc_subtract_time(active_since,
 					tm.tm_hour * SEC_PER_HOUR + tm.tm_min * SEC_PER_MIN + tm.tm_sec, &tm);
 
 			day = (start_date - active_since) / SEC_PER_DAY;
-			start_date = dc_substract_time(start_date, SEC_PER_DAY * (day % period->every), &tm);
+			start_date = dc_subtract_time(start_date, SEC_PER_DAY * (day % period->every), &tm);
 			break;
 		case TIMEPERIOD_TYPE_WEEKLY:
 			if (start_date < active_since)
@@ -577,10 +577,10 @@ static int	dc_calculate_maintenance_period(const zbx_dc_maintenance_t *maintenan
 
 			tm = *localtime(&active_since);
 			wday = (0 == tm.tm_wday ? 7 : tm.tm_wday) - 1;
-			active_since = dc_substract_time(active_since, wday * SEC_PER_DAY +
+			active_since = dc_subtract_time(active_since, wday * SEC_PER_DAY +
 					tm.tm_hour * SEC_PER_HOUR + tm.tm_min * SEC_PER_MIN + tm.tm_sec, &tm);
 
-			for (; start_date >= active_since; start_date = dc_substract_time(start_date, SEC_PER_DAY, &tm))
+			for (; start_date >= active_since; start_date = dc_subtract_time(start_date, SEC_PER_DAY, &tm))
 			{
 				/* check for every x week(s) */
 				week = (start_date - active_since) / SEC_PER_WEEK;
@@ -597,7 +597,7 @@ static int	dc_calculate_maintenance_period(const zbx_dc_maintenance_t *maintenan
 			}
 			break;
 		case TIMEPERIOD_TYPE_MONTHLY:
-			for (; start_date >= active_since; start_date = dc_substract_time(start_date, SEC_PER_DAY, &tm))
+			for (; start_date >= active_since; start_date = dc_subtract_time(start_date, SEC_PER_DAY, &tm))
 			{
 				/* check for month */
 				tm = *localtime(&start_date);
@@ -675,8 +675,8 @@ static int	dc_check_maintenance_period(const zbx_dc_maintenance_t *maintenance,
 
 	tm = *localtime(&now);
 	seconds = tm.tm_hour * SEC_PER_HOUR + tm.tm_min * SEC_PER_MIN + tm.tm_sec;
-	period_start = dc_substract_time(now, seconds, &tm);
-	period_start = dc_substract_time(period_start, -period->start_time, &tm);
+	period_start = dc_subtract_time(now, seconds, &tm);
+	period_start = dc_subtract_time(period_start, -period->start_time, &tm);
 
 	tm = *localtime(&period_start);
 
@@ -687,7 +687,7 @@ static int	dc_check_maintenance_period(const zbx_dc_maintenance_t *maintenance,
 	}
 
 	if (now < period_start)
-		period_start = dc_substract_time(period_start, SEC_PER_DAY, &tm);
+		period_start = dc_subtract_time(period_start, SEC_PER_DAY, &tm);
 
 	rc = dc_calculate_maintenance_period(maintenance, period, period_start, &period_start, &period_end);
 
diff --git a/src/libs/zbxdbcache/dbsync.c b/src/libs/zbxdbcache/dbsync.c
index 713ea9f251c..8d6132dd97a 100644
--- a/src/libs/zbxdbcache/dbsync.c
+++ b/src/libs/zbxdbcache/dbsync.c
@@ -2351,15 +2351,17 @@ int	zbx_dbsync_compare_triggers(zbx_dbsync_t *sync)
 	char			**row;
 
 	if (NULL == (result = DBselect(
-			"select distinct t.triggerid,t.description,t.expression,t.error,t.priority,t.type,t.value,"
+			"select t.triggerid,t.description,t.expression,t.error,t.priority,t.type,t.value,"
 				"t.state,t.lastchange,t.status,t.recovery_mode,t.recovery_expression,"
 				"t.correlation_mode,t.correlation_tag,t.opdata,t.event_name,null,null,null"
-			" from hosts h,items i,functions f,triggers t"
-			" where h.hostid=i.hostid"
-				" and i.itemid=f.itemid"
-				" and f.triggerid=t.triggerid"
-				" and h.status in (%d,%d)"
-				" and t.flags<>%d",
+			" from triggers t"
+			" where t.triggerid in (select distinct tg.triggerid"
+				" from hosts h,items i,functions f,triggers tg"
+				" where h.hostid=i.hostid"
+					" and i.itemid=f.itemid"
+					" and f.triggerid=tg.triggerid"
+					" and h.status in (%d,%d)"
+					" and tg.flags<>%d)",
 			HOST_STATUS_MONITORED, HOST_STATUS_NOT_MONITORED,
 			ZBX_FLAG_DISCOVERY_PROTOTYPE)))
 	{
diff --git a/src/libs/zbxdbhigh/Makefile.am b/src/libs/zbxdbhigh/Makefile.am
index 88fd8d38a29..e863c5c50a5 100644
--- a/src/libs/zbxdbhigh/Makefile.am
+++ b/src/libs/zbxdbhigh/Makefile.am
@@ -21,6 +21,8 @@ libzbxdbhigh_a_SOURCES = \
 	template_item.c \
 	template.h \
 	trigger.c \
+	trigger_dep_linking.c \
+	trigger_dep_linking.h \
 	trigger_linking.c \
 	trigger_linking.h \
 	graph_linking.c \
diff --git a/src/libs/zbxdbhigh/graph_linking.c b/src/libs/zbxdbhigh/graph_linking.c
index 6bc73b78946..9d41a9cfc77 100644
--- a/src/libs/zbxdbhigh/graph_linking.c
+++ b/src/libs/zbxdbhigh/graph_linking.c
@@ -1442,7 +1442,7 @@ static int	execute_graphs_inserts(zbx_vector_graphs_copies_t *graphs_copies_inse
 						graphs_itemsid, template_entry->drawtype_orig,
 						template_entry->sortorder_orig, template_entry->color_orig,
 						template_entry->yaxisside_orig, template_entry->calc_fnc_orig,
-						template_entry->type_orig);
+						template_entry->type_orig, template_entry->itemid);
 				graphs_itemsid++;
 			}
 		}
diff --git a/src/libs/zbxdbhigh/host.c b/src/libs/zbxdbhigh/host.c
index d172c03117c..feb6387c4e5 100644
--- a/src/libs/zbxdbhigh/host.c
+++ b/src/libs/zbxdbhigh/host.c
@@ -1140,10 +1140,11 @@ static void	DBdelete_triggers_by_itemids(zbx_vector_uint64_t *itemids)
 
 	zbx_vector_uint64_create(&triggerids);
 
-	zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, "select distinct triggerid from functions where");
+	zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, "select distinct f.triggerid,t.description,t.flags from "
+			"functions f join triggers t on t.triggerid=f.triggerid where");
 	DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "itemid", itemids->values, itemids->values_num);
 
-	DBselect_uint64(sql, &triggerids);
+	zbx_audit_DBselect_delete_for_trigger(sql, &triggerids);
 
 	DBdelete_trigger_hierarchy(&triggerids);
 	zbx_vector_uint64_destroy(&triggerids);
@@ -2104,11 +2105,14 @@ typedef struct
 #define ZBX_FLAG_HPLINK_UPDATE_STATUS			0x02
 #define ZBX_FLAG_HPLINK_UPDATE_DISCOVER			0x04
 #define ZBX_FLAG_HPLINK_UPDATE_CUSTOM_INTERFACES	0x08
+#define ZBX_FLAG_HPLINK_UPDATE_INVENTORY_MODE		0x10
 	unsigned char		flags;
 	unsigned char		discover_orig;
 	unsigned char		discover;
 	unsigned char		custom_interfaces_orig;
 	unsigned char		custom_interfaces;
+	char			inventory_mode_orig;
+	char			inventory_mode;
 	zbx_uint64_t		templateid_host;
 }
 zbx_host_prototype_t;
@@ -2246,8 +2250,10 @@ static void	DBhost_prototypes_make(zbx_uint64_t hostid, zbx_vector_uint64_t *tem
 	/* selects host prototypes from templates */
 
 	zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
-			"select hi.itemid,th.hostid,th.host,th.name,th.status,th.discover,th.custom_interfaces"
+			"select hi.itemid,th.hostid,th.host,th.name,th.status,th.discover,th.custom_interfaces,"
+				"hinv.inventory_mode"
 			" from items hi,items ti,host_discovery thd,hosts th"
+			" left join host_inventory hinv on hinv.hostid=th.hostid"
 			" where hi.templateid=ti.itemid"
 				" and ti.itemid=thd.parent_itemid"
 				" and thd.hostid=th.hostid"
@@ -2281,6 +2287,14 @@ static void	DBhost_prototypes_make(zbx_uint64_t hostid, zbx_vector_uint64_t *tem
 		host_prototype->discover_orig = 0;
 		host_prototype->templateid_host = 0;
 		host_prototype->custom_interfaces_orig = 0;
+
+		if (SUCCEED == DBis_null(row[7]))
+			host_prototype->inventory_mode = HOST_INVENTORY_DISABLED;
+		else
+			host_prototype->inventory_mode = (char)atoi(row[7]);
+
+		host_prototype->inventory_mode_orig = HOST_INVENTORY_DISABLED;
+
 		zbx_vector_ptr_append(host_prototypes, host_prototype);
 		zbx_vector_uint64_append(&itemids, host_prototype->itemid);
 	}
@@ -2299,9 +2313,10 @@ static void	DBhost_prototypes_make(zbx_uint64_t hostid, zbx_vector_uint64_t *tem
 
 		sql_offset = 0;
 		zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
-				"select i.itemid,h.hostid,h.host,h.name,h.status,h.discover,h.custom_interfaces"
-				",h.templateid"
+				"select i.itemid,h.hostid,h.host,h.name,h.status,h.discover,h.custom_interfaces,"
+					"h.templateid,hinv.inventory_mode"
 				" from items i,host_discovery hd,hosts h"
+				" left join host_inventory hinv on hinv.hostid=h.hostid"
 				" where i.itemid=hd.parent_itemid"
 					" and hd.hostid=h.hostid"
 					" and i.hostid=" ZBX_FS_UI64
@@ -2321,6 +2336,8 @@ static void	DBhost_prototypes_make(zbx_uint64_t hostid, zbx_vector_uint64_t *tem
 
 				if (host_prototype->itemid == itemid && 0 == strcmp(host_prototype->host, row[2]))
 				{
+					char	inventory_mode_null_processed;
+
 					ZBX_STR2UINT64(host_prototype->hostid, row[1]);
 
 					if (0 != strcmp(host_prototype->name, row[3]))
@@ -2347,6 +2364,17 @@ static void	DBhost_prototypes_make(zbx_uint64_t hostid, zbx_vector_uint64_t *tem
 						host_prototype->custom_interfaces_orig = (unsigned char)atoi(row[6]);
 					}
 
+					if (SUCCEED == DBis_null(row[8]))
+						inventory_mode_null_processed = HOST_INVENTORY_DISABLED;
+					else
+						inventory_mode_null_processed = (char)atoi(row[8]);
+
+					if (host_prototype->inventory_mode != inventory_mode_null_processed)
+					{
+						host_prototype->flags |= ZBX_FLAG_HPLINK_UPDATE_INVENTORY_MODE;
+						host_prototype->inventory_mode_orig = inventory_mode_null_processed;
+					}
+
 					ZBX_DBROW2UINT64(host_prototype->templateid_host, row[7]);
 
 					break;
@@ -2429,7 +2457,7 @@ static void	DBhost_prototypes_templates_make(zbx_vector_ptr_t *host_prototypes,
 	}
 	DBfree_result(result);
 
-	/* select list of templates which already linked to host prototypes */
+	/* select list of templates which are already linked to host prototypes */
 
 	zbx_vector_uint64_clear(&hostids);
 
@@ -2475,7 +2503,7 @@ static void	DBhost_prototypes_templates_make(zbx_vector_ptr_t *host_prototypes,
 						zbx_vector_uint64_append(del_hosttemplateids, hosttemplateid);
 
 						zbx_audit_host_prototype_create_entry(AUDIT_ACTION_UPDATE,
-								host_prototype->hostid, host_prototype->name);
+								host_prototype->hostid, host_prototype->host);
 
 						zbx_audit_host_prototype_update_json_delete_parent_template(
 								host_prototype->hostid, hosttemplateid);
@@ -2994,7 +3022,7 @@ static void	DBhost_prototypes_macros_make(zbx_vector_ptr_t *host_prototypes, zbx
 						zbx_vector_uint64_append(del_macroids, hostmacroid);
 
 						zbx_audit_host_prototype_create_entry(AUDIT_ACTION_UPDATE,
-								host_prototype->hostid, host_prototype->name);
+								host_prototype->hostid, host_prototype->host);
 
 						zbx_audit_host_prototype_update_json_delete_hostmacro(
 								host_prototype->hostid, hostmacroid);
@@ -3105,7 +3133,7 @@ static void	DBhost_prototypes_tags_make(zbx_vector_ptr_t *host_prototypes, zbx_v
 	/* replace existing tags with the new tags */
 	if (0 != hostids.values_num)
 	{
-		int	tag_index;
+		int	tag_index = 0;
 
 		zbx_vector_uint64_sort(&hostids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
 
@@ -3156,7 +3184,7 @@ static void	DBhost_prototypes_tags_make(zbx_vector_ptr_t *host_prototypes, zbx_v
 				zbx_vector_uint64_append(del_tagids, tagid);
 
 				zbx_audit_host_prototype_create_entry(AUDIT_ACTION_UPDATE, host_prototype->hostid,
-						host_prototype->name);
+						host_prototype->host);
 				zbx_audit_host_prototype_update_json_delete_tag(host_prototype->hostid, tagid);
 			}
 
@@ -3373,7 +3401,7 @@ static void	DBhost_prototypes_interfaces_make(zbx_vector_ptr_t *host_prototypes,
 							zbx_vector_uint64_append(del_interfaceids, interfaceid);
 
 							zbx_audit_host_prototype_create_entry(AUDIT_ACTION_UPDATE,
-									host_prototype->hostid, host_prototype->name);
+									host_prototype->hostid, host_prototype->host);
 
 							zbx_audit_host_prototype_update_json_delete_interface(
 									host_prototype->hostid, interfaceid);
@@ -3395,7 +3423,7 @@ static void	DBhost_prototypes_interfaces_make(zbx_vector_ptr_t *host_prototypes,
 							zbx_vector_uint64_append(del_interfaceids, interfaceid);
 
 							zbx_audit_host_prototype_create_entry(AUDIT_ACTION_UPDATE,
-									host_prototype->hostid, host_prototype->name);
+									host_prototype->hostid, host_prototype->host);
 
 							zbx_audit_host_prototype_update_json_delete_interface(
 									host_prototype->hostid, interfaceid);
@@ -3544,6 +3572,8 @@ static void	DBhost_prototypes_interface_snmp_prepare_sql(zbx_uint64_t hostid, co
 	}
 
 	zbx_snprintf_alloc(sql, sql_alloc, sql_offset, " where interfaceid=" ZBX_FS_UI64 ";\n", interfaceid);
+
+	DBexecute_overflowed_sql(sql, sql_alloc, sql_offset);
 }
 
 /******************************************************************************
@@ -3561,16 +3591,16 @@ static void	DBhost_prototypes_interface_snmp_prepare_sql(zbx_uint64_t hostid, co
  *             db_insert_htemplates - [IN/OUT] templates insert structure     *
  *                                                                            *
  ******************************************************************************/
-static void	DBhost_prototypes_save(zbx_vector_ptr_t *host_prototypes, zbx_vector_uint64_t *del_hosttemplateids,
-		zbx_vector_uint64_t *del_hostmacroids, zbx_vector_uint64_t *del_tagids,
-		zbx_vector_uint64_t *del_interfaceids ,zbx_vector_uint64_t *del_snmpids,
-		zbx_db_insert_t *db_insert_htemplates)
+static void	DBhost_prototypes_save(const zbx_vector_ptr_t *host_prototypes,
+		const zbx_vector_uint64_t *del_hosttemplateids, const zbx_vector_uint64_t *del_hostmacroids,
+		const zbx_vector_uint64_t *del_tagids, const zbx_vector_uint64_t *del_interfaceids,
+		const zbx_vector_uint64_t *del_snmpids, zbx_db_insert_t *db_insert_htemplates)
 {
 	char				*sql1 = NULL, *sql2 = NULL, *name_esc, *value_esc;
 	size_t				sql1_alloc = ZBX_KIBIBYTE, sql1_offset = 0,
 					sql2_alloc = ZBX_KIBIBYTE, sql2_offset = 0;
-	zbx_group_prototype_t		*group_prototype;
-	zbx_macros_prototype_t		*hostmacro;
+	const zbx_group_prototype_t	*group_prototype;
+	const zbx_macros_prototype_t	*hostmacro;
 	zbx_db_tag_t			*tag;
 	zbx_interfaces_prototype_t	*interface;
 	zbx_uint64_t			hostid = 0, hosttemplateid = 0, group_prototypeid = 0, new_hostmacroid = 0,
@@ -3578,29 +3608,45 @@ static void	DBhost_prototypes_save(zbx_vector_ptr_t *host_prototypes, zbx_vector
 	int				i, j, new_hosts = 0, new_hosts_templates = 0, new_group_prototypes = 0,
 					upd_group_prototypes = 0, new_hostmacros = 0, upd_hostmacros = 0,
 					new_tags = 0, new_interfaces = 0, upd_interfaces = 0, new_snmp = 0,
-					upd_snmp = 0;
+					upd_snmp = 0, new_inventory_modes = 0, upd_inventory_modes = 0, res = SUCCEED;
 	zbx_db_insert_t			db_insert, db_insert_hdiscovery, db_insert_gproto,
-					db_insert_hmacro, db_insert_tag, db_insert_iface, db_insert_snmp;
+					db_insert_hmacro, db_insert_tag, db_insert_iface, db_insert_snmp,
+					db_insert_inventory_mode;
 	zbx_vector_db_tag_ptr_t		upd_tags;
+	zbx_vector_uint64_t		del_inventory_modes_hostids;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
 	zbx_vector_db_tag_ptr_create(&upd_tags);
+	zbx_vector_uint64_create(&del_inventory_modes_hostids);
 
 	for (i = 0; i < host_prototypes->values_num; i++)
 	{
-		zbx_host_prototype_t	*host_prototype;
+		const zbx_host_prototype_t	*host_prototype;
 
 		host_prototype = (zbx_host_prototype_t *)host_prototypes->values[i];
 
 		if (0 == host_prototype->hostid)
 		{
 			new_hosts++;
+
+			if (HOST_INVENTORY_DISABLED != host_prototype->inventory_mode)
+				new_inventory_modes++;
 		}
 		else
 		{
 			zbx_audit_host_prototype_create_entry(AUDIT_ACTION_UPDATE, host_prototype->hostid,
-					host_prototype->name);
+					host_prototype->host);
+
+			if (0 != (host_prototype->flags & ZBX_FLAG_HPLINK_UPDATE_INVENTORY_MODE))
+			{
+				if (HOST_INVENTORY_DISABLED == host_prototype->inventory_mode)
+					zbx_vector_uint64_append(&del_inventory_modes_hostids, host_prototype->hostid);
+				else if (HOST_INVENTORY_DISABLED == host_prototype->inventory_mode_orig)
+					new_inventory_modes++;
+				else
+					upd_inventory_modes++;
+			}
 		}
 
 		new_hosts_templates += host_prototype->lnk_templateids.values_num;
@@ -3696,9 +3742,16 @@ static void	DBhost_prototypes_save(zbx_vector_ptr_t *host_prototypes, zbx_vector
 	if (0 != new_hosts_templates)
 		hosttemplateid = DBget_maxid_num("hosts_templates", new_hosts_templates);
 
-	if (0 != del_hosttemplateids->values_num)
+	if (0 != del_hosttemplateids->values_num || 0 != del_hostmacroids->values_num || 0 != del_tagids->values_num ||
+			0 != del_snmpids->values_num || 0 != del_interfaceids->values_num ||
+			0 != del_inventory_modes_hostids.values_num)
 	{
 		sql2 = (char *)zbx_malloc(sql2, sql2_alloc);
+		DBbegin_multiple_update(&sql2, &sql2_alloc, &sql2_offset);
+	}
+
+	if (0 != del_hosttemplateids->values_num)
+	{
 		zbx_strcpy_alloc(&sql2, &sql2_alloc, &sql2_offset, "delete from hosts_templates where");
 		DBadd_condition_alloc(&sql2, &sql2_alloc, &sql2_offset, "hosttemplateid",
 				del_hosttemplateids->values, del_hosttemplateids->values_num);
@@ -3737,6 +3790,14 @@ static void	DBhost_prototypes_save(zbx_vector_ptr_t *host_prototypes, zbx_vector
 		zbx_strcpy_alloc(&sql2, &sql2_alloc, &sql2_offset, ";\n");
 	}
 
+	if (0 != del_inventory_modes_hostids.values_num)
+	{
+		zbx_strcpy_alloc(&sql2, &sql2_alloc, &sql2_offset, "delete from host_inventory where");
+		DBadd_condition_alloc(&sql2, &sql2_alloc, &sql2_offset, "hostid",
+				del_inventory_modes_hostids.values, del_inventory_modes_hostids.values_num);
+		zbx_strcpy_alloc(&sql2, &sql2_alloc, &sql2_offset, ";\n");
+	}
+
 	if (0 != new_group_prototypes)
 	{
 		group_prototypeid = DBget_maxid_num("group_prototype", new_group_prototypes);
@@ -3775,6 +3836,9 @@ static void	DBhost_prototypes_save(zbx_vector_ptr_t *host_prototypes, zbx_vector
 				"privprotocol", "contextname", NULL);
 	}
 
+	if (0 != new_inventory_modes)
+		zbx_db_insert_prepare(&db_insert_inventory_mode, "host_inventory", "hostid", "inventory_mode", NULL);
+
 	for (i = 0; i < host_prototypes->values_num; i++)
 	{
 		zbx_host_prototype_t	*host_prototype;
@@ -3791,13 +3855,20 @@ static void	DBhost_prototypes_save(zbx_vector_ptr_t *host_prototypes, zbx_vector
 					(int)host_prototype->discover, (int)host_prototype->custom_interfaces);
 
 			zbx_audit_host_prototype_create_entry(AUDIT_ACTION_ADD, host_prototype->hostid,
-					host_prototype->name);
+					host_prototype->host);
 
 			zbx_db_insert_add_values(&db_insert_hdiscovery, host_prototype->hostid, host_prototype->itemid);
 
+			if (HOST_INVENTORY_DISABLED != host_prototype->inventory_mode)
+			{
+				zbx_db_insert_add_values(&db_insert_inventory_mode, host_prototype->hostid,
+						host_prototype->inventory_mode);
+			}
+
 			zbx_audit_host_prototype_update_json_add_details(host_prototype->hostid,
 					host_prototype->templateid, host_prototype->name, (int)host_prototype->status,
-					(int)host_prototype->discover, (int)host_prototype->custom_interfaces);
+					(int)host_prototype->discover, (int)host_prototype->custom_interfaces,
+					host_prototype->inventory_mode);
 		}
 		else
 		{
@@ -3840,9 +3911,39 @@ static void	DBhost_prototypes_save(zbx_vector_ptr_t *host_prototypes, zbx_vector
 
 			zbx_snprintf_alloc(&sql1, &sql1_alloc, &sql1_offset, " where hostid=" ZBX_FS_UI64 ";\n",
 					host_prototype->hostid);
-		}
 
-		DBexecute_overflowed_sql(&sql1, &sql1_alloc, &sql1_offset);
+			if (FAIL == (res = DBexecute_overflowed_sql(&sql1, &sql1_alloc, &sql1_offset)))
+				break;
+
+			if (0 != (host_prototype->flags & ZBX_FLAG_HPLINK_UPDATE_INVENTORY_MODE))
+			{
+				/* new host inventory value which is HOST_INVENTORY_DISABLED is handled later */
+				if (HOST_INVENTORY_DISABLED != host_prototype->inventory_mode)
+				{
+					if (HOST_INVENTORY_DISABLED == host_prototype->inventory_mode_orig)
+					{
+						zbx_db_insert_add_values(&db_insert_inventory_mode,
+								host_prototype->hostid, host_prototype->inventory_mode);
+					}
+					else
+					{
+						zbx_snprintf_alloc(&sql1, &sql1_alloc, &sql1_offset,
+								"update host_inventory set inventory_mode=%d"
+								" where hostid=" ZBX_FS_UI64 ";\n",
+								host_prototype->inventory_mode, host_prototype->hostid);
+
+						if (FAIL == (res = DBexecute_overflowed_sql(&sql1, &sql1_alloc,
+								&sql1_offset)))
+						{
+							break;
+						}
+					}
+				}
+
+				zbx_audit_host_prototype_update_json_update_inventory_mode(host_prototype->hostid,
+						host_prototype->inventory_mode_orig, host_prototype->inventory_mode);
+			}
+		}
 
 		for (j = 0; j < host_prototype->lnk_templateids.values_num; j++)
 		{
@@ -3879,6 +3980,9 @@ static void	DBhost_prototypes_save(zbx_vector_ptr_t *host_prototypes, zbx_vector
 						" where group_prototypeid=" ZBX_FS_UI64 ";\n",
 						group_prototype->templateid, group_prototype->group_prototypeid);
 
+				if (FAIL == (res = DBexecute_overflowed_sql(&sql1, &sql1_alloc, &sql1_offset)))
+					break;
+
 				zbx_audit_host_prototype_update_json_update_group_details(host_prototype->hostid,
 						group_prototype->group_prototypeid, group_prototype->name,
 						group_prototype->groupid, group_prototype->templateid_host,
@@ -3954,6 +4058,8 @@ static void	DBhost_prototypes_save(zbx_vector_ptr_t *host_prototypes, zbx_vector
 
 				zbx_snprintf_alloc(&sql1, &sql1_alloc, &sql1_offset,
 						" where hostmacroid=" ZBX_FS_UI64 ";\n", hostmacro->hostmacroid);
+				if (FAIL == (res = DBexecute_overflowed_sql(&sql1, &sql1_alloc, &sql1_offset)))
+					break;
 			}
 		}
 
@@ -4060,6 +4166,9 @@ static void	DBhost_prototypes_save(zbx_vector_ptr_t *host_prototypes, zbx_vector
 
 				zbx_snprintf_alloc(&sql1, &sql1_alloc, &sql1_offset,
 						" where interfaceid=" ZBX_FS_UI64 ";\n", interface->interfaceid);
+
+				if (FAIL == (res = DBexecute_overflowed_sql(&sql1, &sql1_alloc, &sql1_offset)))
+					break;
 			}
 
 			if (INTERFACE_TYPE_SNMP == interface->type)
@@ -4100,8 +4209,6 @@ static void	DBhost_prototypes_save(zbx_vector_ptr_t *host_prototypes, zbx_vector
 				}
 			}
 		}
-
-		DBexecute_overflowed_sql(&sql1, &sql1_alloc, &sql1_offset);
 	}
 
 	if (0 != upd_tags.values_num)
@@ -4135,6 +4242,9 @@ static void	DBhost_prototypes_save(zbx_vector_ptr_t *host_prototypes, zbx_vector
 
 			zbx_snprintf_alloc(&sql1, &sql1_alloc, &sql1_offset,
 					" where hosttagid=" ZBX_FS_UI64 ";\n", tag->tagid);
+
+			if (FAIL == (res = DBexecute_overflowed_sql(&sql1, &sql1_alloc, &sql1_offset)))
+				break;
 		}
 	}
 
@@ -4177,25 +4287,39 @@ static void	DBhost_prototypes_save(zbx_vector_ptr_t *host_prototypes, zbx_vector
 		zbx_db_insert_clean(&db_insert_snmp);
 	}
 
-	if (NULL != sql1 || new_hosts != host_prototypes->values_num || 0 != upd_group_prototypes ||
-			0 != upd_hostmacros || 0 != upd_interfaces || 0 != upd_snmp)
+	if (0 != new_inventory_modes)
+	{
+		zbx_db_insert_execute(&db_insert_inventory_mode);
+		zbx_db_insert_clean(&db_insert_inventory_mode);
+	}
+
+	if (SUCCEED == res && (NULL != sql1 || new_hosts != host_prototypes->values_num || 0 != upd_group_prototypes ||
+			0 != upd_hostmacros || 0 != upd_interfaces || 0 != upd_snmp || 0 != upd_inventory_modes))
 	{
 		DBend_multiple_update(&sql1, &sql1_alloc, &sql1_offset);
 
 		/* in ORACLE always present begin..end; */
 		if (16 < sql1_offset)
 			DBexecute("%s", sql1);
-		zbx_free(sql1);
 	}
 
-	if (0 != del_hosttemplateids->values_num || 0 != del_hostmacroids->values_num || 0 != del_tagids->values_num ||
-			0 != del_interfaceids->values_num || 0 != del_snmpids->values_num)
+	if (SUCCEED == res && (NULL != sql2 || 0 != del_hosttemplateids->values_num ||
+			0 != del_hostmacroids->values_num || 0 != del_tagids->values_num ||
+			0 != del_interfaceids->values_num || 0 != del_snmpids->values_num ||
+			0 != del_inventory_modes_hostids.values_num))
 	{
-		DBexecute("%s", sql2);
-		zbx_free(sql2);
+		DBend_multiple_update(&sql2, &sql2_alloc, &sql2_offset);
+
+		/* in ORACLE always present begin..end; */
+		if (16 < sql2_offset)
+			DBexecute("%s", sql2);
 	}
 
+	zbx_free(sql1);
+	zbx_free(sql2);
+
 	zbx_vector_db_tag_ptr_destroy(&upd_tags);
+	zbx_vector_uint64_destroy(&del_inventory_modes_hostids);
 
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
 }
@@ -5206,9 +5330,10 @@ static void	DBsave_httptests(zbx_uint64_t hostid, const zbx_vector_ptr_t *httpte
 
 			zbx_audit_httptest_update_json_add_data(httptest->httptestid, httptest->templateid,
 					httptest->name, httptest->delay, (int)httptest->status, httptest->agent,
-					(int)httptest->authentication, httptest->http_user, httptest->http_proxy,
-					httptest->retries, httptest->ssl_cert_file, httptest->ssl_key_file,
-					httptest->verify_peer, httptest->verify_host, hostid);
+					(int)httptest->authentication, httptest->http_user, httptest->http_password,
+					httptest->http_proxy, httptest->retries, httptest->ssl_cert_file,
+					httptest->ssl_key_file, httptest->ssl_key_password, httptest->verify_peer,
+					httptest->verify_host, hostid);
 
 			for (j = 0; j < httptest->httpsteps.values_num; j++)
 			{
@@ -5292,8 +5417,9 @@ static void	DBsave_httptests(zbx_uint64_t hostid, const zbx_vector_ptr_t *httpte
 			d = ",";										\
 			zbx_free(str_esc);									\
 														\
-			zbx_audit_httptest_update_json_update_##field(httptest->httptestid,			\
-				ZBX_MACRO_SECRET_MASK, ZBX_MACRO_SECRET_MASK);					\
+			zbx_audit_httptest_update_json_update_##field(httptest->httptestid, 			\
+					(0 == strcmp("", httptest->field##_orig) ? "" :ZBX_MACRO_SECRET_MASK),	\
+					(0 == strcmp("", httptest->field) ? "" : ZBX_MACRO_SECRET_MASK));	\
 		}
 
 #define PREPARE_UPDATE_HTTPTEST_INT(FLAG, field)								\
diff --git a/src/libs/zbxdbhigh/template_item.c b/src/libs/zbxdbhigh/template_item.c
index cdf27741f0c..c0feae4a752 100644
--- a/src/libs/zbxdbhigh/template_item.c
+++ b/src/libs/zbxdbhigh/template_item.c
@@ -861,7 +861,8 @@ static void	save_template_item(zbx_uint64_t hostid, zbx_uint64_t *itemid, zbx_te
 			zbx_free(str_esc);									\
 														\
 			zbx_audit_item_update_json_update_##field(item->itemid, item->flags,			\
-					ZBX_MACRO_SECRET_MASK, ZBX_MACRO_SECRET_MASK);				\
+					(0 == strcmp("", item->field##_orig) ? "" : ZBX_MACRO_SECRET_MASK),	\
+					(0 == strcmp("", item->field) ? "" : ZBX_MACRO_SECRET_MASK));		\
 		}
 #define PREPARE_UPDATE_UC(FLAG_POSTFIX, field)									\
 		if (0 != (item->upd_flags & ZBX_FLAG_TEMPLATE_ITEM_UPDATE_##FLAG_POSTFIX))			\
diff --git a/src/libs/zbxdbhigh/trigger_dep_linking.c b/src/libs/zbxdbhigh/trigger_dep_linking.c
new file mode 100644
index 00000000000..cc9a75404d3
--- /dev/null
+++ b/src/libs/zbxdbhigh/trigger_dep_linking.c
@@ -0,0 +1,578 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+#include "db.h"
+#include "../../libs/zbxaudit/audit_trigger.h"
+#include "trigger_dep_linking.h"
+
+typedef struct
+{
+	zbx_uint64_t	triggerid;
+	int		flags;
+}
+resolve_dependencies_triggers_flags_t;
+
+static zbx_hash_t	triggers_flags_hash_func(const void *data)
+{
+	const resolve_dependencies_triggers_flags_t	*trigger_entry =
+			(const resolve_dependencies_triggers_flags_t *)data;
+
+	return ZBX_DEFAULT_UINT64_HASH_ALGO(&(trigger_entry->triggerid), sizeof(trigger_entry->triggerid),
+			ZBX_DEFAULT_HASH_SEED);
+}
+
+static int	triggers_flags_compare_func(const void *d1, const void *d2)
+{
+	const resolve_dependencies_triggers_flags_t	*trigger_entry_1 =
+			(const resolve_dependencies_triggers_flags_t *)d1;
+	const resolve_dependencies_triggers_flags_t	*trigger_entry_2 =
+			(const resolve_dependencies_triggers_flags_t *)d2;
+
+	ZBX_RETURN_IF_NOT_EQUAL(trigger_entry_1->triggerid, trigger_entry_2->triggerid);
+
+	return 0;
+}
+
+typedef struct
+{
+	zbx_uint64_t	trigger_dep_id;
+	zbx_uint64_t	trigger_down_id;
+	zbx_uint64_t	trigger_up_id;
+	int		status;
+	int		flags;
+}
+zbx_trigger_dep_vec_entry_t;
+
+ZBX_PTR_VECTOR_DECL(trigger_up_entries, zbx_trigger_dep_vec_entry_t *)
+ZBX_PTR_VECTOR_IMPL(trigger_up_entries, zbx_trigger_dep_vec_entry_t *)
+
+typedef struct
+{
+	zbx_uint64_t			trigger_down_id;
+	zbx_vector_trigger_up_entries_t	v;
+}
+zbx_trigger_dep_entry_t;
+
+static zbx_hash_t	zbx_trigger_dep_entries_hash_func(const void *data)
+{
+	const zbx_trigger_dep_entry_t	*trigger_dep_entry = (const zbx_trigger_dep_entry_t *)data;
+
+	return ZBX_DEFAULT_UINT64_HASH_ALGO(&((trigger_dep_entry)->trigger_down_id),
+			sizeof(trigger_dep_entry->trigger_down_id), ZBX_DEFAULT_HASH_SEED);
+}
+
+static int	zbx_trigger_dep_entries_compare_func(const void *d1, const void *d2)
+{
+	const zbx_trigger_dep_entry_t	*trigger_dep_entry_1 = (const zbx_trigger_dep_entry_t *)d1;
+	const zbx_trigger_dep_entry_t	*trigger_dep_entry_2 = (const zbx_trigger_dep_entry_t *)d2;
+
+	ZBX_RETURN_IF_NOT_EQUAL(trigger_dep_entry_1->trigger_down_id, trigger_dep_entry_2->trigger_down_id);
+
+	return 0;
+}
+
+static void	zbx_trigger_dep_vec_entry_clean(zbx_trigger_dep_vec_entry_t *trigger_dep_entry)
+{
+	zbx_free(trigger_dep_entry);
+}
+
+static void	zbx_triggers_dep_entries_clean(zbx_hashset_t *h)
+{
+	zbx_hashset_iter_t	iter;
+	zbx_trigger_dep_entry_t	*trigger_dep_entry;
+
+	zbx_hashset_iter_reset(h, &iter);
+
+	while (NULL != (trigger_dep_entry = (zbx_trigger_dep_entry_t *)zbx_hashset_iter_next(&iter)))
+	{
+		zbx_vector_trigger_up_entries_clear_ext(&(trigger_dep_entry->v), zbx_trigger_dep_vec_entry_clean);
+		zbx_vector_trigger_up_entries_destroy(&(trigger_dep_entry->v));
+	}
+
+	zbx_hashset_destroy(h);
+}
+
+/*********************************************************************************
+ *                                                                               *
+ * Function: DBresolve_template_trigger_dependencies                             *
+ *                                                                               *
+ * Purpose: resolves trigger dependencies for the specified triggers based on    *
+ *          host and linked templates                                            *
+ *                                                                               *
+ * Parameters: hostid        - [IN] host identifier from database                *
+ *             trids         - [IN] vector of trigger identifiers from database  *
+ *             links         - [OUT] pairs of trigger dependencies (down,up)     *
+ *             trigger_flags - [OUT] map that lets audit to know if trigger is   *
+ *                                   a prototype or just trigger                 *
+ *                                                                               *
+ * Return value: upon successful completion return SUCCEED, or FAIL on DB error  *
+ *                                                                               *
+ *********************************************************************************/
+static int	DBresolve_template_trigger_dependencies(zbx_uint64_t hostid, const zbx_vector_uint64_t *trids,
+		zbx_vector_uint64_pair_t *links, zbx_hashset_t *triggers_flags)
+{
+	char				*sql = NULL;
+	int				i, res = SUCCEED;
+	size_t				sql_alloc = 512, sql_offset;
+	DB_RESULT			result;
+	DB_ROW				row;
+	zbx_vector_uint64_pair_t	dep_list_ids, map_ids;
+	zbx_vector_uint64_t		all_templ_ids;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_vector_uint64_create(&all_templ_ids);
+	zbx_vector_uint64_pair_create(&dep_list_ids);
+	zbx_vector_uint64_pair_create(&map_ids);
+	sql = (char *)zbx_malloc(sql, sql_alloc);
+
+	sql_offset = 0;
+
+	/* get triggerids on which the 'parent template trigger of the new trigger' depends on */
+	zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset,
+			"select distinct td.triggerid_down,td.triggerid_up"
+			" from triggers t,trigger_depends td"
+			" where t.templateid in (td.triggerid_up,td.triggerid_down) and");
+	DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "t.triggerid", trids->values, trids->values_num);
+
+	if (NULL == (result = DBselect("%s", sql)))
+	{
+		res = FAIL;
+		goto clean;
+	}
+
+	while (NULL != (row = DBfetch(result)))
+	{
+		zbx_uint64_pair_t	dep_list_id;
+
+		ZBX_STR2UINT64(dep_list_id.first, row[0]);
+		ZBX_STR2UINT64(dep_list_id.second, row[1]);
+		zbx_vector_uint64_pair_append(&dep_list_ids, dep_list_id);
+		zbx_vector_uint64_append(&all_templ_ids, dep_list_id.first);
+		zbx_vector_uint64_append(&all_templ_ids, dep_list_id.second);
+	}
+
+	DBfree_result(result);
+
+	if (0 == dep_list_ids.values_num)	/* not all trigger templates have a dependency trigger */
+		goto clean;
+
+	zbx_vector_uint64_sort(&all_templ_ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
+	zbx_vector_uint64_uniq(&all_templ_ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
+
+	sql_offset = 0;
+
+	/* find triggers which have a parent template trigger that we have dependency on, */
+	/* those are the dependency triggers of interest on our host */
+	zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
+			"select t.triggerid,t.templateid,t.flags"
+			" from triggers t,functions f,items i"
+			" where t.triggerid=f.triggerid"
+				" and f.itemid=i.itemid"
+				" and i.hostid=" ZBX_FS_UI64
+				" and",
+				hostid);
+	DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "t.templateid", all_templ_ids.values,
+			all_templ_ids.values_num);
+	zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, " and");
+	DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "t.triggerid", trids->values,
+			trids->values_num);
+
+	if (NULL == (result = DBselect("%s", sql)))
+	{
+		res = FAIL;
+		goto clean;
+	}
+
+	while (NULL != (row = DBfetch(result)))
+	{
+		zbx_uint64_pair_t			map_id;
+		resolve_dependencies_triggers_flags_t	*found, temp_t;
+
+		ZBX_STR2UINT64(temp_t.triggerid, row[0]);
+
+		if (NULL == (found = (resolve_dependencies_triggers_flags_t *)zbx_hashset_search(triggers_flags,
+				&temp_t)))
+		{
+			resolve_dependencies_triggers_flags_t	local_temp_t;
+
+			ZBX_STR2UINT64(local_temp_t.triggerid, row[0]);
+			local_temp_t.flags = atoi(row[2]);
+			zbx_hashset_insert(triggers_flags, &local_temp_t, sizeof(local_temp_t));
+		}
+
+		ZBX_STR2UINT64(map_id.first, row[0]);
+		ZBX_DBROW2UINT64(map_id.second, row[1]);
+
+		zbx_vector_uint64_pair_append(&map_ids, map_id);
+	}
+
+	DBfree_result(result);
+
+	for (i = 0; i < dep_list_ids.values_num; i++)
+	{
+		zbx_uint64_t	templateid_down = dep_list_ids.values[i].first;
+		zbx_uint64_t	templateid_up = dep_list_ids.values[i].second;
+
+		/* Convert template ids to corresponding trigger ids.         */
+		/* If template trigger depends on host trigger rather than    */
+		/* template trigger then up id conversion will fail and the   */
+		/* original value (host trigger id) will be used as intended. */
+		zbx_uint64_t	triggerid_down = 0;
+		zbx_uint64_t	triggerid_up = templateid_up;
+		int		j;
+
+		for (j = 0; j < map_ids.values_num; j++)
+		{
+			zbx_uint64_t	hst_triggerid = map_ids.values[j].first;
+			zbx_uint64_t	tpl_triggerid = map_ids.values[j].second;
+
+			if (tpl_triggerid == templateid_down)
+				triggerid_down = hst_triggerid;
+
+			if (tpl_triggerid == templateid_up)
+				triggerid_up = hst_triggerid;
+		}
+
+		if (0 != triggerid_down)
+		{
+			zbx_uint64_pair_t	link = {triggerid_down, triggerid_up};
+
+			zbx_vector_uint64_pair_append(links, link);
+		}
+	}
+clean:
+	zbx_free(sql);
+	zbx_vector_uint64_destroy(&all_templ_ids);
+
+	zbx_vector_uint64_pair_destroy(&map_ids);
+	zbx_vector_uint64_pair_destroy(&dep_list_ids);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(res));
+
+	return res;
+}
+
+/**********************************************************************************************************
+ *                                                                                                        *
+ * Function: prepare_trigger_dependencies_updates_and_deletes                                             *
+ *                                                                                                        *
+ * Purpose: takes a list of pending trigger dependencies (links) and excludes entries that are            *
+ *          already present on the target host to generate a new list (links_processed). Also, prepare    *
+ *          the list of the trigger dependencies (trigger_dep_ids_del) that need to be deleted on the     *
+ *          target host, since they are not present on the template trigger.                              *
+ *                                                                                                        *
+ * Parameters: trids               - [IN] vector of trigger identifiers from database                     *
+ *             links               - [OUT] pairs of trigger dependencies, list of links_up and links_down *
+ *                                         links that we want to be present on the target host            *
+ *             links_processed     - [OUT] processed links with entries that are already present excluded *
+ *             trigger_dep_ids_del - [OUT] list of triggers dependencies that need to be deleted          *
+ *                                                                                                        *
+ * Return value: upon successful completion return SUCCEED, or FAIL on DB error                           *
+ *                                                                                                        *
+ *********************************************************************************************************/
+static int	prepare_trigger_dependencies_updates_and_deletes(const zbx_vector_uint64_t *trids,
+		zbx_vector_uint64_pair_t *links, zbx_vector_uint64_pair_t *links_processed,
+		zbx_vector_uint64_t *trigger_dep_ids_del)
+{
+	char			*sql = NULL;
+	int			i, res = SUCCEED;
+	size_t			sql_alloc = 256, sql_offset = 0;
+	DB_RESULT		result;
+	DB_ROW			row;
+	zbx_hashset_t		h;
+	zbx_hashset_iter_t	iter;
+	zbx_trigger_dep_entry_t	*found;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+#define	TRIGGER_FUNCS_HASHSET_DEF_SIZE	100
+	zbx_hashset_create(&h, TRIGGER_FUNCS_HASHSET_DEF_SIZE, zbx_trigger_dep_entries_hash_func,
+			zbx_trigger_dep_entries_compare_func);
+#undef TRIGGER_FUNCS_HASHSET_DEF_SIZE
+	zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
+			"select td.triggerdepid,td.triggerid_down,td.triggerid_up,t.flags"
+			" from trigger_depends td,triggers t "
+			" where t.triggerid=td.triggerid_down"
+			" and");
+	DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "td.triggerid_down", trids->values, trids->values_num);
+
+	if (NULL == (result = DBselect("%s", sql)))
+	{
+		res = FAIL;
+		goto clean;
+	}
+
+	while (NULL != (row = DBfetch(result)))
+	{
+		int				flags;
+		zbx_uint64_t			trigger_dep_id, trigger_id_down, trigger_id_up;
+		zbx_trigger_dep_entry_t		temp_t;
+		zbx_trigger_dep_vec_entry_t	*s;
+
+		ZBX_STR2UINT64(trigger_dep_id, row[0]);
+		ZBX_STR2UINT64(trigger_id_down, row[1]);
+		ZBX_STR2UINT64(trigger_id_up, row[2]);
+		flags = atoi(row[3]);
+
+		temp_t.trigger_down_id = trigger_id_down;
+
+		s = (zbx_trigger_dep_vec_entry_t *)zbx_malloc(NULL, sizeof(zbx_trigger_dep_vec_entry_t));
+		s->trigger_dep_id = trigger_dep_id;
+		s->trigger_down_id = trigger_id_down;
+		s->trigger_up_id = trigger_id_up;
+		s->status = 0;
+		s->flags = flags;
+
+		if (NULL != (found = (zbx_trigger_dep_entry_t *)zbx_hashset_search(&h, &temp_t)))
+		{
+			zbx_vector_trigger_up_entries_append(&(found->v), s);
+		}
+		else
+		{
+			zbx_trigger_dep_entry_t local_temp_t;
+
+			zbx_vector_trigger_up_entries_create(&(local_temp_t.v));
+			zbx_vector_trigger_up_entries_append(&(local_temp_t.v), s);
+			local_temp_t.trigger_down_id = trigger_id_down;
+			zbx_hashset_insert(&h, &local_temp_t, sizeof(local_temp_t));
+		}
+	}
+
+	DBfree_result(result);
+
+	for (i = 0; i < links->values_num; i++)
+	{
+		zbx_trigger_dep_entry_t	temp_t;
+
+		temp_t.trigger_down_id = links->values[i].first;
+
+		if (NULL != (found = (zbx_trigger_dep_entry_t *) zbx_hashset_search(&h, &temp_t)))
+		{
+			int	j;
+			int	found_trigger_up = 0;
+
+			for (j = 0; j < found->v.values_num; j++)
+			{
+				/* trigger_up are equal */
+				if (links->values[i].second == found->v.values[j]->trigger_up_id)
+				{
+					found_trigger_up = 1;
+					/* mark it as 'need to preserve' */
+					found->v.values[j]->status = 1;
+					break;
+				}
+			}
+
+			if (0 == found_trigger_up)
+			{
+				zbx_uint64_pair_t	x;
+
+				x.first = links->values[i].first;
+				x.second = links->values[i].second;
+				zbx_vector_uint64_pair_append(links_processed, x);
+			}
+		}
+		else
+		{
+			zbx_uint64_pair_t	x;
+
+			x.first = links->values[i].first;
+			x.second = links->values[i].second;
+			zbx_vector_uint64_pair_append(links_processed, x);
+		}
+	}
+
+	zbx_hashset_iter_reset(&h, &iter);
+
+	while (NULL != (found = (zbx_trigger_dep_entry_t *)zbx_hashset_iter_next(&iter)))
+	{
+		for (i = 0; i < found->v.values_num; i++)
+		{
+			if (0 == found->v.values[i]->status)
+			{
+				zbx_vector_uint64_append(trigger_dep_ids_del,
+						found->v.values[i]->trigger_dep_id);
+				zbx_audit_trigger_update_json_remove_dependency(found->v.values[i]->flags,
+						found->v.values[i]->trigger_dep_id,
+						found->v.values[i]->trigger_down_id);
+			}
+		}
+	}
+clean:
+	zbx_triggers_dep_entries_clean(&h);
+	zbx_free(sql);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(res));
+
+	return res;
+}
+
+static int	DBadd_trigger_dependencies(zbx_vector_uint64_pair_t *links, zbx_hashset_t *triggers_flags)
+{
+	int	res = SUCCEED;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	if (0 < links->values_num)
+	{
+		int		i;
+		zbx_uint64_t	triggerdepid;
+		zbx_db_insert_t	db_insert;
+
+		triggerdepid = DBget_maxid_num("trigger_depends", links->values_num);
+
+		zbx_db_insert_prepare(&db_insert, "trigger_depends", "triggerdepid", "triggerid_down", "triggerid_up",
+				NULL);
+
+		for (i = 0; i < links->values_num; i++)
+		{
+			resolve_dependencies_triggers_flags_t	*found, temp_t;
+
+			zbx_db_insert_add_values(&db_insert, triggerdepid, links->values[i].first,
+					links->values[i].second);
+
+			temp_t.triggerid = links->values[i].first;
+
+			if (NULL != (found = (resolve_dependencies_triggers_flags_t *)zbx_hashset_search(
+					triggers_flags, &temp_t)))
+			{
+				zbx_audit_trigger_update_json_add_dependency(found->flags, triggerdepid,
+						links->values[i].first, links->values[i].second);
+			}
+			else
+			{
+				THIS_SHOULD_NEVER_HAPPEN;
+				res = FAIL;
+
+				break;
+			}
+
+			triggerdepid++;
+		}
+
+		if (SUCCEED == res)
+			zbx_db_insert_execute(&db_insert);
+		zbx_db_insert_clean(&db_insert);
+	}
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(res));
+
+	return res;
+}
+
+static int	DBadd_and_remove_trigger_dependencies(zbx_vector_uint64_pair_t *links,
+		const zbx_vector_uint64_t *trids, zbx_hashset_t *triggers_flags)
+{
+	int				res;
+	char				*sql = NULL;
+	size_t				sql_alloc = 0, sql_offset = 0;
+	zbx_vector_uint64_pair_t	links_processed;
+	zbx_vector_uint64_t		trigger_dep_ids_del;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_vector_uint64_create(&trigger_dep_ids_del);
+	zbx_vector_uint64_pair_create(&links_processed);
+
+	if (FAIL == (res = prepare_trigger_dependencies_updates_and_deletes(trids, links, &links_processed,
+			&trigger_dep_ids_del)))
+	{
+		goto clean;
+	}
+
+	if (0 < trigger_dep_ids_del.values_num)
+	{
+		zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, "delete from trigger_depends where");
+		DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "triggerdepid",
+				trigger_dep_ids_del.values, trigger_dep_ids_del.values_num);
+
+		if (ZBX_DB_OK > DBexecute("%s", sql))
+		{
+			res = FAIL;
+			goto clean;
+		}
+	}
+
+	res = DBadd_trigger_dependencies(&links_processed, triggers_flags);
+clean:
+	zbx_free(sql);
+	zbx_vector_uint64_destroy(&trigger_dep_ids_del);
+	zbx_vector_uint64_pair_destroy(&links_processed);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(res));
+
+	return res;
+}
+
+/********************************************************************************
+ *                                                                              *
+ * Function: DBsync_template_dependencies_for_triggers                          *
+ *                                                                              *
+ * Purpose: update trigger dependencies for specified host                      *
+ *                                                                              *
+ * Parameters: hostid    - [IN] host identifier from database                   *
+ *             trids     - [IN] vector of trigger identifiers from database     *
+ *             is_update - [IN] flag. Values:                                   *
+ *                              TRIGGER_DEP_SYNC_INSERT_OP - 'trids' contains   *
+ *                               identifiers of new triggers,                   *
+ *                              TRIGGER_DEP_SYNC_UPDATE_OP - 'trids' contains   *
+ *                               identifiers of already present triggers which  *
+ *                               need to be updated                             *
+ *                                                                              *
+ * Return value: upon successful completion return SUCCEED, or FAIL on DB error *
+ *                                                                              *
+ * Comments: !!! Don't forget to sync the code with PHP !!!                     *
+ *                                                                              *
+ ********************************************************************************/
+int	DBsync_template_dependencies_for_triggers(zbx_uint64_t hostid, const zbx_vector_uint64_t *trids, int is_update)
+{
+	int				res = SUCCEED;
+	zbx_vector_uint64_pair_t	links;
+	zbx_hashset_t			triggers_flags;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	if (0 == trids->values_num)
+		goto out;
+
+	zbx_vector_uint64_pair_create(&links);
+#define	TRIGGER_FUNCS_HASHSET_DEF_SIZE	100
+	zbx_hashset_create(&triggers_flags, TRIGGER_FUNCS_HASHSET_DEF_SIZE, triggers_flags_hash_func,
+			triggers_flags_compare_func);
+#undef TRIGGER_FUNCS_HASHSET_DEF_SIZE
+	if (FAIL == (res = DBresolve_template_trigger_dependencies(hostid, trids, &links, &triggers_flags)))
+		goto clean;
+
+	if (TRIGGER_DEP_SYNC_INSERT_OP == is_update)
+	{
+		if (FAIL == (res = DBadd_trigger_dependencies(&links, &triggers_flags)))
+			goto clean;
+	}
+	else if (TRIGGER_DEP_SYNC_UPDATE_OP == is_update)
+	{
+		res = DBadd_and_remove_trigger_dependencies(&links, trids, &triggers_flags);
+	}
+clean:
+	zbx_vector_uint64_pair_destroy(&links);
+	zbx_hashset_destroy(&triggers_flags);
+out:
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(res));
+
+	return res;
+}
diff --git a/ui/app/views/service.time.validate.php b/src/libs/zbxdbhigh/trigger_dep_linking.h
index 6031943188c..7328eb1a4a4 100644
--- a/ui/app/views/service.time.validate.php
+++ b/src/libs/zbxdbhigh/trigger_dep_linking.h
@@ -1,4 +1,3 @@
-<?php declare(strict_types = 1);
 /*
 ** Zabbix
 ** Copyright (C) 2001-2021 Zabbix SIA
@@ -18,24 +17,16 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
+#ifndef ZABBIX_TRIGGER_DEP_LINKING_H
+#define ZABBIX_TRIGGER_DEP_LINKING_H
 
-/**
- * @var CView $this
- */
+#include "log.h"
+#include "common.h"
+#include "zbxalgo.h"
+#include "../../libs/zbxalgo/vectorimpl.h"
 
-$output = [
-	'body' => (new CPartial('service.time.row', [
-		'row_index' => $data['row_index'],
-		'type' => $data['form']['type'],
-		'ts_from' => $data['form']['ts_from'],
-		'ts_to' => $data['form']['ts_to'],
-		'note' => $data['form']['note']
-	]))->getOutput()
-];
+#define TRIGGER_DEP_SYNC_INSERT_OP 0
+#define TRIGGER_DEP_SYNC_UPDATE_OP 1
+int	DBsync_template_dependencies_for_triggers(zbx_uint64_t hostid, const zbx_vector_uint64_t *trids, int is_update);
 
-if ($data['user']['debug_mode'] == GROUP_DEBUG_MODE_ENABLED) {
-	CProfiler::getInstance()->stop();
-	$output['debug'] = CProfiler::getInstance()->make()->toString();
-}
-
-echo json_encode($output);
+#endif
diff --git a/src/libs/zbxdbhigh/trigger_linking.c b/src/libs/zbxdbhigh/trigger_linking.c
index 8ea5851b9c4..a81d08a864d 100644
--- a/src/libs/zbxdbhigh/trigger_linking.c
+++ b/src/libs/zbxdbhigh/trigger_linking.c
@@ -19,6 +19,7 @@
 
 #include "db.h"
 #include "../../libs/zbxaudit/audit_trigger.h"
+#include "trigger_dep_linking.h"
 #include "trigger_linking.h"
 
 typedef struct
@@ -78,6 +79,12 @@ typedef struct
 	unsigned char	discover;
 	char		*event_name_orig;
 	char		*event_name;
+	unsigned char	priority_orig;
+	unsigned char	priority;
+	char		*comments_orig;
+	char		*comments;
+	char		*url_orig;
+	char		*url;
 	unsigned char	type_orig;
 	unsigned char	type;
 
@@ -89,15 +96,19 @@ typedef struct
 #define ZBX_FLAG_LINK_TRIGGER_UPDATE_OPDATA		__UINT64_C(0x00000010)
 #define ZBX_FLAG_LINK_TRIGGER_UPDATE_DISCOVER		__UINT64_C(0x00000020)
 #define ZBX_FLAG_LINK_TRIGGER_UPDATE_EVENT_NAME		__UINT64_C(0x00000040)
-#define ZBX_FLAG_LINK_TRIGGER_UPDATE_TYPE		__UINT64_C(0x00000080)
-#define ZBX_FLAG_LINK_TRIGGER_UPDATE_TEMPLATEID		__UINT64_C(0x00000100)
+#define ZBX_FLAG_LINK_TRIGGER_UPDATE_PRIORITY		__UINT64_C(0x00000080)
+#define ZBX_FLAG_LINK_TRIGGER_UPDATE_COMMENTS		__UINT64_C(0x00000100)
+#define ZBX_FLAG_LINK_TRIGGER_UPDATE_URL		__UINT64_C(0x00000200)
+#define ZBX_FLAG_LINK_TRIGGER_UPDATE_TYPE		__UINT64_C(0x00000400)
+#define ZBX_FLAG_LINK_TRIGGER_UPDATE_TEMPLATEID		__UINT64_C(0x00000800)
 
 #define ZBX_FLAG_LINK_TRIGGER_UPDATE									\
 	(ZBX_FLAG_LINK_TRIGGER_UPDATE_RECOVERY_MODE | ZBX_FLAG_LINK_TRIGGER_UPDATE_CORRELATION_MODE |	\
 	ZBX_FLAG_LINK_TRIGGER_UPDATE_CORRELATION_TAG | ZBX_FLAG_LINK_TRIGGER_UPDATE_MANUAL_CLOSE |	\
 	ZBX_FLAG_LINK_TRIGGER_UPDATE_OPDATA | ZBX_FLAG_LINK_TRIGGER_UPDATE_DISCOVER |			\
-	ZBX_FLAG_LINK_TRIGGER_UPDATE_EVENT_NAME | ZBX_FLAG_LINK_TRIGGER_UPDATE_TYPE |			\
-	ZBX_FLAG_LINK_TRIGGER_UPDATE_TEMPLATEID)
+	ZBX_FLAG_LINK_TRIGGER_UPDATE_EVENT_NAME | ZBX_FLAG_LINK_TRIGGER_UPDATE_PRIORITY |		\
+	ZBX_FLAG_LINK_TRIGGER_UPDATE_COMMENTS | ZBX_FLAG_LINK_TRIGGER_UPDATE_URL |			\
+	ZBX_FLAG_LINK_TRIGGER_UPDATE_TYPE | ZBX_FLAG_LINK_TRIGGER_UPDATE_TEMPLATEID)
 
 	zbx_uint64_t	update_flags;
 }
@@ -106,7 +117,7 @@ zbx_target_host_trigger_entry_t;
 ZBX_PTR_VECTOR_DECL(target_host_trigger_data, zbx_target_host_trigger_entry_t *)
 ZBX_PTR_VECTOR_IMPL(target_host_trigger_data, zbx_target_host_trigger_entry_t *)
 
-static unsigned	zbx_host_triggers_main_data_hash_func(const void *data)
+static zbx_hash_t	zbx_host_triggers_main_data_hash_func(const void *data)
 {
 	const zbx_target_host_trigger_entry_t	* trigger_entry = (const zbx_target_host_trigger_entry_t *)data;
 
@@ -150,6 +161,17 @@ static void	zbx_host_triggers_main_data_clean(zbx_hashset_t *h)
 
 		if (0 != (trigger_entry->update_flags & ZBX_FLAG_LINK_TRIGGER_UPDATE_EVENT_NAME))
 			zbx_free(trigger_entry->event_name);
+
+		zbx_free(trigger_entry->comments_orig);
+
+		if (0 != (trigger_entry->update_flags & ZBX_FLAG_LINK_TRIGGER_UPDATE_COMMENTS))
+			zbx_free(trigger_entry->comments);
+
+		zbx_free(trigger_entry->url_orig);
+
+		if (0 != (trigger_entry->update_flags & ZBX_FLAG_LINK_TRIGGER_UPDATE_URL))
+			zbx_free(trigger_entry->url);
+
 	}
 
 	zbx_hashset_destroy(h);
@@ -168,7 +190,7 @@ typedef struct zbx_trigger_functions_entry
 
 } zbx_trigger_functions_entry_t;
 
-static unsigned	zbx_triggers_functions_hash_func(const void *data)
+static zbx_hash_t	zbx_triggers_functions_hash_func(const void *data)
 {
 	const zbx_trigger_functions_entry_t	*trigger_entry = (const zbx_trigger_functions_entry_t *)data;
 
@@ -250,272 +272,6 @@ static void	zbx_triggers_descriptions_clean(zbx_hashset_t *x)
 typedef struct
 {
 	zbx_uint64_t	triggerid;
-	int		flags;
-}
-resolve_dependencies_triggers_flags_t;
-
-static unsigned	triggers_flags_hash_func(const void *data)
-{
-	const resolve_dependencies_triggers_flags_t	*trigger_entry =
-			(const resolve_dependencies_triggers_flags_t *)data;
-
-	return ZBX_DEFAULT_UINT64_HASH_ALGO(&(trigger_entry->triggerid), sizeof(trigger_entry->triggerid),
-			ZBX_DEFAULT_HASH_SEED);
-}
-
-static int	triggers_flags_compare_func(const void *d1, const void *d2)
-{
-	const resolve_dependencies_triggers_flags_t	*trigger_entry_1 =
-			(const resolve_dependencies_triggers_flags_t *)d1;
-	const resolve_dependencies_triggers_flags_t	*trigger_entry_2 =
-			(const resolve_dependencies_triggers_flags_t *)d2;
-
-	ZBX_RETURN_IF_NOT_EQUAL(trigger_entry_1->triggerid, trigger_entry_2->triggerid);
-
-	return 0;
-}
-
-/*********************************************************************************
- *                                                                               *
- * Function: DBresolve_template_trigger_dependencies                             *
- *                                                                               *
- * Purpose: resolves trigger dependencies for the specified triggers based on    *
- *          host and linked templates                                            *
- *                                                                               *
- * Parameters: hostid        - [IN] host identifier from database                *
- *             trids         - [IN] array of trigger identifiers from database   *
- *             trids_num     - [IN] trigger count in trids array                 *
- *             links         - [OUT] pairs of trigger dependencies (down,up)     *
- *             trigger_flags - [OUT] map that lets audit know if trigger is      *
- *                                   a prototype or just trigger                 *
- *                                                                               *
- * Return value: upon successful completion return SUCCEED, or FAIL on DB error  *
- *                                                                               *
- *********************************************************************************/
-static int	DBresolve_template_trigger_dependencies(zbx_uint64_t hostid, const zbx_uint64_t *trids, int trids_num,
-		zbx_vector_uint64_pair_t *links, zbx_hashset_t *triggers_flags)
-{
-	DB_RESULT			result;
-	DB_ROW				row;
-	char				*sql = NULL;
-	size_t				sql_alloc = 512, sql_offset;
-	zbx_vector_uint64_pair_t	dep_list_ids, map_ids;
-	zbx_vector_uint64_t		all_templ_ids;
-	int				i, res = SUCCEED;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_vector_uint64_create(&all_templ_ids);
-	zbx_vector_uint64_pair_create(&dep_list_ids);
-	zbx_vector_uint64_pair_create(&map_ids);
-	sql = (char *)zbx_malloc(sql, sql_alloc);
-
-	sql_offset = 0;
-	zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset,
-			"select distinct td.triggerid_down,td.triggerid_up"
-			" from triggers t,trigger_depends td"
-			" where t.templateid in (td.triggerid_up,td.triggerid_down) and");
-	DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "t.triggerid", trids, trids_num);
-
-	if (NULL == (result = DBselect("%s", sql)))
-	{
-		res = FAIL;
-		goto clean;
-	}
-
-	while (NULL != (row = DBfetch(result)))
-	{
-		zbx_uint64_pair_t	dep_list_id;
-
-		ZBX_STR2UINT64(dep_list_id.first, row[0]);
-		ZBX_STR2UINT64(dep_list_id.second, row[1]);
-		zbx_vector_uint64_pair_append(&dep_list_ids, dep_list_id);
-		zbx_vector_uint64_append(&all_templ_ids, dep_list_id.first);
-		zbx_vector_uint64_append(&all_templ_ids, dep_list_id.second);
-	}
-
-	if (0 == dep_list_ids.values_num)	/* not all trigger templates have a dependency trigger */
-		goto clean;
-
-	DBfree_result(result);
-
-	zbx_vector_uint64_sort(&all_templ_ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
-	zbx_vector_uint64_uniq(&all_templ_ids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
-
-	sql_offset = 0;
-	zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
-			"select t.triggerid,t.templateid,t.flags"
-			" from triggers t,functions f,items i"
-			" where t.triggerid=f.triggerid"
-				" and f.itemid=i.itemid"
-				" and i.hostid=" ZBX_FS_UI64
-				" and",
-				hostid);
-	DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "t.templateid", all_templ_ids.values,
-			all_templ_ids.values_num);
-
-	if (NULL == (result = DBselect("%s", sql)))
-	{
-		res = FAIL;
-		goto clean;
-	}
-
-	while (NULL != (row = DBfetch(result)))
-	{
-		zbx_uint64_pair_t			map_id;
-		resolve_dependencies_triggers_flags_t	*found, temp_t;
-
-		ZBX_STR2UINT64(temp_t.triggerid, row[0]);
-
-		if (NULL == (found = (resolve_dependencies_triggers_flags_t *)zbx_hashset_search(triggers_flags,
-				&temp_t)))
-		{
-			resolve_dependencies_triggers_flags_t	local_temp_t;
-
-			ZBX_STR2UINT64(local_temp_t.triggerid, row[0]);
-			local_temp_t.flags = atoi(row[2]);
-			zbx_hashset_insert(triggers_flags, &local_temp_t, sizeof(local_temp_t));
-		}
-
-		ZBX_STR2UINT64(map_id.first, row[0]);
-		ZBX_DBROW2UINT64(map_id.second, row[1]);
-		zbx_vector_uint64_pair_append(&map_ids, map_id);
-	}
-
-	for (i = 0; i < dep_list_ids.values_num; i++)
-	{
-		int		j;
-		zbx_uint64_t	templateid_down, templateid_up, triggerid_down, triggerid_up, hst_triggerid,
-				tpl_triggerid;
-
-		templateid_down = dep_list_ids.values[i].first;
-		templateid_up = dep_list_ids.values[i].second;
-
-		/* Convert template ids to corresponding trigger ids.         */
-		/* If template trigger depends on host trigger rather than    */
-		/* template trigger then up id conversion will fail and the   */
-		/* original value (host trigger id) will be used as intended. */
-		triggerid_down = 0;
-		triggerid_up = templateid_up;
-
-		for (j = 0; j < map_ids.values_num; j++)
-		{
-			hst_triggerid = map_ids.values[j].first;
-			tpl_triggerid = map_ids.values[j].second;
-
-			if (tpl_triggerid == templateid_down)
-				triggerid_down = hst_triggerid;
-
-			if (tpl_triggerid == templateid_up)
-				triggerid_up = hst_triggerid;
-		}
-
-		if (0 != triggerid_down)
-		{
-			zbx_uint64_pair_t	link = {triggerid_down, triggerid_up};
-
-			zbx_vector_uint64_pair_append(links, link);
-		}
-	}
-clean:
-	DBfree_result(result);
-	zbx_free(sql);
-	zbx_vector_uint64_destroy(&all_templ_ids);
-
-	zbx_vector_uint64_pair_destroy(&map_ids);
-	zbx_vector_uint64_pair_destroy(&dep_list_ids);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(res));
-
-	return res;
-}
-
-/********************************************************************************
- *                                                                              *
- * Function: DBadd_template_dependencies_for_new_triggers                       *
- *                                                                              *
- * Purpose: update trigger dependencies for specified host                      *
- *                                                                              *
- * Parameters: hostid    - [IN] host identifier from database                   *
- *             trids     - [IN] array of trigger identifiers from database      *
- *             trids_num - [IN] trigger count in trids array                    *
- *                                                                              *
- * Return value: upon successful completion return SUCCEED, or FAIL on DB error *
- *                                                                              *
- * Comments: !!! Don't forget to sync the code with PHP !!!                     *
- *                                                                              *
- ********************************************************************************/
-static int	DBadd_template_dependencies_for_new_triggers(zbx_uint64_t hostid, const zbx_uint64_t *trids,
-		int trids_num)
-{
-	int				res = SUCCEED;
-	zbx_vector_uint64_pair_t	links;
-	zbx_hashset_t			triggers_flags;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	if (0 == trids_num)
-		goto out;
-
-	zbx_vector_uint64_pair_create(&links);
-#define	TRIGGER_FUNCS_HASHSET_DEF_SIZE	100
-	zbx_hashset_create(&triggers_flags, TRIGGER_FUNCS_HASHSET_DEF_SIZE, triggers_flags_hash_func,
-			triggers_flags_compare_func);
-#undef TRIGGER_FUNCS_HASHSET_DEF_SIZE
-	if (FAIL == (res = DBresolve_template_trigger_dependencies(hostid, trids, trids_num, &links, &triggers_flags)))
-		goto clean;
-
-	if (0 < links.values_num)
-	{
-		int		i;
-		zbx_uint64_t	triggerdepid;
-		zbx_db_insert_t	db_insert;
-
-		triggerdepid = DBget_maxid_num("trigger_depends", links.values_num);
-
-		zbx_db_insert_prepare(&db_insert, "trigger_depends", "triggerdepid", "triggerid_down", "triggerid_up",
-				NULL);
-
-		for (i = 0; i < links.values_num; i++)
-		{
-			resolve_dependencies_triggers_flags_t	*found, temp_t;
-
-			zbx_db_insert_add_values(&db_insert, triggerdepid, links.values[i].first,
-					links.values[i].second);
-
-			temp_t.triggerid = links.values[i].first;
-
-			if (NULL != (found = (resolve_dependencies_triggers_flags_t *)zbx_hashset_search(
-					&triggers_flags, &temp_t)))
-			{
-				zbx_audit_trigger_update_json_add_dependency(found->flags, triggerdepid,
-						links.values[i].first, links.values[i].second);
-			}
-			else
-			{
-				THIS_SHOULD_NEVER_HAPPEN;
-				res = FAIL;
-				goto clean;
-			}
-
-			triggerdepid++;
-		}
-
-		zbx_db_insert_execute(&db_insert);
-		zbx_db_insert_clean(&db_insert);
-	}
-clean:
-	zbx_vector_uint64_pair_destroy(&links);
-	zbx_hashset_destroy(&triggers_flags);
-out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(res));
-
-	return res;
-}
-
-typedef struct
-{
-	zbx_uint64_t	triggerid;
 	char		*tag;
 	char		*value;
 	int		flags;
@@ -594,7 +350,7 @@ static int	DBcopy_template_trigger_tags(const zbx_vector_uint64_t *new_triggerid
 		sql_offset = 0;
 		DBfree_result(result);
 
-		/* remove tags from host triggers that were linking to template triggers */
+		/* remove tags from host triggers that were linked to template triggers */
 		zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, "delete from trigger_tag where");
 		DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "triggerid", cur_triggerids->values,
 				cur_triggerids->values_num);
@@ -776,14 +532,17 @@ static int	get_templates_triggers_data(zbx_uint64_t hostid, const zbx_vector_uin
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
 	zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset,
-			"select distinct t.triggerid,t.description,t.expression,t.status,"
+			"select t.triggerid,t.description,t.expression,t.status,"
 				"t.type,t.priority,t.comments,t.url,t.flags,t.recovery_expression,t.recovery_mode,"
 				"t.correlation_mode,t.correlation_tag,t.manual_close,t.opdata,t.discover,t.event_name"
-			" from triggers t,functions f,items i"
-			" where t.triggerid=f.triggerid"
-				" and f.itemid=i.itemid"
-				" and");
+			" from triggers t"
+			" where t.triggerid in (select distinct tg.triggerid"
+				" from triggers tg,functions f,items i"
+				" where tg.triggerid=f.triggerid"
+					" and f.itemid=i.itemid"
+					" and");
 	DBadd_condition_alloc(&sql, &sql_alloc, &sql_offset, "i.hostid", templateids->values, templateids->values_num);
+	zbx_chrcpy_alloc(&sql, &sql_alloc, &sql_offset, ')');
 
 	if (NULL == (result = DBselect("%s", sql)))
 	{
@@ -844,19 +603,22 @@ static int	get_target_host_main_data(zbx_uint64_t hostid, zbx_vector_str_t *temp
 	sql = (char *)zbx_malloc(sql, sql_alloc);
 
 	zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
-		"select distinct t.triggerid,t.description,t.expression,t.recovery_expression"
+		"select t.triggerid,t.description,t.expression,t.recovery_expression"
 			",t.flags,t.recovery_mode,t.correlation_mode,t.correlation_tag,t.manual_close,t.opdata"
-			",t.discover,t.event_name,t.templateid,t.type"
-		" from triggers t,functions f,items i"
-			" where t.triggerid=f.triggerid"
+			",t.discover,t.event_name,t.priority,t.comments,t.url,t.templateid,t.type"
+		" from triggers t"
+		" where t.triggerid in (select distinct tg.triggerid"
+			" from triggers tg,functions f,items i"
+			" where tg.triggerid=f.triggerid"
 				" and f.itemid=i.itemid"
-				" and t.templateid is null"
+				" and tg.templateid is null"
 				" and i.hostid=" ZBX_FS_UI64
 				" and", hostid);
 
-	DBadd_str_condition_alloc(&sql, &sql_alloc, &sql_offset, "t.description",
+	DBadd_str_condition_alloc(&sql, &sql_alloc, &sql_offset, "tg.description",
 			(const char **)templates_triggers_descriptions->values,
 			templates_triggers_descriptions->values_num);
+	zbx_chrcpy_alloc(&sql, &sql_alloc, &sql_offset, ')');
 
 	if (NULL == (result = DBselect("%s", sql)))
 	{
@@ -875,7 +637,7 @@ static int	get_target_host_main_data(zbx_uint64_t hostid, zbx_vector_str_t *temp
 		target_host_trigger_entry.description = zbx_strdup(NULL, row[1]);
 		target_host_trigger_entry.expression = zbx_strdup(NULL, row[2]);
 		target_host_trigger_entry.recovery_expression = zbx_strdup(NULL, row[3]);
-		ZBX_DBROW2UINT64(target_host_trigger_entry.templateid_orig, row[12]);
+		ZBX_DBROW2UINT64(target_host_trigger_entry.templateid_orig, row[15]);
 		target_host_trigger_entry.templateid = 0;
 		ZBX_STR2UINT64(target_host_trigger_entry.flags, row[4]);
 
@@ -893,7 +655,13 @@ static int	get_target_host_main_data(zbx_uint64_t hostid, zbx_vector_str_t *temp
 		target_host_trigger_entry.discover = 0;
 		target_host_trigger_entry.event_name_orig = zbx_strdup(NULL, row[11]);
 		target_host_trigger_entry.event_name = NULL;
-		ZBX_STR2UCHAR(target_host_trigger_entry.type_orig, row[13]);
+		ZBX_STR2UCHAR(target_host_trigger_entry.priority_orig,  row[12]);
+		target_host_trigger_entry.priority = 0;
+		target_host_trigger_entry.comments_orig = zbx_strdup(NULL, row[13]);
+		target_host_trigger_entry.comments = NULL;
+		target_host_trigger_entry.url_orig = zbx_strdup(NULL, row[14]);
+		target_host_trigger_entry.url = NULL;
+		ZBX_STR2UCHAR(target_host_trigger_entry.type_orig, row[16]);
 		target_host_trigger_entry.type = 0;
 
 		zbx_hashset_insert(zbx_host_triggers_main_data, &target_host_trigger_entry,
@@ -1032,6 +800,24 @@ static void	mark_updates_for_host_trigger(zbx_trigger_copy_t *trigger_copy,
 		main_found->update_flags |= ZBX_FLAG_LINK_TRIGGER_UPDATE_EVENT_NAME;
 	}
 
+	if (trigger_copy->priority != main_found->priority_orig)
+	{
+		main_found->priority = trigger_copy->priority;
+		main_found->update_flags |= ZBX_FLAG_LINK_TRIGGER_UPDATE_PRIORITY;
+	}
+
+	if (0 != strcmp(trigger_copy->comments, main_found->comments_orig))
+	{
+		main_found->comments = zbx_strdup(NULL, trigger_copy->comments);
+		main_found->update_flags |= ZBX_FLAG_LINK_TRIGGER_UPDATE_COMMENTS;
+	}
+
+	if (0 != strcmp(trigger_copy->url, main_found->url_orig))
+	{
+		main_found->url = zbx_strdup(NULL, trigger_copy->url);
+		main_found->update_flags |= ZBX_FLAG_LINK_TRIGGER_UPDATE_URL;
+	}
+
 	if (trigger_copy->type != main_found->type_orig)
 	{
 		main_found->type = trigger_copy->type;
@@ -1146,6 +932,41 @@ static int	execute_triggers_updates(zbx_hashset_t *zbx_host_triggers_main_data)
 						(int)found->flags, found->event_name_orig, found->event_name);
 			}
 
+			if (0 != (found->update_flags & ZBX_FLAG_LINK_TRIGGER_UPDATE_PRIORITY))
+			{
+				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%spriority=%d", d, found->priority);
+				d = ",";
+
+				zbx_audit_trigger_update_json_update_priority(found->triggerid,
+						(int)found->flags, found->priority_orig, found->priority);
+			}
+
+			if (0 != (found->update_flags & ZBX_FLAG_LINK_TRIGGER_UPDATE_COMMENTS))
+			{
+				char	*comments_esc = DBdyn_escape_string(found->comments);
+
+				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%scomments='%s'", d,
+						found->comments);
+				d = ",";
+				zbx_free(comments_esc);
+
+				zbx_audit_trigger_update_json_update_comments(found->triggerid,
+						(int)found->flags, found->comments_orig, found->comments);
+			}
+
+			if (0 != (found->update_flags & ZBX_FLAG_LINK_TRIGGER_UPDATE_URL))
+			{
+				char	*url_esc = DBdyn_escape_string(found->url);
+
+				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%surl='%s'", d,
+						found->url);
+				d = ",";
+				zbx_free(url_esc);
+
+				zbx_audit_trigger_update_json_update_url(found->triggerid,
+						(int)found->flags, found->url_orig, found->url);
+			}
+
 			if (0 != (found->update_flags & ZBX_FLAG_LINK_TRIGGER_UPDATE_TYPE))
 			{
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%stype='%d'", d,
@@ -1640,11 +1461,14 @@ int	DBcopy_template_triggers(zbx_uint64_t hostid, const zbx_vector_uint64_t *tem
 
 	if (SUCCEED == res)
 	{
-		res = DBadd_template_dependencies_for_new_triggers(hostid, new_triggerids.values,
-				new_triggerids.values_num);
+		res = DBsync_template_dependencies_for_triggers(hostid, &temp_host_triggerids,
+				TRIGGER_DEP_SYNC_UPDATE_OP);
 	}
 
 	if (SUCCEED == res)
+		res = DBsync_template_dependencies_for_triggers(hostid, &new_triggerids, TRIGGER_DEP_SYNC_INSERT_OP);
+
+	if (SUCCEED == res)
 		res = DBcopy_template_trigger_tags(&new_triggerids, &cur_triggerids);
 
 	if (FAIL == res && NULL == *error)
diff --git a/src/libs/zbxdbupgrade/dbupgrade_5050.c b/src/libs/zbxdbupgrade/dbupgrade_5050.c
index 400831babba..913ecff4f4f 100644
--- a/src/libs/zbxdbupgrade/dbupgrade_5050.c
+++ b/src/libs/zbxdbupgrade/dbupgrade_5050.c
@@ -674,7 +674,7 @@ static int	DBpatch_5050068_calc_services_write_value(zbx_uint64_t roleid, int *v
 {
 	DB_RESULT	result;
 	DB_ROW		row;
-	int		default_access = 1;
+	int		default_access = 1, ret = FAIL;
 
 	result = DBselect("select name,value_int from role_rule where roleid=" ZBX_FS_UI64, roleid);
 
@@ -682,16 +682,19 @@ static int	DBpatch_5050068_calc_services_write_value(zbx_uint64_t roleid, int *v
 	{
 		/* write rule already exists, skip */
 		if (0 == strcmp("services.write", row[0]))
-			return FAIL;
+			goto out;
+
 
 		if (0 == strcmp("actions.default_access", row[0]))
 			default_access = atoi(row[1]);
 	}
-	DBfree_result(result);
 
 	*value = default_access;
+	ret = SUCCEED;
+out:
+	DBfree_result(result);
 
-	return SUCCEED;
+	return ret;
 }
 
 static int	DBpatch_5050068(void)
@@ -741,12 +744,58 @@ static int	DBpatch_5050068(void)
 
 static int	DBpatch_5050070(void)
 {
+	const ZBX_FIELD	old_field = {"params", "", NULL, NULL, 0, ZBX_TYPE_SHORTTEXT, ZBX_NOTNULL, 0};
+	const ZBX_FIELD	field = {"params", "", NULL, NULL, 0, ZBX_TYPE_TEXT, ZBX_NOTNULL, 0};
+
+	return DBmodify_field_type("item_preproc", &field, &old_field);
+}
+
+static int	DBpatch_5050071(void)
+{
+	const ZBX_FIELD	old_field = {"description", "", NULL, NULL, 255, ZBX_TYPE_CHAR, ZBX_NOTNULL, 0};
+	const ZBX_FIELD	field = {"description", "", NULL, NULL, 0, ZBX_TYPE_SHORTTEXT, ZBX_NOTNULL, 0};
+
+	return DBmodify_field_type("triggers", &field, &old_field);
+}
+
+static int	DBpatch_5050072(void)
+{
+	const ZBX_FIELD	old_field = {"message", "", NULL, NULL, 0, ZBX_TYPE_SHORTTEXT, ZBX_NOTNULL, 0};
+	const ZBX_FIELD	field = {"message", "", NULL, NULL, 0, ZBX_TYPE_TEXT, ZBX_NOTNULL, 0};
+
+	return DBmodify_field_type("media_type_message", &field, &old_field);
+}
+
+static int	DBpatch_5050073(void)
+{
+	if (0 == (program_type & ZBX_PROGRAM_TYPE_SERVER))
+		return SUCCEED;
+
+	if (ZBX_DB_OK > DBexecute("delete from profiles where idx like 'web.overview.%%'"))
+		return FAIL;
+
+	return SUCCEED;
+}
+
+static int	DBpatch_5050074(void)
+{
+	if (0 == (program_type & ZBX_PROGRAM_TYPE_SERVER))
+		return SUCCEED;
+
+	if (ZBX_DB_OK > DBexecute("delete from role_rule where name='ui.monitoring.overview'"))
+		return FAIL;
+
+	return SUCCEED;
+}
+
+static int	DBpatch_5050075(void)
+{
 	const ZBX_FIELD	field = {"ha_failover_delay", "1m", NULL, NULL, 32, ZBX_TYPE_CHAR, ZBX_NOTNULL, 0};
 
 	return DBadd_field("config", &field);
 }
 
-static int	DBpatch_5050071(void)
+static int	DBpatch_5050076(void)
 {
 	const ZBX_TABLE	table =
 			{"ha_node", "ha_nodeid", 0,
@@ -766,22 +815,22 @@ static int	DBpatch_5050071(void)
 	return DBcreate_table(&table);
 }
 
-static int	DBpatch_5050072(void)
+static int	DBpatch_5050077(void)
 {
 	return DBcreate_index("ha_node", "ha_node_1", "name", 1);
 }
 
-static int	DBpatch_5050073(void)
+static int	DBpatch_5050078(void)
 {
 	return DBcreate_index("ha_node", "ha_node_2", "status,lastaccess", 0);
 }
 
-static int	DBpatch_5050074(void)
+static int	DBpatch_5050079(void)
 {
 	return DBdrop_table("auditlog");
 }
 
-static int	DBpatch_5050075(void)
+static int	DBpatch_5050080(void)
 {
 	const ZBX_TABLE table =
 		{"auditlog", "auditid", 0,
@@ -806,22 +855,21 @@ static int	DBpatch_5050075(void)
 	return DBcreate_table(&table);
 }
 
-static int	DBpatch_5050076(void)
+static int	DBpatch_5050081(void)
 {
 	return DBcreate_index("auditlog", "auditlog_1", "userid,clock", 0);
 }
 
-static int	DBpatch_5050077(void)
+static int	DBpatch_5050082(void)
 {
 	return DBcreate_index("auditlog", "auditlog_2", "clock", 0);
 }
 
-static int	DBpatch_5050078(void)
+static int	DBpatch_5050083(void)
 {
 	return DBcreate_index("auditlog", "auditlog_3", "resourcetype,resourceid", 0);
 }
 
-
 #endif
 
 DBPATCH_START(5050)
@@ -895,5 +943,10 @@ DBPATCH_ADD(5050075, 0, 1)
 DBPATCH_ADD(5050076, 0, 1)
 DBPATCH_ADD(5050077, 0, 1)
 DBPATCH_ADD(5050078, 0, 1)
+DBPATCH_ADD(5050079, 0, 1)
+DBPATCH_ADD(5050080, 0, 1)
+DBPATCH_ADD(5050081, 0, 1)
+DBPATCH_ADD(5050082, 0, 1)
+DBPATCH_ADD(5050083, 0, 1)
 
 DBPATCH_END()
diff --git a/src/libs/zbxembed/duk_config.h b/src/libs/zbxembed/duk_config.h
index 6910ba8f84f..4b4057b2b58 100644
--- a/src/libs/zbxembed/duk_config.h
+++ b/src/libs/zbxembed/duk_config.h
@@ -1,9 +1,9 @@
 /*
  *  duk_config.h configuration header generated by genconfig.py.
  *
- *  Git commit: d4f2cff1c592d70f58bab8e1bd85705174c02a58
- *  Git describe: v2.4.0
- *  Git branch: master
+ *  Git commit: fffa346eff06a8764b02c31d4336f63a773a95c3
+ *  Git describe: v2.6.0
+ *  Git branch: HEAD
  *
  *  Supported platforms:
  *      - Mac OSX, iPhone, Darwin
@@ -40,6 +40,8 @@
  *      - PowerPC 64-bit
  *      - SPARC 32-bit
  *      - SPARC 64-bit
+ *      - RISC-V 32-bit
+ *      - RISC-V 64-bit
  *      - SuperH
  *      - Motorola 68k
  *      - Emscripten
@@ -285,6 +287,22 @@
 #endif
 #endif
 
+/* RISC-V, https://github.com/riscv/riscv-toolchain-conventions#cc-preprocessor-definitions */
+#if defined(__riscv)
+#define DUK_F_RISCV
+#if defined(__riscv_xlen)
+#if (__riscv_xlen == 32)
+#define DUK_F_RISCV32
+#elif (__riscv_xlen == 64)
+#define DUK_F_RISCV64
+#else
+#error __riscv_xlen has unsupported value (not 32 or 64)
+#endif
+#else
+#error __riscv defined without __riscv_xlen
+#endif
+#endif  /* __riscv */
+
 /* SuperH */
 #if defined(__sh__) || \
     defined(__sh1__) || defined(__SH1__) || \
@@ -330,7 +348,7 @@
 #endif
 
 /* MinGW.  Also GCC flags (DUK_F_GCC) are enabled now. */
-#if defined(__MINGW32__)
+#if defined(__MINGW32__) || defined(__MINGW64__)
 #define DUK_F_MINGW
 #endif
 
@@ -747,8 +765,11 @@
 #if defined(DUK_F_OLD_SOLARIS)
 /* Old Solaris with no endian.h, stdint.h */
 #define DUK_F_NO_STDINT_H
+#if !defined(DUK_USE_BYTEORDER)
+#define DUK_USE_BYTEORDER 3
+#endif
 #else  /* DUK_F_OLD_SOLARIS */
-#include <ast/endian.h>
+#include <sys/param.h>
 #endif  /* DUK_F_OLD_SOLARIS */
 
 #include <sys/param.h>
@@ -935,13 +956,15 @@
 #elif defined(DUK_F_PPC32)
 /* --- PowerPC 32-bit --- */
 #define DUK_USE_ARCH_STRING "ppc32"
-/* Byte order varies, so rely on autodetect. */
+#if !defined(DUK_USE_BYTEORDER)
+#define DUK_USE_BYTEORDER 3
+#endif
 #define DUK_USE_PACKED_TVAL
 #define DUK_F_PACKED_TVAL_PROVIDED
 #elif defined(DUK_F_PPC64)
 /* --- PowerPC 64-bit --- */
 #define DUK_USE_ARCH_STRING "ppc64"
-/* Byte order varies, so rely on autodetect. */
+/* No forced byteorder (both little and big endian are possible). */
 #undef DUK_USE_PACKED_TVAL
 #define DUK_F_PACKED_TVAL_PROVIDED
 #elif defined(DUK_F_SPARC32)
@@ -956,6 +979,18 @@
 /* SPARC byte order varies so rely on autodetection. */
 #undef DUK_USE_PACKED_TVAL
 #define DUK_F_PACKED_TVAL_PROVIDED
+#elif defined(DUK_F_RISCV32)
+/* --- RISC-V 32-bit --- */
+#define DUK_USE_ARCH_STRING "riscv32"
+#define DUK_USE_BYTEORDER 1
+#define DUK_USE_PACKED_TVAL
+#define DUK_F_PACKED_TVAL_PROVIDED
+#elif defined(DUK_F_RISCV64)
+/* --- RISC-V 64-bit --- */
+#define DUK_USE_ARCH_STRING "riscv64"
+#define DUK_USE_BYTEORDER 1
+#undef DUK_USE_PACKED_TVAL
+#define DUK_F_PACKED_TVAL_PROVIDED
 #elif defined(DUK_F_SUPERH)
 /* --- SuperH --- */
 #define DUK_USE_ARCH_STRING "sh"
@@ -1096,7 +1131,7 @@
 #define DUK_USE_FLEX_ZEROSIZE
 #endif
 
-#undef DUK_USE_GCC_PRAGMAS
+#define DUK_USE_CLANG_PRAGMAS
 #define DUK_USE_PACK_CLANG_ATTR
 
 #if defined(__clang__) && defined(__has_builtin)
@@ -1236,6 +1271,7 @@
 #define DUK_USE_FLEX_ZEROSIZE
 #endif
 
+/* Since 4.6 one can '#pragma GCC diagnostic push/pop'. */
 #if defined(DUK_F_GCC_VERSION) && (DUK_F_GCC_VERSION >= 40600)
 #define DUK_USE_GCC_PRAGMAS
 #else
@@ -2290,10 +2326,6 @@ typedef struct duk_hthread duk_context;
 #elif defined(DUK_F_AIX)
 /* Older versions may be missing isnan(), etc. */
 #define DUK_F_USE_REPL_ALL
-#elif defined(DUK_F_OLD_SOLARIS)
-/* Solaris 11.3 seem to be missing fsnotify, isnan etc and also ast/endian.h header.        */
-/* Forcing DUK_F_OLD_SOLARIS fixes include, so bind the replacements to this define as well */
-#define DUK_F_USE_REPL_ALL
 #endif
 
 #if defined(DUK_F_USE_REPL_ALL)
@@ -2645,12 +2677,15 @@ typedef struct duk_hthread duk_context;
 #define DUK_WO_NORETURN(stmt) do { stmt } while (0)
 #endif
 
-#if !defined(DUK_UNREACHABLE)
+#if defined(DUK_UNREACHABLE)
+#define DUK_WO_UNREACHABLE(stmt) do { } while (0)
+#else
 /* Don't know how to declare unreachable point, so don't do it; this
  * may cause some spurious compilation warnings (e.g. "variable used
  * uninitialized").
  */
 #define DUK_UNREACHABLE()  do { } while (0)
+#define DUK_WO_UNREACHABLE(stmt) do { stmt } while (0)
 #endif
 
 #if !defined(DUK_LOSE_CONST)
@@ -2859,6 +2894,12 @@ typedef struct duk_hthread duk_context;
 #endif
 
 /*
+ *  Forced options
+ */
+
+#undef DUK_USE_JSON_STRINGIFY_FASTPATH
+
+/*
  *  Autogenerated defaults
  */
 
@@ -2879,6 +2920,10 @@ typedef struct duk_hthread duk_context;
 #define DUK_USE_CACHE_ACTIVATION
 #define DUK_USE_CACHE_CATCHER
 #define DUK_USE_CALLSTACK_LIMIT 10000
+#define DUK_USE_CBOR_BUILTIN
+#define DUK_USE_CBOR_DEC_RECLIMIT 1000
+#define DUK_USE_CBOR_ENC_RECLIMIT 1000
+#define DUK_USE_CBOR_SUPPORT
 #define DUK_USE_COMPILER_RECLIMIT 2500
 #define DUK_USE_COROUTINE_SUPPORT
 #undef DUK_USE_CPP_EXCEPTIONS
@@ -2942,7 +2987,7 @@ typedef struct duk_hthread duk_context;
 #undef DUK_USE_GC_TORTURE
 #undef DUK_USE_GET_MONOTONIC_TIME
 #undef DUK_USE_GET_RANDOM_DOUBLE
-#undef DUK_USE_GLOBAL_BINDING
+#define DUK_USE_GLOBAL_BINDING
 #define DUK_USE_GLOBAL_BUILTIN
 #undef DUK_USE_HEAPPTR16
 #undef DUK_USE_HEAPPTR_DEC16
@@ -2950,6 +2995,7 @@ typedef struct duk_hthread duk_context;
 #define DUK_USE_HEX_FASTPATH
 #define DUK_USE_HEX_SUPPORT
 #define DUK_USE_HOBJECT_ARRAY_ABANDON_LIMIT 2
+#define DUK_USE_HOBJECT_ARRAY_ABANDON_MINSIZE 257
 #define DUK_USE_HOBJECT_ARRAY_FAST_RESIZE_LIMIT 9
 #define DUK_USE_HOBJECT_ARRAY_MINGROW_ADD 16
 #define DUK_USE_HOBJECT_ARRAY_MINGROW_DIVISOR 8
@@ -2974,7 +3020,6 @@ typedef struct duk_hthread duk_context;
 #define DUK_USE_JSON_EATWHITE_FASTPATH
 #define DUK_USE_JSON_ENC_RECLIMIT 1000
 #define DUK_USE_JSON_QUOTESTRING_FASTPATH
-#undef DUK_USE_JSON_STRINGIFY_FASTPATH
 #define DUK_USE_JSON_SUPPORT
 #define DUK_USE_JX
 #define DUK_USE_LEXER_SLIDING_WINDOW
@@ -3141,587 +3186,6 @@ int	zbx_es_check_timeout(void *);
 #endif  /* DUK_COMPILING_DUKTAPE */
 
 /*
- *  Checks for legacy feature options (DUK_OPT_xxx)
- */
-
-#if defined(DUK_OPT_ASSERTIONS)
-#error unsupported legacy feature option DUK_OPT_ASSERTIONS used
-#endif
-#if defined(DUK_OPT_BUFFEROBJECT_SUPPORT)
-#error unsupported legacy feature option DUK_OPT_BUFFEROBJECT_SUPPORT used
-#endif
-#if defined(DUK_OPT_BUFLEN16)
-#error unsupported legacy feature option DUK_OPT_BUFLEN16 used
-#endif
-#if defined(DUK_OPT_DATAPTR16)
-#error unsupported legacy feature option DUK_OPT_DATAPTR16 used
-#endif
-#if defined(DUK_OPT_DATAPTR_DEC16)
-#error unsupported legacy feature option DUK_OPT_DATAPTR_DEC16 used
-#endif
-#if defined(DUK_OPT_DATAPTR_ENC16)
-#error unsupported legacy feature option DUK_OPT_DATAPTR_ENC16 used
-#endif
-#if defined(DUK_OPT_DDDPRINT)
-#error unsupported legacy feature option DUK_OPT_DDDPRINT used
-#endif
-#if defined(DUK_OPT_DDPRINT)
-#error unsupported legacy feature option DUK_OPT_DDPRINT used
-#endif
-#if defined(DUK_OPT_DEBUG)
-#error unsupported legacy feature option DUK_OPT_DEBUG used
-#endif
-#if defined(DUK_OPT_DEBUGGER_DUMPHEAP)
-#error unsupported legacy feature option DUK_OPT_DEBUGGER_DUMPHEAP used
-#endif
-#if defined(DUK_OPT_DEBUGGER_FWD_LOGGING)
-#error unsupported legacy feature option DUK_OPT_DEBUGGER_FWD_LOGGING used
-#endif
-#if defined(DUK_OPT_DEBUGGER_FWD_PRINTALERT)
-#error unsupported legacy feature option DUK_OPT_DEBUGGER_FWD_PRINTALERT used
-#endif
-#if defined(DUK_OPT_DEBUGGER_SUPPORT)
-#error unsupported legacy feature option DUK_OPT_DEBUGGER_SUPPORT used
-#endif
-#if defined(DUK_OPT_DEBUGGER_TRANSPORT_TORTURE)
-#error unsupported legacy feature option DUK_OPT_DEBUGGER_TRANSPORT_TORTURE used
-#endif
-#if defined(DUK_OPT_DEBUG_BUFSIZE)
-#error unsupported legacy feature option DUK_OPT_DEBUG_BUFSIZE used
-#endif
-#if defined(DUK_OPT_DECLARE)
-#error unsupported legacy feature option DUK_OPT_DECLARE used
-#endif
-#if defined(DUK_OPT_DEEP_C_STACK)
-#error unsupported legacy feature option DUK_OPT_DEEP_C_STACK used
-#endif
-#if defined(DUK_OPT_DLL_BUILD)
-#error unsupported legacy feature option DUK_OPT_DLL_BUILD used
-#endif
-#if defined(DUK_OPT_DPRINT)
-#error unsupported legacy feature option DUK_OPT_DPRINT used
-#endif
-#if defined(DUK_OPT_DPRINT_COLORS)
-#error unsupported legacy feature option DUK_OPT_DPRINT_COLORS used
-#endif
-#if defined(DUK_OPT_DPRINT_RDTSC)
-#error unsupported legacy feature option DUK_OPT_DPRINT_RDTSC used
-#endif
-#if defined(DUK_OPT_EXEC_TIMEOUT_CHECK)
-#error unsupported legacy feature option DUK_OPT_EXEC_TIMEOUT_CHECK used
-#endif
-#if defined(DUK_OPT_EXTERNAL_STRINGS)
-#error unsupported legacy feature option DUK_OPT_EXTERNAL_STRINGS used
-#endif
-#if defined(DUK_OPT_EXTSTR_FREE)
-#error unsupported legacy feature option DUK_OPT_EXTSTR_FREE used
-#endif
-#if defined(DUK_OPT_EXTSTR_INTERN_CHECK)
-#error unsupported legacy feature option DUK_OPT_EXTSTR_INTERN_CHECK used
-#endif
-#if defined(DUK_OPT_FASTINT)
-#error unsupported legacy feature option DUK_OPT_FASTINT used
-#endif
-#if defined(DUK_OPT_FORCE_ALIGN)
-#error unsupported legacy feature option DUK_OPT_FORCE_ALIGN used
-#endif
-#if defined(DUK_OPT_FORCE_BYTEORDER)
-#error unsupported legacy feature option DUK_OPT_FORCE_BYTEORDER used
-#endif
-#if defined(DUK_OPT_FUNCPTR16)
-#error unsupported legacy feature option DUK_OPT_FUNCPTR16 used
-#endif
-#if defined(DUK_OPT_FUNCPTR_DEC16)
-#error unsupported legacy feature option DUK_OPT_FUNCPTR_DEC16 used
-#endif
-#if defined(DUK_OPT_FUNCPTR_ENC16)
-#error unsupported legacy feature option DUK_OPT_FUNCPTR_ENC16 used
-#endif
-#if defined(DUK_OPT_FUNC_NONSTD_CALLER_PROPERTY)
-#error unsupported legacy feature option DUK_OPT_FUNC_NONSTD_CALLER_PROPERTY used
-#endif
-#if defined(DUK_OPT_FUNC_NONSTD_SOURCE_PROPERTY)
-#error unsupported legacy feature option DUK_OPT_FUNC_NONSTD_SOURCE_PROPERTY used
-#endif
-#if defined(DUK_OPT_GC_TORTURE)
-#error unsupported legacy feature option DUK_OPT_GC_TORTURE used
-#endif
-#if defined(DUK_OPT_HAVE_CUSTOM_H)
-#error unsupported legacy feature option DUK_OPT_HAVE_CUSTOM_H used
-#endif
-#if defined(DUK_OPT_HEAPPTR16)
-#error unsupported legacy feature option DUK_OPT_HEAPPTR16 used
-#endif
-#if defined(DUK_OPT_HEAPPTR_DEC16)
-#error unsupported legacy feature option DUK_OPT_HEAPPTR_DEC16 used
-#endif
-#if defined(DUK_OPT_HEAPPTR_ENC16)
-#error unsupported legacy feature option DUK_OPT_HEAPPTR_ENC16 used
-#endif
-#if defined(DUK_OPT_INTERRUPT_COUNTER)
-#error unsupported legacy feature option DUK_OPT_INTERRUPT_COUNTER used
-#endif
-#if defined(DUK_OPT_JSON_STRINGIFY_FASTPATH)
-#error unsupported legacy feature option DUK_OPT_JSON_STRINGIFY_FASTPATH used
-#endif
-#if defined(DUK_OPT_LIGHTFUNC_BUILTINS)
-#error unsupported legacy feature option DUK_OPT_LIGHTFUNC_BUILTINS used
-#endif
-#if defined(DUK_OPT_NONSTD_FUNC_CALLER_PROPERTY)
-#error unsupported legacy feature option DUK_OPT_NONSTD_FUNC_CALLER_PROPERTY used
-#endif
-#if defined(DUK_OPT_NONSTD_FUNC_SOURCE_PROPERTY)
-#error unsupported legacy feature option DUK_OPT_NONSTD_FUNC_SOURCE_PROPERTY used
-#endif
-#if defined(DUK_OPT_NO_ARRAY_SPLICE_NONSTD_DELCOUNT)
-#error unsupported legacy feature option DUK_OPT_NO_ARRAY_SPLICE_NONSTD_DELCOUNT used
-#endif
-#if defined(DUK_OPT_NO_AUGMENT_ERRORS)
-#error unsupported legacy feature option DUK_OPT_NO_AUGMENT_ERRORS used
-#endif
-#if defined(DUK_OPT_NO_BROWSER_LIKE)
-#error unsupported legacy feature option DUK_OPT_NO_BROWSER_LIKE used
-#endif
-#if defined(DUK_OPT_NO_BUFFEROBJECT_SUPPORT)
-#error unsupported legacy feature option DUK_OPT_NO_BUFFEROBJECT_SUPPORT used
-#endif
-#if defined(DUK_OPT_NO_BYTECODE_DUMP_SUPPORT)
-#error unsupported legacy feature option DUK_OPT_NO_BYTECODE_DUMP_SUPPORT used
-#endif
-#if defined(DUK_OPT_NO_COMMONJS_MODULES)
-#error unsupported legacy feature option DUK_OPT_NO_COMMONJS_MODULES used
-#endif
-#if defined(DUK_OPT_NO_ES6_OBJECT_PROTO_PROPERTY)
-#error unsupported legacy feature option DUK_OPT_NO_ES6_OBJECT_PROTO_PROPERTY used
-#endif
-#if defined(DUK_OPT_NO_ES6_OBJECT_SETPROTOTYPEOF)
-#error unsupported legacy feature option DUK_OPT_NO_ES6_OBJECT_SETPROTOTYPEOF used
-#endif
-#if defined(DUK_OPT_NO_ES6_PROXY)
-#error unsupported legacy feature option DUK_OPT_NO_ES6_PROXY used
-#endif
-#if defined(DUK_OPT_NO_FILE_IO)
-#error unsupported legacy feature option DUK_OPT_NO_FILE_IO used
-#endif
-#if defined(DUK_OPT_NO_FUNC_STMT)
-#error unsupported legacy feature option DUK_OPT_NO_FUNC_STMT used
-#endif
-#if defined(DUK_OPT_NO_JC)
-#error unsupported legacy feature option DUK_OPT_NO_JC used
-#endif
-#if defined(DUK_OPT_NO_JSONC)
-#error unsupported legacy feature option DUK_OPT_NO_JSONC used
-#endif
-#if defined(DUK_OPT_NO_JSONX)
-#error unsupported legacy feature option DUK_OPT_NO_JSONX used
-#endif
-#if defined(DUK_OPT_NO_JX)
-#error unsupported legacy feature option DUK_OPT_NO_JX used
-#endif
-#if defined(DUK_OPT_NO_MARK_AND_SWEEP)
-#error unsupported legacy feature option DUK_OPT_NO_MARK_AND_SWEEP used
-#endif
-#if defined(DUK_OPT_NO_MS_STRINGTABLE_RESIZE)
-#error unsupported legacy feature option DUK_OPT_NO_MS_STRINGTABLE_RESIZE used
-#endif
-#if defined(DUK_OPT_NO_NONSTD_ACCESSOR_KEY_ARGUMENT)
-#error unsupported legacy feature option DUK_OPT_NO_NONSTD_ACCESSOR_KEY_ARGUMENT used
-#endif
-#if defined(DUK_OPT_NO_NONSTD_ARRAY_CONCAT_TRAILER)
-#error unsupported legacy feature option DUK_OPT_NO_NONSTD_ARRAY_CONCAT_TRAILER used
-#endif
-#if defined(DUK_OPT_NO_NONSTD_ARRAY_MAP_TRAILER)
-#error unsupported legacy feature option DUK_OPT_NO_NONSTD_ARRAY_MAP_TRAILER used
-#endif
-#if defined(DUK_OPT_NO_NONSTD_ARRAY_SPLICE_DELCOUNT)
-#error unsupported legacy feature option DUK_OPT_NO_NONSTD_ARRAY_SPLICE_DELCOUNT used
-#endif
-#if defined(DUK_OPT_NO_NONSTD_FUNC_STMT)
-#error unsupported legacy feature option DUK_OPT_NO_NONSTD_FUNC_STMT used
-#endif
-#if defined(DUK_OPT_NO_NONSTD_JSON_ESC_U2028_U2029)
-#error unsupported legacy feature option DUK_OPT_NO_NONSTD_JSON_ESC_U2028_U2029 used
-#endif
-#if defined(DUK_OPT_NO_NONSTD_STRING_FROMCHARCODE_32BIT)
-#error unsupported legacy feature option DUK_OPT_NO_NONSTD_STRING_FROMCHARCODE_32BIT used
-#endif
-#if defined(DUK_OPT_NO_OBJECT_ES6_PROTO_PROPERTY)
-#error unsupported legacy feature option DUK_OPT_NO_OBJECT_ES6_PROTO_PROPERTY used
-#endif
-#if defined(DUK_OPT_NO_OBJECT_ES6_SETPROTOTYPEOF)
-#error unsupported legacy feature option DUK_OPT_NO_OBJECT_ES6_SETPROTOTYPEOF used
-#endif
-#if defined(DUK_OPT_NO_OCTAL_SUPPORT)
-#error unsupported legacy feature option DUK_OPT_NO_OCTAL_SUPPORT used
-#endif
-#if defined(DUK_OPT_NO_PACKED_TVAL)
-#error unsupported legacy feature option DUK_OPT_NO_PACKED_TVAL used
-#endif
-#if defined(DUK_OPT_NO_PC2LINE)
-#error unsupported legacy feature option DUK_OPT_NO_PC2LINE used
-#endif
-#if defined(DUK_OPT_NO_REFERENCE_COUNTING)
-#error unsupported legacy feature option DUK_OPT_NO_REFERENCE_COUNTING used
-#endif
-#if defined(DUK_OPT_NO_REGEXP_SUPPORT)
-#error unsupported legacy feature option DUK_OPT_NO_REGEXP_SUPPORT used
-#endif
-#if defined(DUK_OPT_NO_SECTION_B)
-#error unsupported legacy feature option DUK_OPT_NO_SECTION_B used
-#endif
-#if defined(DUK_OPT_NO_SOURCE_NONBMP)
-#error unsupported legacy feature option DUK_OPT_NO_SOURCE_NONBMP used
-#endif
-#if defined(DUK_OPT_NO_STRICT_DECL)
-#error unsupported legacy feature option DUK_OPT_NO_STRICT_DECL used
-#endif
-#if defined(DUK_OPT_NO_TRACEBACKS)
-#error unsupported legacy feature option DUK_OPT_NO_TRACEBACKS used
-#endif
-#if defined(DUK_OPT_NO_VERBOSE_ERRORS)
-#error unsupported legacy feature option DUK_OPT_NO_VERBOSE_ERRORS used
-#endif
-#if defined(DUK_OPT_NO_VOLUNTARY_GC)
-#error unsupported legacy feature option DUK_OPT_NO_VOLUNTARY_GC used
-#endif
-#if defined(DUK_OPT_NO_ZERO_BUFFER_DATA)
-#error unsupported legacy feature option DUK_OPT_NO_ZERO_BUFFER_DATA used
-#endif
-#if defined(DUK_OPT_OBJSIZES16)
-#error unsupported legacy feature option DUK_OPT_OBJSIZES16 used
-#endif
-#if defined(DUK_OPT_PANIC_HANDLER)
-#error unsupported legacy feature option DUK_OPT_PANIC_HANDLER used
-#endif
-#if defined(DUK_OPT_REFCOUNT16)
-#error unsupported legacy feature option DUK_OPT_REFCOUNT16 used
-#endif
-#if defined(DUK_OPT_SEGFAULT_ON_PANIC)
-#error unsupported legacy feature option DUK_OPT_SEGFAULT_ON_PANIC used
-#endif
-#if defined(DUK_OPT_SELF_TESTS)
-#error unsupported legacy feature option DUK_OPT_SELF_TESTS used
-#endif
-#if defined(DUK_OPT_SETJMP)
-#error unsupported legacy feature option DUK_OPT_SETJMP used
-#endif
-#if defined(DUK_OPT_SHUFFLE_TORTURE)
-#error unsupported legacy feature option DUK_OPT_SHUFFLE_TORTURE used
-#endif
-#if defined(DUK_OPT_SIGSETJMP)
-#error unsupported legacy feature option DUK_OPT_SIGSETJMP used
-#endif
-#if defined(DUK_OPT_STRHASH16)
-#error unsupported legacy feature option DUK_OPT_STRHASH16 used
-#endif
-#if defined(DUK_OPT_STRICT_UTF8_SOURCE)
-#error unsupported legacy feature option DUK_OPT_STRICT_UTF8_SOURCE used
-#endif
-#if defined(DUK_OPT_STRLEN16)
-#error unsupported legacy feature option DUK_OPT_STRLEN16 used
-#endif
-#if defined(DUK_OPT_STRTAB_CHAIN)
-#error unsupported legacy feature option DUK_OPT_STRTAB_CHAIN used
-#endif
-#if defined(DUK_OPT_STRTAB_CHAIN_SIZE)
-#error unsupported legacy feature option DUK_OPT_STRTAB_CHAIN_SIZE used
-#endif
-#if defined(DUK_OPT_TARGET_INFO)
-#error unsupported legacy feature option DUK_OPT_TARGET_INFO used
-#endif
-#if defined(DUK_OPT_TRACEBACK_DEPTH)
-#error unsupported legacy feature option DUK_OPT_TRACEBACK_DEPTH used
-#endif
-#if defined(DUK_OPT_UNDERSCORE_SETJMP)
-#error unsupported legacy feature option DUK_OPT_UNDERSCORE_SETJMP used
-#endif
-#if defined(DUK_OPT_USER_INITJS)
-#error unsupported legacy feature option DUK_OPT_USER_INITJS used
-#endif
-
-/*
- *  Checks for config option consistency (DUK_USE_xxx)
- */
-
-#if defined(DUK_USE_32BIT_PTRS)
-#error unsupported config option used (option has been removed): DUK_USE_32BIT_PTRS
-#endif
-#if defined(DUK_USE_ALIGN_4)
-#error unsupported config option used (option has been removed): DUK_USE_ALIGN_4
-#endif
-#if defined(DUK_USE_ALIGN_8)
-#error unsupported config option used (option has been removed): DUK_USE_ALIGN_8
-#endif
-#if defined(DUK_USE_BROWSER_LIKE)
-#error unsupported config option used (option has been removed): DUK_USE_BROWSER_LIKE
-#endif
-#if defined(DUK_USE_BUILTIN_INITJS)
-#error unsupported config option used (option has been removed): DUK_USE_BUILTIN_INITJS
-#endif
-#if defined(DUK_USE_BYTEORDER_FORCED)
-#error unsupported config option used (option has been removed): DUK_USE_BYTEORDER_FORCED
-#endif
-#if defined(DUK_USE_COMMONJS_MODULES)
-#error unsupported config option used (option has been removed): DUK_USE_COMMONJS_MODULES
-#endif
-#if defined(DUK_USE_DATAPTR_DEC16) && !defined(DUK_USE_DATAPTR16)
-#error config option DUK_USE_DATAPTR_DEC16 requires option DUK_USE_DATAPTR16 (which is missing)
-#endif
-#if defined(DUK_USE_DATAPTR_ENC16) && !defined(DUK_USE_DATAPTR16)
-#error config option DUK_USE_DATAPTR_ENC16 requires option DUK_USE_DATAPTR16 (which is missing)
-#endif
-#if defined(DUK_USE_DDDPRINT)
-#error unsupported config option used (option has been removed): DUK_USE_DDDPRINT
-#endif
-#if defined(DUK_USE_DDPRINT)
-#error unsupported config option used (option has been removed): DUK_USE_DDPRINT
-#endif
-#if defined(DUK_USE_DEBUGGER_FWD_LOGGING)
-#error unsupported config option used (option has been removed): DUK_USE_DEBUGGER_FWD_LOGGING
-#endif
-#if defined(DUK_USE_DEBUGGER_FWD_PRINTALERT)
-#error unsupported config option used (option has been removed): DUK_USE_DEBUGGER_FWD_PRINTALERT
-#endif
-#if defined(DUK_USE_DEBUGGER_SUPPORT) && !defined(DUK_USE_INTERRUPT_COUNTER)
-#error config option DUK_USE_DEBUGGER_SUPPORT requires option DUK_USE_INTERRUPT_COUNTER (which is missing)
-#endif
-#if defined(DUK_USE_DEEP_C_STACK)
-#error unsupported config option used (option has been removed): DUK_USE_DEEP_C_STACK
-#endif
-#if defined(DUK_USE_DOUBLE_BE)
-#error unsupported config option used (option has been removed): DUK_USE_DOUBLE_BE
-#endif
-#if defined(DUK_USE_DOUBLE_BE) && defined(DUK_USE_DOUBLE_LE)
-#error config option DUK_USE_DOUBLE_BE conflicts with option DUK_USE_DOUBLE_LE (which is also defined)
-#endif
-#if defined(DUK_USE_DOUBLE_BE) && defined(DUK_USE_DOUBLE_ME)
-#error config option DUK_USE_DOUBLE_BE conflicts with option DUK_USE_DOUBLE_ME (which is also defined)
-#endif
-#if defined(DUK_USE_DOUBLE_LE)
-#error unsupported config option used (option has been removed): DUK_USE_DOUBLE_LE
-#endif
-#if defined(DUK_USE_DOUBLE_LE) && defined(DUK_USE_DOUBLE_BE)
-#error config option DUK_USE_DOUBLE_LE conflicts with option DUK_USE_DOUBLE_BE (which is also defined)
-#endif
-#if defined(DUK_USE_DOUBLE_LE) && defined(DUK_USE_DOUBLE_ME)
-#error config option DUK_USE_DOUBLE_LE conflicts with option DUK_USE_DOUBLE_ME (which is also defined)
-#endif
-#if defined(DUK_USE_DOUBLE_ME)
-#error unsupported config option used (option has been removed): DUK_USE_DOUBLE_ME
-#endif
-#if defined(DUK_USE_DOUBLE_ME) && defined(DUK_USE_DOUBLE_LE)
-#error config option DUK_USE_DOUBLE_ME conflicts with option DUK_USE_DOUBLE_LE (which is also defined)
-#endif
-#if defined(DUK_USE_DOUBLE_ME) && defined(DUK_USE_DOUBLE_BE)
-#error config option DUK_USE_DOUBLE_ME conflicts with option DUK_USE_DOUBLE_BE (which is also defined)
-#endif
-#if defined(DUK_USE_DPRINT)
-#error unsupported config option used (option has been removed): DUK_USE_DPRINT
-#endif
-#if defined(DUK_USE_DPRINT) && !defined(DUK_USE_DEBUG)
-#error config option DUK_USE_DPRINT requires option DUK_USE_DEBUG (which is missing)
-#endif
-#if defined(DUK_USE_DPRINT_COLORS)
-#error unsupported config option used (option has been removed): DUK_USE_DPRINT_COLORS
-#endif
-#if defined(DUK_USE_DPRINT_RDTSC)
-#error unsupported config option used (option has been removed): DUK_USE_DPRINT_RDTSC
-#endif
-#if defined(DUK_USE_ES6_REGEXP_BRACES)
-#error unsupported config option used (option has been removed): DUK_USE_ES6_REGEXP_BRACES
-#endif
-#if defined(DUK_USE_ESBC_MAX_BYTES) && !defined(DUK_USE_ESBC_LIMITS)
-#error config option DUK_USE_ESBC_MAX_BYTES requires option DUK_USE_ESBC_LIMITS (which is missing)
-#endif
-#if defined(DUK_USE_ESBC_MAX_LINENUMBER) && !defined(DUK_USE_ESBC_LIMITS)
-#error config option DUK_USE_ESBC_MAX_LINENUMBER requires option DUK_USE_ESBC_LIMITS (which is missing)
-#endif
-#if defined(DUK_USE_EXEC_TIMEOUT_CHECK) && !defined(DUK_USE_INTERRUPT_COUNTER)
-#error config option DUK_USE_EXEC_TIMEOUT_CHECK requires option DUK_USE_INTERRUPT_COUNTER (which is missing)
-#endif
-#if defined(DUK_USE_EXTSTR_FREE) && !defined(DUK_USE_HSTRING_EXTDATA)
-#error config option DUK_USE_EXTSTR_FREE requires option DUK_USE_HSTRING_EXTDATA (which is missing)
-#endif
-#if defined(DUK_USE_EXTSTR_INTERN_CHECK) && !defined(DUK_USE_HSTRING_EXTDATA)
-#error config option DUK_USE_EXTSTR_INTERN_CHECK requires option DUK_USE_HSTRING_EXTDATA (which is missing)
-#endif
-#if defined(DUK_USE_FASTINT) && !defined(DUK_USE_64BIT_OPS)
-#error config option DUK_USE_FASTINT requires option DUK_USE_64BIT_OPS (which is missing)
-#endif
-#if defined(DUK_USE_FILE_IO)
-#error unsupported config option used (option has been removed): DUK_USE_FILE_IO
-#endif
-#if defined(DUK_USE_FULL_TVAL)
-#error unsupported config option used (option has been removed): DUK_USE_FULL_TVAL
-#endif
-#if defined(DUK_USE_FUNCPTR_DEC16) && !defined(DUK_USE_FUNCPTR16)
-#error config option DUK_USE_FUNCPTR_DEC16 requires option DUK_USE_FUNCPTR16 (which is missing)
-#endif
-#if defined(DUK_USE_FUNCPTR_ENC16) && !defined(DUK_USE_FUNCPTR16)
-#error config option DUK_USE_FUNCPTR_ENC16 requires option DUK_USE_FUNCPTR16 (which is missing)
-#endif
-#if defined(DUK_USE_HASHBYTES_UNALIGNED_U32_ACCESS)
-#error unsupported config option used (option has been removed): DUK_USE_HASHBYTES_UNALIGNED_U32_ACCESS
-#endif
-#if defined(DUK_USE_HEAPPTR16) && defined(DUK_USE_DEBUG)
-#error config option DUK_USE_HEAPPTR16 conflicts with option DUK_USE_DEBUG (which is also defined)
-#endif
-#if defined(DUK_USE_HEAPPTR_DEC16) && !defined(DUK_USE_HEAPPTR16)
-#error config option DUK_USE_HEAPPTR_DEC16 requires option DUK_USE_HEAPPTR16 (which is missing)
-#endif
-#if defined(DUK_USE_HEAPPTR_ENC16) && !defined(DUK_USE_HEAPPTR16)
-#error config option DUK_USE_HEAPPTR_ENC16 requires option DUK_USE_HEAPPTR16 (which is missing)
-#endif
-#if defined(DUK_USE_INTEGER_BE)
-#error unsupported config option used (option has been removed): DUK_USE_INTEGER_BE
-#endif
-#if defined(DUK_USE_INTEGER_BE) && defined(DUK_USE_INTEGER_LE)
-#error config option DUK_USE_INTEGER_BE conflicts with option DUK_USE_INTEGER_LE (which is also defined)
-#endif
-#if defined(DUK_USE_INTEGER_BE) && defined(DUK_USE_INTEGER_ME)
-#error config option DUK_USE_INTEGER_BE conflicts with option DUK_USE_INTEGER_ME (which is also defined)
-#endif
-#if defined(DUK_USE_INTEGER_LE)
-#error unsupported config option used (option has been removed): DUK_USE_INTEGER_LE
-#endif
-#if defined(DUK_USE_INTEGER_LE) && defined(DUK_USE_INTEGER_BE)
-#error config option DUK_USE_INTEGER_LE conflicts with option DUK_USE_INTEGER_BE (which is also defined)
-#endif
-#if defined(DUK_USE_INTEGER_LE) && defined(DUK_USE_INTEGER_ME)
-#error config option DUK_USE_INTEGER_LE conflicts with option DUK_USE_INTEGER_ME (which is also defined)
-#endif
-#if defined(DUK_USE_INTEGER_ME)
-#error unsupported config option used (option has been removed): DUK_USE_INTEGER_ME
-#endif
-#if defined(DUK_USE_INTEGER_ME) && defined(DUK_USE_INTEGER_LE)
-#error config option DUK_USE_INTEGER_ME conflicts with option DUK_USE_INTEGER_LE (which is also defined)
-#endif
-#if defined(DUK_USE_INTEGER_ME) && defined(DUK_USE_INTEGER_BE)
-#error config option DUK_USE_INTEGER_ME conflicts with option DUK_USE_INTEGER_BE (which is also defined)
-#endif
-#if defined(DUK_USE_MARKANDSWEEP_FINALIZER_TORTURE)
-#error unsupported config option used (option has been removed): DUK_USE_MARKANDSWEEP_FINALIZER_TORTURE
-#endif
-#if defined(DUK_USE_MARK_AND_SWEEP)
-#error unsupported config option used (option has been removed): DUK_USE_MARK_AND_SWEEP
-#endif
-#if defined(DUK_USE_MATH_FMAX)
-#error unsupported config option used (option has been removed): DUK_USE_MATH_FMAX
-#endif
-#if defined(DUK_USE_MATH_FMIN)
-#error unsupported config option used (option has been removed): DUK_USE_MATH_FMIN
-#endif
-#if defined(DUK_USE_MATH_ROUND)
-#error unsupported config option used (option has been removed): DUK_USE_MATH_ROUND
-#endif
-#if defined(DUK_USE_MS_STRINGTABLE_RESIZE)
-#error unsupported config option used (option has been removed): DUK_USE_MS_STRINGTABLE_RESIZE
-#endif
-#if defined(DUK_USE_NONSTD_ARRAY_CONCAT_TRAILER)
-#error unsupported config option used (option has been removed): DUK_USE_NONSTD_ARRAY_CONCAT_TRAILER
-#endif
-#if defined(DUK_USE_NONSTD_ARRAY_MAP_TRAILER)
-#error unsupported config option used (option has been removed): DUK_USE_NONSTD_ARRAY_MAP_TRAILER
-#endif
-#if defined(DUK_USE_NONSTD_REGEXP_DOLLAR_ESCAPE)
-#error unsupported config option used (option has been removed): DUK_USE_NONSTD_REGEXP_DOLLAR_ESCAPE
-#endif
-#if defined(DUK_USE_NO_DOUBLE_ALIASING_SELFTEST)
-#error unsupported config option used (option has been removed): DUK_USE_NO_DOUBLE_ALIASING_SELFTEST
-#endif
-#if defined(DUK_USE_OCTAL_SUPPORT)
-#error unsupported config option used (option has been removed): DUK_USE_OCTAL_SUPPORT
-#endif
-#if defined(DUK_USE_PACKED_TVAL_POSSIBLE)
-#error unsupported config option used (option has been removed): DUK_USE_PACKED_TVAL_POSSIBLE
-#endif
-#if defined(DUK_USE_PANIC_ABORT)
-#error unsupported config option used (option has been removed): DUK_USE_PANIC_ABORT
-#endif
-#if defined(DUK_USE_PANIC_EXIT)
-#error unsupported config option used (option has been removed): DUK_USE_PANIC_EXIT
-#endif
-#if defined(DUK_USE_PANIC_HANDLER)
-#error unsupported config option used (option has been removed): DUK_USE_PANIC_HANDLER
-#endif
-#if defined(DUK_USE_PANIC_SEGFAULT)
-#error unsupported config option used (option has been removed): DUK_USE_PANIC_SEGFAULT
-#endif
-#if defined(DUK_USE_POW_NETBSD_WORKAROUND)
-#error unsupported config option used (option has been removed): DUK_USE_POW_NETBSD_WORKAROUND
-#endif
-#if defined(DUK_USE_RDTSC)
-#error unsupported config option used (option has been removed): DUK_USE_RDTSC
-#endif
-#if defined(DUK_USE_REFZERO_FINALIZER_TORTURE)
-#error unsupported config option used (option has been removed): DUK_USE_REFZERO_FINALIZER_TORTURE
-#endif
-#if defined(DUK_USE_ROM_GLOBAL_CLONE) && !defined(DUK_USE_ROM_STRINGS)
-#error config option DUK_USE_ROM_GLOBAL_CLONE requires option DUK_USE_ROM_STRINGS (which is missing)
-#endif
-#if defined(DUK_USE_ROM_GLOBAL_CLONE) && !defined(DUK_USE_ROM_OBJECTS)
-#error config option DUK_USE_ROM_GLOBAL_CLONE requires option DUK_USE_ROM_OBJECTS (which is missing)
-#endif
-#if defined(DUK_USE_ROM_GLOBAL_CLONE) && defined(DUK_USE_ROM_GLOBAL_INHERIT)
-#error config option DUK_USE_ROM_GLOBAL_CLONE conflicts with option DUK_USE_ROM_GLOBAL_INHERIT (which is also defined)
-#endif
-#if defined(DUK_USE_ROM_GLOBAL_INHERIT) && !defined(DUK_USE_ROM_STRINGS)
-#error config option DUK_USE_ROM_GLOBAL_INHERIT requires option DUK_USE_ROM_STRINGS (which is missing)
-#endif
-#if defined(DUK_USE_ROM_GLOBAL_INHERIT) && !defined(DUK_USE_ROM_OBJECTS)
-#error config option DUK_USE_ROM_GLOBAL_INHERIT requires option DUK_USE_ROM_OBJECTS (which is missing)
-#endif
-#if defined(DUK_USE_ROM_GLOBAL_INHERIT) && defined(DUK_USE_ROM_GLOBAL_CLONE)
-#error config option DUK_USE_ROM_GLOBAL_INHERIT conflicts with option DUK_USE_ROM_GLOBAL_CLONE (which is also defined)
-#endif
-#if defined(DUK_USE_ROM_OBJECTS) && !defined(DUK_USE_ROM_STRINGS)
-#error config option DUK_USE_ROM_OBJECTS requires option DUK_USE_ROM_STRINGS (which is missing)
-#endif
-#if defined(DUK_USE_ROM_STRINGS) && !defined(DUK_USE_ROM_OBJECTS)
-#error config option DUK_USE_ROM_STRINGS requires option DUK_USE_ROM_OBJECTS (which is missing)
-#endif
-#if defined(DUK_USE_SETJMP)
-#error unsupported config option used (option has been removed): DUK_USE_SETJMP
-#endif
-#if defined(DUK_USE_SIGSETJMP)
-#error unsupported config option used (option has been removed): DUK_USE_SIGSETJMP
-#endif
-#if defined(DUK_USE_STRTAB_CHAIN)
-#error unsupported config option used (option has been removed): DUK_USE_STRTAB_CHAIN
-#endif
-#if defined(DUK_USE_STRTAB_CHAIN_SIZE)
-#error unsupported config option used (option has been removed): DUK_USE_STRTAB_CHAIN_SIZE
-#endif
-#if defined(DUK_USE_STRTAB_CHAIN_SIZE) && !defined(DUK_USE_STRTAB_CHAIN)
-#error config option DUK_USE_STRTAB_CHAIN_SIZE requires option DUK_USE_STRTAB_CHAIN (which is missing)
-#endif
-#if defined(DUK_USE_STRTAB_PROBE)
-#error unsupported config option used (option has been removed): DUK_USE_STRTAB_PROBE
-#endif
-#if defined(DUK_USE_STRTAB_PTRCOMP) && !defined(DUK_USE_HEAPPTR16)
-#error config option DUK_USE_STRTAB_PTRCOMP requires option DUK_USE_HEAPPTR16 (which is missing)
-#endif
-#if defined(DUK_USE_TAILCALL) && defined(DUK_USE_NONSTD_FUNC_CALLER_PROPERTY)
-#error config option DUK_USE_TAILCALL conflicts with option DUK_USE_NONSTD_FUNC_CALLER_PROPERTY (which is also defined)
-#endif
-#if defined(DUK_USE_UNALIGNED_ACCESSES_POSSIBLE)
-#error unsupported config option used (option has been removed): DUK_USE_UNALIGNED_ACCESSES_POSSIBLE
-#endif
-#if defined(DUK_USE_UNDERSCORE_SETJMP)
-#error unsupported config option used (option has been removed): DUK_USE_UNDERSCORE_SETJMP
-#endif
-#if defined(DUK_USE_USER_DECLARE)
-#error unsupported config option used (option has been removed): DUK_USE_USER_DECLARE
-#endif
-#if defined(DUK_USE_USER_INITJS)
-#error unsupported config option used (option has been removed): DUK_USE_USER_INITJS
-#endif
-
-#if defined(DUK_USE_CPP_EXCEPTIONS) && !defined(__cplusplus)
-#error DUK_USE_CPP_EXCEPTIONS enabled but not compiling with a C++ compiler
-#endif
-
-/*
  *  Convert DUK_USE_BYTEORDER, from whatever source, into currently used
  *  internal defines.  If detection failed, #error out.
  */
diff --git a/src/libs/zbxembed/duktape.c b/src/libs/zbxembed/duktape.c
index 1146dff9ea5..0d9af216a21 100644
--- a/src/libs/zbxembed/duktape.c
+++ b/src/libs/zbxembed/duktape.c
@@ -1,8 +1,8 @@
 /*
- *  Single source autogenerated distributable for Duktape 2.4.0.
+ *  Single source autogenerated distributable for Duktape 2.6.0.
  *
- *  Git commit d4f2cff1c592d70f58bab8e1bd85705174c02a58 (v2.4.0).
- *  Git branch master.
+ *  Git commit fffa346eff06a8764b02c31d4336f63a773a95c3 (v2.6.0).
+ *  Git branch HEAD.
  *
  *  See Duktape AUTHORS.rst and LICENSE.txt for copyright and
  *  licensing information.
@@ -104,6 +104,7 @@
 *  * James Swift (https://github.com/phraemer)
 *  * Luis de Bethencourt (https://github.com/luisbg)
 *  * Ian Whyman (https://github.com/v00d00)
+*  * Rick Sayre (https://github.com/whorfin)
 *
 *  Other contributions
 *  ===================
@@ -225,13 +226,14 @@
  *
  *    A B C D E F G H    Big endian (e.g. 68k)           DUK_USE_DOUBLE_BE
  *    H G F E D C B A    Little endian (e.g. x86)        DUK_USE_DOUBLE_LE
- *    D C B A H G F E    Mixed/cross endian (e.g. ARM)   DUK_USE_DOUBLE_ME
+ *    D C B A H G F E    Mixed endian (e.g. ARM FPA)     DUK_USE_DOUBLE_ME
  *
- *  ARM is a special case: ARM double values are in mixed/cross endian
- *  format while ARM duk_uint64_t values are in standard little endian
+ *  Legacy ARM (FPA) is a special case: ARM double values are in mixed
+ *  endian format while ARM duk_uint64_t values are in standard little endian
  *  format (H G F E D C B A).  When a double is read as a duk_uint64_t
  *  from memory, the register will contain the (logical) value
  *  E F G H A B C D.  This requires some special handling below.
+ *  See http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0056d/Bcfhgcgd.html.
  *
  *  Indexes of various types (8-bit, 16-bit, 32-bit) in memory relative to
  *  the logical (big endian) order:
@@ -520,7 +522,8 @@ typedef union duk_double_union duk_double_union;
 	} while (0)
 
 #define DUK__DBLUNION_NORMALIZE_NAN_CHECK_NOTFULL(u)  do { \
-		if (DUK__DBLUNION_IS_NAN_NOTFULL((u))) { \
+		/* Check must be full. */ \
+		if (DUK__DBLUNION_IS_NAN_FULL((u))) { \
 			DUK__DBLUNION_SET_NAN_NOTFULL((u)); \
 		} \
 	} while (0)
@@ -532,12 +535,11 @@ typedef union duk_double_union duk_double_union;
  */
 
 #if defined(DUK_USE_PACKED_TVAL)
-#if defined(DUK_USE_FULL_TVAL)
 #define DUK_DBLUNION_NORMALIZE_NAN_CHECK(u)  DUK__DBLUNION_NORMALIZE_NAN_CHECK_FULL((u))
 #define DUK_DBLUNION_IS_NAN(u)               DUK__DBLUNION_IS_NAN_FULL((u))
 #define DUK_DBLUNION_IS_NORMALIZED_NAN(u)    DUK__DBLUNION_IS_NORMALIZED_NAN_FULL((u))
 #define DUK_DBLUNION_SET_NAN(d)              DUK__DBLUNION_SET_NAN_FULL((d))
-#else
+#if 0
 #define DUK_DBLUNION_NORMALIZE_NAN_CHECK(u)  DUK__DBLUNION_NORMALIZE_NAN_CHECK_NOTFULL((u))
 #define DUK_DBLUNION_IS_NAN(u)               DUK__DBLUNION_IS_NAN_NOTFULL((u))
 #define DUK_DBLUNION_IS_NORMALIZED_NAN(u)    DUK__DBLUNION_IS_NORMALIZED_NAN_NOTFULL((u))
@@ -620,6 +622,46 @@ typedef union duk_double_union duk_double_union;
 #endif
 
 #endif  /* DUK_DBLUNION_H_INCLUDED */
+/* #include duk_fltunion.h */
+/*
+ *  Union to access IEEE float memory representation.
+ */
+
+#if !defined(DUK_FLTUNION_H_INCLUDED)
+#define DUK_FLTUNION_H_INCLUDED
+
+/* #include duk_internal.h -> already included */
+
+union duk_float_union {
+	float f;
+	duk_uint32_t ui[1];
+	duk_uint16_t us[2];
+	duk_uint8_t uc[4];
+};
+
+typedef union duk_float_union duk_float_union;
+
+#if defined(DUK_USE_DOUBLE_LE) || defined(DUK_USE_DOUBLE_ME)
+#define DUK_FLT_IDX_UI0    0
+#define DUK_FLT_IDX_US0    1
+#define DUK_FLT_IDX_US1    0
+#define DUK_FLT_IDX_UC0    3
+#define DUK_FLT_IDX_UC1    2
+#define DUK_FLT_IDX_UC2    1
+#define DUK_FLT_IDX_UC3    0
+#elif defined(DUK_USE_DOUBLE_BE)
+#define DUK_FLT_IDX_UI0    0
+#define DUK_FLT_IDX_US0    0
+#define DUK_FLT_IDX_US1    1
+#define DUK_FLT_IDX_UC0    0
+#define DUK_FLT_IDX_UC1    1
+#define DUK_FLT_IDX_UC2    2
+#define DUK_FLT_IDX_UC3    3
+#else
+#error internal error
+#endif
+
+#endif  /* DUK_FLTUNION_H_INCLUDED */
 /* #include duk_replacements.h */
 #if !defined(DUK_REPLACEMENTS_H_INCLUDED)
 #define DUK_REPLACEMENTS_H_INCLUDED
@@ -1510,9 +1552,9 @@ DUK_INTERNAL_DECL void duk_tval_assert_valid(duk_tval *tv);
 #define DUK_STRIDX_UC_FUNCTION                                        5                              /* 'Function' */
 #define DUK_HEAP_STRING_UC_FUNCTION(heap)                             DUK_HEAP_GET_STRING((heap),DUK_STRIDX_UC_FUNCTION)
 #define DUK_HTHREAD_STRING_UC_FUNCTION(thr)                           DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_UC_FUNCTION)
-#define DUK_STRIDX_ARRAY                                              6                              /* 'Array' */
-#define DUK_HEAP_STRING_ARRAY(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_ARRAY)
-#define DUK_HTHREAD_STRING_ARRAY(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_ARRAY)
+#define DUK_STRIDX_UC_ARRAY                                           6                              /* 'Array' */
+#define DUK_HEAP_STRING_UC_ARRAY(heap)                                DUK_HEAP_GET_STRING((heap),DUK_STRIDX_UC_ARRAY)
+#define DUK_HTHREAD_STRING_UC_ARRAY(thr)                              DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_UC_ARRAY)
 #define DUK_STRIDX_UC_STRING                                          7                              /* 'String' */
 #define DUK_HEAP_STRING_UC_STRING(heap)                               DUK_HEAP_GET_STRING((heap),DUK_STRIDX_UC_STRING)
 #define DUK_HTHREAD_STRING_UC_STRING(thr)                             DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_UC_STRING)
@@ -1522,9 +1564,9 @@ DUK_INTERNAL_DECL void duk_tval_assert_valid(duk_tval *tv);
 #define DUK_STRIDX_UC_NUMBER                                          9                              /* 'Number' */
 #define DUK_HEAP_STRING_UC_NUMBER(heap)                               DUK_HEAP_GET_STRING((heap),DUK_STRIDX_UC_NUMBER)
 #define DUK_HTHREAD_STRING_UC_NUMBER(thr)                             DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_UC_NUMBER)
-#define DUK_STRIDX_DATE                                               10                             /* 'Date' */
-#define DUK_HEAP_STRING_DATE(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_DATE)
-#define DUK_HTHREAD_STRING_DATE(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_DATE)
+#define DUK_STRIDX_UC_DATE                                            10                             /* 'Date' */
+#define DUK_HEAP_STRING_UC_DATE(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_UC_DATE)
+#define DUK_HTHREAD_STRING_UC_DATE(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_UC_DATE)
 #define DUK_STRIDX_REG_EXP                                            11                             /* 'RegExp' */
 #define DUK_HEAP_STRING_REG_EXP(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_REG_EXP)
 #define DUK_HTHREAD_STRING_REG_EXP(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_REG_EXP)
@@ -1750,260 +1792,263 @@ DUK_INTERNAL_DECL void duk_tval_assert_valid(duk_tval *tv);
 #define DUK_STRIDX_DATA                                               85                             /* 'data' */
 #define DUK_HEAP_STRING_DATA(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_DATA)
 #define DUK_HTHREAD_STRING_DATA(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_DATA)
-#define DUK_STRIDX_LENGTH                                             86                             /* 'length' */
+#define DUK_STRIDX_LC_BUFFER                                          86                             /* 'buffer' */
+#define DUK_HEAP_STRING_LC_BUFFER(heap)                               DUK_HEAP_GET_STRING((heap),DUK_STRIDX_LC_BUFFER)
+#define DUK_HTHREAD_STRING_LC_BUFFER(thr)                             DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_LC_BUFFER)
+#define DUK_STRIDX_LENGTH                                             87                             /* 'length' */
 #define DUK_HEAP_STRING_LENGTH(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_LENGTH)
 #define DUK_HTHREAD_STRING_LENGTH(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_LENGTH)
-#define DUK_STRIDX_SET                                                87                             /* 'set' */
+#define DUK_STRIDX_SET                                                88                             /* 'set' */
 #define DUK_HEAP_STRING_SET(heap)                                     DUK_HEAP_GET_STRING((heap),DUK_STRIDX_SET)
 #define DUK_HTHREAD_STRING_SET(thr)                                   DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_SET)
-#define DUK_STRIDX_STACK                                              88                             /* 'stack' */
+#define DUK_STRIDX_STACK                                              89                             /* 'stack' */
 #define DUK_HEAP_STRING_STACK(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_STACK)
 #define DUK_HTHREAD_STRING_STACK(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_STACK)
-#define DUK_STRIDX_PC                                                 89                             /* 'pc' */
+#define DUK_STRIDX_PC                                                 90                             /* 'pc' */
 #define DUK_HEAP_STRING_PC(heap)                                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_PC)
 #define DUK_HTHREAD_STRING_PC(thr)                                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_PC)
-#define DUK_STRIDX_LINE_NUMBER                                        90                             /* 'lineNumber' */
+#define DUK_STRIDX_LINE_NUMBER                                        91                             /* 'lineNumber' */
 #define DUK_HEAP_STRING_LINE_NUMBER(heap)                             DUK_HEAP_GET_STRING((heap),DUK_STRIDX_LINE_NUMBER)
 #define DUK_HTHREAD_STRING_LINE_NUMBER(thr)                           DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_LINE_NUMBER)
-#define DUK_STRIDX_INT_TRACEDATA                                      91                             /* '\x82Tracedata' */
+#define DUK_STRIDX_INT_TRACEDATA                                      92                             /* '\x82Tracedata' */
 #define DUK_HEAP_STRING_INT_TRACEDATA(heap)                           DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_TRACEDATA)
 #define DUK_HTHREAD_STRING_INT_TRACEDATA(thr)                         DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_TRACEDATA)
-#define DUK_STRIDX_NAME                                               92                             /* 'name' */
+#define DUK_STRIDX_NAME                                               93                             /* 'name' */
 #define DUK_HEAP_STRING_NAME(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_NAME)
 #define DUK_HTHREAD_STRING_NAME(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_NAME)
-#define DUK_STRIDX_FILE_NAME                                          93                             /* 'fileName' */
+#define DUK_STRIDX_FILE_NAME                                          94                             /* 'fileName' */
 #define DUK_HEAP_STRING_FILE_NAME(heap)                               DUK_HEAP_GET_STRING((heap),DUK_STRIDX_FILE_NAME)
 #define DUK_HTHREAD_STRING_FILE_NAME(thr)                             DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_FILE_NAME)
-#define DUK_STRIDX_LC_POINTER                                         94                             /* 'pointer' */
+#define DUK_STRIDX_LC_POINTER                                         95                             /* 'pointer' */
 #define DUK_HEAP_STRING_LC_POINTER(heap)                              DUK_HEAP_GET_STRING((heap),DUK_STRIDX_LC_POINTER)
 #define DUK_HTHREAD_STRING_LC_POINTER(thr)                            DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_LC_POINTER)
-#define DUK_STRIDX_INT_TARGET                                         95                             /* '\x82Target' */
+#define DUK_STRIDX_INT_TARGET                                         96                             /* '\x82Target' */
 #define DUK_HEAP_STRING_INT_TARGET(heap)                              DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_TARGET)
 #define DUK_HTHREAD_STRING_INT_TARGET(thr)                            DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_TARGET)
-#define DUK_STRIDX_INT_NEXT                                           96                             /* '\x82Next' */
+#define DUK_STRIDX_INT_NEXT                                           97                             /* '\x82Next' */
 #define DUK_HEAP_STRING_INT_NEXT(heap)                                DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_NEXT)
 #define DUK_HTHREAD_STRING_INT_NEXT(thr)                              DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_NEXT)
-#define DUK_STRIDX_INT_BYTECODE                                       97                             /* '\x82Bytecode' */
+#define DUK_STRIDX_INT_BYTECODE                                       98                             /* '\x82Bytecode' */
 #define DUK_HEAP_STRING_INT_BYTECODE(heap)                            DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_BYTECODE)
 #define DUK_HTHREAD_STRING_INT_BYTECODE(thr)                          DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_BYTECODE)
-#define DUK_STRIDX_INT_FORMALS                                        98                             /* '\x82Formals' */
+#define DUK_STRIDX_INT_FORMALS                                        99                             /* '\x82Formals' */
 #define DUK_HEAP_STRING_INT_FORMALS(heap)                             DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_FORMALS)
 #define DUK_HTHREAD_STRING_INT_FORMALS(thr)                           DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_FORMALS)
-#define DUK_STRIDX_INT_VARMAP                                         99                             /* '\x82Varmap' */
+#define DUK_STRIDX_INT_VARMAP                                         100                            /* '\x82Varmap' */
 #define DUK_HEAP_STRING_INT_VARMAP(heap)                              DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_VARMAP)
 #define DUK_HTHREAD_STRING_INT_VARMAP(thr)                            DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_VARMAP)
-#define DUK_STRIDX_INT_SOURCE                                         100                            /* '\x82Source' */
+#define DUK_STRIDX_INT_SOURCE                                         101                            /* '\x82Source' */
 #define DUK_HEAP_STRING_INT_SOURCE(heap)                              DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_SOURCE)
 #define DUK_HTHREAD_STRING_INT_SOURCE(thr)                            DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_SOURCE)
-#define DUK_STRIDX_INT_PC2LINE                                        101                            /* '\x82Pc2line' */
+#define DUK_STRIDX_INT_PC2LINE                                        102                            /* '\x82Pc2line' */
 #define DUK_HEAP_STRING_INT_PC2LINE(heap)                             DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_PC2LINE)
 #define DUK_HTHREAD_STRING_INT_PC2LINE(thr)                           DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_PC2LINE)
-#define DUK_STRIDX_INT_MAP                                            102                            /* '\x82Map' */
+#define DUK_STRIDX_INT_MAP                                            103                            /* '\x82Map' */
 #define DUK_HEAP_STRING_INT_MAP(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_MAP)
 #define DUK_HTHREAD_STRING_INT_MAP(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_MAP)
-#define DUK_STRIDX_INT_VARENV                                         103                            /* '\x82Varenv' */
+#define DUK_STRIDX_INT_VARENV                                         104                            /* '\x82Varenv' */
 #define DUK_HEAP_STRING_INT_VARENV(heap)                              DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_VARENV)
 #define DUK_HTHREAD_STRING_INT_VARENV(thr)                            DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_VARENV)
-#define DUK_STRIDX_INT_FINALIZER                                      104                            /* '\x82Finalizer' */
+#define DUK_STRIDX_INT_FINALIZER                                      105                            /* '\x82Finalizer' */
 #define DUK_HEAP_STRING_INT_FINALIZER(heap)                           DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_FINALIZER)
 #define DUK_HTHREAD_STRING_INT_FINALIZER(thr)                         DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_FINALIZER)
-#define DUK_STRIDX_INT_VALUE                                          105                            /* '\x82Value' */
+#define DUK_STRIDX_INT_VALUE                                          106                            /* '\x82Value' */
 #define DUK_HEAP_STRING_INT_VALUE(heap)                               DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INT_VALUE)
 #define DUK_HTHREAD_STRING_INT_VALUE(thr)                             DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INT_VALUE)
-#define DUK_STRIDX_COMPILE                                            106                            /* 'compile' */
+#define DUK_STRIDX_COMPILE                                            107                            /* 'compile' */
 #define DUK_HEAP_STRING_COMPILE(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_COMPILE)
 #define DUK_HTHREAD_STRING_COMPILE(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_COMPILE)
-#define DUK_STRIDX_INPUT                                              107                            /* 'input' */
+#define DUK_STRIDX_INPUT                                              108                            /* 'input' */
 #define DUK_HEAP_STRING_INPUT(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INPUT)
 #define DUK_HTHREAD_STRING_INPUT(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INPUT)
-#define DUK_STRIDX_ERR_CREATE                                         108                            /* 'errCreate' */
+#define DUK_STRIDX_ERR_CREATE                                         109                            /* 'errCreate' */
 #define DUK_HEAP_STRING_ERR_CREATE(heap)                              DUK_HEAP_GET_STRING((heap),DUK_STRIDX_ERR_CREATE)
 #define DUK_HTHREAD_STRING_ERR_CREATE(thr)                            DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_ERR_CREATE)
-#define DUK_STRIDX_ERR_THROW                                          109                            /* 'errThrow' */
+#define DUK_STRIDX_ERR_THROW                                          110                            /* 'errThrow' */
 #define DUK_HEAP_STRING_ERR_THROW(heap)                               DUK_HEAP_GET_STRING((heap),DUK_STRIDX_ERR_THROW)
 #define DUK_HTHREAD_STRING_ERR_THROW(thr)                             DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_ERR_THROW)
-#define DUK_STRIDX_ENV                                                110                            /* 'env' */
+#define DUK_STRIDX_ENV                                                111                            /* 'env' */
 #define DUK_HEAP_STRING_ENV(heap)                                     DUK_HEAP_GET_STRING((heap),DUK_STRIDX_ENV)
 #define DUK_HTHREAD_STRING_ENV(thr)                                   DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_ENV)
-#define DUK_STRIDX_HEX                                                111                            /* 'hex' */
+#define DUK_STRIDX_HEX                                                112                            /* 'hex' */
 #define DUK_HEAP_STRING_HEX(heap)                                     DUK_HEAP_GET_STRING((heap),DUK_STRIDX_HEX)
 #define DUK_HTHREAD_STRING_HEX(thr)                                   DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_HEX)
-#define DUK_STRIDX_BASE64                                             112                            /* 'base64' */
+#define DUK_STRIDX_BASE64                                             113                            /* 'base64' */
 #define DUK_HEAP_STRING_BASE64(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_BASE64)
 #define DUK_HTHREAD_STRING_BASE64(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_BASE64)
-#define DUK_STRIDX_JX                                                 113                            /* 'jx' */
+#define DUK_STRIDX_JX                                                 114                            /* 'jx' */
 #define DUK_HEAP_STRING_JX(heap)                                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_JX)
 #define DUK_HTHREAD_STRING_JX(thr)                                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_JX)
-#define DUK_STRIDX_JC                                                 114                            /* 'jc' */
+#define DUK_STRIDX_JC                                                 115                            /* 'jc' */
 #define DUK_HEAP_STRING_JC(heap)                                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_JC)
 #define DUK_HTHREAD_STRING_JC(thr)                                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_JC)
-#define DUK_STRIDX_JSON_EXT_UNDEFINED                                 115                            /* '{"_undef":true}' */
+#define DUK_STRIDX_JSON_EXT_UNDEFINED                                 116                            /* '{"_undef":true}' */
 #define DUK_HEAP_STRING_JSON_EXT_UNDEFINED(heap)                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_JSON_EXT_UNDEFINED)
 #define DUK_HTHREAD_STRING_JSON_EXT_UNDEFINED(thr)                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_JSON_EXT_UNDEFINED)
-#define DUK_STRIDX_JSON_EXT_NAN                                       116                            /* '{"_nan":true}' */
+#define DUK_STRIDX_JSON_EXT_NAN                                       117                            /* '{"_nan":true}' */
 #define DUK_HEAP_STRING_JSON_EXT_NAN(heap)                            DUK_HEAP_GET_STRING((heap),DUK_STRIDX_JSON_EXT_NAN)
 #define DUK_HTHREAD_STRING_JSON_EXT_NAN(thr)                          DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_JSON_EXT_NAN)
-#define DUK_STRIDX_JSON_EXT_POSINF                                    117                            /* '{"_inf":true}' */
+#define DUK_STRIDX_JSON_EXT_POSINF                                    118                            /* '{"_inf":true}' */
 #define DUK_HEAP_STRING_JSON_EXT_POSINF(heap)                         DUK_HEAP_GET_STRING((heap),DUK_STRIDX_JSON_EXT_POSINF)
 #define DUK_HTHREAD_STRING_JSON_EXT_POSINF(thr)                       DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_JSON_EXT_POSINF)
-#define DUK_STRIDX_JSON_EXT_NEGINF                                    118                            /* '{"_ninf":true}' */
+#define DUK_STRIDX_JSON_EXT_NEGINF                                    119                            /* '{"_ninf":true}' */
 #define DUK_HEAP_STRING_JSON_EXT_NEGINF(heap)                         DUK_HEAP_GET_STRING((heap),DUK_STRIDX_JSON_EXT_NEGINF)
 #define DUK_HTHREAD_STRING_JSON_EXT_NEGINF(thr)                       DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_JSON_EXT_NEGINF)
-#define DUK_STRIDX_JSON_EXT_FUNCTION1                                 119                            /* '{"_func":true}' */
+#define DUK_STRIDX_JSON_EXT_FUNCTION1                                 120                            /* '{"_func":true}' */
 #define DUK_HEAP_STRING_JSON_EXT_FUNCTION1(heap)                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_JSON_EXT_FUNCTION1)
 #define DUK_HTHREAD_STRING_JSON_EXT_FUNCTION1(thr)                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_JSON_EXT_FUNCTION1)
-#define DUK_STRIDX_JSON_EXT_FUNCTION2                                 120                            /* '{_func:true}' */
+#define DUK_STRIDX_JSON_EXT_FUNCTION2                                 121                            /* '{_func:true}' */
 #define DUK_HEAP_STRING_JSON_EXT_FUNCTION2(heap)                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_JSON_EXT_FUNCTION2)
 #define DUK_HTHREAD_STRING_JSON_EXT_FUNCTION2(thr)                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_JSON_EXT_FUNCTION2)
-#define DUK_STRIDX_BREAK                                              121                            /* 'break' */
+#define DUK_STRIDX_BREAK                                              122                            /* 'break' */
 #define DUK_HEAP_STRING_BREAK(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_BREAK)
 #define DUK_HTHREAD_STRING_BREAK(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_BREAK)
-#define DUK_STRIDX_CASE                                               122                            /* 'case' */
+#define DUK_STRIDX_CASE                                               123                            /* 'case' */
 #define DUK_HEAP_STRING_CASE(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_CASE)
 #define DUK_HTHREAD_STRING_CASE(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_CASE)
-#define DUK_STRIDX_CATCH                                              123                            /* 'catch' */
+#define DUK_STRIDX_CATCH                                              124                            /* 'catch' */
 #define DUK_HEAP_STRING_CATCH(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_CATCH)
 #define DUK_HTHREAD_STRING_CATCH(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_CATCH)
-#define DUK_STRIDX_CONTINUE                                           124                            /* 'continue' */
+#define DUK_STRIDX_CONTINUE                                           125                            /* 'continue' */
 #define DUK_HEAP_STRING_CONTINUE(heap)                                DUK_HEAP_GET_STRING((heap),DUK_STRIDX_CONTINUE)
 #define DUK_HTHREAD_STRING_CONTINUE(thr)                              DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_CONTINUE)
-#define DUK_STRIDX_DEBUGGER                                           125                            /* 'debugger' */
+#define DUK_STRIDX_DEBUGGER                                           126                            /* 'debugger' */
 #define DUK_HEAP_STRING_DEBUGGER(heap)                                DUK_HEAP_GET_STRING((heap),DUK_STRIDX_DEBUGGER)
 #define DUK_HTHREAD_STRING_DEBUGGER(thr)                              DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_DEBUGGER)
-#define DUK_STRIDX_DEFAULT                                            126                            /* 'default' */
+#define DUK_STRIDX_DEFAULT                                            127                            /* 'default' */
 #define DUK_HEAP_STRING_DEFAULT(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_DEFAULT)
 #define DUK_HTHREAD_STRING_DEFAULT(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_DEFAULT)
-#define DUK_STRIDX_DELETE                                             127                            /* 'delete' */
+#define DUK_STRIDX_DELETE                                             128                            /* 'delete' */
 #define DUK_HEAP_STRING_DELETE(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_DELETE)
 #define DUK_HTHREAD_STRING_DELETE(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_DELETE)
-#define DUK_STRIDX_DO                                                 128                            /* 'do' */
+#define DUK_STRIDX_DO                                                 129                            /* 'do' */
 #define DUK_HEAP_STRING_DO(heap)                                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_DO)
 #define DUK_HTHREAD_STRING_DO(thr)                                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_DO)
-#define DUK_STRIDX_ELSE                                               129                            /* 'else' */
+#define DUK_STRIDX_ELSE                                               130                            /* 'else' */
 #define DUK_HEAP_STRING_ELSE(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_ELSE)
 #define DUK_HTHREAD_STRING_ELSE(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_ELSE)
-#define DUK_STRIDX_FINALLY                                            130                            /* 'finally' */
+#define DUK_STRIDX_FINALLY                                            131                            /* 'finally' */
 #define DUK_HEAP_STRING_FINALLY(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_FINALLY)
 #define DUK_HTHREAD_STRING_FINALLY(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_FINALLY)
-#define DUK_STRIDX_FOR                                                131                            /* 'for' */
+#define DUK_STRIDX_FOR                                                132                            /* 'for' */
 #define DUK_HEAP_STRING_FOR(heap)                                     DUK_HEAP_GET_STRING((heap),DUK_STRIDX_FOR)
 #define DUK_HTHREAD_STRING_FOR(thr)                                   DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_FOR)
-#define DUK_STRIDX_LC_FUNCTION                                        132                            /* 'function' */
+#define DUK_STRIDX_LC_FUNCTION                                        133                            /* 'function' */
 #define DUK_HEAP_STRING_LC_FUNCTION(heap)                             DUK_HEAP_GET_STRING((heap),DUK_STRIDX_LC_FUNCTION)
 #define DUK_HTHREAD_STRING_LC_FUNCTION(thr)                           DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_LC_FUNCTION)
-#define DUK_STRIDX_IF                                                 133                            /* 'if' */
+#define DUK_STRIDX_IF                                                 134                            /* 'if' */
 #define DUK_HEAP_STRING_IF(heap)                                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_IF)
 #define DUK_HTHREAD_STRING_IF(thr)                                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_IF)
-#define DUK_STRIDX_IN                                                 134                            /* 'in' */
+#define DUK_STRIDX_IN                                                 135                            /* 'in' */
 #define DUK_HEAP_STRING_IN(heap)                                      DUK_HEAP_GET_STRING((heap),DUK_STRIDX_IN)
 #define DUK_HTHREAD_STRING_IN(thr)                                    DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_IN)
-#define DUK_STRIDX_INSTANCEOF                                         135                            /* 'instanceof' */
+#define DUK_STRIDX_INSTANCEOF                                         136                            /* 'instanceof' */
 #define DUK_HEAP_STRING_INSTANCEOF(heap)                              DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INSTANCEOF)
 #define DUK_HTHREAD_STRING_INSTANCEOF(thr)                            DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INSTANCEOF)
-#define DUK_STRIDX_NEW                                                136                            /* 'new' */
+#define DUK_STRIDX_NEW                                                137                            /* 'new' */
 #define DUK_HEAP_STRING_NEW(heap)                                     DUK_HEAP_GET_STRING((heap),DUK_STRIDX_NEW)
 #define DUK_HTHREAD_STRING_NEW(thr)                                   DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_NEW)
-#define DUK_STRIDX_RETURN                                             137                            /* 'return' */
+#define DUK_STRIDX_RETURN                                             138                            /* 'return' */
 #define DUK_HEAP_STRING_RETURN(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_RETURN)
 #define DUK_HTHREAD_STRING_RETURN(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_RETURN)
-#define DUK_STRIDX_SWITCH                                             138                            /* 'switch' */
+#define DUK_STRIDX_SWITCH                                             139                            /* 'switch' */
 #define DUK_HEAP_STRING_SWITCH(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_SWITCH)
 #define DUK_HTHREAD_STRING_SWITCH(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_SWITCH)
-#define DUK_STRIDX_THIS                                               139                            /* 'this' */
+#define DUK_STRIDX_THIS                                               140                            /* 'this' */
 #define DUK_HEAP_STRING_THIS(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_THIS)
 #define DUK_HTHREAD_STRING_THIS(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_THIS)
-#define DUK_STRIDX_THROW                                              140                            /* 'throw' */
+#define DUK_STRIDX_THROW                                              141                            /* 'throw' */
 #define DUK_HEAP_STRING_THROW(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_THROW)
 #define DUK_HTHREAD_STRING_THROW(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_THROW)
-#define DUK_STRIDX_TRY                                                141                            /* 'try' */
+#define DUK_STRIDX_TRY                                                142                            /* 'try' */
 #define DUK_HEAP_STRING_TRY(heap)                                     DUK_HEAP_GET_STRING((heap),DUK_STRIDX_TRY)
 #define DUK_HTHREAD_STRING_TRY(thr)                                   DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_TRY)
-#define DUK_STRIDX_TYPEOF                                             142                            /* 'typeof' */
+#define DUK_STRIDX_TYPEOF                                             143                            /* 'typeof' */
 #define DUK_HEAP_STRING_TYPEOF(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_TYPEOF)
 #define DUK_HTHREAD_STRING_TYPEOF(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_TYPEOF)
-#define DUK_STRIDX_VAR                                                143                            /* 'var' */
+#define DUK_STRIDX_VAR                                                144                            /* 'var' */
 #define DUK_HEAP_STRING_VAR(heap)                                     DUK_HEAP_GET_STRING((heap),DUK_STRIDX_VAR)
 #define DUK_HTHREAD_STRING_VAR(thr)                                   DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_VAR)
-#define DUK_STRIDX_CONST                                              144                            /* 'const' */
+#define DUK_STRIDX_CONST                                              145                            /* 'const' */
 #define DUK_HEAP_STRING_CONST(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_CONST)
 #define DUK_HTHREAD_STRING_CONST(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_CONST)
-#define DUK_STRIDX_VOID                                               145                            /* 'void' */
+#define DUK_STRIDX_VOID                                               146                            /* 'void' */
 #define DUK_HEAP_STRING_VOID(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_VOID)
 #define DUK_HTHREAD_STRING_VOID(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_VOID)
-#define DUK_STRIDX_WHILE                                              146                            /* 'while' */
+#define DUK_STRIDX_WHILE                                              147                            /* 'while' */
 #define DUK_HEAP_STRING_WHILE(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_WHILE)
 #define DUK_HTHREAD_STRING_WHILE(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_WHILE)
-#define DUK_STRIDX_WITH                                               147                            /* 'with' */
+#define DUK_STRIDX_WITH                                               148                            /* 'with' */
 #define DUK_HEAP_STRING_WITH(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_WITH)
 #define DUK_HTHREAD_STRING_WITH(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_WITH)
-#define DUK_STRIDX_CLASS                                              148                            /* 'class' */
+#define DUK_STRIDX_CLASS                                              149                            /* 'class' */
 #define DUK_HEAP_STRING_CLASS(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_CLASS)
 #define DUK_HTHREAD_STRING_CLASS(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_CLASS)
-#define DUK_STRIDX_ENUM                                               149                            /* 'enum' */
+#define DUK_STRIDX_ENUM                                               150                            /* 'enum' */
 #define DUK_HEAP_STRING_ENUM(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_ENUM)
 #define DUK_HTHREAD_STRING_ENUM(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_ENUM)
-#define DUK_STRIDX_EXPORT                                             150                            /* 'export' */
+#define DUK_STRIDX_EXPORT                                             151                            /* 'export' */
 #define DUK_HEAP_STRING_EXPORT(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_EXPORT)
 #define DUK_HTHREAD_STRING_EXPORT(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_EXPORT)
-#define DUK_STRIDX_EXTENDS                                            151                            /* 'extends' */
+#define DUK_STRIDX_EXTENDS                                            152                            /* 'extends' */
 #define DUK_HEAP_STRING_EXTENDS(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_EXTENDS)
 #define DUK_HTHREAD_STRING_EXTENDS(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_EXTENDS)
-#define DUK_STRIDX_IMPORT                                             152                            /* 'import' */
+#define DUK_STRIDX_IMPORT                                             153                            /* 'import' */
 #define DUK_HEAP_STRING_IMPORT(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_IMPORT)
 #define DUK_HTHREAD_STRING_IMPORT(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_IMPORT)
-#define DUK_STRIDX_SUPER                                              153                            /* 'super' */
+#define DUK_STRIDX_SUPER                                              154                            /* 'super' */
 #define DUK_HEAP_STRING_SUPER(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_SUPER)
 #define DUK_HTHREAD_STRING_SUPER(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_SUPER)
-#define DUK_STRIDX_LC_NULL                                            154                            /* 'null' */
+#define DUK_STRIDX_LC_NULL                                            155                            /* 'null' */
 #define DUK_HEAP_STRING_LC_NULL(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_LC_NULL)
 #define DUK_HTHREAD_STRING_LC_NULL(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_LC_NULL)
-#define DUK_STRIDX_TRUE                                               155                            /* 'true' */
+#define DUK_STRIDX_TRUE                                               156                            /* 'true' */
 #define DUK_HEAP_STRING_TRUE(heap)                                    DUK_HEAP_GET_STRING((heap),DUK_STRIDX_TRUE)
 #define DUK_HTHREAD_STRING_TRUE(thr)                                  DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_TRUE)
-#define DUK_STRIDX_FALSE                                              156                            /* 'false' */
+#define DUK_STRIDX_FALSE                                              157                            /* 'false' */
 #define DUK_HEAP_STRING_FALSE(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_FALSE)
 #define DUK_HTHREAD_STRING_FALSE(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_FALSE)
-#define DUK_STRIDX_IMPLEMENTS                                         157                            /* 'implements' */
+#define DUK_STRIDX_IMPLEMENTS                                         158                            /* 'implements' */
 #define DUK_HEAP_STRING_IMPLEMENTS(heap)                              DUK_HEAP_GET_STRING((heap),DUK_STRIDX_IMPLEMENTS)
 #define DUK_HTHREAD_STRING_IMPLEMENTS(thr)                            DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_IMPLEMENTS)
-#define DUK_STRIDX_INTERFACE                                          158                            /* 'interface' */
+#define DUK_STRIDX_INTERFACE                                          159                            /* 'interface' */
 #define DUK_HEAP_STRING_INTERFACE(heap)                               DUK_HEAP_GET_STRING((heap),DUK_STRIDX_INTERFACE)
 #define DUK_HTHREAD_STRING_INTERFACE(thr)                             DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_INTERFACE)
-#define DUK_STRIDX_LET                                                159                            /* 'let' */
+#define DUK_STRIDX_LET                                                160                            /* 'let' */
 #define DUK_HEAP_STRING_LET(heap)                                     DUK_HEAP_GET_STRING((heap),DUK_STRIDX_LET)
 #define DUK_HTHREAD_STRING_LET(thr)                                   DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_LET)
-#define DUK_STRIDX_PACKAGE                                            160                            /* 'package' */
+#define DUK_STRIDX_PACKAGE                                            161                            /* 'package' */
 #define DUK_HEAP_STRING_PACKAGE(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_PACKAGE)
 #define DUK_HTHREAD_STRING_PACKAGE(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_PACKAGE)
-#define DUK_STRIDX_PRIVATE                                            161                            /* 'private' */
+#define DUK_STRIDX_PRIVATE                                            162                            /* 'private' */
 #define DUK_HEAP_STRING_PRIVATE(heap)                                 DUK_HEAP_GET_STRING((heap),DUK_STRIDX_PRIVATE)
 #define DUK_HTHREAD_STRING_PRIVATE(thr)                               DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_PRIVATE)
-#define DUK_STRIDX_PROTECTED                                          162                            /* 'protected' */
+#define DUK_STRIDX_PROTECTED                                          163                            /* 'protected' */
 #define DUK_HEAP_STRING_PROTECTED(heap)                               DUK_HEAP_GET_STRING((heap),DUK_STRIDX_PROTECTED)
 #define DUK_HTHREAD_STRING_PROTECTED(thr)                             DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_PROTECTED)
-#define DUK_STRIDX_PUBLIC                                             163                            /* 'public' */
+#define DUK_STRIDX_PUBLIC                                             164                            /* 'public' */
 #define DUK_HEAP_STRING_PUBLIC(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_PUBLIC)
 #define DUK_HTHREAD_STRING_PUBLIC(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_PUBLIC)
-#define DUK_STRIDX_STATIC                                             164                            /* 'static' */
+#define DUK_STRIDX_STATIC                                             165                            /* 'static' */
 #define DUK_HEAP_STRING_STATIC(heap)                                  DUK_HEAP_GET_STRING((heap),DUK_STRIDX_STATIC)
 #define DUK_HTHREAD_STRING_STATIC(thr)                                DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_STATIC)
-#define DUK_STRIDX_YIELD                                              165                            /* 'yield' */
+#define DUK_STRIDX_YIELD                                              166                            /* 'yield' */
 #define DUK_HEAP_STRING_YIELD(heap)                                   DUK_HEAP_GET_STRING((heap),DUK_STRIDX_YIELD)
 #define DUK_HTHREAD_STRING_YIELD(thr)                                 DUK_HTHREAD_GET_STRING((thr),DUK_STRIDX_YIELD)
 
-#define DUK_HEAP_NUM_STRINGS                                          166
-#define DUK_STRIDX_START_RESERVED                                     121
-#define DUK_STRIDX_START_STRICT_RESERVED                              157
-#define DUK_STRIDX_END_RESERVED                                       166                            /* exclusive endpoint */
+#define DUK_HEAP_NUM_STRINGS                                          167
+#define DUK_STRIDX_START_RESERVED                                     122
+#define DUK_STRIDX_START_STRICT_RESERVED                              158
+#define DUK_STRIDX_END_RESERVED                                       167                            /* exclusive endpoint */
 
 /* To convert a heap stridx to a token number, subtract
  * DUK_STRIDX_START_RESERVED and add DUK_TOK_START_RESERVED.
  */
 #if !defined(DUK_SINGLE_FILE)
-DUK_INTERNAL_DECL const duk_uint8_t duk_strings_data[967];
+DUK_INTERNAL_DECL const duk_uint8_t duk_strings_data[972];
 #endif  /* !DUK_SINGLE_FILE */
 #define DUK_STRDATA_MAX_STRLEN                                        27
-#define DUK_STRDATA_DATA_LENGTH                                       967
+#define DUK_STRDATA_DATA_LENGTH                                       972
 #endif  /* DUK_USE_ROM_STRINGS */
 
 #if defined(DUK_USE_ROM_OBJECTS)
@@ -2186,13 +2231,15 @@ DUK_INTERNAL_DECL duk_ret_t duk_bi_nodejs_buffer_tojson(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_nodejs_buffer_fill(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_nodejs_buffer_copy(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_nodejs_buffer_write(duk_context *ctx);
+DUK_INTERNAL_DECL duk_ret_t duk_bi_cbor_encode(duk_context *ctx);
+DUK_INTERNAL_DECL duk_ret_t duk_bi_cbor_decode(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_textencoder_prototype_encoding_getter(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_textencoder_prototype_encode(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_textdecoder_prototype_shared_getter(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_textdecoder_prototype_decode(duk_context *ctx);
 DUK_INTERNAL_DECL duk_ret_t duk_bi_performance_now(duk_context *ctx);
 #if !defined(DUK_SINGLE_FILE)
-DUK_INTERNAL_DECL const duk_c_function duk_bi_native_functions[183];
+DUK_INTERNAL_DECL const duk_c_function duk_bi_native_functions[185];
 #endif  /* !DUK_SINGLE_FILE */
 #define DUK_BIDX_GLOBAL                                               0
 #define DUK_BIDX_GLOBAL_ENV                                           1
@@ -2247,22 +2294,22 @@ DUK_INTERNAL_DECL const duk_c_function duk_bi_native_functions[183];
 #define DUK_BIDX_NODEJS_BUFFER_PROTOTYPE                              50
 #define DUK_NUM_BUILTINS                                              51
 #define DUK_NUM_BIDX_BUILTINS                                         51
-#define DUK_NUM_ALL_BUILTINS                                          79
+#define DUK_NUM_ALL_BUILTINS                                          80
 #if defined(DUK_USE_DOUBLE_LE)
 #if !defined(DUK_SINGLE_FILE)
-DUK_INTERNAL_DECL const duk_uint8_t duk_builtins_data[4251];
+DUK_INTERNAL_DECL const duk_uint8_t duk_builtins_data[4281];
 #endif  /* !DUK_SINGLE_FILE */
-#define DUK_BUILTINS_DATA_LENGTH                                      4251
+#define DUK_BUILTINS_DATA_LENGTH                                      4281
 #elif defined(DUK_USE_DOUBLE_BE)
 #if !defined(DUK_SINGLE_FILE)
-DUK_INTERNAL_DECL const duk_uint8_t duk_builtins_data[4251];
+DUK_INTERNAL_DECL const duk_uint8_t duk_builtins_data[4281];
 #endif  /* !DUK_SINGLE_FILE */
-#define DUK_BUILTINS_DATA_LENGTH                                      4251
+#define DUK_BUILTINS_DATA_LENGTH                                      4281
 #elif defined(DUK_USE_DOUBLE_ME)
 #if !defined(DUK_SINGLE_FILE)
-DUK_INTERNAL_DECL const duk_uint8_t duk_builtins_data[4251];
+DUK_INTERNAL_DECL const duk_uint8_t duk_builtins_data[4281];
 #endif  /* !DUK_SINGLE_FILE */
-#define DUK_BUILTINS_DATA_LENGTH                                      4251
+#define DUK_BUILTINS_DATA_LENGTH                                      4281
 #else
 #error invalid endianness defines
 #endif
@@ -2339,40 +2386,49 @@ struct duk_bitencoder_ctx {
 
 /*
  *  Raw write/read macros for big endian, unaligned basic values.
- *  Caller ensures there's enough space.  The macros update the pointer
- *  argument automatically on resizes.  The idiom seems a bit odd, but
- *  leads to compact code.
+ *  Caller ensures there's enough space.  The INC macro variants
+ *  update the pointer argument automatically.
  */
 
 #define DUK_RAW_WRITE_U8(ptr,val)  do { \
-		*(ptr)++ = (duk_uint8_t) (val); \
-	} while (0)
-#define DUK_RAW_WRITE_U16_BE(ptr,val) duk_raw_write_u16_be(&(ptr), (duk_uint16_t) (val))
-#define DUK_RAW_WRITE_U32_BE(ptr,val) duk_raw_write_u32_be(&(ptr), (duk_uint32_t) (val))
-#define DUK_RAW_WRITE_DOUBLE_BE(ptr,val) duk_raw_write_double_be(&(ptr), (duk_double_t) (val))
-#define DUK_RAW_WRITE_XUTF8(ptr,val)  do { \
-		/* 'ptr' is evaluated both as LHS and RHS. */ \
-		duk_uint8_t *duk__ptr; \
-		duk_small_int_t duk__len; \
-		duk__ptr = (duk_uint8_t *) (ptr); \
-		duk__len = duk_unicode_encode_xutf8((duk_ucodepoint_t) (val), duk__ptr); \
-		duk__ptr += duk__len; \
-		(ptr) = duk__ptr; \
+		*(ptr) = (duk_uint8_t) (val); \
 	} while (0)
-#define DUK_RAW_WRITE_CESU8(ptr,val)  do { \
-		/* 'ptr' is evaluated both as LHS and RHS. */ \
-		duk_uint8_t *duk__ptr; \
-		duk_small_int_t duk__len; \
-		duk__ptr = (duk_uint8_t *) (ptr); \
-		duk__len = duk_unicode_encode_cesu8((duk_ucodepoint_t) (val), duk__ptr); \
-		duk__ptr += duk__len; \
-		(ptr) = duk__ptr; \
+#define DUK_RAW_WRITE_U16_BE(ptr,val) duk_raw_write_u16_be((ptr), (duk_uint16_t) (val))
+#define DUK_RAW_WRITE_U32_BE(ptr,val) duk_raw_write_u32_be((ptr), (duk_uint32_t) (val))
+#define DUK_RAW_WRITE_FLOAT_BE(ptr,val) duk_raw_write_float_be((ptr), (duk_float_t) (val))
+#define DUK_RAW_WRITE_DOUBLE_BE(ptr,val) duk_raw_write_double_be((ptr), (duk_double_t) (val))
+#define DUK_RAW_WRITE_XUTF8(ptr,val) duk_raw_write_xutf8((ptr), (duk_ucodepoint_t) (val))
+
+#define DUK_RAW_WRITEINC_U8(ptr,val)  do { \
+		*(ptr)++ = (duk_uint8_t) (val); \
 	} while (0)
+#define DUK_RAW_WRITEINC_U16_BE(ptr,val) duk_raw_writeinc_u16_be(&(ptr), (duk_uint16_t) (val))
+#define DUK_RAW_WRITEINC_U32_BE(ptr,val) duk_raw_writeinc_u32_be(&(ptr), (duk_uint32_t) (val))
+#define DUK_RAW_WRITEINC_FLOAT_BE(ptr,val) duk_raw_writeinc_float_be(&(ptr), (duk_float_t) (val))
+#define DUK_RAW_WRITEINC_DOUBLE_BE(ptr,val) duk_raw_writeinc_double_be(&(ptr), (duk_double_t) (val))
+#define DUK_RAW_WRITEINC_XUTF8(ptr,val) duk_raw_writeinc_xutf8(&(ptr), (duk_ucodepoint_t) (val))
+#define DUK_RAW_WRITEINC_CESU8(ptr,val) duk_raw_writeinc_cesu8(&(ptr), (duk_ucodepoint_t) (val))
 
-#define DUK_RAW_READ_U8(ptr) ((duk_uint8_t) (*(ptr)++))
-#define DUK_RAW_READ_U16_BE(ptr) duk_raw_read_u16_be(&(ptr));
-#define DUK_RAW_READ_U32_BE(ptr) duk_raw_read_u32_be(&(ptr));
-#define DUK_RAW_READ_DOUBLE_BE(ptr) duk_raw_read_double_be(&(ptr));
+#define DUK_RAW_READ_U8(ptr) ((duk_uint8_t) (*(ptr)))
+#define DUK_RAW_READ_U16_BE(ptr) duk_raw_read_u16_be((ptr));
+#define DUK_RAW_READ_U32_BE(ptr) duk_raw_read_u32_be((ptr));
+#define DUK_RAW_READ_DOUBLE_BE(ptr) duk_raw_read_double_be((ptr));
+
+#define DUK_RAW_READINC_U8(ptr) ((duk_uint8_t) (*(ptr)++))
+#define DUK_RAW_READINC_U16_BE(ptr) duk_raw_readinc_u16_be(&(ptr));
+#define DUK_RAW_READINC_U32_BE(ptr) duk_raw_readinc_u32_be(&(ptr));
+#define DUK_RAW_READINC_DOUBLE_BE(ptr) duk_raw_readinc_double_be(&(ptr));
+
+/*
+ *  Double and float byte order operations.
+ */
+
+DUK_INTERNAL_DECL void duk_dblunion_host_to_little(duk_double_union *u);
+DUK_INTERNAL_DECL void duk_dblunion_little_to_host(duk_double_union *u);
+DUK_INTERNAL_DECL void duk_dblunion_host_to_big(duk_double_union *u);
+DUK_INTERNAL_DECL void duk_dblunion_big_to_host(duk_double_union *u);
+DUK_INTERNAL_DECL void duk_fltunion_host_to_big(duk_float_union *u);
+DUK_INTERNAL_DECL void duk_fltunion_big_to_host(duk_float_union *u);
 
 /*
  *  Buffer writer (dynamic buffer only)
@@ -2801,12 +2857,26 @@ DUK_INTERNAL_DECL duk_uint8_t *duk_bw_insert_ensure_area(duk_hthread *thr, duk_b
 DUK_INTERNAL_DECL void duk_bw_remove_raw_slice(duk_hthread *thr, duk_bufwriter_ctx *bw, duk_size_t off, duk_size_t len);
 /* No duk_bw_remove_ensure_slice(), functionality would be identical. */
 
-DUK_INTERNAL_DECL duk_uint16_t duk_raw_read_u16_be(duk_uint8_t **p);
-DUK_INTERNAL_DECL duk_uint32_t duk_raw_read_u32_be(duk_uint8_t **p);
-DUK_INTERNAL_DECL duk_double_t duk_raw_read_double_be(duk_uint8_t **p);
-DUK_INTERNAL_DECL void duk_raw_write_u16_be(duk_uint8_t **p, duk_uint16_t val);
-DUK_INTERNAL_DECL void duk_raw_write_u32_be(duk_uint8_t **p, duk_uint32_t val);
-DUK_INTERNAL_DECL void duk_raw_write_double_be(duk_uint8_t **p, duk_double_t val);
+DUK_INTERNAL_DECL duk_uint16_t duk_raw_read_u16_be(const duk_uint8_t *p);
+DUK_INTERNAL_DECL duk_uint32_t duk_raw_read_u32_be(const duk_uint8_t *p);
+DUK_INTERNAL_DECL duk_float_t duk_raw_read_float_be(const duk_uint8_t *p);
+DUK_INTERNAL_DECL duk_double_t duk_raw_read_double_be(const duk_uint8_t *p);
+DUK_INTERNAL_DECL duk_uint16_t duk_raw_readinc_u16_be(const duk_uint8_t **p);
+DUK_INTERNAL_DECL duk_uint32_t duk_raw_readinc_u32_be(const duk_uint8_t **p);
+DUK_INTERNAL_DECL duk_float_t duk_raw_readinc_float_be(const duk_uint8_t **p);
+DUK_INTERNAL_DECL duk_double_t duk_raw_readinc_double_be(const duk_uint8_t **p);
+DUK_INTERNAL_DECL void duk_raw_write_u16_be(duk_uint8_t *p, duk_uint16_t val);
+DUK_INTERNAL_DECL void duk_raw_write_u32_be(duk_uint8_t *p, duk_uint32_t val);
+DUK_INTERNAL_DECL void duk_raw_write_float_be(duk_uint8_t *p, duk_float_t val);
+DUK_INTERNAL_DECL void duk_raw_write_double_be(duk_uint8_t *p, duk_double_t val);
+DUK_INTERNAL_DECL duk_small_int_t duk_raw_write_xutf8(duk_uint8_t *p, duk_ucodepoint_t val);
+DUK_INTERNAL_DECL duk_small_int_t duk_raw_write_cesu8(duk_uint8_t *p, duk_ucodepoint_t val);
+DUK_INTERNAL_DECL void duk_raw_writeinc_u16_be(duk_uint8_t **p, duk_uint16_t val);
+DUK_INTERNAL_DECL void duk_raw_writeinc_u32_be(duk_uint8_t **p, duk_uint32_t val);
+DUK_INTERNAL_DECL void duk_raw_writeinc_float_be(duk_uint8_t **p, duk_float_t val);
+DUK_INTERNAL_DECL void duk_raw_writeinc_double_be(duk_uint8_t **p, duk_double_t val);
+DUK_INTERNAL_DECL void duk_raw_writeinc_xutf8(duk_uint8_t **p, duk_ucodepoint_t val);
+DUK_INTERNAL_DECL void duk_raw_writeinc_cesu8(duk_uint8_t **p, duk_ucodepoint_t val);
 
 #if defined(DUK_USE_DEBUGGER_SUPPORT)  /* For now only needed by the debugger. */
 DUK_INTERNAL_DECL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len);
@@ -2957,6 +3027,8 @@ DUK_INTERNAL_DECL duk_uint_t duk_double_to_uint_t(duk_double_t x);
 DUK_INTERNAL_DECL duk_int32_t duk_double_to_int32_t(duk_double_t x);
 DUK_INTERNAL_DECL duk_uint32_t duk_double_to_uint32_t(duk_double_t x);
 DUK_INTERNAL_DECL duk_float_t duk_double_to_float_t(duk_double_t x);
+DUK_INTERNAL_DECL duk_bool_t duk_double_equals(duk_double_t x, duk_double_t y);
+DUK_INTERNAL_DECL duk_bool_t duk_float_equals(duk_float_t x, duk_float_t y);
 
 /*
  *  Miscellaneous
@@ -3056,10 +3128,12 @@ DUK_INTERNAL_DECL duk_float_t duk_double_to_float_t(duk_double_t x);
 /* JSON */
 #define DUK_STR_FMT_PTR                          "%p"
 #define DUK_STR_FMT_INVALID_JSON                 "invalid json (at offset %ld)"
-#define DUK_STR_JSONDEC_RECLIMIT                 "json decode recursion limit"
-#define DUK_STR_JSONENC_RECLIMIT                 "json encode recursion limit"
 #define DUK_STR_CYCLIC_INPUT                     "cyclic input"
 
+/* Generic codec */
+#define DUK_STR_DEC_RECLIMIT                     "decode recursion limit"
+#define DUK_STR_ENC_RECLIMIT                     "encode recursion limit"
+
 /* Object property access */
 #define DUK_STR_INVALID_BASE                     "invalid base value"
 #define DUK_STR_STRICT_CALLER_READ               "cannot read strict 'caller'"
@@ -5412,6 +5486,28 @@ DUK_INTERNAL_DECL void duk_heaphdr_decref_norz(duk_hthread *thr, duk_heaphdr *h)
 #if !defined(DUK_API_INTERNAL_H_INCLUDED)
 #define DUK_API_INTERNAL_H_INCLUDED
 
+/* Inline macro helpers. */
+#if defined(DUK_USE_PREFER_SIZE)
+#define DUK_INLINE_PERF
+#define DUK_ALWAYS_INLINE_PERF
+#define DUK_NOINLINE_PERF
+#else
+#define DUK_INLINE_PERF DUK_INLINE
+#define DUK_ALWAYS_INLINE_PERF DUK_ALWAYS_INLINE
+#define DUK_NOINLINE_PERF DUK_NOINLINE
+#endif
+
+/* Inline macro helpers, for bytecode executor. */
+#if defined(DUK_USE_EXEC_PREFER_SIZE)
+#define DUK_EXEC_INLINE_PERF
+#define DUK_EXEC_ALWAYS_INLINE_PERF
+#define DUK_EXEC_NOINLINE_PERF
+#else
+#define DUK_EXEC_INLINE_PERF DUK_INLINE
+#define DUK_EXEC_ALWAYS_INLINE_PERF DUK_ALWAYS_INLINE
+#define DUK_EXEC_NOINLINE_PERF DUK_NOINLINE
+#endif
+
 /* duk_push_sprintf constants */
 #define DUK_PUSH_SPRINTF_INITIAL_SIZE  256L
 #define DUK_PUSH_SPRINTF_SANITY_LIMIT  (1L * 1024L * 1024L * 1024L)
@@ -8423,20 +8519,17 @@ struct duk_hproxy {
  */
 #define DUK_MS_FLAG_EMERGENCY                (1U << 0)
 
-/* Voluntary mark-and-sweep: triggered periodically. */
-#define DUK_MS_FLAG_VOLUNTARY                (1U << 1)
-
 /* Postpone rescue decisions for reachable objects with FINALIZED set.
  * Used during finalize_list processing to avoid incorrect rescue
  * decisions due to finalize_list being a reachability root.
  */
-#define DUK_MS_FLAG_POSTPONE_RESCUE          (1U << 2)
+#define DUK_MS_FLAG_POSTPONE_RESCUE          (1U << 1)
 
 /* Don't compact objects; needed during object property table resize
  * to prevent a recursive resize.  It would suffice to protect only the
  * current object being resized, but this is not yet implemented.
  */
-#define DUK_MS_FLAG_NO_OBJECT_COMPACTION     (1U << 3)
+#define DUK_MS_FLAG_NO_OBJECT_COMPACTION     (1U << 2)
 
 /*
  *  Thread switching
@@ -10220,6 +10313,7 @@ DUK_INTERNAL_DECL duk_small_int_t duk_unicode_encode_cesu8(duk_ucodepoint_t cp,
 DUK_INTERNAL_DECL duk_small_int_t duk_unicode_decode_xutf8(duk_hthread *thr, const duk_uint8_t **ptr, const duk_uint8_t *ptr_start, const duk_uint8_t *ptr_end, duk_ucodepoint_t *out_cp);
 DUK_INTERNAL_DECL duk_ucodepoint_t duk_unicode_decode_xutf8_checked(duk_hthread *thr, const duk_uint8_t **ptr, const duk_uint8_t *ptr_start, const duk_uint8_t *ptr_end);
 DUK_INTERNAL_DECL duk_size_t duk_unicode_unvalidated_utf8_length(const duk_uint8_t *data, duk_size_t blen);
+DUK_INTERNAL_DECL duk_bool_t duk_unicode_is_utf8_compatible(const duk_uint8_t *buf, duk_size_t len);
 DUK_INTERNAL_DECL duk_small_int_t duk_unicode_is_whitespace(duk_codepoint_t cp);
 DUK_INTERNAL_DECL duk_small_int_t duk_unicode_is_line_terminator(duk_codepoint_t cp);
 DUK_INTERNAL_DECL duk_small_int_t duk_unicode_is_identifier_start(duk_codepoint_t cp);
@@ -10352,6 +10446,8 @@ DUK_INTERNAL_DECL duk_bool_t duk_js_instanceof_ordinary(duk_hthread *thr, duk_tv
 #endif
 DUK_INTERNAL_DECL duk_bool_t duk_js_in(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_y);
 DUK_INTERNAL_DECL duk_small_uint_t duk_js_typeof_stridx(duk_tval *tv_x);
+DUK_INTERNAL_DECL duk_bool_t duk_js_isarray_hobject(duk_hobject *h);
+DUK_INTERNAL_DECL duk_bool_t duk_js_isarray(duk_tval *tv);
 
 /* arithmetic */
 DUK_INTERNAL_DECL double duk_js_arith_pow(double x, double y);
@@ -10800,7 +10896,7 @@ DUK_INTERNAL void duk_debug_log(const char *fmt, ...) {
 #if defined(DUK_USE_ROM_STRINGS)
 #error ROM support not enabled, rerun configure.py with --rom-support
 #else  /* DUK_USE_ROM_STRINGS */
-DUK_INTERNAL const duk_uint8_t duk_strings_data[967] = {
+DUK_INTERNAL const duk_uint8_t duk_strings_data[972] = {
 79,40,209,144,168,105,6,78,54,139,89,185,44,48,46,90,120,8,154,140,35,103,
 35,113,193,73,5,52,112,180,104,166,135,52,188,4,98,12,27,146,156,80,211,31,
 129,115,150,64,52,220,109,24,18,68,156,24,38,67,114,36,55,9,119,151,132,
@@ -10828,34 +10924,34 @@ DUK_INTERNAL const duk_uint8_t duk_strings_data[967] = {
 113,67,77,201,128,223,255,223,224,121,44,48,46,95,203,145,46,9,205,16,39,
 201,62,36,0,192,21,147,255,238,145,39,199,197,211,116,240,242,113,197,78,
 214,211,226,233,187,107,105,19,119,37,56,161,166,52,221,212,201,205,36,240,
-242,16,96,152,12,178,52,211,56,228,73,150,83,0,148,39,137,75,67,73,198,209,
-129,36,85,185,201,196,2,32,193,48,17,160,97,16,84,44,156,104,24,67,189,200,
-108,201,19,238,114,96,137,137,50,238,113,164,188,211,185,192,226,100,19,
-134,68,110,112,174,139,0,185,31,115,149,4,88,7,159,115,146,117,34,34,35,
-115,143,22,146,208,210,19,115,140,3,207,185,202,130,36,109,85,185,194,161,
-160,90,50,72,155,115,149,2,232,67,137,204,122,22,66,161,175,164,210,72,199,
-130,137,1,50,32,145,143,38,120,186,195,35,106,51,146,230,8,36,77,109,65,38,
-226,72,159,191,189,181,70,140,133,222,249,212,227,66,125,245,187,251,219,
-77,3,119,190,117,56,208,159,125,110,254,246,210,26,93,239,157,78,52,39,223,
-93,191,189,180,212,52,187,223,58,156,104,79,190,187,127,123,104,180,104,
-183,190,117,56,208,159,125,102,254,209,104,209,124,234,113,161,62,250,80,
-196,128,81,4,9,16,162,4,196,116,9,205,154,27,66,32,100,13,12,98,68,227,33,
-65,69,204,195,34,201,50,8,110,33,23,34,28,168,104,22,188,12,174,138,11,70,
-138,104,115,68,130,137,13,82,27,41,129,162,35,138,54,146,198,137,39,72,180,
-210,178,38,35,146,103,68,139,51,197,214,28,227,131,79,15,35,138,58,130,37,
-19,155,41,146,174,64,203,99,161,100,37,145,51,148,75,4,164,66,54,140,49,46,
-247,70,103,37,230,70,142,70,67,30,232,204,178,163,201,18,54,139,89,39,26,
-16,165,2,228,69,33,143,89,24,70,206,73,67,102,72,148,2,32,214,73,157,224,
-18,128,98,29,241,69,65,50,37,241,116,200,41,144,102,125,2,180,8,210,152,38,
-129,23,8,34,198,
+242,16,96,152,12,26,20,164,137,150,70,154,103,28,137,50,202,96,18,132,241,
+41,104,105,56,218,48,36,138,183,57,56,128,68,24,38,2,52,12,34,10,133,147,
+141,3,8,119,185,13,153,34,125,206,76,17,49,38,93,206,52,151,154,119,56,28,
+76,130,112,200,141,206,21,209,96,23,35,238,114,160,139,0,243,238,114,78,
+164,68,68,110,113,226,210,90,26,66,110,113,128,121,247,57,80,68,141,170,
+183,56,84,52,11,70,73,19,110,114,160,93,8,113,57,143,66,200,84,53,244,154,
+73,24,240,81,32,38,68,18,49,228,207,23,88,100,109,70,114,92,193,4,137,173,
+168,36,220,73,19,247,247,182,168,209,144,187,223,58,156,104,79,190,183,127,
+123,105,160,110,247,206,167,26,19,239,173,223,222,218,67,75,189,243,169,
+198,132,251,235,183,247,182,154,134,151,123,231,83,141,9,247,215,111,239,
+109,22,141,22,247,206,167,26,19,239,172,223,218,45,26,47,157,78,52,39,223,
+74,24,144,10,32,129,34,20,64,152,142,129,57,179,67,104,68,12,129,161,140,
+72,156,100,40,40,185,152,100,89,38,65,13,196,34,228,67,149,13,2,215,129,
+149,209,65,104,209,77,14,104,144,81,33,170,67,101,48,52,68,113,70,210,88,
+209,36,233,22,154,86,68,196,114,76,232,145,102,120,186,195,156,112,105,225,
+228,113,71,80,68,162,115,101,50,85,200,25,108,116,44,132,178,38,114,137,96,
+148,136,70,209,134,37,222,232,204,228,188,200,209,200,200,99,221,25,150,84,
+121,34,70,209,107,36,227,66,20,160,92,136,164,49,235,35,8,217,201,40,108,
+201,18,128,68,26,201,51,188,2,80,12,67,190,40,168,38,68,190,46,153,5,50,12,
+207,160,86,129,26,83,4,208,34,225,4,88,192,
 };
 #endif  /* DUK_USE_ROM_STRINGS */
 
 #if defined(DUK_USE_ROM_OBJECTS)
 #error ROM support not enabled, rerun configure.py with --rom-support
 #else  /* DUK_USE_ROM_OBJECTS */
-/* native functions: 183 */
-DUK_INTERNAL const duk_c_function duk_bi_native_functions[183] = {
+/* native functions: 185 */
+DUK_INTERNAL const duk_c_function duk_bi_native_functions[185] = {
 	NULL,
 	duk_bi_array_constructor,
 	duk_bi_array_constructor_is_array,
@@ -10881,6 +10977,8 @@ DUK_INTERNAL const duk_c_function duk_bi_native_functions[183] = {
 	duk_bi_buffer_readfield,
 	duk_bi_buffer_slice_shared,
 	duk_bi_buffer_writefield,
+	duk_bi_cbor_decode,
+	duk_bi_cbor_encode,
 	duk_bi_dataview_constructor,
 	duk_bi_date_constructor,
 	duk_bi_date_constructor_now,
@@ -11041,598 +11139,604 @@ DUK_INTERNAL const duk_c_function duk_bi_native_functions[183] = {
 	duk_bi_uint8array_plainof,
 };
 #if defined(DUK_USE_DOUBLE_LE)
-DUK_INTERNAL const duk_uint8_t duk_builtins_data[4251] = {
-144,148,105,225,32,68,52,228,126,12,104,201,37,132,52,167,194,138,105,244,
-124,57,28,211,57,18,64,52,238,254,44,138,111,171,241,164,19,87,137,30,33,
-167,18,145,159,8,211,137,9,225,42,5,240,145,139,163,163,8,211,137,10,228,
-64,211,19,132,140,93,29,56,70,156,72,119,34,66,146,36,104,137,194,70,46,
-142,172,35,78,36,47,146,195,102,11,240,145,139,163,175,8,211,137,9,228,240,
-242,112,145,139,163,179,8,211,137,8,237,34,130,118,49,116,118,225,26,48,0,
-1,94,29,201,158,46,183,39,135,147,132,140,93,16,132,76,66,33,8,66,16,132,
-33,8,66,26,180,41,97,167,64,150,34,33,154,112,0,1,87,247,35,79,103,237,198,
-174,216,47,31,23,95,17,13,31,217,96,211,49,50,53,212,77,141,24,0,0,179,10,
-228,240,242,15,128,140,65,128,134,188,0,0,89,167,97,181,224,0,2,205,62,53,
-224,0,2,205,66,237,120,0,0,179,81,204,107,192,0,5,154,150,67,94,0,0,44,212,
-245,90,240,0,1,102,169,162,215,128,0,11,53,93,150,188,0,0,89,171,111,53,
-108,150,163,70,0,0,42,2,249,50,94,124,35,68,225,146,49,13,24,0,0,165,161,
-124,153,47,62,12,130,112,201,24,132,56,97,115,16,0,0,0,0,0,0,62,31,243,48,
-0,0,0,0,0,0,60,31,242,241,32,26,193,55,132,112,161,156,72,135,26,41,200,
-140,114,163,156,201,7,56,79,9,80,47,132,140,93,19,160,43,145,3,76,78,18,49,
-116,78,144,238,68,133,36,72,209,19,132,140,93,19,168,47,146,195,102,11,240,
-145,139,162,117,132,242,120,121,56,72,197,209,59,2,59,72,160,157,140,93,19,
-181,36,242,50,143,36,31,131,162,166,7,144,238,133,227,226,235,224,242,161,
-249,18,21,100,20,207,44,199,151,180,122,89,135,152,154,121,153,199,156,158,
-121,218,7,158,162,121,250,71,160,166,122,26,135,162,170,122,58,199,164,16,
-240,70,68,226,27,51,199,138,120,35,34,112,171,112,38,121,1,124,153,47,62,
-17,162,112,201,19,211,11,228,201,121,240,100,19,134,72,158,160,91,201,18,
-186,44,3,68,79,122,168,151,115,165,40,21,18,227,65,198,231,200,8,68,184,84,
-53,19,38,120,128,145,144,78,25,59,72,163,48,64,144,200,39,12,157,164,80,46,
-185,143,115,72,217,230,72,9,35,68,225,147,180,138,51,68,9,17,162,112,201,
-218,69,2,235,152,247,52,141,158,108,128,98,72,64,121,51,132,4,81,164,144,
-128,242,104,136,0,16,92,38,14,49,39,199,197,211,116,240,242,113,197,231,18,
-53,189,116,65,131,18,124,117,155,199,197,207,36,103,142,12,146,20,80,249,
-186,60,116,4,204,73,241,214,111,31,23,60,145,158,56,208,48,146,229,146,3,2,
-82,65,155,195,94,3,10,36,4,201,196,64,56,100,42,26,78,62,46,121,35,60,113,
-152,16,25,10,134,147,143,139,158,72,205,4,151,21,0,73,16,11,230,144,12,88,
-144,153,39,52,144,69,241,37,72,217,240,151,153,27,36,57,178,230,16,16,137,
-114,68,2,200,62,81,1,8,151,11,23,100,141,229,18,6,34,92,37,230,70,201,1,89,
-57,36,2,40,152,151,44,129,83,18,124,117,155,199,197,207,36,103,142,75,12,
-11,151,46,89,40,18,37,200,64,12,154,236,252,238,185,23,95,213,1,132,234,0,
-194,245,128,14,56,37,199,89,188,124,92,242,70,120,232,16,26,137,113,241,
-116,221,60,60,156,113,122,36,10,62,46,121,35,60,113,18,225,27,70,18,32,10,
-201,211,32,67,107,104,100,42,26,78,24,147,153,35,181,181,207,64,67,107,104,
-100,42,26,78,72,147,153,35,181,181,207,68,16,218,218,91,156,170,63,134,36,
-230,72,237,109,116,136,16,218,218,91,156,170,63,146,36,230,72,237,109,116,
-137,16,96,128,228,2,6,191,46,3,71,147,68,4,16,22,188,169,240,16,40,104,242,
-135,198,171,44,68,65,5,217,231,215,6,231,62,188,8,49,1,3,162,92,4,98,12,41,
-7,33,148,53,242,128,97,32,130,3,9,205,16,38,199,198,14,9,0,111,115,225,0,8,
-250,72,240,207,128,241,37,73,25,18,40,0,178,58,11,56,192,2,201,104,17,35,
-160,9,39,70,114,8,6,147,214,129,18,74,240,30,141,145,208,89,203,62,3,161,
-163,37,248,226,185,244,11,88,37,62,33,163,37,248,226,185,252,0,127,255,130,
-146,164,142,32,26,1,36,230,18,1,164,7,43,163,194,0,71,128,105,64,216,7,192,
-52,192,197,66,230,72,192,52,224,209,32,232,34,68,62,129,113,32,232,34,114,
-40,49,231,16,254,0,63,255,208,99,2,140,44,92,206,8,224,143,4,225,147,210,
-124,13,44,92,206,9,195,39,30,228,54,126,163,225,200,169,198,133,42,166,191,
-246,3,11,251,0,24,71,4,120,9,251,8,10,17,193,30,9,195,39,1,63,105,1,98,112,
-201,199,185,13,159,1,63,105,32,48,156,209,2,126,227,224,58,26,50,95,142,47,
-192,208,22,176,74,124,67,70,75,241,197,248,26,64,213,184,64,89,56,39,49,
-224,137,62,36,2,176,19,17,254,68,3,196,143,88,4,79,162,0,210,32,34,35,253,
-72,5,146,208,34,125,144,5,147,214,137,253,208,9,149,3,41,197,13,55,233,0,
-185,187,139,117,137,30,8,18,39,172,1,25,187,139,112,128,178,113,110,177,35,
-193,2,68,245,128,23,55,114,143,121,35,193,2,68,245,130,8,205,220,91,132,5,
-147,148,123,201,30,8,18,39,172,16,18,113,67,63,128,3,68,143,32,39,243,32,
-42,83,4,103,46,89,19,63,224,208,16,70,142,92,178,38,127,193,164,8,67,68,
-186,12,146,247,154,1,165,64,202,113,252,160,131,32,7,35,167,26,50,235,231,
-130,48,179,192,65,148,69,19,214,2,251,85,2,232,72,31,255,255,255,255,255,
-253,239,226,122,196,55,106,160,93,9,0,4,0,0,0,0,0,0,3,49,0,0,0,0,0,0,3,225,
-252,143,94,233,34,104,169,54,144,210,161,168,158,32,0,0,0,0,0,0,120,63,145,
-235,72,96,77,21,38,210,26,84,53,19,196,0,0,0,0,0,0,15,15,240,253,35,228,
-133,185,176,0,0,0,0,0,0,44,15,8,117,128,190,212,128,82,109,33,179,33,137,
-24,31,255,255,255,255,255,231,232,100,58,196,55,106,64,41,54,144,217,144,
-196,140,15,255,255,255,255,255,243,252,49,15,4,100,78,33,179,60,120,167,
-130,50,39,10,183,2,103,144,113,8,151,10,134,162,100,221,16,18,137,113,13,
-153,12,72,238,137,1,81,46,52,28,110,232,148,53,18,228,128,82,113,13,153,12,
-72,238,137,142,73,78,52,0,0,0,0,0,0,0,0,8,58,254,1,12,38,248,134,23,130,0,
-60,221,194,162,228,30,244,128,217,187,132,187,220,210,54,104,2,247,132,5,
-205,220,124,72,36,73,14,110,252,132,25,128,193,94,8,200,149,200,3,237,38,
-43,31,192,54,186,213,128,57,45,56,210,0,0,0,0,0,0,62,31,241,90,251,224,6,
-77,220,24,38,78,74,113,67,77,124,16,50,110,228,208,194,114,83,138,26,107,
-224,172,37,240,97,41,187,139,112,128,178,112,96,153,57,41,197,13,53,240,
-113,41,187,139,112,128,178,114,104,97,57,41,197,13,53,240,128,195,95,8,44,
-61,240,132,216,93,33,133,192,128,14,98,79,147,67,9,129,0,44,196,159,11,69,
-175,152,32,35,100,33,135,24,147,237,38,34,246,139,95,48,64,70,200,68,8,49,
-39,198,57,179,61,144,138,22,98,79,180,152,153,215,54,103,178,17,129,204,73,
-240,96,153,44,132,112,163,18,125,164,196,62,130,100,178,18,1,140,73,240,96,
-197,144,146,18,98,79,180,152,135,208,98,200,74,8,49,39,195,186,145,149,144,
-150,22,98,79,180,152,143,215,82,50,178,19,2,140,73,241,136,109,38,73,89,9,
-161,166,36,251,73,137,157,67,105,50,74,200,78,10,49,39,201,16,78,104,229,
-100,39,134,152,147,237,38,41,116,130,115,71,43,33,64,60,196,159,24,133,173,
-18,32,156,209,202,200,81,18,49,39,218,76,76,234,22,180,72,130,115,71,43,33,
-72,68,196,159,38,134,19,46,105,56,226,150,68,157,160,1,228,73,242,104,97,
-46,16,31,34,79,140,66,214,137,16,78,104,229,108,169,137,72,147,237,38,38,
-117,11,90,36,65,57,163,149,178,168,21,34,79,146,32,156,209,202,218,250,161,
-178,36,251,73,138,93,32,156,209,202,218,250,193,82,36,248,196,54,147,36,
-173,191,174,27,34,79,180,152,153,212,54,147,36,173,191,176,17,34,79,135,
-117,35,43,115,236,133,200,147,237,38,35,245,212,140,173,207,180,15,34,79,
-131,4,201,108,173,133,72,147,237,38,33,244,19,37,178,184,17,34,79,140,115,
-102,123,107,238,133,200,147,237,38,38,117,205,153,237,175,188,23,34,79,133,
-162,215,204,16,17,182,254,248,116,137,62,210,98,47,104,181,243,4,4,109,191,
-192,131,152,147,230,8,8,217,12,16,60,137,62,96,128,141,178,193,181,55,136,
-200,51,128,114,108,28,100,128,0,0,0,0,0,0,0,12,110,127,32,98,115,249,73,
-117,243,249,67,21,159,202,38,47,63,148,86,8,75,144,94,50,1,38,73,79,204,67,
-95,231,1,6,128,14,79,129,185,40,249,18,149,181,207,142,199,155,172,248,172,
-89,183,207,140,198,137,175,200,0,159,72,10,5,21,220,138,120,74,129,124,36,
-98,232,228,74,81,62,160,20,10,107,185,21,114,32,105,137,194,70,46,142,68,
-165,19,235,1,64,170,187,145,119,34,66,146,36,104,137,194,70,46,142,68,165,
-19,236,1,64,174,187,145,95,37,134,204,23,225,35,23,71,34,82,137,246,128,
-160,89,93,200,167,147,195,201,194,70,46,142,68,165,19,238,1,64,182,187,145,
-71,105,20,19,177,139,163,145,41,68,16,7,6,15,82,70,72,115,96,0,0,0,0,0,118,
-105,160,91,60,165,195,201,194,8,134,149,216,130,0,192,41,224,136,2,48,176,
-228,1,149,13,195,15,0,200,209,97,71,128,99,32,176,131,192,113,57,143,0,167,
-131,32,230,80,28,202,139,175,237,2,48,189,160,20,1,119,48,87,193,186,129,
-89,56,72,197,209,200,193,185,35,23,71,109,13,219,36,98,232,237,156,13,26,
-208,211,14,102,19,87,137,91,95,128,0,10,64,24,92,0,0,82,2,53,63,240,49,204,
-202,10,14,38,78,44,141,52,207,31,0,0,22,32,129,100,180,8,148,145,78,102,
-152,80,113,50,113,100,105,166,120,248,0,0,177,1,65,196,201,199,20,178,36,
-227,224,0,2,200,3,6,133,41,35,31,0,0,22,1,44,57,137,62,33,179,216,162,152,
-192,131,18,124,162,27,61,138,41,108,32,196,159,16,217,232,235,81,76,104,73,
-137,62,81,13,158,142,181,20,184,16,98,79,136,108,244,244,168,166,56,36,196,
-159,40,134,207,79,74,138,93,10,49,39,194,173,192,158,158,149,20,188,20,98,
-79,133,91,129,61,109,74,41,124,30,68,159,16,217,236,83,108,96,68,137,62,81,
-13,158,197,54,182,17,34,79,136,108,244,117,169,182,52,38,68,159,40,134,207,
-71,90,155,92,8,145,39,196,54,122,122,84,219,28,19,34,79,148,67,103,167,165,
-77,174,133,72,147,225,86,224,79,79,74,155,94,10,145,39,194,173,192,158,182,
-165,54,190,206,25,212,35,208,226,100,150,211,201,29,162,44,140,35,103,0,0,
-0,0,0,0,3,192,252,206,25,228,35,208,226,100,150,211,201,29,162,44,140,35,
-103,0,0,0,0,0,0,3,192,252,206,25,244,35,208,226,100,150,211,201,29,162,44,
-140,35,103,0,0,0,0,0,0,3,192,252,206,26,4,35,208,226,100,150,211,201,29,
-162,44,140,35,103,0,0,0,0,0,0,0,1,0,206,26,20,35,208,226,100,150,211,201,
-29,162,44,140,35,103,0,0,0,0,0,0,0,1,0,206,26,36,35,208,226,100,150,211,
-201,29,162,44,140,35,103,0,0,0,0,0,0,0,65,0,206,26,52,35,208,226,100,150,
-211,201,29,162,44,140,35,103,0,0,0,0,0,0,0,65,0,206,26,68,35,208,226,100,
-150,211,201,29,162,44,140,35,103,0,0,0,0,0,0,0,65,0,206,26,84,35,208,226,
-100,150,211,201,29,162,44,140,35,103,0,0,0,0,0,0,0,129,0,195,154,99,16,38,
-36,0,251,68,117,179,216,162,128,68,72,1,241,13,158,197,20,150,25,18,0,125,
-162,58,217,232,235,117,100,162,136,25,18,0,125,162,58,217,232,235,116,36,
-162,145,2,226,64,15,136,108,244,117,186,178,81,73,129,113,32,7,196,54,122,
-58,221,9,40,165,64,200,144,3,237,17,214,207,79,75,171,37,20,80,200,144,3,
-237,17,214,207,79,75,161,37,20,138,23,18,0,124,67,103,167,165,213,146,138,
-77,11,137,0,62,33,179,211,210,232,73,69,42,133,196,128,31,10,183,2,125,89,
-40,163,5,196,128,31,10,183,2,125,9,40,164,96,200,144,3,224,221,64,172,157,
-89,40,163,134,68,128,31,6,234,5,100,232,73,69,35,133,68,128,31,104,142,182,
-125,89,40,180,0,168,144,3,237,17,214,207,161,37,22,144,19,18,0,124,67,103,
-213,146,139,80,9,137,0,62,33,179,232,73,69,172,5,90,40,153,59,68,117,179,
-216,166,192,77,162,137,147,136,108,246,41,180,176,219,69,19,39,104,142,182,
-122,58,221,89,41,178,6,218,40,153,59,68,117,179,209,214,232,73,77,162,6,90,
-40,153,56,134,207,71,91,171,37,54,152,25,104,162,100,226,27,61,29,110,132,
-148,218,160,109,162,137,147,180,71,91,61,61,46,172,148,217,67,109,20,76,
-157,162,58,217,233,233,116,36,166,209,67,45,20,76,156,67,103,167,165,213,
-146,155,77,12,180,81,50,113,13,158,158,151,66,74,109,84,50,209,68,201,194,
-173,192,159,86,74,108,193,150,138,38,78,21,110,4,250,18,83,104,193,182,138,
-38,78,13,212,10,201,213,146,155,56,109,162,137,147,131,117,2,178,116,36,
-166,209,194,237,20,76,157,162,58,217,245,100,167,16,2,237,20,76,157,162,58,
-217,244,36,167,18,2,173,20,76,156,67,103,213,146,156,80,10,180,81,50,113,
-13,159,66,74,113,97,175,220,48,216,109,192,4,42,22,189,163,0,196,133,0,185,
-80,32,28,78,99,193,18,80,36,4,19,159,141,156,0,178,90,4,74,73,0,22,209,68,
-201,185,129,4,2,8,3,132,64,60,36,6,149,113,72,176,171,240,84,0,157,91,116,
-116,32,11,42,218,221,216,181,129,32,3,234,219,165,3,188,231,235,249,8,187,
-152,252,47,86,227,105,18,7,244,17,91,42,56,175,185,248,110,173,198,209,208,
-36,0,238,82,97,87,188,189,179,240,93,122,32,12,22,162,42,125,144,132,160,7,
-236,161,25,232,237,105,64,205,59,127,102,158,160,230,63,11,217,66,51,210,
-129,154,118,254,205,61,65,236,127,171,197,34,168,48,6,90,162,1,0,39,75,84,
-72,8,9,33,186,162,80,64,76,13,213,19,2,130,96,110,150,181,0,65,6,51,213,20,
-128,65,17,11,213,19,130,137,121,211,210,210,144,6,39,75,84,80,0,201,119,
-234,138,8,41,86,231,71,84,80,129,79,135,186,122,101,224,34,25,69,233,208,3,
-91,141,170,40,96,139,113,180,181,69,36,21,110,54,142,134,168,165,1,176,23,
-212,47,0,216,134,234,87,128,111,117,181,168,128,209,3,70,230,106,192,5,139,
-168,209,234,138,32,36,144,102,235,8,3,146,27,170,40,160,146,132,103,170,40,
-192,115,3,117,69,28,22,113,163,69,170,41,103,1,66,188,17,145,52,104,4,202,
-113,67,76,130,227,72,194,13,240,108,0,0,83,96,0,2,185,0,104,146,84,97,48,0,
-1,90,192,56,169,24,145,179,192,0,5,96,8,56,16,32,128,56,18,52,125,198,86,
-147,186,140,28,50,21,13,39,31,23,60,145,158,56,204,141,47,121,6,155,190,
-188,24,49,39,199,89,188,124,92,242,70,120,224,201,33,69,15,155,163,199,68,
-14,49,39,199,197,211,116,240,242,113,197,231,18,180,254,4,3,17,46,18,243,
-35,100,128,172,156,146,70,163,150,76,34,248,146,164,108,248,75,204,141,146,
-28,217,115,9,27,79,11,241,173,235,162,160,224,200,2,206,9,113,13,148,192,
-209,18,22,164,146,37,193,57,162,4,249,39,196,128,24,2,178,66,213,136,68,
-201,16,77,209,131,31,192,242,88,96,92,191,151,34,100,136,38,232,255,252,92,
-221,199,197,12,68,209,82,66,212,11,155,185,41,197,13,55,38,3,66,213,47,131,
-250,72,12,162,99,133,116,127,196,32,225,1,3,34,92,170,9,105,164,32,225,64,
-131,156,1,193,133,7,19,39,22,70,154,103,143,128,0,11,16,20,28,76,156,113,
-75,34,78,62,0,0,44,128,48,104,82,146,49,240,0,1,96,11,180,192,0,5,162,1,18,
-160,65,24,131,20,145,25,188,48,132,122,28,76,146,218,121,35,180,69,145,132,
-108,224,0,0,0,0,0,0,120,31,153,188,56,132,122,28,76,146,218,121,35,180,69,
-145,132,108,224,0,0,0,0,0,0,120,31,168,160,45,110,23,30,176,33,184,0,0,181,
-32,29,235,2,27,199,23,0,0,22,196,51,120,129,8,244,56,153,37,180,242,71,104,
-139,35,8,217,192,0,0,0,0,0,0,240,63,51,120,145,8,244,56,153,37,180,242,71,
-104,139,35,8,217,192,0,0,0,0,0,0,0,64,51,120,161,8,244,56,153,37,180,242,
-71,104,139,35,8,217,192,0,0,0,0,0,0,0,64,51,120,177,8,244,56,153,37,180,
-242,71,104,139,35,8,217,192,0,0,0,0,0,0,16,64,51,120,193,8,244,56,153,37,
-180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,16,64,51,120,209,8,244,56,153,
-37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,16,64,51,120,225,8,244,56,
-153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,32,64,32,227,194,0,97,
-57,162,4,246,40,5,34,92,35,68,225,161,166,219,16,16,137,112,52,41,73,29,
-169,1,65,196,201,197,145,166,153,246,8,3,137,204,120,34,74,8,200,58,128,28,
-211,160,130,52,78,26,26,110,248,0,0,170,4,12,70,137,195,38,0,0,42,68,159,7,
-84,3,154,150,16,70,137,195,67,77,223,0,0,20,224,20,160,152,23,223,0,0,20,
-226,9,65,154,232,147,161,115,59,224,0,2,156,84,12,50,9,195,38,0,0,41,133,
-30,224,32,54,186,221,128,60,
+DUK_INTERNAL const duk_uint8_t duk_builtins_data[4281] = {
+144,148,105,226,32,68,52,228,254,12,104,202,37,132,52,167,194,138,105,245,
+124,57,28,211,57,18,64,52,239,126,44,138,111,175,241,164,19,87,145,30,33,
+167,22,145,159,8,211,139,9,225,42,5,240,145,139,163,163,8,211,139,10,228,
+64,211,19,132,140,93,29,56,70,156,88,119,34,66,146,36,104,137,194,70,46,
+142,172,35,78,44,47,146,195,102,11,240,145,139,163,175,8,211,139,9,228,240,
+242,112,145,139,163,179,8,211,139,8,237,34,130,118,49,116,118,225,26,48,0,
+1,98,29,201,158,46,183,39,135,147,132,140,93,16,132,76,66,33,8,66,16,132,
+33,8,66,26,180,105,97,167,68,150,34,33,154,112,0,1,91,247,35,79,111,237,
+198,174,232,47,31,23,95,17,13,31,249,96,211,49,50,53,214,77,141,24,0,0,181,
+10,228,240,242,15,128,140,65,128,134,188,0,0,90,167,97,181,224,0,2,213,62,
+53,224,0,2,213,66,237,120,0,0,181,81,204,107,192,0,5,170,150,67,94,0,0,45,
+84,245,90,240,0,1,106,169,162,215,128,0,11,85,93,150,188,0,0,90,171,111,53,
+109,22,162,26,48,0,1,84,23,201,146,243,225,26,39,12,145,136,104,192,0,5,61,
+11,228,201,121,240,100,19,134,72,196,33,195,14,40,203,112,64,190,76,232,
+145,153,136,0,0,0,0,0,0,31,15,249,152,0,0,0,0,0,0,30,15,249,120,144,13,96,
+155,194,56,80,206,36,67,141,20,228,70,57,81,206,100,131,156,39,132,168,23,
+194,70,46,137,208,21,200,129,166,39,9,24,186,39,72,119,34,66,146,36,104,
+137,194,70,46,137,212,23,201,97,179,5,248,72,197,209,58,194,121,60,60,156,
+36,98,232,157,129,29,164,80,78,198,46,137,218,146,121,25,71,146,9,209,5,
+209,61,48,126,14,138,152,30,67,186,23,143,139,175,131,202,135,228,72,85,
+144,83,60,179,30,94,209,233,102,30,98,105,230,103,30,114,121,231,104,30,
+122,137,231,233,30,130,153,232,106,30,138,169,232,235,30,144,67,193,25,19,
+136,108,207,30,41,224,140,137,194,173,192,153,228,5,242,100,188,248,70,137,
+195,36,79,78,47,147,37,231,193,144,78,25,34,122,145,111,36,74,232,176,13,
+17,61,234,226,93,207,148,160,84,75,141,7,27,161,32,33,18,225,80,212,76,154,
+2,2,70,65,56,100,237,34,140,209,2,67,32,156,50,118,145,64,186,230,61,205,
+35,103,155,32,36,141,19,134,78,210,40,206,16,36,70,137,195,39,105,20,11,
+174,99,220,210,54,121,210,1,137,33,1,228,207,16,17,70,146,66,3,201,164,32,
+0,65,112,152,56,196,159,31,23,77,211,195,201,199,23,160,72,214,246,81,6,12,
+73,241,214,111,31,23,60,145,158,56,50,72,81,67,230,232,242,80,19,49,39,199,
+89,188,124,92,242,70,120,227,64,194,75,154,72,12,9,73,6,111,21,120,12,40,
+144,19,39,25,0,225,144,168,105,56,248,185,228,140,241,200,96,64,100,42,26,
+78,62,46,121,35,52,18,92,116,1,36,64,47,158,64,49,98,66,100,156,242,65,23,
+196,149,35,103,194,94,100,108,144,230,203,156,64,66,37,201,16,11,32,249,
+132,4,34,92,44,93,146,55,152,72,24,137,112,151,153,27,36,5,100,229,144,8,
+162,98,92,210,5,76,73,241,214,111,31,23,60,145,158,57,44,48,46,92,185,164,
+160,72,151,41,0,50,107,179,244,59,36,93,127,92,6,19,172,3,11,216,0,56,224,
+151,29,102,241,241,115,201,25,227,164,64,106,37,199,197,211,116,240,242,
+113,197,233,144,40,248,185,228,140,241,196,75,132,109,24,72,128,43,39,84,
+129,13,173,161,144,168,105,56,98,78,100,142,214,215,69,1,13,173,161,144,
+168,105,57,34,78,100,142,214,215,69,16,67,107,105,110,114,168,254,24,147,
+153,35,181,181,212,32,67,107,105,110,114,168,254,72,147,153,35,181,181,212,
+36,65,130,3,144,8,26,252,200,13,30,85,16,16,64,90,242,231,192,64,161,163,
+203,31,26,172,193,17,4,23,105,159,96,27,172,251,16,32,196,4,14,137,112,17,
+136,48,164,28,134,80,215,202,1,132,130,8,12,39,52,64,155,31,24,56,36,1,189,
+207,132,0,35,233,35,195,62,3,196,149,36,100,72,160,2,200,232,44,227,0,11,
+37,160,68,142,128,36,157,25,200,32,26,79,90,4,73,43,192,122,54,71,65,103,
+44,248,14,134,140,151,227,138,231,208,45,96,148,248,134,140,151,227,138,
+231,240,1,255,254,10,74,146,56,128,104,4,147,152,72,6,144,28,174,143,8,1,
+30,1,165,3,96,31,0,211,3,21,11,153,35,0,211,131,68,131,160,137,16,250,5,
+196,131,160,137,200,160,199,156,67,248,0,255,255,65,140,10,48,177,115,56,
+35,130,60,19,134,79,89,240,52,177,115,56,39,12,156,123,144,217,251,15,135,
+34,167,30,20,170,154,255,232,12,47,244,0,97,28,17,224,39,238,32,40,71,4,
+120,39,12,156,4,253,228,5,137,195,39,30,228,54,124,4,253,228,128,194,115,
+68,9,252,15,128,232,104,201,126,56,191,35,64,90,193,41,241,13,25,47,199,23,
+228,105,3,86,225,1,100,224,156,199,130,36,249,144,10,192,76,71,250,16,15,
+18,61,96,17,62,200,3,72,128,136,143,247,32,22,75,64,137,248,64,22,79,90,39,
+249,64,38,84,12,167,20,52,223,196,2,230,238,45,214,36,120,32,72,158,208,4,
+102,238,45,194,2,201,197,186,196,143,4,9,19,218,0,92,221,202,61,228,143,4,
+9,19,218,8,35,55,113,110,16,22,78,81,239,36,120,32,72,158,208,64,73,197,12,
+255,0,13,18,60,128,159,212,128,169,76,17,156,185,100,76,255,163,64,65,26,
+57,114,200,153,255,70,144,33,13,18,232,50,75,226,104,6,149,3,41,199,246,
+130,12,128,28,142,156,120,203,175,158,8,194,207,1,6,81,20,79,88,11,237,84,
+11,161,32,127,255,255,255,255,255,247,191,137,235,16,221,170,129,116,36,0,
+16,0,0,0,0,0,0,12,196,0,0,0,0,0,0,15,135,242,61,123,164,137,162,164,218,67,
+74,134,162,120,128,0,0,0,0,0,1,224,254,71,173,33,129,52,84,155,72,105,80,
+212,79,16,0,0,0,0,0,0,60,63,195,244,143,146,22,230,192,0,0,0,0,0,0,176,60,
+33,214,2,251,82,1,73,180,134,204,134,36,96,127,255,255,255,255,255,159,161,
+144,235,16,221,169,0,164,218,67,102,67,18,48,63,255,255,255,255,255,207,
+240,196,60,17,145,56,134,204,241,226,158,8,200,156,42,220,9,158,65,196,34,
+92,42,26,137,147,120,64,74,37,196,54,100,49,35,188,36,5,68,184,208,113,187,
+194,80,212,75,146,1,73,196,54,100,49,35,188,38,57,37,56,240,0,0,0,0,0,0,0,
+0,32,235,248,68,48,156,2,24,94,24,0,243,119,10,139,144,123,242,3,102,238,
+18,239,115,72,217,160,11,223,16,23,55,113,241,32,145,36,57,188,18,16,102,3,
+5,120,35,34,89,32,15,180,152,173,127,0,218,235,88,0,228,180,227,200,0,0,0,
+0,0,0,248,127,197,107,240,64,6,77,220,24,38,78,74,113,67,77,130,4,12,155,
+185,52,48,156,148,226,134,155,4,10,194,96,129,132,166,238,45,194,2,201,193,
+130,100,228,167,20,52,216,32,113,41,187,139,112,128,178,114,104,97,57,41,
+197,13,54,8,32,48,216,32,130,195,224,130,19,97,124,134,23,6,0,57,137,62,77,
+12,38,12,0,179,18,124,45,22,190,96,128,141,176,134,28,98,79,180,152,139,
+218,45,124,193,1,27,97,16,32,196,159,24,230,204,246,194,40,89,137,62,210,
+98,103,92,217,158,216,70,7,49,39,193,130,100,182,17,194,140,73,246,147,16,
+250,9,146,216,72,6,49,39,193,131,22,194,72,73,137,62,210,98,31,65,139,97,
+40,32,196,159,14,234,70,86,194,88,89,137,62,210,98,63,93,72,202,216,76,10,
+49,39,198,33,180,153,37,108,38,134,152,147,237,38,38,117,13,164,201,43,97,
+56,40,196,159,36,65,57,163,149,176,158,26,98,79,180,152,165,210,9,205,28,
+173,133,0,243,18,124,98,22,180,72,130,115,71,43,97,68,72,196,159,105,49,51,
+168,90,209,34,9,205,28,173,133,33,19,18,124,154,24,76,185,164,227,138,89,
+18,119,0,7,145,39,201,161,132,188,64,124,137,62,49,11,90,36,65,57,163,149,
+210,166,37,34,79,180,152,153,212,45,104,145,4,230,142,87,74,160,84,137,62,
+72,130,115,71,43,171,234,134,200,147,237,38,41,116,130,115,71,43,171,235,5,
+72,147,227,16,218,76,146,186,254,184,108,137,62,210,98,103,80,218,76,146,
+186,254,192,68,137,62,29,212,140,174,207,178,23,34,79,180,152,143,215,82,
+50,187,62,208,60,137,62,12,19,37,210,182,21,34,79,180,152,135,208,76,151,
+74,224,68,137,62,49,205,153,238,175,186,23,34,79,180,152,153,215,54,103,
+186,190,240,92,137,62,22,139,95,48,64,70,235,251,225,210,36,251,73,136,189,
+162,215,204,16,17,186,255,2,14,98,79,152,32,35,108,48,64,242,36,249,130,2,
+55,75,6,212,224,72,200,51,128,114,108,28,100,128,0,0,0,0,0,0,0,12,110,127,
+48,98,115,249,201,117,243,249,195,21,159,206,38,47,63,156,86,8,75,144,94,
+82,1,38,73,79,208,67,95,233,1,6,128,14,79,129,186,40,249,18,149,182,207,
+144,200,155,188,248,204,105,184,207,142,199,137,175,201,0,159,72,10,5,21,
+221,10,120,74,129,124,36,98,232,228,74,81,62,160,20,10,107,186,21,114,32,
+105,137,194,70,46,142,68,165,19,235,1,64,170,187,161,119,34,66,146,36,104,
+137,194,70,46,142,68,165,19,236,1,64,174,187,161,95,37,134,204,23,225,35,
+23,71,34,82,137,246,128,160,89,93,208,167,147,195,201,194,70,46,142,68,165,
+19,238,1,64,182,187,161,71,105,20,19,177,139,163,145,41,68,16,7,6,15,82,70,
+72,115,96,0,0,0,0,0,15,106,32,91,60,165,195,201,194,8,134,149,216,162,0,
+192,41,225,8,2,48,177,36,1,149,13,196,15,0,200,209,97,199,128,99,32,176,
+195,192,113,57,143,0,167,133,32,230,80,28,202,139,175,238,2,48,189,192,20,
+1,119,80,87,193,186,129,89,56,72,197,209,200,193,185,35,23,71,109,13,219,
+36,98,232,237,156,13,26,208,211,14,102,19,87,137,91,95,128,0,10,96,24,92,0,
+0,83,2,53,56,0,0,165,3,28,204,160,160,226,100,226,200,211,76,241,240,0,1,
+102,8,22,75,64,137,73,20,230,105,133,7,19,39,22,70,154,103,143,128,0,11,48,
+20,28,76,156,113,75,34,78,62,0,0,45,3,103,31,0,0,22,65,44,57,137,62,33,179,
+216,162,152,192,131,18,124,162,27,61,138,41,108,32,196,159,16,217,232,235,
+81,76,104,73,137,62,81,13,158,142,181,20,184,16,98,79,136,108,244,244,168,
+166,56,36,196,159,40,134,207,79,74,138,93,10,49,39,194,173,192,158,158,149,
+20,188,20,98,79,133,91,129,61,109,74,41,124,30,68,159,16,217,236,83,108,96,
+68,137,62,81,13,158,197,54,182,17,34,79,136,108,244,117,169,182,52,38,68,
+159,40,134,207,71,90,155,92,8,145,39,196,54,122,122,84,219,28,19,34,79,148,
+67,103,167,165,77,174,133,72,147,225,86,224,79,79,74,155,94,10,145,39,194,
+173,192,158,182,165,54,190,206,25,212,35,208,226,100,150,211,201,29,162,44,
+140,35,103,0,0,0,0,0,0,3,192,252,206,25,228,35,208,226,100,150,211,201,29,
+162,44,140,35,103,0,0,0,0,0,0,3,192,252,206,25,244,35,208,226,100,150,211,
+201,29,162,44,140,35,103,0,0,0,0,0,0,3,192,252,206,26,4,35,208,226,100,150,
+211,201,29,162,44,140,35,103,0,0,0,0,0,0,0,1,0,206,26,20,35,208,226,100,
+150,211,201,29,162,44,140,35,103,0,0,0,0,0,0,0,1,0,206,26,36,35,208,226,
+100,150,211,201,29,162,44,140,35,103,0,0,0,0,0,0,0,65,0,206,26,52,35,208,
+226,100,150,211,201,29,162,44,140,35,103,0,0,0,0,0,0,0,65,0,206,26,68,35,
+208,226,100,150,211,201,29,162,44,140,35,103,0,0,0,0,0,0,0,65,0,206,26,84,
+35,208,226,100,150,211,201,29,162,44,140,35,103,0,0,0,0,0,0,0,129,0,195,
+154,99,16,38,36,0,251,68,117,179,216,162,128,68,72,1,241,13,158,197,20,150,
+25,18,0,125,162,58,217,232,235,117,100,162,136,25,18,0,125,162,58,217,232,
+235,116,36,162,145,2,226,64,15,136,108,244,117,186,178,81,73,129,113,32,7,
+196,54,122,58,221,9,40,165,64,200,144,3,237,17,214,207,79,75,171,37,20,80,
+200,144,3,237,17,214,207,79,75,161,37,20,138,23,18,0,124,67,103,167,165,
+213,146,138,77,11,137,0,62,33,179,211,210,232,73,69,42,133,196,128,31,10,
+183,2,125,89,40,163,5,196,128,31,10,183,2,125,9,40,164,96,200,144,3,224,
+221,64,172,157,89,40,163,134,68,128,31,6,234,5,100,232,73,69,35,133,68,128,
+31,104,142,182,125,89,40,180,0,168,144,3,237,17,214,207,161,37,22,144,19,
+18,0,124,67,103,213,146,139,80,9,137,0,62,33,179,232,73,69,172,5,90,40,153,
+59,68,117,179,216,166,192,77,162,137,147,136,108,246,41,180,176,219,69,19,
+39,104,142,182,122,58,221,89,41,178,6,218,40,153,59,68,117,179,209,214,232,
+73,77,162,6,90,40,153,56,134,207,71,91,171,37,54,152,25,104,162,100,226,27,
+61,29,110,132,148,218,160,109,162,137,147,180,71,91,61,61,46,172,148,217,
+67,109,20,76,157,162,58,217,233,233,116,36,166,209,67,45,20,76,156,67,103,
+167,165,213,146,155,77,12,180,81,50,113,13,158,158,151,66,74,109,84,50,209,
+68,201,194,173,192,159,86,74,108,193,150,138,38,78,21,110,4,250,18,83,104,
+193,182,138,38,78,13,212,10,201,213,146,155,56,109,162,137,147,131,117,2,
+178,116,36,166,209,194,237,20,76,157,162,58,217,245,100,167,16,2,237,20,76,
+157,162,58,217,244,36,167,18,2,173,20,76,156,67,103,213,146,156,80,10,180,
+81,50,113,13,159,66,74,113,97,175,221,48,216,110,64,4,42,22,189,179,0,196,
+133,0,185,80,32,28,78,99,193,18,80,36,4,19,159,141,172,0,178,90,4,74,73,0,
+22,209,68,201,187,129,4,2,8,3,132,64,60,36,6,149,113,72,176,171,240,84,0,
+157,91,116,116,32,11,42,218,221,216,181,129,32,3,234,219,165,3,188,231,235,
+249,8,187,152,252,47,86,227,105,18,7,244,17,91,42,56,175,185,248,110,173,
+198,209,208,36,0,238,82,97,87,188,189,179,240,93,122,32,12,22,162,42,125,
+144,132,160,7,236,161,25,232,237,105,64,205,59,127,102,158,160,230,63,11,
+217,66,51,210,129,154,118,254,205,61,65,236,127,171,197,34,168,48,6,90,194,
+1,0,39,75,88,72,8,9,33,186,194,80,64,76,13,214,19,2,130,96,110,150,189,0,
+65,6,51,214,20,128,65,17,11,214,19,130,137,121,211,210,211,144,6,39,75,88,
+80,0,201,119,235,10,8,41,86,231,71,88,80,129,79,135,186,122,133,224,34,25,
+69,234,80,3,91,141,172,40,96,139,113,180,181,133,36,21,110,54,142,134,176,
+165,1,176,23,213,47,0,216,134,234,215,128,111,117,181,232,128,209,3,70,230,
+107,64,5,139,168,209,235,10,32,36,144,102,235,136,3,146,27,172,40,160,146,
+132,103,172,40,192,115,3,117,133,28,22,113,163,69,172,41,103,1,66,188,17,
+145,52,168,4,202,113,67,76,130,227,76,194,13,240,108,0,0,83,224,0,2,193,0,
+104,146,84,97,48,0,1,94,192,56,169,24,145,179,192,0,5,112,8,56,16,32,128,
+56,18,52,125,230,86,147,190,140,28,50,21,13,39,31,23,60,145,158,57,12,141,
+47,129,6,155,194,188,24,49,39,199,89,188,124,92,242,70,120,224,201,33,69,
+15,155,163,201,68,14,49,39,199,197,211,116,240,242,113,197,232,18,180,254,
+36,3,17,46,18,243,35,100,128,172,156,178,70,163,154,76,34,248,146,164,108,
+248,75,204,141,146,28,217,115,137,27,95,27,241,173,236,162,160,224,200,2,
+206,9,113,13,148,192,209,18,22,164,146,37,193,57,162,4,249,39,196,128,24,2,
+178,66,213,136,68,201,16,77,209,131,31,192,242,88,96,92,191,151,34,100,136,
+38,232,255,252,92,221,199,197,12,68,209,82,66,212,11,155,185,41,197,13,55,
+38,3,66,213,47,135,254,72,12,162,99,133,116,112,0,1,72,66,14,16,16,50,37,
+202,160,150,154,66,14,20,8,57,192,28,24,80,113,50,113,100,105,166,120,248,
+0,0,179,1,65,196,201,199,20,178,36,227,224,0,2,208,54,113,240,0,1,100,11,
+181,192,0,5,178,1,18,160,65,24,131,20,145,25,188,48,132,122,28,76,146,218,
+121,35,180,69,145,132,108,224,0,0,0,0,0,0,120,31,153,188,56,132,122,28,76,
+146,218,121,35,180,69,145,132,108,224,0,0,0,0,0,0,120,31,168,160,45,110,23,
+30,176,33,184,0,0,183,32,29,235,2,27,199,23,0,0,23,4,51,120,129,8,244,56,
+153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,240,63,51,120,145,8,244,
+56,153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,0,64,51,120,161,8,
+244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,0,64,51,120,177,
+8,244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,16,64,51,120,
+193,8,244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,16,64,51,
+120,209,8,244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,16,64,
+51,120,225,8,244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,0,0,0,0,32,
+64,32,227,194,0,97,57,162,4,246,104,5,34,92,35,68,225,161,166,220,16,16,
+137,112,52,41,73,29,185,1,65,196,201,197,145,166,153,246,72,3,137,204,120,
+34,74,8,199,1,67,17,162,112,201,84,128,97,144,78,25,42,16,131,169,1,205,66,
+8,35,68,225,161,166,239,128,0,10,192,64,196,104,156,50,96,0,2,172,73,240,
+117,96,57,170,97,4,104,156,52,52,221,240,0,1,82,1,74,9,129,125,240,0,1,82,
+32,148,25,174,137,58,23,51,190,0,0,42,69,64,195,32,156,50,96,0,2,160,81,
+238,2,3,107,173,218,3,192,
 };
 #elif defined(DUK_USE_DOUBLE_BE)
-DUK_INTERNAL const duk_uint8_t duk_builtins_data[4251] = {
-144,148,105,225,32,68,52,228,126,12,104,201,37,132,52,167,194,138,105,244,
-124,57,28,211,57,18,64,52,238,254,44,138,111,171,241,164,19,87,137,30,33,
-167,18,145,159,8,211,137,9,225,42,5,240,145,139,163,163,8,211,137,10,228,
-64,211,19,132,140,93,29,56,70,156,72,119,34,66,146,36,104,137,194,70,46,
-142,172,35,78,36,47,146,195,102,11,240,145,139,163,175,8,211,137,9,228,240,
-242,112,145,139,163,179,8,211,137,8,237,34,130,118,49,116,118,225,26,48,0,
-1,94,29,201,158,46,183,39,135,147,132,140,93,16,132,76,66,33,8,66,16,132,
-33,8,66,26,180,41,97,167,64,150,34,33,154,112,0,1,87,247,35,79,103,237,198,
-174,216,47,31,23,95,17,13,31,217,96,211,49,50,53,212,77,141,24,0,0,179,10,
-228,240,242,15,128,140,65,128,134,188,0,0,89,167,97,181,224,0,2,205,62,53,
-224,0,2,205,66,237,120,0,0,179,81,204,107,192,0,5,154,150,67,94,0,0,44,212,
-245,90,240,0,1,102,169,162,215,128,0,11,53,93,150,188,0,0,89,171,111,53,
-108,150,163,70,0,0,42,2,249,50,94,124,35,68,225,146,49,13,24,0,0,165,161,
-124,153,47,62,12,130,112,201,24,132,56,97,115,16,31,254,0,0,0,0,0,0,51,48,
-31,252,0,0,0,0,0,0,50,241,32,26,193,55,132,112,161,156,72,135,26,41,200,
-140,114,163,156,201,7,56,79,9,80,47,132,140,93,19,160,43,145,3,76,78,18,49,
-116,78,144,238,68,133,36,72,209,19,132,140,93,19,168,47,146,195,102,11,240,
-145,139,162,117,132,242,120,121,56,72,197,209,59,2,59,72,160,157,140,93,19,
-181,36,242,50,143,36,31,131,162,166,7,144,238,133,227,226,235,224,242,161,
-249,18,21,100,20,207,44,199,151,180,122,89,135,152,154,121,153,199,156,158,
-121,218,7,158,162,121,250,71,160,166,122,26,135,162,170,122,58,199,164,16,
-240,70,68,226,27,51,199,138,120,35,34,112,171,112,38,121,1,124,153,47,62,
-17,162,112,201,19,211,11,228,201,121,240,100,19,134,72,158,160,91,201,18,
-186,44,3,68,79,122,168,151,115,165,40,21,18,227,65,198,231,200,8,68,184,84,
-53,19,38,120,128,145,144,78,25,59,72,163,48,64,144,200,39,12,157,164,80,46,
-185,143,115,72,217,230,72,9,35,68,225,147,180,138,51,68,9,17,162,112,201,
-218,69,2,235,152,247,52,141,158,108,128,98,72,64,121,51,132,4,81,164,144,
-128,242,104,136,0,16,92,38,14,49,39,199,197,211,116,240,242,113,197,231,18,
-53,189,116,65,131,18,124,117,155,199,197,207,36,103,142,12,146,20,80,249,
-186,60,116,4,204,73,241,214,111,31,23,60,145,158,56,208,48,146,229,146,3,2,
-82,65,155,195,94,3,10,36,4,201,196,64,56,100,42,26,78,62,46,121,35,60,113,
-152,16,25,10,134,147,143,139,158,72,205,4,151,21,0,73,16,11,230,144,12,88,
-144,153,39,52,144,69,241,37,72,217,240,151,153,27,36,57,178,230,16,16,137,
-114,68,2,200,62,81,1,8,151,11,23,100,141,229,18,6,34,92,37,230,70,201,1,89,
-57,36,2,40,152,151,44,129,83,18,124,117,155,199,197,207,36,103,142,75,12,
-11,151,46,89,40,18,37,200,64,12,154,236,252,238,185,23,95,213,1,132,234,0,
-194,245,128,14,56,37,199,89,188,124,92,242,70,120,232,16,26,137,113,241,
-116,221,60,60,156,113,122,36,10,62,46,121,35,60,113,18,225,27,70,18,32,10,
-201,211,32,67,107,104,100,42,26,78,24,147,153,35,181,181,207,64,67,107,104,
-100,42,26,78,72,147,153,35,181,181,207,68,16,218,218,91,156,170,63,134,36,
-230,72,237,109,116,136,16,218,218,91,156,170,63,146,36,230,72,237,109,116,
-137,16,96,128,228,2,6,191,46,3,71,147,68,4,16,22,188,169,240,16,40,104,242,
-135,198,171,44,68,65,5,217,231,215,6,231,62,188,8,49,1,3,162,92,4,98,12,41,
-7,33,148,53,242,128,97,32,130,3,9,205,16,38,199,198,14,9,0,111,115,225,0,8,
-250,72,240,207,128,241,37,73,25,18,40,0,178,58,11,56,192,2,201,104,17,35,
-160,9,39,70,114,8,6,147,214,129,18,74,240,30,141,145,208,89,203,62,3,161,
-163,37,248,226,185,244,11,88,37,62,33,163,37,248,226,185,252,0,127,255,130,
-146,164,142,32,26,1,36,230,18,1,164,7,43,163,194,0,71,128,105,64,216,7,192,
-52,192,197,66,230,72,192,52,224,209,32,232,34,68,62,129,113,32,232,34,114,
-40,49,231,16,254,0,63,255,208,99,2,140,44,92,206,8,224,143,4,225,147,210,
-124,13,44,92,206,9,195,39,30,228,54,126,163,225,200,169,198,133,42,166,191,
-246,3,11,251,0,24,71,4,120,9,251,8,10,17,193,30,9,195,39,1,63,105,1,98,112,
-201,199,185,13,159,1,63,105,32,48,156,209,2,126,227,224,58,26,50,95,142,47,
-192,208,22,176,74,124,67,70,75,241,197,248,26,64,213,184,64,89,56,39,49,
-224,137,62,36,2,176,19,17,254,68,3,196,143,88,4,79,162,0,210,32,34,35,253,
-72,5,146,208,34,125,144,5,147,214,137,253,208,9,149,3,41,197,13,55,233,0,
-185,187,139,117,137,30,8,18,39,172,1,25,187,139,112,128,178,113,110,177,35,
-193,2,68,245,128,23,55,114,143,121,35,193,2,68,245,130,8,205,220,91,132,5,
-147,148,123,201,30,8,18,39,172,16,18,113,67,63,128,3,68,143,32,39,243,32,
-42,83,4,103,46,89,19,63,224,208,16,70,142,92,178,38,127,193,164,8,67,68,
-186,12,146,247,154,1,165,64,202,113,252,160,131,32,7,35,167,26,50,235,231,
-130,48,179,192,65,148,69,19,214,2,251,85,2,232,72,15,253,255,255,255,255,
-255,255,226,122,196,55,106,160,93,9,0,0,0,0,0,0,0,0,7,49,1,255,224,0,0,0,0,
-0,0,143,94,233,34,104,169,54,144,210,161,168,158,32,63,248,0,0,0,0,0,0,17,
-235,72,96,77,21,38,210,26,84,53,19,196,15,255,0,0,0,0,0,0,0,253,35,228,133,
-185,176,15,44,0,0,0,0,0,0,8,117,128,190,212,128,82,109,33,179,33,137,24,8,
-103,255,255,255,255,255,255,228,58,196,55,106,64,41,54,144,217,144,196,140,
-12,51,255,255,255,255,255,255,241,15,4,100,78,33,179,60,120,167,130,50,39,
-10,183,2,103,144,113,8,151,10,134,162,100,221,16,18,137,113,13,153,12,72,
-238,137,1,81,46,52,28,110,232,148,53,18,228,128,82,113,13,153,12,72,238,
-137,142,73,78,52,0,0,0,0,0,0,0,0,8,58,254,1,12,38,248,134,23,130,0,60,221,
-194,162,228,30,244,128,217,187,132,187,220,210,54,104,2,247,132,5,205,220,
-124,72,36,73,14,110,252,132,25,128,193,94,8,200,149,200,3,237,38,43,31,192,
-54,186,213,128,57,45,56,210,31,254,0,0,0,0,0,0,49,90,251,224,6,77,220,24,
-38,78,74,113,67,77,124,16,50,110,228,208,194,114,83,138,26,107,224,172,37,
-240,97,41,187,139,112,128,178,112,96,153,57,41,197,13,53,240,113,41,187,
-139,112,128,178,114,104,97,57,41,197,13,53,240,128,195,95,8,44,61,240,132,
-216,93,33,133,192,128,14,98,79,147,67,9,129,0,44,196,159,11,69,175,152,32,
-35,100,33,135,24,147,237,38,34,246,139,95,48,64,70,200,68,8,49,39,198,57,
-179,61,144,138,22,98,79,180,152,153,215,54,103,178,17,129,204,73,240,96,
-153,44,132,112,163,18,125,164,196,62,130,100,178,18,1,140,73,240,96,197,
-144,146,18,98,79,180,152,135,208,98,200,74,8,49,39,195,186,145,149,144,150,
-22,98,79,180,152,143,215,82,50,178,19,2,140,73,241,136,109,38,73,89,9,161,
-166,36,251,73,137,157,67,105,50,74,200,78,10,49,39,201,16,78,104,229,100,
-39,134,152,147,237,38,41,116,130,115,71,43,33,64,60,196,159,24,133,173,18,
-32,156,209,202,200,81,18,49,39,218,76,76,234,22,180,72,130,115,71,43,33,72,
-68,196,159,38,134,19,46,105,56,226,150,68,157,160,1,228,73,242,104,97,46,
-16,31,34,79,140,66,214,137,16,78,104,229,108,169,137,72,147,237,38,38,117,
-11,90,36,65,57,163,149,178,168,21,34,79,146,32,156,209,202,218,250,161,178,
-36,251,73,138,93,32,156,209,202,218,250,193,82,36,248,196,54,147,36,173,
-191,174,27,34,79,180,152,153,212,54,147,36,173,191,176,17,34,79,135,117,35,
-43,115,236,133,200,147,237,38,35,245,212,140,173,207,180,15,34,79,131,4,
-201,108,173,133,72,147,237,38,33,244,19,37,178,184,17,34,79,140,115,102,
-123,107,238,133,200,147,237,38,38,117,205,153,237,175,188,23,34,79,133,162,
-215,204,16,17,182,254,248,116,137,62,210,98,47,104,181,243,4,4,109,191,192,
-131,152,147,230,8,8,217,12,16,60,137,62,96,128,141,178,193,181,55,136,200,
-51,128,114,108,28,100,128,0,0,0,0,0,0,0,12,110,127,32,98,115,249,73,117,
-243,249,67,21,159,202,38,47,63,148,86,8,75,144,94,50,1,38,73,79,204,67,95,
-231,1,6,128,14,79,129,185,40,249,18,149,181,207,142,199,155,172,248,172,89,
-183,207,140,198,137,175,200,0,159,72,10,5,21,220,138,120,74,129,124,36,98,
-232,228,74,81,62,160,20,10,107,185,21,114,32,105,137,194,70,46,142,68,165,
-19,235,1,64,170,187,145,119,34,66,146,36,104,137,194,70,46,142,68,165,19,
-236,1,64,174,187,145,95,37,134,204,23,225,35,23,71,34,82,137,246,128,160,
-89,93,200,167,147,195,201,194,70,46,142,68,165,19,238,1,64,182,187,145,71,
-105,20,19,177,139,163,145,41,68,16,7,6,15,82,70,72,115,96,32,105,246,0,0,0,
-0,0,91,60,165,195,201,194,8,134,149,216,130,0,192,41,224,136,2,48,176,228,
-1,149,13,195,15,0,200,209,97,71,128,99,32,176,131,192,113,57,143,0,167,131,
-32,230,80,28,202,139,175,237,2,48,189,160,20,1,119,48,87,193,186,129,89,56,
-72,197,209,200,193,185,35,23,71,109,13,219,36,98,232,237,156,13,26,208,211,
-14,102,19,87,137,91,95,128,0,10,64,24,92,0,0,82,2,53,63,240,49,204,202,10,
-14,38,78,44,141,52,207,31,0,0,22,32,129,100,180,8,148,145,78,102,152,80,
-113,50,113,100,105,166,120,248,0,0,177,1,65,196,201,199,20,178,36,227,224,
-0,2,200,3,6,133,41,35,31,0,0,22,1,44,57,137,62,33,179,216,162,152,192,131,
-18,124,162,27,61,138,41,108,32,196,159,16,217,232,235,81,76,104,73,137,62,
-81,13,158,142,181,20,184,16,98,79,136,108,244,244,168,166,56,36,196,159,40,
-134,207,79,74,138,93,10,49,39,194,173,192,158,158,149,20,188,20,98,79,133,
-91,129,61,109,74,41,124,30,68,159,16,217,236,83,108,96,68,137,62,81,13,158,
-197,54,182,17,34,79,136,108,244,117,169,182,52,38,68,159,40,134,207,71,90,
-155,92,8,145,39,196,54,122,122,84,219,28,19,34,79,148,67,103,167,165,77,
-174,133,72,147,225,86,224,79,79,74,155,94,10,145,39,194,173,192,158,182,
-165,54,190,206,25,212,35,208,226,100,150,211,201,29,162,44,140,35,103,0,
-255,192,0,0,0,0,0,0,206,25,228,35,208,226,100,150,211,201,29,162,44,140,35,
-103,0,255,192,0,0,0,0,0,0,206,25,244,35,208,226,100,150,211,201,29,162,44,
-140,35,103,0,255,192,0,0,0,0,0,0,206,26,4,35,208,226,100,150,211,201,29,
-162,44,140,35,103,1,0,0,0,0,0,0,0,0,206,26,20,35,208,226,100,150,211,201,
-29,162,44,140,35,103,1,0,0,0,0,0,0,0,0,206,26,36,35,208,226,100,150,211,
-201,29,162,44,140,35,103,1,0,64,0,0,0,0,0,0,206,26,52,35,208,226,100,150,
-211,201,29,162,44,140,35,103,1,0,64,0,0,0,0,0,0,206,26,68,35,208,226,100,
-150,211,201,29,162,44,140,35,103,1,0,64,0,0,0,0,0,0,206,26,84,35,208,226,
-100,150,211,201,29,162,44,140,35,103,1,0,128,0,0,0,0,0,0,195,154,99,16,38,
-36,0,251,68,117,179,216,162,128,68,72,1,241,13,158,197,20,150,25,18,0,125,
-162,58,217,232,235,117,100,162,136,25,18,0,125,162,58,217,232,235,116,36,
-162,145,2,226,64,15,136,108,244,117,186,178,81,73,129,113,32,7,196,54,122,
-58,221,9,40,165,64,200,144,3,237,17,214,207,79,75,171,37,20,80,200,144,3,
-237,17,214,207,79,75,161,37,20,138,23,18,0,124,67,103,167,165,213,146,138,
-77,11,137,0,62,33,179,211,210,232,73,69,42,133,196,128,31,10,183,2,125,89,
-40,163,5,196,128,31,10,183,2,125,9,40,164,96,200,144,3,224,221,64,172,157,
-89,40,163,134,68,128,31,6,234,5,100,232,73,69,35,133,68,128,31,104,142,182,
-125,89,40,180,0,168,144,3,237,17,214,207,161,37,22,144,19,18,0,124,67,103,
-213,146,139,80,9,137,0,62,33,179,232,73,69,172,5,90,40,153,59,68,117,179,
-216,166,192,77,162,137,147,136,108,246,41,180,176,219,69,19,39,104,142,182,
-122,58,221,89,41,178,6,218,40,153,59,68,117,179,209,214,232,73,77,162,6,90,
-40,153,56,134,207,71,91,171,37,54,152,25,104,162,100,226,27,61,29,110,132,
-148,218,160,109,162,137,147,180,71,91,61,61,46,172,148,217,67,109,20,76,
-157,162,58,217,233,233,116,36,166,209,67,45,20,76,156,67,103,167,165,213,
-146,155,77,12,180,81,50,113,13,158,158,151,66,74,109,84,50,209,68,201,194,
-173,192,159,86,74,108,193,150,138,38,78,21,110,4,250,18,83,104,193,182,138,
-38,78,13,212,10,201,213,146,155,56,109,162,137,147,131,117,2,178,116,36,
-166,209,194,237,20,76,157,162,58,217,245,100,167,16,2,237,20,76,157,162,58,
-217,244,36,167,18,2,173,20,76,156,67,103,213,146,156,80,10,180,81,50,113,
-13,159,66,74,113,97,175,220,48,216,109,192,4,42,22,189,163,0,196,133,0,185,
-80,32,28,78,99,193,18,80,36,4,19,159,141,156,0,178,90,4,74,73,0,22,209,68,
-201,185,129,4,2,8,3,132,64,60,36,4,0,91,240,168,177,69,118,144,157,91,116,
-116,32,32,1,53,216,221,218,170,139,3,234,219,165,0,255,152,185,11,251,232,
-231,188,47,86,227,105,18,1,255,184,170,59,41,92,23,240,110,173,198,209,208,
-36,3,253,188,183,177,82,110,80,224,93,122,32,32,4,144,253,170,34,22,140,7,
-236,161,25,232,237,105,64,63,230,160,158,102,127,59,205,11,217,66,51,210,
-128,127,237,65,60,204,254,119,155,171,197,34,168,48,6,90,162,1,0,39,75,84,
-72,8,9,33,186,162,80,64,76,13,213,19,2,130,96,110,150,181,0,65,6,51,213,20,
-128,65,17,11,213,19,130,137,121,211,210,210,144,6,39,75,84,80,0,201,119,
-234,138,8,41,86,231,71,84,80,129,79,135,186,122,101,224,34,25,69,233,208,3,
-91,141,170,40,96,139,113,180,181,69,36,21,110,54,142,134,168,165,1,176,23,
-212,47,0,216,134,234,87,128,111,117,181,168,128,209,3,70,230,106,192,5,139,
-168,209,234,138,32,36,144,102,235,8,3,146,27,170,40,160,146,132,103,170,40,
-192,115,3,117,69,28,22,113,163,69,170,41,103,1,66,188,17,145,52,104,4,202,
-113,67,76,130,227,72,194,13,240,108,0,0,83,96,0,2,185,0,104,146,84,97,48,0,
-1,90,192,56,169,24,145,179,192,0,5,96,8,56,16,32,128,56,18,52,125,198,86,
-147,186,140,28,50,21,13,39,31,23,60,145,158,56,204,141,47,121,6,155,190,
-188,24,49,39,199,89,188,124,92,242,70,120,224,201,33,69,15,155,163,199,68,
-14,49,39,199,197,211,116,240,242,113,197,231,18,180,254,4,3,17,46,18,243,
-35,100,128,172,156,146,70,163,150,76,34,248,146,164,108,248,75,204,141,146,
-28,217,115,9,27,79,11,241,173,235,162,160,224,200,2,206,9,113,13,148,192,
-209,18,22,164,146,37,193,57,162,4,249,39,196,128,24,2,178,66,213,136,68,
-201,16,77,209,131,31,192,242,88,96,92,191,151,34,100,136,38,232,255,252,92,
-221,199,197,12,68,209,82,66,212,11,155,185,41,197,13,55,38,3,66,213,47,131,
-250,72,12,162,99,133,116,127,196,32,225,1,3,34,92,170,9,105,164,32,225,64,
-131,156,1,193,133,7,19,39,22,70,154,103,143,128,0,11,16,20,28,76,156,113,
-75,34,78,62,0,0,44,128,48,104,82,146,49,240,0,1,96,11,180,192,0,5,162,1,18,
-160,65,24,131,20,145,25,188,48,132,122,28,76,146,218,121,35,180,69,145,132,
-108,224,31,248,0,0,0,0,0,0,25,188,56,132,122,28,76,146,218,121,35,180,69,
-145,132,108,224,31,248,0,0,0,0,0,0,40,160,45,110,23,30,176,33,184,0,0,181,
-32,29,235,2,27,199,23,0,0,22,196,51,120,129,8,244,56,153,37,180,242,71,104,
-139,35,8,217,192,63,240,0,0,0,0,0,0,51,120,145,8,244,56,153,37,180,242,71,
-104,139,35,8,217,192,64,0,0,0,0,0,0,0,51,120,161,8,244,56,153,37,180,242,
-71,104,139,35,8,217,192,64,0,0,0,0,0,0,0,51,120,177,8,244,56,153,37,180,
-242,71,104,139,35,8,217,192,64,16,0,0,0,0,0,0,51,120,193,8,244,56,153,37,
-180,242,71,104,139,35,8,217,192,64,16,0,0,0,0,0,0,51,120,209,8,244,56,153,
-37,180,242,71,104,139,35,8,217,192,64,16,0,0,0,0,0,0,51,120,225,8,244,56,
-153,37,180,242,71,104,139,35,8,217,192,64,32,0,0,0,0,0,0,32,227,194,0,97,
-57,162,4,246,40,5,34,92,35,68,225,161,166,219,16,16,137,112,52,41,73,29,
-169,1,65,196,201,197,145,166,153,246,8,3,137,204,120,34,74,8,200,58,128,28,
-211,160,130,52,78,26,26,110,248,0,0,170,4,12,70,137,195,38,0,0,42,68,159,7,
-84,3,154,150,16,70,137,195,67,77,223,0,0,20,224,20,160,152,23,223,0,0,20,
-226,9,65,154,232,147,161,115,59,224,0,2,156,84,12,50,9,195,38,0,0,41,133,
-30,224,32,54,186,221,128,60,
+DUK_INTERNAL const duk_uint8_t duk_builtins_data[4281] = {
+144,148,105,226,32,68,52,228,254,12,104,202,37,132,52,167,194,138,105,245,
+124,57,28,211,57,18,64,52,239,126,44,138,111,175,241,164,19,87,145,30,33,
+167,22,145,159,8,211,139,9,225,42,5,240,145,139,163,163,8,211,139,10,228,
+64,211,19,132,140,93,29,56,70,156,88,119,34,66,146,36,104,137,194,70,46,
+142,172,35,78,44,47,146,195,102,11,240,145,139,163,175,8,211,139,9,228,240,
+242,112,145,139,163,179,8,211,139,8,237,34,130,118,49,116,118,225,26,48,0,
+1,98,29,201,158,46,183,39,135,147,132,140,93,16,132,76,66,33,8,66,16,132,
+33,8,66,26,180,105,97,167,68,150,34,33,154,112,0,1,91,247,35,79,111,237,
+198,174,232,47,31,23,95,17,13,31,249,96,211,49,50,53,214,77,141,24,0,0,181,
+10,228,240,242,15,128,140,65,128,134,188,0,0,90,167,97,181,224,0,2,213,62,
+53,224,0,2,213,66,237,120,0,0,181,81,204,107,192,0,5,170,150,67,94,0,0,45,
+84,245,90,240,0,1,106,169,162,215,128,0,11,85,93,150,188,0,0,90,171,111,53,
+109,22,162,26,48,0,1,84,23,201,146,243,225,26,39,12,145,136,104,192,0,5,61,
+11,228,201,121,240,100,19,134,72,196,33,195,14,40,203,112,64,190,76,232,
+145,153,136,15,255,0,0,0,0,0,0,25,152,15,254,0,0,0,0,0,0,25,120,144,13,96,
+155,194,56,80,206,36,67,141,20,228,70,57,81,206,100,131,156,39,132,168,23,
+194,70,46,137,208,21,200,129,166,39,9,24,186,39,72,119,34,66,146,36,104,
+137,194,70,46,137,212,23,201,97,179,5,248,72,197,209,58,194,121,60,60,156,
+36,98,232,157,129,29,164,80,78,198,46,137,218,146,121,25,71,146,9,209,5,
+209,61,48,126,14,138,152,30,67,186,23,143,139,175,131,202,135,228,72,85,
+144,83,60,179,30,94,209,233,102,30,98,105,230,103,30,114,121,231,104,30,
+122,137,231,233,30,130,153,232,106,30,138,169,232,235,30,144,67,193,25,19,
+136,108,207,30,41,224,140,137,194,173,192,153,228,5,242,100,188,248,70,137,
+195,36,79,78,47,147,37,231,193,144,78,25,34,122,145,111,36,74,232,176,13,
+17,61,234,226,93,207,148,160,84,75,141,7,27,161,32,33,18,225,80,212,76,154,
+2,2,70,65,56,100,237,34,140,209,2,67,32,156,50,118,145,64,186,230,61,205,
+35,103,155,32,36,141,19,134,78,210,40,206,16,36,70,137,195,39,105,20,11,
+174,99,220,210,54,121,210,1,137,33,1,228,207,16,17,70,146,66,3,201,164,32,
+0,65,112,152,56,196,159,31,23,77,211,195,201,199,23,160,72,214,246,81,6,12,
+73,241,214,111,31,23,60,145,158,56,50,72,81,67,230,232,242,80,19,49,39,199,
+89,188,124,92,242,70,120,227,64,194,75,154,72,12,9,73,6,111,21,120,12,40,
+144,19,39,25,0,225,144,168,105,56,248,185,228,140,241,200,96,64,100,42,26,
+78,62,46,121,35,52,18,92,116,1,36,64,47,158,64,49,98,66,100,156,242,65,23,
+196,149,35,103,194,94,100,108,144,230,203,156,64,66,37,201,16,11,32,249,
+132,4,34,92,44,93,146,55,152,72,24,137,112,151,153,27,36,5,100,229,144,8,
+162,98,92,210,5,76,73,241,214,111,31,23,60,145,158,57,44,48,46,92,185,164,
+160,72,151,41,0,50,107,179,244,59,36,93,127,92,6,19,172,3,11,216,0,56,224,
+151,29,102,241,241,115,201,25,227,164,64,106,37,199,197,211,116,240,242,
+113,197,233,144,40,248,185,228,140,241,196,75,132,109,24,72,128,43,39,84,
+129,13,173,161,144,168,105,56,98,78,100,142,214,215,69,1,13,173,161,144,
+168,105,57,34,78,100,142,214,215,69,16,67,107,105,110,114,168,254,24,147,
+153,35,181,181,212,32,67,107,105,110,114,168,254,72,147,153,35,181,181,212,
+36,65,130,3,144,8,26,252,200,13,30,85,16,16,64,90,242,231,192,64,161,163,
+203,31,26,172,193,17,4,23,105,159,96,27,172,251,16,32,196,4,14,137,112,17,
+136,48,164,28,134,80,215,202,1,132,130,8,12,39,52,64,155,31,24,56,36,1,189,
+207,132,0,35,233,35,195,62,3,196,149,36,100,72,160,2,200,232,44,227,0,11,
+37,160,68,142,128,36,157,25,200,32,26,79,90,4,73,43,192,122,54,71,65,103,
+44,248,14,134,140,151,227,138,231,208,45,96,148,248,134,140,151,227,138,
+231,240,1,255,254,10,74,146,56,128,104,4,147,152,72,6,144,28,174,143,8,1,
+30,1,165,3,96,31,0,211,3,21,11,153,35,0,211,131,68,131,160,137,16,250,5,
+196,131,160,137,200,160,199,156,67,248,0,255,255,65,140,10,48,177,115,56,
+35,130,60,19,134,79,89,240,52,177,115,56,39,12,156,123,144,217,251,15,135,
+34,167,30,20,170,154,255,232,12,47,244,0,97,28,17,224,39,238,32,40,71,4,
+120,39,12,156,4,253,228,5,137,195,39,30,228,54,124,4,253,228,128,194,115,
+68,9,252,15,128,232,104,201,126,56,191,35,64,90,193,41,241,13,25,47,199,23,
+228,105,3,86,225,1,100,224,156,199,130,36,249,144,10,192,76,71,250,16,15,
+18,61,96,17,62,200,3,72,128,136,143,247,32,22,75,64,137,248,64,22,79,90,39,
+249,64,38,84,12,167,20,52,223,196,2,230,238,45,214,36,120,32,72,158,208,4,
+102,238,45,194,2,201,197,186,196,143,4,9,19,218,0,92,221,202,61,228,143,4,
+9,19,218,8,35,55,113,110,16,22,78,81,239,36,120,32,72,158,208,64,73,197,12,
+255,0,13,18,60,128,159,212,128,169,76,17,156,185,100,76,255,163,64,65,26,
+57,114,200,153,255,70,144,33,13,18,232,50,75,226,104,6,149,3,41,199,246,
+130,12,128,28,142,156,120,203,175,158,8,194,207,1,6,81,20,79,88,11,237,84,
+11,161,32,63,247,255,255,255,255,255,255,137,235,16,221,170,129,116,36,0,0,
+0,0,0,0,0,0,28,196,7,255,128,0,0,0,0,0,2,61,123,164,137,162,164,218,67,74,
+134,162,120,128,255,224,0,0,0,0,0,0,71,173,33,129,52,84,155,72,105,80,212,
+79,16,63,252,0,0,0,0,0,0,3,244,143,146,22,230,192,60,176,0,0,0,0,0,0,33,
+214,2,251,82,1,73,180,134,204,134,36,96,33,159,255,255,255,255,255,255,144,
+235,16,221,169,0,164,218,67,102,67,18,48,48,207,255,255,255,255,255,255,
+196,60,17,145,56,134,204,241,226,158,8,200,156,42,220,9,158,65,196,34,92,
+42,26,137,147,120,64,74,37,196,54,100,49,35,188,36,5,68,184,208,113,187,
+194,80,212,75,146,1,73,196,54,100,49,35,188,38,57,37,56,240,0,0,0,0,0,0,0,
+0,32,235,248,68,48,156,2,24,94,24,0,243,119,10,139,144,123,242,3,102,238,
+18,239,115,72,217,160,11,223,16,23,55,113,241,32,145,36,57,188,18,16,102,3,
+5,120,35,34,89,32,15,180,152,173,127,0,218,235,88,0,228,180,227,200,127,
+248,0,0,0,0,0,0,197,107,240,64,6,77,220,24,38,78,74,113,67,77,130,4,12,155,
+185,52,48,156,148,226,134,155,4,10,194,96,129,132,166,238,45,194,2,201,193,
+130,100,228,167,20,52,216,32,113,41,187,139,112,128,178,114,104,97,57,41,
+197,13,54,8,32,48,216,32,130,195,224,130,19,97,124,134,23,6,0,57,137,62,77,
+12,38,12,0,179,18,124,45,22,190,96,128,141,176,134,28,98,79,180,152,139,
+218,45,124,193,1,27,97,16,32,196,159,24,230,204,246,194,40,89,137,62,210,
+98,103,92,217,158,216,70,7,49,39,193,130,100,182,17,194,140,73,246,147,16,
+250,9,146,216,72,6,49,39,193,131,22,194,72,73,137,62,210,98,31,65,139,97,
+40,32,196,159,14,234,70,86,194,88,89,137,62,210,98,63,93,72,202,216,76,10,
+49,39,198,33,180,153,37,108,38,134,152,147,237,38,38,117,13,164,201,43,97,
+56,40,196,159,36,65,57,163,149,176,158,26,98,79,180,152,165,210,9,205,28,
+173,133,0,243,18,124,98,22,180,72,130,115,71,43,97,68,72,196,159,105,49,51,
+168,90,209,34,9,205,28,173,133,33,19,18,124,154,24,76,185,164,227,138,89,
+18,119,0,7,145,39,201,161,132,188,64,124,137,62,49,11,90,36,65,57,163,149,
+210,166,37,34,79,180,152,153,212,45,104,145,4,230,142,87,74,160,84,137,62,
+72,130,115,71,43,171,234,134,200,147,237,38,41,116,130,115,71,43,171,235,5,
+72,147,227,16,218,76,146,186,254,184,108,137,62,210,98,103,80,218,76,146,
+186,254,192,68,137,62,29,212,140,174,207,178,23,34,79,180,152,143,215,82,
+50,187,62,208,60,137,62,12,19,37,210,182,21,34,79,180,152,135,208,76,151,
+74,224,68,137,62,49,205,153,238,175,186,23,34,79,180,152,153,215,54,103,
+186,190,240,92,137,62,22,139,95,48,64,70,235,251,225,210,36,251,73,136,189,
+162,215,204,16,17,186,255,2,14,98,79,152,32,35,108,48,64,242,36,249,130,2,
+55,75,6,212,224,72,200,51,128,114,108,28,100,128,0,0,0,0,0,0,0,12,110,127,
+48,98,115,249,201,117,243,249,195,21,159,206,38,47,63,156,86,8,75,144,94,
+82,1,38,73,79,208,67,95,233,1,6,128,14,79,129,186,40,249,18,149,182,207,
+144,200,155,188,248,204,105,184,207,142,199,137,175,201,0,159,72,10,5,21,
+221,10,120,74,129,124,36,98,232,228,74,81,62,160,20,10,107,186,21,114,32,
+105,137,194,70,46,142,68,165,19,235,1,64,170,187,161,119,34,66,146,36,104,
+137,194,70,46,142,68,165,19,236,1,64,174,187,161,95,37,134,204,23,225,35,
+23,71,34,82,137,246,128,160,89,93,208,167,147,195,201,194,70,46,142,68,165,
+19,238,1,64,182,187,161,71,105,20,19,177,139,163,145,41,68,16,7,6,15,82,70,
+72,115,96,32,106,15,0,0,0,0,0,91,60,165,195,201,194,8,134,149,216,162,0,
+192,41,225,8,2,48,177,36,1,149,13,196,15,0,200,209,97,199,128,99,32,176,
+195,192,113,57,143,0,167,133,32,230,80,28,202,139,175,238,2,48,189,192,20,
+1,119,80,87,193,186,129,89,56,72,197,209,200,193,185,35,23,71,109,13,219,
+36,98,232,237,156,13,26,208,211,14,102,19,87,137,91,95,128,0,10,96,24,92,0,
+0,83,2,53,56,0,0,165,3,28,204,160,160,226,100,226,200,211,76,241,240,0,1,
+102,8,22,75,64,137,73,20,230,105,133,7,19,39,22,70,154,103,143,128,0,11,48,
+20,28,76,156,113,75,34,78,62,0,0,45,3,103,31,0,0,22,65,44,57,137,62,33,179,
+216,162,152,192,131,18,124,162,27,61,138,41,108,32,196,159,16,217,232,235,
+81,76,104,73,137,62,81,13,158,142,181,20,184,16,98,79,136,108,244,244,168,
+166,56,36,196,159,40,134,207,79,74,138,93,10,49,39,194,173,192,158,158,149,
+20,188,20,98,79,133,91,129,61,109,74,41,124,30,68,159,16,217,236,83,108,96,
+68,137,62,81,13,158,197,54,182,17,34,79,136,108,244,117,169,182,52,38,68,
+159,40,134,207,71,90,155,92,8,145,39,196,54,122,122,84,219,28,19,34,79,148,
+67,103,167,165,77,174,133,72,147,225,86,224,79,79,74,155,94,10,145,39,194,
+173,192,158,182,165,54,190,206,25,212,35,208,226,100,150,211,201,29,162,44,
+140,35,103,0,255,192,0,0,0,0,0,0,206,25,228,35,208,226,100,150,211,201,29,
+162,44,140,35,103,0,255,192,0,0,0,0,0,0,206,25,244,35,208,226,100,150,211,
+201,29,162,44,140,35,103,0,255,192,0,0,0,0,0,0,206,26,4,35,208,226,100,150,
+211,201,29,162,44,140,35,103,1,0,0,0,0,0,0,0,0,206,26,20,35,208,226,100,
+150,211,201,29,162,44,140,35,103,1,0,0,0,0,0,0,0,0,206,26,36,35,208,226,
+100,150,211,201,29,162,44,140,35,103,1,0,64,0,0,0,0,0,0,206,26,52,35,208,
+226,100,150,211,201,29,162,44,140,35,103,1,0,64,0,0,0,0,0,0,206,26,68,35,
+208,226,100,150,211,201,29,162,44,140,35,103,1,0,64,0,0,0,0,0,0,206,26,84,
+35,208,226,100,150,211,201,29,162,44,140,35,103,1,0,128,0,0,0,0,0,0,195,
+154,99,16,38,36,0,251,68,117,179,216,162,128,68,72,1,241,13,158,197,20,150,
+25,18,0,125,162,58,217,232,235,117,100,162,136,25,18,0,125,162,58,217,232,
+235,116,36,162,145,2,226,64,15,136,108,244,117,186,178,81,73,129,113,32,7,
+196,54,122,58,221,9,40,165,64,200,144,3,237,17,214,207,79,75,171,37,20,80,
+200,144,3,237,17,214,207,79,75,161,37,20,138,23,18,0,124,67,103,167,165,
+213,146,138,77,11,137,0,62,33,179,211,210,232,73,69,42,133,196,128,31,10,
+183,2,125,89,40,163,5,196,128,31,10,183,2,125,9,40,164,96,200,144,3,224,
+221,64,172,157,89,40,163,134,68,128,31,6,234,5,100,232,73,69,35,133,68,128,
+31,104,142,182,125,89,40,180,0,168,144,3,237,17,214,207,161,37,22,144,19,
+18,0,124,67,103,213,146,139,80,9,137,0,62,33,179,232,73,69,172,5,90,40,153,
+59,68,117,179,216,166,192,77,162,137,147,136,108,246,41,180,176,219,69,19,
+39,104,142,182,122,58,221,89,41,178,6,218,40,153,59,68,117,179,209,214,232,
+73,77,162,6,90,40,153,56,134,207,71,91,171,37,54,152,25,104,162,100,226,27,
+61,29,110,132,148,218,160,109,162,137,147,180,71,91,61,61,46,172,148,217,
+67,109,20,76,157,162,58,217,233,233,116,36,166,209,67,45,20,76,156,67,103,
+167,165,213,146,155,77,12,180,81,50,113,13,158,158,151,66,74,109,84,50,209,
+68,201,194,173,192,159,86,74,108,193,150,138,38,78,21,110,4,250,18,83,104,
+193,182,138,38,78,13,212,10,201,213,146,155,56,109,162,137,147,131,117,2,
+178,116,36,166,209,194,237,20,76,157,162,58,217,245,100,167,16,2,237,20,76,
+157,162,58,217,244,36,167,18,2,173,20,76,156,67,103,213,146,156,80,10,180,
+81,50,113,13,159,66,74,113,97,175,221,48,216,110,64,4,42,22,189,179,0,196,
+133,0,185,80,32,28,78,99,193,18,80,36,4,19,159,141,172,0,178,90,4,74,73,0,
+22,209,68,201,187,129,4,2,8,3,132,64,60,36,4,0,91,240,168,177,69,118,144,
+157,91,116,116,32,32,1,53,216,221,218,170,139,3,234,219,165,0,255,152,185,
+11,251,232,231,188,47,86,227,105,18,1,255,184,170,59,41,92,23,240,110,173,
+198,209,208,36,3,253,188,183,177,82,110,80,224,93,122,32,32,4,144,253,170,
+34,22,140,7,236,161,25,232,237,105,64,63,230,160,158,102,127,59,205,11,217,
+66,51,210,128,127,237,65,60,204,254,119,155,171,197,34,168,48,6,90,194,1,0,
+39,75,88,72,8,9,33,186,194,80,64,76,13,214,19,2,130,96,110,150,189,0,65,6,
+51,214,20,128,65,17,11,214,19,130,137,121,211,210,211,144,6,39,75,88,80,0,
+201,119,235,10,8,41,86,231,71,88,80,129,79,135,186,122,133,224,34,25,69,
+234,80,3,91,141,172,40,96,139,113,180,181,133,36,21,110,54,142,134,176,165,
+1,176,23,213,47,0,216,134,234,215,128,111,117,181,232,128,209,3,70,230,107,
+64,5,139,168,209,235,10,32,36,144,102,235,136,3,146,27,172,40,160,146,132,
+103,172,40,192,115,3,117,133,28,22,113,163,69,172,41,103,1,66,188,17,145,
+52,168,4,202,113,67,76,130,227,76,194,13,240,108,0,0,83,224,0,2,193,0,104,
+146,84,97,48,0,1,94,192,56,169,24,145,179,192,0,5,112,8,56,16,32,128,56,18,
+52,125,230,86,147,190,140,28,50,21,13,39,31,23,60,145,158,57,12,141,47,129,
+6,155,194,188,24,49,39,199,89,188,124,92,242,70,120,224,201,33,69,15,155,
+163,201,68,14,49,39,199,197,211,116,240,242,113,197,232,18,180,254,36,3,17,
+46,18,243,35,100,128,172,156,178,70,163,154,76,34,248,146,164,108,248,75,
+204,141,146,28,217,115,137,27,95,27,241,173,236,162,160,224,200,2,206,9,
+113,13,148,192,209,18,22,164,146,37,193,57,162,4,249,39,196,128,24,2,178,
+66,213,136,68,201,16,77,209,131,31,192,242,88,96,92,191,151,34,100,136,38,
+232,255,252,92,221,199,197,12,68,209,82,66,212,11,155,185,41,197,13,55,38,
+3,66,213,47,135,254,72,12,162,99,133,116,112,0,1,72,66,14,16,16,50,37,202,
+160,150,154,66,14,20,8,57,192,28,24,80,113,50,113,100,105,166,120,248,0,0,
+179,1,65,196,201,199,20,178,36,227,224,0,2,208,54,113,240,0,1,100,11,181,
+192,0,5,178,1,18,160,65,24,131,20,145,25,188,48,132,122,28,76,146,218,121,
+35,180,69,145,132,108,224,31,248,0,0,0,0,0,0,25,188,56,132,122,28,76,146,
+218,121,35,180,69,145,132,108,224,31,248,0,0,0,0,0,0,40,160,45,110,23,30,
+176,33,184,0,0,183,32,29,235,2,27,199,23,0,0,23,4,51,120,129,8,244,56,153,
+37,180,242,71,104,139,35,8,217,192,63,240,0,0,0,0,0,0,51,120,145,8,244,56,
+153,37,180,242,71,104,139,35,8,217,192,64,0,0,0,0,0,0,0,51,120,161,8,244,
+56,153,37,180,242,71,104,139,35,8,217,192,64,0,0,0,0,0,0,0,51,120,177,8,
+244,56,153,37,180,242,71,104,139,35,8,217,192,64,16,0,0,0,0,0,0,51,120,193,
+8,244,56,153,37,180,242,71,104,139,35,8,217,192,64,16,0,0,0,0,0,0,51,120,
+209,8,244,56,153,37,180,242,71,104,139,35,8,217,192,64,16,0,0,0,0,0,0,51,
+120,225,8,244,56,153,37,180,242,71,104,139,35,8,217,192,64,32,0,0,0,0,0,0,
+32,227,194,0,97,57,162,4,246,104,5,34,92,35,68,225,161,166,220,16,16,137,
+112,52,41,73,29,185,1,65,196,201,197,145,166,153,246,72,3,137,204,120,34,
+74,8,199,1,67,17,162,112,201,84,128,97,144,78,25,42,16,131,169,1,205,66,8,
+35,68,225,161,166,239,128,0,10,192,64,196,104,156,50,96,0,2,172,73,240,117,
+96,57,170,97,4,104,156,52,52,221,240,0,1,82,1,74,9,129,125,240,0,1,82,32,
+148,25,174,137,58,23,51,190,0,0,42,69,64,195,32,156,50,96,0,2,160,81,238,2,
+3,107,173,218,3,192,
 };
 #elif defined(DUK_USE_DOUBLE_ME)
-DUK_INTERNAL const duk_uint8_t duk_builtins_data[4251] = {
-144,148,105,225,32,68,52,228,126,12,104,201,37,132,52,167,194,138,105,244,
-124,57,28,211,57,18,64,52,238,254,44,138,111,171,241,164,19,87,137,30,33,
-167,18,145,159,8,211,137,9,225,42,5,240,145,139,163,163,8,211,137,10,228,
-64,211,19,132,140,93,29,56,70,156,72,119,34,66,146,36,104,137,194,70,46,
-142,172,35,78,36,47,146,195,102,11,240,145,139,163,175,8,211,137,9,228,240,
-242,112,145,139,163,179,8,211,137,8,237,34,130,118,49,116,118,225,26,48,0,
-1,94,29,201,158,46,183,39,135,147,132,140,93,16,132,76,66,33,8,66,16,132,
-33,8,66,26,180,41,97,167,64,150,34,33,154,112,0,1,87,247,35,79,103,237,198,
-174,216,47,31,23,95,17,13,31,217,96,211,49,50,53,212,77,141,24,0,0,179,10,
-228,240,242,15,128,140,65,128,134,188,0,0,89,167,97,181,224,0,2,205,62,53,
-224,0,2,205,66,237,120,0,0,179,81,204,107,192,0,5,154,150,67,94,0,0,44,212,
-245,90,240,0,1,102,169,162,215,128,0,11,53,93,150,188,0,0,89,171,111,53,
-108,150,163,70,0,0,42,2,249,50,94,124,35,68,225,146,49,13,24,0,0,165,161,
-124,153,47,62,12,130,112,201,24,132,56,97,115,16,0,0,62,31,192,0,0,0,51,48,
-0,0,60,31,192,0,0,0,50,241,32,26,193,55,132,112,161,156,72,135,26,41,200,
-140,114,163,156,201,7,56,79,9,80,47,132,140,93,19,160,43,145,3,76,78,18,49,
-116,78,144,238,68,133,36,72,209,19,132,140,93,19,168,47,146,195,102,11,240,
-145,139,162,117,132,242,120,121,56,72,197,209,59,2,59,72,160,157,140,93,19,
-181,36,242,50,143,36,31,131,162,166,7,144,238,133,227,226,235,224,242,161,
-249,18,21,100,20,207,44,199,151,180,122,89,135,152,154,121,153,199,156,158,
-121,218,7,158,162,121,250,71,160,166,122,26,135,162,170,122,58,199,164,16,
-240,70,68,226,27,51,199,138,120,35,34,112,171,112,38,121,1,124,153,47,62,
-17,162,112,201,19,211,11,228,201,121,240,100,19,134,72,158,160,91,201,18,
-186,44,3,68,79,122,168,151,115,165,40,21,18,227,65,198,231,200,8,68,184,84,
-53,19,38,120,128,145,144,78,25,59,72,163,48,64,144,200,39,12,157,164,80,46,
-185,143,115,72,217,230,72,9,35,68,225,147,180,138,51,68,9,17,162,112,201,
-218,69,2,235,152,247,52,141,158,108,128,98,72,64,121,51,132,4,81,164,144,
-128,242,104,136,0,16,92,38,14,49,39,199,197,211,116,240,242,113,197,231,18,
-53,189,116,65,131,18,124,117,155,199,197,207,36,103,142,12,146,20,80,249,
-186,60,116,4,204,73,241,214,111,31,23,60,145,158,56,208,48,146,229,146,3,2,
-82,65,155,195,94,3,10,36,4,201,196,64,56,100,42,26,78,62,46,121,35,60,113,
-152,16,25,10,134,147,143,139,158,72,205,4,151,21,0,73,16,11,230,144,12,88,
-144,153,39,52,144,69,241,37,72,217,240,151,153,27,36,57,178,230,16,16,137,
-114,68,2,200,62,81,1,8,151,11,23,100,141,229,18,6,34,92,37,230,70,201,1,89,
-57,36,2,40,152,151,44,129,83,18,124,117,155,199,197,207,36,103,142,75,12,
-11,151,46,89,40,18,37,200,64,12,154,236,252,238,185,23,95,213,1,132,234,0,
-194,245,128,14,56,37,199,89,188,124,92,242,70,120,232,16,26,137,113,241,
-116,221,60,60,156,113,122,36,10,62,46,121,35,60,113,18,225,27,70,18,32,10,
-201,211,32,67,107,104,100,42,26,78,24,147,153,35,181,181,207,64,67,107,104,
-100,42,26,78,72,147,153,35,181,181,207,68,16,218,218,91,156,170,63,134,36,
-230,72,237,109,116,136,16,218,218,91,156,170,63,146,36,230,72,237,109,116,
-137,16,96,128,228,2,6,191,46,3,71,147,68,4,16,22,188,169,240,16,40,104,242,
-135,198,171,44,68,65,5,217,231,215,6,231,62,188,8,49,1,3,162,92,4,98,12,41,
-7,33,148,53,242,128,97,32,130,3,9,205,16,38,199,198,14,9,0,111,115,225,0,8,
-250,72,240,207,128,241,37,73,25,18,40,0,178,58,11,56,192,2,201,104,17,35,
-160,9,39,70,114,8,6,147,214,129,18,74,240,30,141,145,208,89,203,62,3,161,
-163,37,248,226,185,244,11,88,37,62,33,163,37,248,226,185,252,0,127,255,130,
-146,164,142,32,26,1,36,230,18,1,164,7,43,163,194,0,71,128,105,64,216,7,192,
-52,192,197,66,230,72,192,52,224,209,32,232,34,68,62,129,113,32,232,34,114,
-40,49,231,16,254,0,63,255,208,99,2,140,44,92,206,8,224,143,4,225,147,210,
-124,13,44,92,206,9,195,39,30,228,54,126,163,225,200,169,198,133,42,166,191,
-246,3,11,251,0,24,71,4,120,9,251,8,10,17,193,30,9,195,39,1,63,105,1,98,112,
-201,199,185,13,159,1,63,105,32,48,156,209,2,126,227,224,58,26,50,95,142,47,
-192,208,22,176,74,124,67,70,75,241,197,248,26,64,213,184,64,89,56,39,49,
-224,137,62,36,2,176,19,17,254,68,3,196,143,88,4,79,162,0,210,32,34,35,253,
-72,5,146,208,34,125,144,5,147,214,137,253,208,9,149,3,41,197,13,55,233,0,
-185,187,139,117,137,30,8,18,39,172,1,25,187,139,112,128,178,113,110,177,35,
-193,2,68,245,128,23,55,114,143,121,35,193,2,68,245,130,8,205,220,91,132,5,
-147,148,123,201,30,8,18,39,172,16,18,113,67,63,128,3,68,143,32,39,243,32,
-42,83,4,103,46,89,19,63,224,208,16,70,142,92,178,38,127,193,164,8,67,68,
-186,12,146,247,154,1,165,64,202,113,252,160,131,32,7,35,167,26,50,235,231,
-130,48,179,192,65,148,69,19,214,2,251,85,2,232,72,31,255,253,239,255,255,
-255,255,226,122,196,55,106,160,93,9,0,0,0,0,0,4,0,0,3,49,0,0,3,225,252,0,0,
-0,0,143,94,233,34,104,169,54,144,210,161,168,158,32,0,0,120,63,128,0,0,0,
-17,235,72,96,77,21,38,210,26,84,53,19,196,0,0,15,15,240,0,0,0,0,253,35,228,
-133,185,176,0,0,44,15,0,0,0,0,8,117,128,190,212,128,82,109,33,179,33,137,
-24,31,255,231,232,127,255,255,255,228,58,196,55,106,64,41,54,144,217,144,
-196,140,15,255,243,252,63,255,255,255,241,15,4,100,78,33,179,60,120,167,
-130,50,39,10,183,2,103,144,113,8,151,10,134,162,100,221,16,18,137,113,13,
-153,12,72,238,137,1,81,46,52,28,110,232,148,53,18,228,128,82,113,13,153,12,
-72,238,137,142,73,78,52,0,0,0,0,0,0,0,0,8,58,254,1,12,38,248,134,23,130,0,
-60,221,194,162,228,30,244,128,217,187,132,187,220,210,54,104,2,247,132,5,
-205,220,124,72,36,73,14,110,252,132,25,128,193,94,8,200,149,200,3,237,38,
-43,31,192,54,186,213,128,57,45,56,210,0,0,62,31,192,0,0,0,49,90,251,224,6,
-77,220,24,38,78,74,113,67,77,124,16,50,110,228,208,194,114,83,138,26,107,
-224,172,37,240,97,41,187,139,112,128,178,112,96,153,57,41,197,13,53,240,
-113,41,187,139,112,128,178,114,104,97,57,41,197,13,53,240,128,195,95,8,44,
-61,240,132,216,93,33,133,192,128,14,98,79,147,67,9,129,0,44,196,159,11,69,
-175,152,32,35,100,33,135,24,147,237,38,34,246,139,95,48,64,70,200,68,8,49,
-39,198,57,179,61,144,138,22,98,79,180,152,153,215,54,103,178,17,129,204,73,
-240,96,153,44,132,112,163,18,125,164,196,62,130,100,178,18,1,140,73,240,96,
-197,144,146,18,98,79,180,152,135,208,98,200,74,8,49,39,195,186,145,149,144,
-150,22,98,79,180,152,143,215,82,50,178,19,2,140,73,241,136,109,38,73,89,9,
-161,166,36,251,73,137,157,67,105,50,74,200,78,10,49,39,201,16,78,104,229,
-100,39,134,152,147,237,38,41,116,130,115,71,43,33,64,60,196,159,24,133,173,
-18,32,156,209,202,200,81,18,49,39,218,76,76,234,22,180,72,130,115,71,43,33,
-72,68,196,159,38,134,19,46,105,56,226,150,68,157,160,1,228,73,242,104,97,
-46,16,31,34,79,140,66,214,137,16,78,104,229,108,169,137,72,147,237,38,38,
-117,11,90,36,65,57,163,149,178,168,21,34,79,146,32,156,209,202,218,250,161,
-178,36,251,73,138,93,32,156,209,202,218,250,193,82,36,248,196,54,147,36,
-173,191,174,27,34,79,180,152,153,212,54,147,36,173,191,176,17,34,79,135,
-117,35,43,115,236,133,200,147,237,38,35,245,212,140,173,207,180,15,34,79,
-131,4,201,108,173,133,72,147,237,38,33,244,19,37,178,184,17,34,79,140,115,
-102,123,107,238,133,200,147,237,38,38,117,205,153,237,175,188,23,34,79,133,
-162,215,204,16,17,182,254,248,116,137,62,210,98,47,104,181,243,4,4,109,191,
-192,131,152,147,230,8,8,217,12,16,60,137,62,96,128,141,178,193,181,55,136,
-200,51,128,114,108,28,100,128,0,0,0,0,0,0,0,12,110,127,32,98,115,249,73,
-117,243,249,67,21,159,202,38,47,63,148,86,8,75,144,94,50,1,38,73,79,204,67,
-95,231,1,6,128,14,79,129,185,40,249,18,149,181,207,142,199,155,172,248,172,
-89,183,207,140,198,137,175,200,0,159,72,10,5,21,220,138,120,74,129,124,36,
-98,232,228,74,81,62,160,20,10,107,185,21,114,32,105,137,194,70,46,142,68,
-165,19,235,1,64,170,187,145,119,34,66,146,36,104,137,194,70,46,142,68,165,
-19,236,1,64,174,187,145,95,37,134,204,23,225,35,23,71,34,82,137,246,128,
-160,89,93,200,167,147,195,201,194,70,46,142,68,165,19,238,1,64,182,187,145,
-71,105,20,19,177,139,163,145,41,68,16,7,6,15,82,70,72,115,96,0,118,105,160,
-0,0,0,0,91,60,165,195,201,194,8,134,149,216,130,0,192,41,224,136,2,48,176,
-228,1,149,13,195,15,0,200,209,97,71,128,99,32,176,131,192,113,57,143,0,167,
-131,32,230,80,28,202,139,175,237,2,48,189,160,20,1,119,48,87,193,186,129,
-89,56,72,197,209,200,193,185,35,23,71,109,13,219,36,98,232,237,156,13,26,
-208,211,14,102,19,87,137,91,95,128,0,10,64,24,92,0,0,82,2,53,63,240,49,204,
-202,10,14,38,78,44,141,52,207,31,0,0,22,32,129,100,180,8,148,145,78,102,
-152,80,113,50,113,100,105,166,120,248,0,0,177,1,65,196,201,199,20,178,36,
-227,224,0,2,200,3,6,133,41,35,31,0,0,22,1,44,57,137,62,33,179,216,162,152,
-192,131,18,124,162,27,61,138,41,108,32,196,159,16,217,232,235,81,76,104,73,
-137,62,81,13,158,142,181,20,184,16,98,79,136,108,244,244,168,166,56,36,196,
-159,40,134,207,79,74,138,93,10,49,39,194,173,192,158,158,149,20,188,20,98,
-79,133,91,129,61,109,74,41,124,30,68,159,16,217,236,83,108,96,68,137,62,81,
-13,158,197,54,182,17,34,79,136,108,244,117,169,182,52,38,68,159,40,134,207,
-71,90,155,92,8,145,39,196,54,122,122,84,219,28,19,34,79,148,67,103,167,165,
-77,174,133,72,147,225,86,224,79,79,74,155,94,10,145,39,194,173,192,158,182,
-165,54,190,206,25,212,35,208,226,100,150,211,201,29,162,44,140,35,103,0,0,
-3,192,252,0,0,0,0,206,25,228,35,208,226,100,150,211,201,29,162,44,140,35,
-103,0,0,3,192,252,0,0,0,0,206,25,244,35,208,226,100,150,211,201,29,162,44,
-140,35,103,0,0,3,192,252,0,0,0,0,206,26,4,35,208,226,100,150,211,201,29,
-162,44,140,35,103,0,0,0,1,0,0,0,0,0,206,26,20,35,208,226,100,150,211,201,
-29,162,44,140,35,103,0,0,0,1,0,0,0,0,0,206,26,36,35,208,226,100,150,211,
-201,29,162,44,140,35,103,0,0,0,65,0,0,0,0,0,206,26,52,35,208,226,100,150,
-211,201,29,162,44,140,35,103,0,0,0,65,0,0,0,0,0,206,26,68,35,208,226,100,
-150,211,201,29,162,44,140,35,103,0,0,0,65,0,0,0,0,0,206,26,84,35,208,226,
-100,150,211,201,29,162,44,140,35,103,0,0,0,129,0,0,0,0,0,195,154,99,16,38,
-36,0,251,68,117,179,216,162,128,68,72,1,241,13,158,197,20,150,25,18,0,125,
-162,58,217,232,235,117,100,162,136,25,18,0,125,162,58,217,232,235,116,36,
-162,145,2,226,64,15,136,108,244,117,186,178,81,73,129,113,32,7,196,54,122,
-58,221,9,40,165,64,200,144,3,237,17,214,207,79,75,171,37,20,80,200,144,3,
-237,17,214,207,79,75,161,37,20,138,23,18,0,124,67,103,167,165,213,146,138,
-77,11,137,0,62,33,179,211,210,232,73,69,42,133,196,128,31,10,183,2,125,89,
-40,163,5,196,128,31,10,183,2,125,9,40,164,96,200,144,3,224,221,64,172,157,
-89,40,163,134,68,128,31,6,234,5,100,232,73,69,35,133,68,128,31,104,142,182,
-125,89,40,180,0,168,144,3,237,17,214,207,161,37,22,144,19,18,0,124,67,103,
-213,146,139,80,9,137,0,62,33,179,232,73,69,172,5,90,40,153,59,68,117,179,
-216,166,192,77,162,137,147,136,108,246,41,180,176,219,69,19,39,104,142,182,
-122,58,221,89,41,178,6,218,40,153,59,68,117,179,209,214,232,73,77,162,6,90,
-40,153,56,134,207,71,91,171,37,54,152,25,104,162,100,226,27,61,29,110,132,
-148,218,160,109,162,137,147,180,71,91,61,61,46,172,148,217,67,109,20,76,
-157,162,58,217,233,233,116,36,166,209,67,45,20,76,156,67,103,167,165,213,
-146,155,77,12,180,81,50,113,13,158,158,151,66,74,109,84,50,209,68,201,194,
-173,192,159,86,74,108,193,150,138,38,78,21,110,4,250,18,83,104,193,182,138,
-38,78,13,212,10,201,213,146,155,56,109,162,137,147,131,117,2,178,116,36,
-166,209,194,237,20,76,157,162,58,217,245,100,167,16,2,237,20,76,157,162,58,
-217,244,36,167,18,2,173,20,76,156,67,103,213,146,156,80,10,180,81,50,113,
-13,159,66,74,113,97,175,220,48,216,109,192,4,42,22,189,163,0,196,133,0,185,
-80,32,28,78,99,193,18,80,36,4,19,159,141,156,0,178,90,4,74,73,0,22,209,68,
-201,185,129,4,2,8,3,132,64,60,36,0,171,240,84,6,149,113,72,176,157,91,116,
-116,32,88,181,129,32,11,42,218,221,131,234,219,165,1,8,187,152,255,188,231,
-235,248,47,86,227,105,18,2,56,175,185,255,244,17,91,40,110,173,198,209,208,
-36,7,188,189,179,240,238,82,97,80,93,122,32,125,144,132,160,12,22,162,42,7,
-236,161,25,232,237,105,64,158,160,230,63,205,59,127,102,11,217,66,51,210,
-129,61,65,236,127,154,118,254,205,171,197,34,168,48,6,90,162,1,0,39,75,84,
-72,8,9,33,186,162,80,64,76,13,213,19,2,130,96,110,150,181,0,65,6,51,213,20,
-128,65,17,11,213,19,130,137,121,211,210,210,144,6,39,75,84,80,0,201,119,
-234,138,8,41,86,231,71,84,80,129,79,135,186,122,101,224,34,25,69,233,208,3,
-91,141,170,40,96,139,113,180,181,69,36,21,110,54,142,134,168,165,1,176,23,
-212,47,0,216,134,234,87,128,111,117,181,168,128,209,3,70,230,106,192,5,139,
-168,209,234,138,32,36,144,102,235,8,3,146,27,170,40,160,146,132,103,170,40,
-192,115,3,117,69,28,22,113,163,69,170,41,103,1,66,188,17,145,52,104,4,202,
-113,67,76,130,227,72,194,13,240,108,0,0,83,96,0,2,185,0,104,146,84,97,48,0,
-1,90,192,56,169,24,145,179,192,0,5,96,8,56,16,32,128,56,18,52,125,198,86,
-147,186,140,28,50,21,13,39,31,23,60,145,158,56,204,141,47,121,6,155,190,
-188,24,49,39,199,89,188,124,92,242,70,120,224,201,33,69,15,155,163,199,68,
-14,49,39,199,197,211,116,240,242,113,197,231,18,180,254,4,3,17,46,18,243,
-35,100,128,172,156,146,70,163,150,76,34,248,146,164,108,248,75,204,141,146,
-28,217,115,9,27,79,11,241,173,235,162,160,224,200,2,206,9,113,13,148,192,
-209,18,22,164,146,37,193,57,162,4,249,39,196,128,24,2,178,66,213,136,68,
-201,16,77,209,131,31,192,242,88,96,92,191,151,34,100,136,38,232,255,252,92,
-221,199,197,12,68,209,82,66,212,11,155,185,41,197,13,55,38,3,66,213,47,131,
-250,72,12,162,99,133,116,127,196,32,225,1,3,34,92,170,9,105,164,32,225,64,
-131,156,1,193,133,7,19,39,22,70,154,103,143,128,0,11,16,20,28,76,156,113,
-75,34,78,62,0,0,44,128,48,104,82,146,49,240,0,1,96,11,180,192,0,5,162,1,18,
-160,65,24,131,20,145,25,188,48,132,122,28,76,146,218,121,35,180,69,145,132,
-108,224,0,0,120,31,128,0,0,0,25,188,56,132,122,28,76,146,218,121,35,180,69,
-145,132,108,224,0,0,120,31,128,0,0,0,40,160,45,110,23,30,176,33,184,0,0,
-181,32,29,235,2,27,199,23,0,0,22,196,51,120,129,8,244,56,153,37,180,242,71,
-104,139,35,8,217,192,0,0,240,63,0,0,0,0,51,120,145,8,244,56,153,37,180,242,
-71,104,139,35,8,217,192,0,0,0,64,0,0,0,0,51,120,161,8,244,56,153,37,180,
-242,71,104,139,35,8,217,192,0,0,0,64,0,0,0,0,51,120,177,8,244,56,153,37,
-180,242,71,104,139,35,8,217,192,0,0,16,64,0,0,0,0,51,120,193,8,244,56,153,
-37,180,242,71,104,139,35,8,217,192,0,0,16,64,0,0,0,0,51,120,209,8,244,56,
-153,37,180,242,71,104,139,35,8,217,192,0,0,16,64,0,0,0,0,51,120,225,8,244,
-56,153,37,180,242,71,104,139,35,8,217,192,0,0,32,64,0,0,0,0,32,227,194,0,
-97,57,162,4,246,40,5,34,92,35,68,225,161,166,219,16,16,137,112,52,41,73,29,
-169,1,65,196,201,197,145,166,153,246,8,3,137,204,120,34,74,8,200,58,128,28,
-211,160,130,52,78,26,26,110,248,0,0,170,4,12,70,137,195,38,0,0,42,68,159,7,
-84,3,154,150,16,70,137,195,67,77,223,0,0,20,224,20,160,152,23,223,0,0,20,
-226,9,65,154,232,147,161,115,59,224,0,2,156,84,12,50,9,195,38,0,0,41,133,
-30,224,32,54,186,221,128,60,
+DUK_INTERNAL const duk_uint8_t duk_builtins_data[4281] = {
+144,148,105,226,32,68,52,228,254,12,104,202,37,132,52,167,194,138,105,245,
+124,57,28,211,57,18,64,52,239,126,44,138,111,175,241,164,19,87,145,30,33,
+167,22,145,159,8,211,139,9,225,42,5,240,145,139,163,163,8,211,139,10,228,
+64,211,19,132,140,93,29,56,70,156,88,119,34,66,146,36,104,137,194,70,46,
+142,172,35,78,44,47,146,195,102,11,240,145,139,163,175,8,211,139,9,228,240,
+242,112,145,139,163,179,8,211,139,8,237,34,130,118,49,116,118,225,26,48,0,
+1,98,29,201,158,46,183,39,135,147,132,140,93,16,132,76,66,33,8,66,16,132,
+33,8,66,26,180,105,97,167,68,150,34,33,154,112,0,1,91,247,35,79,111,237,
+198,174,232,47,31,23,95,17,13,31,249,96,211,49,50,53,214,77,141,24,0,0,181,
+10,228,240,242,15,128,140,65,128,134,188,0,0,90,167,97,181,224,0,2,213,62,
+53,224,0,2,213,66,237,120,0,0,181,81,204,107,192,0,5,170,150,67,94,0,0,45,
+84,245,90,240,0,1,106,169,162,215,128,0,11,85,93,150,188,0,0,90,171,111,53,
+109,22,162,26,48,0,1,84,23,201,146,243,225,26,39,12,145,136,104,192,0,5,61,
+11,228,201,121,240,100,19,134,72,196,33,195,14,40,203,112,64,190,76,232,
+145,153,136,0,0,31,15,224,0,0,0,25,152,0,0,30,15,224,0,0,0,25,120,144,13,
+96,155,194,56,80,206,36,67,141,20,228,70,57,81,206,100,131,156,39,132,168,
+23,194,70,46,137,208,21,200,129,166,39,9,24,186,39,72,119,34,66,146,36,104,
+137,194,70,46,137,212,23,201,97,179,5,248,72,197,209,58,194,121,60,60,156,
+36,98,232,157,129,29,164,80,78,198,46,137,218,146,121,25,71,146,9,209,5,
+209,61,48,126,14,138,152,30,67,186,23,143,139,175,131,202,135,228,72,85,
+144,83,60,179,30,94,209,233,102,30,98,105,230,103,30,114,121,231,104,30,
+122,137,231,233,30,130,153,232,106,30,138,169,232,235,30,144,67,193,25,19,
+136,108,207,30,41,224,140,137,194,173,192,153,228,5,242,100,188,248,70,137,
+195,36,79,78,47,147,37,231,193,144,78,25,34,122,145,111,36,74,232,176,13,
+17,61,234,226,93,207,148,160,84,75,141,7,27,161,32,33,18,225,80,212,76,154,
+2,2,70,65,56,100,237,34,140,209,2,67,32,156,50,118,145,64,186,230,61,205,
+35,103,155,32,36,141,19,134,78,210,40,206,16,36,70,137,195,39,105,20,11,
+174,99,220,210,54,121,210,1,137,33,1,228,207,16,17,70,146,66,3,201,164,32,
+0,65,112,152,56,196,159,31,23,77,211,195,201,199,23,160,72,214,246,81,6,12,
+73,241,214,111,31,23,60,145,158,56,50,72,81,67,230,232,242,80,19,49,39,199,
+89,188,124,92,242,70,120,227,64,194,75,154,72,12,9,73,6,111,21,120,12,40,
+144,19,39,25,0,225,144,168,105,56,248,185,228,140,241,200,96,64,100,42,26,
+78,62,46,121,35,52,18,92,116,1,36,64,47,158,64,49,98,66,100,156,242,65,23,
+196,149,35,103,194,94,100,108,144,230,203,156,64,66,37,201,16,11,32,249,
+132,4,34,92,44,93,146,55,152,72,24,137,112,151,153,27,36,5,100,229,144,8,
+162,98,92,210,5,76,73,241,214,111,31,23,60,145,158,57,44,48,46,92,185,164,
+160,72,151,41,0,50,107,179,244,59,36,93,127,92,6,19,172,3,11,216,0,56,224,
+151,29,102,241,241,115,201,25,227,164,64,106,37,199,197,211,116,240,242,
+113,197,233,144,40,248,185,228,140,241,196,75,132,109,24,72,128,43,39,84,
+129,13,173,161,144,168,105,56,98,78,100,142,214,215,69,1,13,173,161,144,
+168,105,57,34,78,100,142,214,215,69,16,67,107,105,110,114,168,254,24,147,
+153,35,181,181,212,32,67,107,105,110,114,168,254,72,147,153,35,181,181,212,
+36,65,130,3,144,8,26,252,200,13,30,85,16,16,64,90,242,231,192,64,161,163,
+203,31,26,172,193,17,4,23,105,159,96,27,172,251,16,32,196,4,14,137,112,17,
+136,48,164,28,134,80,215,202,1,132,130,8,12,39,52,64,155,31,24,56,36,1,189,
+207,132,0,35,233,35,195,62,3,196,149,36,100,72,160,2,200,232,44,227,0,11,
+37,160,68,142,128,36,157,25,200,32,26,79,90,4,73,43,192,122,54,71,65,103,
+44,248,14,134,140,151,227,138,231,208,45,96,148,248,134,140,151,227,138,
+231,240,1,255,254,10,74,146,56,128,104,4,147,152,72,6,144,28,174,143,8,1,
+30,1,165,3,96,31,0,211,3,21,11,153,35,0,211,131,68,131,160,137,16,250,5,
+196,131,160,137,200,160,199,156,67,248,0,255,255,65,140,10,48,177,115,56,
+35,130,60,19,134,79,89,240,52,177,115,56,39,12,156,123,144,217,251,15,135,
+34,167,30,20,170,154,255,232,12,47,244,0,97,28,17,224,39,238,32,40,71,4,
+120,39,12,156,4,253,228,5,137,195,39,30,228,54,124,4,253,228,128,194,115,
+68,9,252,15,128,232,104,201,126,56,191,35,64,90,193,41,241,13,25,47,199,23,
+228,105,3,86,225,1,100,224,156,199,130,36,249,144,10,192,76,71,250,16,15,
+18,61,96,17,62,200,3,72,128,136,143,247,32,22,75,64,137,248,64,22,79,90,39,
+249,64,38,84,12,167,20,52,223,196,2,230,238,45,214,36,120,32,72,158,208,4,
+102,238,45,194,2,201,197,186,196,143,4,9,19,218,0,92,221,202,61,228,143,4,
+9,19,218,8,35,55,113,110,16,22,78,81,239,36,120,32,72,158,208,64,73,197,12,
+255,0,13,18,60,128,159,212,128,169,76,17,156,185,100,76,255,163,64,65,26,
+57,114,200,153,255,70,144,33,13,18,232,50,75,226,104,6,149,3,41,199,246,
+130,12,128,28,142,156,120,203,175,158,8,194,207,1,6,81,20,79,88,11,237,84,
+11,161,32,127,255,247,191,255,255,255,255,137,235,16,221,170,129,116,36,0,
+0,0,0,0,16,0,0,12,196,0,0,15,135,240,0,0,0,2,61,123,164,137,162,164,218,67,
+74,134,162,120,128,0,1,224,254,0,0,0,0,71,173,33,129,52,84,155,72,105,80,
+212,79,16,0,0,60,63,192,0,0,0,3,244,143,146,22,230,192,0,0,176,60,0,0,0,0,
+33,214,2,251,82,1,73,180,134,204,134,36,96,127,255,159,161,255,255,255,255,
+144,235,16,221,169,0,164,218,67,102,67,18,48,63,255,207,240,255,255,255,
+255,196,60,17,145,56,134,204,241,226,158,8,200,156,42,220,9,158,65,196,34,
+92,42,26,137,147,120,64,74,37,196,54,100,49,35,188,36,5,68,184,208,113,187,
+194,80,212,75,146,1,73,196,54,100,49,35,188,38,57,37,56,240,0,0,0,0,0,0,0,
+0,32,235,248,68,48,156,2,24,94,24,0,243,119,10,139,144,123,242,3,102,238,
+18,239,115,72,217,160,11,223,16,23,55,113,241,32,145,36,57,188,18,16,102,3,
+5,120,35,34,89,32,15,180,152,173,127,0,218,235,88,0,228,180,227,200,0,0,
+248,127,0,0,0,0,197,107,240,64,6,77,220,24,38,78,74,113,67,77,130,4,12,155,
+185,52,48,156,148,226,134,155,4,10,194,96,129,132,166,238,45,194,2,201,193,
+130,100,228,167,20,52,216,32,113,41,187,139,112,128,178,114,104,97,57,41,
+197,13,54,8,32,48,216,32,130,195,224,130,19,97,124,134,23,6,0,57,137,62,77,
+12,38,12,0,179,18,124,45,22,190,96,128,141,176,134,28,98,79,180,152,139,
+218,45,124,193,1,27,97,16,32,196,159,24,230,204,246,194,40,89,137,62,210,
+98,103,92,217,158,216,70,7,49,39,193,130,100,182,17,194,140,73,246,147,16,
+250,9,146,216,72,6,49,39,193,131,22,194,72,73,137,62,210,98,31,65,139,97,
+40,32,196,159,14,234,70,86,194,88,89,137,62,210,98,63,93,72,202,216,76,10,
+49,39,198,33,180,153,37,108,38,134,152,147,237,38,38,117,13,164,201,43,97,
+56,40,196,159,36,65,57,163,149,176,158,26,98,79,180,152,165,210,9,205,28,
+173,133,0,243,18,124,98,22,180,72,130,115,71,43,97,68,72,196,159,105,49,51,
+168,90,209,34,9,205,28,173,133,33,19,18,124,154,24,76,185,164,227,138,89,
+18,119,0,7,145,39,201,161,132,188,64,124,137,62,49,11,90,36,65,57,163,149,
+210,166,37,34,79,180,152,153,212,45,104,145,4,230,142,87,74,160,84,137,62,
+72,130,115,71,43,171,234,134,200,147,237,38,41,116,130,115,71,43,171,235,5,
+72,147,227,16,218,76,146,186,254,184,108,137,62,210,98,103,80,218,76,146,
+186,254,192,68,137,62,29,212,140,174,207,178,23,34,79,180,152,143,215,82,
+50,187,62,208,60,137,62,12,19,37,210,182,21,34,79,180,152,135,208,76,151,
+74,224,68,137,62,49,205,153,238,175,186,23,34,79,180,152,153,215,54,103,
+186,190,240,92,137,62,22,139,95,48,64,70,235,251,225,210,36,251,73,136,189,
+162,215,204,16,17,186,255,2,14,98,79,152,32,35,108,48,64,242,36,249,130,2,
+55,75,6,212,224,72,200,51,128,114,108,28,100,128,0,0,0,0,0,0,0,12,110,127,
+48,98,115,249,201,117,243,249,195,21,159,206,38,47,63,156,86,8,75,144,94,
+82,1,38,73,79,208,67,95,233,1,6,128,14,79,129,186,40,249,18,149,182,207,
+144,200,155,188,248,204,105,184,207,142,199,137,175,201,0,159,72,10,5,21,
+221,10,120,74,129,124,36,98,232,228,74,81,62,160,20,10,107,186,21,114,32,
+105,137,194,70,46,142,68,165,19,235,1,64,170,187,161,119,34,66,146,36,104,
+137,194,70,46,142,68,165,19,236,1,64,174,187,161,95,37,134,204,23,225,35,
+23,71,34,82,137,246,128,160,89,93,208,167,147,195,201,194,70,46,142,68,165,
+19,238,1,64,182,187,161,71,105,20,19,177,139,163,145,41,68,16,7,6,15,82,70,
+72,115,96,0,15,106,32,0,0,0,0,91,60,165,195,201,194,8,134,149,216,162,0,
+192,41,225,8,2,48,177,36,1,149,13,196,15,0,200,209,97,199,128,99,32,176,
+195,192,113,57,143,0,167,133,32,230,80,28,202,139,175,238,2,48,189,192,20,
+1,119,80,87,193,186,129,89,56,72,197,209,200,193,185,35,23,71,109,13,219,
+36,98,232,237,156,13,26,208,211,14,102,19,87,137,91,95,128,0,10,96,24,92,0,
+0,83,2,53,56,0,0,165,3,28,204,160,160,226,100,226,200,211,76,241,240,0,1,
+102,8,22,75,64,137,73,20,230,105,133,7,19,39,22,70,154,103,143,128,0,11,48,
+20,28,76,156,113,75,34,78,62,0,0,45,3,103,31,0,0,22,65,44,57,137,62,33,179,
+216,162,152,192,131,18,124,162,27,61,138,41,108,32,196,159,16,217,232,235,
+81,76,104,73,137,62,81,13,158,142,181,20,184,16,98,79,136,108,244,244,168,
+166,56,36,196,159,40,134,207,79,74,138,93,10,49,39,194,173,192,158,158,149,
+20,188,20,98,79,133,91,129,61,109,74,41,124,30,68,159,16,217,236,83,108,96,
+68,137,62,81,13,158,197,54,182,17,34,79,136,108,244,117,169,182,52,38,68,
+159,40,134,207,71,90,155,92,8,145,39,196,54,122,122,84,219,28,19,34,79,148,
+67,103,167,165,77,174,133,72,147,225,86,224,79,79,74,155,94,10,145,39,194,
+173,192,158,182,165,54,190,206,25,212,35,208,226,100,150,211,201,29,162,44,
+140,35,103,0,0,3,192,252,0,0,0,0,206,25,228,35,208,226,100,150,211,201,29,
+162,44,140,35,103,0,0,3,192,252,0,0,0,0,206,25,244,35,208,226,100,150,211,
+201,29,162,44,140,35,103,0,0,3,192,252,0,0,0,0,206,26,4,35,208,226,100,150,
+211,201,29,162,44,140,35,103,0,0,0,1,0,0,0,0,0,206,26,20,35,208,226,100,
+150,211,201,29,162,44,140,35,103,0,0,0,1,0,0,0,0,0,206,26,36,35,208,226,
+100,150,211,201,29,162,44,140,35,103,0,0,0,65,0,0,0,0,0,206,26,52,35,208,
+226,100,150,211,201,29,162,44,140,35,103,0,0,0,65,0,0,0,0,0,206,26,68,35,
+208,226,100,150,211,201,29,162,44,140,35,103,0,0,0,65,0,0,0,0,0,206,26,84,
+35,208,226,100,150,211,201,29,162,44,140,35,103,0,0,0,129,0,0,0,0,0,195,
+154,99,16,38,36,0,251,68,117,179,216,162,128,68,72,1,241,13,158,197,20,150,
+25,18,0,125,162,58,217,232,235,117,100,162,136,25,18,0,125,162,58,217,232,
+235,116,36,162,145,2,226,64,15,136,108,244,117,186,178,81,73,129,113,32,7,
+196,54,122,58,221,9,40,165,64,200,144,3,237,17,214,207,79,75,171,37,20,80,
+200,144,3,237,17,214,207,79,75,161,37,20,138,23,18,0,124,67,103,167,165,
+213,146,138,77,11,137,0,62,33,179,211,210,232,73,69,42,133,196,128,31,10,
+183,2,125,89,40,163,5,196,128,31,10,183,2,125,9,40,164,96,200,144,3,224,
+221,64,172,157,89,40,163,134,68,128,31,6,234,5,100,232,73,69,35,133,68,128,
+31,104,142,182,125,89,40,180,0,168,144,3,237,17,214,207,161,37,22,144,19,
+18,0,124,67,103,213,146,139,80,9,137,0,62,33,179,232,73,69,172,5,90,40,153,
+59,68,117,179,216,166,192,77,162,137,147,136,108,246,41,180,176,219,69,19,
+39,104,142,182,122,58,221,89,41,178,6,218,40,153,59,68,117,179,209,214,232,
+73,77,162,6,90,40,153,56,134,207,71,91,171,37,54,152,25,104,162,100,226,27,
+61,29,110,132,148,218,160,109,162,137,147,180,71,91,61,61,46,172,148,217,
+67,109,20,76,157,162,58,217,233,233,116,36,166,209,67,45,20,76,156,67,103,
+167,165,213,146,155,77,12,180,81,50,113,13,158,158,151,66,74,109,84,50,209,
+68,201,194,173,192,159,86,74,108,193,150,138,38,78,21,110,4,250,18,83,104,
+193,182,138,38,78,13,212,10,201,213,146,155,56,109,162,137,147,131,117,2,
+178,116,36,166,209,194,237,20,76,157,162,58,217,245,100,167,16,2,237,20,76,
+157,162,58,217,244,36,167,18,2,173,20,76,156,67,103,213,146,156,80,10,180,
+81,50,113,13,159,66,74,113,97,175,221,48,216,110,64,4,42,22,189,179,0,196,
+133,0,185,80,32,28,78,99,193,18,80,36,4,19,159,141,172,0,178,90,4,74,73,0,
+22,209,68,201,187,129,4,2,8,3,132,64,60,36,0,171,240,84,6,149,113,72,176,
+157,91,116,116,32,88,181,129,32,11,42,218,221,131,234,219,165,1,8,187,152,
+255,188,231,235,248,47,86,227,105,18,2,56,175,185,255,244,17,91,40,110,173,
+198,209,208,36,7,188,189,179,240,238,82,97,80,93,122,32,125,144,132,160,12,
+22,162,42,7,236,161,25,232,237,105,64,158,160,230,63,205,59,127,102,11,217,
+66,51,210,129,61,65,236,127,154,118,254,205,171,197,34,168,48,6,90,194,1,0,
+39,75,88,72,8,9,33,186,194,80,64,76,13,214,19,2,130,96,110,150,189,0,65,6,
+51,214,20,128,65,17,11,214,19,130,137,121,211,210,211,144,6,39,75,88,80,0,
+201,119,235,10,8,41,86,231,71,88,80,129,79,135,186,122,133,224,34,25,69,
+234,80,3,91,141,172,40,96,139,113,180,181,133,36,21,110,54,142,134,176,165,
+1,176,23,213,47,0,216,134,234,215,128,111,117,181,232,128,209,3,70,230,107,
+64,5,139,168,209,235,10,32,36,144,102,235,136,3,146,27,172,40,160,146,132,
+103,172,40,192,115,3,117,133,28,22,113,163,69,172,41,103,1,66,188,17,145,
+52,168,4,202,113,67,76,130,227,76,194,13,240,108,0,0,83,224,0,2,193,0,104,
+146,84,97,48,0,1,94,192,56,169,24,145,179,192,0,5,112,8,56,16,32,128,56,18,
+52,125,230,86,147,190,140,28,50,21,13,39,31,23,60,145,158,57,12,141,47,129,
+6,155,194,188,24,49,39,199,89,188,124,92,242,70,120,224,201,33,69,15,155,
+163,201,68,14,49,39,199,197,211,116,240,242,113,197,232,18,180,254,36,3,17,
+46,18,243,35,100,128,172,156,178,70,163,154,76,34,248,146,164,108,248,75,
+204,141,146,28,217,115,137,27,95,27,241,173,236,162,160,224,200,2,206,9,
+113,13,148,192,209,18,22,164,146,37,193,57,162,4,249,39,196,128,24,2,178,
+66,213,136,68,201,16,77,209,131,31,192,242,88,96,92,191,151,34,100,136,38,
+232,255,252,92,221,199,197,12,68,209,82,66,212,11,155,185,41,197,13,55,38,
+3,66,213,47,135,254,72,12,162,99,133,116,112,0,1,72,66,14,16,16,50,37,202,
+160,150,154,66,14,20,8,57,192,28,24,80,113,50,113,100,105,166,120,248,0,0,
+179,1,65,196,201,199,20,178,36,227,224,0,2,208,54,113,240,0,1,100,11,181,
+192,0,5,178,1,18,160,65,24,131,20,145,25,188,48,132,122,28,76,146,218,121,
+35,180,69,145,132,108,224,0,0,120,31,128,0,0,0,25,188,56,132,122,28,76,146,
+218,121,35,180,69,145,132,108,224,0,0,120,31,128,0,0,0,40,160,45,110,23,30,
+176,33,184,0,0,183,32,29,235,2,27,199,23,0,0,23,4,51,120,129,8,244,56,153,
+37,180,242,71,104,139,35,8,217,192,0,0,240,63,0,0,0,0,51,120,145,8,244,56,
+153,37,180,242,71,104,139,35,8,217,192,0,0,0,64,0,0,0,0,51,120,161,8,244,
+56,153,37,180,242,71,104,139,35,8,217,192,0,0,0,64,0,0,0,0,51,120,177,8,
+244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,16,64,0,0,0,0,51,120,193,
+8,244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,16,64,0,0,0,0,51,120,
+209,8,244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,16,64,0,0,0,0,51,
+120,225,8,244,56,153,37,180,242,71,104,139,35,8,217,192,0,0,32,64,0,0,0,0,
+32,227,194,0,97,57,162,4,246,104,5,34,92,35,68,225,161,166,220,16,16,137,
+112,52,41,73,29,185,1,65,196,201,197,145,166,153,246,72,3,137,204,120,34,
+74,8,199,1,67,17,162,112,201,84,128,97,144,78,25,42,16,131,169,1,205,66,8,
+35,68,225,161,166,239,128,0,10,192,64,196,104,156,50,96,0,2,172,73,240,117,
+96,57,170,97,4,104,156,52,52,221,240,0,1,82,1,74,9,129,125,240,0,1,82,32,
+148,25,174,137,58,23,51,190,0,0,42,69,64,195,32,156,50,96,0,2,160,81,238,2,
+3,107,173,218,3,192,
 };
 #else
 #error invalid endianness defines
@@ -12195,6 +12299,90 @@ DUK_INTERNAL duk_size_t duk_unicode_unvalidated_utf8_length(const duk_uint8_t *d
 }
 #endif  /* DUK_USE_PREFER_SIZE */
 
+/* Check whether a string is UTF-8 compatible or not. */
+DUK_INTERNAL duk_bool_t duk_unicode_is_utf8_compatible(const duk_uint8_t *buf, duk_size_t len) {
+	duk_size_t i = 0;
+#if !defined(DUK_USE_PREFER_SIZE)
+	duk_size_t len_safe;
+#endif
+
+	/* Many practical strings are ASCII only, so use a fast path check
+	 * to check chunks of bytes at once with minimal branch cost.
+	 */
+#if !defined(DUK_USE_PREFER_SIZE)
+	len_safe = len & ~0x03UL;
+	for (; i < len_safe; i += 4) {
+		duk_uint8_t t = buf[i] | buf[i + 1] | buf[i + 2] | buf[i + 3];
+		if (DUK_UNLIKELY((t & 0x80U) != 0U)) {
+			/* At least one byte was outside 0x00-0x7f, break
+			 * out to slow path (and remain there).
+			 *
+			 * XXX: We could also deal with the problem character
+			 * and resume fast path later.
+			 */
+			break;
+		}
+	}
+#endif
+
+	for (; i < len;) {
+		duk_uint8_t t;
+		duk_size_t left;
+		duk_size_t ncont;
+		duk_uint32_t cp;
+		duk_uint32_t mincp;
+
+		t = buf[i++];
+		if (DUK_LIKELY((t & 0x80U) == 0U)) {
+			/* Fast path, ASCII. */
+			continue;
+		}
+
+		/* Non-ASCII start byte, slow path.
+		 *
+		 * 10xx xxxx          -> continuation byte
+		 * 110x xxxx + 1*CONT -> [0x80, 0x7ff]
+		 * 1110 xxxx + 2*CONT -> [0x800, 0xffff], must reject [0xd800,0xdfff]
+		 * 1111 0xxx + 3*CONT -> [0x10000, 0x10ffff]
+		 */
+		left = len - i;
+		if (t <= 0xdfU) {  /* 1101 1111 = 0xdf */
+			if (t <= 0xbfU) {  /* 1011 1111 = 0xbf */
+				return 0;
+			}
+			ncont = 1;
+			mincp = 0x80UL;
+			cp = t & 0x1fU;
+		} else if (t <= 0xefU) {  /* 1110 1111 = 0xef */
+			ncont = 2;
+			mincp = 0x800UL;
+			cp = t & 0x0fU;
+		} else if (t <= 0xf7U) {  /* 1111 0111 = 0xf7 */
+			ncont = 3;
+			mincp = 0x10000UL;
+			cp = t & 0x07U;
+		} else {
+			return 0;
+		}
+		if (left < ncont) {
+			return 0;
+		}
+		while (ncont > 0U) {
+			t = buf[i++];
+			if ((t & 0xc0U) != 0x80U) {  /* 10xx xxxx */
+				return 0;
+			}
+			cp = (cp << 6) + (t & 0x3fU);
+			ncont--;
+		}
+		if (cp < mincp || cp > 0x10ffffUL || (cp >= 0xd800UL && cp <= 0xdfffUL)) {
+			return 0;
+		}
+	}
+
+	return 1;
+}
+
 /*
  *  Unicode range matcher
  *
@@ -12978,6 +13166,154 @@ DUK_INTERNAL const duk_uint16_t duk_unicode_re_ranges_not_wordchar[10] = {
 
 #endif  /* DUK_USE_REGEXP_SUPPORT */
 /*
+ *  Macro support functions for reading/writing raw data.
+ *
+ *  These are done using memcpy to ensure they're valid even for unaligned
+ *  reads/writes on platforms where alignment counts.  On x86 at least gcc
+ *  is able to compile these into a bswap+mov.  "Always inline" is used to
+ *  ensure these macros compile to minimal code.
+ */
+
+/* #include duk_internal.h -> already included */
+
+union duk__u16_union {
+	duk_uint8_t b[2];
+	duk_uint16_t x;
+};
+typedef union duk__u16_union duk__u16_union;
+
+union duk__u32_union {
+	duk_uint8_t b[4];
+	duk_uint32_t x;
+};
+typedef union duk__u32_union duk__u32_union;
+
+#if defined(DUK_USE_64BIT_OPS)
+union duk__u64_union {
+	duk_uint8_t b[8];
+	duk_uint64_t x;
+};
+typedef union duk__u64_union duk__u64_union;
+#endif
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_uint16_t duk_raw_read_u16_be(const duk_uint8_t *p) {
+	duk__u16_union u;
+	duk_memcpy((void *) u.b, (const void *) p, (size_t) 2);
+	u.x = DUK_NTOH16(u.x);
+	return u.x;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_uint32_t duk_raw_read_u32_be(const duk_uint8_t *p) {
+	duk__u32_union u;
+	duk_memcpy((void *) u.b, (const void *) p, (size_t) 4);
+	u.x = DUK_NTOH32(u.x);
+	return u.x;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_float_t duk_raw_read_float_be(const duk_uint8_t *p) {
+	duk_float_union fu;
+	duk_memcpy((void *) fu.uc, (const void *) p, (size_t) 4);
+	duk_fltunion_big_to_host(&fu);
+	return fu.f;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_double_t duk_raw_read_double_be(const duk_uint8_t *p) {
+	duk_double_union du;
+	duk_memcpy((void *) du.uc, (const void *) p, (size_t) 8);
+	duk_dblunion_big_to_host(&du);
+	return du.d;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_uint16_t duk_raw_readinc_u16_be(const duk_uint8_t **p) {
+	duk_uint16_t res = duk_raw_read_u16_be(*p);
+	*p += 2;
+	return res;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_uint32_t duk_raw_readinc_u32_be(const duk_uint8_t **p) {
+	duk_uint32_t res = duk_raw_read_u32_be(*p);
+	*p += 4;
+	return res;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_float_t duk_raw_readinc_float_be(const duk_uint8_t **p) {
+	duk_float_t res = duk_raw_read_float_be(*p);
+	*p += 4;
+	return res;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_double_t duk_raw_readinc_double_be(const duk_uint8_t **p) {
+	duk_double_t res = duk_raw_read_double_be(*p);
+	*p += 8;
+	return res;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_u16_be(duk_uint8_t *p, duk_uint16_t val) {
+	duk__u16_union u;
+	u.x = DUK_HTON16(val);
+	duk_memcpy((void *) p, (const void *) u.b, (size_t) 2);
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_u32_be(duk_uint8_t *p, duk_uint32_t val) {
+	duk__u32_union u;
+	u.x = DUK_HTON32(val);
+	duk_memcpy((void *) p, (const void *) u.b, (size_t) 4);
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_float_be(duk_uint8_t *p, duk_float_t val) {
+	duk_float_union fu;
+	fu.f = val;
+	duk_fltunion_host_to_big(&fu);
+	duk_memcpy((void *) p, (const void *) fu.uc, (size_t) 4);
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_double_be(duk_uint8_t *p, duk_double_t val) {
+	duk_double_union du;
+	du.d = val;
+	duk_dblunion_host_to_big(&du);
+	duk_memcpy((void *) p, (const void *) du.uc, (size_t) 8);
+}
+
+DUK_INTERNAL duk_small_int_t duk_raw_write_xutf8(duk_uint8_t *p, duk_ucodepoint_t val) {
+	duk_small_int_t len = duk_unicode_encode_xutf8(val, p);
+	return len;
+}
+
+DUK_INTERNAL duk_small_int_t duk_raw_write_cesu8(duk_uint8_t *p, duk_ucodepoint_t val) {
+	duk_small_int_t len = duk_unicode_encode_cesu8(val, p);
+	return len;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_writeinc_u16_be(duk_uint8_t **p, duk_uint16_t val) {
+	duk_raw_write_u16_be(*p, val);
+	*p += 2;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_writeinc_u32_be(duk_uint8_t **p, duk_uint32_t val) {
+	duk_raw_write_u32_be(*p, val);
+	*p += 4;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_writeinc_float_be(duk_uint8_t **p, duk_float_t val) {
+	duk_raw_write_float_be(*p, val);
+	*p += 4;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_writeinc_double_be(duk_uint8_t **p, duk_double_t val) {
+	duk_raw_write_double_be(*p, val);
+	*p += 8;
+}
+
+DUK_INTERNAL void duk_raw_writeinc_xutf8(duk_uint8_t **p, duk_ucodepoint_t val) {
+	duk_small_int_t len = duk_unicode_encode_xutf8(val, *p);
+	*p += len;
+}
+
+DUK_INTERNAL void duk_raw_writeinc_cesu8(duk_uint8_t **p, duk_ucodepoint_t val) {
+	duk_small_int_t len = duk_unicode_encode_cesu8(val, *p);
+	*p += len;
+}
+/*
  *  Misc util stuff.
  */
 
@@ -13169,13 +13505,13 @@ DUK_INTERNAL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len) {
 #if (DUK_STRIDX_UC_ARGUMENTS > 255)
 #error constant too large
 #endif
-#if (DUK_STRIDX_ARRAY > 255)
+#if (DUK_STRIDX_UC_ARRAY > 255)
 #error constant too large
 #endif
 #if (DUK_STRIDX_UC_BOOLEAN > 255)
 #error constant too large
 #endif
-#if (DUK_STRIDX_DATE > 255)
+#if (DUK_STRIDX_UC_DATE > 255)
 #error constant too large
 #endif
 #if (DUK_STRIDX_UC_ERROR > 255)
@@ -13258,11 +13594,11 @@ DUK_INTERNAL void duk_byteswap_bytes(duk_uint8_t *p, duk_small_uint_t len) {
 DUK_INTERNAL duk_uint8_t duk_class_number_to_stridx[32] = {
 	DUK_STRIDX_EMPTY_STRING,  /* NONE, intentionally empty */
 	DUK_STRIDX_UC_OBJECT,
-	DUK_STRIDX_ARRAY,
+	DUK_STRIDX_UC_ARRAY,
 	DUK_STRIDX_UC_FUNCTION,
 	DUK_STRIDX_UC_ARGUMENTS,
 	DUK_STRIDX_UC_BOOLEAN,
-	DUK_STRIDX_DATE,
+	DUK_STRIDX_UC_DATE,
 	DUK_STRIDX_UC_ERROR,
 	DUK_STRIDX_JSON,
 	DUK_STRIDX_MATH,
@@ -13422,20 +13758,20 @@ DUK_EXTERNAL void duk_config_buffer(duk_hthread *thr, duk_idx_t idx, void *ptr,
  *  Dump/load helpers, xxx_raw() helpers do no buffer checks
  */
 
-DUK_LOCAL duk_uint8_t *duk__load_string_raw(duk_hthread *thr, duk_uint8_t *p) {
+DUK_LOCAL const duk_uint8_t *duk__load_string_raw(duk_hthread *thr, const duk_uint8_t *p) {
 	duk_uint32_t len;
 
-	len = DUK_RAW_READ_U32_BE(p);
+	len = DUK_RAW_READINC_U32_BE(p);
 	duk_push_lstring(thr, (const char *) p, len);
 	p += len;
 	return p;
 }
 
-DUK_LOCAL duk_uint8_t *duk__load_buffer_raw(duk_hthread *thr, duk_uint8_t *p) {
+DUK_LOCAL const duk_uint8_t *duk__load_buffer_raw(duk_hthread *thr, const duk_uint8_t *p) {
 	duk_uint32_t len;
 	duk_uint8_t *buf;
 
-	len = DUK_RAW_READ_U32_BE(p);
+	len = DUK_RAW_READINC_U32_BE(p);
 	buf = (duk_uint8_t *) duk_push_fixed_buffer_nozero(thr, (duk_size_t) len);
 	DUK_ASSERT(buf != NULL);
 	duk_memcpy((void *) buf, (const void *) p, (size_t) len);
@@ -13452,7 +13788,7 @@ DUK_LOCAL duk_uint8_t *duk__dump_hstring_raw(duk_uint8_t *p, duk_hstring *h) {
 	len = DUK_HSTRING_GET_BYTELEN(h);
 	DUK_ASSERT(len <= 0xffffffffUL);  /* string limits */
 	tmp32 = (duk_uint32_t) len;
-	DUK_RAW_WRITE_U32_BE(p, tmp32);
+	DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 	duk_memcpy((void *) p,
 	           (const void *) DUK_HSTRING_GET_DATA(h),
 	           len);
@@ -13471,7 +13807,7 @@ DUK_LOCAL duk_uint8_t *duk__dump_hbuffer_raw(duk_hthread *thr, duk_uint8_t *p, d
 	len = DUK_HBUFFER_GET_SIZE(h);
 	DUK_ASSERT(len <= 0xffffffffUL);  /* buffer limits */
 	tmp32 = (duk_uint32_t) len;
-	DUK_RAW_WRITE_U32_BE(p, tmp32);
+	DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 	/* When len == 0, buffer data pointer may be NULL. */
 	duk_memcpy_unsafe((void *) p,
 	                  (const void *) DUK_HBUFFER_GET_DATA_PTR(thr->heap, h),
@@ -13511,7 +13847,7 @@ DUK_LOCAL duk_uint8_t *duk__dump_buffer_prop(duk_hthread *thr, duk_uint8_t *p, d
 		p = duk__dump_hbuffer_raw(thr, p, h_buf);
 	} else {
 		p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 4U, p);
-		DUK_RAW_WRITE_U32_BE(p, 0);
+		DUK_RAW_WRITEINC_U32_BE(p, 0);
 	}
 	return p;
 }
@@ -13527,7 +13863,7 @@ DUK_LOCAL duk_uint8_t *duk__dump_uint32_prop(duk_hthread *thr, duk_uint8_t *p, d
 		val = def_value;
 	}
 	p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 4U, p);
-	DUK_RAW_WRITE_U32_BE(p, val);
+	DUK_RAW_WRITEINC_U32_BE(p, val);
 	return p;
 }
 
@@ -13565,11 +13901,11 @@ DUK_LOCAL duk_uint8_t *duk__dump_varmap(duk_hthread *thr, duk_uint8_t *p, duk_bu
 			DUK_ASSERT(DUK_HSTRING_MAX_BYTELEN <= 0x7fffffffUL);  /* ensures no overflow */
 			p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 4U + DUK_HSTRING_GET_BYTELEN(key) + 4U, p);
 			p = duk__dump_hstring_raw(p, key);
-			DUK_RAW_WRITE_U32_BE(p, val);
+			DUK_RAW_WRITEINC_U32_BE(p, val);
 		}
 	}
 	p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 4U, p);
-	DUK_RAW_WRITE_U32_BE(p, 0);  /* end of _Varmap */
+	DUK_RAW_WRITEINC_U32_BE(p, 0);  /* end of _Varmap */
 	return p;
 }
 
@@ -13588,7 +13924,7 @@ DUK_LOCAL duk_uint8_t *duk__dump_formals(duk_hthread *thr, duk_uint8_t *p, duk_b
 
 		p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 4U, p);
 		DUK_ASSERT(h->length != DUK__NO_FORMALS);  /* limits */
-		DUK_RAW_WRITE_U32_BE(p, h->length);
+		DUK_RAW_WRITEINC_U32_BE(p, h->length);
 
 		for (i = 0; i < h->length; i++) {
 			duk_tval *tv_val;
@@ -13609,7 +13945,7 @@ DUK_LOCAL duk_uint8_t *duk__dump_formals(duk_hthread *thr, duk_uint8_t *p, duk_b
 	} else {
 		DUK_DD(DUK_DDPRINT("dumping function without _Formals, emit marker to indicate missing _Formals"));
 		p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 4U, p);
-		DUK_RAW_WRITE_U32_BE(p, DUK__NO_FORMALS);  /* marker: no formals */
+		DUK_RAW_WRITEINC_U32_BE(p, DUK__NO_FORMALS);  /* marker: no formals */
 	}
 	return p;
 }
@@ -13649,27 +13985,27 @@ static duk_uint8_t *duk__dump_func(duk_hthread *thr, duk_hcompfunc *func, duk_bu
 
 	/* Fixed header info. */
 	tmp32 = count_instr;
-	DUK_RAW_WRITE_U32_BE(p, tmp32);
+	DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 	tmp32 = (duk_uint32_t) DUK_HCOMPFUNC_GET_CONSTS_COUNT(thr->heap, func);
-	DUK_RAW_WRITE_U32_BE(p, tmp32);
+	DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 	tmp32 = (duk_uint32_t) DUK_HCOMPFUNC_GET_FUNCS_COUNT(thr->heap, func);
-	DUK_RAW_WRITE_U32_BE(p, tmp32);
+	DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 	tmp16 = func->nregs;
-	DUK_RAW_WRITE_U16_BE(p, tmp16);
+	DUK_RAW_WRITEINC_U16_BE(p, tmp16);
 	tmp16 = func->nargs;
-	DUK_RAW_WRITE_U16_BE(p, tmp16);
+	DUK_RAW_WRITEINC_U16_BE(p, tmp16);
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
 	tmp32 = func->start_line;
-	DUK_RAW_WRITE_U32_BE(p, tmp32);
+	DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 	tmp32 = func->end_line;
-	DUK_RAW_WRITE_U32_BE(p, tmp32);
+	DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 #else
-	DUK_RAW_WRITE_U32_BE(p, 0);
-	DUK_RAW_WRITE_U32_BE(p, 0);
+	DUK_RAW_WRITEINC_U32_BE(p, 0);
+	DUK_RAW_WRITEINC_U32_BE(p, 0);
 #endif
 	tmp32 = DUK_HEAPHDR_GET_FLAGS((duk_heaphdr *) func);  /* masks flags, only duk_hobject flags */
 	tmp32 &= ~(DUK_HOBJECT_FLAG_HAVE_FINALIZER);  /* finalizer flag is lost */
-	DUK_RAW_WRITE_U32_BE(p, tmp32);
+	DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 
 	/* Bytecode instructions: endian conversion needed unless
 	 * platform is big endian.
@@ -13678,12 +14014,12 @@ static duk_uint8_t *duk__dump_func(duk_hthread *thr, duk_hcompfunc *func, duk_bu
 	ins_end = DUK_HCOMPFUNC_GET_CODE_END(thr->heap, func);
 	DUK_ASSERT((duk_size_t) (ins_end - ins) == (duk_size_t) count_instr);
 #if defined(DUK_USE_INTEGER_BE)
-	duk_memcpy_unsafe((void *) p, (const void *) ins, (size_t) (ins_end - ins));
-	p += (size_t) (ins_end - ins);
+	duk_memcpy_unsafe((void *) p, (const void *) ins, (size_t) (ins_end - ins) * 4);
+	p += (size_t) (ins_end - ins) * 4;
 #else
 	while (ins != ins_end) {
 		tmp32 = (duk_uint32_t) (*ins);
-		DUK_RAW_WRITE_U32_BE(p, tmp32);
+		DUK_RAW_WRITEINC_U32_BE(p, tmp32);
 		ins++;
 	}
 #endif
@@ -13708,7 +14044,7 @@ static duk_uint8_t *duk__dump_func(duk_hthread *thr, duk_hcompfunc *func, duk_bu
 			p = DUK_BW_ENSURE_RAW(thr, bw_ctx, 1U + 8U, p);
 			*p++ = DUK__SER_NUMBER;
 			d = DUK_TVAL_GET_NUMBER(tv);
-			DUK_RAW_WRITE_DOUBLE_BE(p, d);
+			DUK_RAW_WRITEINC_DOUBLE_BE(p, d);
 		}
 		tv++;
 	}
@@ -13769,7 +14105,7 @@ static duk_uint8_t *duk__dump_func(duk_hthread *thr, duk_hcompfunc *func, duk_bu
 		DUK_ASSERT((duk_size_t) (p_end - p) >= (duk_size_t) (n)); \
 	} while (0)
 
-static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t *p_end) {
+static const duk_uint8_t *duk__load_func(duk_hthread *thr, const duk_uint8_t *p, const duk_uint8_t *p_end) {
 	duk_hcompfunc *h_fun;
 	duk_hbuffer *h_data;
 	duk_size_t data_size;
@@ -13793,12 +14129,12 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 
 	DUK_ASSERT(thr != NULL);
 
-	DUK_DD(DUK_DDPRINT("loading function, p=%p, p_end=%p", (void *) p, (void *) p_end));
+	DUK_DD(DUK_DDPRINT("loading function, p=%p, p_end=%p", (const void *) p, (const void *) p_end));
 
 	DUK__ASSERT_LEFT(3 * 4);
-	count_instr = DUK_RAW_READ_U32_BE(p);
-	count_const = DUK_RAW_READ_U32_BE(p);
-	count_funcs = DUK_RAW_READ_U32_BE(p);
+	count_instr = DUK_RAW_READINC_U32_BE(p);
+	count_const = DUK_RAW_READINC_U32_BE(p);
+	count_funcs = DUK_RAW_READINC_U32_BE(p);
 
 	data_size = sizeof(duk_tval) * count_const +
 	            sizeof(duk_hobject *) * count_funcs +
@@ -13826,17 +14162,17 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 	DUK_ASSERT(DUK_HCOMPFUNC_GET_BYTECODE(thr->heap, h_fun) == NULL);
 	DUK_ASSERT(DUK_HOBJECT_GET_PROTOTYPE(thr->heap, (duk_hobject *) h_fun) == thr->builtins[DUK_BIDX_FUNCTION_PROTOTYPE]);
 
-	h_fun->nregs = DUK_RAW_READ_U16_BE(p);
-	h_fun->nargs = DUK_RAW_READ_U16_BE(p);
+	h_fun->nregs = DUK_RAW_READINC_U16_BE(p);
+	h_fun->nargs = DUK_RAW_READINC_U16_BE(p);
 #if defined(DUK_USE_DEBUGGER_SUPPORT)
-	h_fun->start_line = DUK_RAW_READ_U32_BE(p);
-	h_fun->end_line = DUK_RAW_READ_U32_BE(p);
+	h_fun->start_line = DUK_RAW_READINC_U32_BE(p);
+	h_fun->end_line = DUK_RAW_READINC_U32_BE(p);
 #else
 	p += 8;  /* skip line info */
 #endif
 
 	/* duk_hcompfunc flags; quite version specific */
-	tmp32 = DUK_RAW_READ_U32_BE(p);
+	tmp32 = DUK_RAW_READINC_U32_BE(p);
 	DUK_HEAPHDR_SET_FLAGS((duk_heaphdr *) h_fun, tmp32);  /* masks flags to only change duk_hobject flags */
 
 	/* standard prototype (no need to set here, already set) */
@@ -13872,7 +14208,7 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 #else
 	q = fun_data + sizeof(duk_tval) * count_const + sizeof(duk_hobject *) * count_funcs;
 	for (n = count_instr; n > 0; n--) {
-		*((duk_instr_t *) (void *) q) = DUK_RAW_READ_U32_BE(p);
+		*((duk_instr_t *) (void *) q) = DUK_RAW_READINC_U32_BE(p);
 		q += sizeof(duk_instr_t);
 	}
 #endif
@@ -13880,7 +14216,7 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 	/* Load constants onto value stack but don't yet copy to buffer. */
 	for (n = count_const; n > 0; n--) {
 		DUK__ASSERT_LEFT(1);
-		const_type = DUK_RAW_READ_U8(p);
+		const_type = DUK_RAW_READINC_U8(p);
 		switch (const_type) {
 		case DUK__SER_STRING: {
 			p = duk__load_string_raw(thr, p);
@@ -13893,7 +14229,7 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 			duk_tval tv_tmp;
 			duk_double_t val;
 			DUK__ASSERT_LEFT(8);
-			val = DUK_RAW_READ_DOUBLE_BE(p);
+			val = DUK_RAW_READINC_DOUBLE_BE(p);
 			DUK_TVAL_SET_NUMBER_CHKFAST_SLOW(&tv_tmp, val);
 			duk_push_tval(thr, &tv_tmp);
 			break;
@@ -13960,7 +14296,7 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 	duk_set_top(thr, idx_base + 1);
 
 	/* Setup function properties. */
-	tmp32 = DUK_RAW_READ_U32_BE(p);
+	tmp32 = DUK_RAW_READINC_U32_BE(p);
 	duk_push_u32(thr, tmp32);
 	duk_xdef_prop_stridx_short(thr, -2, DUK_STRIDX_LENGTH, DUK_PROPDESC_FLAGS_C);
 
@@ -14040,7 +14376,7 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 			duk_pop(thr);
 			break;
 		}
-		tmp32 = DUK_RAW_READ_U32_BE(p);
+		tmp32 = DUK_RAW_READINC_U32_BE(p);
 		duk_push_u32(thr, tmp32);
 		duk_put_prop(thr, -3);
 	}
@@ -14050,7 +14386,7 @@ static duk_uint8_t *duk__load_func(duk_hthread *thr, duk_uint8_t *p, duk_uint8_t
 	/* _Formals may have been missing in the original function, which is
 	 * handled using a marker length.
 	 */
-	arr_limit = DUK_RAW_READ_U32_BE(p);
+	arr_limit = DUK_RAW_READINC_U32_BE(p);
 	if (arr_limit != DUK__NO_FORMALS) {
 		duk_push_bare_array(thr);  /* _Formals */
 		for (arr_idx = 0; arr_idx < arr_limit; arr_idx++) {
@@ -14104,7 +14440,7 @@ DUK_EXTERNAL void duk_dump_function(duk_hthread *thr) {
 }
 
 DUK_EXTERNAL void duk_load_function(duk_hthread *thr) {
-	duk_uint8_t *p_buf, *p, *p_end;
+	const duk_uint8_t *p_buf, *p, *p_end;
 	duk_size_t sz;
 
 	DUK_ASSERT_API_ENTRY(thr);
@@ -15370,7 +15706,7 @@ DUK_EXTERNAL void duk_base64_decode(duk_hthread *thr, duk_idx_t idx) {
 DUK_EXTERNAL const char *duk_base64_encode(duk_hthread *thr, duk_idx_t idx) {
 	DUK_UNREF(idx);
 	DUK_ERROR_UNSUPPORTED(thr);
-	DUK_WO_NORETURN(return;);
+	DUK_WO_NORETURN(return NULL;);
 }
 
 DUK_EXTERNAL void duk_base64_decode(duk_hthread *thr, duk_idx_t idx) {
@@ -16051,6 +16387,7 @@ struct duk_internal_thread_state {
 	duk_ljstate lj;
 	duk_bool_t creating_error;
 	duk_hthread *curr_thread;
+	duk_uint8_t thread_state;
 	duk_int_t call_recursion_depth;
 };
 
@@ -16149,6 +16486,7 @@ DUK_EXTERNAL void duk_suspend(duk_hthread *thr, duk_thread_state *state) {
 	duk_memcpy((void *) &snapshot->lj, (const void *) lj, sizeof(duk_ljstate));
 	snapshot->creating_error = heap->creating_error;
 	snapshot->curr_thread = heap->curr_thread;
+	snapshot->thread_state = thr->state;
 	snapshot->call_recursion_depth = heap->call_recursion_depth;
 
 	lj->jmpbuf_ptr = NULL;
@@ -16158,6 +16496,8 @@ DUK_EXTERNAL void duk_suspend(duk_hthread *thr, duk_thread_state *state) {
 	heap->creating_error = 0;
 	heap->curr_thread = NULL;
 	heap->call_recursion_depth = 0;
+
+	thr->state = DUK_HTHREAD_STATE_INACTIVE;
 }
 
 DUK_EXTERNAL void duk_resume(duk_hthread *thr, const duk_thread_state *state) {
@@ -16174,6 +16514,8 @@ DUK_EXTERNAL void duk_resume(duk_hthread *thr, const duk_thread_state *state) {
 	DUK_ASSERT(thr->heap->pf_prevent_count == 0);
 	DUK_ASSERT(thr->heap->creating_error == 0);
 
+	thr->state = snapshot->thread_state;
+
 	heap = thr->heap;
 
 	duk_memcpy((void *) &heap->lj, (const void *) &snapshot->lj, sizeof(duk_ljstate));
@@ -18802,7 +19144,7 @@ DUK_EXTERNAL void duk_insert(duk_hthread *thr, duk_idx_t to_idx) {
 	 * => [ ... | q | p | x | x ]
 	 */
 
-	nbytes = (duk_size_t) (((duk_uint8_t *) q) - ((duk_uint8_t *) p));  /* Note: 'q' is top-1 */
+	nbytes = (duk_size_t) (((duk_uint8_t *) q) - ((duk_uint8_t *) p));
 
 	DUK_DDD(DUK_DDDPRINT("duk_insert: to_idx=%ld, p=%p, q=%p, nbytes=%lu",
 	                     (long) to_idx, (void *) p, (void *) q, (unsigned long) nbytes));
@@ -18838,6 +19180,40 @@ DUK_INTERNAL void duk_insert_undefined_n(duk_hthread *thr, duk_idx_t idx, duk_id
 	}
 }
 
+DUK_EXTERNAL void duk_pull(duk_hthread *thr, duk_idx_t from_idx) {
+	duk_tval *p;
+	duk_tval *q;
+	duk_tval tv_tmp;
+	duk_size_t nbytes;
+
+	DUK_ASSERT_API_ENTRY(thr);
+
+	/*                         nbytes
+	 *                       <--------->
+	 *    [ ... | x | x | p | y | y | q ]
+	 * => [ ... | x | x | y | y | q | p ]
+	 */
+
+	p = duk_require_tval(thr, from_idx);
+	DUK_ASSERT(p != NULL);
+	q = duk_require_tval(thr, -1);
+	DUK_ASSERT(q != NULL);
+
+	DUK_ASSERT(q >= p);
+
+	nbytes = (duk_size_t) (((duk_uint8_t *) q) - ((duk_uint8_t *) p));
+
+	DUK_DDD(DUK_DDDPRINT("duk_pull: from_idx=%ld, p=%p, q=%p, nbytes=%lu",
+	                     (long) from_idx, (void *) p, (void *) q, (unsigned long) nbytes));
+
+	/* No net refcount changes.  No need to special case nbytes == 0
+	 * (p == q).
+	 */
+	DUK_TVAL_SET_TVAL(&tv_tmp, p);
+	duk_memmove((void *) p, (const void *) (p + 1), (size_t) nbytes);
+	DUK_TVAL_SET_TVAL(q, &tv_tmp);
+}
+
 DUK_EXTERNAL void duk_replace(duk_hthread *thr, duk_idx_t to_idx) {
 	duk_tval *tv1;
 	duk_tval *tv2;
@@ -20634,7 +21010,7 @@ DUK_INTERNAL duk_uint8_t duk_to_uint8clamped(duk_hthread *thr, duk_idx_t idx) {
 	}
 
 	t = d - DUK_FLOOR(d);
-	if (t == 0.5) {
+	if (duk_double_equals(t, 0.5)) {
 		/* Exact halfway, round to even. */
 		ret = (duk_uint8_t) d;
 		ret = (ret + 1) & 0xfe;  /* Example: d=3.5, t=0.5 -> ret = (3 + 1) & 0xfe = 4 & 0xfe = 4
@@ -20782,134 +21158,6 @@ DUK_INTERNAL duk_hstring *duk_safe_to_hstring(duk_hthread *thr, duk_idx_t idx) {
 #endif
 
 /* Push Object.prototype.toString() output for 'tv'. */
-#if 0  /* See XXX note why this variant doesn't work. */
-DUK_INTERNAL void duk_push_class_string_tval(duk_hthread *thr, duk_tval *tv, duk_bool_t avoid_side_effects) {
-	duk_uint_t stridx_bidx = 0;  /* (prototype_bidx << 16) + default_tag_stridx */
-
-	DUK_ASSERT_API_ENTRY(thr);
-
-	/* Conceptually for any non-undefined/null value we should do a
-	 * ToObject() coercion and look up @@toStringTag (from the object
-	 * prototype) to see if a custom tag should be used.  Avoid the
-	 * actual conversion by doing a prototype lookup without the object
-	 * coercion.  However, see problem below.
-	 */
-
-	duk_push_literal(thr, "[object ");  /* -> [ ... "[object" ] */
-
-	switch (DUK_TVAL_GET_TAG(tv)) {
-	case DUK_TAG_UNUSED:  /* Treat like 'undefined', shouldn't happen. */
-	case DUK_TAG_UNDEFINED: {
-		stridx_bidx = DUK_STRIDX_UC_UNDEFINED;
-		goto use_stridx;
-	}
-	case DUK_TAG_NULL: {
-		stridx_bidx = DUK_STRIDX_UC_NULL;
-		goto use_stridx;
-	}
-	case DUK_TAG_BOOLEAN: {
-		stridx_bidx = (DUK_BIDX_BOOLEAN_PROTOTYPE << 16) + DUK_STRIDX_UC_BOOLEAN;
-		goto use_proto_bidx;
-	}
-	case DUK_TAG_POINTER: {
-		stridx_bidx = (DUK_BIDX_POINTER_PROTOTYPE << 16) + DUK_STRIDX_UC_POINTER;
-		goto use_proto_bidx;
-	}
-	case DUK_TAG_LIGHTFUNC: {
-		stridx_bidx = (DUK_BIDX_FUNCTION_PROTOTYPE << 16) + DUK_STRIDX_UC_FUNCTION;
-		goto use_proto_bidx;
-	}
-	case DUK_TAG_STRING: {
-		duk_hstring *h;
-		h = DUK_TVAL_GET_STRING(tv);
-		DUK_ASSERT(h != NULL);
-		if (DUK_UNLIKELY(DUK_HSTRING_HAS_SYMBOL(h))) {
-			/* Even without DUK_USE_SYMBOL_BUILTIN the Symbol
-			 * prototype exists so we can lookup @@toStringTag
-			 * and provide [object Symbol] for symbol values
-			 * created from C code.
-			 */
-			stridx_bidx = (DUK_BIDX_SYMBOL_PROTOTYPE << 16) + DUK_STRIDX_UC_SYMBOL;
-		} else {
-			stridx_bidx = (DUK_BIDX_STRING_PROTOTYPE << 16) + DUK_STRIDX_UC_STRING;
-		}
-		goto use_proto_bidx;
-	}
-	case DUK_TAG_OBJECT: {
-		duk_push_tval(thr, tv);
-		stridx_bidx = 0xffffffffUL;  /* Marker value. */
-		goto use_pushed_object;
-	}
-	case DUK_TAG_BUFFER: {
-		stridx_bidx = (DUK_BIDX_UINT8ARRAY_PROTOTYPE << 16) + DUK_STRIDX_UINT8_ARRAY;
-		goto use_proto_bidx;
-	}
-#if defined(DUK_USE_FASTINT)
-	case DUK_TAG_FASTINT:
-		/* Fall through to generic number case. */
-#endif
-	default: {
-		DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv));  /* number (maybe fastint) */
-		stridx_bidx = (DUK_BIDX_NUMBER_PROTOTYPE << 16) + DUK_STRIDX_UC_NUMBER;
-		goto use_proto_bidx;
-	}
-	}
-	DUK_ASSERT(0);  /* Never here. */
-
- use_proto_bidx:
-	DUK_ASSERT_BIDX_VALID((stridx_bidx >> 16) & 0xffffUL);
-	duk_push_hobject(thr, thr->builtins[(stridx_bidx >> 16) & 0xffffUL]);
-	/* Fall through. */
-
- use_pushed_object:
-	/* [ ... "[object" obj ] */
-
-#if defined(DUK_USE_SYMBOL_BUILTIN)
-	/* XXX: better handling with avoid_side_effects == 1; lookup tval
-	 * without Proxy or getter side effects, and use it in sanitized
-	 * form if it's a string.
-	 */
-	if (!avoid_side_effects) {
-		/* XXX: The problem with using the prototype object as the
-		 * lookup base is that if @@toStringTag is a getter, its
-		 * 'this' binding must be the ToObject() coerced input value,
-		 * not the prototype object of the type.
-		 */
-		(void) duk_get_prop_stridx(thr, -1, DUK_STRIDX_WELLKNOWN_SYMBOL_TO_STRING_TAG);
-		if (duk_is_string_notsymbol(thr, -1)) {
-			duk_remove_m2(thr);
-			goto finish;
-		}
-		duk_pop_unsafe(thr);
-	}
-#endif
-
-	if (stridx_bidx == 0xffffffffUL) {
-		duk_hobject *h_obj;
-		duk_small_uint_t classnum;
-
-		h_obj = duk_known_hobject(thr, -1);
-		DUK_ASSERT(h_obj != NULL);
-		classnum = DUK_HOBJECT_GET_CLASS_NUMBER(h_obj);
-		stridx_bidx = DUK_HOBJECT_CLASS_NUMBER_TO_STRIDX(classnum);
-	} else {
-		/* stridx_bidx already has the desired fallback stridx. */
-		;
-	}
-	duk_pop_unsafe(thr);
-	/* Fall through. */
-
- use_stridx:
-	/* [ ... "[object" ] */
-	duk_push_hstring_stridx(thr, stridx_bidx & 0xffffUL);
-
- finish:
-	/* [ ... "[object" tag ] */
-	duk_push_literal(thr, "]");
-	duk_concat(thr, 3);  /* [ ... "[object" tag "]" ] -> [ ... res ] */
-}
-#endif  /* 0 */
-
 DUK_INTERNAL void duk_push_class_string_tval(duk_hthread *thr, duk_tval *tv, duk_bool_t avoid_side_effects) {
 	duk_hobject *h_obj;
 	duk_small_uint_t classnum;
@@ -20925,11 +21173,13 @@ DUK_INTERNAL void duk_push_class_string_tval(duk_hthread *thr, duk_tval *tv, duk
 
 	/* Conceptually for any non-undefined/null value we should do a
 	 * ToObject() coercion and look up @@toStringTag (from the object
-	 * prototype) to see if a custom result should be used.  We'd like to
-	 * avoid the actual conversion, but even for primitive types the
-	 * prototype may have @@toStringTag.  What's worse, the @@toStringTag
-	 * property may be a getter that must get the object coerced value
-	 * (not the prototype) as its 'this' binding.
+	 * prototype) to see if a custom result should be used, with the
+	 * exception of Arrays which are handled specially first.
+	 *
+	 * We'd like to avoid the actual conversion, but even for primitive
+	 * types the prototype may have @@toStringTag.  What's worse, the
+	 * @@toStringTag property may be a getter that must get the object
+	 * coerced value (not the prototype) as its 'this' binding.
 	 *
 	 * For now, do an actual object coercion.  This could be avoided by
 	 * doing a side effect free lookup to see if a getter would be invoked.
@@ -20954,31 +21204,33 @@ DUK_INTERNAL void duk_push_class_string_tval(duk_hthread *thr, duk_tval *tv, duk
 
 	duk_push_tval(thr, tv);
 	tv = NULL;  /* Invalidated by ToObject(). */
-	duk_to_object(thr, -1);
-
-	/* [ ... "[object" obj ] */
+	h_obj = duk_to_hobject(thr, -1);
+	DUK_ASSERT(h_obj != NULL);
+	if (duk_js_isarray_hobject(h_obj)) {
+		stridx = DUK_STRIDX_UC_ARRAY;
+	} else {
+		/* [ ... "[object" obj ] */
 
 #if defined(DUK_USE_SYMBOL_BUILTIN)
-	/* XXX: better handling with avoid_side_effects == 1; lookup tval
-	 * without Proxy or getter side effects, and use it in sanitized
-	 * form if it's a string.
-	 */
-	if (!avoid_side_effects) {
-		(void) duk_get_prop_stridx(thr, -1, DUK_STRIDX_WELLKNOWN_SYMBOL_TO_STRING_TAG);
-		if (duk_is_string_notsymbol(thr, -1)) {
-			duk_remove_m2(thr);
-			goto finish;
+		/* XXX: better handling with avoid_side_effects == 1; lookup tval
+		 * without Proxy or getter side effects, and use it in sanitized
+		 * form if it's a string.
+		 */
+		if (!avoid_side_effects) {
+			(void) duk_get_prop_stridx(thr, -1, DUK_STRIDX_WELLKNOWN_SYMBOL_TO_STRING_TAG);
+			if (duk_is_string_notsymbol(thr, -1)) {
+				duk_remove_m2(thr);
+				goto finish;
+			}
+			duk_pop_unsafe(thr);
 		}
-		duk_pop_unsafe(thr);
-	}
 #else
-	DUK_UNREF(avoid_side_effects);
+		DUK_UNREF(avoid_side_effects);
 #endif
 
-	h_obj = duk_known_hobject(thr, -1);
-	DUK_ASSERT(h_obj != NULL);
-	classnum = DUK_HOBJECT_GET_CLASS_NUMBER(h_obj);
-	stridx = DUK_HOBJECT_CLASS_NUMBER_TO_STRIDX(classnum);
+		classnum = DUK_HOBJECT_GET_CLASS_NUMBER(h_obj);
+		stridx = DUK_HOBJECT_CLASS_NUMBER_TO_STRIDX(classnum);
+	}
 	duk_pop_unsafe(thr);
 	duk_push_hstring_stridx(thr, stridx);
 
@@ -21817,14 +22069,15 @@ DUK_EXTERNAL duk_bool_t duk_is_symbol(duk_hthread *thr, duk_idx_t idx) {
 	return 0;
 }
 
+/* IsArray(), returns true for Array instance or Proxy of Array instance. */
 DUK_EXTERNAL duk_bool_t duk_is_array(duk_hthread *thr, duk_idx_t idx) {
-	duk_hobject *obj;
+	duk_tval *tv;
 
 	DUK_ASSERT_API_ENTRY(thr);
 
-	obj = duk_get_hobject(thr, idx);
-	if (obj) {
-		return (DUK_HOBJECT_GET_CLASS_NUMBER(obj) == DUK_HOBJECT_CLASS_ARRAY ? 1 : 0);
+	tv = duk_get_tval(thr, idx);
+	if (tv) {
+		return duk_js_isarray(tv);
 	}
 	return 0;
 }
@@ -24032,6 +24285,13 @@ DUK_INTERNAL duk_idx_t duk_unpack_array_like(duk_hthread *thr, duk_idx_t idx) {
  *  Error throwing
  */
 
+#if defined(DUK_USE_GCC_PRAGMAS)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsuggest-attribute=noreturn"
+#elif defined(DUK_USE_CLANG_PRAGMAS)
+#pragma clang diagnostic push
+#endif
+
 DUK_EXTERNAL void duk_throw_raw(duk_hthread *thr) {
 	duk_tval *tv_val;
 
@@ -24121,6 +24381,12 @@ DUK_EXTERNAL void duk_error_raw(duk_hthread *thr, duk_errcode_t err_code, const
 	DUK_WO_NORETURN(return;);
 }
 
+#if defined(DUK_USE_GCC_PRAGMAS)
+#pragma GCC diagnostic pop
+#elif defined(DUK_USE_CLANG_PRAGMAS)
+#pragma clang diagnostic pop
+#endif
+
 #if !defined(DUK_USE_VARIADIC_MACROS)
 DUK_NORETURN(DUK_LOCAL_DECL void duk__throw_error_from_stash(duk_hthread *thr, duk_errcode_t err_code, const char *fmt, va_list ap));
 
@@ -25227,7 +25493,7 @@ DUK_INTERNAL duk_ret_t duk_bi_array_constructor(duk_hthread *thr) {
 		/* XXX: expensive check (also shared elsewhere - so add a shared internal API call?) */
 		d = duk_get_number(thr, 0);
 		len = duk_to_uint32(thr, 0);
-		if (((duk_double_t) len) != d) {
+		if (!duk_double_equals((duk_double_t) len, d)) {
 			DUK_DCERROR_RANGE_INVALID_LENGTH(thr);
 		}
 
@@ -25251,10 +25517,8 @@ DUK_INTERNAL duk_ret_t duk_bi_array_constructor(duk_hthread *thr) {
  */
 
 DUK_INTERNAL duk_ret_t duk_bi_array_constructor_is_array(duk_hthread *thr) {
-	duk_hobject *h;
-
-	h = duk_get_hobject_with_class(thr, 0, DUK_HOBJECT_CLASS_ARRAY);
-	duk_push_boolean(thr, (h != NULL));
+	DUK_ASSERT_TOP(thr, 1);
+	duk_push_boolean(thr, duk_js_isarray(DUK_GET_TVAL_POSIDX(thr, 0)));
 	return 1;
 }
 
@@ -25347,13 +25611,13 @@ DUK_INTERNAL duk_ret_t duk_bi_array_prototype_concat(duk_hthread *thr) {
 #if defined(DUK_USE_SYMBOL_BUILTIN)
 			duk_get_prop_stridx(thr, i, DUK_STRIDX_WELLKNOWN_SYMBOL_IS_CONCAT_SPREADABLE);
 			if (duk_is_undefined(thr, -1)) {
-				spreadable = (DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_ARRAY);
+				spreadable = duk_js_isarray_hobject(h);
 			} else {
 				spreadable = duk_to_boolean(thr, -1);
 			}
 			duk_pop_nodecref_unsafe(thr);
 #else
-			spreadable = (DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_ARRAY);
+			spreadable = duk_js_isarray_hobject(h);
 #endif
 		}
 
@@ -29061,12 +29325,12 @@ DUK_INTERNAL duk_ret_t duk_bi_nodejs_buffer_concat(duk_hthread *thr) {
 
 /* XXX: split into separate functions for each field type? */
 DUK_INTERNAL duk_ret_t duk_bi_buffer_readfield(duk_hthread *thr) {
-	duk_small_int_t magic = (duk_small_int_t) duk_get_current_magic(thr);
-	duk_small_int_t magic_ftype;
-	duk_small_int_t magic_bigendian;
-	duk_small_int_t magic_signed;
-	duk_small_int_t magic_typedarray;
-	duk_small_int_t endswap;
+	duk_small_uint_t magic = (duk_small_uint_t) duk_get_current_magic(thr);
+	duk_small_uint_t magic_ftype;
+	duk_small_uint_t magic_bigendian;
+	duk_small_uint_t magic_signed;
+	duk_small_uint_t magic_typedarray;
+	duk_small_uint_t endswap;
 	duk_hbufobj *h_this;
 	duk_bool_t no_assert;
 	duk_int_t offset_signed;
@@ -29076,10 +29340,10 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_readfield(duk_hthread *thr) {
 	duk_uint8_t *buf;
 	duk_double_union du;
 
-	magic_ftype = magic & 0x0007;
-	magic_bigendian = magic & 0x0008;
-	magic_signed = magic & 0x0010;
-	magic_typedarray = magic & 0x0020;
+	magic_ftype = magic & 0x0007U;
+	magic_bigendian = magic & 0x0008U;
+	magic_signed = magic & 0x0010U;
+	magic_typedarray = magic & 0x0020U;
 
 	h_this = duk__require_bufobj_this(thr);  /* XXX: very inefficient for plain buffers */
 	DUK_ASSERT(h_this != NULL);
@@ -29118,7 +29382,7 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_readfield(duk_hthread *thr) {
 
 	DUK_DDD(DUK_DDDPRINT("readfield, buffer_length=%ld, offset=%ld, no_assert=%d, "
 	                     "magic=%04x, magic_fieldtype=%d, magic_bigendian=%d, magic_signed=%d, "
-	                     "endswap=%d",
+	                     "endswap=%u",
 	                     (long) buffer_length, (long) offset, (int) no_assert,
 	                     (unsigned int) magic, (int) magic_ftype, (int) (magic_bigendian >> 3),
 	                     (int) (magic_signed >> 4), (int) endswap));
@@ -29320,12 +29584,12 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_readfield(duk_hthread *thr) {
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
 /* XXX: split into separate functions for each field type? */
 DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_hthread *thr) {
-	duk_small_int_t magic = (duk_small_int_t) duk_get_current_magic(thr);
-	duk_small_int_t magic_ftype;
-	duk_small_int_t magic_bigendian;
-	duk_small_int_t magic_signed;
-	duk_small_int_t magic_typedarray;
-	duk_small_int_t endswap;
+	duk_small_uint_t magic = (duk_small_uint_t) duk_get_current_magic(thr);
+	duk_small_uint_t magic_ftype;
+	duk_small_uint_t magic_bigendian;
+	duk_small_uint_t magic_signed;
+	duk_small_uint_t magic_typedarray;
+	duk_small_uint_t endswap;
 	duk_hbufobj *h_this;
 	duk_bool_t no_assert;
 	duk_int_t offset_signed;
@@ -29336,10 +29600,10 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_hthread *thr) {
 	duk_double_union du;
 	duk_int_t nbytes = 0;
 
-	magic_ftype = magic & 0x0007;
-	magic_bigendian = magic & 0x0008;
-	magic_signed = magic & 0x0010;
-	magic_typedarray = magic & 0x0020;
+	magic_ftype = magic & 0x0007U;
+	magic_bigendian = magic & 0x0008U;
+	magic_signed = magic & 0x0010U;
+	magic_typedarray = magic & 0x0020U;
 	DUK_UNREF(magic_signed);
 
 	h_this = duk__require_bufobj_this(thr);  /* XXX: very inefficient for plain buffers */
@@ -29379,7 +29643,7 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_hthread *thr) {
 	 * (offset + nbytes) even when write fails due to invalid offset.
 	 */
 	if (magic_ftype != DUK__FLD_VARINT) {
-		DUK_ASSERT(magic_ftype >= 0 && magic_ftype < (duk_small_int_t) (sizeof(duk__buffer_nbytes_from_fldtype) / sizeof(duk_uint8_t)));
+		DUK_ASSERT(magic_ftype < (duk_small_uint_t) (sizeof(duk__buffer_nbytes_from_fldtype) / sizeof(duk_uint8_t)));
 		nbytes = duk__buffer_nbytes_from_fldtype[magic_ftype];
 	} else {
 		nbytes = duk_get_int(thr, 2);
@@ -29396,7 +29660,7 @@ DUK_INTERNAL duk_ret_t duk_bi_buffer_writefield(duk_hthread *thr) {
 
 	DUK_DDD(DUK_DDDPRINT("writefield, value=%!T, buffer_length=%ld, offset=%ld, no_assert=%d, "
 	                     "magic=%04x, magic_fieldtype=%d, magic_bigendian=%d, magic_signed=%d, "
-	                     "endswap=%d",
+	                     "endswap=%u",
 	                     duk_get_tval(thr, 0), (long) buffer_length, (long) offset, (int) no_assert,
 	                     (unsigned int) magic, (int) magic_ftype, (int) (magic_bigendian >> 3),
 	                     (int) (magic_signed >> 4), (int) endswap));
@@ -29733,6 +29997,1746 @@ DUK_INTERNAL duk_ret_t duk_bi_typedarray_bytelength_getter(duk_hthread *thr) {
 #undef DUK__FLD_TYPEDARRAY
 #undef DUK__FLD_VARINT
 /*
+ *  CBOR bindings.
+ *
+ *  http://cbor.io/
+ *  https://tools.ietf.org/html/rfc7049
+ */
+
+/* #include duk_internal.h -> already included */
+
+#if defined(DUK_USE_CBOR_SUPPORT)
+
+/* #define DUK_CBOR_STRESS */
+
+/* Default behavior for encoding strings: use CBOR text string if string
+ * is UTF-8 compatible, otherwise use CBOR byte string.  These defines
+ * can be used to force either type for all strings.  Using text strings
+ * for non-UTF-8 data is technically invalid CBOR.
+ */
+/* #define DUK_CBOR_TEXT_STRINGS */
+/* #define DUK_CBOR_BYTE_STRINGS */
+
+/* Misc. defines. */
+/* #define DUK_CBOR_PREFER_SIZE */
+/* #define DUK_CBOR_DOUBLE_AS_IS */
+/* #define DUK_CBOR_DECODE_FASTPATH */
+
+typedef struct {
+	duk_hthread *thr;
+	duk_uint8_t *ptr;
+	duk_uint8_t *buf;
+	duk_uint8_t *buf_end;
+	duk_size_t len;
+	duk_idx_t idx_buf;
+	duk_uint_t recursion_depth;
+	duk_uint_t recursion_limit;
+} duk_cbor_encode_context;
+
+typedef struct {
+	duk_hthread *thr;
+	const duk_uint8_t *buf;
+	duk_size_t off;
+	duk_size_t len;
+	duk_uint_t recursion_depth;
+	duk_uint_t recursion_limit;
+} duk_cbor_decode_context;
+
+DUK_LOCAL void duk__cbor_encode_value(duk_cbor_encode_context *enc_ctx);
+DUK_LOCAL void duk__cbor_decode_value(duk_cbor_decode_context *dec_ctx);
+
+/*
+ *  Misc
+ */
+
+DUK_LOCAL duk_uint32_t duk__cbor_double_to_uint32(double d) {
+	/* Out of range casts are undefined behavior, so caller must avoid. */
+	DUK_ASSERT(d >= 0.0 && d <= 4294967295.0);
+	return (duk_uint32_t) d;
+}
+
+/*
+ *  Encoding
+ */
+
+DUK_LOCAL void duk__cbor_encode_error(duk_cbor_encode_context *enc_ctx) {
+	(void) duk_type_error(enc_ctx->thr, "cbor encode error");
+}
+
+DUK_LOCAL void duk__cbor_encode_req_stack(duk_cbor_encode_context *enc_ctx) {
+	duk_require_stack(enc_ctx->thr, 4);
+}
+
+DUK_LOCAL void duk__cbor_encode_objarr_entry(duk_cbor_encode_context *enc_ctx) {
+	duk_hthread *thr = enc_ctx->thr;
+
+	/* Native stack check in object/array recursion. */
+	duk_native_stack_check(thr);
+
+	/* When working with deeply recursive structures, this is important
+	 * to ensure there's no effective depth limit.
+	 */
+	duk__cbor_encode_req_stack(enc_ctx);
+
+	DUK_ASSERT(enc_ctx->recursion_depth <= enc_ctx->recursion_limit);
+	if (enc_ctx->recursion_depth >= enc_ctx->recursion_limit) {
+		DUK_ERROR_RANGE(thr, DUK_STR_ENC_RECLIMIT);
+		DUK_WO_NORETURN(return;);
+	}
+	enc_ctx->recursion_depth++;
+}
+
+DUK_LOCAL void duk__cbor_encode_objarr_exit(duk_cbor_encode_context *enc_ctx) {
+	DUK_ASSERT(enc_ctx->recursion_depth > 0);
+	enc_ctx->recursion_depth--;
+}
+
+/* Check that a size_t is in uint32 range to avoid out-of-range casts. */
+DUK_LOCAL void duk__cbor_encode_sizet_uint32_check(duk_cbor_encode_context *enc_ctx, duk_size_t len) {
+	if (DUK_UNLIKELY(sizeof(duk_size_t) > sizeof(duk_uint32_t) && len > (duk_size_t) DUK_UINT32_MAX)) {
+		duk__cbor_encode_error(enc_ctx);
+	}
+}
+
+DUK_LOCAL DUK_NOINLINE void duk__cbor_encode_ensure_slowpath(duk_cbor_encode_context *enc_ctx, duk_size_t len) {
+	duk_size_t oldlen;
+	duk_size_t minlen;
+	duk_size_t newlen;
+	duk_uint8_t *p_new;
+	duk_size_t old_data_len;
+
+	DUK_ASSERT(enc_ctx->ptr >= enc_ctx->buf);
+	DUK_ASSERT(enc_ctx->buf_end >= enc_ctx->ptr);
+	DUK_ASSERT(enc_ctx->buf_end >= enc_ctx->buf);
+
+	/* Overflow check.
+	 *
+	 * Limit example: 0xffffffffUL / 2U = 0x7fffffffUL, we reject >= 0x80000000UL.
+	 */
+	oldlen = enc_ctx->len;
+	minlen = oldlen + len;
+	if (DUK_UNLIKELY(oldlen > DUK_SIZE_MAX / 2U || minlen < oldlen)) {
+		duk__cbor_encode_error(enc_ctx);
+	}
+
+#if defined(DUK_CBOR_STRESS)
+	newlen = oldlen + 1U;
+#else
+	newlen = oldlen * 2U;
+#endif
+	DUK_ASSERT(newlen >= oldlen);
+
+	if (minlen > newlen) {
+		newlen = minlen;
+	}
+	DUK_ASSERT(newlen >= oldlen);
+	DUK_ASSERT(newlen >= minlen);
+	DUK_ASSERT(newlen > 0U);
+
+	DUK_DD(DUK_DDPRINT("cbor encode buffer resized to %ld", (long) newlen));
+
+	p_new = (duk_uint8_t *) duk_resize_buffer(enc_ctx->thr, enc_ctx->idx_buf, newlen);
+	DUK_ASSERT(p_new != NULL);
+	old_data_len = (duk_size_t) (enc_ctx->ptr - enc_ctx->buf);
+	enc_ctx->buf = p_new;
+	enc_ctx->buf_end = p_new + newlen;
+	enc_ctx->ptr = p_new + old_data_len;
+	enc_ctx->len = newlen;
+}
+
+DUK_LOCAL DUK_INLINE void duk__cbor_encode_ensure(duk_cbor_encode_context *enc_ctx, duk_size_t len) {
+	if (DUK_LIKELY((duk_size_t) (enc_ctx->buf_end - enc_ctx->ptr) >= len)) {
+		return;
+	}
+	duk__cbor_encode_ensure_slowpath(enc_ctx, len);
+}
+
+DUK_LOCAL duk_size_t duk__cbor_get_reserve(duk_cbor_encode_context *enc_ctx) {
+	DUK_ASSERT(enc_ctx->ptr >= enc_ctx->buf);
+	DUK_ASSERT(enc_ctx->ptr <= enc_ctx->buf_end);
+	return (duk_size_t) (enc_ctx->buf_end - enc_ctx->ptr);
+}
+
+DUK_LOCAL void duk__cbor_encode_uint32(duk_cbor_encode_context *enc_ctx, duk_uint32_t u, duk_uint8_t base) {
+	duk_uint8_t *p;
+
+	/* Caller must ensure space. */
+	DUK_ASSERT(duk__cbor_get_reserve(enc_ctx) >= 1 + 4);
+
+	p = enc_ctx->ptr;
+	if (DUK_LIKELY(u <= 23U)) {
+		*p++ = (duk_uint8_t) (base + (duk_uint8_t) u);
+	} else if (u <= 0xffUL) {
+		*p++ = base + 0x18U;
+		*p++ = (duk_uint8_t) u;
+	} else if (u <= 0xffffUL) {
+		*p++ = base + 0x19U;
+		DUK_RAW_WRITEINC_U16_BE(p, (duk_uint16_t) u);
+	} else {
+		*p++ = base + 0x1aU;
+		DUK_RAW_WRITEINC_U32_BE(p, u);
+	}
+	enc_ctx->ptr = p;
+}
+
+#if defined(DUK_CBOR_DOUBLE_AS_IS)
+DUK_LOCAL void duk__cbor_encode_double(duk_cbor_encode_context *enc_ctx, double d) {
+	duk_uint8_t *p;
+
+	/* Caller must ensure space. */
+	DUK_ASSERT(duk__cbor_get_reserve(enc_ctx) >= 1 + 8);
+
+	p = enc_ctx->ptr;
+	*p++ = 0xfbU;
+	DUK_RAW_WRITEINC_DOUBLE_BE(p, d);
+	p += 8;
+	enc_ctx->ptr = p;
+}
+#else  /* DUK_CBOR_DOUBLE_AS_IS */
+DUK_LOCAL void duk__cbor_encode_double_fp(duk_cbor_encode_context *enc_ctx, double d) {
+	duk_double_union u;
+	duk_uint16_t u16;
+	duk_int16_t expt;
+	duk_uint8_t *p;
+
+	DUK_ASSERT(DUK_FPCLASSIFY(d) != DUK_FP_ZERO);
+
+	/* Caller must ensure space. */
+	DUK_ASSERT(duk__cbor_get_reserve(enc_ctx) >= 1 + 8);
+
+	/* Organize into little endian (no-op if platform is little endian). */
+	u.d = d;
+	duk_dblunion_host_to_little(&u);
+
+	/* Check if 'd' can represented as a normal half-float.
+	 * Denormal half-floats could also be used, but that check
+	 * isn't done now (denormal half-floats are decoded of course).
+	 * So just check exponent range and that at most 10 significant
+	 * bits (excluding implicit leading 1) are used in 'd'.
+	 */
+	u16 = (((duk_uint16_t) u.uc[7]) << 8) | ((duk_uint16_t) u.uc[6]);
+	expt = (duk_int16_t) ((u16 & 0x7ff0U) >> 4) - 1023;
+
+	if (expt >= -14 && expt <= 15) {
+		/* Half-float normal exponents (excl. denormals).
+		 *
+		 *          7        6        5        4        3        2        1        0  (LE index)
+		 * double: seeeeeee eeeemmmm mmmmmmmm mmmmmmmm mmmmmmmm mmmmmmmm mmmmmmmm mmmmmmmm
+		 * half:         seeeee mmmm mmmmmm00 00000000 00000000 00000000 00000000 00000000
+		 */
+		duk_bool_t use_half_float;
+
+		use_half_float =
+		    (u.uc[0] == 0 && u.uc[1] == 0 && u.uc[2] == 0 && u.uc[3] == 0 &&
+		     u.uc[4] == 0 && (u.uc[5] & 0x03U) == 0);
+
+		if (use_half_float) {
+			duk_uint32_t t;
+
+			expt += 15;
+			t = (duk_uint32_t) (u.uc[7] & 0x80U) << 8;
+			t += (duk_uint32_t) expt << 10;
+			t += ((duk_uint32_t) u.uc[6] & 0x0fU) << 6;
+			t += ((duk_uint32_t) u.uc[5]) >> 2;
+
+			/* seeeeemm mmmmmmmm */
+			p = enc_ctx->ptr;
+			*p++ = 0xf9U;
+			DUK_RAW_WRITEINC_U16_BE(p, (duk_uint16_t) t);
+			enc_ctx->ptr = p;
+			return;
+		}
+	}
+
+	/* Same check for plain float.  Also no denormal support here. */
+	if (expt >= -126 && expt <= 127) {
+		/* Float normal exponents (excl. denormals).
+		 *
+		 * double: seeeeeee eeeemmmm mmmmmmmm mmmmmmmm mmmmmmmm mmmmmmmm mmmmmmmm mmmmmmmm
+		 * float:     seeee eeeemmmm mmmmmmmm mmmmmmmm mmm00000 00000000 00000000 00000000
+		 */
+		duk_bool_t use_float;
+		duk_float_t d_float;
+
+		/* We could do this explicit mantissa check, but doing
+		 * a double-float-double cast is fine because we've
+		 * already verified that the exponent is in range so
+		 * that the narrower cast is not undefined behavior.
+		 */
+#if 0
+		use_float =
+		    (u.uc[0] == 0 && u.uc[1] == 0 && u.uc[2] == 0 && (u.uc[3] & 0xe0U) == 0);
+#endif
+		d_float = (duk_float_t) d;
+		use_float = duk_double_equals((duk_double_t) d_float, d);
+		if (use_float) {
+			p = enc_ctx->ptr;
+			*p++ = 0xfaU;
+			DUK_RAW_WRITEINC_FLOAT_BE(p, d_float);
+			enc_ctx->ptr = p;
+			return;
+		}
+	}
+
+	/* Special handling for NaN and Inf which we want to encode as
+	 * half-floats.  They share the same (maximum) exponent.
+	 */
+	if (expt == 1024) {
+		DUK_ASSERT(DUK_ISNAN(d) || DUK_ISINF(d));
+		p = enc_ctx->ptr;
+		*p++ = 0xf9U;
+		if (DUK_ISNAN(d)) {
+			/* Shortest NaN encoding is using a half-float.  Lose the
+			 * exact NaN bits in the process.  IEEE double would be
+			 * 7ff8 0000 0000 0000, i.e. a quiet NaN in most architectures
+			 * (https://en.wikipedia.org/wiki/NaN#Encoding).  The
+			 * equivalent half float is 7e00.
+			 */
+			*p++ = 0x7eU;
+		} else {
+			/* Shortest +/- Infinity encoding is using a half-float. */
+			if (DUK_SIGNBIT(d)) {
+				*p++ = 0xfcU;
+			} else {
+				*p++ = 0x7cU;
+			}
+		}
+		*p++ = 0x00U;
+		enc_ctx->ptr = p;
+		return;
+	}
+
+	/* Cannot use half-float or float, encode as full IEEE double. */
+	p = enc_ctx->ptr;
+	*p++ = 0xfbU;
+	DUK_RAW_WRITEINC_DOUBLE_BE(p, d);
+	enc_ctx->ptr = p;
+}
+
+DUK_LOCAL void duk__cbor_encode_double(duk_cbor_encode_context *enc_ctx, double d) {
+	duk_uint8_t *p;
+	double d_floor;
+
+	/* Integers and floating point values of all types are conceptually
+	 * equivalent in CBOR.  Try to always choose the shortest encoding
+	 * which is not always immediately obvious.  For example, NaN and Inf
+	 * can be most compactly represented as a half-float (assuming NaN
+	 * bits are not preserved), and 0x1'0000'0000 as a single precision
+	 * float.  Shortest forms in preference order (prefer integer over
+	 * float when equal length):
+	 *
+	 *   uint        1 byte    [0,23] (not -0)
+	 *   sint        1 byte    [-24,-1]
+	 *   uint+1      2 bytes   [24,255]
+	 *   sint+1      2 bytes   [-256,-25]
+	 *   uint+2      3 bytes   [256,65535]
+	 *   sint+2      3 bytes   [-65536,-257]
+	 *   half-float  3 bytes   -0, NaN, +/- Infinity, range [-65504,65504]
+	 *   uint+4      5 bytes   [65536,4294967295]
+	 *   sint+4      5 bytes   [-4294967296,-258]
+	 *   float       5 bytes   range [-(1 - 2^(-24)) * 2^128, (1 - 2^(-24)) * 2^128]
+	 *   uint+8      9 bytes   [4294967296,18446744073709551615]
+	 *   sint+8      9 bytes   [-18446744073709551616,-4294967297]
+	 *   double      9 bytes
+	 *
+	 * For whole numbers (compatible with integers):
+	 *   - 1-byte or 2-byte uint/sint representation is preferred for
+	 *     [-256,255].
+	 *   - 3-byte uint/sint is preferred for [-65536,65535].  Half floats
+	 *     are never preferred because they have the same length.
+	 *   - 5-byte uint/sint is preferred for [-4294967296,4294967295].
+	 *     Single precision floats are never preferred, and half-floats
+	 *     don't reach above the 3-byte uint/sint range so they're never
+	 *     preferred.
+	 *   - So, for all integers up to signed/unsigned 32-bit range the
+	 *     preferred encoding is always an integer uint/sint.
+	 *   - For integers above 32 bits the situation is more complicated.
+	 *     Half-floats are never useful for them because of their limited
+	 *     range, but IEEE single precision floats (5 bytes encoded) can
+	 *     represent some integers between the 32-bit and 64-bit ranges
+	 *     which require 9 bytes as a uint/sint.
+	 *
+	 * For floating point values not compatible with integers, the
+	 * preferred encoding is quite clear:
+	 *   - For +Inf/-Inf use half-float.
+	 *   - For NaN use a half-float, assuming NaN bits ("payload") is
+	 *     not worth preserving.  Duktape doesn't in general guarantee
+	 *     preservation of the NaN payload so using a half-float seems
+	 *     consistent with that.
+	 *   - For remaining values, prefer the shortest form which doesn't
+	 *     lose any precision.  For normal half-floats and single precision
+	 *     floats this is simple: just check exponent and mantissa bits
+	 *     using a fixed mask.  For denormal half-floats and single
+	 *     precision floats the check is a bit more complicated: a normal
+	 *     IEEE double can sometimes be represented as a denormal
+	 *     half-float or single precision float.
+	 *
+	 * https://en.wikipedia.org/wiki/Half-precision_floating-point_format#IEEE_754_half-precision_binary_floating-point_format:_binary16
+	 */
+
+	/* Caller must ensure space. */
+	DUK_ASSERT(duk__cbor_get_reserve(enc_ctx) >= 1 + 8);
+
+	/* Most important path is integers.  The floor() test will be true
+	 * for Inf too (but not NaN).
+	 */
+	d_floor = DUK_FLOOR(d);  /* identity if d is +/- 0.0, NaN, or +/- Infinity */
+	if (DUK_LIKELY(duk_double_equals(d_floor, d) != 0)) {
+		DUK_ASSERT(!DUK_ISNAN(d));  /* NaN == NaN compares false. */
+		if (DUK_SIGNBIT(d)) {
+			if (d >= -4294967296.0) {
+				d = -1.0 - d;
+				if (d >= 0.0) {
+					DUK_ASSERT(d >= 0.0);
+					duk__cbor_encode_uint32(enc_ctx, duk__cbor_double_to_uint32(d), 0x20U);
+					return;
+				}
+
+				/* Input was negative zero, d == -1.0 < 0.0.
+				 * Shortest -0 is using half-float.
+				 */
+				p = enc_ctx->ptr;
+				*p++ = 0xf9U;
+				*p++ = 0x80U;
+				*p++ = 0x00U;
+				enc_ctx->ptr = p;
+				return;
+			}
+		} else {
+			if (d <= 4294967295.0) {
+				/* Positive zero needs no special handling. */
+				DUK_ASSERT(d >= 0.0);
+				duk__cbor_encode_uint32(enc_ctx, duk__cbor_double_to_uint32(d), 0x00U);
+				return;
+			}
+		}
+	}
+
+	/* 64-bit integers are not supported at present.  So
+	 * we also don't need to deal with choosing between a
+	 * 64-bit uint/sint representation vs. IEEE double or
+	 * float.
+	 */
+
+	DUK_ASSERT(DUK_FPCLASSIFY(d) != DUK_FP_ZERO);
+	duk__cbor_encode_double_fp(enc_ctx, d);
+}
+#endif  /* DUK_CBOR_DOUBLE_AS_IS */
+
+DUK_LOCAL void duk__cbor_encode_string_top(duk_cbor_encode_context *enc_ctx) {
+	const duk_uint8_t *str;
+	duk_size_t len;
+	duk_uint8_t *p;
+
+	/* CBOR differentiates between UTF-8 text strings and byte strings.
+	 * Text strings MUST be valid UTF-8, so not all Duktape strings can
+	 * be encoded as valid CBOR text strings.  Possible behaviors:
+	 *
+	 *   1. Use text string when input is valid UTF-8, otherwise use
+	 *      byte string (maybe tagged to indicate it was an extended
+	 *      UTF-8 string).
+	 *   2. Always use text strings, but sanitize input string so that
+	 *      invalid UTF-8 is replaced with U+FFFD for example.  Combine
+	 *      surrogates whenever possible.
+	 *   3. Always use byte strings.  This is simple and produces valid
+	 *      CBOR, but isn't ideal for interoperability.
+	 *   4. Always use text strings, even for invalid UTF-8 such as
+	 *      codepoints in the surrogate pair range.  This is simple but
+	 *      produces technically invalid CBOR for non-UTF-8 strings which
+	 *      may affect interoperability.
+	 *
+	 * Current default is 1; can be changed with defines.
+	 */
+
+	/* Caller must ensure space. */
+	DUK_ASSERT(duk__cbor_get_reserve(enc_ctx) >= 1 + 8);
+
+	str = (const duk_uint8_t *) duk_require_lstring(enc_ctx->thr, -1, &len);
+	if (duk_is_symbol(enc_ctx->thr, -1)) {
+		/* Symbols, encode as an empty table for now.  This matches
+		 * the behavior of cbor-js.
+		 *
+		 * XXX: Maybe encode String() coercion with a tag?
+		 * XXX: Option to keep enough information to recover
+		 * Symbols when decoding (this is not always desirable).
+		 */
+		p = enc_ctx->ptr;
+		*p++ = 0xa0U;
+		enc_ctx->ptr = p;
+		return;
+	}
+
+	duk__cbor_encode_sizet_uint32_check(enc_ctx, len);
+#if defined(DUK_CBOR_TEXT_STRINGS)
+	duk__cbor_encode_uint32(enc_ctx, (duk_uint32_t) len, 0x60U);
+#elif defined(DUK_CBOR_BYTE_STRINGS)
+	duk__cbor_encode_uint32(enc_ctx, (duk_uint32_t) len, 0x40U);
+#else
+	duk__cbor_encode_uint32(enc_ctx, (duk_uint32_t) len,
+	                        (DUK_LIKELY(duk_unicode_is_utf8_compatible(str, len) != 0) ? 0x60U : 0x40U));
+#endif
+	duk__cbor_encode_ensure(enc_ctx, len);
+	p = enc_ctx->ptr;
+	duk_memcpy((void *) p, (const void *) str, len);
+	p += len;
+	enc_ctx->ptr = p;
+}
+
+DUK_LOCAL void duk__cbor_encode_object(duk_cbor_encode_context *enc_ctx) {
+	duk_uint8_t *buf;
+	duk_size_t len;
+	duk_uint8_t *p;
+	duk_size_t i;
+	duk_size_t off_ib;
+	duk_uint32_t count;
+
+	/* Caller must ensure space. */
+	DUK_ASSERT(duk__cbor_get_reserve(enc_ctx) >= 1 + 8);
+
+	duk__cbor_encode_objarr_entry(enc_ctx);
+
+	/* XXX: Support for specific built-ins like Date and RegExp. */
+	if (duk_is_array(enc_ctx->thr, -1)) {
+		/* Shortest encoding for arrays >= 256 in length is actually
+		 * the indefinite length one (3 or more bytes vs. 2 bytes).
+		 * We still use the definite length version because it is
+		 * more decoding friendly.
+		 */
+		len = duk_get_length(enc_ctx->thr, -1);
+		duk__cbor_encode_sizet_uint32_check(enc_ctx, len);
+		duk__cbor_encode_uint32(enc_ctx, (duk_uint32_t) len, 0x80U);
+		for (i = 0; i < len; i++) {
+			duk_get_prop_index(enc_ctx->thr, -1, (duk_uarridx_t) i);
+			duk__cbor_encode_value(enc_ctx);
+		}
+	} else if (duk_is_buffer_data(enc_ctx->thr, -1)) {
+		/* XXX: Tag buffer data?
+		 * XXX: Encode typed arrays as integer arrays rather
+		 * than buffer data as is?
+		 */
+		buf = (duk_uint8_t *) duk_require_buffer_data(enc_ctx->thr, -1, &len);
+		duk__cbor_encode_sizet_uint32_check(enc_ctx, len);
+		duk__cbor_encode_uint32(enc_ctx, (duk_uint32_t) len, 0x40U);
+		duk__cbor_encode_ensure(enc_ctx, len);
+		p = enc_ctx->ptr;
+		duk_memcpy_unsafe((void *) p, (const void *) buf, len);
+		p += len;
+		enc_ctx->ptr = p;
+	} else {
+		/* We don't know the number of properties in advance
+		 * but would still like to encode at least small
+		 * objects without indefinite length.  Emit an
+		 * indefinite length byte initially, and if the final
+		 * property count is small enough to also fit in one
+		 * byte, backpatch it later.  Otherwise keep the
+		 * indefinite length.  This works well up to 23
+		 * properties which is practical and good enough.
+		 */
+		off_ib = (duk_size_t) (enc_ctx->ptr - enc_ctx->buf);  /* XXX: get_offset? */
+		count = 0U;
+		p = enc_ctx->ptr;
+		*p++ = 0xa0U + 0x1fU;  /* indefinite length */
+		enc_ctx->ptr = p;
+		duk_enum(enc_ctx->thr, -1, DUK_ENUM_OWN_PROPERTIES_ONLY);
+		while (duk_next(enc_ctx->thr, -1, 1 /*get_value*/)) {
+			duk_insert(enc_ctx->thr, -2);  /* [ ... key value ] -> [ ... value key ] */
+			duk__cbor_encode_value(enc_ctx);
+			duk__cbor_encode_value(enc_ctx);
+			count++;
+			if (count == 0U) {
+				duk__cbor_encode_error(enc_ctx);
+			}
+		}
+		duk_pop(enc_ctx->thr);
+		if (count <= 0x17U) {
+			DUK_ASSERT(off_ib < enc_ctx->len);
+			enc_ctx->buf[off_ib] = 0xa0U + (duk_uint8_t) count;
+		} else {
+			duk__cbor_encode_ensure(enc_ctx, 1);
+			p = enc_ctx->ptr;
+			*p++ = 0xffU;  /* break */
+			enc_ctx->ptr = p;
+		}
+	}
+
+	duk__cbor_encode_objarr_exit(enc_ctx);
+}
+
+DUK_LOCAL void duk__cbor_encode_buffer(duk_cbor_encode_context *enc_ctx) {
+	duk_uint8_t *buf;
+	duk_size_t len;
+	duk_uint8_t *p;
+
+	/* Caller must ensure space. */
+	DUK_ASSERT(duk__cbor_get_reserve(enc_ctx) >= 1 + 8);
+
+	/* Tag buffer data? */
+	buf = (duk_uint8_t *) duk_require_buffer(enc_ctx->thr, -1, &len);
+	duk__cbor_encode_sizet_uint32_check(enc_ctx, len);
+	duk__cbor_encode_uint32(enc_ctx, (duk_uint32_t) len, 0x40U);
+	duk__cbor_encode_ensure(enc_ctx, len);
+	p = enc_ctx->ptr;
+	duk_memcpy_unsafe((void *) p, (const void *) buf, len);
+	p += len;
+	enc_ctx->ptr = p;
+}
+
+DUK_LOCAL void duk__cbor_encode_pointer(duk_cbor_encode_context *enc_ctx) {
+	/* Pointers (void *) are challenging to encode.  They can't
+	 * be relied to be even 64-bit integer compatible (there are
+	 * pointer models larger than that), nor can floats encode
+	 * them.  They could be encoded as strings (%p format) but
+	 * that's not portable.  They could be encoded as direct memory
+	 * representations.  Recovering pointers is non-portable in any
+	 * case but it would be nice to be able to detect and recover
+	 * compatible pointers.
+	 *
+	 * For now, encode as "(%p)" string, matching JX.  There doesn't
+	 * seem to be an appropriate tag, so pointers don't currently
+	 * survive a CBOR encode/decode roundtrip intact.
+	 */
+	const char *ptr;
+
+	ptr = duk_to_string(enc_ctx->thr, -1);
+	DUK_ASSERT(ptr != NULL);
+	duk_push_sprintf(enc_ctx->thr, "(%s)", ptr);
+	duk_remove(enc_ctx->thr, -2);
+	duk__cbor_encode_string_top(enc_ctx);
+}
+
+DUK_LOCAL void duk__cbor_encode_lightfunc(duk_cbor_encode_context *enc_ctx) {
+	duk_uint8_t *p;
+
+	/* Caller must ensure space. */
+	DUK_ASSERT(duk__cbor_get_reserve(enc_ctx) >= 1 + 8);
+
+	/* For now encode as an empty object. */
+	p = enc_ctx->ptr;
+	*p++ = 0xa0U;
+	enc_ctx->ptr = p;
+}
+
+DUK_LOCAL void duk__cbor_encode_value(duk_cbor_encode_context *enc_ctx) {
+	duk_uint8_t *p;
+
+	/* Encode/decode cycle currently loses some type information.
+	 * This can be improved by registering custom tags with IANA.
+	 */
+
+	/* Reserve space for up to 64-bit types (1 initial byte + 8
+	 * followup bytes).  This allows encoding of integers, floats,
+	 * string/buffer length fields, etc without separate checks
+	 * in each code path.
+	 */
+	duk__cbor_encode_ensure(enc_ctx, 1 + 8);
+
+	switch (duk_get_type(enc_ctx->thr, -1)) {
+	case DUK_TYPE_UNDEFINED: {
+		p = enc_ctx->ptr;
+		*p++ = 0xf7;
+		enc_ctx->ptr = p;
+		break;
+	}
+	case DUK_TYPE_NULL: {
+		p = enc_ctx->ptr;
+		*p++ = 0xf6;
+		enc_ctx->ptr = p;
+		break;
+	}
+	case DUK_TYPE_BOOLEAN: {
+		duk_uint8_t u8 = duk_get_boolean(enc_ctx->thr, -1) ? 0xf5U : 0xf4U;
+		p = enc_ctx->ptr;
+		*p++ = u8;
+		enc_ctx->ptr = p;
+		break;
+	}
+	case DUK_TYPE_NUMBER: {
+		duk__cbor_encode_double(enc_ctx, duk_get_number(enc_ctx->thr, -1));
+		break;
+	}
+	case DUK_TYPE_STRING: {
+		duk__cbor_encode_string_top(enc_ctx);
+		break;
+	}
+	case DUK_TYPE_OBJECT: {
+		duk__cbor_encode_object(enc_ctx);
+		break;
+	}
+	case DUK_TYPE_BUFFER: {
+		duk__cbor_encode_buffer(enc_ctx);
+		break;
+	}
+	case DUK_TYPE_POINTER: {
+		duk__cbor_encode_pointer(enc_ctx);
+		break;
+	}
+	case DUK_TYPE_LIGHTFUNC: {
+		duk__cbor_encode_lightfunc(enc_ctx);
+		break;
+	}
+	case DUK_TYPE_NONE:
+	default:
+		goto fail;
+	}
+
+	duk_pop(enc_ctx->thr);
+	return;
+
+ fail:
+	duk__cbor_encode_error(enc_ctx);
+}
+
+/*
+ *  Decoding
+ */
+
+DUK_LOCAL void duk__cbor_decode_error(duk_cbor_decode_context *dec_ctx) {
+	(void) duk_type_error(dec_ctx->thr, "cbor decode error");
+}
+
+DUK_LOCAL void duk__cbor_decode_req_stack(duk_cbor_decode_context *dec_ctx) {
+	duk_require_stack(dec_ctx->thr, 4);
+}
+
+DUK_LOCAL void duk__cbor_decode_objarr_entry(duk_cbor_decode_context *dec_ctx) {
+	duk_hthread *thr = dec_ctx->thr;
+
+	/* Native stack check in object/array recursion. */
+	duk_native_stack_check(thr);
+
+	duk__cbor_decode_req_stack(dec_ctx);
+
+	DUK_ASSERT(dec_ctx->recursion_depth <= dec_ctx->recursion_limit);
+	if (dec_ctx->recursion_depth >= dec_ctx->recursion_limit) {
+		DUK_ERROR_RANGE(thr, DUK_STR_DEC_RECLIMIT);
+		DUK_WO_NORETURN(return;);
+	}
+	dec_ctx->recursion_depth++;
+}
+
+DUK_LOCAL void duk__cbor_decode_objarr_exit(duk_cbor_decode_context *dec_ctx) {
+	DUK_ASSERT(dec_ctx->recursion_depth > 0);
+	dec_ctx->recursion_depth--;
+}
+
+DUK_LOCAL duk_uint8_t duk__cbor_decode_readbyte(duk_cbor_decode_context *dec_ctx) {
+	DUK_ASSERT(dec_ctx->off <= dec_ctx->len);
+	if (DUK_UNLIKELY(dec_ctx->len - dec_ctx->off < 1U)) {
+		duk__cbor_decode_error(dec_ctx);
+	}
+	return dec_ctx->buf[dec_ctx->off++];
+}
+
+DUK_LOCAL duk_uint16_t duk__cbor_decode_read_u16(duk_cbor_decode_context *dec_ctx) {
+	duk_uint16_t res;
+
+	DUK_ASSERT(dec_ctx->off <= dec_ctx->len);
+	if (DUK_UNLIKELY(dec_ctx->len - dec_ctx->off < 2U)) {
+		duk__cbor_decode_error(dec_ctx);
+	}
+	res = DUK_RAW_READ_U16_BE(dec_ctx->buf + dec_ctx->off);
+	dec_ctx->off += 2;
+	return res;
+}
+
+DUK_LOCAL duk_uint32_t duk__cbor_decode_read_u32(duk_cbor_decode_context *dec_ctx) {
+	duk_uint32_t res;
+
+	DUK_ASSERT(dec_ctx->off <= dec_ctx->len);
+	if (DUK_UNLIKELY(dec_ctx->len - dec_ctx->off < 4U)) {
+		duk__cbor_decode_error(dec_ctx);
+	}
+	res = DUK_RAW_READ_U32_BE(dec_ctx->buf + dec_ctx->off);
+	dec_ctx->off += 4;
+	return res;
+}
+
+DUK_LOCAL duk_uint8_t duk__cbor_decode_peekbyte(duk_cbor_decode_context *dec_ctx) {
+	if (DUK_UNLIKELY(dec_ctx->off >= dec_ctx->len)) {
+		duk__cbor_decode_error(dec_ctx);
+	}
+	return dec_ctx->buf[dec_ctx->off];
+}
+
+DUK_LOCAL void duk__cbor_decode_rewind(duk_cbor_decode_context *dec_ctx, duk_size_t len) {
+	DUK_ASSERT(len <= dec_ctx->off);  /* Caller must ensure. */
+	dec_ctx->off -= len;
+}
+
+#if 0
+DUK_LOCAL void duk__cbor_decode_ensure(duk_cbor_decode_context *dec_ctx, duk_size_t len) {
+	if (dec_ctx->off + len > dec_ctx->len) {
+		duk__cbor_decode_error(dec_ctx);
+	}
+}
+#endif
+
+DUK_LOCAL const duk_uint8_t *duk__cbor_decode_consume(duk_cbor_decode_context *dec_ctx, duk_size_t len) {
+	DUK_ASSERT(dec_ctx->off <= dec_ctx->len);
+	if (DUK_LIKELY(dec_ctx->len - dec_ctx->off >= len)) {
+		const duk_uint8_t *res = dec_ctx->buf + dec_ctx->off;
+		dec_ctx->off += len;
+		return res;
+	}
+
+	duk__cbor_decode_error(dec_ctx);  /* Not enough input. */
+	return NULL;
+}
+
+DUK_LOCAL int duk__cbor_decode_checkbreak(duk_cbor_decode_context *dec_ctx) {
+	if (duk__cbor_decode_peekbyte(dec_ctx) == 0xffU) {
+		DUK_ASSERT(dec_ctx->off < dec_ctx->len);
+		dec_ctx->off++;
+#if 0
+		(void) duk__cbor_decode_readbyte(dec_ctx);
+#endif
+		return 1;
+	}
+	return 0;
+}
+
+DUK_LOCAL void duk__cbor_decode_push_aival_int(duk_cbor_decode_context *dec_ctx, duk_uint8_t ib, duk_bool_t negative) {
+	duk_uint8_t ai;
+	duk_uint32_t t, t1, t2;
+#if 0
+	duk_uint64_t t3;
+#endif
+	duk_double_t d1, d2;
+	duk_double_t d;
+
+	ai = ib & 0x1fU;
+	if (ai <= 0x17U) {
+		t = ai;
+		goto shared_exit;
+	}
+
+	switch (ai) {
+	case 0x18U:  /* 1 byte */
+		t = (duk_uint32_t) duk__cbor_decode_readbyte(dec_ctx);
+		goto shared_exit;
+	case 0x19U:  /* 2 byte */
+		t = (duk_uint32_t) duk__cbor_decode_read_u16(dec_ctx);
+		goto shared_exit;
+	case 0x1aU:  /* 4 byte */
+		t = (duk_uint32_t) duk__cbor_decode_read_u32(dec_ctx);
+		goto shared_exit;
+	case 0x1bU:  /* 8 byte */
+		/* For uint64 it's important to handle the -1.0 part before
+		 * casting to double: otherwise the adjustment might be lost
+		 * in the cast.  Uses: -1.0 - d <=> -(d + 1.0).
+		 */
+		t = (duk_uint32_t) duk__cbor_decode_read_u32(dec_ctx);
+		t2 = t;
+		t = (duk_uint32_t) duk__cbor_decode_read_u32(dec_ctx);
+		t1 = t;
+#if 0
+		t3 = (duk_uint64_t) t2 * DUK_U64_CONSTANT(0x100000000) + (duk_uint64_t) t1;
+		if (negative) {
+			if (t3 == DUK_UINT64_MAX) {
+				/* -(0xffff'ffff'ffff'ffffULL + 1) =
+				 * -0x1'0000'0000'0000'0000
+				 *
+				 * >>> -0x10000000000000000
+				 * -18446744073709551616L
+				 */
+				return -18446744073709551616.0;
+			} else {
+				return -((duk_double_t) (t3 + DUK_U64_CONSTANT(1)));
+			}
+		} else {
+			return (duk_double_t) t3;  /* XXX: cast helper */
+		}
+#endif
+#if 0
+		t3 = (duk_uint64_t) t2 * DUK_U64_CONSTANT(0x100000000) + (duk_uint64_t) t1;
+		if (negative) {
+			/* Simpler version: take advantage of the fact that
+			 * 0xffff'ffff'ffff'ffff and 0x1'0000'0000'0000'0000
+			 * both round to 0x1'0000'0000'0000'0000:
+			 * > (0xffffffffffffffff).toString(16)
+			 * '10000000000000000'
+			 * > (0x10000000000000000).toString(16)
+			 * '10000000000000000'
+			 *
+			 * For the DUK_UINT64_MAX case we just skip the +1
+			 * increment to avoid wrapping; the result still
+			 * comes out right for an IEEE double cast.
+			 */
+			if (t3 != DUK_UINT64_MAX) {
+				t3++;
+			}
+			return -((duk_double_t) t3);
+		} else {
+			return (duk_double_t) t3;  /* XXX: cast helper */
+		}
+#endif
+#if 1
+		/* Use two double parts, avoids dependency on 64-bit type.
+		 * Avoid precision loss carefully, especially when dealing
+		 * with the required +1 for negative values.
+		 *
+		 * No fastint check for this path at present.
+		 */
+		d1 = (duk_double_t) t1;  /* XXX: cast helpers */
+		d2 = (duk_double_t) t2 * 4294967296.0;
+		if (negative) {
+			d1 += 1.0;
+		}
+		d = d2 + d1;
+		if (negative) {
+			d = -d;
+		}
+#endif
+		/* XXX: a push and check for fastint API would be nice */
+		duk_push_number(dec_ctx->thr, d);
+		return;
+	}
+
+	duk__cbor_decode_error(dec_ctx);
+	return;
+
+ shared_exit:
+	if (negative) {
+		/* XXX: a push and check for fastint API would be nice */
+		if ((duk_uint_t) t <= (duk_uint_t) -(DUK_INT_MIN + 1)) {
+			duk_push_int(dec_ctx->thr, -1 - ((duk_int_t) t));
+		} else {
+			duk_push_number(dec_ctx->thr, -1.0 - (duk_double_t) t);
+		}
+	} else {
+		duk_push_uint(dec_ctx->thr, (duk_uint_t) t);
+	}
+}
+
+DUK_LOCAL void duk__cbor_decode_skip_aival_int(duk_cbor_decode_context *dec_ctx, duk_uint8_t ib) {
+	const duk_int8_t skips[32] = {
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 4, 8, -1, -1, -1, -1
+	};
+	duk_uint8_t ai;
+	duk_int8_t skip;
+
+	ai = ib & 0x1fU;
+	skip = skips[ai];
+	if (DUK_UNLIKELY(skip < 0)) {
+		duk__cbor_decode_error(dec_ctx);
+	}
+	duk__cbor_decode_consume(dec_ctx, (duk_size_t) skip);
+	return;
+}
+
+DUK_LOCAL duk_uint32_t duk__cbor_decode_aival_uint32(duk_cbor_decode_context *dec_ctx, duk_uint8_t ib) {
+	duk_uint8_t ai;
+	duk_uint32_t t;
+
+	ai = ib & 0x1fU;
+	if (ai <= 0x17U) {
+		return (duk_uint32_t) ai;
+	}
+
+	switch (ai) {
+	case 0x18U:  /* 1 byte */
+		t = (duk_uint32_t) duk__cbor_decode_readbyte(dec_ctx);
+		return t;
+	case 0x19U:  /* 2 byte */
+		t = (duk_uint32_t) duk__cbor_decode_read_u16(dec_ctx);
+		return t;
+	case 0x1aU:  /* 4 byte */
+		t = (duk_uint32_t) duk__cbor_decode_read_u32(dec_ctx);
+		return t;
+	case 0x1bU:  /* 8 byte */
+		t = (duk_uint32_t) duk__cbor_decode_read_u32(dec_ctx);
+		if (t != 0U) {
+			break;
+		}
+		t = (duk_uint32_t) duk__cbor_decode_read_u32(dec_ctx);
+		return t;
+	}
+
+	duk__cbor_decode_error(dec_ctx);
+	return 0U;
+}
+
+DUK_LOCAL void duk__cbor_decode_buffer(duk_cbor_decode_context *dec_ctx, duk_uint8_t expected_base) {
+	duk_uint32_t len;
+	duk_uint8_t *buf;
+	const duk_uint8_t *inp;
+	duk_uint8_t ib;
+
+	ib = duk__cbor_decode_readbyte(dec_ctx);
+	if ((ib & 0xe0U) != expected_base) {
+		duk__cbor_decode_error(dec_ctx);
+	}
+	/* Indefinite format is rejected by the following on purpose. */
+	len = duk__cbor_decode_aival_uint32(dec_ctx, ib);
+	inp = duk__cbor_decode_consume(dec_ctx, len);
+	/* XXX: duk_push_fixed_buffer_with_data() would be a nice API addition. */
+	buf = (duk_uint8_t *) duk_push_fixed_buffer(dec_ctx->thr, (duk_size_t) len);
+	duk_memcpy((void *) buf, (const void *) inp, (size_t) len);
+}
+
+DUK_LOCAL void duk__cbor_decode_join_buffers(duk_cbor_decode_context *dec_ctx, duk_idx_t count) {
+	duk_size_t total_size = 0;
+	duk_idx_t top = duk_get_top(dec_ctx->thr);
+	duk_idx_t base = top - count;  /* count is >= 1 */
+	duk_idx_t idx;
+	duk_uint8_t *p = NULL;
+
+	DUK_ASSERT(count >= 1);
+	DUK_ASSERT(top >= count);
+
+	for (;;) {
+		/* First round: compute total size.
+		 * Second round: copy into place.
+		 */
+		for (idx = base; idx < top; idx++) {
+			duk_uint8_t *buf_data;
+			duk_size_t buf_size;
+
+			buf_data = (duk_uint8_t *) duk_require_buffer(dec_ctx->thr, idx, &buf_size);
+			if (p != NULL) {
+				duk_memcpy_unsafe((void *) p, (const void *) buf_data, buf_size);
+				p += buf_size;
+			} else {
+				total_size += buf_size;
+				if (DUK_UNLIKELY(total_size < buf_size)) {  /* Wrap check. */
+					duk__cbor_decode_error(dec_ctx);
+				}
+			}
+		}
+
+		if (p != NULL) {
+			break;
+		} else {
+			p = (duk_uint8_t *) duk_push_fixed_buffer(dec_ctx->thr, total_size);
+			DUK_ASSERT(p != NULL);
+		}
+	}
+
+	duk_replace(dec_ctx->thr, base);
+	duk_pop_n(dec_ctx->thr, count - 1);
+}
+
+DUK_LOCAL void duk__cbor_decode_and_join_strbuf(duk_cbor_decode_context *dec_ctx, duk_uint8_t expected_base) {
+	duk_idx_t count = 0;
+	for (;;) {
+		if (duk__cbor_decode_checkbreak(dec_ctx)) {
+			break;
+		}
+		duk_require_stack(dec_ctx->thr, 1);
+		duk__cbor_decode_buffer(dec_ctx, expected_base);
+		count++;
+		if (DUK_UNLIKELY(count <= 0)) {  /* Wrap check. */
+			duk__cbor_decode_error(dec_ctx);
+		}
+	}
+	if (count == 0) {
+		(void) duk_push_fixed_buffer(dec_ctx->thr, 0);
+	} else if (count > 1) {
+		duk__cbor_decode_join_buffers(dec_ctx, count);
+	}
+}
+
+DUK_LOCAL duk_double_t duk__cbor_decode_half_float(duk_cbor_decode_context *dec_ctx) {
+	duk_double_union u;
+	const duk_uint8_t *inp;
+	duk_int_t expt;
+	duk_uint_t u16;
+	duk_uint_t tmp;
+	duk_double_t res;
+
+	inp = duk__cbor_decode_consume(dec_ctx, 2);
+	u16 = ((duk_uint_t) inp[0] << 8) + (duk_uint_t) inp[1];
+	expt = (duk_int_t) ((u16 >> 10) & 0x1fU) - 15;
+
+	/* Reconstruct IEEE double into little endian order first, then convert
+	 * to host order.
+	 */
+
+	duk_memzero((void *) &u, sizeof(u));
+
+	if (expt == -15) {
+		/* Zero or denormal; but note that half float
+		 * denormals become double normals.
+		 */
+		if ((u16 & 0x03ffU) == 0) {
+			u.uc[7] = inp[0] & 0x80U;
+		} else {
+			/* Create denormal by first creating a double that
+			 * contains the denormal bits and a leading implicit
+			 * 1-bit.  Then subtract away the implicit 1-bit.
+			 *
+			 *    0.mmmmmmmmmm * 2^-14
+			 *    1.mmmmmmmmmm 0.... * 2^-14
+			 *   -1.0000000000 0.... * 2^-14
+			 *
+			 * Double exponent: -14 + 1023 = 0x3f1
+			 */
+			u.uc[7] = 0x3fU;
+			u.uc[6] = 0x10U + (duk_uint8_t) ((u16 >> 6) & 0x0fU);
+			u.uc[5] = (duk_uint8_t) ((u16 << 2) & 0xffU);  /* Mask is really 0xfcU */
+
+			duk_dblunion_little_to_host(&u);
+			res = u.d - 0.00006103515625;  /* 2^(-14) */
+			if (u16 & 0x8000U) {
+				res = -res;
+			}
+			return res;
+		}
+	} else if (expt == 16) {
+		/* +/- Inf or NaN. */
+		if ((u16 & 0x03ffU) == 0) {
+			u.uc[7] = (inp[0] & 0x80U) + 0x7fU;
+			u.uc[6] = 0xf0U;
+		} else {
+			/* Create a 'quiet NaN' with highest
+			 * bit set (there are some platforms
+			 * where the NaN payload convention is
+			 * the opposite).  Keep sign.
+			 */
+			u.uc[7] = (inp[0] & 0x80U) + 0x7fU;
+			u.uc[6] = 0xf8U;
+		}
+	} else {
+		/* Normal. */
+		tmp = (inp[0] & 0x80U) ? 0x80000000UL : 0UL;
+		tmp += (duk_uint_t) (expt + 1023) << 20;
+		tmp += (duk_uint_t) (inp[0] & 0x03U) << 18;
+		tmp += (duk_uint_t) (inp[1] & 0xffU) << 10;
+		u.uc[7] = (tmp >> 24) & 0xffU;
+		u.uc[6] = (tmp >> 16) & 0xffU;
+		u.uc[5] = (tmp >> 8) & 0xffU;
+		u.uc[4] = (tmp >> 0) & 0xffU;
+	}
+
+	duk_dblunion_little_to_host(&u);
+	return u.d;
+}
+
+DUK_LOCAL void duk__cbor_decode_string(duk_cbor_decode_context *dec_ctx, duk_uint8_t ib, duk_uint8_t ai) {
+	/* If the CBOR string data is not valid UTF-8 it is technically
+	 * invalid CBOR.  Possible behaviors at least:
+	 *
+	 *   1. Reject the input, i.e. throw TypeError.
+	 *
+	 *   2. Accept the input, but sanitize non-UTF-8 data into UTF-8
+	 *      using U+FFFD replacements.  Also it might make sense to
+	 *      decode non-BMP codepoints into surrogates for better
+	 *      ECMAScript compatibility.
+	 *
+	 *   3. Accept the input as a Duktape string (which are not always
+	 *      valid UTF-8), but reject any input that would create a
+	 *      Symbol representation.
+	 *
+	 * Current behavior is 3.
+	 */
+
+	if (ai == 0x1fU) {
+		duk_uint8_t *buf_data;
+		duk_size_t buf_size;
+
+		duk__cbor_decode_and_join_strbuf(dec_ctx, 0x60U);
+		buf_data = (duk_uint8_t *) duk_require_buffer(dec_ctx->thr, -1, &buf_size);
+		(void) duk_push_lstring(dec_ctx->thr, (const char *) buf_data, buf_size);
+		duk_remove(dec_ctx->thr, -2);
+	} else {
+		duk_uint32_t len;
+		const duk_uint8_t *inp;
+
+		len = duk__cbor_decode_aival_uint32(dec_ctx, ib);
+		inp = duk__cbor_decode_consume(dec_ctx, len);
+		(void) duk_push_lstring(dec_ctx->thr, (const char *) inp, (duk_size_t) len);
+	}
+	if (duk_is_symbol(dec_ctx->thr, -1)) {
+		/* Refuse to create Symbols when decoding. */
+		duk__cbor_decode_error(dec_ctx);
+	}
+
+	/* XXX: Here a Duktape API call to convert input -> utf-8 with
+	 * replacements would be nice.
+	 */
+}
+
+DUK_LOCAL duk_bool_t duk__cbor_decode_array(duk_cbor_decode_context *dec_ctx, duk_uint8_t ib, duk_uint8_t ai) {
+	duk_uint32_t idx, len;
+
+	duk__cbor_decode_objarr_entry(dec_ctx);
+
+	/* Support arrays up to 0xfffffffeU in length.  0xffffffff is
+	 * used as an indefinite length marker.
+	 */
+	if (ai == 0x1fU) {
+		len = 0xffffffffUL;
+	} else {
+		len = duk__cbor_decode_aival_uint32(dec_ctx, ib);
+		if (len == 0xffffffffUL) {
+			goto failure;
+		}
+	}
+
+	/* XXX: use bare array? */
+	duk_push_array(dec_ctx->thr);
+	for (idx = 0U; ;) {
+		if (len == 0xffffffffUL && duk__cbor_decode_checkbreak(dec_ctx)) {
+			break;
+		}
+		if (idx == len) {
+			if (ai == 0x1fU) {
+				goto failure;
+			}
+			break;
+		}
+		duk__cbor_decode_value(dec_ctx);
+		duk_put_prop_index(dec_ctx->thr, -2, (duk_uarridx_t) idx);
+		idx++;
+		if (idx == 0U) {
+			goto failure;  /* wrapped */
+		}
+	}
+
+#if 0
+ success:
+#endif
+	duk__cbor_decode_objarr_exit(dec_ctx);
+	return 1;
+
+ failure:
+	/* No need to unwind recursion checks, caller will throw. */
+	return 0;
+}
+
+DUK_LOCAL duk_bool_t duk__cbor_decode_map(duk_cbor_decode_context *dec_ctx, duk_uint8_t ib, duk_uint8_t ai) {
+	duk_uint32_t count;
+
+	duk__cbor_decode_objarr_entry(dec_ctx);
+
+	if (ai == 0x1fU) {
+		count = 0xffffffffUL;
+	} else {
+		count = duk__cbor_decode_aival_uint32(dec_ctx, ib);
+		if (count == 0xffffffffUL) {
+			goto failure;
+		}
+	}
+
+	/* XXX: use bare object? */
+	duk_push_object(dec_ctx->thr);
+	for (;;) {
+		if (count == 0xffffffffUL) {
+			if (duk__cbor_decode_checkbreak(dec_ctx)) {
+				break;
+			}
+		} else {
+			if (count == 0UL) {
+				break;
+			}
+			count--;
+		}
+
+		/* Non-string keys are coerced to strings,
+		 * possibly leading to overwriting previous
+		 * keys.  Last key of a certain coerced name
+		 * wins.  If key is an object, it will coerce
+		 * to '[object Object]' which is consistent
+		 * but potentially misleading.  One alternative
+		 * would be to skip non-string keys.
+		 */
+		duk__cbor_decode_value(dec_ctx);
+		duk__cbor_decode_value(dec_ctx);
+		duk_put_prop(dec_ctx->thr, -3);
+	}
+
+#if 0
+ success:
+#endif
+	duk__cbor_decode_objarr_exit(dec_ctx);
+	return 1;
+
+ failure:
+	/* No need to unwind recursion checks, caller will throw. */
+	return 0;
+}
+
+DUK_LOCAL duk_double_t duk__cbor_decode_float(duk_cbor_decode_context *dec_ctx) {
+	duk_float_union u;
+	const duk_uint8_t *inp;
+	inp = duk__cbor_decode_consume(dec_ctx, 4);
+	duk_memcpy((void *) u.uc, (const void *) inp, 4);
+	duk_fltunion_big_to_host(&u);
+	return (duk_double_t) u.f;
+}
+
+DUK_LOCAL duk_double_t duk__cbor_decode_double(duk_cbor_decode_context *dec_ctx) {
+	duk_double_union u;
+	const duk_uint8_t *inp;
+	inp = duk__cbor_decode_consume(dec_ctx, 8);
+	duk_memcpy((void *) u.uc, (const void *) inp, 8);
+	duk_dblunion_big_to_host(&u);
+	return u.d;
+}
+
+#if defined(DUK_CBOR_DECODE_FASTPATH)
+#define DUK__CBOR_AI  (ib & 0x1fU)
+
+DUK_LOCAL void duk__cbor_decode_value(duk_cbor_decode_context *dec_ctx) {
+	duk_uint8_t ib;
+
+	/* Any paths potentially recursing back to duk__cbor_decode_value()
+	 * must perform a Duktape value stack growth check.  Avoid the check
+	 * here for simple paths like primitive values.
+	 */
+
+ reread_initial_byte:
+	DUK_DDD(DUK_DDDPRINT("cbor decode off=%ld len=%ld", (long) dec_ctx->off, (long) dec_ctx->len));
+
+	ib = duk__cbor_decode_readbyte(dec_ctx);
+
+	/* Full initial byte switch, footprint cost over baseline is ~+1kB. */
+	/* XXX: Force full switch with no range check. */
+
+	switch (ib) {
+	case 0x00U: case 0x01U: case 0x02U: case 0x03U: case 0x04U: case 0x05U: case 0x06U: case 0x07U:
+	case 0x08U: case 0x09U: case 0x0aU: case 0x0bU: case 0x0cU: case 0x0dU: case 0x0eU: case 0x0fU:
+	case 0x10U: case 0x11U: case 0x12U: case 0x13U: case 0x14U: case 0x15U: case 0x16U: case 0x17U:
+		duk_push_uint(dec_ctx->thr, ib);
+		break;
+	case 0x18U: case 0x19U: case 0x1aU: case 0x1bU:
+		duk__cbor_decode_push_aival_int(dec_ctx, ib, 0 /*negative*/);
+		break;
+	case 0x1cU: case 0x1dU: case 0x1eU: case 0x1fU:
+		goto format_error;
+	case 0x20U: case 0x21U: case 0x22U: case 0x23U: case 0x24U: case 0x25U: case 0x26U: case 0x27U:
+	case 0x28U: case 0x29U: case 0x2aU: case 0x2bU: case 0x2cU: case 0x2dU: case 0x2eU: case 0x2fU:
+	case 0x30U: case 0x31U: case 0x32U: case 0x33U: case 0x34U: case 0x35U: case 0x36U: case 0x37U:
+		duk_push_int(dec_ctx->thr, -((duk_int_t) ((ib - 0x20U) + 1U)));
+		break;
+	case 0x38U: case 0x39U: case 0x3aU: case 0x3bU:
+		duk__cbor_decode_push_aival_int(dec_ctx, ib, 1 /*negative*/);
+		break;
+	case 0x3cU: case 0x3dU: case 0x3eU: case 0x3fU:
+		goto format_error;
+	case 0x40U: case 0x41U: case 0x42U: case 0x43U: case 0x44U: case 0x45U: case 0x46U: case 0x47U:
+	case 0x48U: case 0x49U: case 0x4aU: case 0x4bU: case 0x4cU: case 0x4dU: case 0x4eU: case 0x4fU:
+	case 0x50U: case 0x51U: case 0x52U: case 0x53U: case 0x54U: case 0x55U: case 0x56U: case 0x57U:
+		/* XXX: Avoid rewind, we know the length already. */
+		DUK_ASSERT(dec_ctx->off > 0U);
+		dec_ctx->off--;
+		duk__cbor_decode_buffer(dec_ctx, 0x40U);
+		break;
+	case 0x58U: case 0x59U: case 0x5aU: case 0x5bU:
+		/* XXX: Avoid rewind, decode length inline. */
+		DUK_ASSERT(dec_ctx->off > 0U);
+		dec_ctx->off--;
+		duk__cbor_decode_buffer(dec_ctx, 0x40U);
+		break;
+	case 0x5cU: case 0x5dU: case 0x5eU:
+		goto format_error;
+	case 0x5fU:
+		duk__cbor_decode_and_join_strbuf(dec_ctx, 0x40U);
+		break;
+	case 0x60U: case 0x61U: case 0x62U: case 0x63U: case 0x64U: case 0x65U: case 0x66U: case 0x67U:
+	case 0x68U: case 0x69U: case 0x6aU: case 0x6bU: case 0x6cU: case 0x6dU: case 0x6eU: case 0x6fU:
+	case 0x70U: case 0x71U: case 0x72U: case 0x73U: case 0x74U: case 0x75U: case 0x76U: case 0x77U:
+		/* XXX: Avoid double decode of length. */
+		duk__cbor_decode_string(dec_ctx, ib, DUK__CBOR_AI);
+		break;
+	case 0x78U: case 0x79U: case 0x7aU: case 0x7bU:
+		/* XXX: Avoid double decode of length. */
+		duk__cbor_decode_string(dec_ctx, ib, DUK__CBOR_AI);
+		break;
+	case 0x7cU: case 0x7dU: case 0x7eU:
+		goto format_error;
+	case 0x7fU:
+		duk__cbor_decode_string(dec_ctx, ib, DUK__CBOR_AI);
+		break;
+	case 0x80U: case 0x81U: case 0x82U: case 0x83U: case 0x84U: case 0x85U: case 0x86U: case 0x87U:
+	case 0x88U: case 0x89U: case 0x8aU: case 0x8bU: case 0x8cU: case 0x8dU: case 0x8eU: case 0x8fU:
+	case 0x90U: case 0x91U: case 0x92U: case 0x93U: case 0x94U: case 0x95U: case 0x96U: case 0x97U:
+		if (DUK_UNLIKELY(duk__cbor_decode_array(dec_ctx, ib, DUK__CBOR_AI) == 0)) {
+			goto format_error;
+		}
+		break;
+	case 0x98U: case 0x99U: case 0x9aU: case 0x9bU:
+		if (DUK_UNLIKELY(duk__cbor_decode_array(dec_ctx, ib, DUK__CBOR_AI) == 0)) {
+			goto format_error;
+		}
+		break;
+	case 0x9cU: case 0x9dU: case 0x9eU:
+		goto format_error;
+	case 0x9fU:
+		if (DUK_UNLIKELY(duk__cbor_decode_array(dec_ctx, ib, DUK__CBOR_AI) == 0)) {
+			goto format_error;
+		}
+		break;
+	case 0xa0U: case 0xa1U: case 0xa2U: case 0xa3U: case 0xa4U: case 0xa5U: case 0xa6U: case 0xa7U:
+	case 0xa8U: case 0xa9U: case 0xaaU: case 0xabU: case 0xacU: case 0xadU: case 0xaeU: case 0xafU:
+	case 0xb0U: case 0xb1U: case 0xb2U: case 0xb3U: case 0xb4U: case 0xb5U: case 0xb6U: case 0xb7U:
+		if (DUK_UNLIKELY(duk__cbor_decode_map(dec_ctx, ib, DUK__CBOR_AI) == 0)) {
+			goto format_error;
+		}
+		break;
+	case 0xb8U: case 0xb9U: case 0xbaU: case 0xbbU:
+		if (DUK_UNLIKELY(duk__cbor_decode_map(dec_ctx, ib, DUK__CBOR_AI) == 0)) {
+			goto format_error;
+		}
+		break;
+	case 0xbcU: case 0xbdU: case 0xbeU:
+		goto format_error;
+	case 0xbfU:
+		if (DUK_UNLIKELY(duk__cbor_decode_map(dec_ctx, ib, DUK__CBOR_AI) == 0)) {
+			goto format_error;
+		}
+		break;
+	case 0xc0U: case 0xc1U: case 0xc2U: case 0xc3U: case 0xc4U: case 0xc5U: case 0xc6U: case 0xc7U:
+	case 0xc8U: case 0xc9U: case 0xcaU: case 0xcbU: case 0xccU: case 0xcdU: case 0xceU: case 0xcfU:
+	case 0xd0U: case 0xd1U: case 0xd2U: case 0xd3U: case 0xd4U: case 0xd5U: case 0xd6U: case 0xd7U:
+		/* Tag 0-23: drop. */
+		goto reread_initial_byte;
+	case 0xd8U: case 0xd9U: case 0xdaU: case 0xdbU:
+		duk__cbor_decode_skip_aival_int(dec_ctx, ib);
+		goto reread_initial_byte;
+	case 0xdcU: case 0xddU: case 0xdeU: case 0xdfU:
+		goto format_error;
+	case 0xe0U:
+		goto format_error;
+	case 0xe1U:
+		goto format_error;
+	case 0xe2U:
+		goto format_error;
+	case 0xe3U:
+		goto format_error;
+	case 0xe4U:
+		goto format_error;
+	case 0xe5U:
+		goto format_error;
+	case 0xe6U:
+		goto format_error;
+	case 0xe7U:
+		goto format_error;
+	case 0xe8U:
+		goto format_error;
+	case 0xe9U:
+		goto format_error;
+	case 0xeaU:
+		goto format_error;
+	case 0xebU:
+		goto format_error;
+	case 0xecU:
+		goto format_error;
+	case 0xedU:
+		goto format_error;
+	case 0xeeU:
+		goto format_error;
+	case 0xefU:
+		goto format_error;
+	case 0xf0U:
+		goto format_error;
+	case 0xf1U:
+		goto format_error;
+	case 0xf2U:
+		goto format_error;
+	case 0xf3U:
+		goto format_error;
+	case 0xf4U:
+		duk_push_false(dec_ctx->thr);
+		break;
+	case 0xf5U:
+		duk_push_true(dec_ctx->thr);
+		break;
+	case 0xf6U:
+		duk_push_null(dec_ctx->thr);
+		break;
+	case 0xf7U:
+		duk_push_undefined(dec_ctx->thr);
+		break;
+	case 0xf8U:
+		/* Simple value 32-255, nothing defined yet, so reject. */
+		goto format_error;
+	case 0xf9U: {
+		duk_double_t d;
+		d = duk__cbor_decode_half_float(dec_ctx);
+		duk_push_number(dec_ctx->thr, d);
+		break;
+	}
+	case 0xfaU: {
+		duk_double_t d;
+		d = duk__cbor_decode_float(dec_ctx);
+		duk_push_number(dec_ctx->thr, d);
+		break;
+	}
+	case 0xfbU: {
+		duk_double_t d;
+		d = duk__cbor_decode_double(dec_ctx);
+		duk_push_number(dec_ctx->thr, d);
+		break;
+	}
+	case 0xfcU:
+	case 0xfdU:
+	case 0xfeU:
+	case 0xffU:
+		goto format_error;
+	}  /* end switch */
+
+	return;
+
+ format_error:
+	duk__cbor_decode_error(dec_ctx);
+}
+#else  /* DUK_CBOR_DECODE_FASTPATH */
+DUK_LOCAL void duk__cbor_decode_value(duk_cbor_decode_context *dec_ctx) {
+	duk_uint8_t ib, mt, ai;
+
+	/* Any paths potentially recursing back to duk__cbor_decode_value()
+	 * must perform a Duktape value stack growth check.  Avoid the check
+	 * here for simple paths like primitive values.
+	 */
+
+ reread_initial_byte:
+	DUK_DDD(DUK_DDDPRINT("cbor decode off=%ld len=%ld", (long) dec_ctx->off, (long) dec_ctx->len));
+
+	ib = duk__cbor_decode_readbyte(dec_ctx);
+	mt = ib >> 5U;
+	ai = ib & 0x1fU;
+
+	/* Additional information in [24,27] = [0x18,0x1b] has relatively
+	 * uniform handling for all major types: read 1/2/4/8 additional
+	 * bytes.  For major type 7 the 1-byte value is a 'simple type', and
+	 * 2/4/8-byte values are floats.  For other major types the 1/2/4/8
+	 * byte values are integers.  The lengths are uniform, but the typing
+	 * is not.
+	 */
+
+	switch (mt) {
+	case 0U: {  /* unsigned integer */
+		duk__cbor_decode_push_aival_int(dec_ctx, ib, 0 /*negative*/);
+		break;
+	}
+	case 1U: {  /* negative integer */
+		duk__cbor_decode_push_aival_int(dec_ctx, ib, 1 /*negative*/);
+		break;
+	}
+	case 2U: {  /* byte string */
+		if (ai == 0x1fU) {
+			duk__cbor_decode_and_join_strbuf(dec_ctx, 0x40U);
+		} else {
+			duk__cbor_decode_rewind(dec_ctx, 1U);
+			duk__cbor_decode_buffer(dec_ctx, 0x40U);
+		}
+		break;
+	}
+	case 3U: {  /* text string */
+		duk__cbor_decode_string(dec_ctx, ib, ai);
+		break;
+	}
+	case 4U: {  /* array of data items */
+		if (DUK_UNLIKELY(duk__cbor_decode_array(dec_ctx, ib, ai) == 0)) {
+			goto format_error;
+		}
+		break;
+	}
+	case 5U: {  /* map of pairs of data items */
+		if (DUK_UNLIKELY(duk__cbor_decode_map(dec_ctx, ib, ai) == 0)) {
+			goto format_error;
+		}
+		break;
+	}
+	case 6U: {  /* semantic tagging */
+		/* Tags are ignored now, re-read initial byte.  A tagged
+		 * value may itself be tagged (an unlimited number of times)
+		 * so keep on peeling away tags.
+		 */
+		duk__cbor_decode_skip_aival_int(dec_ctx, ib);
+		goto reread_initial_byte;
+	}
+	case 7U: {  /* floating point numbers, simple data types, break; other */
+		switch (ai) {
+		case 0x14U: {
+			duk_push_false(dec_ctx->thr);
+			break;
+		}
+		case 0x15U: {
+			duk_push_true(dec_ctx->thr);
+			break;
+		}
+		case 0x16U: {
+			duk_push_null(dec_ctx->thr);
+			break;
+		}
+		case 0x17U: {
+			duk_push_undefined(dec_ctx->thr);
+			break;
+		}
+		case 0x18U: {  /* more simple values (1 byte) */
+			/* Simple value encoded in additional byte (none
+			 * are defined so far).  RFC 7049 states that the
+			 * follow-up byte must be 32-255 to minimize
+			 * confusion.  So, a non-shortest encoding like
+			 * f815 (= true, shortest encoding f5) must be
+			 * rejected.  cbor.me tester rejects f815, but
+			 * e.g. Python CBOR binding decodes it as true.
+			 */
+			goto format_error;
+		}
+		case 0x19U: {  /* half-float (2 bytes) */
+			duk_double_t d;
+			d = duk__cbor_decode_half_float(dec_ctx);
+			duk_push_number(dec_ctx->thr, d);
+			break;
+		}
+		case 0x1aU: {  /* float (4 bytes) */
+			duk_double_t d;
+			d = duk__cbor_decode_float(dec_ctx);
+			duk_push_number(dec_ctx->thr, d);
+			break;
+		}
+		case 0x1bU: {  /* double (8 bytes) */
+			duk_double_t d;
+			d = duk__cbor_decode_double(dec_ctx);
+			duk_push_number(dec_ctx->thr, d);
+			break;
+		}
+		case 0xffU:  /* unexpected break */
+		default: {
+			goto format_error;
+		}
+		}  /* end switch */
+		break;
+	}
+	default: {
+		goto format_error;  /* will never actually occur */
+	}
+	}  /* end switch */
+
+	return;
+
+ format_error:
+	duk__cbor_decode_error(dec_ctx);
+}
+#endif  /* DUK_CBOR_DECODE_FASTPATH */
+
+DUK_LOCAL void duk__cbor_encode(duk_hthread *thr, duk_idx_t idx, duk_uint_t encode_flags) {
+	duk_cbor_encode_context enc_ctx;
+	duk_uint8_t *buf;
+
+	DUK_UNREF(encode_flags);
+
+	idx = duk_require_normalize_index(thr, idx);
+
+	enc_ctx.thr = thr;
+	enc_ctx.idx_buf = duk_get_top(thr);
+
+	enc_ctx.len = 64;
+	buf = (duk_uint8_t *) duk_push_dynamic_buffer(thr, enc_ctx.len);
+	enc_ctx.ptr = buf;
+	enc_ctx.buf = buf;
+	enc_ctx.buf_end = buf + enc_ctx.len;
+
+	enc_ctx.recursion_depth = 0;
+	enc_ctx.recursion_limit = DUK_USE_CBOR_ENC_RECLIMIT;
+
+	duk_dup(thr, idx);
+	duk__cbor_encode_req_stack(&enc_ctx);
+	duk__cbor_encode_value(&enc_ctx);
+	DUK_ASSERT(enc_ctx.recursion_depth == 0);
+	duk_resize_buffer(enc_ctx.thr, enc_ctx.idx_buf, (duk_size_t) (enc_ctx.ptr - enc_ctx.buf));
+	duk_replace(thr, idx);
+}
+
+DUK_LOCAL void duk__cbor_decode(duk_hthread *thr, duk_idx_t idx, duk_uint_t decode_flags) {
+	duk_cbor_decode_context dec_ctx;
+
+	DUK_UNREF(decode_flags);
+
+	/* Suppress compile warnings for functions only needed with e.g.
+	 * asserts enabled.
+	 */
+	DUK_UNREF(duk__cbor_get_reserve);
+
+	idx = duk_require_normalize_index(thr, idx);
+
+	dec_ctx.thr = thr;
+	dec_ctx.buf = (const duk_uint8_t *) duk_require_buffer_data(thr, idx, &dec_ctx.len);
+	dec_ctx.off = 0;
+	/* dec_ctx.len: set above */
+
+	dec_ctx.recursion_depth = 0;
+	dec_ctx.recursion_limit = DUK_USE_CBOR_DEC_RECLIMIT;
+
+	duk__cbor_decode_req_stack(&dec_ctx);
+	duk__cbor_decode_value(&dec_ctx);
+	DUK_ASSERT(dec_ctx.recursion_depth == 0);
+	if (dec_ctx.off != dec_ctx.len) {
+		(void) duk_type_error(thr, "trailing garbage");
+	}
+
+	duk_replace(thr, idx);
+}
+
+#else  /* DUK_USE_CBOR_SUPPORT */
+
+DUK_LOCAL void duk__cbor_encode(duk_hthread *thr, duk_idx_t idx, duk_uint_t encode_flags) {
+	DUK_UNREF(idx);
+	DUK_UNREF(encode_flags);
+	DUK_ERROR_UNSUPPORTED(thr);
+}
+
+DUK_LOCAL void duk__cbor_decode(duk_hthread *thr, duk_idx_t idx, duk_uint_t decode_flags) {
+	DUK_UNREF(idx);
+	DUK_UNREF(decode_flags);
+	DUK_ERROR_UNSUPPORTED(thr);
+}
+
+#endif  /* DUK_USE_CBOR_SUPPORT */
+
+/*
+ *  Public APIs
+ */
+
+DUK_EXTERNAL void duk_cbor_encode(duk_hthread *thr, duk_idx_t idx, duk_uint_t encode_flags) {
+	DUK_ASSERT_API_ENTRY(thr);
+	duk__cbor_encode(thr, idx, encode_flags);
+}
+DUK_EXTERNAL void duk_cbor_decode(duk_hthread *thr, duk_idx_t idx, duk_uint_t decode_flags) {
+	DUK_ASSERT_API_ENTRY(thr);
+	duk__cbor_decode(thr, idx, decode_flags);
+}
+
+#if defined(DUK_USE_CBOR_BUILTIN)
+#if defined(DUK_USE_CBOR_SUPPORT)
+DUK_INTERNAL duk_ret_t duk_bi_cbor_encode(duk_hthread *thr) {
+	DUK_ASSERT_TOP(thr, 1);
+
+	duk__cbor_encode(thr, -1, 0 /*flags*/);
+
+	/* Produce an ArrayBuffer by first decoding into a plain buffer which
+	 * mimics a Uint8Array and gettings its .buffer property.
+	 */
+	/* XXX: shortcut */
+	(void) duk_get_prop_stridx(thr, -1, DUK_STRIDX_LC_BUFFER);
+	return 1;
+}
+
+DUK_INTERNAL duk_ret_t duk_bi_cbor_decode(duk_hthread *thr) {
+	DUK_ASSERT_TOP(thr, 1);
+
+	duk__cbor_decode(thr, -1, 0 /*flags*/);
+	return 1;
+}
+#else  /* DUK_USE_CBOR_SUPPORT */
+DUK_INTERNAL duk_ret_t duk_bi_cbor_encode(duk_hthread *thr) {
+	DUK_ERROR_UNSUPPORTED(thr);
+	DUK_WO_NORETURN(return 0;);
+}
+DUK_INTERNAL duk_ret_t duk_bi_cbor_decode(duk_hthread *thr) {
+	DUK_ERROR_UNSUPPORTED(thr);
+	DUK_WO_NORETURN(return 0;);
+}
+#endif  /* DUK_USE_CBOR_SUPPORT */
+#endif  /* DUK_USE_CBOR_BUILTIN */
+
+/* automatic undefs */
+#undef DUK__CBOR_AI
+/*
  *  Date built-ins
  *
  *  Unlike most built-ins, Date has some platform dependencies for getting
@@ -30356,7 +32360,7 @@ DUK_INTERNAL void duk_bi_date_timeval_to_parts(duk_double_t d, duk_int_t *parts,
 
 	DUK_ASSERT(DUK_ISFINITE(d));    /* caller checks */
 	d = DUK_FLOOR(d);  /* remove fractions if present */
-	DUK_ASSERT(DUK_FLOOR(d) == d);
+	DUK_ASSERT(duk_double_equals(DUK_FLOOR(d), d));
 
 	/* The timevalue must be in valid ECMAScript range, but since a local
 	 * time offset can be applied, we need to allow a +/- 24h leeway to
@@ -30375,13 +32379,13 @@ DUK_INTERNAL void duk_bi_date_timeval_to_parts(duk_double_t d, duk_int_t *parts,
 		d1 += (duk_double_t) DUK_DATE_MSEC_DAY;
 	}
 	d2 = DUK_FLOOR((double) (d / (duk_double_t) DUK_DATE_MSEC_DAY));
-	DUK_ASSERT(d2 * ((duk_double_t) DUK_DATE_MSEC_DAY) + d1 == d);
+	DUK_ASSERT(duk_double_equals(d2 * ((duk_double_t) DUK_DATE_MSEC_DAY) + d1, d));
 	/* now expected to fit into a 32-bit integer */
 	t1 = (duk_int_t) d1;
 	t2 = (duk_int_t) d2;
 	day_since_epoch = t2;
-	DUK_ASSERT((duk_double_t) t1 == d1);
-	DUK_ASSERT((duk_double_t) t2 == d2);
+	DUK_ASSERT(duk_double_equals((duk_double_t) t1, d1));
+	DUK_ASSERT(duk_double_equals((duk_double_t) t2, d2));
 
 	/* t1 = milliseconds within day (fits 32 bit)
 	 * t2 = day number from epoch (fits 32 bit, may be negative)
@@ -31238,7 +33242,7 @@ DUK_INTERNAL duk_ret_t duk_bi_date_constructor_now(duk_hthread *thr) {
 	duk_double_t d;
 
 	d = duk_time_get_ecmascript_time_nofrac(thr);
-	DUK_ASSERT(duk__timeclip(d) == d);  /* TimeClip() should never be necessary */
+	DUK_ASSERT(duk_double_equals(duk__timeclip(d), d));  /* TimeClip() should never be necessary */
 	duk_push_number(thr, d);
 	return 1;
 }
@@ -34374,28 +36378,28 @@ DUK_INTERNAL duk_ret_t duk_bi_global_object_unescape(duk_hthread *thr) {
 #define DUK__JSON_STRINGIFY_BUFSIZE 128
 #define DUK__JSON_MAX_ESC_LEN 10  /* '\Udeadbeef' */
 
-DUK_LOCAL_DECL void duk__dec_syntax_error(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_eat_white(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_syntax_error(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_eat_white(duk_json_dec_ctx *js_ctx);
 #if defined(DUK_USE_JX)
-DUK_LOCAL_DECL duk_uint8_t duk__dec_peek(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL duk_uint8_t duk__json_dec_peek(duk_json_dec_ctx *js_ctx);
 #endif
-DUK_LOCAL_DECL duk_uint8_t duk__dec_get(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL duk_uint8_t duk__dec_get_nonwhite(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL duk_uint_fast32_t duk__dec_decode_hex_escape(duk_json_dec_ctx *js_ctx, duk_small_uint_t n);
-DUK_LOCAL_DECL void duk__dec_req_stridx(duk_json_dec_ctx *js_ctx, duk_small_uint_t stridx);
-DUK_LOCAL_DECL void duk__dec_string(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL duk_uint8_t duk__json_dec_get(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL duk_uint8_t duk__json_dec_get_nonwhite(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL duk_uint_fast32_t duk__json_dec_decode_hex_escape(duk_json_dec_ctx *js_ctx, duk_small_uint_t n);
+DUK_LOCAL_DECL void duk__json_dec_req_stridx(duk_json_dec_ctx *js_ctx, duk_small_uint_t stridx);
+DUK_LOCAL_DECL void duk__json_dec_string(duk_json_dec_ctx *js_ctx);
 #if defined(DUK_USE_JX)
-DUK_LOCAL_DECL void duk__dec_plain_string(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_pointer(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_buffer(duk_json_dec_ctx *js_ctx);
-#endif
-DUK_LOCAL_DECL void duk__dec_number(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_objarr_entry(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_objarr_exit(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_object(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_array(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_value(duk_json_dec_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__dec_reviver_walk(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_plain_string(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_pointer(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_buffer(duk_json_dec_ctx *js_ctx);
+#endif
+DUK_LOCAL_DECL void duk__json_dec_number(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_objarr_entry(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_objarr_exit(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_object(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_array(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_value(duk_json_dec_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_dec_reviver_walk(duk_json_dec_ctx *js_ctx);
 
 DUK_LOCAL_DECL void duk__emit_1(duk_json_enc_ctx *js_ctx, duk_uint_fast8_t ch);
 DUK_LOCAL_DECL void duk__emit_2(duk_json_enc_ctx *js_ctx, duk_uint_fast8_t ch1, duk_uint_fast8_t ch2);
@@ -34406,29 +36410,29 @@ DUK_LOCAL_DECL void duk__emit_cstring(duk_json_enc_ctx *js_ctx, const char *p);
 #endif
 DUK_LOCAL_DECL void duk__emit_stridx(duk_json_enc_ctx *js_ctx, duk_small_uint_t stridx);
 DUK_LOCAL_DECL duk_uint8_t *duk__emit_esc_auto_fast(duk_json_enc_ctx *js_ctx, duk_uint_fast32_t cp, duk_uint8_t *q);
-DUK_LOCAL_DECL void duk__enc_key_autoquote(duk_json_enc_ctx *js_ctx, duk_hstring *k);
-DUK_LOCAL_DECL void duk__enc_quote_string(duk_json_enc_ctx *js_ctx, duk_hstring *h_str);
-DUK_LOCAL_DECL void duk__enc_objarr_entry(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_top);
-DUK_LOCAL_DECL void duk__enc_objarr_exit(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_top);
-DUK_LOCAL_DECL void duk__enc_object(duk_json_enc_ctx *js_ctx);
-DUK_LOCAL_DECL void duk__enc_array(duk_json_enc_ctx *js_ctx);
-DUK_LOCAL_DECL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_holder);
-DUK_LOCAL_DECL duk_bool_t duk__enc_allow_into_proplist(duk_tval *tv);
-DUK_LOCAL_DECL void duk__enc_double(duk_json_enc_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_enc_key_autoquote(duk_json_enc_ctx *js_ctx, duk_hstring *k);
+DUK_LOCAL_DECL void duk__json_enc_quote_string(duk_json_enc_ctx *js_ctx, duk_hstring *h_str);
+DUK_LOCAL_DECL void duk__json_enc_objarr_entry(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_top);
+DUK_LOCAL_DECL void duk__json_enc_objarr_exit(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_top);
+DUK_LOCAL_DECL void duk__json_enc_object(duk_json_enc_ctx *js_ctx);
+DUK_LOCAL_DECL void duk__json_enc_array(duk_json_enc_ctx *js_ctx);
+DUK_LOCAL_DECL duk_bool_t duk__json_enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_holder);
+DUK_LOCAL_DECL duk_bool_t duk__json_enc_allow_into_proplist(duk_tval *tv);
+DUK_LOCAL_DECL void duk__json_enc_double(duk_json_enc_ctx *js_ctx);
 #if defined(DUK_USE_FASTINT)
-DUK_LOCAL_DECL void duk__enc_fastint_tval(duk_json_enc_ctx *js_ctx, duk_tval *tv);
+DUK_LOCAL_DECL void duk__json_enc_fastint_tval(duk_json_enc_ctx *js_ctx, duk_tval *tv);
 #endif
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
-DUK_LOCAL_DECL void duk__enc_buffer_jx_jc(duk_json_enc_ctx *js_ctx, duk_hbuffer *h);
-DUK_LOCAL_DECL void duk__enc_pointer(duk_json_enc_ctx *js_ctx, void *ptr);
+DUK_LOCAL_DECL void duk__json_enc_buffer_jx_jc(duk_json_enc_ctx *js_ctx, duk_hbuffer *h);
+DUK_LOCAL_DECL void duk__json_enc_pointer(duk_json_enc_ctx *js_ctx, void *ptr);
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
-DUK_LOCAL_DECL void duk__enc_bufobj(duk_json_enc_ctx *js_ctx, duk_hbufobj *h_bufobj);
+DUK_LOCAL_DECL void duk__json_enc_bufobj(duk_json_enc_ctx *js_ctx, duk_hbufobj *h_bufobj);
 #endif
 #endif
 #if defined(DUK_USE_JSON_STRINGIFY_FASTPATH)
-DUK_LOCAL_DECL void duk__enc_buffer_json_fastpath(duk_json_enc_ctx *js_ctx, duk_hbuffer *h);
+DUK_LOCAL_DECL void duk__json_enc_buffer_json_fastpath(duk_json_enc_ctx *js_ctx, duk_hbuffer *h);
 #endif
-DUK_LOCAL_DECL void duk__enc_newline_indent(duk_json_enc_ctx *js_ctx, duk_uint_t depth);
+DUK_LOCAL_DECL void duk__json_enc_newline_indent(duk_json_enc_ctx *js_ctx, duk_uint_t depth);
 
 /*
  *  Helper tables
@@ -34553,7 +36557,7 @@ DUK_LOCAL const duk_uint8_t duk__json_decnumber_lookup[256] = {
  *  CESU-8 encodings.
  */
 
-DUK_LOCAL void duk__dec_syntax_error(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_syntax_error(duk_json_dec_ctx *js_ctx) {
 	/* Shared handler to minimize parser size.  Cause will be
 	 * hidden, unfortunately, but we'll have an offset which
 	 * is often quite enough.
@@ -34563,7 +36567,7 @@ DUK_LOCAL void duk__dec_syntax_error(duk_json_dec_ctx *js_ctx) {
 	DUK_WO_NORETURN(return;);
 }
 
-DUK_LOCAL void duk__dec_eat_white(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_eat_white(duk_json_dec_ctx *js_ctx) {
 	const duk_uint8_t *p;
 	duk_uint8_t t;
 
@@ -34594,24 +36598,24 @@ DUK_LOCAL void duk__dec_eat_white(duk_json_dec_ctx *js_ctx) {
 }
 
 #if defined(DUK_USE_JX)
-DUK_LOCAL duk_uint8_t duk__dec_peek(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL duk_uint8_t duk__json_dec_peek(duk_json_dec_ctx *js_ctx) {
 	DUK_ASSERT(js_ctx->p <= js_ctx->p_end);
 	return *js_ctx->p;
 }
 #endif
 
-DUK_LOCAL duk_uint8_t duk__dec_get(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL duk_uint8_t duk__json_dec_get(duk_json_dec_ctx *js_ctx) {
 	DUK_ASSERT(js_ctx->p <= js_ctx->p_end);
 	return *js_ctx->p++;
 }
 
-DUK_LOCAL duk_uint8_t duk__dec_get_nonwhite(duk_json_dec_ctx *js_ctx) {
-	duk__dec_eat_white(js_ctx);
-	return duk__dec_get(js_ctx);
+DUK_LOCAL duk_uint8_t duk__json_dec_get_nonwhite(duk_json_dec_ctx *js_ctx) {
+	duk__json_dec_eat_white(js_ctx);
+	return duk__json_dec_get(js_ctx);
 }
 
 /* For JX, expressing the whole unsigned 32-bit range matters. */
-DUK_LOCAL duk_uint_fast32_t duk__dec_decode_hex_escape(duk_json_dec_ctx *js_ctx, duk_small_uint_t n) {
+DUK_LOCAL duk_uint_fast32_t duk__json_dec_decode_hex_escape(duk_json_dec_ctx *js_ctx, duk_small_uint_t n) {
 	duk_small_uint_t i;
 	duk_uint_fast32_t res = 0;
 	duk_uint8_t x;
@@ -34620,7 +36624,7 @@ DUK_LOCAL duk_uint_fast32_t duk__dec_decode_hex_escape(duk_json_dec_ctx *js_ctx,
 	for (i = 0; i < n; i++) {
 		/* XXX: share helper from lexer; duk_lexer.c / hexval(). */
 
-		x = duk__dec_get(js_ctx);
+		x = duk__json_dec_get(js_ctx);
 		DUK_DDD(DUK_DDDPRINT("decode_hex_escape: i=%ld, n=%ld, res=%ld, x=%ld",
 		                     (long) i, (long) n, (long) res, (long) x));
 
@@ -34639,12 +36643,12 @@ DUK_LOCAL duk_uint_fast32_t duk__dec_decode_hex_escape(duk_json_dec_ctx *js_ctx,
 	return res;
 
  syntax_error:
-	duk__dec_syntax_error(js_ctx);
+	duk__json_dec_syntax_error(js_ctx);
 	DUK_UNREACHABLE();
 	return 0;
 }
 
-DUK_LOCAL void duk__dec_req_stridx(duk_json_dec_ctx *js_ctx, duk_small_uint_t stridx) {
+DUK_LOCAL void duk__json_dec_req_stridx(duk_json_dec_ctx *js_ctx, duk_small_uint_t stridx) {
 	duk_hstring *h;
 	const duk_uint8_t *p;
 	duk_uint8_t x, y;
@@ -34666,7 +36670,7 @@ DUK_LOCAL void duk__dec_req_stridx(duk_json_dec_ctx *js_ctx, duk_small_uint_t st
 		if (x == 0) {
 			break;
 		}
-		y = duk__dec_get(js_ctx);
+		y = duk__json_dec_get(js_ctx);
 		if (x != y) {
 			/* Catches EOF of JSON input. */
 			goto syntax_error;
@@ -34677,18 +36681,18 @@ DUK_LOCAL void duk__dec_req_stridx(duk_json_dec_ctx *js_ctx, duk_small_uint_t st
 	return;
 
  syntax_error:
-	duk__dec_syntax_error(js_ctx);
+	duk__json_dec_syntax_error(js_ctx);
 	DUK_UNREACHABLE();
 }
 
-DUK_LOCAL duk_small_int_t duk__dec_string_escape(duk_json_dec_ctx *js_ctx, duk_uint8_t **ext_p) {
+DUK_LOCAL duk_small_int_t duk__json_dec_string_escape(duk_json_dec_ctx *js_ctx, duk_uint8_t **ext_p) {
 	duk_uint_fast32_t cp;
 
 	/* EOF (-1) will be cast to an unsigned value first
 	 * and then re-cast for the switch.  In any case, it
 	 * will match the default case (syntax error).
 	 */
-	cp = (duk_uint_fast32_t) duk__dec_get(js_ctx);
+	cp = (duk_uint_fast32_t) duk__json_dec_get(js_ctx);
 	switch (cp) {
 	case DUK_ASC_BACKSLASH: break;
 	case DUK_ASC_DOUBLEQUOTE: break;
@@ -34699,13 +36703,13 @@ DUK_LOCAL duk_small_int_t duk__dec_string_escape(duk_json_dec_ctx *js_ctx, duk_u
 	case DUK_ASC_LC_F: cp = 0x0c; break;
 	case DUK_ASC_LC_B: cp = 0x08; break;
 	case DUK_ASC_LC_U: {
-		cp = duk__dec_decode_hex_escape(js_ctx, 4);
+		cp = duk__json_dec_decode_hex_escape(js_ctx, 4);
 		break;
 	}
 #if defined(DUK_USE_JX)
 	case DUK_ASC_UC_U: {
 		if (js_ctx->flag_ext_custom) {
-			cp = duk__dec_decode_hex_escape(js_ctx, 8);
+			cp = duk__json_dec_decode_hex_escape(js_ctx, 8);
 		} else {
 			return 1;  /* syntax error */
 		}
@@ -34713,7 +36717,7 @@ DUK_LOCAL duk_small_int_t duk__dec_string_escape(duk_json_dec_ctx *js_ctx, duk_u
 	}
 	case DUK_ASC_LC_X: {
 		if (js_ctx->flag_ext_custom) {
-			cp = duk__dec_decode_hex_escape(js_ctx, 2);
+			cp = duk__json_dec_decode_hex_escape(js_ctx, 2);
 		} else {
 			return 1;  /* syntax error */
 		}
@@ -34725,12 +36729,12 @@ DUK_LOCAL duk_small_int_t duk__dec_string_escape(duk_json_dec_ctx *js_ctx, duk_u
 		return 1;  /* syntax error */
 	}
 
-	DUK_RAW_WRITE_XUTF8(*ext_p, cp);
+	DUK_RAW_WRITEINC_XUTF8(*ext_p, cp);
 
 	return 0;
 }
 
-DUK_LOCAL void duk__dec_string(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_string(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_bufwriter_ctx bw_alloc;
 	duk_bufwriter_ctx *bw;
@@ -34789,7 +36793,7 @@ DUK_LOCAL void duk__dec_string(duk_json_dec_ctx *js_ctx) {
 				 * quite slow but it's uncommon).
 				 */
 				js_ctx->p = p;
-				if (duk__dec_string_escape(js_ctx, &q) != 0) {
+				if (duk__json_dec_string_escape(js_ctx, &q) != 0) {
 					goto syntax_error;
 				}
 				break;
@@ -34806,12 +36810,12 @@ DUK_LOCAL void duk__dec_string(duk_json_dec_ctx *js_ctx) {
 
 		q = DUK_BW_ENSURE_RAW(js_ctx->thr, bw, DUK_UNICODE_MAX_XUTF8_LENGTH, q);
 
-		x = duk__dec_get(js_ctx);
+		x = duk__json_dec_get(js_ctx);
 
 		if (x == DUK_ASC_DOUBLEQUOTE) {
 			break;
 		} else if (x == DUK_ASC_BACKSLASH) {
-			if (duk__dec_string_escape(js_ctx, &q) != 0) {
+			if (duk__json_dec_string_escape(js_ctx, &q) != 0) {
 				goto syntax_error;
 			}
 		} else if (x < 0x20) {
@@ -34831,7 +36835,7 @@ DUK_LOCAL void duk__dec_string(duk_json_dec_ctx *js_ctx) {
 	return;
 
  syntax_error:
-	duk__dec_syntax_error(js_ctx);
+	duk__json_dec_syntax_error(js_ctx);
 	DUK_UNREACHABLE();
 }
 
@@ -34839,7 +36843,7 @@ DUK_LOCAL void duk__dec_string(duk_json_dec_ctx *js_ctx) {
 /* Decode a plain string consisting entirely of identifier characters.
  * Used to parse plain keys (e.g. "foo: 123").
  */
-DUK_LOCAL void duk__dec_plain_string(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_plain_string(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	const duk_uint8_t *p;
 	duk_small_int_t x;
@@ -34881,7 +36885,7 @@ DUK_LOCAL void duk__dec_plain_string(duk_json_dec_ctx *js_ctx) {
 #endif  /* DUK_USE_JX */
 
 #if defined(DUK_USE_JX)
-DUK_LOCAL void duk__dec_pointer(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_pointer(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	const duk_uint8_t *p;
 	duk_small_int_t x;
@@ -34928,13 +36932,13 @@ DUK_LOCAL void duk__dec_pointer(duk_json_dec_ctx *js_ctx) {
 	return;
 
  syntax_error:
-	duk__dec_syntax_error(js_ctx);
+	duk__json_dec_syntax_error(js_ctx);
 	DUK_UNREACHABLE();
 }
 #endif  /* DUK_USE_JX */
 
 #if defined(DUK_USE_JX)
-DUK_LOCAL void duk__dec_buffer(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_buffer(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	const duk_uint8_t *p;
 	duk_uint8_t *buf;
@@ -34986,13 +36990,13 @@ DUK_LOCAL void duk__dec_buffer(duk_json_dec_ctx *js_ctx) {
 	return;
 
  syntax_error:
-	duk__dec_syntax_error(js_ctx);
+	duk__json_dec_syntax_error(js_ctx);
 	DUK_UNREACHABLE();
 }
 #endif  /* DUK_USE_JX */
 
 /* Parse a number, other than NaN or +/- Infinity */
-DUK_LOCAL void duk__dec_number(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_number(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	const duk_uint8_t *p_start;
 	const duk_uint8_t *p;
@@ -35048,7 +37052,7 @@ DUK_LOCAL void duk__dec_number(duk_json_dec_ctx *js_ctx) {
 	                     (duk_tval *) duk_get_tval(thr, -1)));
 	duk_numconv_parse(thr, 10 /*radix*/, s2n_flags);
 	if (duk_is_nan(thr, -1)) {
-		duk__dec_syntax_error(js_ctx);
+		duk__json_dec_syntax_error(js_ctx);
 	}
 	DUK_ASSERT(duk_is_number(thr, -1));
 	DUK_DDD(DUK_DDDPRINT("parse_number: final number: %!T",
@@ -35057,22 +37061,24 @@ DUK_LOCAL void duk__dec_number(duk_json_dec_ctx *js_ctx) {
 	/* [ ... num ] */
 }
 
-DUK_LOCAL void duk__dec_objarr_entry(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_objarr_entry(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_require_stack(thr, DUK_JSON_DEC_REQSTACK);
 
 	/* c recursion check */
 
+	duk_native_stack_check(thr);
+
 	DUK_ASSERT_DISABLE(js_ctx->recursion_depth >= 0);  /* unsigned */
 	DUK_ASSERT(js_ctx->recursion_depth <= js_ctx->recursion_limit);
 	if (js_ctx->recursion_depth >= js_ctx->recursion_limit) {
-		DUK_ERROR_RANGE(thr, DUK_STR_JSONDEC_RECLIMIT);
+		DUK_ERROR_RANGE(thr, DUK_STR_DEC_RECLIMIT);
 		DUK_WO_NORETURN(return;);
 	}
 	js_ctx->recursion_depth++;
 }
 
-DUK_LOCAL void duk__dec_objarr_exit(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_objarr_exit(duk_json_dec_ctx *js_ctx) {
 	/* c recursion check */
 
 	DUK_ASSERT(js_ctx->recursion_depth > 0);
@@ -35080,14 +37086,14 @@ DUK_LOCAL void duk__dec_objarr_exit(duk_json_dec_ctx *js_ctx) {
 	js_ctx->recursion_depth--;
 }
 
-DUK_LOCAL void duk__dec_object(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_object(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_int_t key_count;  /* XXX: a "first" flag would suffice */
 	duk_uint8_t x;
 
 	DUK_DDD(DUK_DDDPRINT("parse_object"));
 
-	duk__dec_objarr_entry(js_ctx);
+	duk__json_dec_objarr_entry(js_ctx);
 
 	duk_push_object(thr);
 
@@ -35095,7 +37101,7 @@ DUK_LOCAL void duk__dec_object(duk_json_dec_ctx *js_ctx) {
 
 	key_count = 0;
 	for (;;) {
-		x = duk__dec_get_nonwhite(js_ctx);
+		x = duk__json_dec_get_nonwhite(js_ctx);
 
 		DUK_DDD(DUK_DDDPRINT("parse_object: obj=%!T, x=%ld, key_count=%ld",
 		                     (duk_tval *) duk_get_tval(thr, -1),
@@ -35105,7 +37111,7 @@ DUK_LOCAL void duk__dec_object(duk_json_dec_ctx *js_ctx) {
 
 		if (x == DUK_ASC_COMMA && key_count > 0) {
 			/* accept comma, expect new value */
-			x = duk__dec_get_nonwhite(js_ctx);
+			x = duk__json_dec_get_nonwhite(js_ctx);
 		} else if (x == DUK_ASC_RCURLY) {
 			/* eat closing brace */
 			break;
@@ -35122,11 +37128,11 @@ DUK_LOCAL void duk__dec_object(duk_json_dec_ctx *js_ctx) {
 		/* parse key and value */
 
 		if (x == DUK_ASC_DOUBLEQUOTE) {
-			duk__dec_string(js_ctx);
+			duk__json_dec_string(js_ctx);
 #if defined(DUK_USE_JX)
 		} else if (js_ctx->flag_ext_custom &&
 		           duk_unicode_is_identifier_start((duk_codepoint_t) x)) {
-			duk__dec_plain_string(js_ctx);
+			duk__json_dec_plain_string(js_ctx);
 #endif
 		} else {
 			goto syntax_error;
@@ -35134,12 +37140,12 @@ DUK_LOCAL void duk__dec_object(duk_json_dec_ctx *js_ctx) {
 
 		/* [ ... obj key ] */
 
-		x = duk__dec_get_nonwhite(js_ctx);
+		x = duk__json_dec_get_nonwhite(js_ctx);
 		if (x != DUK_ASC_COLON) {
 			goto syntax_error;
 		}
 
-		duk__dec_value(js_ctx);
+		duk__json_dec_value(js_ctx);
 
 		/* [ ... obj key val ] */
 
@@ -35155,22 +37161,22 @@ DUK_LOCAL void duk__dec_object(duk_json_dec_ctx *js_ctx) {
 	DUK_DDD(DUK_DDDPRINT("parse_object: final object is %!T",
 	                     (duk_tval *) duk_get_tval(thr, -1)));
 
-	duk__dec_objarr_exit(js_ctx);
+	duk__json_dec_objarr_exit(js_ctx);
 	return;
 
  syntax_error:
-	duk__dec_syntax_error(js_ctx);
+	duk__json_dec_syntax_error(js_ctx);
 	DUK_UNREACHABLE();
 }
 
-DUK_LOCAL void duk__dec_array(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_array(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_uarridx_t arr_idx;
 	duk_uint8_t x;
 
 	DUK_DDD(DUK_DDDPRINT("parse_array"));
 
-	duk__dec_objarr_entry(js_ctx);
+	duk__json_dec_objarr_entry(js_ctx);
 
 	duk_push_array(thr);
 
@@ -35178,7 +37184,7 @@ DUK_LOCAL void duk__dec_array(duk_json_dec_ctx *js_ctx) {
 
 	arr_idx = 0;
 	for (;;) {
-		x = duk__dec_get_nonwhite(js_ctx);
+		x = duk__json_dec_get_nonwhite(js_ctx);
 
 		DUK_DDD(DUK_DDDPRINT("parse_array: arr=%!T, x=%ld, arr_idx=%ld",
 		                     (duk_tval *) duk_get_tval(thr, -1),
@@ -35194,7 +37200,7 @@ DUK_LOCAL void duk__dec_array(duk_json_dec_ctx *js_ctx) {
 			break;
 		} else if (arr_idx == 0) {
 			/* accept anything, expect first value (EOF will be
-			 * caught by duk__dec_value() below.
+			 * caught by duk__json_dec_value() below.
 			 */
 			js_ctx->p--;  /* backtrack (safe) */
 		} else {
@@ -35204,7 +37210,7 @@ DUK_LOCAL void duk__dec_array(duk_json_dec_ctx *js_ctx) {
 
 		/* parse value */
 
-		duk__dec_value(js_ctx);
+		duk__json_dec_value(js_ctx);
 
 		/* [ ... arr val ] */
 
@@ -35223,30 +37229,30 @@ DUK_LOCAL void duk__dec_array(duk_json_dec_ctx *js_ctx) {
 	DUK_DDD(DUK_DDDPRINT("parse_array: final array is %!T",
 	                     (duk_tval *) duk_get_tval(thr, -1)));
 
-	duk__dec_objarr_exit(js_ctx);
+	duk__json_dec_objarr_exit(js_ctx);
 	return;
 
  syntax_error:
-	duk__dec_syntax_error(js_ctx);
+	duk__json_dec_syntax_error(js_ctx);
 	DUK_UNREACHABLE();
 }
 
-DUK_LOCAL void duk__dec_value(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_value(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_uint8_t x;
 
-	x = duk__dec_get_nonwhite(js_ctx);
+	x = duk__json_dec_get_nonwhite(js_ctx);
 
 	DUK_DDD(DUK_DDDPRINT("parse_value: initial x=%ld", (long) x));
 
-	/* Note: duk__dec_req_stridx() backtracks one char */
+	/* Note: duk__json_dec_req_stridx() backtracks one char */
 
 	if (x == DUK_ASC_DOUBLEQUOTE) {
-		duk__dec_string(js_ctx);
+		duk__json_dec_string(js_ctx);
 	} else if ((x >= DUK_ASC_0 && x <= DUK_ASC_9) || (x == DUK_ASC_MINUS)) {
 #if defined(DUK_USE_JX)
-		if (js_ctx->flag_ext_custom && x == DUK_ASC_MINUS && duk__dec_peek(js_ctx) == DUK_ASC_UC_I) {
-			duk__dec_req_stridx(js_ctx, DUK_STRIDX_MINUS_INFINITY);  /* "-Infinity", '-' has been eaten */
+		if (js_ctx->flag_ext_custom && x == DUK_ASC_MINUS && duk__json_dec_peek(js_ctx) == DUK_ASC_UC_I) {
+			duk__json_dec_req_stridx(js_ctx, DUK_STRIDX_MINUS_INFINITY);  /* "-Infinity", '-' has been eaten */
 			duk_push_number(thr, -DUK_DOUBLE_INFINITY);
 		} else {
 #else
@@ -35254,60 +37260,63 @@ DUK_LOCAL void duk__dec_value(duk_json_dec_ctx *js_ctx) {
 #endif
 			/* We already ate 'x', so backup one byte. */
 			js_ctx->p--;  /* safe */
-			duk__dec_number(js_ctx);
+			duk__json_dec_number(js_ctx);
 		}
 	} else if (x == DUK_ASC_LC_T) {
-		duk__dec_req_stridx(js_ctx, DUK_STRIDX_TRUE);
+		duk__json_dec_req_stridx(js_ctx, DUK_STRIDX_TRUE);
 		duk_push_true(thr);
 	} else if (x == DUK_ASC_LC_F) {
-		duk__dec_req_stridx(js_ctx, DUK_STRIDX_FALSE);
+		duk__json_dec_req_stridx(js_ctx, DUK_STRIDX_FALSE);
 		duk_push_false(thr);
 	} else if (x == DUK_ASC_LC_N) {
-		duk__dec_req_stridx(js_ctx, DUK_STRIDX_LC_NULL);
+		duk__json_dec_req_stridx(js_ctx, DUK_STRIDX_LC_NULL);
 		duk_push_null(thr);
 #if defined(DUK_USE_JX)
 	} else if (js_ctx->flag_ext_custom && x == DUK_ASC_LC_U) {
-		duk__dec_req_stridx(js_ctx, DUK_STRIDX_LC_UNDEFINED);
+		duk__json_dec_req_stridx(js_ctx, DUK_STRIDX_LC_UNDEFINED);
 		duk_push_undefined(thr);
 	} else if (js_ctx->flag_ext_custom && x == DUK_ASC_UC_N) {
-		duk__dec_req_stridx(js_ctx, DUK_STRIDX_NAN);
+		duk__json_dec_req_stridx(js_ctx, DUK_STRIDX_NAN);
 		duk_push_nan(thr);
 	} else if (js_ctx->flag_ext_custom && x == DUK_ASC_UC_I) {
-		duk__dec_req_stridx(js_ctx, DUK_STRIDX_INFINITY);
+		duk__json_dec_req_stridx(js_ctx, DUK_STRIDX_INFINITY);
 		duk_push_number(thr, DUK_DOUBLE_INFINITY);
 	} else if (js_ctx->flag_ext_custom && x == DUK_ASC_LPAREN) {
-		duk__dec_pointer(js_ctx);
+		duk__json_dec_pointer(js_ctx);
 	} else if (js_ctx->flag_ext_custom && x == DUK_ASC_PIPE) {
-		duk__dec_buffer(js_ctx);
+		duk__json_dec_buffer(js_ctx);
 #endif
 	} else if (x == DUK_ASC_LCURLY) {
-		duk__dec_object(js_ctx);
+		duk__json_dec_object(js_ctx);
 	} else if (x == DUK_ASC_LBRACKET) {
-		duk__dec_array(js_ctx);
+		duk__json_dec_array(js_ctx);
 	} else {
 		/* catches EOF (NUL) */
 		goto syntax_error;
 	}
 
-	duk__dec_eat_white(js_ctx);
+	duk__json_dec_eat_white(js_ctx);
 
 	/* [ ... val ] */
 	return;
 
  syntax_error:
-	duk__dec_syntax_error(js_ctx);
+	duk__json_dec_syntax_error(js_ctx);
 	DUK_UNREACHABLE();
 }
 
-/* Recursive value reviver, implements the Walk() algorithm.  No C recursion
- * check is done here because the initial parsing step will already ensure
- * there is a reasonable limit on C recursion depth and hence object depth.
+/* Recursive value reviver, implements the Walk() algorithm.  The parsing
+ * step ensures there is a reasonable depth limit to the input.  However,
+ * the reviver may create more depth by editing object or array entries, so
+ * we have both C recursion limit and native stack checks here.
  */
-DUK_LOCAL void duk__dec_reviver_walk(duk_json_dec_ctx *js_ctx) {
+DUK_LOCAL void duk__json_dec_reviver_walk(duk_json_dec_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_hobject *h;
 	duk_uarridx_t i, arr_len;
 
+	duk__json_dec_objarr_entry(js_ctx);
+
 	DUK_DDD(DUK_DDDPRINT("walk: top=%ld, holder=%!T, name=%!T",
 	                     (long) duk_get_top(thr),
 	                     (duk_tval *) duk_get_tval(thr, -2),
@@ -35318,7 +37327,7 @@ DUK_LOCAL void duk__dec_reviver_walk(duk_json_dec_ctx *js_ctx) {
 
 	h = duk_get_hobject(thr, -1);
 	if (h != NULL) {
-		if (DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_ARRAY) {
+		if (duk_js_isarray_hobject(h)) {
 			arr_len = (duk_uarridx_t) duk_get_length(thr, -1);
 			for (i = 0; i < arr_len; i++) {
 				/* [ ... holder name val ] */
@@ -35330,7 +37339,7 @@ DUK_LOCAL void duk__dec_reviver_walk(duk_json_dec_ctx *js_ctx) {
 
 				duk_dup_top(thr);
 				(void) duk_push_uint_to_hstring(thr, (duk_uint_t) i);  /* -> [ ... holder name val val ToString(i) ] */
-				duk__dec_reviver_walk(js_ctx);  /* -> [ ... holder name val new_elem ] */
+				duk__json_dec_reviver_walk(js_ctx);  /* -> [ ... holder name val new_elem ] */
 
 				if (duk_is_undefined(thr, -1)) {
 					duk_pop(thr);
@@ -35357,7 +37366,7 @@ DUK_LOCAL void duk__dec_reviver_walk(duk_json_dec_ctx *js_ctx) {
 				duk_dup_m2(thr);
 
 				/* [ ... holder name val enum obj_key val obj_key ] */
-				duk__dec_reviver_walk(js_ctx);
+				duk__json_dec_reviver_walk(js_ctx);
 
 				/* [ ... holder name val enum obj_key new_elem ] */
 				if (duk_is_undefined(thr, -1)) {
@@ -35386,6 +37395,8 @@ DUK_LOCAL void duk__dec_reviver_walk(duk_json_dec_ctx *js_ctx) {
 	duk_insert(thr, -4);  /* -> [ ... reviver holder name val ] */
 	duk_call_method(thr, 2);  /* -> [ ... res ] */
 
+	duk__json_dec_objarr_exit(js_ctx);
+
 	DUK_DDD(DUK_DDDPRINT("walk: top=%ld, result=%!T",
 	                     (long) duk_get_top(thr), (duk_tval *) duk_get_tval(thr, -1)));
 }
@@ -35495,7 +37506,7 @@ DUK_LOCAL duk_uint8_t *duk__emit_esc_auto_fast(duk_json_enc_ctx *js_ctx, duk_uin
 	return q;
 }
 
-DUK_LOCAL void duk__enc_key_autoquote(duk_json_enc_ctx *js_ctx, duk_hstring *k) {
+DUK_LOCAL void duk__json_enc_key_autoquote(duk_json_enc_ctx *js_ctx, duk_hstring *k) {
 	const duk_int8_t *p, *p_start, *p_end;  /* Note: intentionally signed. */
 	duk_size_t k_len;
 	duk_codepoint_t cp;
@@ -35538,7 +37549,7 @@ DUK_LOCAL void duk__enc_key_autoquote(duk_json_enc_ctx *js_ctx, duk_hstring *k)
 	}
 
  quote_normally:
-	duk__enc_quote_string(js_ctx, k);
+	duk__json_enc_quote_string(js_ctx, k);
 }
 
 /* The Quote(value) operation: quote a string.
@@ -35546,13 +37557,13 @@ DUK_LOCAL void duk__enc_key_autoquote(duk_json_enc_ctx *js_ctx, duk_hstring *k)
  * Stack policy: [ ] -> [ ].
  */
 
-DUK_LOCAL void duk__enc_quote_string(duk_json_enc_ctx *js_ctx, duk_hstring *h_str) {
+DUK_LOCAL void duk__json_enc_quote_string(duk_json_enc_ctx *js_ctx, duk_hstring *h_str) {
 	duk_hthread *thr = js_ctx->thr;
 	const duk_uint8_t *p, *p_start, *p_end, *p_now, *p_tmp;
 	duk_uint8_t *q;
 	duk_ucodepoint_t cp;  /* typed for duk_unicode_decode_xutf8() */
 
-	DUK_DDD(DUK_DDDPRINT("duk__enc_quote_string: h_str=%!O", (duk_heaphdr *) h_str));
+	DUK_DDD(DUK_DDDPRINT("duk__json_enc_quote_string: h_str=%!O", (duk_heaphdr *) h_str));
 
 	DUK_ASSERT(h_str != NULL);
 	p_start = DUK_HSTRING_GET_DATA(h_str);
@@ -35669,7 +37680,7 @@ DUK_LOCAL void duk__enc_quote_string(duk_json_enc_ctx *js_ctx, duk_hstring *h_st
 					q = duk__emit_esc_auto_fast(js_ctx, cp, q);
 				} else {
 					/* as is */
-					DUK_RAW_WRITE_XUTF8(q, cp);
+					DUK_RAW_WRITEINC_XUTF8(q, cp);
 				}
 			}
 		}
@@ -35683,7 +37694,7 @@ DUK_LOCAL void duk__enc_quote_string(duk_json_enc_ctx *js_ctx, duk_hstring *h_st
 /* Encode a double (checked by caller) from stack top.  Stack top may be
  * replaced by serialized string but is not popped (caller does that).
  */
-DUK_LOCAL void duk__enc_double(duk_json_enc_ctx *js_ctx) {
+DUK_LOCAL void duk__json_enc_double(duk_json_enc_ctx *js_ctx) {
 	duk_hthread *thr;
 	duk_tval *tv;
 	duk_double_t d;
@@ -35747,7 +37758,7 @@ DUK_LOCAL void duk__enc_double(duk_json_enc_ctx *js_ctx) {
 
 #if defined(DUK_USE_FASTINT)
 /* Encode a fastint from duk_tval ptr, no value stack effects. */
-DUK_LOCAL void duk__enc_fastint_tval(duk_json_enc_ctx *js_ctx, duk_tval *tv) {
+DUK_LOCAL void duk__json_enc_fastint_tval(duk_json_enc_ctx *js_ctx, duk_tval *tv) {
 	duk_int64_t v;
 
 	/* Fastint range is signed 48-bit so longest value is -2^47 = -140737488355328
@@ -35772,7 +37783,7 @@ DUK_LOCAL void duk__enc_fastint_tval(duk_json_enc_ctx *js_ctx, duk_tval *tv) {
 
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
 #if defined(DUK_USE_HEX_FASTPATH)
-DUK_LOCAL duk_uint8_t *duk__enc_buffer_data_hex(const duk_uint8_t *src, duk_size_t src_len, duk_uint8_t *dst) {
+DUK_LOCAL duk_uint8_t *duk__json_enc_buffer_data_hex(const duk_uint8_t *src, duk_size_t src_len, duk_uint8_t *dst) {
 	duk_uint8_t *q;
 	duk_uint16_t *q16;
 	duk_small_uint_t x;
@@ -35830,7 +37841,7 @@ DUK_LOCAL duk_uint8_t *duk__enc_buffer_data_hex(const duk_uint8_t *src, duk_size
 	return q;
 }
 #else  /* DUK_USE_HEX_FASTPATH */
-DUK_LOCAL duk_uint8_t *duk__enc_buffer_data_hex(const duk_uint8_t *src, duk_size_t src_len, duk_uint8_t *dst) {
+DUK_LOCAL duk_uint8_t *duk__json_enc_buffer_data_hex(const duk_uint8_t *src, duk_size_t src_len, duk_uint8_t *dst) {
 	const duk_uint8_t *p;
 	const duk_uint8_t *p_end;
 	duk_uint8_t *q;
@@ -35849,7 +37860,7 @@ DUK_LOCAL duk_uint8_t *duk__enc_buffer_data_hex(const duk_uint8_t *src, duk_size
 }
 #endif  /* DUK_USE_HEX_FASTPATH */
 
-DUK_LOCAL void duk__enc_buffer_data(duk_json_enc_ctx *js_ctx, duk_uint8_t *buf_data, duk_size_t buf_len) {
+DUK_LOCAL void duk__json_enc_buffer_data(duk_json_enc_ctx *js_ctx, duk_uint8_t *buf_data, duk_size_t buf_len) {
 	duk_hthread *thr;
 	duk_uint8_t *q;
 	duk_size_t space;
@@ -35881,7 +37892,7 @@ DUK_LOCAL void duk__enc_buffer_data(duk_json_enc_ctx *js_ctx, duk_uint8_t *buf_d
 #if defined(DUK_USE_JX)
 	{
 		*q++ = DUK_ASC_PIPE;
-		q = duk__enc_buffer_data_hex(buf_data, buf_len, q);
+		q = duk__json_enc_buffer_data_hex(buf_data, buf_len, q);
 		*q++ = DUK_ASC_PIPE;
 
 	}
@@ -35894,7 +37905,7 @@ DUK_LOCAL void duk__enc_buffer_data(duk_json_enc_ctx *js_ctx, duk_uint8_t *buf_d
 		DUK_ASSERT(js_ctx->flag_ext_compatible);
 		duk_memcpy((void *) q, (const void *) "{\"_buf\":\"", 9);  /* len: 9 */
 		q += 9;
-		q = duk__enc_buffer_data_hex(buf_data, buf_len, q);
+		q = duk__json_enc_buffer_data_hex(buf_data, buf_len, q);
 		*q++ = DUK_ASC_DOUBLEQUOTE;
 		*q++ = DUK_ASC_RCURLY;
 	}
@@ -35903,15 +37914,15 @@ DUK_LOCAL void duk__enc_buffer_data(duk_json_enc_ctx *js_ctx, duk_uint8_t *buf_d
 	DUK_BW_SET_PTR(thr, &js_ctx->bw, q);
 }
 
-DUK_LOCAL void duk__enc_buffer_jx_jc(duk_json_enc_ctx *js_ctx, duk_hbuffer *h) {
-	duk__enc_buffer_data(js_ctx,
+DUK_LOCAL void duk__json_enc_buffer_jx_jc(duk_json_enc_ctx *js_ctx, duk_hbuffer *h) {
+	duk__json_enc_buffer_data(js_ctx,
 	                     (duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR(js_ctx->thr->heap, h),
 	                     (duk_size_t) DUK_HBUFFER_GET_SIZE(h));
 }
 #endif  /* DUK_USE_JX || DUK_USE_JC */
 
 #if defined(DUK_USE_JSON_STRINGIFY_FASTPATH)
-DUK_LOCAL void duk__enc_buffer_json_fastpath(duk_json_enc_ctx *js_ctx, duk_hbuffer *h) {
+DUK_LOCAL void duk__json_enc_buffer_json_fastpath(duk_json_enc_ctx *js_ctx, duk_hbuffer *h) {
 	duk_size_t i, n;
 	const duk_uint8_t *buf;
 	duk_uint8_t *q;
@@ -35935,7 +37946,7 @@ DUK_LOCAL void duk__enc_buffer_json_fastpath(duk_json_enc_ctx *js_ctx, duk_hbuff
 	buf = (const duk_uint8_t *) DUK_HBUFFER_GET_DATA_PTR(js_ctx->thr->heap, h);
 	if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
 		for (i = 0; i < n; i++) {
-			duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth + 1);
+			duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth + 1);
 			q = DUK_BW_ENSURE_GETPTR(js_ctx->thr, &js_ctx->bw, 32);
 			q += DUK_SPRINTF((char *) q, "\"%lu\": %u,", (unsigned long) i, (unsigned int) buf[i]);
 			DUK_BW_SET_PTR(js_ctx->thr, &js_ctx->bw, q);
@@ -35951,14 +37962,14 @@ DUK_LOCAL void duk__enc_buffer_json_fastpath(duk_json_enc_ctx *js_ctx, duk_hbuff
 	DUK__UNEMIT_1(js_ctx);  /* eat trailing comma */
 
 	if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
-		duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth);
+		duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth);
 	}
 	DUK__EMIT_1(js_ctx, DUK_ASC_RCURLY);
 }
 #endif  /* DUK_USE_JSON_STRINGIFY_FASTPATH */
 
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
-DUK_LOCAL void duk__enc_pointer(duk_json_enc_ctx *js_ctx, void *ptr) {
+DUK_LOCAL void duk__json_enc_pointer(duk_json_enc_ctx *js_ctx, void *ptr) {
 	char buf[64];  /* XXX: how to figure correct size? */
 	const char *fmt;
 
@@ -35996,14 +38007,14 @@ DUK_LOCAL void duk__enc_pointer(duk_json_enc_ctx *js_ctx, void *ptr) {
 
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
-DUK_LOCAL void duk__enc_bufobj(duk_json_enc_ctx *js_ctx, duk_hbufobj *h_bufobj) {
+DUK_LOCAL void duk__json_enc_bufobj(duk_json_enc_ctx *js_ctx, duk_hbufobj *h_bufobj) {
 	DUK_HBUFOBJ_ASSERT_VALID(h_bufobj);
 
 	if (h_bufobj->buf == NULL || !DUK_HBUFOBJ_VALID_SLICE(h_bufobj)) {
 		DUK__EMIT_STRIDX(js_ctx, DUK_STRIDX_LC_NULL);
 	} else {
 		/* Handle both full and partial slice (as long as covered). */
-		duk__enc_buffer_data(js_ctx,
+		duk__json_enc_buffer_data(js_ctx,
 		                     (duk_uint8_t *) DUK_HBUFOBJ_GET_SLICE_BASE(js_ctx->thr->heap, h_bufobj),
 		                     (duk_size_t) h_bufobj->length);
 	}
@@ -36015,7 +38026,7 @@ DUK_LOCAL void duk__enc_bufobj(duk_json_enc_ctx *js_ctx, duk_hbufobj *h_bufobj)
  * directly related to indent depth.
  */
 #if defined(DUK_USE_PREFER_SIZE)
-DUK_LOCAL void duk__enc_newline_indent(duk_json_enc_ctx *js_ctx, duk_uint_t depth) {
+DUK_LOCAL void duk__json_enc_newline_indent(duk_json_enc_ctx *js_ctx, duk_uint_t depth) {
 	DUK_ASSERT(js_ctx->h_gap != NULL);
 	DUK_ASSERT(DUK_HSTRING_GET_BYTELEN(js_ctx->h_gap) > 0);  /* caller guarantees */
 
@@ -36025,7 +38036,7 @@ DUK_LOCAL void duk__enc_newline_indent(duk_json_enc_ctx *js_ctx, duk_uint_t dept
 	}
 }
 #else  /* DUK_USE_PREFER_SIZE */
-DUK_LOCAL void duk__enc_newline_indent(duk_json_enc_ctx *js_ctx, duk_uint_t depth) {
+DUK_LOCAL void duk__json_enc_newline_indent(duk_json_enc_ctx *js_ctx, duk_uint_t depth) {
 	const duk_uint8_t *gap_data;
 	duk_size_t gap_len;
 	duk_size_t avail_bytes;   /* bytes of indent available for copying */
@@ -36078,13 +38089,14 @@ DUK_LOCAL void duk__enc_newline_indent(duk_json_enc_ctx *js_ctx, duk_uint_t dept
 #endif  /* DUK_USE_PREFER_SIZE */
 
 /* Shared entry handling for object/array serialization. */
-DUK_LOCAL void duk__enc_objarr_entry(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_top) {
+DUK_LOCAL void duk__json_enc_objarr_entry(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_top) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_hobject *h_target;
 	duk_uint_fast32_t i, n;
 
 	*entry_top = duk_get_top(thr);
 
+	duk_native_stack_check(thr);
 	duk_require_stack(thr, DUK_JSON_ENC_REQSTACK);
 
 	/* Loop check using a hybrid approach: a fixed-size visited[] array
@@ -36122,7 +38134,7 @@ DUK_LOCAL void duk__enc_objarr_entry(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_
 	DUK_ASSERT_DISABLE(js_ctx->recursion_depth >= 0);  /* unsigned */
 	DUK_ASSERT(js_ctx->recursion_depth <= js_ctx->recursion_limit);
 	if (js_ctx->recursion_depth >= js_ctx->recursion_limit) {
-		DUK_ERROR_RANGE(thr, DUK_STR_JSONENC_RECLIMIT);
+		DUK_ERROR_RANGE(thr, DUK_STR_ENC_RECLIMIT);
 		DUK_WO_NORETURN(return;);
 	}
 	js_ctx->recursion_depth++;
@@ -36132,7 +38144,7 @@ DUK_LOCAL void duk__enc_objarr_entry(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_
 }
 
 /* Shared exit handling for object/array serialization. */
-DUK_LOCAL void duk__enc_objarr_exit(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_top) {
+DUK_LOCAL void duk__json_enc_objarr_exit(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_top) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_hobject *h_target;
 
@@ -36164,7 +38176,7 @@ DUK_LOCAL void duk__enc_objarr_exit(duk_json_enc_ctx *js_ctx, duk_idx_t *entry_t
  *
  * Stack policy: [ object ] -> [ object ].
  */
-DUK_LOCAL void duk__enc_object(duk_json_enc_ctx *js_ctx) {
+DUK_LOCAL void duk__json_enc_object(duk_json_enc_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_hstring *h_key;
 	duk_idx_t entry_top;
@@ -36174,9 +38186,9 @@ DUK_LOCAL void duk__enc_object(duk_json_enc_ctx *js_ctx) {
 	duk_uarridx_t arr_len, i;
 	duk_size_t prev_size;
 
-	DUK_DDD(DUK_DDDPRINT("duk__enc_object: obj=%!T", (duk_tval *) duk_get_tval(thr, -1)));
+	DUK_DDD(DUK_DDDPRINT("duk__json_enc_object: obj=%!T", (duk_tval *) duk_get_tval(thr, -1)));
 
-	duk__enc_objarr_entry(js_ctx, &entry_top);
+	duk__json_enc_objarr_entry(js_ctx, &entry_top);
 
 	idx_obj = entry_top - 1;
 
@@ -36218,17 +38230,17 @@ DUK_LOCAL void duk__enc_object(duk_json_enc_ctx *js_ctx) {
 
 		prev_size = DUK_BW_GET_SIZE(js_ctx->thr, &js_ctx->bw);
 		if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
-			duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth);
-			duk__enc_key_autoquote(js_ctx, h_key);
+			duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth);
+			duk__json_enc_key_autoquote(js_ctx, h_key);
 			DUK__EMIT_2(js_ctx, DUK_ASC_COLON, DUK_ASC_SPACE);
 		} else {
-			duk__enc_key_autoquote(js_ctx, h_key);
+			duk__json_enc_key_autoquote(js_ctx, h_key);
 			DUK__EMIT_1(js_ctx, DUK_ASC_COLON);
 		}
 
 		/* [ ... key ] */
 
-		if (DUK_UNLIKELY(duk__enc_value(js_ctx, idx_obj) == 0)) {
+		if (DUK_UNLIKELY(duk__json_enc_value(js_ctx, idx_obj) == 0)) {
 			/* Value would yield 'undefined', so skip key altogether.
 			 * Side effects have already happened.
 			 */
@@ -36246,12 +38258,12 @@ DUK_LOCAL void duk__enc_object(duk_json_enc_ctx *js_ctx) {
 		DUK__UNEMIT_1(js_ctx);  /* eat trailing comma */
 		if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
 			DUK_ASSERT(js_ctx->recursion_depth >= 1);
-			duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth - 1U);
+			duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth - 1U);
 		}
 	}
 	DUK__EMIT_1(js_ctx, DUK_ASC_RCURLY);
 
-	duk__enc_objarr_exit(js_ctx, &entry_top);
+	duk__json_enc_objarr_exit(js_ctx, &entry_top);
 
 	DUK_ASSERT_TOP(thr, entry_top);
 }
@@ -36260,17 +38272,17 @@ DUK_LOCAL void duk__enc_object(duk_json_enc_ctx *js_ctx) {
  *
  * Stack policy: [ array ] -> [ array ].
  */
-DUK_LOCAL void duk__enc_array(duk_json_enc_ctx *js_ctx) {
+DUK_LOCAL void duk__json_enc_array(duk_json_enc_ctx *js_ctx) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_idx_t entry_top;
 	duk_idx_t idx_arr;
 	duk_bool_t emitted;
 	duk_uarridx_t i, arr_len;
 
-	DUK_DDD(DUK_DDDPRINT("duk__enc_array: array=%!T",
+	DUK_DDD(DUK_DDDPRINT("duk__json_enc_array: array=%!T",
 	                     (duk_tval *) duk_get_tval(thr, -1)));
 
-	duk__enc_objarr_entry(js_ctx, &entry_top);
+	duk__json_enc_objarr_entry(js_ctx, &entry_top);
 
 	idx_arr = entry_top - 1;
 
@@ -36287,14 +38299,14 @@ DUK_LOCAL void duk__enc_array(duk_json_enc_ctx *js_ctx) {
 
 		if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
 			DUK_ASSERT(js_ctx->recursion_depth >= 1);
-			duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth);
+			duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth);
 		}
 
 		(void) duk_push_uint_to_hstring(thr, (duk_uint_t) i);  /* -> [ ... key ] */
 
 		/* [ ... key ] */
 
-		if (DUK_UNLIKELY(duk__enc_value(js_ctx, idx_arr) == 0)) {
+		if (DUK_UNLIKELY(duk__json_enc_value(js_ctx, idx_arr) == 0)) {
 			/* Value would normally be omitted, replace with 'null'. */
 			DUK__EMIT_STRIDX(js_ctx, DUK_STRIDX_LC_NULL);
 		} else {
@@ -36312,12 +38324,12 @@ DUK_LOCAL void duk__enc_array(duk_json_enc_ctx *js_ctx) {
 		DUK__UNEMIT_1(js_ctx);  /* eat trailing comma */
 		if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
 			DUK_ASSERT(js_ctx->recursion_depth >= 1);
-			duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth - 1U);
+			duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth - 1U);
 		}
 	}
 	DUK__EMIT_1(js_ctx, DUK_ASC_RBRACKET);
 
-	duk__enc_objarr_exit(js_ctx, &entry_top);
+	duk__json_enc_objarr_exit(js_ctx, &entry_top);
 
 	DUK_ASSERT_TOP(thr, entry_top);
 }
@@ -36326,14 +38338,14 @@ DUK_LOCAL void duk__enc_array(duk_json_enc_ctx *js_ctx) {
  *
  * Stack policy: [ ... key ] -> [ ... ]
  */
-DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_holder) {
+DUK_LOCAL duk_bool_t duk__json_enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_holder) {
 	duk_hthread *thr = js_ctx->thr;
 	duk_tval *tv;
 	duk_tval *tv_holder;
 	duk_tval *tv_key;
 	duk_small_int_t c;
 
-	DUK_DDD(DUK_DDDPRINT("duk__enc_value: idx_holder=%ld, holder=%!T, key=%!T",
+	DUK_DDD(DUK_DDDPRINT("duk__json_enc_value: idx_holder=%ld, holder=%!T, key=%!T",
 	                     (long) idx_holder, (duk_tval *) duk_get_tval(thr, idx_holder),
 	                     (duk_tval *) duk_get_tval(thr, -1)));
 
@@ -36403,7 +38415,7 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 			duk_hbufobj *h_bufobj;
 			h_bufobj = (duk_hbufobj *) h;
 			DUK_HBUFOBJ_ASSERT_VALID(h_bufobj);
-			duk__enc_bufobj(js_ctx, h_bufobj);
+			duk__json_enc_bufobj(js_ctx, h_bufobj);
 			goto pop2_emitted;
 		}
 		/* Otherwise bufferobjects get serialized as normal objects. */
@@ -36499,7 +38511,7 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
 	/* When JX/JC not in use, the type mask above will avoid this case if needed. */
 	case DUK_TAG_POINTER: {
-		duk__enc_pointer(js_ctx, DUK_TVAL_GET_POINTER(tv));
+		duk__json_enc_pointer(js_ctx, DUK_TVAL_GET_POINTER(tv));
 		break;
 	}
 #endif  /* DUK_USE_JX || DUK_USE_JC */
@@ -36509,7 +38521,7 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 		if (DUK_UNLIKELY(DUK_HSTRING_HAS_SYMBOL(h))) {
 			goto pop2_undef;
 		}
-		duk__enc_quote_string(js_ctx, h);
+		duk__json_enc_quote_string(js_ctx, h);
 		break;
 	}
 	case DUK_TAG_OBJECT: {
@@ -36521,10 +38533,10 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 		 */
 		DUK_ASSERT(!DUK_HOBJECT_IS_CALLABLE(h));
 
-		if (DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_ARRAY) {
-			duk__enc_array(js_ctx);
+		if (duk_js_isarray_hobject(h)) {
+			duk__json_enc_array(js_ctx);
 		} else {
-			duk__enc_object(js_ctx);
+			duk__json_enc_object(js_ctx);
 		}
 		break;
 	}
@@ -36537,7 +38549,7 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 	case DUK_TAG_BUFFER: {
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
 		if (js_ctx->flag_ext_custom_or_compatible) {
-			duk__enc_buffer_jx_jc(js_ctx, DUK_TVAL_GET_BUFFER(tv));
+			duk__json_enc_buffer_jx_jc(js_ctx, DUK_TVAL_GET_BUFFER(tv));
 			break;
 		}
 #endif
@@ -36546,7 +38558,7 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 		 * to handle realloc side effects correctly.
 		 */
 		duk_to_object(thr, -1);
-		duk__enc_object(js_ctx);
+		duk__json_enc_object(js_ctx);
 		break;
 	}
 	case DUK_TAG_LIGHTFUNC: {
@@ -36565,7 +38577,7 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 		/* Number serialization has a significant impact relative to
 		 * other fast path code, so careful fast path for fastints.
 		 */
-		duk__enc_fastint_tval(js_ctx, tv);
+		duk__json_enc_fastint_tval(js_ctx, tv);
 		break;
 #endif
 	default: {
@@ -36575,7 +38587,7 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 		/* XXX: A fast path for usual integers would be useful when
 		 * fastint support is not enabled.
 		 */
-		duk__enc_double(js_ctx);
+		duk__json_enc_double(js_ctx);
 		break;
 	}
 	}
@@ -36592,7 +38604,7 @@ DUK_LOCAL duk_bool_t duk__enc_value(duk_json_enc_ctx *js_ctx, duk_idx_t idx_hold
 }
 
 /* E5 Section 15.12.3, main algorithm, step 4.b.ii steps 1-4. */
-DUK_LOCAL duk_bool_t duk__enc_allow_into_proplist(duk_tval *tv) {
+DUK_LOCAL duk_bool_t duk__json_enc_allow_into_proplist(duk_tval *tv) {
 	duk_small_int_t c;
 
 	/* XXX: some kind of external internal type checker?
@@ -36675,7 +38687,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 		if (DUK_UNLIKELY(DUK_HSTRING_HAS_SYMBOL(h))) {
 			goto emit_undefined;
 		}
-		duk__enc_quote_string(js_ctx, h);
+		duk__json_enc_quote_string(js_ctx, h);
 		break;
 	}
 	case DUK_TAG_OBJECT: {
@@ -36720,7 +38732,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 		DUK_ASSERT(js_ctx->recursion_depth <= js_ctx->recursion_limit);
 		if (js_ctx->recursion_depth >= js_ctx->recursion_limit) {
 			DUK_DD(DUK_DDPRINT("fast path recursion limit"));
-			DUK_ERROR_RANGE(js_ctx->thr, DUK_STR_JSONDEC_RECLIMIT);
+			DUK_ERROR_RANGE(js_ctx->thr, DUK_STR_DEC_RECLIMIT);
 			DUK_WO_NORETURN(return 0;);
 		}
 
@@ -36847,11 +38859,11 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 
 				prev_size = DUK_BW_GET_SIZE(js_ctx->thr, &js_ctx->bw);
 				if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
-					duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth);
-					duk__enc_key_autoquote(js_ctx, k);
+					duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth);
+					duk__json_enc_key_autoquote(js_ctx, k);
 					DUK__EMIT_2(js_ctx, DUK_ASC_COLON, DUK_ASC_SPACE);
 				} else {
-					duk__enc_key_autoquote(js_ctx, k);
+					duk__json_enc_key_autoquote(js_ctx, k);
 					DUK__EMIT_1(js_ctx, DUK_ASC_COLON);
 				}
 
@@ -36874,7 +38886,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 				DUK__UNEMIT_1(js_ctx);  /* eat trailing comma */
 				if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
 					DUK_ASSERT(js_ctx->recursion_depth >= 1);
-					duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth - 1U);
+					duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth - 1U);
 				}
 			}
 			DUK__EMIT_1(js_ctx, DUK_ASC_RCURLY);
@@ -36902,7 +38914,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 				duk_bool_t has_inherited;
 
 				if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
-					duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth);
+					duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth);
 				}
 
 				if (DUK_LIKELY(i < asize)) {
@@ -36951,7 +38963,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 				DUK__UNEMIT_1(js_ctx);  /* eat trailing comma */
 				if (DUK_UNLIKELY(js_ctx->h_gap != NULL)) {
 					DUK_ASSERT(js_ctx->recursion_depth >= 1);
-					duk__enc_newline_indent(js_ctx, js_ctx->recursion_depth - 1U);
+					duk__json_enc_newline_indent(js_ctx, js_ctx->recursion_depth - 1U);
 				}
 			}
 			DUK__EMIT_1(js_ctx, DUK_ASC_RBRACKET);
@@ -36993,7 +39005,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 			DUK__EMIT_STRIDX(js_ctx, js_ctx->stridx_custom_function);
 #if defined(DUK_USE_BUFFEROBJECT_SUPPORT)
 		} else if (c_bit & c_bufobj) {
-			duk__enc_bufobj(js_ctx, (duk_hbufobj *) obj);
+			duk__json_enc_bufobj(js_ctx, (duk_hbufobj *) obj);
 #endif
 #endif
 		} else if (c_bit & c_abort) {
@@ -37033,7 +39045,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
 		if (js_ctx->flag_ext_custom_or_compatible) {
-			duk__enc_buffer_jx_jc(js_ctx, DUK_TVAL_GET_BUFFER(tv));
+			duk__json_enc_buffer_jx_jc(js_ctx, DUK_TVAL_GET_BUFFER(tv));
 			break;
 		}
 #endif
@@ -37041,13 +39053,13 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 		/* Plain buffers mimic Uint8Arrays, and have enumerable index
 		 * properties.
 		 */
-		duk__enc_buffer_json_fastpath(js_ctx, DUK_TVAL_GET_BUFFER(tv));
+		duk__json_enc_buffer_json_fastpath(js_ctx, DUK_TVAL_GET_BUFFER(tv));
 		break;
 	}
 	case DUK_TAG_POINTER: {
 #if defined(DUK_USE_JX) || defined(DUK_USE_JC)
 		if (js_ctx->flag_ext_custom_or_compatible) {
-			duk__enc_pointer(js_ctx, DUK_TVAL_GET_POINTER(tv));
+			duk__json_enc_pointer(js_ctx, DUK_TVAL_GET_POINTER(tv));
 			break;
 		} else {
 			goto emit_undefined;
@@ -37069,7 +39081,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 		/* Number serialization has a significant impact relative to
 		 * other fast path code, so careful fast path for fastints.
 		 */
-		duk__enc_fastint_tval(js_ctx, tv);
+		duk__json_enc_fastint_tval(js_ctx, tv);
 		break;
 	}
 #endif
@@ -37082,7 +39094,7 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du
 
 		/* XXX: Stack discipline is annoying, could be changed in numconv. */
 		duk_push_tval(js_ctx->thr, tv);
-		duk__enc_double(js_ctx);
+		duk__json_enc_double(js_ctx);
 		duk_pop(js_ctx->thr);
 
 #if 0
@@ -37194,14 +39206,15 @@ void duk_bi_json_parse_helper(duk_hthread *thr,
 	                DUK_HSTRING_GET_BYTELEN(h_text);
 	DUK_ASSERT(*(js_ctx->p_end) == 0x00);
 
-	duk__dec_value(js_ctx);  /* -> [ ... value ] */
+	duk__json_dec_value(js_ctx);  /* -> [ ... value ] */
+	DUK_ASSERT(js_ctx->recursion_depth == 0);
 
-	/* Trailing whitespace has been eaten by duk__dec_value(), so if
+	/* Trailing whitespace has been eaten by duk__json_dec_value(), so if
 	 * we're not at end of input here, it's a SyntaxError.
 	 */
 
 	if (js_ctx->p != js_ctx->p_end) {
-		duk__dec_syntax_error(js_ctx);
+		duk__json_dec_syntax_error(js_ctx);
 	}
 
 	if (duk_is_callable(thr, idx_reviver)) {
@@ -37219,7 +39232,9 @@ void duk_bi_json_parse_helper(duk_hthread *thr,
 		                     (duk_tval *) duk_get_tval(thr, -2),
 		                     (duk_tval *) duk_get_tval(thr, -1)));
 
-		duk__dec_reviver_walk(js_ctx);  /* [ ... val root "" ] -> [ ... val val' ] */
+		DUK_ASSERT(js_ctx->recursion_depth == 0);
+		duk__json_dec_reviver_walk(js_ctx);  /* [ ... val root "" ] -> [ ... val val' ] */
+		DUK_ASSERT(js_ctx->recursion_depth == 0);
 		duk_remove_m2(thr);             /* -> [ ... val' ] */
 	} else {
 		DUK_DDD(DUK_DDDPRINT("reviver does not exist or is not callable: %!T",
@@ -37357,7 +39372,7 @@ void duk_bi_json_stringify_helper(duk_hthread *thr,
 	if (h != NULL) {
 		if (DUK_HOBJECT_IS_CALLABLE(h)) {
 			js_ctx->h_replacer = h;
-		} else if (DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_ARRAY) {
+		} else if (duk_js_isarray_hobject(h)) {
 			/* Here the specification requires correct array index enumeration
 			 * which is a bit tricky for sparse arrays (it is handled by the
 			 * enum setup code).  We now enumerate ancestors too, although the
@@ -37367,14 +39382,14 @@ void duk_bi_json_stringify_helper(duk_hthread *thr,
 			duk_uarridx_t plist_idx = 0;
 			duk_small_uint_t enum_flags;
 
-			js_ctx->idx_proplist = duk_push_array(thr);  /* XXX: array internal? */
+			js_ctx->idx_proplist = duk_push_bare_array(thr);
 
 			enum_flags = DUK_ENUM_ARRAY_INDICES_ONLY |
 			             DUK_ENUM_SORT_ARRAY_INDICES;  /* expensive flag */
 			duk_enum(thr, idx_replacer, enum_flags);
 			while (duk_next(thr, -1 /*enum_index*/, 1 /*get_value*/)) {
 				/* [ ... proplist enum_obj key val ] */
-				if (duk__enc_allow_into_proplist(duk_get_tval(thr, -1))) {
+				if (duk__json_enc_allow_into_proplist(duk_get_tval(thr, -1))) {
 					/* XXX: duplicates should be eliminated here */
 					DUK_DDD(DUK_DDDPRINT("proplist enum: key=%!T, val=%!T --> accept",
 					                     (duk_tval *) duk_get_tval(thr, -2),
@@ -37534,7 +39549,7 @@ void duk_bi_json_stringify_helper(duk_hthread *thr,
 	js_ctx->recursion_limit = DUK_USE_JSON_ENC_RECLIMIT;
 	DUK_ASSERT(js_ctx->recursion_depth == 0);
 
-	if (DUK_UNLIKELY(duk__enc_value(js_ctx, idx_holder) == 0)) {  /* [ ... holder key ] -> [ ... holder ] */
+	if (DUK_UNLIKELY(duk__json_enc_value(js_ctx, idx_holder) == 0)) {  /* [ ... holder key ] -> [ ... holder ] */
 		/* Result is undefined. */
 		duk_push_undefined(thr);
 	} else {
@@ -37668,7 +39683,7 @@ DUK_LOCAL double duk__fmin_fixed(double x, double y) {
 	/* fmin() with args -0 and +0 is not guaranteed to return
 	 * -0 as ECMAScript requires.
 	 */
-	if (x == 0 && y == 0) {
+	if (duk_double_equals(x, 0.0) && duk_double_equals(y, 0.0)) {
 		duk_double_union du1, du2;
 		du1.d = x;
 		du2.d = y;
@@ -37695,7 +39710,7 @@ DUK_LOCAL double duk__fmax_fixed(double x, double y) {
 	/* fmax() with args -0 and +0 is not guaranteed to return
 	 * +0 as ECMAScript requires.
 	 */
-	if (x == 0 && y == 0) {
+	if (duk_double_equals(x, 0.0) && duk_double_equals(y, 0.0)) {
 		if (DUK_SIGNBIT(x) == 0 || DUK_SIGNBIT(y) == 0) {
 			return +0.0;
 		} else {
@@ -37862,10 +39877,11 @@ DUK_LOCAL double duk__atan2_fixed(double x, double y) {
 	}
 #else
 	/* Some ISO C assumptions. */
-	DUK_ASSERT(DUK_ATAN2(DUK_DOUBLE_INFINITY, DUK_DOUBLE_INFINITY) == 0.7853981633974483);
-	DUK_ASSERT(DUK_ATAN2(-DUK_DOUBLE_INFINITY, DUK_DOUBLE_INFINITY) == -0.7853981633974483);
-	DUK_ASSERT(DUK_ATAN2(DUK_DOUBLE_INFINITY, -DUK_DOUBLE_INFINITY) == 2.356194490192345);
-	DUK_ASSERT(DUK_ATAN2(-DUK_DOUBLE_INFINITY, -DUK_DOUBLE_INFINITY) == -2.356194490192345);
+
+	DUK_ASSERT(duk_double_equals(DUK_ATAN2(DUK_DOUBLE_INFINITY, DUK_DOUBLE_INFINITY), 0.7853981633974483));
+	DUK_ASSERT(duk_double_equals(DUK_ATAN2(-DUK_DOUBLE_INFINITY, DUK_DOUBLE_INFINITY), -0.7853981633974483));
+	DUK_ASSERT(duk_double_equals(DUK_ATAN2(DUK_DOUBLE_INFINITY, -DUK_DOUBLE_INFINITY), 2.356194490192345));
+	DUK_ASSERT(duk_double_equals(DUK_ATAN2(-DUK_DOUBLE_INFINITY, -DUK_DOUBLE_INFINITY), -2.356194490192345));
 #endif
 
 	return DUK_ATAN2(x, y);
@@ -38005,13 +40021,13 @@ DUK_INTERNAL duk_ret_t duk_bi_math_object_hypot(duk_hthread *thr) {
 	}
 
 	/* Early return cases. */
-	if (max == DUK_DOUBLE_INFINITY) {
+	if (duk_double_equals(max, DUK_DOUBLE_INFINITY)) {
 		duk_push_number(thr, DUK_DOUBLE_INFINITY);
 		return 1;
 	} else if (found_nan) {
 		duk_push_number(thr, DUK_DOUBLE_NAN);
 		return 1;
-	} else if (max == 0.0) {
+	} else if (duk_double_equals(max, 0.0)) {
 		duk_push_number(thr, 0.0);
 		/* Otherwise we'd divide by zero. */
 		return 1;
@@ -38046,7 +40062,7 @@ DUK_INTERNAL duk_ret_t duk_bi_math_object_sign(duk_hthread *thr) {
 		DUK_ASSERT(duk_is_nan(thr, -1));
 		return 1;  /* NaN input -> return NaN */
 	}
-	if (d == 0.0) {
+	if (duk_double_equals(d, 0.0)) {
 		/* Zero sign kept, i.e. -0 -> -0, +0 -> +0. */
 		return 1;
 	}
@@ -39429,7 +41445,9 @@ DUK_INTERNAL void duk_proxy_ownkeys_postprocess(duk_hthread *thr, duk_hobject *h
 		}
 
 		/* [ obj trap_result res_arr propname ] */
-		duk_put_prop_index(thr, -2, idx++);
+		duk_push_uarridx(thr, idx++);
+		duk_insert(thr, -2);
+		duk_def_prop(thr, -3, DUK_DEFPROP_HAVE_VALUE | DUK_DEFPROP_SET_WEC);
 		continue;
 
 	 skip_key:
@@ -40451,6 +42469,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_replace(duk_hthread *thr) {
 #endif  /* DUK_USE_REGEXP_SUPPORT */
 			const duk_uint8_t *p_start, *p_end, *p;   /* input string scan */
 			const duk_uint8_t *q_start;               /* match string */
+			duk_size_t p_blen;
 			duk_size_t q_blen;
 
 #if defined(DUK_USE_REGEXP_SUPPORT)
@@ -40459,13 +42478,19 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_replace(duk_hthread *thr) {
 
 			p_start = DUK_HSTRING_GET_DATA(h_input);
 			p_end = p_start + DUK_HSTRING_GET_BYTELEN(h_input);
+			p_blen = (duk_size_t) DUK_HSTRING_GET_BYTELEN(h_input);
 			p = p_start;
 
 			h_search = duk_known_hstring(thr, 0);
 			q_start = DUK_HSTRING_GET_DATA(h_search);
 			q_blen = (duk_size_t) DUK_HSTRING_GET_BYTELEN(h_search);
 
+			if (q_blen > p_blen) {
+				break;  /* no match */
+			}
+
 			p_end -= q_blen;  /* ensure full memcmp() fits in while */
+			DUK_ASSERT(p_end >= p);
 
 			match_start_coff = 0;
 
@@ -41280,44 +43305,65 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_locale_compare(duk_hthread *thr)
 #if defined(DUK_USE_ES6)
 DUK_INTERNAL duk_ret_t duk_bi_string_prototype_startswith_endswith(duk_hthread *thr) {
 	duk_int_t magic;
-	duk_hstring *h;
+	duk_hstring *h_target;
+	duk_size_t blen_target;
 	duk_hstring *h_search;
 	duk_size_t blen_search;
-	const duk_uint8_t *p_cmp_start;
-	duk_bool_t result;
+	duk_int_t off;
+	duk_bool_t result = 0;
+	duk_size_t blen_left;
 
-	h = duk_push_this_coercible_to_string(thr);
-	DUK_ASSERT(h != NULL);
+	/* Because string byte lengths are in [0,DUK_INT_MAX] it's safe to
+	 * subtract two string lengths without overflow.
+	 */
+	DUK_ASSERT(DUK_HSTRING_MAX_BYTELEN <= DUK_INT_MAX);
+
+	h_target = duk_push_this_coercible_to_string(thr);
+	DUK_ASSERT(h_target != NULL);
 
 	h_search = duk__str_tostring_notregexp(thr, 0);
 	DUK_ASSERT(h_search != NULL);
 
 	magic = duk_get_current_magic(thr);
 
-	p_cmp_start = (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h);
+	/* Careful to avoid pointer overflows in the matching logic. */
+
+	blen_target = DUK_HSTRING_GET_BYTELEN(h_target);
 	blen_search = DUK_HSTRING_GET_BYTELEN(h_search);
 
+#if 0
+	/* If search string is longer than the target string, we can
+	 * never match.  Could check explicitly, but should be handled
+	 * correctly below.
+	 */
+	if (blen_search > blen_target) {
+		goto finish;
+	}
+#endif
+
+	off = 0;
 	if (duk_is_undefined(thr, 1)) {
 		if (magic) {
-			p_cmp_start = p_cmp_start + DUK_HSTRING_GET_BYTELEN(h) - blen_search;
+			off = (duk_int_t) blen_target - (duk_int_t) blen_search;
 		} else {
-			/* p_cmp_start already OK */
+			DUK_ASSERT(off == 0);
 		}
 	} else {
 		duk_int_t len;
 		duk_int_t pos;
 
 		DUK_ASSERT(DUK_HSTRING_MAX_BYTELEN <= DUK_INT_MAX);
-		len = (duk_int_t) DUK_HSTRING_GET_CHARLEN(h);
+		len = (duk_int_t) DUK_HSTRING_GET_CHARLEN(h_target);
 		pos = duk_to_int_clamped(thr, 1, 0, len);
 		DUK_ASSERT(pos >= 0 && pos <= len);
 
+		off = (duk_int_t) duk_heap_strcache_offset_char2byte(thr, h_target, (duk_uint_fast32_t) pos);
 		if (magic) {
-			p_cmp_start -= blen_search;  /* Conceptually subtracted last, but do already here. */
+			off -= (duk_int_t) blen_search;
 		}
-		DUK_ASSERT(pos >= 0 && pos <= len);
-
-		p_cmp_start += duk_heap_strcache_offset_char2byte(thr, h, (duk_uint_fast32_t) pos);
+	}
+	if (off < 0 || off > (duk_int_t) blen_target) {
+		goto finish;
 	}
 
 	/* The main comparison can be done using a memcmp() rather than
@@ -41327,16 +43373,18 @@ DUK_INTERNAL duk_ret_t duk_bi_string_prototype_startswith_endswith(duk_hthread *
 	 * comparison range.
 	 */
 
-	result = 0;
-	if (p_cmp_start >= DUK_HSTRING_GET_DATA(h) &&
-	    (duk_size_t) (p_cmp_start - (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h)) + blen_search <= DUK_HSTRING_GET_BYTELEN(h)) {
-		if (duk_memcmp((const void *) p_cmp_start,
-		               (const void *) DUK_HSTRING_GET_DATA(h_search),
-		               (size_t) blen_search) == 0) {
+	DUK_ASSERT(off >= 0);
+	DUK_ASSERT((duk_size_t) off <= blen_target);
+	blen_left = blen_target - (duk_size_t) off;
+	if (blen_left >= blen_search) {
+		const duk_uint8_t *p_cmp_start = (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h_target) + off;
+		const duk_uint8_t *p_search = (const duk_uint8_t *) DUK_HSTRING_GET_DATA(h_search);
+		if (duk_memcmp_unsafe((const void *) p_cmp_start, (const void *) p_search, (size_t) blen_search) == 0) {
 			result = 1;
 		}
 	}
 
+ finish:
 	duk_push_boolean(thr, result);
 	return 1;
 }
@@ -46388,7 +48436,28 @@ DUK_LOCAL void duk__add_compiler_error_line(duk_hthread *thr) {
 	                     (duk_tval *) duk_get_tval(thr, -1)));
 
 	if (duk_get_prop_stridx_short(thr, -1, DUK_STRIDX_MESSAGE)) {
-		duk_push_sprintf(thr, " (line %ld)", (long) thr->compile_ctx->curr_token.start_line);
+		duk_bool_t at_end;
+
+		/* Best guesstimate that error occurred at end of input, token
+		 * truncated by end of input, etc.
+		 */
+#if 0
+		at_end = (thr->compile_ctx->curr_token.start_offset + 1 >= thr->compile_ctx->lex.input_length);
+		at_end = (thr->compile_ctx->lex.window[0].codepoint < 0 || thr->compile_ctx->lex.window[1].codepoint < 0);
+#endif
+		at_end = (thr->compile_ctx->lex.window[0].codepoint < 0);
+
+		DUK_D(DUK_DPRINT("syntax error, determined at_end=%ld; curr_token.start_offset=%ld, "
+		                 "lex.input_length=%ld, window[0].codepoint=%ld, window[1].codepoint=%ld",
+		                 (long) at_end,
+		                 (long) thr->compile_ctx->curr_token.start_offset,
+		                 (long) thr->compile_ctx->lex.input_length,
+		                 (long) thr->compile_ctx->lex.window[0].codepoint,
+		                 (long) thr->compile_ctx->lex.window[1].codepoint));
+
+		duk_push_sprintf(thr, " (line %ld%s)",
+		                 (long) thr->compile_ctx->curr_token.start_line,
+		                 at_end ? ", end of input" : "");
 		duk_concat(thr, 2);
 		duk_put_prop_stridx_short(thr, -2, DUK_STRIDX_MESSAGE);
 	} else {
@@ -50195,6 +52264,7 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 #if defined(DUK_USE_VOLUNTARY_GC)
 	duk_size_t tmp;
 #endif
+	duk_bool_t entry_creating_error;
 
 	DUK_STATS_INC(heap, stats_ms_try_count);
 #if defined(DUK_USE_DEBUG)
@@ -50265,6 +52335,8 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 	DUK_ASSERT(heap->ms_running == 0);
 	heap->ms_prevent_count = 1;
 	heap->ms_running = 1;
+	entry_creating_error = heap->creating_error;
+	heap->creating_error = 0;
 
 	/*
 	 *  Free activation/catcher freelists on every mark-and-sweep for now.
@@ -50395,6 +52467,7 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 	DUK_ASSERT(heap->ms_running == 1);
 	heap->ms_prevent_count = 0;
 	heap->ms_running = 0;
+	heap->creating_error = entry_creating_error;  /* for nested error handling, see GH-2278 */
 
 	/*
 	 *  Assertions after
@@ -50482,84 +52555,31 @@ DUK_INTERNAL void duk_heap_mark_and_sweep(duk_heap *heap, duk_small_uint_t flags
 /* #include duk_internal.h -> already included */
 
 /*
- *  Voluntary GC check
+ *  Allocate memory with garbage collection.
  */
 
-#if defined(DUK_USE_VOLUNTARY_GC)
-DUK_LOCAL DUK_INLINE void duk__check_voluntary_gc(duk_heap *heap) {
-	if (DUK_UNLIKELY(--(heap)->ms_trigger_counter < 0)) {
-#if defined(DUK_USE_DEBUG)
-		if (heap->ms_prevent_count == 0) {
-			DUK_D(DUK_DPRINT("triggering voluntary mark-and-sweep"));
-		} else {
-			DUK_DD(DUK_DDPRINT("gc blocked -> skip voluntary mark-and-sweep now"));
-		}
-#endif
-
-		/* Prevention checks in the call target handle cases where
-		 * voluntary GC is not allowed.  The voluntary GC trigger
-		 * counter is only rewritten if mark-and-sweep actually runs.
-		 */
-		duk_heap_mark_and_sweep(heap, DUK_MS_FLAG_VOLUNTARY /*flags*/);
-	}
-}
-#define DUK__VOLUNTARY_PERIODIC_GC(heap)  do { duk__check_voluntary_gc((heap)); } while (0)
-#else
-#define DUK__VOLUNTARY_PERIODIC_GC(heap)  /* no voluntary gc */
-#endif  /* DUK_USE_VOLUNTARY_GC */
-
-/*
- *  Allocate memory with garbage collection
- */
-
-DUK_INTERNAL void *duk_heap_mem_alloc(duk_heap *heap, duk_size_t size) {
+/* Slow path: voluntary GC triggered, first alloc attempt failed, or zero size. */
+DUK_LOCAL DUK_NOINLINE_PERF DUK_COLD void *duk__heap_mem_alloc_slowpath(duk_heap *heap, duk_size_t size) {
 	void *res;
 	duk_small_int_t i;
 
 	DUK_ASSERT(heap != NULL);
+	DUK_ASSERT(heap->alloc_func != NULL);
 	DUK_ASSERT_DISABLE(size >= 0);
 
-	/*
-	 *  Voluntary periodic GC (if enabled)
-	 */
-
-	DUK__VOLUNTARY_PERIODIC_GC(heap);
-
-	/*
-	 *  First attempt
-	 */
-
-#if defined(DUK_USE_GC_TORTURE)
-	/* Simulate alloc failure on every alloc, except when mark-and-sweep
-	 * is running.
-	 */
-	if (heap->ms_prevent_count == 0) {
-		DUK_DDD(DUK_DDDPRINT("gc torture enabled, pretend that first alloc attempt fails"));
-		res = NULL;
-		DUK_UNREF(res);
-		goto skip_attempt;
-	}
-#endif
-	res = heap->alloc_func(heap->heap_udata, size);
-	if (DUK_LIKELY(res || size == 0)) {
-		/* For zero size allocations NULL is allowed. */
-		return res;
+	if (size == 0) {
+		DUK_D(DUK_DPRINT("zero size alloc in slow path, return NULL"));
+		return NULL;
 	}
-#if defined(DUK_USE_GC_TORTURE)
- skip_attempt:
-#endif
 
-	DUK_D(DUK_DPRINT("first alloc attempt failed, attempt to gc and retry"));
+	DUK_D(DUK_DPRINT("first alloc attempt failed or voluntary GC limit reached, attempt to gc and retry"));
 
 #if 0
 	/*
-	 *  Avoid a GC if GC is already running.  This can happen at a late
-	 *  stage in a GC when we try to e.g. resize the stringtable
-	 *  or compact objects.
-	 *
-	 *  NOTE: explicit handling isn't actually be needed: if the GC is
-	 *  not allowed, duk_heap_mark_and_sweep() will reject it for every
-	 *  attempt in the loop below, resulting in a NULL same as here.
+	 *  If GC is already running there is no point in attempting a GC
+	 *  because it will be skipped.  This could be checked for explicitly,
+	 *  but it isn't actually needed: the loop below will eventually
+	 *  fail resulting in a NULL.
 	 */
 
 	if (heap->ms_prevent_count != 0) {
@@ -50584,8 +52604,9 @@ DUK_INTERNAL void *duk_heap_mem_alloc(duk_heap *heap, duk_size_t size) {
 
 		duk_heap_mark_and_sweep(heap, flags);
 
+		DUK_ASSERT(size > 0);
 		res = heap->alloc_func(heap->heap_udata, size);
-		if (res) {
+		if (res != NULL) {
 			DUK_D(DUK_DPRINT("duk_heap_mem_alloc() succeeded after gc (pass %ld), alloc size %ld",
 			                 (long) (i + 1), (long) size));
 			return res;
@@ -50596,10 +52617,56 @@ DUK_INTERNAL void *duk_heap_mem_alloc(duk_heap *heap, duk_size_t size) {
 	return NULL;
 }
 
-DUK_INTERNAL void *duk_heap_mem_alloc_zeroed(duk_heap *heap, duk_size_t size) {
+DUK_INTERNAL DUK_INLINE_PERF DUK_HOT void *duk_heap_mem_alloc(duk_heap *heap, duk_size_t size) {
+	void *res;
+
+	DUK_ASSERT(heap != NULL);
+	DUK_ASSERT(heap->alloc_func != NULL);
+	DUK_ASSERT_DISABLE(size >= 0);
+
+#if defined(DUK_USE_VOLUNTARY_GC)
+	/* Voluntary periodic GC (if enabled). */
+	if (DUK_UNLIKELY(--(heap)->ms_trigger_counter < 0)) {
+		goto slowpath;
+	}
+#endif
+
+#if defined(DUK_USE_GC_TORTURE)
+	/* Simulate alloc failure on every alloc, except when mark-and-sweep
+	 * is running.
+	 */
+	if (heap->ms_prevent_count == 0) {
+		DUK_DDD(DUK_DDDPRINT("gc torture enabled, pretend that first alloc attempt fails"));
+		res = NULL;
+		DUK_UNREF(res);
+		goto slowpath;
+	}
+#endif
+
+	/* Zero-size allocation should happen very rarely (if at all), so
+	 * don't check zero size on NULL; handle it in the slow path
+	 * instead.  This reduces size of inlined code.
+	 */
+	res = heap->alloc_func(heap->heap_udata, size);
+	if (DUK_LIKELY(res != NULL)) {
+		return res;
+	}
+
+ slowpath:
+
+	if (size == 0) {
+		DUK_D(DUK_DPRINT("first alloc attempt returned NULL for zero size alloc, use slow path to deal with it"));
+	} else {
+		DUK_D(DUK_DPRINT("first alloc attempt failed, attempt to gc and retry"));
+	}
+	return duk__heap_mem_alloc_slowpath(heap, size);
+}
+
+DUK_INTERNAL DUK_INLINE_PERF DUK_HOT void *duk_heap_mem_alloc_zeroed(duk_heap *heap, duk_size_t size) {
 	void *res;
 
 	DUK_ASSERT(heap != NULL);
+	DUK_ASSERT(heap->alloc_func != NULL);
 	DUK_ASSERT_DISABLE(size >= 0);
 
 	res = DUK_ALLOC(heap, size);
@@ -50609,24 +52676,37 @@ DUK_INTERNAL void *duk_heap_mem_alloc_zeroed(duk_heap *heap, duk_size_t size) {
 	return res;
 }
 
-DUK_INTERNAL void *duk_heap_mem_alloc_checked(duk_hthread *thr, duk_size_t size) {
+DUK_INTERNAL DUK_INLINE_PERF DUK_HOT void *duk_heap_mem_alloc_checked(duk_hthread *thr, duk_size_t size) {
 	void *res;
 
 	DUK_ASSERT(thr != NULL);
+	DUK_ASSERT(thr->heap != NULL);
+	DUK_ASSERT(thr->heap->alloc_func != NULL);
+
 	res = duk_heap_mem_alloc(thr->heap, size);
-	if (DUK_LIKELY(res != NULL || size == 0)) {
+	if (DUK_LIKELY(res != NULL)) {
+		return res;
+	} else if (size == 0) {
+		DUK_ASSERT(res == NULL);
 		return res;
 	}
 	DUK_ERROR_ALLOC_FAILED(thr);
 	DUK_WO_NORETURN(return NULL;);
 }
 
-DUK_INTERNAL void *duk_heap_mem_alloc_checked_zeroed(duk_hthread *thr, duk_size_t size) {
+DUK_INTERNAL DUK_INLINE_PERF DUK_HOT void *duk_heap_mem_alloc_checked_zeroed(duk_hthread *thr, duk_size_t size) {
 	void *res;
 
 	DUK_ASSERT(thr != NULL);
-	res = duk_heap_mem_alloc_zeroed(thr->heap, size);
-	if (DUK_LIKELY(res != NULL || size == 0)) {
+	DUK_ASSERT(thr->heap != NULL);
+	DUK_ASSERT(thr->heap->alloc_func != NULL);
+
+	res = duk_heap_mem_alloc(thr->heap, size);
+	if (DUK_LIKELY(res != NULL)) {
+		duk_memzero(res, size);
+		return res;
+	} else if (size == 0) {
+		DUK_ASSERT(res == NULL);
 		return res;
 	}
 	DUK_ERROR_ALLOC_FAILED(thr);
@@ -50634,46 +52714,26 @@ DUK_INTERNAL void *duk_heap_mem_alloc_checked_zeroed(duk_hthread *thr, duk_size_
 }
 
 /*
- *  Reallocate memory with garbage collection
+ *  Reallocate memory with garbage collection.
  */
 
-DUK_INTERNAL void *duk_heap_mem_realloc(duk_heap *heap, void *ptr, duk_size_t newsize) {
+/* Slow path: voluntary GC triggered, first realloc attempt failed, or zero size. */
+DUK_LOCAL DUK_NOINLINE_PERF DUK_COLD void *duk__heap_mem_realloc_slowpath(duk_heap *heap, void *ptr, duk_size_t newsize) {
 	void *res;
 	duk_small_int_t i;
 
 	DUK_ASSERT(heap != NULL);
+	DUK_ASSERT(heap->realloc_func != NULL);
 	/* ptr may be NULL */
 	DUK_ASSERT_DISABLE(newsize >= 0);
 
-	/*
-	 *  Voluntary periodic GC (if enabled)
+	/* Newsize was 0 and realloc() returned NULL, this has the semantics
+	 * of free(oldptr), i.e. memory was successfully freed.
 	 */
-
-	DUK__VOLUNTARY_PERIODIC_GC(heap);
-
-	/*
-	 *  First attempt
-	 */
-
-#if defined(DUK_USE_GC_TORTURE)
-	/* Simulate alloc failure on every realloc, except when mark-and-sweep
-	 * is running.
-	 */
-	if (heap->ms_prevent_count == 0) {
-		DUK_DDD(DUK_DDDPRINT("gc torture enabled, pretend that first realloc attempt fails"));
-		res = NULL;
-		DUK_UNREF(res);
-		goto skip_attempt;
-	}
-#endif
-	res = heap->realloc_func(heap->heap_udata, ptr, newsize);
-	if (DUK_LIKELY(res || newsize == 0)) {
-		/* For zero size allocations NULL is allowed. */
-		return res;
+	if (newsize == 0) {
+		DUK_D(DUK_DPRINT("zero size realloc in slow path, return NULL"));
+		return NULL;
 	}
-#if defined(DUK_USE_GC_TORTURE)
- skip_attempt:
-#endif
 
 	DUK_D(DUK_DPRINT("first realloc attempt failed, attempt to gc and retry"));
 
@@ -50704,6 +52764,7 @@ DUK_INTERNAL void *duk_heap_mem_realloc(duk_heap *heap, void *ptr, duk_size_t ne
 
 		duk_heap_mark_and_sweep(heap, flags);
 
+		DUK_ASSERT(newsize > 0);
 		res = heap->realloc_func(heap->heap_udata, ptr, newsize);
 		if (res || newsize == 0) {
 			DUK_D(DUK_DPRINT("duk_heap_mem_realloc() succeeded after gc (pass %ld), alloc size %ld",
@@ -50716,48 +52777,67 @@ DUK_INTERNAL void *duk_heap_mem_realloc(duk_heap *heap, void *ptr, duk_size_t ne
 	return NULL;
 }
 
-/*
- *  Reallocate memory with garbage collection, using a callback to provide
- *  the current allocated pointer.  This variant is used when a mark-and-sweep
- *  (e.g. finalizers) might change the original pointer.
- */
-
-DUK_INTERNAL void *duk_heap_mem_realloc_indirect(duk_heap *heap, duk_mem_getptr cb, void *ud, duk_size_t newsize) {
+DUK_INTERNAL DUK_INLINE_PERF DUK_HOT void *duk_heap_mem_realloc(duk_heap *heap, void *ptr, duk_size_t newsize) {
 	void *res;
-	duk_small_int_t i;
 
 	DUK_ASSERT(heap != NULL);
+	DUK_ASSERT(heap->realloc_func != NULL);
+	/* ptr may be NULL */
 	DUK_ASSERT_DISABLE(newsize >= 0);
 
-	/*
-	 *  Voluntary periodic GC (if enabled)
-	 */
-
-	DUK__VOLUNTARY_PERIODIC_GC(heap);
-
-	/*
-	 *  First attempt
-	 */
+#if defined(DUK_USE_VOLUNTARY_GC)
+	/* Voluntary periodic GC (if enabled). */
+	if (DUK_UNLIKELY(--(heap)->ms_trigger_counter < 0)) {
+		goto slowpath;
+	}
+#endif
 
 #if defined(DUK_USE_GC_TORTURE)
 	/* Simulate alloc failure on every realloc, except when mark-and-sweep
 	 * is running.
 	 */
 	if (heap->ms_prevent_count == 0) {
-		DUK_DDD(DUK_DDDPRINT("gc torture enabled, pretend that first indirect realloc attempt fails"));
+		DUK_DDD(DUK_DDDPRINT("gc torture enabled, pretend that first realloc attempt fails"));
 		res = NULL;
 		DUK_UNREF(res);
-		goto skip_attempt;
+		goto slowpath;
 	}
 #endif
-	res = heap->realloc_func(heap->heap_udata, cb(heap, ud), newsize);
-	if (DUK_LIKELY(res || newsize == 0)) {
-		/* For zero size allocations NULL is allowed. */
+
+	res = heap->realloc_func(heap->heap_udata, ptr, newsize);
+	if (DUK_LIKELY(res != NULL)) {
 		return res;
 	}
-#if defined(DUK_USE_GC_TORTURE)
- skip_attempt:
-#endif
+
+ slowpath:
+
+	if (newsize == 0) {
+		DUK_D(DUK_DPRINT("first realloc attempt returned NULL for zero size realloc, use slow path to deal with it"));
+	} else {
+		DUK_D(DUK_DPRINT("first realloc attempt failed, attempt to gc and retry"));
+	}
+	return duk__heap_mem_realloc_slowpath(heap, ptr, newsize);
+}
+
+/*
+ *  Reallocate memory with garbage collection, using a callback to provide
+ *  the current allocated pointer.  This variant is used when a mark-and-sweep
+ *  (e.g. finalizers) might change the original pointer.
+ */
+
+/* Slow path: voluntary GC triggered, first realloc attempt failed, or zero size. */
+DUK_LOCAL DUK_NOINLINE_PERF DUK_COLD void *duk__heap_mem_realloc_indirect_slowpath(duk_heap *heap, duk_mem_getptr cb, void *ud, duk_size_t newsize) {
+	void *res;
+	duk_small_int_t i;
+
+	DUK_ASSERT(heap != NULL);
+	DUK_ASSERT(heap->realloc_func != NULL);
+	DUK_ASSERT_DISABLE(newsize >= 0);
+
+	if (newsize == 0) {
+		DUK_D(DUK_DPRINT("zero size indirect realloc in slow path, return NULL"));
+		return NULL;
+	}
 
 	DUK_D(DUK_DPRINT("first indirect realloc attempt failed, attempt to gc and retry"));
 
@@ -50807,6 +52887,7 @@ DUK_INTERNAL void *duk_heap_mem_realloc_indirect(duk_heap *heap, duk_mem_getptr
 		 * The pointer being reallocated may change after every mark-and-sweep.
 		 */
 
+		DUK_ASSERT(newsize > 0);
 		res = heap->realloc_func(heap->heap_udata, cb(heap, ud), newsize);
 		if (res || newsize == 0) {
 			DUK_D(DUK_DPRINT("duk_heap_mem_realloc_indirect() succeeded after gc (pass %ld), alloc size %ld",
@@ -50819,12 +52900,54 @@ DUK_INTERNAL void *duk_heap_mem_realloc_indirect(duk_heap *heap, duk_mem_getptr
 	return NULL;
 }
 
+DUK_INTERNAL DUK_INLINE_PERF DUK_HOT void *duk_heap_mem_realloc_indirect(duk_heap *heap, duk_mem_getptr cb, void *ud, duk_size_t newsize) {
+	void *res;
+
+	DUK_ASSERT(heap != NULL);
+	DUK_ASSERT(heap->realloc_func != NULL);
+	DUK_ASSERT_DISABLE(newsize >= 0);
+
+#if defined(DUK_USE_VOLUNTARY_GC)
+	/* Voluntary periodic GC (if enabled). */
+	if (DUK_UNLIKELY(--(heap)->ms_trigger_counter < 0)) {
+		goto slowpath;
+	}
+#endif
+
+#if defined(DUK_USE_GC_TORTURE)
+	/* Simulate alloc failure on every realloc, except when mark-and-sweep
+	 * is running.
+	 */
+	if (heap->ms_prevent_count == 0) {
+		DUK_DDD(DUK_DDDPRINT("gc torture enabled, pretend that first indirect realloc attempt fails"));
+		res = NULL;
+		DUK_UNREF(res);
+		goto slowpath;
+	}
+#endif
+
+	res = heap->realloc_func(heap->heap_udata, cb(heap, ud), newsize);
+	if (DUK_LIKELY(res != NULL)) {
+		return res;
+	}
+
+ slowpath:
+
+	if (newsize == 0) {
+		DUK_D(DUK_DPRINT("first indirect realloc attempt returned NULL for zero size realloc, use slow path to deal with it"));
+	} else {
+		DUK_D(DUK_DPRINT("first indirect realloc attempt failed, attempt to gc and retry"));
+	}
+	return duk__heap_mem_realloc_indirect_slowpath(heap, cb, ud, newsize);
+}
+
 /*
  *  Free memory
  */
 
-DUK_INTERNAL void duk_heap_mem_free(duk_heap *heap, void *ptr) {
+DUK_INTERNAL DUK_INLINE_PERF DUK_HOT void duk_heap_mem_free(duk_heap *heap, void *ptr) {
 	DUK_ASSERT(heap != NULL);
+	DUK_ASSERT(heap->free_func != NULL);
 	/* ptr may be NULL */
 
 	/* Must behave like a no-op with NULL and any pointer returned from
@@ -50837,9 +52960,6 @@ DUK_INTERNAL void duk_heap_mem_free(duk_heap *heap, void *ptr) {
 	 * No need to update voluntary GC counter either.
 	 */
 }
-
-/* automatic undefs */
-#undef DUK__VOLUNTARY_PERIODIC_GC
 /*
  *  Support functions for duk_heap.
  */
@@ -53874,6 +55994,13 @@ DUK_LOCAL void duk__sort_enum_keys_es6(duk_hthread *thr, duk_hobject *h_obj, duk
 			keys[idx_insert] = h_curr;
 		}
 	}
+
+	/* Entry part has been reordered now with no side effects.
+	 * If the object has a hash part, it will now be incorrect
+	 * and we need to rehash.  Do that by forcing a resize to
+	 * the current size.
+	 */
+	duk_hobject_resize_entrypart(thr, h_obj, DUK_HOBJECT_GET_ESIZE(h_obj));
 }
 
 /*
@@ -54817,7 +56944,7 @@ DUK_LOCAL duk_uint32_t duk__tval_number_to_arr_idx(duk_tval *tv) {
 	 */
 	dbl = DUK_TVAL_GET_NUMBER(tv);
 	idx = (duk_uint32_t) dbl;
-	if ((duk_double_t) idx == dbl) {
+	if (duk_double_equals((duk_double_t) idx, dbl)) {
 	        /* Is whole and within 32 bit range.  If the value happens to be 0xFFFFFFFF,
 		 * it's not a valid array index but will then match DUK__NO_ARRAY_INDEX.
 		 */
@@ -55041,6 +57168,8 @@ DUK_LOCAL duk_bool_t duk__abandon_array_density_check(duk_uint32_t a_used, duk_u
 
 /* Fast check for extending array: check whether or not a slow density check is required. */
 DUK_LOCAL duk_bool_t duk__abandon_array_slow_check_required(duk_uint32_t arr_idx, duk_uint32_t old_size) {
+	duk_uint32_t new_size_min;
+
 	/*
 	 *  In a fast check we assume old_size equals old_used (i.e., existing
 	 *  array is fully dense).
@@ -55062,7 +57191,9 @@ DUK_LOCAL duk_bool_t duk__abandon_array_slow_check_required(duk_uint32_t arr_idx
 	 *    arr_idx > limit'' * ((old_size + 7) / 8)
 	 */
 
-	return (arr_idx > DUK_USE_HOBJECT_ARRAY_FAST_RESIZE_LIMIT * ((old_size + 7) >> 3));
+	new_size_min = arr_idx + 1;
+	return (new_size_min >= DUK_USE_HOBJECT_ARRAY_ABANDON_MINSIZE) &&
+	       (arr_idx > DUK_USE_HOBJECT_ARRAY_FAST_RESIZE_LIMIT * ((old_size + 7) >> 3));
 }
 
 DUK_LOCAL duk_bool_t duk__abandon_array_check(duk_hthread *thr, duk_uint32_t arr_idx, duk_hobject *obj) {
@@ -57900,7 +60031,7 @@ DUK_LOCAL duk_uint32_t duk__to_new_array_length_checked(duk_hthread *thr, duk_tv
 	 * 32-bit range.  Negative zero is accepted as zero.
 	 */
 	res = duk_double_to_uint32_t(d);
-	if ((duk_double_t) res != d) {
+	if (!duk_double_equals((duk_double_t) res, d)) {
 		goto fail_range;
 	}
 
@@ -62603,11 +64734,11 @@ DUK_INTERNAL double duk_js_arith_mod(double d1, double d2) {
 		} else {
 			return d1;
 		}
-	} else if (d1 == 0.0) {
+	} else if (duk_double_equals(d1, 0.0)) {
 		/* d1 +/-0 is returned as is (preserving sign) except when
 		 * d2 is zero or NaN.
 		 */
-		if (d2 == 0.0 || DUK_ISNAN(d2)) {
+		if (duk_double_equals(d2, 0.0) || DUK_ISNAN(d2)) {
 			return DUK_DOUBLE_NAN;
 		} else {
 			return d1;
@@ -62615,20 +64746,20 @@ DUK_INTERNAL double duk_js_arith_mod(double d1, double d2) {
 	}
 #else
 	/* Some ISO C assumptions. */
-	DUK_ASSERT(DUK_FMOD(1.0, DUK_DOUBLE_INFINITY) == 1.0);
-	DUK_ASSERT(DUK_FMOD(-1.0, DUK_DOUBLE_INFINITY) == -1.0);
-	DUK_ASSERT(DUK_FMOD(1.0, -DUK_DOUBLE_INFINITY) == 1.0);
-	DUK_ASSERT(DUK_FMOD(-1.0, -DUK_DOUBLE_INFINITY) == -1.0);
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(1.0, DUK_DOUBLE_INFINITY), 1.0));
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(-1.0, DUK_DOUBLE_INFINITY), -1.0));
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(1.0, -DUK_DOUBLE_INFINITY), 1.0));
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(-1.0, -DUK_DOUBLE_INFINITY), -1.0));
 	DUK_ASSERT(DUK_ISNAN(DUK_FMOD(DUK_DOUBLE_INFINITY, DUK_DOUBLE_INFINITY)));
 	DUK_ASSERT(DUK_ISNAN(DUK_FMOD(DUK_DOUBLE_INFINITY, -DUK_DOUBLE_INFINITY)));
 	DUK_ASSERT(DUK_ISNAN(DUK_FMOD(-DUK_DOUBLE_INFINITY, DUK_DOUBLE_INFINITY)));
 	DUK_ASSERT(DUK_ISNAN(DUK_FMOD(-DUK_DOUBLE_INFINITY, -DUK_DOUBLE_INFINITY)));
-	DUK_ASSERT(DUK_FMOD(0.0, 1.0) == 0.0 && DUK_SIGNBIT(DUK_FMOD(0.0, 1.0)) == 0);
-	DUK_ASSERT(DUK_FMOD(-0.0, 1.0) == 0.0 && DUK_SIGNBIT(DUK_FMOD(-0.0, 1.0)) != 0);
-	DUK_ASSERT(DUK_FMOD(0.0, DUK_DOUBLE_INFINITY) == 0.0 && DUK_SIGNBIT(DUK_FMOD(0.0, DUK_DOUBLE_INFINITY)) == 0);
-	DUK_ASSERT(DUK_FMOD(-0.0, DUK_DOUBLE_INFINITY) == 0.0 && DUK_SIGNBIT(DUK_FMOD(-0.0, DUK_DOUBLE_INFINITY)) != 0);
-	DUK_ASSERT(DUK_FMOD(0.0, -DUK_DOUBLE_INFINITY) == 0.0 && DUK_SIGNBIT(DUK_FMOD(0.0, DUK_DOUBLE_INFINITY)) == 0);
-	DUK_ASSERT(DUK_FMOD(-0.0, -DUK_DOUBLE_INFINITY) == 0.0 && DUK_SIGNBIT(DUK_FMOD(-0.0, -DUK_DOUBLE_INFINITY)) != 0);
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(0.0, 1.0), 0.0) && DUK_SIGNBIT(DUK_FMOD(0.0, 1.0)) == 0);
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(-0.0, 1.0), 0.0) && DUK_SIGNBIT(DUK_FMOD(-0.0, 1.0)) != 0);
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(0.0, DUK_DOUBLE_INFINITY), 0.0) && DUK_SIGNBIT(DUK_FMOD(0.0, DUK_DOUBLE_INFINITY)) == 0);
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(-0.0, DUK_DOUBLE_INFINITY), 0.0) && DUK_SIGNBIT(DUK_FMOD(-0.0, DUK_DOUBLE_INFINITY)) != 0);
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(0.0, -DUK_DOUBLE_INFINITY), 0.0) && DUK_SIGNBIT(DUK_FMOD(0.0, DUK_DOUBLE_INFINITY)) == 0);
+	DUK_ASSERT(duk_double_equals(DUK_FMOD(-0.0, -DUK_DOUBLE_INFINITY), 0.0) && DUK_SIGNBIT(DUK_FMOD(-0.0, -DUK_DOUBLE_INFINITY)) != 0);
 	DUK_ASSERT(DUK_ISNAN(DUK_FMOD(0.0, 0.0)));
 	DUK_ASSERT(DUK_ISNAN(DUK_FMOD(-0.0, 0.0)));
 	DUK_ASSERT(DUK_ISNAN(DUK_FMOD(0.0, -0.0)));
@@ -62657,7 +64788,7 @@ DUK_INTERNAL double duk_js_arith_pow(double x, double y) {
 	if (cy == DUK_FP_NAN) {
 		goto ret_nan;
 	}
-	if (DUK_FABS(x) == 1.0 && cy == DUK_FP_INFINITE) {
+	if (duk_double_equals(DUK_FABS(x), 1.0) && cy == DUK_FP_INFINITE) {
 		goto ret_nan;
 	}
 
@@ -62699,7 +64830,7 @@ DUK_INTERNAL double duk_js_arith_pow(double x, double y) {
 			}
 		}
 	} else if (cx == DUK_FP_NAN) {
-		if (y == 0.0) {
+		if (duk_double_equals(y, 0.0)) {
 			/* NaN ** +/- 0 should always be 1, but is NaN on
 			 * at least some Cygwin/MinGW versions.
 			 */
@@ -62708,7 +64839,7 @@ DUK_INTERNAL double duk_js_arith_pow(double x, double y) {
 	}
 #else
 	/* Some ISO C assumptions. */
-	DUK_ASSERT(DUK_POW(DUK_DOUBLE_NAN, 0.0) == 1.0);
+	DUK_ASSERT(duk_double_equals(DUK_POW(DUK_DOUBLE_NAN, 0.0), 1.0));
 	DUK_ASSERT(DUK_ISINF(DUK_POW(0.0, -1.0)) && DUK_SIGNBIT(DUK_POW(0.0, -1.0)) == 0);
 	DUK_ASSERT(DUK_ISINF(DUK_POW(-0.0, -2.0)) && DUK_SIGNBIT(DUK_POW(-0.0, -2.0)) == 0);
 	DUK_ASSERT(DUK_ISINF(DUK_POW(-0.0, -3.0)) && DUK_SIGNBIT(DUK_POW(-0.0, -3.0)) != 0);
@@ -65490,6 +67621,7 @@ DUK_INTERNAL duk_int_t duk_handle_safe_call(duk_hthread *thr,
 #if defined(DUK_USE_CPP_EXCEPTIONS)
 	catch (duk_fatal_exception &exc) {
 		DUK_D(DUK_DPRINT("rethrow duk_fatal_exception"));
+		DUK_UNREF(exc);
 		throw;
 	} catch (std::exception &exc) {
 		const char *what = exc.what();
@@ -69369,12 +71501,12 @@ DUK_LOCAL void duk__expr_nud(duk_compiler_ctx *comp_ctx, duk_ivalue *res) {
 			if (DUK_TVAL_IS_NUMBER(tv_val)) {
 				duk_double_t d;
 				d = DUK_TVAL_GET_NUMBER(tv_val);
-				if (d == 0.0) {
+				if (duk_double_equals(d, 0.0)) {
 					/* Matches both +0 and -0 on purpose. */
 					DUK_DDD(DUK_DDDPRINT("inlined lnot: !0 -> true"));
 					DUK_TVAL_SET_BOOLEAN_TRUE(tv_val);
 					return;
-				} else if (d == 1.0) {
+				} else if (duk_double_equals(d, 1.0)) {
 					DUK_DDD(DUK_DDDPRINT("inlined lnot: !1 -> false"));
 					DUK_TVAL_SET_BOOLEAN_FALSE(tv_val);
 					return;
@@ -72042,10 +74174,13 @@ DUK_LOCAL void duk__parse_stmt(duk_compiler_ctx *comp_ctx, duk_ivalue *res, duk_
 		 */
 		test_func_decl = allow_source_elem;
 #if defined(DUK_USE_NONSTD_FUNC_STMT)
-		/* Lenient: allow function declarations outside top level in
-		 * non-strict mode but reject them in strict mode.
+		/* Lenient: allow function declarations outside top level in both
+		 * strict and non-strict modes.  However, don't allow labelled
+		 * function declarations in strict mode.
 		 */
-		test_func_decl = test_func_decl || !comp_ctx->curr_func.is_strict;
+		test_func_decl = test_func_decl ||
+		                 !comp_ctx->curr_func.is_strict ||
+		                 label_id < 0;
 #endif  /* DUK_USE_NONSTD_FUNC_STMT */
 		/* Strict: never allow function declarations outside top level. */
 		if (test_func_decl) {
@@ -73778,15 +75913,6 @@ DUK_LOCAL_DECL void duk__js_execute_bytecode_inner(duk_hthread *entry_thread, du
  *  Misc helpers.
  */
 
-/* Forced inline declaration, only applied for performance oriented build. */
-#if defined(DUK_USE_EXEC_PREFER_SIZE)
-#define DUK__INLINE_PERF
-#define DUK__NOINLINE_PERF
-#else
-#define DUK__INLINE_PERF DUK_ALWAYS_INLINE
-#define DUK__NOINLINE_PERF DUK_NOINLINE
-#endif
-
 /* Replace value stack top to value at 'tv_ptr'.  Optimize for
  * performance by only applying the net refcount change.
  */
@@ -73838,17 +75964,17 @@ DUK_LOCAL void duk__push_tvals_incref_only(duk_hthread *thr, duk_tval *tv_src, d
  *  possible.
  */
 
-DUK_LOCAL DUK__INLINE_PERF duk_double_t duk__compute_mod(duk_double_t d1, duk_double_t d2) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF duk_double_t duk__compute_mod(duk_double_t d1, duk_double_t d2) {
 	return (duk_double_t) duk_js_arith_mod((double) d1, (double) d2);
 }
 
 #if defined(DUK_USE_ES7_EXP_OPERATOR)
-DUK_LOCAL DUK__INLINE_PERF duk_double_t duk__compute_exp(duk_double_t d1, duk_double_t d2) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF duk_double_t duk__compute_exp(duk_double_t d1, duk_double_t d2) {
 	return (duk_double_t) duk_js_arith_pow((double) d1, (double) d2);
 }
 #endif
 
-DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_add(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_y, duk_small_uint_fast_t idx_z) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF void duk__vm_arith_add(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_y, duk_small_uint_fast_t idx_z) {
 	/*
 	 *  Addition operator is different from other arithmetic
 	 *  operations in that it also provides string concatenation.
@@ -73955,7 +76081,7 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_add(duk_hthread *thr, duk_tval *tv
 	duk_replace(thr, (duk_idx_t) idx_z);  /* side effects */
 }
 
-DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_binary_op(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_y, duk_uint_fast_t idx_z, duk_small_uint_fast_t opcode) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF void duk__vm_arith_binary_op(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_y, duk_uint_fast_t idx_z, duk_small_uint_fast_t opcode) {
 	/*
 	 *  Arithmetic operations other than '+' have number-only semantics
 	 *  and are implemented here.  The separate switch-case here means a
@@ -74113,7 +76239,7 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_binary_op(duk_hthread *thr, duk_tv
 #endif  /* DUK_USE_EXEC_PREFER_SIZE */
 }
 
-DUK_LOCAL DUK__INLINE_PERF void duk__vm_bitwise_binary_op(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_y, duk_small_uint_fast_t idx_z, duk_small_uint_fast_t opcode) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF void duk__vm_bitwise_binary_op(duk_hthread *thr, duk_tval *tv_x, duk_tval *tv_y, duk_small_uint_fast_t idx_z, duk_small_uint_fast_t opcode) {
 	/*
 	 *  Binary bitwise operations use different coercions (ToInt32, ToUint32)
 	 *  depending on the operation.  We coerce the arguments first using
@@ -74241,7 +76367,7 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_bitwise_binary_op(duk_hthread *thr, duk_
 }
 
 /* In-place unary operation. */
-DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_unary_op(duk_hthread *thr, duk_uint_fast_t idx_src, duk_uint_fast_t idx_dst, duk_small_uint_fast_t opcode) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF void duk__vm_arith_unary_op(duk_hthread *thr, duk_uint_fast_t idx_src, duk_uint_fast_t idx_dst, duk_small_uint_fast_t opcode) {
 	/*
 	 *  Arithmetic operations other than '+' have number-only semantics
 	 *  and are implemented here.  The separate switch-case here means a
@@ -74318,7 +76444,7 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_arith_unary_op(duk_hthread *thr, duk_uin
 	DUK_TVAL_SET_NUMBER_UPDREF(thr, tv, du.d);
 }
 
-DUK_LOCAL DUK__INLINE_PERF void duk__vm_bitwise_not(duk_hthread *thr, duk_uint_fast_t idx_src, duk_uint_fast_t idx_dst) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF void duk__vm_bitwise_not(duk_hthread *thr, duk_uint_fast_t idx_src, duk_uint_fast_t idx_dst) {
 	/*
 	 *  E5 Section 11.4.8
 	 */
@@ -74352,7 +76478,7 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_bitwise_not(duk_hthread *thr, duk_uint_f
 	DUK_TVAL_SET_I32_UPDREF(thr, tv, i2);  /* side effects */
 }
 
-DUK_LOCAL DUK__INLINE_PERF void duk__vm_logical_not(duk_hthread *thr, duk_uint_fast_t idx_src, duk_uint_fast_t idx_dst) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF void duk__vm_logical_not(duk_hthread *thr, duk_uint_fast_t idx_src, duk_uint_fast_t idx_dst) {
 	/*
 	 *  E5 Section 11.4.9
 	 */
@@ -74380,7 +76506,7 @@ DUK_LOCAL DUK__INLINE_PERF void duk__vm_logical_not(duk_hthread *thr, duk_uint_f
 }
 
 /* XXX: size optimized variant */
-DUK_LOCAL DUK__INLINE_PERF void duk__prepost_incdec_reg_helper(duk_hthread *thr, duk_tval *tv_dst, duk_tval *tv_src, duk_small_uint_t op) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF void duk__prepost_incdec_reg_helper(duk_hthread *thr, duk_tval *tv_dst, duk_tval *tv_src, duk_small_uint_t op) {
 	duk_double_t x, y, z;
 
 	/* Two lowest bits of opcode are used to distinguish
@@ -74456,7 +76582,7 @@ DUK_LOCAL DUK__INLINE_PERF void duk__prepost_incdec_reg_helper(duk_hthread *thr,
 	DUK_TVAL_SET_NUMBER_UPDREF(thr, tv_dst, z);  /* side effects */
 }
 
-DUK_LOCAL DUK__INLINE_PERF void duk__prepost_incdec_var_helper(duk_hthread *thr, duk_small_uint_t idx_dst, duk_tval *tv_id, duk_small_uint_t op, duk_small_uint_t is_strict) {
+DUK_LOCAL DUK_EXEC_ALWAYS_INLINE_PERF void duk__prepost_incdec_var_helper(duk_hthread *thr, duk_small_uint_t idx_dst, duk_tval *tv_id, duk_small_uint_t op, duk_small_uint_t is_strict) {
 	duk_activation *act;
 	duk_double_t x, y;
 	duk_hstring *name;
@@ -75082,17 +77208,21 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
 			DUK_DD(DUK_DDPRINT("-> yield an error, converted to a throw in the resumer, propagate"));
 			goto check_longjmp;
 		} else {
-			duk_hthread_activation_unwind_norz(resumer);
-			duk__handle_yield(thr, resumer, &thr->heap->lj.value1);
+			/* When handling the yield, the last reference to
+			 * 'thr' may disappear.
+			 */
 
+			DUK_GC_TORTURE(resumer->heap);
+			duk_hthread_activation_unwind_norz(resumer);
+			DUK_GC_TORTURE(resumer->heap);
 			thr->state = DUK_HTHREAD_STATE_YIELDED;
 			thr->resumer = NULL;
 			DUK_HTHREAD_DECREF_NORZ(thr, resumer);
 			resumer->state = DUK_HTHREAD_STATE_RUNNING;
 			DUK_HEAP_SWITCH_THREAD(thr->heap, resumer);
-#if 0
-			thr = resumer;  /* not needed, as we exit right away */
-#endif
+			duk__handle_yield(thr, resumer, &thr->heap->lj.value1);
+			thr = resumer;
+			DUK_GC_TORTURE(resumer->heap);
 
 			DUK_DD(DUK_DDPRINT("-> yield a value, restart execution in resumer"));
 			retval = DUK__LONGJMP_RESTART;
@@ -75254,9 +77384,9 @@ DUK_LOCAL duk_small_uint_t duk__handle_longjmp(duk_hthread *thr, duk_activation
  * handling because it has a measurable performance impact in ordinary
  * environments and an extreme impact in Emscripten (GH-342).
  */
-DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_break_or_continue(duk_hthread *thr,
-                                                                duk_uint_t label_id,
-                                                                duk_small_uint_t lj_type) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF void duk__handle_break_or_continue(duk_hthread *thr,
+                                                                    duk_uint_t label_id,
+                                                                    duk_small_uint_t lj_type) {
 	duk_activation *act;
 	duk_catcher *cat;
 
@@ -75707,7 +77837,7 @@ DUK_LOCAL void duk__interrupt_handle_debugger(duk_hthread *thr, duk_bool_t *out_
 }
 #endif  /* DUK_USE_DEBUGGER_SUPPORT */
 
-DUK_LOCAL DUK__NOINLINE_PERF DUK_COLD duk_small_uint_t duk__executor_interrupt(duk_hthread *thr) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF DUK_COLD duk_small_uint_t duk__executor_interrupt(duk_hthread *thr) {
 	duk_int_t ctr;
 	duk_activation *act;
 	duk_hcompfunc *fun;
@@ -75960,7 +78090,7 @@ DUK_LOCAL void duk__executor_recheck_debugger(duk_hthread *thr, duk_activation *
  *  rare; NOINLINE to reduce amount of code in main bytecode dispatcher.
  */
 
-DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_initset_initget(duk_hthread *thr, duk_uint_fast32_t ins) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF void duk__handle_op_initset_initget(duk_hthread *thr, duk_uint_fast32_t ins) {
 	duk_bool_t is_set = (DUK_DEC_OP(ins) == DUK_OP_INITSET);
 	duk_uint_fast_t idx;
 	duk_uint_t defprop_flags;
@@ -75993,7 +78123,7 @@ DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_initset_initget(duk_hthread *th
 	duk_def_prop(thr, (duk_idx_t) DUK_DEC_A(ins), defprop_flags);
 }
 
-DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_trycatch(duk_hthread *thr, duk_uint_fast32_t ins, duk_instr_t *curr_pc) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF void duk__handle_op_trycatch(duk_hthread *thr, duk_uint_fast32_t ins, duk_instr_t *curr_pc) {
 	duk_activation *act;
 	duk_catcher *cat;
 	duk_tval *tv1;
@@ -76158,7 +78288,7 @@ DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_trycatch(duk_hthread *thr, duk_
 	duk_pop_unsafe(thr);
 }
 
-DUK_LOCAL DUK__NOINLINE_PERF duk_instr_t *duk__handle_op_endtry(duk_hthread *thr, duk_uint_fast32_t ins) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF duk_instr_t *duk__handle_op_endtry(duk_hthread *thr, duk_uint_fast32_t ins) {
 	duk_activation *act;
 	duk_catcher *cat;
 	duk_tval *tv1;
@@ -76202,7 +78332,7 @@ DUK_LOCAL DUK__NOINLINE_PERF duk_instr_t *duk__handle_op_endtry(duk_hthread *thr
 	return pc_base + 1;  /* new curr_pc value */
 }
 
-DUK_LOCAL DUK__NOINLINE_PERF duk_instr_t *duk__handle_op_endcatch(duk_hthread *thr, duk_uint_fast32_t ins) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF duk_instr_t *duk__handle_op_endcatch(duk_hthread *thr, duk_uint_fast32_t ins) {
 	duk_activation *act;
 	duk_catcher *cat;
 	duk_tval *tv1;
@@ -76263,7 +78393,7 @@ DUK_LOCAL DUK__NOINLINE_PERF duk_instr_t *duk__handle_op_endcatch(duk_hthread *t
 	return pc_base + 1;  /* new curr_pc value */
 }
 
-DUK_LOCAL DUK__NOINLINE_PERF duk_small_uint_t duk__handle_op_endfin(duk_hthread *thr, duk_uint_fast32_t ins, duk_activation *entry_act) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF duk_small_uint_t duk__handle_op_endfin(duk_hthread *thr, duk_uint_fast32_t ins, duk_activation *entry_act) {
 	duk_activation *act;
 	duk_tval *tv1;
 	duk_uint_t reg_catch;
@@ -76364,7 +78494,7 @@ DUK_LOCAL DUK__NOINLINE_PERF duk_small_uint_t duk__handle_op_endfin(duk_hthread
 	return 0;
 }
 
-DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_initenum(duk_hthread *thr, duk_uint_fast32_t ins) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF void duk__handle_op_initenum(duk_hthread *thr, duk_uint_fast32_t ins) {
 	duk_small_uint_t b;
 	duk_small_uint_t c;
 
@@ -76392,7 +78522,7 @@ DUK_LOCAL DUK__NOINLINE_PERF void duk__handle_op_initenum(duk_hthread *thr, duk_
 	}
 }
 
-DUK_LOCAL DUK__NOINLINE_PERF duk_small_uint_t duk__handle_op_nextenum(duk_hthread *thr, duk_uint_fast32_t ins) {
+DUK_LOCAL DUK_EXEC_NOINLINE_PERF duk_small_uint_t duk__handle_op_nextenum(duk_hthread *thr, duk_uint_fast32_t ins) {
 	duk_small_uint_t b;
 	duk_small_uint_t c;
 	duk_small_uint_t pc_skip = 0;
@@ -76752,6 +78882,7 @@ DUK_INTERNAL void duk_js_execute_bytecode(duk_hthread *exec_thr) {
 #if defined(DUK_USE_CPP_EXCEPTIONS)
 		catch (duk_fatal_exception &exc) {
 			DUK_D(DUK_DPRINT("rethrow duk_fatal_exception"));
+			DUK_UNREF(exc);
 			throw;
 		} catch (std::exception &exc) {
 			const char *what = exc.what();
@@ -78988,7 +81119,6 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 #undef DUK__GETPROP_BODY
 #undef DUK__GE_BODY
 #undef DUK__GT_BODY
-#undef DUK__INLINE_PERF
 #undef DUK__INSTOF_BODY
 #undef DUK__INTERNAL_ERROR
 #undef DUK__INT_NOACTION
@@ -79004,7 +81134,6 @@ DUK_LOCAL DUK_NOINLINE DUK_HOT void duk__js_execute_bytecode_inner(duk_hthread *
 #undef DUK__MASK_BC
 #undef DUK__MASK_C
 #undef DUK__NEQ_BODY
-#undef DUK__NOINLINE_PERF
 #undef DUK__PUTPROP_BODY
 #undef DUK__RCBIT_B
 #undef DUK__RCBIT_C
@@ -79154,6 +81283,7 @@ DUK_INTERNAL duk_bool_t duk_js_toboolean(duk_tval *tv) {
 	}
 	}
 	DUK_UNREACHABLE();
+	DUK_WO_UNREACHABLE(return 0;);
 }
 
 /*
@@ -79295,6 +81425,7 @@ DUK_INTERNAL duk_double_t duk_js_tonumber(duk_hthread *thr, duk_tval *tv) {
 	}
 
 	DUK_UNREACHABLE();
+	DUK_WO_UNREACHABLE(return 0.0;);
 }
 
 /*
@@ -79397,7 +81528,7 @@ DUK_INTERNAL duk_int32_t duk_js_toint32(duk_hthread *thr, duk_tval *tv) {
 	d = duk__toint32_touint32_helper(d, 1);
 	DUK_ASSERT(DUK_FPCLASSIFY(d) == DUK_FP_ZERO || DUK_FPCLASSIFY(d) == DUK_FP_NORMAL);
 	DUK_ASSERT(d >= -2147483648.0 && d <= 2147483647.0);  /* [-0x80000000,0x7fffffff] */
-	DUK_ASSERT(d == ((duk_double_t) ((duk_int32_t) d)));  /* whole, won't clip */
+	DUK_ASSERT(duk_double_equals(d, (duk_double_t) ((duk_int32_t) d)));  /* whole, won't clip */
 	return (duk_int32_t) d;
 }
 
@@ -79415,7 +81546,7 @@ DUK_INTERNAL duk_uint32_t duk_js_touint32(duk_hthread *thr, duk_tval *tv) {
 	d = duk__toint32_touint32_helper(d, 0);
 	DUK_ASSERT(DUK_FPCLASSIFY(d) == DUK_FP_ZERO || DUK_FPCLASSIFY(d) == DUK_FP_NORMAL);
 	DUK_ASSERT(d >= 0.0 && d <= 4294967295.0);  /* [0x00000000, 0xffffffff] */
-	DUK_ASSERT(d == ((duk_double_t) ((duk_uint32_t) d)));  /* whole, won't clip */
+	DUK_ASSERT(duk_double_equals(d, (duk_double_t) ((duk_uint32_t) d)));  /* whole, won't clip */
 	return (duk_uint32_t) d;
 
 }
@@ -79474,7 +81605,7 @@ DUK_LOCAL duk_bool_t duk__js_equals_number(duk_double_t x, duk_double_t y) {
 	 * equal regardless of sign.  Could also use a macro, but this inlines
 	 * already nicely (no difference on gcc, for instance).
 	 */
-	if (x == y) {
+	if (duk_double_equals(x, y)) {
 		/* IEEE requires that NaNs compare false */
 		DUK_ASSERT(DUK_FPCLASSIFY(x) != DUK_FP_NAN);
 		DUK_ASSERT(DUK_FPCLASSIFY(y) != DUK_FP_NAN);
@@ -79521,7 +81652,7 @@ DUK_LOCAL duk_bool_t duk__js_samevalue_number(duk_double_t x, duk_double_t y) {
 	duk_small_int_t cx = (duk_small_int_t) DUK_FPCLASSIFY(x);
 	duk_small_int_t cy = (duk_small_int_t) DUK_FPCLASSIFY(y);
 
-	if (x == y) {
+	if (duk_double_equals(x, y)) {
 		/* IEEE requires that NaNs compare false */
 		DUK_ASSERT(DUK_FPCLASSIFY(x) != DUK_FP_NAN);
 		DUK_ASSERT(DUK_FPCLASSIFY(y) != DUK_FP_NAN);
@@ -79646,7 +81777,7 @@ DUK_INTERNAL duk_bool_t duk_js_equals_helper(duk_hthread *thr, duk_tval *tv_x, d
 			DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv_x));
 			DUK_ASSERT(DUK_TVAL_IS_NUMBER(tv_y));
 			DUK_UNREACHABLE();
-			return 0;
+			DUK_WO_UNREACHABLE(return 0;);
 		}
 		}
 	}
@@ -80210,11 +82341,9 @@ DUK_LOCAL duk_bool_t duk__js_instanceof_helper(duk_hthread *thr, duk_tval *tv_x,
 		val = DUK_HOBJECT_GET_PROTOTYPE(thr->heap, val);
 	} while (--sanity > 0);
 
-	if (DUK_UNLIKELY(sanity == 0)) {
-		DUK_ERROR_RANGE(thr, DUK_STR_PROTOTYPE_CHAIN_LIMIT);
-		DUK_WO_NORETURN(return 0;);
-	}
-	DUK_UNREACHABLE();
+	DUK_ASSERT(sanity == 0);
+	DUK_ERROR_RANGE(thr, DUK_STR_PROTOTYPE_CHAIN_LIMIT);
+	DUK_WO_NORETURN(return 0;);
 
  pop2_and_false:
 	duk_pop_2_unsafe(thr);
@@ -80381,6 +82510,26 @@ DUK_INTERNAL duk_small_uint_t duk_js_typeof_stridx(duk_tval *tv_x) {
 }
 
 /*
+ *  IsArray()
+ */
+
+DUK_INTERNAL duk_bool_t duk_js_isarray_hobject(duk_hobject *h) {
+	DUK_ASSERT(h != NULL);
+#if defined(DUK_USE_ES6_PROXY)
+	h = duk_hobject_resolve_proxy_target(h);
+#endif
+	return (DUK_HOBJECT_GET_CLASS_NUMBER(h) == DUK_HOBJECT_CLASS_ARRAY ? 1 : 0);
+}
+
+DUK_INTERNAL duk_bool_t duk_js_isarray(duk_tval *tv) {
+	DUK_ASSERT(tv != NULL);
+	if (DUK_TVAL_IS_OBJECT(tv)) {
+		return duk_js_isarray_hobject(DUK_TVAL_GET_OBJECT(tv));
+	}
+	return 0;
+}
+
+/*
  *  Array index and length
  *
  *  Array index: E5 Section 15.4
@@ -81774,6 +83923,7 @@ void duk__putvar_helper(duk_hthread *thr,
                         duk_tval *val,
                         duk_bool_t strict) {
 	duk__id_lookup_result ref;
+	duk_tval tv_tmp_val;
 	duk_tval tv_tmp_obj;
 	duk_tval tv_tmp_key;
 	duk_bool_t parents;
@@ -81791,10 +83941,13 @@ void duk__putvar_helper(duk_hthread *thr,
 	DUK_ASSERT(val != NULL);
 	/* env and act may be NULL */
 
-        DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(env);
-        DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(name);
+	DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(env);
+	DUK_ASSERT_REFCOUNT_NONZERO_HEAPHDR(name);
 	DUK_ASSERT_REFCOUNT_NONZERO_TVAL(val);
 
+	DUK_TVAL_SET_TVAL(&tv_tmp_val, val);  /* Stabilize. */
+	val = NULL;
+
 	/*
 	 *  In strict mode E5 protects 'eval' and 'arguments' from being
 	 *  assigned to (or even declared anywhere).  Attempt to do so
@@ -81826,7 +83979,7 @@ void duk__putvar_helper(duk_hthread *thr,
 
 			tv_val = ref.value;
 			DUK_ASSERT(tv_val != NULL);
-			DUK_TVAL_SET_TVAL_UPDREF(thr, tv_val, val);  /* side effects */
+			DUK_TVAL_SET_TVAL_UPDREF(thr, tv_val, &tv_tmp_val);  /* side effects */
 
 			/* ref.value invalidated here */
 		} else {
@@ -81834,7 +83987,7 @@ void duk__putvar_helper(duk_hthread *thr,
 
 			DUK_TVAL_SET_OBJECT(&tv_tmp_obj, ref.holder);
 			DUK_TVAL_SET_STRING(&tv_tmp_key, name);
-			(void) duk_hobject_putprop(thr, &tv_tmp_obj, &tv_tmp_key, val, strict);
+			(void) duk_hobject_putprop(thr, &tv_tmp_obj, &tv_tmp_key, &tv_tmp_val, strict);
 
 			/* ref.value invalidated here */
 		}
@@ -81859,7 +84012,7 @@ void duk__putvar_helper(duk_hthread *thr,
 
 	DUK_TVAL_SET_OBJECT(&tv_tmp_obj, thr->builtins[DUK_BIDX_GLOBAL]);
 	DUK_TVAL_SET_STRING(&tv_tmp_key, name);
-	(void) duk_hobject_putprop(thr, &tv_tmp_obj, &tv_tmp_key, val, 0);  /* 0 = no throw */
+	(void) duk_hobject_putprop(thr, &tv_tmp_obj, &tv_tmp_key, &tv_tmp_val, 0);  /* 0 = no throw */
 
 	/* NB: 'val' may be invalidated here because put_value may realloc valstack,
 	 * caller beware.
@@ -86341,8 +88494,8 @@ DUK_LOCAL DUK_NOINLINE void duk__numconv_stringify_raw(duk_hthread *thr, duk_sma
 	 */
 
 	uval = duk_double_to_uint32_t(x);
-	if (((double) uval) == x &&  /* integer number in range */
-	    flags == 0) {            /* no special formatting */
+	if (duk_double_equals((double) uval, x) &&  /* integer number in range */
+	    flags == 0) {                           /* no special formatting */
 		/* use bigint area as a temp */
 		duk_uint8_t *buf = (duk_uint8_t *) (&nc_ctx->f);
 		duk_uint8_t *p = buf;
@@ -89276,10 +91429,12 @@ DUK_LOCAL void duk__regexp_match_helper(duk_hthread *thr, duk_small_int_t force_
 			 * as 'undefined'.  The same is done when saved[] pointers are insane
 			 * (this should, of course, never happen in practice).
 			 */
+			duk_push_uarridx(thr, (duk_uarridx_t) (i / 2));
+
 			if (re_ctx.saved[i] && re_ctx.saved[i + 1] && re_ctx.saved[i + 1] >= re_ctx.saved[i]) {
 				duk_push_lstring(thr,
 				                 (const char *) re_ctx.saved[i],
-				                 (duk_size_t) (re_ctx.saved[i+1] - re_ctx.saved[i]));
+				                 (duk_size_t) (re_ctx.saved[i + 1] - re_ctx.saved[i]));
 				if (i == 0) {
 					/* Assumes that saved[0] and saved[1] are always
 					 * set by regexp bytecode (if not, char_end_offset
@@ -89292,8 +91447,8 @@ DUK_LOCAL void duk__regexp_match_helper(duk_hthread *thr, duk_small_int_t force_
 				duk_push_undefined(thr);
 			}
 
-			/* [ ... re_obj input bc saved_buf res_obj val ] */
-			duk_put_prop_index(thr, -2, (duk_uarridx_t) (i / 2));
+			/* [ ... re_obj input bc saved_buf res_obj idx val ] */
+			duk_def_prop(thr, -3, DUK_DEFPROP_HAVE_VALUE | DUK_DEFPROP_SET_WEC);
 		}
 
 		/* [ ... re_obj input bc saved_buf res_obj ] */
@@ -89532,7 +91687,7 @@ DUK_LOCAL duk_uint_t duk__selftest_byte_order(void) {
 		DUK__FAILED("duk_uint32_t byte order");
 	}
 
-	if (u2.d != (double) 102030405060.0) {
+	if (!duk_double_equals(u2.d, 102030405060.0)) {
 		DUK__FAILED("double byte order");
 	}
 
@@ -89907,7 +92062,7 @@ DUK_LOCAL duk_uint_t duk__selftest_cast_double_to_small_uint(void) {
 	u = (duk_small_uint_t) d1;
 	d2 = (duk_double_t) u;
 
-	if (!(d1 == 1.0 && u == 1 && d2 == 1.0 && d1 == d2)) {
+	if (!(duk_double_equals(d1, 1.0) && u == 1 && duk_double_equals(d2, 1.0) && duk_double_equals(d1, d2))) {
 		DUK__FAILED("double to duk_small_uint_t cast failed");
 	}
 
@@ -89917,7 +92072,7 @@ DUK_LOCAL duk_uint_t duk__selftest_cast_double_to_small_uint(void) {
 	uv = (duk_small_uint_t) d1v;
 	d2v = (duk_double_t) uv;
 
-	if (!(d1v == 1.0 && uv == 1 && d2v == 1.0 && d1v == d2v)) {
+	if (!(duk_double_equals(d1v, 1.0) && uv == 1 && duk_double_equals(d2v, 1.0) && duk_double_equals(d1v, d2v))) {
 		DUK__FAILED("double to duk_small_uint_t cast failed");
 	}
 
@@ -96847,98 +99002,6 @@ DUK_INTERNAL void duk_bw_remove_raw_slice(duk_hthread *thr, duk_bufwriter_ctx *b
 }
 
 /*
- *  Macro support functions for reading/writing raw data.
- *
- *  These are done using mempcy to ensure they're valid even for unaligned
- *  reads/writes on platforms where alignment counts.  On x86 at least gcc
- *  is able to compile these into a bswap+mov.  "Always inline" is used to
- *  ensure these macros compile to minimal code.
- *
- *  Not really bufwriter related, but currently used together.
- */
-
-DUK_INTERNAL DUK_ALWAYS_INLINE duk_uint16_t duk_raw_read_u16_be(duk_uint8_t **p) {
-	union {
-		duk_uint8_t b[2];
-		duk_uint16_t x;
-	} u;
-
-	duk_memcpy((void *) u.b, (const void *) (*p), (size_t) 2);
-	u.x = DUK_NTOH16(u.x);
-	*p += 2;
-	return u.x;
-}
-
-DUK_INTERNAL DUK_ALWAYS_INLINE duk_uint32_t duk_raw_read_u32_be(duk_uint8_t **p) {
-	union {
-		duk_uint8_t b[4];
-		duk_uint32_t x;
-	} u;
-
-	duk_memcpy((void *) u.b, (const void *) (*p), (size_t) 4);
-	u.x = DUK_NTOH32(u.x);
-	*p += 4;
-	return u.x;
-}
-
-DUK_INTERNAL DUK_ALWAYS_INLINE duk_double_t duk_raw_read_double_be(duk_uint8_t **p) {
-	duk_double_union du;
-	union {
-		duk_uint8_t b[4];
-		duk_uint32_t x;
-	} u;
-
-	duk_memcpy((void *) u.b, (const void *) (*p), (size_t) 4);
-	u.x = DUK_NTOH32(u.x);
-	du.ui[DUK_DBL_IDX_UI0] = u.x;
-	duk_memcpy((void *) u.b, (const void *) (*p + 4), (size_t) 4);
-	u.x = DUK_NTOH32(u.x);
-	du.ui[DUK_DBL_IDX_UI1] = u.x;
-	*p += 8;
-
-	return du.d;
-}
-
-DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_u16_be(duk_uint8_t **p, duk_uint16_t val) {
-	union {
-		duk_uint8_t b[2];
-		duk_uint16_t x;
-	} u;
-
-	u.x = DUK_HTON16(val);
-	duk_memcpy((void *) (*p), (const void *) u.b, (size_t) 2);
-	*p += 2;
-}
-
-DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_u32_be(duk_uint8_t **p, duk_uint32_t val) {
-	union {
-		duk_uint8_t b[4];
-		duk_uint32_t x;
-	} u;
-
-	u.x = DUK_HTON32(val);
-	duk_memcpy((void *) (*p), (const void *) u.b, (size_t) 4);
-	*p += 4;
-}
-
-DUK_INTERNAL DUK_ALWAYS_INLINE void duk_raw_write_double_be(duk_uint8_t **p, duk_double_t val) {
-	duk_double_union du;
-	union {
-		duk_uint8_t b[4];
-		duk_uint32_t x;
-	} u;
-
-	du.d = val;
-	u.x = du.ui[DUK_DBL_IDX_UI0];
-	u.x = DUK_HTON32(u.x);
-	duk_memcpy((void *) (*p), (const void *) u.b, (size_t) 4);
-	u.x = du.ui[DUK_DBL_IDX_UI1];
-	u.x = DUK_HTON32(u.x);
-	duk_memcpy((void *) (*p + 4), (const void *) u.b, (size_t) 4);
-	*p += 8;
-}
-
-/*
  *  Assertion helpers
  */
 
@@ -97276,7 +99339,7 @@ DUK_INTERNAL duk_bool_t duk_double_is_integer(duk_double_t x) {
 	if (duk_double_is_nan_or_inf(x)) {
 		return 0;
 	} else {
-		return duk_js_tointeger_number(x) == x;
+		return duk_double_equals(duk_js_tointeger_number(x), x);
 	}
 }
 
@@ -97296,7 +99359,7 @@ DUK_INTERNAL duk_bool_t duk_is_whole_get_int32_nonegzero(duk_double_t x, duk_int
 	duk_int32_t t;
 
 	t = duk_double_to_int32_t(x);
-	if (!((duk_double_t) t == x)) {
+	if (!duk_double_equals((duk_double_t) t, x)) {
 		return 0;
 	}
 	if (t == 0) {
@@ -97317,7 +99380,7 @@ DUK_INTERNAL duk_bool_t duk_is_whole_get_int32(duk_double_t x, duk_int32_t *ival
 	duk_int32_t t;
 
 	t = duk_double_to_int32_t(x);
-	if (!((duk_double_t) t == x)) {
+	if (!duk_double_equals((duk_double_t) t, x)) {
 		return 0;
 	}
 	*ival = t;
@@ -97330,7 +99393,7 @@ DUK_INTERNAL duk_bool_t duk_is_whole_get_int32(duk_double_t x, duk_int32_t *ival
 
 DUK_INTERNAL DUK_INLINE duk_double_t duk_double_div(duk_double_t x, duk_double_t y) {
 #if !defined(DUK_USE_ALLOW_UNDEFINED_BEHAVIOR)
-	if (DUK_UNLIKELY(y == 0.0)) {
+	if (DUK_UNLIKELY(duk_double_equals(y, 0.0) != 0)) {
 		/* In C99+ division by zero is undefined behavior so
 		 * avoid it entirely.  Hopefully the compiler is
 		 * smart enough to avoid emitting any actual code
@@ -97358,6 +99421,115 @@ DUK_INTERNAL DUK_INLINE duk_double_t duk_double_div(duk_double_t x, duk_double_t
 
 	return x / y;
 }
+
+/* Double and float byteorder changes. */
+
+DUK_INTERNAL DUK_INLINE void duk_dblunion_host_to_little(duk_double_union *u) {
+#if defined(DUK_USE_DOUBLE_LE)
+	/* HGFEDCBA -> HGFEDCBA */
+	DUK_UNREF(u);
+#elif defined(DUK_USE_DOUBLE_ME)
+	duk_uint32_t a, b;
+
+	/* DCBAHGFE -> HGFEDCBA */
+	a = u->ui[0];
+	b = u->ui[1];
+	u->ui[0] = b;
+	u->ui[1] = a;
+#elif defined(DUK_USE_DOUBLE_BE)
+	/* ABCDEFGH -> HGFEDCBA */
+#if defined(DUK_USE_64BIT_OPS)
+	u->ull[0] = DUK_BSWAP64(u->ull[0]);
+#else
+	duk_uint32_t a, b;
+
+	a = u->ui[0];
+	b = u->ui[1];
+	u->ui[0] = DUK_BSWAP32(b);
+	u->ui[1] = DUK_BSWAP32(a);
+#endif
+#else
+#error internal error
+#endif
+}
+
+DUK_INTERNAL DUK_INLINE void duk_dblunion_little_to_host(duk_double_union *u) {
+	duk_dblunion_host_to_little(u);
+}
+
+DUK_INTERNAL DUK_INLINE void duk_dblunion_host_to_big(duk_double_union *u) {
+#if defined(DUK_USE_DOUBLE_LE)
+	/* HGFEDCBA -> ABCDEFGH */
+#if defined(DUK_USE_64BIT_OPS)
+	u->ull[0] = DUK_BSWAP64(u->ull[0]);
+#else
+	duk_uint32_t a, b;
+
+	a = u->ui[0];
+	b = u->ui[1];
+	u->ui[0] = DUK_BSWAP32(b);
+	u->ui[1] = DUK_BSWAP32(a);
+#endif
+#elif defined(DUK_USE_DOUBLE_ME)
+	duk_uint32_t a, b;
+
+	/* DCBAHGFE -> ABCDEFGH */
+	a = u->ui[0];
+	b = u->ui[1];
+	u->ui[0] = DUK_BSWAP32(a);
+	u->ui[1] = DUK_BSWAP32(b);
+#elif defined(DUK_USE_DOUBLE_BE)
+	/* ABCDEFGH -> ABCDEFGH */
+	DUK_UNREF(u);
+#else
+#error internal error
+#endif
+}
+
+DUK_INTERNAL DUK_INLINE void duk_dblunion_big_to_host(duk_double_union *u) {
+	duk_dblunion_host_to_big(u);
+}
+
+DUK_INTERNAL DUK_INLINE void duk_fltunion_host_to_big(duk_float_union *u) {
+#if defined(DUK_USE_DOUBLE_LE) || defined(DUK_USE_DOUBLE_ME)
+	/* DCBA -> ABCD */
+	u->ui[0] = DUK_BSWAP32(u->ui[0]);
+#elif defined(DUK_USE_DOUBLE_BE)
+	/* ABCD -> ABCD */
+	DUK_UNREF(u);
+#else
+#error internal error
+#endif
+}
+
+DUK_INTERNAL DUK_INLINE void duk_fltunion_big_to_host(duk_float_union *u) {
+	duk_fltunion_host_to_big(u);
+}
+
+/* Comparison: ensures comparison operates on exactly correct types, avoiding
+ * some floating point comparison pitfalls (e.g. atan2() assertions failed on
+ * -m32 with direct comparison, even with explicit casts).
+ */
+#if defined(DUK_USE_GCC_PRAGMAS)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#elif defined(DUK_USE_CLANG_PRAGMAS)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wfloat-equal"
+#endif
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_bool_t duk_double_equals(duk_double_t x, duk_double_t y) {
+	return x == y;
+}
+
+DUK_INTERNAL DUK_ALWAYS_INLINE duk_bool_t duk_float_equals(duk_float_t x, duk_float_t y) {
+	return x == y;
+}
+#if defined(DUK_USE_GCC_PRAGMAS)
+#pragma GCC diagnostic pop
+#elif defined(DUK_USE_CLANG_PRAGMAS)
+#pragma clang diagnostic pop
+#endif
 /*
  *  Hash function duk_util_hashbytes().
  *
diff --git a/src/libs/zbxembed/duktape.h b/src/libs/zbxembed/duktape.h
index d51af0f85c5..5e1cf4e41f2 100644
--- a/src/libs/zbxembed/duktape.h
+++ b/src/libs/zbxembed/duktape.h
@@ -1,13 +1,13 @@
 /*
- *  Duktape public API for Duktape 2.4.0.
+ *  Duktape public API for Duktape 2.6.0.
  *
  *  See the API reference for documentation on call semantics.  The exposed,
  *  supported API is between the "BEGIN PUBLIC API" and "END PUBLIC API"
  *  comments.  Other parts of the header are Duktape internal and related to
  *  e.g. platform/compiler/feature detection.
  *
- *  Git commit d4f2cff1c592d70f58bab8e1bd85705174c02a58 (v2.4.0).
- *  Git branch master.
+ *  Git commit fffa346eff06a8764b02c31d4336f63a773a95c3 (v2.6.0).
+ *  Git branch HEAD.
  *
  *  See Duktape AUTHORS.rst and LICENSE.txt for copyright and
  *  licensing information.
@@ -109,6 +109,7 @@
  *  * James Swift (https://github.com/phraemer)
  *  * Luis de Bethencourt (https://github.com/luisbg)
  *  * Ian Whyman (https://github.com/v00d00)
+ *  * Rick Sayre (https://github.com/whorfin)
  *  
  *  Other contributions
  *  ===================
@@ -175,16 +176,16 @@
  * development snapshots have 99 for patch level (e.g. 0.10.99 would be a
  * development version after 0.10.0 but before the next official release).
  */
-#define DUK_VERSION                       20400L
+#define DUK_VERSION                       20600L
 
 /* Git commit, describe, and branch for Duktape build.  Useful for
  * non-official snapshot builds so that application code can easily log
  * which Duktape snapshot was used.  Not available in the ECMAScript
  * environment.
  */
-#define DUK_GIT_COMMIT                    "d4f2cff1c592d70f58bab8e1bd85705174c02a58"
-#define DUK_GIT_DESCRIBE                  "v2.4.0"
-#define DUK_GIT_BRANCH                    "master"
+#define DUK_GIT_COMMIT                    "fffa346eff06a8764b02c31d4336f63a773a95c3"
+#define DUK_GIT_DESCRIBE                  "v2.6.0"
+#define DUK_GIT_BRANCH                    "HEAD"
 
 /* External duk_config.h provides platform/compiler/OS dependent
  * typedefs and macros, and DUK_USE_xxx config options so that
@@ -394,30 +395,35 @@ struct duk_time_components {
 #define DUK_DEFPROP_C                     DUK_DEFPROP_CONFIGURABLE
 #define DUK_DEFPROP_WE                    (DUK_DEFPROP_WRITABLE | DUK_DEFPROP_ENUMERABLE)
 #define DUK_DEFPROP_WC                    (DUK_DEFPROP_WRITABLE | DUK_DEFPROP_CONFIGURABLE)
+#define DUK_DEFPROP_EC                    (DUK_DEFPROP_ENUMERABLE | DUK_DEFPROP_CONFIGURABLE)
 #define DUK_DEFPROP_WEC                   (DUK_DEFPROP_WRITABLE | DUK_DEFPROP_ENUMERABLE | DUK_DEFPROP_CONFIGURABLE)
 #define DUK_DEFPROP_HAVE_W                DUK_DEFPROP_HAVE_WRITABLE
 #define DUK_DEFPROP_HAVE_E                DUK_DEFPROP_HAVE_ENUMERABLE
 #define DUK_DEFPROP_HAVE_C                DUK_DEFPROP_HAVE_CONFIGURABLE
 #define DUK_DEFPROP_HAVE_WE               (DUK_DEFPROP_HAVE_WRITABLE | DUK_DEFPROP_HAVE_ENUMERABLE)
 #define DUK_DEFPROP_HAVE_WC               (DUK_DEFPROP_HAVE_WRITABLE | DUK_DEFPROP_HAVE_CONFIGURABLE)
+#define DUK_DEFPROP_HAVE_EC               (DUK_DEFPROP_HAVE_ENUMERABLE | DUK_DEFPROP_HAVE_CONFIGURABLE)
 #define DUK_DEFPROP_HAVE_WEC              (DUK_DEFPROP_HAVE_WRITABLE | DUK_DEFPROP_HAVE_ENUMERABLE | DUK_DEFPROP_HAVE_CONFIGURABLE)
 #define DUK_DEFPROP_SET_W                 DUK_DEFPROP_SET_WRITABLE
 #define DUK_DEFPROP_SET_E                 DUK_DEFPROP_SET_ENUMERABLE
 #define DUK_DEFPROP_SET_C                 DUK_DEFPROP_SET_CONFIGURABLE
 #define DUK_DEFPROP_SET_WE                (DUK_DEFPROP_SET_WRITABLE | DUK_DEFPROP_SET_ENUMERABLE)
 #define DUK_DEFPROP_SET_WC                (DUK_DEFPROP_SET_WRITABLE | DUK_DEFPROP_SET_CONFIGURABLE)
+#define DUK_DEFPROP_SET_EC                (DUK_DEFPROP_SET_ENUMERABLE | DUK_DEFPROP_SET_CONFIGURABLE)
 #define DUK_DEFPROP_SET_WEC               (DUK_DEFPROP_SET_WRITABLE | DUK_DEFPROP_SET_ENUMERABLE | DUK_DEFPROP_SET_CONFIGURABLE)
 #define DUK_DEFPROP_CLEAR_W               DUK_DEFPROP_CLEAR_WRITABLE
 #define DUK_DEFPROP_CLEAR_E               DUK_DEFPROP_CLEAR_ENUMERABLE
 #define DUK_DEFPROP_CLEAR_C               DUK_DEFPROP_CLEAR_CONFIGURABLE
 #define DUK_DEFPROP_CLEAR_WE              (DUK_DEFPROP_CLEAR_WRITABLE | DUK_DEFPROP_CLEAR_ENUMERABLE)
 #define DUK_DEFPROP_CLEAR_WC              (DUK_DEFPROP_CLEAR_WRITABLE | DUK_DEFPROP_CLEAR_CONFIGURABLE)
+#define DUK_DEFPROP_CLEAR_EC              (DUK_DEFPROP_CLEAR_ENUMERABLE | DUK_DEFPROP_CLEAR_CONFIGURABLE)
 #define DUK_DEFPROP_CLEAR_WEC             (DUK_DEFPROP_CLEAR_WRITABLE | DUK_DEFPROP_CLEAR_ENUMERABLE | DUK_DEFPROP_CLEAR_CONFIGURABLE)
 #define DUK_DEFPROP_ATTR_W                (DUK_DEFPROP_HAVE_WEC | DUK_DEFPROP_W)
 #define DUK_DEFPROP_ATTR_E                (DUK_DEFPROP_HAVE_WEC | DUK_DEFPROP_E)
 #define DUK_DEFPROP_ATTR_C                (DUK_DEFPROP_HAVE_WEC | DUK_DEFPROP_C)
 #define DUK_DEFPROP_ATTR_WE               (DUK_DEFPROP_HAVE_WEC | DUK_DEFPROP_WE)
 #define DUK_DEFPROP_ATTR_WC               (DUK_DEFPROP_HAVE_WEC | DUK_DEFPROP_WC)
+#define DUK_DEFPROP_ATTR_EC               (DUK_DEFPROP_HAVE_WEC | DUK_DEFPROP_EC)
 #define DUK_DEFPROP_ATTR_WEC              (DUK_DEFPROP_HAVE_WEC | DUK_DEFPROP_WEC)
 
 /* Flags for duk_push_thread_raw() */
@@ -661,6 +667,7 @@ DUK_EXTERNAL_DECL void duk_swap_top(duk_context *ctx, duk_idx_t idx);
 DUK_EXTERNAL_DECL void duk_dup(duk_context *ctx, duk_idx_t from_idx);
 DUK_EXTERNAL_DECL void duk_dup_top(duk_context *ctx);
 DUK_EXTERNAL_DECL void duk_insert(duk_context *ctx, duk_idx_t to_idx);
+DUK_EXTERNAL_DECL void duk_pull(duk_context *ctx, duk_idx_t from_idx);
 DUK_EXTERNAL_DECL void duk_replace(duk_context *ctx, duk_idx_t to_idx);
 DUK_EXTERNAL_DECL void duk_copy(duk_context *ctx, duk_idx_t from_idx, duk_idx_t to_idx);
 DUK_EXTERNAL_DECL void duk_remove(duk_context *ctx, duk_idx_t idx);
@@ -1032,6 +1039,8 @@ DUK_EXTERNAL_DECL const char *duk_hex_encode(duk_context *ctx, duk_idx_t idx);
 DUK_EXTERNAL_DECL void duk_hex_decode(duk_context *ctx, duk_idx_t idx);
 DUK_EXTERNAL_DECL const char *duk_json_encode(duk_context *ctx, duk_idx_t idx);
 DUK_EXTERNAL_DECL void duk_json_decode(duk_context *ctx, duk_idx_t idx);
+DUK_EXTERNAL_DECL void duk_cbor_encode(duk_context *ctx, duk_idx_t idx, duk_uint_t encode_flags);
+DUK_EXTERNAL_DECL void duk_cbor_decode(duk_context *ctx, duk_idx_t idx, duk_uint_t decode_flags);
 
 DUK_EXTERNAL_DECL const char *duk_buffer_to_string(duk_context *ctx, duk_idx_t idx);
 
diff --git a/src/libs/zbxeval/calc.c b/src/libs/zbxeval/calc.c
index 8ec652f165e..af4985d6843 100644
--- a/src/libs/zbxeval/calc.c
+++ b/src/libs/zbxeval/calc.c
@@ -20,6 +20,17 @@
 #include "common.h"
 #include "zbxalgo.h"
 #include "zbxeval.h"
+#include "log.h"
+#include "../../libs/zbxalgo/vectorimpl.h"
+
+typedef struct
+{
+	double	upper;
+	double	count;
+}
+zbx_histogram_t;
+ZBX_VECTOR_DECL(histogram, zbx_histogram_t)
+ZBX_VECTOR_IMPL(histogram, zbx_histogram_t)
 
 static int	zbx_is_normal_double(double dbl)
 {
@@ -110,16 +121,6 @@ err:
 	return FAIL;
 }
 
-static int	zbx_vector_dbl_compare(const void *d1, const void *d2)
-{
-	const double	*p1 = (const double *)d1;
-	const double	*p2 = (const double *)d2;
-
-	ZBX_RETURN_IF_NOT_EQUAL(*p1, *p2);
-
-	return 0;
-}
-
 /******************************************************************************
  *                                                                            *
  * Function: find_median                                                      *
@@ -134,7 +135,7 @@ static int	zbx_vector_dbl_compare(const void *d1, const void *d2)
  ******************************************************************************/
 static double	find_median(zbx_vector_dbl_t *v)
 {
-	zbx_vector_dbl_sort(v, zbx_vector_dbl_compare);
+	zbx_vector_dbl_sort(v, ZBX_DEFAULT_DBL_COMPARE_FUNC);
 
 	if (0 == v->values_num % 2)	/* number of elements is even */
 		return (v->values[v->values_num / 2 - 1] + v->values[v->values_num / 2]) / 2.0;
@@ -492,3 +493,174 @@ err:
 
 	return FAIL;
 }
+
+static void	remove_duplicate_backet(zbx_vector_histogram_t *h)
+{
+	zbx_histogram_t	b, last = h->values[0];
+	int		i, inx = 0;
+
+	for (i = 1; i < h->values_num; i++)
+	{
+		b = h->values[i];
+
+		if (SUCCEED == zbx_double_compare(b.upper, last.upper))
+		{
+			last.count += b.count;
+		}
+		else
+		{
+			h->values[inx] = last;
+			last = b;
+			inx++;
+		}
+	}
+
+	h->values[inx] = last;
+
+	while (h->values_num > inx + 1)
+		zbx_vector_histogram_remove_noorder(h, h->values_num - 1);
+}
+
+static void	ensure_histogram_monotonic(zbx_vector_histogram_t *h)
+{
+	double	max = h->values[0].count;
+	int	i;
+
+	for (i = 1; i < h->values_num; i++)
+	{
+		if (h->values[i].count > max)
+			max = h->values[i].count;
+		else if (h->values[i].count < max)
+			h->values[i].count = max;
+	}
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: zbx_eval_calc_histogram_quantile                                 *
+ *                                                                            *
+ * Purpose: calculate histogram quantile base on vector, where odd position   *
+ *          is bucket upper bound ('le') and even position is 'rate' value    *
+ *                                                                            *
+ * Parameters: q      - [IN] quantile value from 0 till 1                     *
+ *             values - [IN] non-empty vector with input data                 *
+ *             err_fn - [IN] function name for error info                     *
+ *             result - [OUT] calculated value                                *
+ *             error  - [OUT] dynamically allocated error message             *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully                             *
+ *               FAIL - failed to evaluate function (see 'error')             *
+ *                                                                            *
+ ******************************************************************************/
+int	zbx_eval_calc_histogram_quantile(const double q, const zbx_vector_dbl_t *values, const char *err_fn,
+		double *result, char **error)
+{
+#	define LAST(v)		v.values[v.values_num - 1]
+
+	zbx_vector_histogram_t	histogram;
+	double			res, total, rank, count, end, start;
+	zbx_histogram_t		hg;
+	int			i, ret = FAIL;
+
+	if (0 == values->values_num)
+	{
+		*error = zbx_dsprintf(*error, "invalid parameter: number of histogram buckets must not be zero"
+				" for function at \"%s\"",err_fn);
+		return FAIL;
+	}
+
+	zbx_vector_histogram_create(&histogram);
+
+	for (i = 0; i < values->values_num;)
+	{
+		hg.upper = values->values[i++];
+		hg.count = values->values[i++];
+		zbx_vector_histogram_append(&histogram, hg);
+	}
+
+	if (histogram.values_num < 2)
+	{
+		*error = zbx_dsprintf(*error, "invalid number of rate buckets for function at \"%s\"",err_fn);
+		goto err;
+	}
+
+	zbx_vector_histogram_sort(&histogram, ZBX_DEFAULT_DBL_COMPARE_FUNC);
+
+	if (FP_INFINITE != fpclassify(LAST(histogram).upper))
+	{
+		*error = zbx_dsprintf(*error, "invalid last infinity rate buckets for function at \"%s\"", err_fn);
+		goto err;
+	}
+
+	if (0 == LAST(histogram).count)
+	{
+		*error = zbx_dsprintf(*error, "invalid parameters: value of infinity bucket must not be zero"
+				" for function at \"%s\"", err_fn);
+		goto err;
+	}
+
+	remove_duplicate_backet(&histogram);
+
+	if (histogram.values_num < 2)
+	{
+		*error = zbx_dsprintf(*error,
+				"invalid number of rate buckets with duplicates for function at \"%s\"", err_fn);
+		goto err;
+	}
+
+	ensure_histogram_monotonic(&histogram);
+	total = LAST(histogram).count;
+
+	if (FP_ZERO == fpclassify(total))
+	{
+		*error = zbx_dsprintf(*error, "invalid zero value of infinity bucket for function at \"%s\"", err_fn);
+		goto err;
+	}
+
+	rank = q * total;
+
+	for (i = 0; i < histogram.values_num - 1; i++)
+	{
+		if (histogram.values[i].count >= rank)
+			break;
+	}
+
+	if (i == histogram.values_num - 1)
+	{
+		res = histogram.values[histogram.values_num - 2].upper;
+		goto end;
+	}
+
+	if (0 == i && 0 >= histogram.values[0].upper)
+	{
+		res = histogram.values[0].upper;
+		goto end;
+	}
+
+	start = 0;
+	end = histogram.values[i].upper;
+	count = histogram.values[i].count;
+
+	if (i > 0)
+	{
+		start = histogram.values[i - 1].upper;
+		count -= histogram.values[i - 1].count;
+		rank -= histogram.values[i - 1].count;
+	}
+
+	res = start + (end - start) * (rank / count);
+
+end:
+	if (SUCCEED != zbx_is_normal_double(res))
+	{
+		*error = zbx_dsprintf(*error, "cannot calculate value for function at \"%s\"", err_fn);
+		goto err;
+	}
+
+	*result = res;
+	ret = SUCCEED;
+err:
+	zbx_vector_histogram_destroy(&histogram);
+
+	return ret;
+}
diff --git a/src/libs/zbxeval/execute.c b/src/libs/zbxeval/execute.c
index d633376aab2..4fad1a013ce 100644
--- a/src/libs/zbxeval/execute.c
+++ b/src/libs/zbxeval/execute.c
@@ -2295,6 +2295,136 @@ out:
 
 /******************************************************************************
  *                                                                            *
+ * Function: eval_execute_function_histogram_quantile                         *
+ *                                                                            *
+ * Purpose: evaluate histogram_quantile() function                            *
+ *                                                                            *
+ * Parameters: ctx    - [IN] the evaluation context                           *
+ *             token  - [IN] the function token                               *
+ *             output - [IN/OUT] the output value stack                       *
+ *             error  - [OUT] the error message in the case of failure        *
+ *                                                                            *
+ * Return value: SUCCEED - function evaluation succeeded                      *
+ *               FAIL    - otherwise                                          *
+ *                                                                            *
+ ******************************************************************************/
+static int	eval_execute_function_histogram_quantile(const zbx_eval_context_t *ctx, const zbx_eval_token_t *token,
+		zbx_vector_var_t *output, char **error)
+{
+	int			i, ret;
+	zbx_variant_t		value;
+	zbx_vector_dbl_t	values, *v = NULL;
+	double			q, result;
+	const char		*err_fn = ctx->expression + token->loc.l;
+
+	if (2 > token->opt || (2 < token->opt && (token->opt % 2 == 0)))
+	{
+		*error = zbx_dsprintf(*error, "invalid number of arguments for function at \"%s\"", err_fn);
+		return FAIL;
+	}
+
+	if (UNKNOWN != (ret = eval_validate_function_args(ctx, token, output, error)))
+		return ret;
+
+	i = output->values_num - (int)token->opt + 1;
+
+	if (2 == token->opt)
+	{
+		if (ZBX_VARIANT_DBL_VECTOR != output->values[i].type)
+		{
+			*error = zbx_dsprintf(*error, "invalid type of second argument for function at \"%s\"", err_fn);
+			return FAIL;
+		}
+
+		if (output->values[i].data.dbl_vector->values_num % 2 != 0)
+		{
+			*error = zbx_dsprintf(*error, "invalid values number of second argument for function at \"%s\"",
+					err_fn);
+			return FAIL;
+		}
+	}
+	else
+	{
+		if ((output->values_num - i) % 2 != 0)
+		{
+			*error = zbx_dsprintf(*error, "invalid number of histogram arguments for function at \"%s\"",
+					err_fn);
+			return FAIL;
+		}
+
+		for (; i < output->values_num; i++)
+		{
+			if (ZBX_VARIANT_STR == output->values[i].type )
+			{
+				zbx_strupper(output->values[i].data.str);
+
+				if (0 == strcmp(output->values[i].data.str, "+INF") ||
+						0 == strcmp(output->values[i].data.str, "INF"))
+				{
+					zbx_variant_clear(&output->values[i]);
+					zbx_variant_set_dbl(&output->values[i], ZBX_INFINITY);
+				}
+				else
+				{
+					*error = zbx_dsprintf(*error, "invalid string values of backet"
+							" for function at \"%s\"", err_fn);
+					return FAIL;
+				}
+			}
+			else if (SUCCEED != eval_convert_function_arg(ctx, token, ZBX_VARIANT_DBL, &output->values[i],
+					error))
+			{
+				return FAIL;
+			}
+		}
+	}
+
+	i = output->values_num - (int)token->opt;
+
+	if (ZBX_VARIANT_DBL != output->values[i].type &&
+			SUCCEED != eval_convert_function_arg(ctx, token, ZBX_VARIANT_DBL, &output->values[i], error))
+	{
+		return FAIL;
+	}
+
+	q = output->values[i].data.dbl;
+
+	if (0 > q || 1 < q)
+	{
+		*error = zbx_dsprintf(*error, "invalid value of quantile for function at \"%s\"", err_fn);
+		return FAIL;
+	}
+
+	i = output->values_num - (int)token->opt + 1;
+
+	if (2 == token->opt)
+	{
+		v = output->values[i].data.dbl_vector;
+	}
+	else
+	{
+		zbx_vector_dbl_create(&values);
+
+		while (i < output->values_num)
+		{
+			zbx_vector_dbl_append(&values, output->values[i++].data.dbl);
+		}
+	}
+
+	if (SUCCEED == (ret = zbx_eval_calc_histogram_quantile(q, NULL != v ? v : &values, err_fn, &result, error)))
+	{
+		zbx_variant_set_dbl(&value, result);
+		eval_function_return(token->opt, &value, output);
+	}
+
+	if (NULL == v)
+		zbx_vector_dbl_destroy(&values);
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
  * Function: eval_execute_cb_function                                         *
  *                                                                            *
  * Purpose: evaluate function by calling custom callback (if configured)      *
@@ -2760,6 +2890,8 @@ static int	eval_execute_common_function(const zbx_eval_context_t *ctx, const zbx
 		return eval_execute_statistical_function(ctx, token, zbx_eval_calc_varsamp, output, error);
 	if (SUCCEED == eval_compare_token(ctx, &token->loc, "count", ZBX_CONST_STRLEN("count")))
 		return eval_execute_function_count(ctx, token, output, error);
+	if (SUCCEED == eval_compare_token(ctx, &token->loc, "histogram_quantile", ZBX_CONST_STRLEN("histogram_quantile")))
+		return eval_execute_function_histogram_quantile(ctx, token, output, error);
 
 	if (NULL != ctx->common_func_cb)
 		return eval_execute_cb_function(ctx, token, ctx->common_func_cb, output, error);
diff --git a/src/libs/zbxserver/Makefile.am b/src/libs/zbxserver/Makefile.am
index d0f0b47b169..9762c2ea93c 100644
--- a/src/libs/zbxserver/Makefile.am
+++ b/src/libs/zbxserver/Makefile.am
@@ -11,7 +11,6 @@ libzbxserver_a_SOURCES = \
 	macrofunc.h \
 	zabbix_stats.c \
 	zabbix_stats.h \
-	evalfunc2.c \
 	get_host_from_event.c \
 	get_host_from_event.h \
 	zabbix_users.c \
diff --git a/src/libs/zbxserver/evalfunc.c b/src/libs/zbxserver/evalfunc.c
index c4c12619ef5..9bd2205cf15 100644
--- a/src/libs/zbxserver/evalfunc.c
+++ b/src/libs/zbxserver/evalfunc.c
@@ -23,6 +23,8 @@
 #include "zbxserver.h"
 #include "evalfunc.h"
 #include "zbxregexp.h"
+#include "valuecache.h"
+#include "zbxtrends.h"
 #include "../zbxalgo/vectorimpl.h"
 
 #define ZBX_VALUEMAP_STRING_LEN	64
@@ -45,6 +47,21 @@ zbx_valuemaps_t;
 ZBX_PTR_VECTOR_DECL(valuemaps_ptr, zbx_valuemaps_t *)
 ZBX_PTR_VECTOR_IMPL(valuemaps_ptr, zbx_valuemaps_t *)
 
+typedef enum
+{
+	ZBX_PARAM_OPTIONAL,
+	ZBX_PARAM_MANDATORY
+}
+zbx_param_type_t;
+
+typedef enum
+{
+	ZBX_VALUE_NONE,
+	ZBX_VALUE_SECONDS,
+	ZBX_VALUE_NVALUES
+}
+zbx_value_type_t;
+
 /******************************************************************************
  *                                                                            *
  * Function: add_value_suffix_uptime                                          *
@@ -636,6 +653,3058 @@ int	zbx_evaluatable_for_notsupported(const char *fn)
 	return FAIL;
 }
 
+static const char	*zbx_type_string(zbx_value_type_t type)
+{
+	switch (type)
+	{
+		case ZBX_VALUE_NONE:
+			return "none";
+		case ZBX_VALUE_SECONDS:
+			return "sec";
+		case ZBX_VALUE_NVALUES:
+			return "num";
+		default:
+			THIS_SHOULD_NEVER_HAPPEN;
+			return "unknown";
+	}
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: get_function_parameter_int                                       *
+ *                                                                            *
+ * Purpose: get the value of sec|#num trigger function parameter              *
+ *                                                                            *
+ * Parameters: parameters     - [IN] trigger function parameters              *
+ *             Nparam         - [IN] specifies which parameter to extract     *
+ *             parameter_type - [IN] specifies whether parameter is mandatory *
+ *                              or optional                                   *
+ *             value          - [OUT] parameter value (preserved as is if the *
+ *                              parameter is optional and empty)              *
+ *             type           - [OUT] parameter value type (number of seconds *
+ *                              or number of values)                          *
+ *                                                                            *
+ * Return value: SUCCEED - parameter is valid                                 *
+ *               FAIL    - otherwise                                          *
+ *                                                                            *
+ ******************************************************************************/
+static int	get_function_parameter_int(const char *parameters, int Nparam, zbx_param_type_t parameter_type,
+		int *value, zbx_value_type_t *type)
+{
+	char	*parameter;
+	int	ret = FAIL;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
+
+	if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
+		goto out;
+
+	if ('\0' == *parameter)
+	{
+		switch (parameter_type)
+		{
+			case ZBX_PARAM_OPTIONAL:
+				ret = SUCCEED;
+				break;
+			case ZBX_PARAM_MANDATORY:
+				break;
+			default:
+				THIS_SHOULD_NEVER_HAPPEN;
+		}
+	}
+	else if ('#' == *parameter)
+	{
+		*type = ZBX_VALUE_NVALUES;
+		if (SUCCEED == is_uint31(parameter + 1, value) && 0 < *value)
+			ret = SUCCEED;
+	}
+	else if ('-' == *parameter)
+	{
+		if (SUCCEED == is_time_suffix(parameter + 1, value, ZBX_LENGTH_UNLIMITED))
+		{
+			*value = -(*value);
+			*type = ZBX_VALUE_SECONDS;
+			ret = SUCCEED;
+		}
+	}
+	else if (SUCCEED == is_time_suffix(parameter, value, ZBX_LENGTH_UNLIMITED))
+	{
+		*type = ZBX_VALUE_SECONDS;
+		ret = SUCCEED;
+	}
+
+	if (SUCCEED == ret)
+		zabbix_log(LOG_LEVEL_DEBUG, "%s() type:%s value:%d", __func__, zbx_type_string(*type), *value);
+
+	zbx_free(parameter);
+out:
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+static int	get_function_parameter_uint64(const char *parameters, int Nparam, zbx_uint64_t *value)
+{
+	char	*parameter;
+	int	ret = FAIL;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
+
+	if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
+		goto out;
+
+	if (SUCCEED == (ret = is_uint64(parameter, value)))
+		zabbix_log(LOG_LEVEL_DEBUG, "%s() value:" ZBX_FS_UI64, __func__, *value);
+
+	zbx_free(parameter);
+out:
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+static int	get_function_parameter_float(const char *parameters, int Nparam, unsigned char flags, double *value)
+{
+	char	*parameter;
+	int	ret = FAIL;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
+
+	if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
+		goto out;
+
+	if (SUCCEED == (ret = is_double_suffix(parameter, flags)))
+	{
+		*value = str2double(parameter);
+		zabbix_log(LOG_LEVEL_DEBUG, "%s() value:" ZBX_FS_DBL, __func__, *value);
+	}
+
+	zbx_free(parameter);
+out:
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+static int	get_function_parameter_str(const char *parameters, int Nparam, char **value)
+{
+	int	ret = FAIL;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
+
+	if (NULL == (*value = zbx_function_get_param_dyn(parameters, Nparam)))
+		goto out;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() value:'%s'", __func__, *value);
+	ret = SUCCEED;
+out:
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: get_function_parameter_hist_range                                *
+ *                                                                            *
+ * Purpose: get the value of sec|num + timeshift trigger function parameter   *
+ *                                                                            *
+ * Parameters: from           - [IN] the function calculation time            *
+ *             parameters     - [IN] trigger function parameters              *
+ *             Nparam         - [IN] specifies which parameter to extract     *
+ *             value          - [OUT] parameter value (preserved as is if the *
+ *                              parameter is optional and empty)              *
+ *             type           - [OUT] parameter value type (number of seconds *
+ *                              or number of values)                          *
+ *             timeshift      - [OUT] the timeshift value (0 if absent)       *
+ *                                                                            *
+ * Return value: SUCCEED - parameter is valid                                 *
+ *               FAIL    - otherwise                                          *
+ *                                                                            *
+ ******************************************************************************/
+static int	get_function_parameter_hist_range(int from, const char *parameters, int Nparam, int *value,
+		zbx_value_type_t *type, int *timeshift)
+{
+	char	*parameter = NULL, *shift;
+	int	ret = FAIL;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
+
+	if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
+		goto out;
+
+	if (NULL != (shift = strchr(parameter, ':')))
+		*shift++ = '\0';
+
+	if ('\0' == *parameter)
+	{
+		*value = 0;
+		*type = ZBX_VALUE_NONE;
+	}
+	else if ('#' != *parameter)
+	{
+		if (SUCCEED != is_time_suffix(parameter, value, ZBX_LENGTH_UNLIMITED) || 0 > *value)
+			goto out;
+
+		*type = ZBX_VALUE_SECONDS;
+	}
+	else
+	{
+		if (SUCCEED != is_uint31(parameter + 1, value) || 0 >= *value)
+			goto out;
+		*type = ZBX_VALUE_NVALUES;
+	}
+
+	if (NULL != shift)
+	{
+		struct tm	tm;
+		char		*error = NULL;
+		int		end;
+
+		if (SUCCEED != zbx_parse_timeshift(from, shift, &tm, &error))
+		{
+			zabbix_log(LOG_LEVEL_DEBUG, "%s() timeshift error:%s", __func__, error);
+			zbx_free(error);
+			goto out;
+		}
+
+		if (-1 == (end = mktime(&tm)))
+		{
+			zabbix_log(LOG_LEVEL_DEBUG, "%s() invalid timeshift value:%s", __func__, zbx_strerror(errno));
+			goto out;
+		}
+
+		if (end >= from)
+		{
+			zabbix_log(LOG_LEVEL_DEBUG, "%s() timeshift produced time in future", __func__);
+			goto out;
+		}
+
+		*timeshift = from - end;
+	}
+	else
+		*timeshift = 0;
+
+	ret = SUCCEED;
+	zabbix_log(LOG_LEVEL_DEBUG, "%s() type:%s value:%d timeshift:%d", __func__, zbx_type_string(*type), *value,
+			*timeshift);
+out:
+	zbx_free(parameter);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: get_last_n_value                                                 *
+ *                                                                            *
+ * Purpose: get last Nth value defined by #num:now-timeshift first parameter  *
+ *                                                                            *
+ * Parameters: item       - [IN] item (performance metric)                    *
+ *             parameters - [IN] the parameter string with #sec|num/timeshift *
+ *                          in first parameter                                *
+ *             ts         - [IN] the starting timestamp                       *
+ *             value      - [OUT] the Nth value                               *
+ *             error      - [OUT] the error message                           *
+ *                                                                            *
+ * Return value: SUCCEED - value was found successfully copied                *
+ *               FAIL    - otherwise                                          *
+ *                                                                            *
+ ******************************************************************************/
+static int	get_last_n_value(const DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+		zbx_history_record_t *value, char **error)
+{
+	int				arg1 = 1, ret = FAIL, time_shift;
+	zbx_value_type_t		arg1_type = ZBX_VALUE_NVALUES;
+	zbx_vector_history_record_t	values;
+	zbx_timespec_t			ts_end = *ts;
+
+	zbx_history_record_vector_create(&values);
+
+	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift))
+	{
+		*error = zbx_strdup(*error, "invalid second parameter");
+		goto out;
+	}
+
+	if (ZBX_VALUE_NVALUES != arg1_type)
+		arg1 = 1;	/* time or non parameter is defaulted to "last(0)" */
+
+	ts_end.sec -= time_shift;
+
+	if (SUCCEED != zbx_vc_get_values(item->itemid, item->value_type, &values, 0, arg1, &ts_end))
+	{
+		*error = zbx_strdup(*error, "cannot get values from value cache");
+		goto out;
+	}
+
+	if (arg1 <= values.values_num)
+	{
+		*value = values.values[arg1 - 1];
+		zbx_vector_history_record_remove(&values, arg1 - 1);
+		ret = SUCCEED;
+	}
+	else
+		*error = zbx_strdup(*error, "not enough data");
+out:
+	zbx_history_record_vector_destroy(&values, item->value_type);
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_LOGEVENTID                                              *
+ *                                                                            *
+ * Purpose: evaluate function 'logeventid' for the item                       *
+ *                                                                            *
+ * Parameters: item - item (performance metric)                               *
+ *             parameter - regex string for event id matching                 *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_LOGEVENTID(zbx_variant_t *value, DC_ITEM *item, const char *parameters,
+		const zbx_timespec_t *ts, char **error)
+{
+	char			*pattern = NULL;
+	int			ret = FAIL, nparams;
+	zbx_vector_ptr_t	regexps;
+	zbx_history_record_t	vc_value;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_vector_ptr_create(&regexps);
+
+	if (ITEM_VALUE_TYPE_LOG != item->value_type)
+	{
+		*error = zbx_strdup(*error, "invalid value type");
+		goto out;
+	}
+
+	if (2 < (nparams = num_param(parameters)))
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (2 == nparams)
+	{
+		if (SUCCEED != get_function_parameter_str(parameters, 2, &pattern))
+		{
+			*error = zbx_strdup(*error, "invalid third parameter");
+			goto out;
+		}
+
+		if ('@' == *pattern)
+		{
+			DCget_expressions_by_name(&regexps, pattern + 1);
+
+			if (0 == regexps.values_num)
+			{
+				*error = zbx_dsprintf(*error, "global regular expression \"%s\" does not exist",
+						pattern + 1);
+				goto out;
+			}
+		}
+	}
+	else
+		pattern = zbx_strdup(NULL, "");
+
+	if (SUCCEED == get_last_n_value(item, parameters, ts, &vc_value, error))
+	{
+		char	logeventid[16];
+		int	regexp_ret;
+
+		zbx_snprintf(logeventid, sizeof(logeventid), "%d", vc_value.value.log->logeventid);
+
+		if (FAIL == (regexp_ret = regexp_match_ex(&regexps, logeventid, pattern, ZBX_CASE_SENSITIVE)))
+		{
+			*error = zbx_dsprintf(*error, "invalid regular expression \"%s\"", pattern);
+		}
+		else
+		{
+			if (ZBX_REGEXP_MATCH == regexp_ret)
+				zbx_variant_set_dbl(value, 1);
+			else if (ZBX_REGEXP_NO_MATCH == regexp_ret)
+				zbx_variant_set_dbl(value, 0);
+
+			ret = SUCCEED;
+		}
+
+		zbx_history_record_clear(&vc_value, item->value_type);
+	}
+	else
+		zabbix_log(LOG_LEVEL_DEBUG, "result for LOGEVENTID is empty");
+out:
+	zbx_free(pattern);
+
+	zbx_regexp_clean_expressions(&regexps);
+	zbx_vector_ptr_destroy(&regexps);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_LOGSOURCE                                               *
+ *                                                                            *
+ * Purpose: evaluate function 'logsource' for the item                        *
+ *                                                                            *
+ * Parameters: item - item (performance metric)                               *
+ *             parameter - ignored                                            *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_LOGSOURCE(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+		char **error)
+{
+	char			*pattern = NULL;
+	int			ret = FAIL, nparams;
+	zbx_vector_ptr_t	regexps;
+	zbx_history_record_t	vc_value;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_vector_ptr_create(&regexps);
+
+	if (ITEM_VALUE_TYPE_LOG != item->value_type)
+	{
+		*error = zbx_strdup(*error, "invalid value type");
+		goto out;
+	}
+
+	if (2 < (nparams = num_param(parameters)))
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (2 == nparams)
+	{
+		if (SUCCEED != get_function_parameter_str(parameters, 2, &pattern))
+		{
+			*error = zbx_strdup(*error, "invalid third parameter");
+			goto out;
+		}
+
+		if ('@' == *pattern)
+		{
+			DCget_expressions_by_name(&regexps, pattern + 1);
+
+			if (0 == regexps.values_num)
+			{
+				*error = zbx_dsprintf(*error, "global regular expression \"%s\" does not exist",
+						pattern + 1);
+				goto out;
+			}
+		}
+	}
+	else
+		pattern = zbx_strdup(NULL, "");
+
+	if (SUCCEED == get_last_n_value(item, parameters, ts, &vc_value, error))
+	{
+		switch (regexp_match_ex(&regexps, vc_value.value.log->source, pattern, ZBX_CASE_SENSITIVE))
+		{
+			case ZBX_REGEXP_MATCH:
+				zbx_variant_set_dbl(value, 1);
+				ret = SUCCEED;
+				break;
+			case ZBX_REGEXP_NO_MATCH:
+				zbx_variant_set_dbl(value, 0);
+				ret = SUCCEED;
+				break;
+			case FAIL:
+				*error = zbx_dsprintf(*error, "invalid regular expression");
+		}
+
+		zbx_history_record_clear(&vc_value, item->value_type);
+	}
+	else
+		zabbix_log(LOG_LEVEL_DEBUG, "result for LOGSOURCE is empty");
+out:
+	zbx_free(pattern);
+
+	zbx_regexp_clean_expressions(&regexps);
+	zbx_vector_ptr_destroy(&regexps);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_LOGSEVERITY                                             *
+ *                                                                            *
+ * Purpose: evaluate function 'logseverity' for the item                      *
+ *                                                                            *
+ * Parameters: item - item (performance metric)                               *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_LOGSEVERITY(zbx_variant_t *value, DC_ITEM *item, const char *parameters,
+		const zbx_timespec_t *ts, char **error)
+{
+	int			ret = FAIL;
+	zbx_history_record_t	vc_value;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	if (ITEM_VALUE_TYPE_LOG != item->value_type)
+	{
+		*error = zbx_strdup(*error, "invalid value type");
+		goto out;
+	}
+
+	if (1 < num_param(parameters))
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (SUCCEED == get_last_n_value(item, parameters, ts, &vc_value, error))
+	{
+		zbx_variant_set_dbl(value, vc_value.value.log->severity);
+		zbx_history_record_clear(&vc_value, item->value_type);
+
+		ret = SUCCEED;
+	}
+	else
+		zabbix_log(LOG_LEVEL_DEBUG, "result for LOGSEVERITY is empty");
+out:
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+static int	history_record_float_compare(const zbx_history_record_t *d1, const zbx_history_record_t *d2)
+{
+	ZBX_RETURN_IF_NOT_EQUAL(d1->value.dbl, d2->value.dbl);
+
+	return 0;
+}
+
+static int	history_record_uint64_compare(const zbx_history_record_t *d1, const zbx_history_record_t *d2)
+{
+	ZBX_RETURN_IF_NOT_EQUAL(d1->value.ui64, d2->value.ui64);
+
+	return 0;
+}
+
+static int	history_record_str_compare(const zbx_history_record_t *d1, const zbx_history_record_t *d2)
+{
+	return strcmp(d1->value.str, d2->value.str);
+}
+
+static int	history_record_log_compare(const zbx_history_record_t *d1, const zbx_history_record_t *d2)
+{
+	int	value_match;
+
+	if (0 != (value_match = strcmp(d1->value.log->value, d2->value.log->value)))
+		return value_match;
+
+	if (NULL != d1->value.log->source && NULL != d2->value.log->source)
+		return strcmp(d1->value.log->source, d2->value.log->source);
+
+	if (NULL != d2->value.log->source)
+		return -1;
+
+	if (NULL != d1->value.log->source)
+		return 1;
+
+	return 0;
+}
+
+/* specialized versions of zbx_vector_history_record_*_uniq() because */
+/* standard versions do not release memory occupied by duplicate elements */
+
+static void	zbx_vector_history_record_str_uniq(zbx_vector_history_record_t *vector, zbx_compare_func_t compare_func)
+{
+	if (2 <= vector->values_num)
+	{
+		int	i = 0, j = 1;
+
+		while (j < vector->values_num)
+		{
+			if (0 != compare_func(&vector->values[i], &vector->values[j]))
+			{
+				i++;
+				j++;
+			}
+			else
+			{
+				zbx_free(vector->values[j].value.str);
+				zbx_vector_history_record_remove(vector, j);
+			}
+		}
+	}
+}
+
+static void	zbx_vector_history_record_log_uniq(zbx_vector_history_record_t *vector, zbx_compare_func_t compare_func)
+{
+	if (2 <= vector->values_num)
+	{
+		int	i = 0, j = 1;
+
+		while (j < vector->values_num)
+		{
+			if (0 != compare_func(&vector->values[i], &vector->values[j]))
+			{
+				i++;
+				j++;
+			}
+			else
+			{
+				zbx_free(vector->values[j].value.log->source);
+				zbx_free(vector->values[j].value.log->value);
+				zbx_free(vector->values[j].value.log);
+				zbx_vector_history_record_remove(vector, j);
+			}
+		}
+	}
+}
+
+#define OP_UNKNOWN	-1
+#define OP_EQ		0
+#define OP_NE		1
+#define OP_GT		2
+#define OP_GE		3
+#define OP_LT		4
+#define OP_LE		5
+#define OP_LIKE		6
+#define OP_REGEXP	7
+#define OP_IREGEXP	8
+#define OP_BITAND		9
+
+static void	count_one_ui64(int *count, int op, zbx_uint64_t value, zbx_uint64_t pattern, zbx_uint64_t mask)
+{
+	switch (op)
+	{
+		case OP_EQ:
+			if (value == pattern)
+				(*count)++;
+			break;
+		case OP_NE:
+			if (value != pattern)
+				(*count)++;
+			break;
+		case OP_GT:
+			if (value > pattern)
+				(*count)++;
+			break;
+		case OP_GE:
+			if (value >= pattern)
+				(*count)++;
+			break;
+		case OP_LT:
+			if (value < pattern)
+				(*count)++;
+			break;
+		case OP_LE:
+			if (value <= pattern)
+				(*count)++;
+			break;
+		case OP_BITAND:
+			if ((value & mask) == pattern)
+				(*count)++;
+	}
+}
+
+static void	count_one_dbl(int *count, int op, double value, double pattern)
+{
+	switch (op)
+	{
+		case OP_EQ:
+			if (value > pattern - ZBX_DOUBLE_EPSILON && value < pattern + ZBX_DOUBLE_EPSILON)
+				(*count)++;
+			break;
+		case OP_NE:
+			if (!(value > pattern - ZBX_DOUBLE_EPSILON && value < pattern + ZBX_DOUBLE_EPSILON))
+				(*count)++;
+			break;
+		case OP_GT:
+			if (value >= pattern + ZBX_DOUBLE_EPSILON)
+				(*count)++;
+			break;
+		case OP_GE:
+			if (value > pattern - ZBX_DOUBLE_EPSILON)
+				(*count)++;
+			break;
+		case OP_LT:
+			if (value <= pattern - ZBX_DOUBLE_EPSILON)
+				(*count)++;
+			break;
+		case OP_LE:
+			if (value < pattern + ZBX_DOUBLE_EPSILON)
+				(*count)++;
+	}
+}
+
+static void	count_one_str(int *count, int op, const char *value, const char *pattern, zbx_vector_ptr_t *regexps)
+{
+	int	res;
+
+	switch (op)
+	{
+		case OP_EQ:
+			if (0 == strcmp(value, pattern))
+				(*count)++;
+			break;
+		case OP_NE:
+			if (0 != strcmp(value, pattern))
+				(*count)++;
+			break;
+		case OP_LIKE:
+			if (NULL != strstr(value, pattern))
+				(*count)++;
+			break;
+		case OP_REGEXP:
+			if (ZBX_REGEXP_MATCH == (res = regexp_match_ex(regexps, value, pattern, ZBX_CASE_SENSITIVE)))
+				(*count)++;
+			else if (FAIL == res)
+				*count = FAIL;
+			break;
+		case OP_IREGEXP:
+			if (ZBX_REGEXP_MATCH == (res = regexp_match_ex(regexps, value, pattern, ZBX_IGNORE_CASE)))
+				(*count)++;
+			else if (FAIL == res)
+				*count = FAIL;
+	}
+}
+
+/* flags for evaluate_COUNT() */
+#define COUNT_ALL	0
+#define COUNT_UNIQUE	1
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_COUNT                                                   *
+ *                                                                            *
+ * Purpose: evaluate functions 'count' and 'find' for the item                *
+ *                                                                            *
+ * Parameters: item       - [IN] item (performance metric)                    *
+ *             parameters - [IN] up to three comma-separated fields:          *
+ *                            (1) number of seconds/values + timeshift        *
+ *                            (2) comparison operator (optional)              *
+ *                            (3) value to compare with (optional)            *
+ *                                Becomes mandatory for numeric items if 3rd  *
+ *                                parameter is specified and is not "regexp"  *
+ *                                or "iregexp". With "bitand" can take one of *
+ *                                2 forms:                                    *
+ *                                  - value_to_compare_with/mask              *
+ *                                  - mask                                    *
+ *             ts         - [IN] the function evaluation time                 *
+ *             limit      - [IN] the limit of counted values, will return     *
+ *                              when the limit is reached                     *
+ *             unique     - [IN] COUNT_ALL - count all values,                *
+ *                               COUNT_UNIQUE - count unique values           *
+ *             error      - [OUT] the error message                           *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_COUNT(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+		int limit, int unique, char **error)
+{
+	int				arg1, op = OP_UNKNOWN, numeric_search, nparams, count = 0, i, ret = FAIL;
+	int				seconds = 0, nvalues = 0, time_shift;
+	char				*operator = NULL, *pattern2 = NULL, *pattern = NULL, buf[ZBX_MAX_UINT64_LEN];
+	double				arg3_dbl;
+	zbx_uint64_t			pattern_ui64, pattern2_ui64;
+	zbx_value_type_t		arg1_type;
+	zbx_vector_ptr_t		regexps;
+	zbx_vector_history_record_t	values;
+	zbx_timespec_t			ts_end = *ts;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_vector_ptr_create(&regexps);
+	zbx_history_record_vector_create(&values);
+
+	numeric_search = (ITEM_VALUE_TYPE_UINT64 == item->value_type || ITEM_VALUE_TYPE_FLOAT == item->value_type);
+
+	if (3 < (nparams = num_param(parameters)))
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift))
+	{
+		*error = zbx_strdup(*error, "invalid second parameter");
+		goto out;
+	}
+
+	if (2 <= nparams && SUCCEED != get_function_parameter_str(parameters, 2, &operator))
+	{
+		*error = zbx_strdup(*error, "invalid third parameter");
+		goto out;
+	}
+
+	if (3 <= nparams)
+	{
+		if (SUCCEED != get_function_parameter_str(parameters, 3, &pattern))
+		{
+			*error = zbx_strdup(*error, "invalid fourth parameter");
+			goto out;
+		}
+	}
+	else
+		pattern = zbx_strdup(NULL, "");
+
+	ts_end.sec -= time_shift;
+
+	if (NULL == operator || '\0' == *operator)
+		op = (0 != numeric_search ? OP_EQ : OP_LIKE);
+	else if (0 == strcmp(operator, "eq"))
+		op = OP_EQ;
+	else if (0 == strcmp(operator, "ne"))
+		op = OP_NE;
+	else if (0 == strcmp(operator, "gt"))
+		op = OP_GT;
+	else if (0 == strcmp(operator, "ge"))
+		op = OP_GE;
+	else if (0 == strcmp(operator, "lt"))
+		op = OP_LT;
+	else if (0 == strcmp(operator, "le"))
+		op = OP_LE;
+	else if (0 == strcmp(operator, "like"))
+		op = OP_LIKE;
+	else if (0 == strcmp(operator, "regexp"))
+		op = OP_REGEXP;
+	else if (0 == strcmp(operator, "iregexp"))
+		op = OP_IREGEXP;
+	else if (0 == strcmp(operator, "bitand"))
+		op = OP_BITAND;
+
+	if (OP_UNKNOWN == op)
+	{
+		*error = zbx_dsprintf(*error, "operator \"%s\" is not supported for function COUNT", operator);
+		goto out;
+	}
+
+	numeric_search = (0 != numeric_search && OP_REGEXP != op && OP_IREGEXP != op);
+
+	if (0 != numeric_search)
+	{
+		if (NULL != operator && '\0' != *operator && '\0' == *pattern)
+		{
+			*error = zbx_strdup(*error, "pattern must be provided along with operator for numeric values");
+			goto out;
+		}
+
+		if (OP_LIKE == op)
+		{
+			*error = zbx_dsprintf(*error, "operator \"%s\" is not supported for counting numeric values",
+					operator);
+			goto out;
+		}
+
+		if (OP_BITAND == op && ITEM_VALUE_TYPE_FLOAT == item->value_type)
+		{
+			*error = zbx_dsprintf(*error, "operator \"%s\" is not supported for counting float values",
+					operator);
+			goto out;
+		}
+
+		if (OP_BITAND == op && NULL != (pattern2 = strchr(pattern, '/')))
+		{
+			*pattern2 = '\0';	/* end of the 1st part of the 2nd parameter (number to compare with) */
+			pattern2++;	/* start of the 2nd part of the 2nd parameter (mask) */
+		}
+
+		if (NULL != pattern && '\0' != *pattern)
+		{
+			if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
+			{
+				if (OP_BITAND != op)
+				{
+					if (SUCCEED != str2uint64(pattern, ZBX_UNIT_SYMBOLS, &pattern_ui64))
+					{
+						*error = zbx_dsprintf(*error, "\"%s\" is not a valid numeric unsigned"
+								" value", pattern);
+						goto out;
+					}
+					pattern2_ui64 = 0;
+				}
+				else
+				{
+					if (SUCCEED != is_uint64(pattern, &pattern_ui64))
+					{
+						*error = zbx_dsprintf(*error, "\"%s\" is not a valid numeric unsigned"
+								" value", pattern);
+						goto out;
+					}
+
+					if (NULL != pattern2)
+					{
+						if (SUCCEED != is_uint64(pattern2, &pattern2_ui64))
+						{
+							*error = zbx_dsprintf(*error, "\"%s\" is not a valid numeric"
+									" unsigned value", pattern2);
+							goto out;
+						}
+					}
+					else
+						pattern2_ui64 = pattern_ui64;
+				}
+			}
+			else
+			{
+				if (SUCCEED != is_double_suffix(pattern, ZBX_FLAG_DOUBLE_SUFFIX))
+				{
+					*error = zbx_dsprintf(*error, "\"%s\" is not a valid numeric float value",
+							pattern);
+					goto out;
+				}
+
+				arg3_dbl = str2double(pattern);
+			}
+		}
+	}
+	else if (OP_LIKE != op && OP_REGEXP != op && OP_IREGEXP != op && OP_EQ != op && OP_NE != op)
+	{
+		*error = zbx_dsprintf(*error, "operator \"%s\" is not supported for counting textual values", operator);
+		goto out;
+	}
+
+	if ((OP_REGEXP == op || OP_IREGEXP == op) && NULL != pattern && '@' == *pattern)
+	{
+		DCget_expressions_by_name(&regexps, pattern + 1);
+
+		if (0 == regexps.values_num)
+		{
+			*error = zbx_dsprintf(*error, "global regular expression \"%s\" does not exist", pattern + 1);
+			goto out;
+		}
+	}
+
+	switch (arg1_type)
+	{
+		case ZBX_VALUE_SECONDS:
+			seconds = arg1;
+			break;
+		case ZBX_VALUE_NVALUES:
+			nvalues = arg1;
+			break;
+		case ZBX_VALUE_NONE:
+			nvalues = 1;
+			break;
+		default:
+			THIS_SHOULD_NEVER_HAPPEN;
+	}
+
+	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
+	{
+		*error = zbx_strdup(*error, "cannot get values from value cache");
+		goto out;
+	}
+
+	if (COUNT_UNIQUE == unique)
+	{
+		switch (item->value_type)
+		{
+			case ITEM_VALUE_TYPE_UINT64:
+				zbx_vector_history_record_sort(&values,
+						(zbx_compare_func_t)history_record_uint64_compare);
+				zbx_vector_history_record_uniq(&values,
+						(zbx_compare_func_t)history_record_uint64_compare);
+				break;
+			case ITEM_VALUE_TYPE_FLOAT:
+				zbx_vector_history_record_sort(&values,
+						(zbx_compare_func_t)history_record_float_compare);
+				zbx_vector_history_record_uniq(&values,
+						(zbx_compare_func_t)history_record_float_compare);
+				break;
+			case ITEM_VALUE_TYPE_LOG:
+				zbx_vector_history_record_sort(&values,
+						(zbx_compare_func_t)history_record_log_compare);
+				zbx_vector_history_record_log_uniq(&values,
+						(zbx_compare_func_t)history_record_log_compare);
+				break;
+			default:
+				zbx_vector_history_record_sort(&values,
+						(zbx_compare_func_t)history_record_str_compare);
+				zbx_vector_history_record_str_uniq(&values,
+						(zbx_compare_func_t)history_record_str_compare);
+		}
+	}
+
+	/* skip counting values one by one if both pattern and operator are empty or "" is searched in text values */
+	if ((NULL != pattern && '\0' != *pattern) || (NULL != operator && '\0' != *operator &&
+			OP_LIKE != op && OP_REGEXP != op && OP_IREGEXP != op))
+	{
+		switch (item->value_type)
+		{
+			case ITEM_VALUE_TYPE_UINT64:
+				if (0 != numeric_search)
+				{
+					for (i = 0; i < values.values_num && count < limit; i++)
+					{
+						count_one_ui64(&count, op, values.values[i].value.ui64, pattern_ui64,
+								pattern2_ui64);
+					}
+				}
+				else
+				{
+					for (i = 0; i < values.values_num && FAIL != count && count < limit; i++)
+					{
+						zbx_snprintf(buf, sizeof(buf), ZBX_FS_UI64,
+								values.values[i].value.ui64);
+						count_one_str(&count, op, buf, pattern, &regexps);
+					}
+				}
+				break;
+			case ITEM_VALUE_TYPE_FLOAT:
+				if (0 != numeric_search)
+				{
+					for (i = 0; i < values.values_num && count < limit; i++)
+						count_one_dbl(&count, op, values.values[i].value.dbl, arg3_dbl);
+				}
+				else
+				{
+					for (i = 0; i < values.values_num && FAIL != count && count < limit; i++)
+					{
+						zbx_snprintf(buf, sizeof(buf), ZBX_FS_DBL_EXT(4),
+								values.values[i].value.dbl);
+						count_one_str(&count, op, buf, pattern, &regexps);
+					}
+				}
+				break;
+			case ITEM_VALUE_TYPE_LOG:
+				for (i = 0; i < values.values_num && FAIL != count && count < limit; i++)
+					count_one_str(&count, op, values.values[i].value.log->value, pattern, &regexps);
+				break;
+			default:
+				for (i = 0; i < values.values_num && FAIL != count && count < limit; i++)
+					count_one_str(&count, op, values.values[i].value.str, pattern, &regexps);
+		}
+
+		if (FAIL == count)
+		{
+			*error = zbx_strdup(*error, "invalid regular expression");
+			goto out;
+		}
+	}
+	else
+	{
+		if ((count = values.values_num) > limit)
+			count = limit;
+	}
+
+	zbx_variant_set_dbl(value, count);
+
+	ret = SUCCEED;
+out:
+	zbx_free(operator);
+	zbx_free(pattern);
+
+	zbx_regexp_clean_expressions(&regexps);
+	zbx_vector_ptr_destroy(&regexps);
+
+	zbx_history_record_vector_destroy(&values, item->value_type);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+#undef OP_UNKNOWN
+#undef OP_EQ
+#undef OP_NE
+#undef OP_GT
+#undef OP_GE
+#undef OP_LT
+#undef OP_LE
+#undef OP_LIKE
+#undef OP_REGEXP
+#undef OP_IREGEXP
+#undef OP_BITAND
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_SUM                                                     *
+ *                                                                            *
+ * Purpose: evaluate function 'sum' for the item                              *
+ *                                                                            *
+ * Parameters: item - item (performance metric)                               *
+ *             parameters - number of seconds/values and time shift (optional)*
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_SUM(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts, char **error)
+{
+	int				arg1, i, ret = FAIL, seconds = 0, nvalues = 0, time_shift;
+	zbx_value_type_t		arg1_type;
+	zbx_vector_history_record_t	values;
+	history_value_t			result;
+	zbx_timespec_t			ts_end = *ts;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_history_record_vector_create(&values);
+
+	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
+	{
+		*error = zbx_strdup(*error, "invalid value type");
+		goto out;
+	}
+
+	if (1 != num_param(parameters))
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
+			ZBX_VALUE_NONE == arg1_type)
+	{
+		*error = zbx_strdup(*error, "invalid second parameter");
+		goto out;
+	}
+
+	ts_end.sec -= time_shift;
+
+	switch (arg1_type)
+	{
+		case ZBX_VALUE_SECONDS:
+			seconds = arg1;
+			break;
+		case ZBX_VALUE_NVALUES:
+			nvalues = arg1;
+			break;
+		default:
+			THIS_SHOULD_NEVER_HAPPEN;
+	}
+
+	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
+	{
+		*error = zbx_strdup(*error, "cannot get values from value cache");
+		goto out;
+	}
+
+	if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
+	{
+		result.dbl = 0;
+
+		for (i = 0; i < values.values_num; i++)
+			result.dbl += values.values[i].value.dbl;
+	}
+	else
+	{
+		result.ui64 = 0;
+
+		for (i = 0; i < values.values_num; i++)
+			result.ui64 += values.values[i].value.ui64;
+	}
+
+	zbx_history_value2variant(&result, item->value_type, value);
+	ret = SUCCEED;
+out:
+	zbx_history_record_vector_destroy(&values, item->value_type);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_AVG                                                     *
+ *                                                                            *
+ * Purpose: evaluate function 'avg' for the item                              *
+ *                                                                            *
+ * Parameters: item - item (performance metric)                               *
+ *             parameters - number of seconds/values and time shift (optional)*
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_AVG(zbx_variant_t  *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts, char **error)
+{
+	int				arg1, ret = FAIL, i, seconds = 0, nvalues = 0, time_shift;
+	zbx_value_type_t		arg1_type;
+	zbx_vector_history_record_t	values;
+	zbx_timespec_t			ts_end = *ts;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_history_record_vector_create(&values);
+
+	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
+	{
+		*error = zbx_strdup(*error, "invalid value type");
+		goto out;
+	}
+
+	if (1 != num_param(parameters))
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
+			ZBX_VALUE_NONE == arg1_type)
+	{
+		*error = zbx_strdup(*error, "invalid second parameter");
+		goto out;
+	}
+
+	ts_end.sec -= time_shift;
+
+	switch (arg1_type)
+	{
+		case ZBX_VALUE_SECONDS:
+			seconds = arg1;
+			break;
+		case ZBX_VALUE_NVALUES:
+			nvalues = arg1;
+			break;
+		default:
+			THIS_SHOULD_NEVER_HAPPEN;
+	}
+
+	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
+	{
+		*error = zbx_strdup(*error, "cannot get values from value cache");
+		goto out;
+	}
+
+	if (0 < values.values_num)
+	{
+		double	avg = 0;
+
+		if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
+		{
+			for (i = 0; i < values.values_num; i++)
+				avg += values.values[i].value.dbl / (i + 1) - avg / (i + 1);
+		}
+		else
+		{
+			for (i = 0; i < values.values_num; i++)
+				avg += (double)values.values[i].value.ui64;
+
+			avg = avg / values.values_num;
+		}
+		zbx_variant_set_dbl(value, avg);
+
+		ret = SUCCEED;
+	}
+	else
+	{
+		zabbix_log(LOG_LEVEL_DEBUG, "result for AVG is empty");
+		*error = zbx_strdup(*error, "not enough data");
+	}
+out:
+	zbx_history_record_vector_destroy(&values, item->value_type);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_LAST                                                    *
+ *                                                                            *
+ * Purpose: evaluate function 'last' for the item                             *
+ *                                                                            *
+ * Parameters: value - dynamic buffer                                         *
+ *             item - item (performance metric)                               *
+ *             parameters - Nth last value and time shift (optional)          *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_LAST(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+		char **error)
+{
+	int			ret;
+	zbx_history_record_t	vc_value;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	if (SUCCEED == (ret = get_last_n_value(item, parameters, ts, &vc_value, error)))
+	{
+		zbx_history_value2variant(&vc_value.value, item->value_type, value);
+		zbx_history_record_clear(&vc_value, item->value_type);
+	}
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_MIN                                                     *
+ *                                                                            *
+ * Purpose: evaluate function 'min' for the item                              *
+ *                                                                            *
+ * Parameters: item - item (performance metric)                               *
+ *             parameters - number of seconds/values and time shift (optional)*
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_MIN(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts, char **error)
+{
+	int				arg1, i, ret = FAIL, seconds = 0, nvalues = 0, time_shift;
+	zbx_value_type_t		arg1_type;
+	zbx_vector_history_record_t	values;
+	zbx_timespec_t			ts_end = *ts;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_history_record_vector_create(&values);
+
+	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
+	{
+		*error = zbx_strdup(*error, "invalid value type");
+		goto out;
+	}
+
+	if (1 != num_param(parameters))
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
+			ZBX_VALUE_NONE == arg1_type)
+	{
+		*error = zbx_strdup(*error, "invalid second parameter");
+		goto out;
+	}
+
+	ts_end.sec -= time_shift;
+
+	switch (arg1_type)
+	{
+		case ZBX_VALUE_SECONDS:
+			seconds = arg1;
+			break;
+		case ZBX_VALUE_NVALUES:
+			nvalues = arg1;
+			break;
+		default:
+			THIS_SHOULD_NEVER_HAPPEN;
+	}
+
+	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
+	{
+		*error = zbx_strdup(*error, "cannot get values from value cache");
+		goto out;
+	}
+
+	if (0 < values.values_num)
+	{
+		int	index = 0;
+
+		if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
+		{
+			for (i = 1; i < values.values_num; i++)
+			{
+				if (values.values[i].value.ui64 < values.values[index].value.ui64)
+					index = i;
+			}
+		}
+		else
+		{
+			for (i = 1; i < values.values_num; i++)
+			{
+				if (values.values[i].value.dbl < values.values[index].value.dbl)
+					index = i;
+			}
+		}
+
+		zbx_history_value2variant(&values.values[index].value, item->value_type, value);
+		ret = SUCCEED;
+	}
+	else
+	{
+		zabbix_log(LOG_LEVEL_DEBUG, "result for MIN is empty");
+		*error = zbx_strdup(*error, "not enough data");
+	}
+out:
+	zbx_history_record_vector_destroy(&values, item->value_type);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_MAX                                                     *
+ *                                                                            *
+ * Purpose: evaluate function 'max' for the item                              *
+ *                                                                            *
+ * Parameters: item - item (performance metric)                               *
+ *             parameters - number of seconds/values and time shift (optional)*
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_MAX(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts, char **error)
+{
+	int				arg1, ret = FAIL, i, seconds = 0, nvalues = 0, time_shift;
+	zbx_value_type_t		arg1_type;
+	zbx_vector_history_record_t	values;
+	zbx_timespec_t			ts_end = *ts;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_history_record_vector_create(&values);
+
+	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
+	{
+		*error = zbx_strdup(*error, "invalid value type");
+		goto out;
+	}
+
+	if (1 != num_param(parameters))
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
+			ZBX_VALUE_NONE == arg1_type)
+	{
+		*error = zbx_strdup(*error, "invalid second parameter");
+		goto out;
+	}
+
+	ts_end.sec -= time_shift;
+
+	switch (arg1_type)
+	{
+		case ZBX_VALUE_SECONDS:
+			seconds = arg1;
+			break;
+		case ZBX_VALUE_NVALUES:
+			nvalues = arg1;
+			break;
+		default:
+			THIS_SHOULD_NEVER_HAPPEN;
+	}
+
+	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
+	{
+		*error = zbx_strdup(*error, "cannot get values from value cache");
+		goto out;
+	}
+
+	if (0 < values.values_num)
+	{
+		int	index = 0;
+
+		if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
+		{
+			for (i = 1; i < values.values_num; i++)
+			{
+				if (values.values[i].value.ui64 > values.values[index].value.ui64)
+					index = i;
+			}
+		}
+		else
+		{
+			for (i = 1; i < values.values_num; i++)
+			{
+				if (values.values[i].value.dbl > values.values[index].value.dbl)
+					index = i;
+			}
+		}
+
+		zbx_history_value2variant(&values.values[index].value, item->value_type, value);
+
+		ret = SUCCEED;
+	}
+	else
+	{
+		zabbix_log(LOG_LEVEL_DEBUG, "result for MAX is empty");
+		*error = zbx_strdup(*error, "not enough data");
+	}
+out:
+	zbx_history_record_vector_destroy(&values, item->value_type);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_PERCENTILE                                              *
+ *                                                                            *
+ * Purpose: evaluate function 'percentile' for the item                       *
+ *                                                                            *
+ * Parameters: item       - [IN] item (performance metric)                    *
+ *             parameters - [IN] seconds/values, time shift (optional),       *
+ *                               percentage                                   *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in        *
+ *                         'value'                                            *
+ *               FAIL    - failed to evaluate function                        *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_PERCENTILE(zbx_variant_t  *value, DC_ITEM *item, const char *parameters,
+		const zbx_timespec_t *ts, char **error)
+{
+	int				arg1, time_shift, ret = FAIL, seconds = 0, nvalues = 0;
+	zbx_value_type_t		arg1_type;
+	double				percentage;
+	zbx_vector_history_record_t	values;
+	zbx_timespec_t			ts_end = *ts;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_history_record_vector_create(&values);
+
+	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
+	{
+		*error = zbx_strdup(*error, "invalid value type");
+		goto out;
+	}
+
+	if (2 != num_param(parameters))
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
+			ZBX_VALUE_NONE == arg1_type)
+	{
+		*error = zbx_strdup(*error, "invalid second parameter");
+		goto out;
+	}
+
+
+	switch (arg1_type)
+	{
+		case ZBX_VALUE_SECONDS:
+			seconds = arg1;
+			break;
+		case ZBX_VALUE_NVALUES:
+			nvalues = arg1;
+			break;
+		default:
+			THIS_SHOULD_NEVER_HAPPEN;
+	}
+
+	ts_end.sec -= time_shift;
+
+	if (SUCCEED != get_function_parameter_float(parameters, 2, ZBX_FLAG_DOUBLE_PLAIN, &percentage) ||
+			0.0 > percentage || 100.0 < percentage)
+	{
+		*error = zbx_strdup(*error, "invalid third parameter");
+		goto out;
+	}
+
+	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
+	{
+		*error = zbx_strdup(*error, "cannot get values from value cache");
+		goto out;
+	}
+
+	if (0 < values.values_num)
+	{
+		int	index;
+
+		if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
+			zbx_vector_history_record_sort(&values, (zbx_compare_func_t)history_record_float_compare);
+		else
+			zbx_vector_history_record_sort(&values, (zbx_compare_func_t)history_record_uint64_compare);
+
+		if (0 == percentage)
+			index = 1;
+		else
+			index = (int)ceil(values.values_num * (percentage / 100));
+
+		zbx_history_value2variant(&values.values[index - 1].value, item->value_type, value);
+
+		ret = SUCCEED;
+	}
+	else
+	{
+		zabbix_log(LOG_LEVEL_DEBUG, "result for PERCENTILE is empty");
+		*error = zbx_strdup(*error, "not enough data");
+	}
+out:
+	zbx_history_record_vector_destroy(&values, item->value_type);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_NODATA                                                  *
+ *                                                                            *
+ * Purpose: evaluate function 'nodata' for the item                           *
+ *                                                                            *
+ * Parameters: item - item (performance metric)                               *
+ *             parameter - number of seconds                                  *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_NODATA(zbx_variant_t *value, DC_ITEM *item, const char *parameters, char **error)
+{
+	int				arg1, num, period, lazy = 1, ret = FAIL;
+	zbx_value_type_t		arg1_type;
+	zbx_vector_history_record_t	values;
+	zbx_timespec_t			ts;
+	char				*arg2 = NULL;
+	zbx_proxy_suppress_t		nodata_win;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_history_record_vector_create(&values);
+
+	if (2 < (num = num_param(parameters)))
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) ||
+			ZBX_VALUE_SECONDS != arg1_type || 0 >= arg1)
+	{
+		*error = zbx_strdup(*error, "invalid second parameter");
+		goto out;
+	}
+
+	if (1 < num && (SUCCEED != get_function_parameter_str(parameters, 2, &arg2) ||
+			('\0' != *arg2 && 0 != (lazy = strcmp("strict", arg2)))))
+	{
+		*error = zbx_strdup(*error, "invalid third parameter");
+		goto out;
+	}
+
+	zbx_timespec(&ts);
+	nodata_win.flags = ZBX_PROXY_SUPPRESS_DISABLE;
+
+	if (0 != item->host.proxy_hostid && 0 != lazy)
+	{
+		int			lastaccess;
+
+		if (SUCCEED != DCget_proxy_nodata_win(item->host.proxy_hostid, &nodata_win, &lastaccess))
+		{
+			*error = zbx_strdup(*error, "cannot retrieve proxy last access");
+			goto out;
+		}
+
+		period = arg1 + (ts.sec - lastaccess);
+	}
+	else
+		period = arg1;
+
+	if (SUCCEED == zbx_vc_get_values(item->itemid, item->value_type, &values, period, 1, &ts) &&
+			1 == values.values_num)
+	{
+		zbx_variant_set_dbl(value, 0);
+	}
+	else
+	{
+		int	seconds;
+
+		if (SUCCEED != DCget_data_expected_from(item->itemid, &seconds))
+		{
+			*error = zbx_strdup(*error, "item does not exist, is disabled or belongs to a disabled host");
+			goto out;
+		}
+
+		if (seconds + arg1 > ts.sec)
+		{
+			*error = zbx_strdup(*error,
+					"item does not have enough data after server start or item creation");
+			goto out;
+		}
+
+		if (0 != (nodata_win.flags & ZBX_PROXY_SUPPRESS_ACTIVE))
+		{
+			*error = zbx_strdup(*error, "historical data transfer from proxy is still in progress");
+			goto out;
+		}
+
+		zbx_variant_set_dbl(value, 1);
+
+		if (0 != item->host.proxy_hostid && 0 != lazy)
+		{
+			zabbix_log(LOG_LEVEL_TRACE, "Nodata in %s() flag:%d values_num:%d start_time:%d period:%d",
+					__func__, nodata_win.flags, nodata_win.values_num, ts.sec - period, period);
+		}
+	}
+
+	ret = SUCCEED;
+out:
+	zbx_history_record_vector_destroy(&values, item->value_type);
+	zbx_free(arg2);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_CHANGE                                                  *
+ *                                                                            *
+ * Purpose: evaluate function 'change' for the item                           *
+ *                                                                            *
+ * Parameters: item - item (performance metric)                               *
+ *             parameter - number of seconds                                  *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_CHANGE(zbx_variant_t *value, DC_ITEM *item, const zbx_timespec_t *ts, char **error)
+{
+	int				ret = FAIL;
+	zbx_vector_history_record_t	values;
+	double				result;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_history_record_vector_create(&values);
+
+	if (SUCCEED != zbx_vc_get_values(item->itemid, item->value_type, &values, 0, 2, ts) ||
+			2 > values.values_num)
+	{
+		*error = zbx_strdup(*error, "cannot get values from value cache");
+		goto out;
+	}
+
+	switch (item->value_type)
+	{
+		case ITEM_VALUE_TYPE_FLOAT:
+			result = values.values[0].value.dbl - values.values[1].value.dbl;
+			break;
+		case ITEM_VALUE_TYPE_UINT64:
+			/* to avoid overflow */
+			if (values.values[0].value.ui64 >= values.values[1].value.ui64)
+				result = values.values[0].value.ui64 - values.values[1].value.ui64;
+			else
+				result = -(double)(values.values[1].value.ui64 - values.values[0].value.ui64);
+			break;
+		case ITEM_VALUE_TYPE_LOG:
+			if (0 == strcmp(values.values[0].value.log->value, values.values[1].value.log->value))
+				result = 0;
+			else
+				result = 1;
+			break;
+
+		case ITEM_VALUE_TYPE_STR:
+		case ITEM_VALUE_TYPE_TEXT:
+			if (0 == strcmp(values.values[0].value.str, values.values[1].value.str))
+				result = 0;
+			else
+				result = 1;
+			break;
+		default:
+			*error = zbx_strdup(*error, "invalid value type");
+			goto out;
+	}
+
+	zbx_variant_set_dbl(value, result);
+	ret = SUCCEED;
+out:
+	zbx_history_record_vector_destroy(&values, item->value_type);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_FUZZYTIME                                               *
+ *                                                                            *
+ * Purpose: evaluate function 'fuzzytime' for the item                        *
+ *                                                                            *
+ * Parameters: item - item (performance metric)                               *
+ *             parameter - number of seconds                                  *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_FUZZYTIME(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+		char **error)
+{
+	int			arg1, ret = FAIL;
+	zbx_value_type_t	arg1_type;
+	zbx_history_record_t	vc_value;
+	zbx_uint64_t		fuzlow, fuzhig;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
+	{
+		*error = zbx_strdup(*error, "invalid value type");
+		goto out;
+	}
+
+	if (1 < num_param(parameters))
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) || 0 >= arg1)
+	{
+		*error = zbx_strdup(*error, "invalid second parameter");
+		goto out;
+	}
+
+	if (ZBX_VALUE_SECONDS != arg1_type || ts->sec <= arg1)
+	{
+		*error = zbx_strdup(*error, "invalid argument type or value");
+		goto out;
+	}
+
+	if (SUCCEED != zbx_vc_get_value(item->itemid, item->value_type, ts, &vc_value))
+	{
+		*error = zbx_strdup(*error, "cannot get value from value cache");
+		goto out;
+	}
+
+	fuzlow = (int)(ts->sec - arg1);
+	fuzhig = (int)(ts->sec + arg1);
+
+	if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
+	{
+		if (vc_value.value.ui64 >= fuzlow && vc_value.value.ui64 <= fuzhig)
+			zbx_variant_set_dbl(value, 1);
+		else
+			zbx_variant_set_dbl(value, 0);
+	}
+	else
+	{
+		if (vc_value.value.dbl >= fuzlow && vc_value.value.dbl <= fuzhig)
+			zbx_variant_set_dbl(value, 1);
+		else
+			zbx_variant_set_dbl(value, 0);
+	}
+
+	zbx_history_record_clear(&vc_value, item->value_type);
+
+	ret = SUCCEED;
+out:
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_BITAND                                                  *
+ *                                                                            *
+ * Purpose: evaluate logical bitwise function 'and' for the item              *
+ *                                                                            *
+ * Parameters: value - dynamic buffer                                         *
+ *             item - item (performance metric)                               *
+ *             parameters - to 2 comma-separated fields:                      *
+ *                            (1) same as the 1st parameter for function      *
+ *                                evaluate_LAST() (see documentation of       *
+ *                                trigger function last()),                   *
+ *                            (2) mask to bitwise AND with (mandatory),       *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_BITAND(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+		char **error)
+{
+	char		*last_parameters = NULL;
+	int		ret = FAIL;
+	zbx_uint64_t	mask;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	if (ITEM_VALUE_TYPE_UINT64 != item->value_type)
+	{
+		*error = zbx_strdup(*error, "invalid value type");
+		goto clean;
+	}
+
+	if (2 < num_param(parameters))
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto clean;
+	}
+
+	if (SUCCEED != get_function_parameter_uint64(parameters, 2, &mask))
+	{
+		*error = zbx_strdup(*error, "invalid third parameter");
+		goto clean;
+	}
+
+	/* prepare the 1st and the 3rd parameter for passing to evaluate_LAST() */
+	last_parameters = zbx_function_get_param_dyn(parameters, 1);
+
+	if (SUCCEED == evaluate_LAST(value, item, last_parameters, ts, error))
+	{
+		/* the evaluate_LAST() should return uint64 value, but just to be sure try to convert it */
+		if (SUCCEED != zbx_variant_convert(value, ZBX_VARIANT_UI64))
+		{
+			*error = zbx_strdup(*error, "invalid value type");
+			goto clean;
+		}
+		zbx_variant_set_dbl(value, value->data.ui64 & (zbx_uint64_t)mask);
+		ret = SUCCEED;
+	}
+
+	zbx_free(last_parameters);
+clean:
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_FORECAST                                                *
+ *                                                                            *
+ * Purpose: evaluate function 'forecast' for the item                         *
+ *                                                                            *
+ * Parameters: item - item (performance metric)                               *
+ *             parameters - number of seconds/values and time shift (optional)*
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_FORECAST(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+		char **error)
+{
+	char				*fit_str = NULL, *mode_str = NULL;
+	double				*t = NULL, *x = NULL;
+	int				nparams, time, arg1, i, ret = FAIL, seconds = 0, nvalues = 0, time_shift;
+	zbx_value_type_t		time_type, arg1_type;
+	unsigned int			k = 0;
+	zbx_vector_history_record_t	values;
+	zbx_timespec_t			zero_time;
+	zbx_fit_t			fit;
+	zbx_mode_t			mode;
+	zbx_timespec_t			ts_end = *ts;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_history_record_vector_create(&values);
+
+	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
+	{
+		*error = zbx_strdup(*error, "invalid value type");
+		goto out;
+	}
+
+	if (2 > (nparams = num_param(parameters)) || nparams > 4)
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
+			ZBX_VALUE_NONE == arg1_type)
+	{
+		*error = zbx_strdup(*error, "invalid second parameter");
+		goto out;
+	}
+
+	if (SUCCEED != get_function_parameter_int(parameters, 2, ZBX_PARAM_MANDATORY, &time, &time_type) ||
+			ZBX_VALUE_SECONDS != time_type)
+	{
+		*error = zbx_strdup(*error, "invalid third parameter");
+		goto out;
+	}
+
+	if (3 <= nparams)
+	{
+		if (SUCCEED != get_function_parameter_str(parameters, 3, &fit_str) ||
+				SUCCEED != zbx_fit_code(fit_str, &fit, &k, error))
+		{
+			*error = zbx_strdup(*error, "invalid fourth parameter");
+			goto out;
+		}
+	}
+	else
+	{
+		fit = FIT_LINEAR;
+	}
+
+	if (4 == nparams)
+	{
+		if (SUCCEED != get_function_parameter_str(parameters, 4, &mode_str) ||
+				SUCCEED != zbx_mode_code(mode_str, &mode, error))
+		{
+			*error = zbx_strdup(*error, "invalid fifth parameter");
+			goto out;
+		}
+	}
+	else
+	{
+		mode = MODE_VALUE;
+	}
+
+	switch (arg1_type)
+	{
+		case ZBX_VALUE_SECONDS:
+			seconds = arg1;
+			break;
+		case ZBX_VALUE_NVALUES:
+			nvalues = arg1;
+			break;
+		default:
+			THIS_SHOULD_NEVER_HAPPEN;
+	}
+
+	ts_end.sec -= time_shift;
+
+	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
+	{
+		*error = zbx_strdup(*error, "cannot get values from value cache");
+		goto out;
+	}
+
+	if (0 < values.values_num)
+	{
+		t = (double *)zbx_malloc(t, values.values_num * sizeof(double));
+		x = (double *)zbx_malloc(x, values.values_num * sizeof(double));
+
+		zero_time.sec = values.values[values.values_num - 1].timestamp.sec;
+		zero_time.ns = values.values[values.values_num - 1].timestamp.ns;
+
+		if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
+		{
+			for (i = 0; i < values.values_num; i++)
+			{
+				t[i] = values.values[i].timestamp.sec - zero_time.sec + 1.0e-9 *
+						(values.values[i].timestamp.ns - zero_time.ns + 1);
+				x[i] = values.values[i].value.dbl;
+			}
+		}
+		else
+		{
+			for (i = 0; i < values.values_num; i++)
+			{
+				t[i] = values.values[i].timestamp.sec - zero_time.sec + 1.0e-9 *
+						(values.values[i].timestamp.ns - zero_time.ns + 1);
+				x[i] = values.values[i].value.ui64;
+			}
+		}
+
+		zbx_variant_set_dbl(value, zbx_forecast(t, x, values.values_num,
+				ts->sec - zero_time.sec - 1.0e-9 * (zero_time.ns + 1), time, fit, k, mode));
+	}
+	else
+	{
+		zbx_variant_set_dbl(value, ZBX_MATH_ERROR);
+	}
+
+	ret = SUCCEED;
+out:
+	zbx_history_record_vector_destroy(&values, item->value_type);
+
+	zbx_free(fit_str);
+	zbx_free(mode_str);
+
+	zbx_free(t);
+	zbx_free(x);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_TIMELEFT                                                *
+ *                                                                            *
+ * Purpose: evaluate function 'timeleft' for the item                         *
+ *                                                                            *
+ * Parameters: item - item (performance metric)                               *
+ *             parameters - number of seconds/values and time shift (optional)*
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_TIMELEFT(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+		char **error)
+{
+	char				*fit_str = NULL;
+	double				*t = NULL, *x = NULL, threshold;
+	int				nparams, arg1, i, ret = FAIL, seconds = 0, nvalues = 0, time_shift;
+	zbx_value_type_t		arg1_type;
+	unsigned			k = 0;
+	zbx_vector_history_record_t	values;
+	zbx_timespec_t			zero_time;
+	zbx_fit_t			fit;
+	zbx_timespec_t			ts_end = *ts;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_history_record_vector_create(&values);
+
+	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
+	{
+		*error = zbx_strdup(*error, "invalid value type");
+		goto out;
+	}
+
+	if (2 > (nparams = num_param(parameters)) || nparams > 3)
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
+			ZBX_VALUE_NONE == arg1_type)
+	{
+		*error = zbx_strdup(*error, "invalid second parameter");
+		goto out;
+	}
+
+	if (SUCCEED != get_function_parameter_float(parameters, 2, ZBX_FLAG_DOUBLE_SUFFIX, &threshold))
+	{
+		*error = zbx_strdup(*error, "invalid third parameter");
+		goto out;
+	}
+
+	if (3 == nparams)
+	{
+		if (SUCCEED != get_function_parameter_str(parameters, 3, &fit_str) ||
+				SUCCEED != zbx_fit_code(fit_str, &fit, &k, error))
+		{
+			*error = zbx_strdup(*error, "invalid fourth parameter");
+			goto out;
+		}
+	}
+	else
+	{
+		fit = FIT_LINEAR;
+	}
+
+	if ((FIT_EXPONENTIAL == fit || FIT_POWER == fit) && 0.0 >= threshold)
+	{
+		*error = zbx_strdup(*error, "exponential and power functions are always positive");
+		goto out;
+	}
+
+	switch (arg1_type)
+	{
+		case ZBX_VALUE_SECONDS:
+			seconds = arg1;
+			break;
+		case ZBX_VALUE_NVALUES:
+			nvalues = arg1;
+			break;
+		default:
+			THIS_SHOULD_NEVER_HAPPEN;
+	}
+
+	ts_end.sec -= time_shift;
+
+	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
+	{
+		*error = zbx_strdup(*error, "cannot get values from value cache");
+		goto out;
+	}
+
+	if (0 < values.values_num)
+	{
+		t = (double *)zbx_malloc(t, values.values_num * sizeof(double));
+		x = (double *)zbx_malloc(x, values.values_num * sizeof(double));
+
+		zero_time.sec = values.values[values.values_num - 1].timestamp.sec;
+		zero_time.ns = values.values[values.values_num - 1].timestamp.ns;
+
+		if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
+		{
+			for (i = 0; i < values.values_num; i++)
+			{
+				t[i] = values.values[i].timestamp.sec - zero_time.sec + 1.0e-9 *
+						(values.values[i].timestamp.ns - zero_time.ns + 1);
+				x[i] = values.values[i].value.dbl;
+			}
+		}
+		else
+		{
+			for (i = 0; i < values.values_num; i++)
+			{
+				t[i] = values.values[i].timestamp.sec - zero_time.sec + 1.0e-9 *
+						(values.values[i].timestamp.ns - zero_time.ns + 1);
+				x[i] = values.values[i].value.ui64;
+			}
+		}
+
+		zbx_variant_set_dbl(value, zbx_timeleft(t, x, values.values_num,
+				ts->sec - zero_time.sec - 1.0e-9 * (zero_time.ns + 1), threshold, fit, k));
+	}
+	else
+	{
+		zbx_variant_set_dbl(value, ZBX_MATH_ERROR);
+	}
+
+	ret = SUCCEED;
+out:
+	zbx_history_record_vector_destroy(&values, item->value_type);
+
+	zbx_free(fit_str);
+
+	zbx_free(t);
+	zbx_free(x);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_TREND                                                   *
+ *                                                                            *
+ * Purpose: evaluate trend* functions for the item                            *
+ *                                                                            *
+ * Parameters: value      - [OUT] the function result                         *
+ *             item       - [IN] item (performance metric)                    *
+ *             func       - [IN] the trend function to evaluate               *
+ *                               (avg, sum, count, delta, max, min)           *
+ *             parameters - [IN] function parameters                          *
+ *             ts         - [IN] the historical time when function must be    *
+ *                               evaluated                                    *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_TREND(zbx_variant_t *value, DC_ITEM *item, const char *func, const char *parameters,
+		const zbx_timespec_t *ts, char **error)
+{
+	int		ret = FAIL, start, end;
+	char		*period = NULL;
+	const char	*table;
+	double		value_dbl;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	if (1 != num_param(parameters))
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (SUCCEED != get_function_parameter_str(parameters, 1, &period))
+	{
+		*error = zbx_strdup(*error, "invalid second parameter");
+		goto out;
+	}
+
+	if (SUCCEED != zbx_trends_parse_range(ts->sec, period, &start, &end, error))
+		goto out;
+
+	switch (item->value_type)
+	{
+		case ITEM_VALUE_TYPE_FLOAT:
+			table = "trends";
+			break;
+		case ITEM_VALUE_TYPE_UINT64:
+			table = "trends_uint";
+			break;
+		default:
+			*error = zbx_strdup(*error, "unsupported value type");
+			goto out;
+	}
+
+	if (0 == strcmp(func, "avg"))
+	{
+		ret = zbx_trends_eval_avg(table, item->itemid, start, end, &value_dbl, error);
+	}
+	else if (0 == strcmp(func, "count"))
+	{
+		ret = zbx_trends_eval_count(table, item->itemid, start, end, &value_dbl, error);
+	}
+	else if (0 == strcmp(func, "max"))
+	{
+		ret = zbx_trends_eval_max(table, item->itemid, start, end, &value_dbl, error);
+	}
+	else if (0 == strcmp(func, "min"))
+	{
+		ret = zbx_trends_eval_min(table, item->itemid, start, end, &value_dbl, error);
+	}
+	else if (0 == strcmp(func, "sum"))
+	{
+		ret = zbx_trends_eval_sum(table, item->itemid, start, end, &value_dbl, error);
+	}
+	else
+	{
+		*error = zbx_strdup(*error, "unknown trend function");
+		goto out;
+	}
+
+	if (SUCCEED == ret)
+		zbx_variant_set_dbl(value, value_dbl);
+out:
+	zbx_free(period);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+static int	validate_params_and_get_data(DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+		zbx_vector_history_record_t *values, char **error)
+{
+	int			arg1, seconds = 0, nvalues = 0, time_shift;
+	zbx_value_type_t	arg1_type;
+	zbx_timespec_t		ts_end = *ts;
+
+	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
+	{
+		*error = zbx_strdup(*error, "invalid value type");
+		return FAIL;
+	}
+
+	if (1 != num_param(parameters))
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		return FAIL;
+	}
+
+	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
+			ZBX_VALUE_NONE == arg1_type)
+	{
+		*error = zbx_strdup(*error, "invalid parameter");
+		return FAIL;
+	}
+
+	ts_end.sec -= time_shift;
+
+	switch (arg1_type)
+	{
+		case ZBX_VALUE_SECONDS:
+			seconds = arg1;
+			break;
+		case ZBX_VALUE_NVALUES:
+			nvalues = arg1;
+			break;
+		default:
+			*error = zbx_strdup(*error, "invalid type of first argument");
+			THIS_SHOULD_NEVER_HAPPEN;
+			return FAIL;
+	}
+
+	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, values, seconds, nvalues, &ts_end))
+	{
+		*error = zbx_strdup(*error, "cannot get values from value cache");
+		return FAIL;
+	}
+
+	return SUCCEED;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_FIRST                                                   *
+ *                                                                            *
+ * Purpose: evaluate function 'first' for the item                            *
+ *                                                                            *
+ * Parameters: value - dynamic buffer                                         *
+ *             item - item (performance metric)                               *
+ *             parameters - Nth first value and time shift (optional)         *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_FIRST(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+		char **error)
+{
+	int				arg1 = 1, ret = FAIL, seconds = 0, time_shift;
+	zbx_value_type_t		arg1_type = ZBX_VALUE_NVALUES;
+	zbx_vector_history_record_t	values;
+	zbx_timespec_t			ts_end = *ts;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_history_record_vector_create(&values);
+
+	if (1 != num_param(parameters))
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift))
+	{
+		*error = zbx_strdup(*error, "invalid parameter");
+		goto out;
+	}
+
+	switch (arg1_type)
+	{
+		case ZBX_VALUE_SECONDS:
+			seconds = arg1;
+			break;
+		case ZBX_VALUE_NONE:
+			*error = zbx_strdup(*error, "the first argument is not specified");
+			goto out;
+		case ZBX_VALUE_NVALUES:
+			*error = zbx_strdup(*error, "the first argument cannot be number of value");
+			goto out;
+		default:
+			*error = zbx_strdup(*error, "invalid type of first argument");
+			THIS_SHOULD_NEVER_HAPPEN;
+			goto out;
+	}
+
+	if (0 >= arg1)
+	{
+		*error = zbx_strdup(*error, "the first argument must be greater than 0");
+		goto out;
+	}
+
+	ts_end.sec -= time_shift;
+
+	if (SUCCEED == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, 0, &ts_end))
+	{
+		if (0 < values.values_num)
+		{
+			zbx_history_value2variant(&values.values[values.values_num - 1].value, item->value_type, value);
+			ret = SUCCEED;
+		}
+		else
+		{
+			*error = zbx_strdup(*error, "not enough data");
+			goto out;
+		}
+	}
+	else
+		*error = zbx_strdup(*error, "cannot get values from value cache");
+out:
+	zbx_history_record_vector_destroy(&values, item->value_type);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/* flags for evaluate_MONO() */
+#define MONOINC		0
+#define MONODEC		1
+
+#define CHECK_MONOTONICITY(type, mode_op, epsi_op)					\
+	for (i = 0; i < values.values_num - 1; i++)					\
+	{										\
+		if (0 == strict && values.values[i + 1].value.type mode_op		\
+				(epsi_op + values.values[i].value.type))		\
+		{									\
+			res = 0;							\
+			break;								\
+		}									\
+		else if (1 == strict && values.values[i + 1].value.type mode_op##=	\
+				(epsi_op + values.values[i].value.type ) )		\
+		{									\
+			res = 0;							\
+			break;								\
+		}									\
+	}										\
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_MONO                                                    *
+ *                                                                            *
+ * Purpose: evaluate functions 'monoinc' and 'monodec' for the item           *
+ *                                                                            *
+ * Parameters: value      - [OUT] the function return value                   *
+ *             item       - [IN] item (performance metric)                    *
+ *             parameters - [IN] mode, strict or weak monotonicity            *
+ *             ts         - [IN] the function execution time                  *
+ *             gradient   - [IN] check increase or decrease of monotonicity   *
+ *             error      - [OUT] the error message if function failed        *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_MONO(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+		int gradient, char **error)
+{
+	int				arg1, i, num, time_shift, strict = 0, ret = FAIL, seconds = 0, nvalues = 0;
+	char				*arg2 = NULL;
+	zbx_uint64_t			res;
+	zbx_value_type_t		arg1_type;
+	zbx_vector_history_record_t	values;
+	zbx_timespec_t			ts_end = *ts;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_history_record_vector_create(&values);
+
+	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
+	{
+		*error = zbx_strdup(*error, "invalid value type");
+		goto out;
+	}
+
+	num = num_param(parameters);
+
+	if (1 > num || 2 < num )
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
+			ZBX_VALUE_NONE == arg1_type)
+	{
+		*error = zbx_strdup(*error, "invalid second parameter");
+		goto out;
+	}
+
+	if (1 < num && (SUCCEED != get_function_parameter_str(parameters, 2, &arg2) ||
+			('\0' != *arg2 && 0 == (strict = (0 == strcmp("strict", arg2))) &&
+			0 != strcmp("weak", arg2))))
+	{
+		*error = zbx_strdup(*error, "invalid third parameter");
+		goto out;
+	}
+
+	ts_end.sec -= time_shift;
+
+	switch (arg1_type)
+	{
+		case ZBX_VALUE_SECONDS:
+			seconds = arg1;
+			break;
+		case ZBX_VALUE_NVALUES:
+			nvalues = arg1;
+			break;
+		default:
+			THIS_SHOULD_NEVER_HAPPEN;
+	}
+
+	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
+	{
+		*error = zbx_strdup(*error, "cannot get values from value cache");
+		goto out;
+	}
+
+	if (0 < values.values_num)
+	{
+		res = 1;
+
+		if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
+		{
+			if (MONOINC == gradient)
+			{
+				CHECK_MONOTONICITY(dbl, >, +ZBX_DOUBLE_EPSILON);
+			}
+			else if (MONODEC == gradient)
+			{
+				CHECK_MONOTONICITY(dbl, <, -ZBX_DOUBLE_EPSILON);
+			}
+			else
+			{
+				THIS_SHOULD_NEVER_HAPPEN;
+			}
+		}
+		else if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
+		{
+			if (MONOINC == gradient)
+			{
+				CHECK_MONOTONICITY(ui64, >, 0);
+			}
+			else if (MONODEC == gradient)
+			{
+				CHECK_MONOTONICITY(ui64, <, 0);
+			}
+			else
+			{
+				THIS_SHOULD_NEVER_HAPPEN;
+			}
+		}
+		else
+		{
+			THIS_SHOULD_NEVER_HAPPEN;
+		}
+		zbx_variant_set_ui64(value, res);
+		ret = SUCCEED;
+	}
+	else
+	{
+		if (MONOINC == gradient)
+			zabbix_log(LOG_LEVEL_DEBUG, "result for MONOINC is empty");
+		else if (MONODEC == gradient)
+			zabbix_log(LOG_LEVEL_DEBUG, "result for MONODEC is empty");
+		else
+			THIS_SHOULD_NEVER_HAPPEN;
+
+		*error = zbx_strdup(*error, "not enough data");
+	}
+out:
+	zbx_history_record_vector_destroy(&values, item->value_type);
+	zbx_free(arg2);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_RATE                                                    *
+ *                                                                            *
+ * Purpose: evaluate functions 'rate' for the item                            *
+ *                                                                            *
+ * Parameters: value      - [OUT] the function return value                   *
+ *             item       - [IN] item (performance metric)                    *
+ *             parameters - [IN] seconds, time shift (optional)               *
+ *             ts         - [IN] the function execution time                  *
+ *             error      - [OUT] the error message if function failed        *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_RATE(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+		char **error)
+{
+#	define HVD(v) (ITEM_VALUE_TYPE_FLOAT == item->value_type ? v.dbl : (double)v.ui64)
+#	define TS2DBL(t) (t.sec + t.ns / 1e9)
+#	define LAST(v) (v.values[0])
+#	define FIRST(v) (v.values[v.values_num - 1])
+
+	int				arg1, time_shift, ret = FAIL, seconds = 0, nvalues = 0;
+	zbx_value_type_t		arg1_type;
+	zbx_vector_history_record_t	values;
+	zbx_timespec_t			ts_end = *ts;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() params:%s", __func__, parameters);
+
+	zbx_history_record_vector_create(&values);
+
+	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
+	{
+		*error = zbx_strdup(*error, "invalid value type");
+		goto out;
+	}
+
+	if (1 != num_param(parameters))
+	{
+		*error = zbx_strdup(*error, "invalid number of parameters");
+		goto out;
+	}
+
+	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
+			ZBX_VALUE_NONE == arg1_type)
+	{
+		*error = zbx_strdup(*error, "invalid second parameter");
+		goto out;
+	}
+
+	switch (arg1_type)
+	{
+		case ZBX_VALUE_SECONDS:
+			seconds = arg1;
+			break;
+		case ZBX_VALUE_NVALUES:
+			nvalues = arg1;
+			break;
+		default:
+			THIS_SHOULD_NEVER_HAPPEN;
+	}
+
+	ts_end.sec -= time_shift;
+
+	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
+	{
+		*error = zbx_strdup(*error, "cannot get values from value cache");
+		goto out;
+	}
+
+	if (1 < values.values_num)
+	{
+		history_value_t	last = {0};
+		int		i;
+		double		delta, gap_start, gap_end, sampled_interval, average_duration_between_samples,
+				threshold, interval, range, range_start, range_end;
+
+		/* Reset detection */
+
+		delta = HVD(LAST(values).value) - HVD(FIRST(values).value);
+
+		for (i = values.values_num - 1; i >= 0; i--)
+		{
+			if (FAIL == zbx_double_compare(HVD(values.values[i].value), HVD(last)) &&
+					HVD(values.values[i].value) < HVD(last))
+			{
+				delta = delta + HVD(last);
+			}
+
+			last = values.values[i].value;
+		}
+
+		/* Extrapolation */
+
+		if (ZBX_VALUE_NVALUES == arg1_type)
+			range = TS2DBL(LAST(values).timestamp) - TS2DBL(FIRST(values).timestamp);
+		else
+			range = seconds;
+
+		range_start = TS2DBL(ts_end) - range;
+		range_end = TS2DBL(ts_end);
+		gap_start = TS2DBL(FIRST(values).timestamp) - range_start;
+		gap_end = range_end - TS2DBL(LAST(values).timestamp);
+		sampled_interval = TS2DBL(LAST(values).timestamp) - TS2DBL(FIRST(values).timestamp);
+		average_duration_between_samples = sampled_interval / (values.values_num - 1);
+
+		if (delta > 0 && HVD(FIRST(values).value) >= 0)
+		{
+			double	zero = sampled_interval * (HVD(FIRST(values).value) / delta);
+
+			if (zero < gap_start)
+				gap_start = zero;
+		}
+
+		threshold = average_duration_between_samples * 1.1;
+		interval = sampled_interval;
+
+		if (gap_start < threshold)
+			interval += gap_start;
+		else
+			interval += average_duration_between_samples / 2;
+
+		if (gap_end < threshold)
+			interval += gap_end;
+		else
+			interval += average_duration_between_samples / 2;
+
+		zbx_variant_set_dbl(value, (delta * (interval / sampled_interval)) / range);
+
+		ret = SUCCEED;
+	}
+	else
+	{
+		*error = zbx_strdup(*error, "not enough data");
+	}
+out:
+	zbx_history_record_vector_destroy(&values, item->value_type);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s rate=" ZBX_FS_DBL " error:%s", __func__, zbx_result_string(ret),
+			(FAIL == ret ? 0 : value->data.dbl), ZBX_NULL2EMPTY_STR(*error));
+
+	return ret;
+
+#	undef HVD
+#	undef TS2DBL
+#	undef LAST
+#	undef FIRST
+}
+
+int	zbx_evaluate_RATE(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+		char **error)
+{
+	return evaluate_RATE(value, item, parameters, ts, error);
+}
+
+static void	history_to_dbl_vector(const zbx_history_record_t *v, int n, unsigned char value_type,
+		zbx_vector_dbl_t *values)
+{
+	int	i;
+
+	zbx_vector_dbl_reserve(values, (size_t)n);
+
+	if (ITEM_VALUE_TYPE_FLOAT == value_type)
+	{
+		for (i = 0; i < n; i++)
+			zbx_vector_dbl_append(values, v[i].value.dbl);
+	}
+	else
+	{
+		for (i = 0; i < n; i++)
+			zbx_vector_dbl_append(values, (double)v[i].value.ui64);
+	}
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_statistical_func                                        *
+ *                                                                            *
+ * Purpose: common operations for aggregate function calculation              *
+ *                                                                            *
+ * Parameters: value      - [OUT] result                                      *
+ *             item       - [IN] item (performance metric)                    *
+ *             parameters - [IN] number of seconds/values and time shift      *
+ *                               (optional)                                   *
+ *             ts         - [IN] time shift                                   *
+ *             stat_func  - [IN] pointer to aggregate function to be called   *
+ *             min_values - [IN] minimum data values required                 *
+ *             error      - [OUT] the error message in the case of failure    *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ *               FAIL - failed to evaluate function                           *
+ *                                                                            *
+ ******************************************************************************/
+static int	evaluate_statistical_func(zbx_variant_t *value, DC_ITEM *item, const char *parameters,
+		const zbx_timespec_t *ts, zbx_statistical_func_t stat_func, int min_values, char **error)
+{
+	int				ret = FAIL;
+	zbx_vector_history_record_t	values;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+	zbx_history_record_vector_create(&values);
+
+	if (SUCCEED != validate_params_and_get_data(item, parameters, ts, &values, error))
+		goto out;
+
+	if (min_values <= values.values_num)
+	{
+		zbx_vector_dbl_t	values_dbl;
+		double			result;
+
+		zbx_vector_dbl_create(&values_dbl);
+
+		history_to_dbl_vector(values.values, values.values_num, item->value_type, &values_dbl);
+
+		if (SUCCEED == (ret = stat_func(&values_dbl, &result, error)))
+			zbx_variant_set_dbl(value, result);
+
+		zbx_vector_dbl_destroy(&values_dbl);
+	}
+	else
+		*error = zbx_strdup(*error, "not enough data");
+out:
+	zbx_history_record_vector_destroy(&values, item->value_type);
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: evaluate_function                                                *
+ *                                                                            *
+ * Purpose: evaluate function                                                 *
+ *                                                                            *
+ * Parameters: item      - item to calculate function for                     *
+ *             function  - function (for example, 'max')                      *
+ *             parameter - parameter of the function                          *
+ *                                                                            *
+ * Return value: SUCCEED - evaluated successfully, value contains its value   *
+ *               FAIL - evaluation failed                                     *
+ *                                                                            *
+ ******************************************************************************/
+int	evaluate_function2(zbx_variant_t *value, DC_ITEM *item, const char *function, const char *parameter,
+		const zbx_timespec_t *ts, char **error)
+{
+	int	ret;
+
+	zabbix_log(LOG_LEVEL_DEBUG, "In %s() function:'%s(/%s/%s,%s)' ts:'%s\'", __func__,
+			function, item->host.host, item->key_orig, parameter, zbx_timespec_str(ts));
+
+	if (0 == strcmp(function, "last"))
+	{
+		ret = evaluate_LAST(value, item, parameter, ts, error);
+	}
+	else if (0 == strcmp(function, "min"))
+	{
+		ret = evaluate_MIN(value, item, parameter, ts, error);
+	}
+	else if (0 == strcmp(function, "max"))
+	{
+		ret = evaluate_MAX(value, item, parameter, ts, error);
+	}
+	else if (0 == strcmp(function, "avg"))
+	{
+		ret = evaluate_AVG(value, item, parameter, ts, error);
+	}
+	else if (0 == strcmp(function, "sum"))
+	{
+		ret = evaluate_SUM(value, item, parameter, ts, error);
+	}
+	else if (0 == strcmp(function, "percentile"))
+	{
+		ret = evaluate_PERCENTILE(value, item, parameter, ts, error);
+	}
+	else if (0 == strcmp(function, "count"))
+	{
+		ret = evaluate_COUNT(value, item, parameter, ts, ZBX_MAX_UINT31_1, COUNT_ALL, error);
+	}
+	else if (0 == strcmp(function, "countunique"))
+	{
+		ret = evaluate_COUNT(value, item, parameter, ts, ZBX_MAX_UINT31_1, COUNT_UNIQUE, error);
+	}
+	else if (0 == strcmp(function, "nodata"))
+	{
+		ret = evaluate_NODATA(value, item, parameter, error);
+	}
+	else if (0 == strcmp(function, "change"))
+	{
+		ret = evaluate_CHANGE(value, item, ts, error);
+	}
+	else if (0 == strcmp(function, "find"))
+	{
+		ret = evaluate_COUNT(value, item, parameter, ts, 1, COUNT_ALL, error);
+	}
+	else if (0 == strcmp(function, "fuzzytime"))
+	{
+		ret = evaluate_FUZZYTIME(value, item, parameter, ts, error);
+	}
+	else if (0 == strcmp(function, "logeventid"))
+	{
+		ret = evaluate_LOGEVENTID(value, item, parameter, ts, error);
+	}
+	else if (0 == strcmp(function, "logseverity"))
+	{
+		ret = evaluate_LOGSEVERITY(value, item, parameter, ts, error);
+	}
+	else if (0 == strcmp(function, "logsource"))
+	{
+		ret = evaluate_LOGSOURCE(value, item, parameter, ts, error);
+	}
+	else if (0 == strcmp(function, "bitand"))
+	{
+		ret = evaluate_BITAND(value, item, parameter, ts, error);
+	}
+	else if (0 == strcmp(function, "forecast"))
+	{
+		ret = evaluate_FORECAST(value, item, parameter, ts, error);
+	}
+	else if (0 == strcmp(function, "timeleft"))
+	{
+		ret = evaluate_TIMELEFT(value, item, parameter, ts, error);
+	}
+	else if (0 == strncmp(function, "trend", 5))
+	{
+		ret = evaluate_TREND(value, item, function + 5, parameter, ts, error);
+	}
+	else if (0 == strcmp(function, "first"))
+	{
+		ret = evaluate_FIRST(value, item, parameter, ts, error);
+	}
+	else if (0 == strcmp(function, "kurtosis"))
+	{
+		ret = evaluate_statistical_func(value, item, parameter, ts, zbx_eval_calc_kurtosis, 1, error);
+	}
+	else if (0 == strcmp(function, "mad"))
+	{
+		ret = evaluate_statistical_func(value, item, parameter, ts, zbx_eval_calc_mad, 1, error);
+	}
+	else if (0 == strcmp(function, "skewness"))
+	{
+		ret = evaluate_statistical_func(value, item, parameter, ts, zbx_eval_calc_skewness, 1, error);
+	}
+	else if (0 == strcmp(function, "stddevpop"))
+	{
+		ret = evaluate_statistical_func(value, item, parameter, ts, zbx_eval_calc_stddevpop, 1, error);
+	}
+	else if (0 == strcmp(function, "stddevsamp"))
+	{
+		ret = evaluate_statistical_func(value, item, parameter, ts, zbx_eval_calc_stddevsamp, 2, error);
+	}
+	else if (0 == strcmp(function, "sumofsquares"))
+	{
+		ret = evaluate_statistical_func(value, item, parameter, ts, zbx_eval_calc_sumofsquares, 1, error);
+	}
+	else if (0 == strcmp(function, "varpop"))
+	{
+		ret = evaluate_statistical_func(value, item, parameter, ts, zbx_eval_calc_varpop, 1, error);
+	}
+	else if (0 == strcmp(function, "varsamp"))
+	{
+		ret = evaluate_statistical_func(value, item, parameter, ts, zbx_eval_calc_varsamp, 2, error);
+	}
+	else if (0 == strcmp(function, "monoinc"))
+	{
+		ret = evaluate_MONO(value, item, parameter, ts, MONOINC, error);
+	}
+	else if (0 == strcmp(function, "monodec"))
+	{
+		ret = evaluate_MONO(value, item, parameter, ts, MONODEC, error);
+	}
+	else if (0 == strcmp(function, "rate"))
+	{
+		ret = evaluate_RATE(value, item, parameter, ts, error);
+	}
+	else
+	{
+		*error = zbx_strdup(*error, "function is not supported");
+		ret = FAIL;
+	}
+
+	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s value:'%s' of type:'%s'", __func__, zbx_result_string(ret),
+			zbx_variant_value_desc(value), zbx_variant_type_desc(value));
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
+ * Function: zbx_is_trigger_function                                          *
+ *                                                                            *
+ * Purpose: check if the specified function is a trigger function             *
+ *                                                                            *
+ * Parameters: name - [IN] the function name to check                         *
+ *             len  - [IN] the length of function name                        *
+ *                                                                            *
+ * Return value: SUCCEED - the function is a trigger function                 *
+ *               FAIL - otherwise                                             *
+ *                                                                            *
+ ******************************************************************************/
+int	zbx_is_trigger_function(const char *name, size_t len)
+{
+	char	*functions[] = {"last", "min", "max", "avg", "sum", "percentile", "count", "countunique", "nodata",
+			"change", "find", "fuzzytime", "logeventid", "logseverity", "logsource", "bitand", "forecast",
+			"timeleft", "trendavg", "trendcount", "trendmax", "trendmin", "trendsum", "abs", "cbrt",
+			"ceil", "exp", "floor", "log", "log10", "power", "round", "rand", "signum", "sqrt", "truncate",
+			"acos", "asin", "atan", "cos", "cosh", "cot", "sin", "sinh", "tan", "degrees", "radians", "mod",
+			"pi", "e", "expm1", "atan2", "first", "kurtosis", "mad", "skewness", "stddevpop", "stddevsamp",
+			"sumofsquares", "varpop", "varsamp", "ascii", "bitlength", "char", "concat", "insert", "lcase",
+			"left", "ltrim", "bytelength", "repeat", "replace", "right", "rtrim", "mid", "trim", "between",
+			"in", "bitor", "bitxor", "bitnot", "bitlshift", "bitrshift", NULL};
+	char	**ptr;
+
+	for (ptr = functions; NULL != *ptr; ptr++)
+	{
+		size_t	compare_len;
+
+		compare_len = strlen(*ptr);
+		if (compare_len == len && 0 == memcmp(*ptr, name, len))
+			return SUCCEED;
+	}
+
+	return FAIL;
+}
+
 #ifdef HAVE_TESTS
 #	include "../../../tests/libs/zbxserver/valuemaps_test.c"
 #endif
diff --git a/src/libs/zbxserver/evalfunc.h b/src/libs/zbxserver/evalfunc.h
index 4bbe243c1d8..2acddd9d9d7 100644
--- a/src/libs/zbxserver/evalfunc.h
+++ b/src/libs/zbxserver/evalfunc.h
@@ -21,5 +21,7 @@
 #define ZABBIX_EVALFUNC_H
 
 int	zbx_evaluatable_for_notsupported(const char *fn);
+int	zbx_evaluate_RATE(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+		char **error);
 
 #endif
diff --git a/src/libs/zbxserver/evalfunc2.c b/src/libs/zbxserver/evalfunc2.c
deleted file mode 100644
index 98e38cd1d73..00000000000
--- a/src/libs/zbxserver/evalfunc2.c
+++ /dev/null
@@ -1,2942 +0,0 @@
-/*
-** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**/
-
-/*
- * NOTE!!!!!
- *
- * This is the new expression syntax support for trigger functions and calculated/aggregated
- * checks. The old syntax is still used in simple macros. When the new expression syntax
- * support is added to simple macros the evalfunc.c:evaluate_function (and related code)
- * must be removed, this code must be copied over the old implementation and unused code removed.
- */
-
-#include "common.h"
-#include "db.h"
-#include "log.h"
-#include "zbxserver.h"
-#include "valuecache.h"
-#include "evalfunc.h"
-#include "zbxregexp.h"
-#include "zbxtrends.h"
-
-typedef enum
-{
-	ZBX_PARAM_OPTIONAL,
-	ZBX_PARAM_MANDATORY
-}
-zbx_param_type_t;
-
-typedef enum
-{
-	ZBX_VALUE_NONE,
-	ZBX_VALUE_SECONDS,
-	ZBX_VALUE_NVALUES
-}
-zbx_value_type_t;
-
-static const char	*zbx_type_string(zbx_value_type_t type)
-{
-	switch (type)
-	{
-		case ZBX_VALUE_NONE:
-			return "none";
-		case ZBX_VALUE_SECONDS:
-			return "sec";
-		case ZBX_VALUE_NVALUES:
-			return "num";
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-			return "unknown";
-	}
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: get_function_parameter_int                                       *
- *                                                                            *
- * Purpose: get the value of sec|#num trigger function parameter              *
- *                                                                            *
- * Parameters: parameters     - [IN] trigger function parameters              *
- *             Nparam         - [IN] specifies which parameter to extract     *
- *             parameter_type - [IN] specifies whether parameter is mandatory *
- *                              or optional                                   *
- *             value          - [OUT] parameter value (preserved as is if the *
- *                              parameter is optional and empty)              *
- *             type           - [OUT] parameter value type (number of seconds *
- *                              or number of values)                          *
- *                                                                            *
- * Return value: SUCCEED - parameter is valid                                 *
- *               FAIL    - otherwise                                          *
- *                                                                            *
- ******************************************************************************/
-static int	get_function_parameter_int(const char *parameters, int Nparam, zbx_param_type_t parameter_type,
-		int *value, zbx_value_type_t *type)
-{
-	char	*parameter;
-	int	ret = FAIL;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
-
-	if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
-		goto out;
-
-	if ('\0' == *parameter)
-	{
-		switch (parameter_type)
-		{
-			case ZBX_PARAM_OPTIONAL:
-				ret = SUCCEED;
-				break;
-			case ZBX_PARAM_MANDATORY:
-				break;
-			default:
-				THIS_SHOULD_NEVER_HAPPEN;
-		}
-	}
-	else if ('#' == *parameter)
-	{
-		*type = ZBX_VALUE_NVALUES;
-		if (SUCCEED == is_uint31(parameter + 1, value) && 0 < *value)
-			ret = SUCCEED;
-	}
-	else if ('-' == *parameter)
-	{
-		if (SUCCEED == is_time_suffix(parameter + 1, value, ZBX_LENGTH_UNLIMITED))
-		{
-			*value = -(*value);
-			*type = ZBX_VALUE_SECONDS;
-			ret = SUCCEED;
-		}
-	}
-	else if (SUCCEED == is_time_suffix(parameter, value, ZBX_LENGTH_UNLIMITED))
-	{
-		*type = ZBX_VALUE_SECONDS;
-		ret = SUCCEED;
-	}
-
-	if (SUCCEED == ret)
-		zabbix_log(LOG_LEVEL_DEBUG, "%s() type:%s value:%d", __func__, zbx_type_string(*type), *value);
-
-	zbx_free(parameter);
-out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-static int	get_function_parameter_uint64(const char *parameters, int Nparam, zbx_uint64_t *value)
-{
-	char	*parameter;
-	int	ret = FAIL;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
-
-	if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
-		goto out;
-
-	if (SUCCEED == (ret = is_uint64(parameter, value)))
-		zabbix_log(LOG_LEVEL_DEBUG, "%s() value:" ZBX_FS_UI64, __func__, *value);
-
-	zbx_free(parameter);
-out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-static int	get_function_parameter_float(const char *parameters, int Nparam, unsigned char flags, double *value)
-{
-	char	*parameter;
-	int	ret = FAIL;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
-
-	if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
-		goto out;
-
-	if (SUCCEED == (ret = is_double_suffix(parameter, flags)))
-	{
-		*value = str2double(parameter);
-		zabbix_log(LOG_LEVEL_DEBUG, "%s() value:" ZBX_FS_DBL, __func__, *value);
-	}
-
-	zbx_free(parameter);
-out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-static int	get_function_parameter_str(const char *parameters, int Nparam, char **value)
-{
-	int	ret = FAIL;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
-
-	if (NULL == (*value = zbx_function_get_param_dyn(parameters, Nparam)))
-		goto out;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() value:'%s'", __func__, *value);
-	ret = SUCCEED;
-out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: get_function_parameter_hist_range                                *
- *                                                                            *
- * Purpose: get the value of sec|num + timeshift trigger function parameter   *
- *                                                                            *
- * Parameters: from           - [IN] the function calculation time            *
- *             parameters     - [IN] trigger function parameters              *
- *             Nparam         - [IN] specifies which parameter to extract     *
- *             value          - [OUT] parameter value (preserved as is if the *
- *                              parameter is optional and empty)              *
- *             type           - [OUT] parameter value type (number of seconds *
- *                              or number of values)                          *
- *             timeshift      - [OUT] the timeshift value (0 if absent)       *
- *                                                                            *
- * Return value: SUCCEED - parameter is valid                                 *
- *               FAIL    - otherwise                                          *
- *                                                                            *
- ******************************************************************************/
-static int	get_function_parameter_hist_range(int from, const char *parameters, int Nparam, int *value,
-		zbx_value_type_t *type, int *timeshift)
-{
-	char	*parameter = NULL, *shift;
-	int	ret = FAIL;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
-
-	if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
-		goto out;
-
-	if (NULL != (shift = strchr(parameter, ':')))
-		*shift++ = '\0';
-
-	if ('\0' == *parameter)
-	{
-		*value = 0;
-		*type = ZBX_VALUE_NONE;
-	}
-	else if ('#' != *parameter)
-	{
-		if (SUCCEED != is_time_suffix(parameter, value, ZBX_LENGTH_UNLIMITED) || 0 > *value)
-			goto out;
-
-		*type = ZBX_VALUE_SECONDS;
-	}
-	else
-	{
-		if (SUCCEED != is_uint31(parameter + 1, value) || 0 >= *value)
-			goto out;
-		*type = ZBX_VALUE_NVALUES;
-	}
-
-	if (NULL != shift)
-	{
-		struct tm	tm;
-		char		*error = NULL;
-		int		end;
-
-		if (SUCCEED != zbx_parse_timeshift(from, shift, &tm, &error))
-		{
-			zabbix_log(LOG_LEVEL_DEBUG, "%s() timeshift error:%s", __func__, error);
-			zbx_free(error);
-			goto out;
-		}
-
-		if (-1 == (end = mktime(&tm)))
-		{
-			zabbix_log(LOG_LEVEL_DEBUG, "%s() invalid timeshift value:%s", __func__, zbx_strerror(errno));
-			goto out;
-		}
-
-		if (end >= from)
-		{
-			zabbix_log(LOG_LEVEL_DEBUG, "%s() timeshift produced time in future", __func__);
-			goto out;
-		}
-
-		*timeshift = from - end;
-	}
-	else
-		*timeshift = 0;
-
-	ret = SUCCEED;
-	zabbix_log(LOG_LEVEL_DEBUG, "%s() type:%s value:%d timeshift:%d", __func__, zbx_type_string(*type), *value,
-			*timeshift);
-out:
-	zbx_free(parameter);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: get_last_n_value                                                 *
- *                                                                            *
- * Purpose: get last Nth value defined by #num:now-timeshift first parameter  *
- *                                                                            *
- * Parameters: item       - [IN] item (performance metric)                    *
- *             parameters - [IN] the parameter string with #sec|num/timeshift *
- *                          in first parameter                                *
- *             ts         - [IN] the starting timestamp                       *
- *             value      - [OUT] the Nth value                               *
- *             error      - [OUT] the error message                           *
- *                                                                            *
- * Return value: SUCCEED - value was found successfully copied                *
- *               FAIL    - otherwise                                          *
- *                                                                            *
- ******************************************************************************/
-static int	get_last_n_value(const DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		zbx_history_record_t *value, char **error)
-{
-	int				arg1 = 1, ret = FAIL, time_shift;
-	zbx_value_type_t		arg1_type = ZBX_VALUE_NVALUES;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts_end = *ts;
-
-	zbx_history_record_vector_create(&values);
-
-	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift))
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	if (ZBX_VALUE_NVALUES != arg1_type)
-		arg1 = 1;	/* time or non parameter is defaulted to "last(0)" */
-
-	ts_end.sec -= time_shift;
-
-	if (SUCCEED != zbx_vc_get_values(item->itemid, item->value_type, &values, 0, arg1, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (arg1 <= values.values_num)
-	{
-		*value = values.values[arg1 - 1];
-		zbx_vector_history_record_remove(&values, arg1 - 1);
-		ret = SUCCEED;
-	}
-	else
-		*error = zbx_strdup(*error, "not enough data");
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_LOGEVENTID                                              *
- *                                                                            *
- * Purpose: evaluate function 'logeventid' for the item                       *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameter - regex string for event id matching                 *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_LOGEVENTID(zbx_variant_t *value, DC_ITEM *item, const char *parameters,
-		const zbx_timespec_t *ts, char **error)
-{
-	char			*pattern = NULL;
-	int			ret = FAIL, nparams;
-	zbx_vector_ptr_t	regexps;
-	zbx_history_record_t	vc_value;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_vector_ptr_create(&regexps);
-
-	if (ITEM_VALUE_TYPE_LOG != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (2 < (nparams = num_param(parameters)))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (2 == nparams)
-	{
-		if (SUCCEED != get_function_parameter_str(parameters, 2, &pattern))
-		{
-			*error = zbx_strdup(*error, "invalid third parameter");
-			goto out;
-		}
-
-		if ('@' == *pattern)
-		{
-			DCget_expressions_by_name(&regexps, pattern + 1);
-
-			if (0 == regexps.values_num)
-			{
-				*error = zbx_dsprintf(*error, "global regular expression \"%s\" does not exist",
-						pattern + 1);
-				goto out;
-			}
-		}
-	}
-	else
-		pattern = zbx_strdup(NULL, "");
-
-	if (SUCCEED == get_last_n_value(item, parameters, ts, &vc_value, error))
-	{
-		char	logeventid[16];
-		int	regexp_ret;
-
-		zbx_snprintf(logeventid, sizeof(logeventid), "%d", vc_value.value.log->logeventid);
-
-		if (FAIL == (regexp_ret = regexp_match_ex(&regexps, logeventid, pattern, ZBX_CASE_SENSITIVE)))
-		{
-			*error = zbx_dsprintf(*error, "invalid regular expression \"%s\"", pattern);
-		}
-		else
-		{
-			if (ZBX_REGEXP_MATCH == regexp_ret)
-				zbx_variant_set_dbl(value, 1);
-			else if (ZBX_REGEXP_NO_MATCH == regexp_ret)
-				zbx_variant_set_dbl(value, 0);
-
-			ret = SUCCEED;
-		}
-
-		zbx_history_record_clear(&vc_value, item->value_type);
-	}
-	else
-		zabbix_log(LOG_LEVEL_DEBUG, "result for LOGEVENTID is empty");
-out:
-	zbx_free(pattern);
-
-	zbx_regexp_clean_expressions(&regexps);
-	zbx_vector_ptr_destroy(&regexps);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_LOGSOURCE                                               *
- *                                                                            *
- * Purpose: evaluate function 'logsource' for the item                        *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameter - ignored                                            *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_LOGSOURCE(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		char **error)
-{
-	char			*pattern = NULL;
-	int			ret = FAIL, nparams;
-	zbx_vector_ptr_t	regexps;
-	zbx_history_record_t	vc_value;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_vector_ptr_create(&regexps);
-
-	if (ITEM_VALUE_TYPE_LOG != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (2 < (nparams = num_param(parameters)))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (2 == nparams)
-	{
-		if (SUCCEED != get_function_parameter_str(parameters, 2, &pattern))
-		{
-			*error = zbx_strdup(*error, "invalid third parameter");
-			goto out;
-		}
-
-		if ('@' == *pattern)
-		{
-			DCget_expressions_by_name(&regexps, pattern + 1);
-
-			if (0 == regexps.values_num)
-			{
-				*error = zbx_dsprintf(*error, "global regular expression \"%s\" does not exist",
-						pattern + 1);
-				goto out;
-			}
-		}
-	}
-	else
-		pattern = zbx_strdup(NULL, "");
-
-	if (SUCCEED == get_last_n_value(item, parameters, ts, &vc_value, error))
-	{
-		switch (regexp_match_ex(&regexps, vc_value.value.log->source, pattern, ZBX_CASE_SENSITIVE))
-		{
-			case ZBX_REGEXP_MATCH:
-				zbx_variant_set_dbl(value, 1);
-				ret = SUCCEED;
-				break;
-			case ZBX_REGEXP_NO_MATCH:
-				zbx_variant_set_dbl(value, 0);
-				ret = SUCCEED;
-				break;
-			case FAIL:
-				*error = zbx_dsprintf(*error, "invalid regular expression");
-		}
-
-		zbx_history_record_clear(&vc_value, item->value_type);
-	}
-	else
-		zabbix_log(LOG_LEVEL_DEBUG, "result for LOGSOURCE is empty");
-out:
-	zbx_free(pattern);
-
-	zbx_regexp_clean_expressions(&regexps);
-	zbx_vector_ptr_destroy(&regexps);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_LOGSEVERITY                                             *
- *                                                                            *
- * Purpose: evaluate function 'logseverity' for the item                      *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_LOGSEVERITY(zbx_variant_t *value, DC_ITEM *item, const char *parameters,
-		const zbx_timespec_t *ts, char **error)
-{
-	int			ret = FAIL;
-	zbx_history_record_t	vc_value;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	if (ITEM_VALUE_TYPE_LOG != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (1 < num_param(parameters))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED == get_last_n_value(item, parameters, ts, &vc_value, error))
-	{
-		zbx_variant_set_dbl(value, vc_value.value.log->severity);
-		zbx_history_record_clear(&vc_value, item->value_type);
-
-		ret = SUCCEED;
-	}
-	else
-		zabbix_log(LOG_LEVEL_DEBUG, "result for LOGSEVERITY is empty");
-out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-static int	history_record_float_compare(const zbx_history_record_t *d1, const zbx_history_record_t *d2)
-{
-	ZBX_RETURN_IF_NOT_EQUAL(d1->value.dbl, d2->value.dbl);
-
-	return 0;
-}
-
-static int	history_record_uint64_compare(const zbx_history_record_t *d1, const zbx_history_record_t *d2)
-{
-	ZBX_RETURN_IF_NOT_EQUAL(d1->value.ui64, d2->value.ui64);
-
-	return 0;
-}
-
-static int	history_record_str_compare(const zbx_history_record_t *d1, const zbx_history_record_t *d2)
-{
-	return strcmp(d1->value.str, d2->value.str);
-}
-
-static int	history_record_log_compare(const zbx_history_record_t *d1, const zbx_history_record_t *d2)
-{
-	int	value_match;
-
-	if (0 != (value_match = strcmp(d1->value.log->value, d2->value.log->value)))
-		return value_match;
-
-	if (NULL != d1->value.log->source && NULL != d2->value.log->source)
-		return strcmp(d1->value.log->source, d2->value.log->source);
-
-	if (NULL != d2->value.log->source)
-		return -1;
-
-	if (NULL != d1->value.log->source)
-		return 1;
-
-	return 0;
-}
-
-/* specialized versions of zbx_vector_history_record_*_uniq() because */
-/* standard versions do not release memory occupied by duplicate elements */
-
-static void	zbx_vector_history_record_str_uniq(zbx_vector_history_record_t *vector, zbx_compare_func_t compare_func)
-{
-	if (2 <= vector->values_num)
-	{
-		int	i = 0, j = 1;
-
-		while (j < vector->values_num)
-		{
-			if (0 != compare_func(&vector->values[i], &vector->values[j]))
-			{
-				i++;
-				j++;
-			}
-			else
-			{
-				zbx_free(vector->values[j].value.str);
-				zbx_vector_history_record_remove(vector, j);
-			}
-		}
-	}
-}
-
-static void	zbx_vector_history_record_log_uniq(zbx_vector_history_record_t *vector, zbx_compare_func_t compare_func)
-{
-	if (2 <= vector->values_num)
-	{
-		int	i = 0, j = 1;
-
-		while (j < vector->values_num)
-		{
-			if (0 != compare_func(&vector->values[i], &vector->values[j]))
-			{
-				i++;
-				j++;
-			}
-			else
-			{
-				zbx_free(vector->values[j].value.log->source);
-				zbx_free(vector->values[j].value.log->value);
-				zbx_free(vector->values[j].value.log);
-				zbx_vector_history_record_remove(vector, j);
-			}
-		}
-	}
-}
-
-#define OP_UNKNOWN	-1
-#define OP_EQ		0
-#define OP_NE		1
-#define OP_GT		2
-#define OP_GE		3
-#define OP_LT		4
-#define OP_LE		5
-#define OP_LIKE		6
-#define OP_REGEXP	7
-#define OP_IREGEXP	8
-#define OP_BITAND		9
-
-static void	count_one_ui64(int *count, int op, zbx_uint64_t value, zbx_uint64_t pattern, zbx_uint64_t mask)
-{
-	switch (op)
-	{
-		case OP_EQ:
-			if (value == pattern)
-				(*count)++;
-			break;
-		case OP_NE:
-			if (value != pattern)
-				(*count)++;
-			break;
-		case OP_GT:
-			if (value > pattern)
-				(*count)++;
-			break;
-		case OP_GE:
-			if (value >= pattern)
-				(*count)++;
-			break;
-		case OP_LT:
-			if (value < pattern)
-				(*count)++;
-			break;
-		case OP_LE:
-			if (value <= pattern)
-				(*count)++;
-			break;
-		case OP_BITAND:
-			if ((value & mask) == pattern)
-				(*count)++;
-	}
-}
-
-static void	count_one_dbl(int *count, int op, double value, double pattern)
-{
-	switch (op)
-	{
-		case OP_EQ:
-			if (value > pattern - ZBX_DOUBLE_EPSILON && value < pattern + ZBX_DOUBLE_EPSILON)
-				(*count)++;
-			break;
-		case OP_NE:
-			if (!(value > pattern - ZBX_DOUBLE_EPSILON && value < pattern + ZBX_DOUBLE_EPSILON))
-				(*count)++;
-			break;
-		case OP_GT:
-			if (value >= pattern + ZBX_DOUBLE_EPSILON)
-				(*count)++;
-			break;
-		case OP_GE:
-			if (value > pattern - ZBX_DOUBLE_EPSILON)
-				(*count)++;
-			break;
-		case OP_LT:
-			if (value <= pattern - ZBX_DOUBLE_EPSILON)
-				(*count)++;
-			break;
-		case OP_LE:
-			if (value < pattern + ZBX_DOUBLE_EPSILON)
-				(*count)++;
-	}
-}
-
-static void	count_one_str(int *count, int op, const char *value, const char *pattern, zbx_vector_ptr_t *regexps)
-{
-	int	res;
-
-	switch (op)
-	{
-		case OP_EQ:
-			if (0 == strcmp(value, pattern))
-				(*count)++;
-			break;
-		case OP_NE:
-			if (0 != strcmp(value, pattern))
-				(*count)++;
-			break;
-		case OP_LIKE:
-			if (NULL != strstr(value, pattern))
-				(*count)++;
-			break;
-		case OP_REGEXP:
-			if (ZBX_REGEXP_MATCH == (res = regexp_match_ex(regexps, value, pattern, ZBX_CASE_SENSITIVE)))
-				(*count)++;
-			else if (FAIL == res)
-				*count = FAIL;
-			break;
-		case OP_IREGEXP:
-			if (ZBX_REGEXP_MATCH == (res = regexp_match_ex(regexps, value, pattern, ZBX_IGNORE_CASE)))
-				(*count)++;
-			else if (FAIL == res)
-				*count = FAIL;
-	}
-}
-
-/* flags for evaluate_COUNT() */
-#define COUNT_ALL	0
-#define COUNT_UNIQUE	1
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_COUNT                                                   *
- *                                                                            *
- * Purpose: evaluate functions 'count' and 'find' for the item                *
- *                                                                            *
- * Parameters: item       - [IN] item (performance metric)                    *
- *             parameters - [IN] up to three comma-separated fields:          *
- *                            (1) number of seconds/values + timeshift        *
- *                            (2) comparison operator (optional)              *
- *                            (3) value to compare with (optional)            *
- *                                Becomes mandatory for numeric items if 3rd  *
- *                                parameter is specified and is not "regexp"  *
- *                                or "iregexp". With "bitand" can take one of *
- *                                2 forms:                                    *
- *                                  - value_to_compare_with/mask              *
- *                                  - mask                                    *
- *             ts         - [IN] the function evaluation time                 *
- *             limit      - [IN] the limit of counted values, will return     *
- *                              when the limit is reached                     *
- *             unique     - [IN] COUNT_ALL - count all values,                *
- *                               COUNT_UNIQUE - count unique values           *
- *             error      - [OUT] the error message                           *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_COUNT(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		int limit, int unique, char **error)
-{
-	int				arg1, op = OP_UNKNOWN, numeric_search, nparams, count = 0, i, ret = FAIL;
-	int				seconds = 0, nvalues = 0, time_shift;
-	char				*operator = NULL, *pattern2 = NULL, *pattern = NULL, buf[ZBX_MAX_UINT64_LEN];
-	double				arg3_dbl;
-	zbx_uint64_t			pattern_ui64, pattern2_ui64;
-	zbx_value_type_t		arg1_type;
-	zbx_vector_ptr_t		regexps;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_vector_ptr_create(&regexps);
-	zbx_history_record_vector_create(&values);
-
-	numeric_search = (ITEM_VALUE_TYPE_UINT64 == item->value_type || ITEM_VALUE_TYPE_FLOAT == item->value_type);
-
-	if (3 < (nparams = num_param(parameters)))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift))
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	if (2 <= nparams && SUCCEED != get_function_parameter_str(parameters, 2, &operator))
-	{
-		*error = zbx_strdup(*error, "invalid third parameter");
-		goto out;
-	}
-
-	if (3 <= nparams)
-	{
-		if (SUCCEED != get_function_parameter_str(parameters, 3, &pattern))
-		{
-			*error = zbx_strdup(*error, "invalid fourth parameter");
-			goto out;
-		}
-	}
-	else
-		pattern = zbx_strdup(NULL, "");
-
-	ts_end.sec -= time_shift;
-
-	if (NULL == operator || '\0' == *operator)
-		op = (0 != numeric_search ? OP_EQ : OP_LIKE);
-	else if (0 == strcmp(operator, "eq"))
-		op = OP_EQ;
-	else if (0 == strcmp(operator, "ne"))
-		op = OP_NE;
-	else if (0 == strcmp(operator, "gt"))
-		op = OP_GT;
-	else if (0 == strcmp(operator, "ge"))
-		op = OP_GE;
-	else if (0 == strcmp(operator, "lt"))
-		op = OP_LT;
-	else if (0 == strcmp(operator, "le"))
-		op = OP_LE;
-	else if (0 == strcmp(operator, "like"))
-		op = OP_LIKE;
-	else if (0 == strcmp(operator, "regexp"))
-		op = OP_REGEXP;
-	else if (0 == strcmp(operator, "iregexp"))
-		op = OP_IREGEXP;
-	else if (0 == strcmp(operator, "bitand"))
-		op = OP_BITAND;
-
-	if (OP_UNKNOWN == op)
-	{
-		*error = zbx_dsprintf(*error, "operator \"%s\" is not supported for function COUNT", operator);
-		goto out;
-	}
-
-	numeric_search = (0 != numeric_search && OP_REGEXP != op && OP_IREGEXP != op);
-
-	if (0 != numeric_search)
-	{
-		if (NULL != operator && '\0' != *operator && '\0' == *pattern)
-		{
-			*error = zbx_strdup(*error, "pattern must be provided along with operator for numeric values");
-			goto out;
-		}
-
-		if (OP_LIKE == op)
-		{
-			*error = zbx_dsprintf(*error, "operator \"%s\" is not supported for counting numeric values",
-					operator);
-			goto out;
-		}
-
-		if (OP_BITAND == op && ITEM_VALUE_TYPE_FLOAT == item->value_type)
-		{
-			*error = zbx_dsprintf(*error, "operator \"%s\" is not supported for counting float values",
-					operator);
-			goto out;
-		}
-
-		if (OP_BITAND == op && NULL != (pattern2 = strchr(pattern, '/')))
-		{
-			*pattern2 = '\0';	/* end of the 1st part of the 2nd parameter (number to compare with) */
-			pattern2++;	/* start of the 2nd part of the 2nd parameter (mask) */
-		}
-
-		if (NULL != pattern && '\0' != *pattern)
-		{
-			if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
-			{
-				if (OP_BITAND != op)
-				{
-					if (SUCCEED != str2uint64(pattern, ZBX_UNIT_SYMBOLS, &pattern_ui64))
-					{
-						*error = zbx_dsprintf(*error, "\"%s\" is not a valid numeric unsigned"
-								" value", pattern);
-						goto out;
-					}
-					pattern2_ui64 = 0;
-				}
-				else
-				{
-					if (SUCCEED != is_uint64(pattern, &pattern_ui64))
-					{
-						*error = zbx_dsprintf(*error, "\"%s\" is not a valid numeric unsigned"
-								" value", pattern);
-						goto out;
-					}
-
-					if (NULL != pattern2)
-					{
-						if (SUCCEED != is_uint64(pattern2, &pattern2_ui64))
-						{
-							*error = zbx_dsprintf(*error, "\"%s\" is not a valid numeric"
-									" unsigned value", pattern2);
-							goto out;
-						}
-					}
-					else
-						pattern2_ui64 = pattern_ui64;
-				}
-			}
-			else
-			{
-				if (SUCCEED != is_double_suffix(pattern, ZBX_FLAG_DOUBLE_SUFFIX))
-				{
-					*error = zbx_dsprintf(*error, "\"%s\" is not a valid numeric float value",
-							pattern);
-					goto out;
-				}
-
-				arg3_dbl = str2double(pattern);
-			}
-		}
-	}
-	else if (OP_LIKE != op && OP_REGEXP != op && OP_IREGEXP != op && OP_EQ != op && OP_NE != op)
-	{
-		*error = zbx_dsprintf(*error, "operator \"%s\" is not supported for counting textual values", operator);
-		goto out;
-	}
-
-	if ((OP_REGEXP == op || OP_IREGEXP == op) && NULL != pattern && '@' == *pattern)
-	{
-		DCget_expressions_by_name(&regexps, pattern + 1);
-
-		if (0 == regexps.values_num)
-		{
-			*error = zbx_dsprintf(*error, "global regular expression \"%s\" does not exist", pattern + 1);
-			goto out;
-		}
-	}
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		case ZBX_VALUE_NONE:
-			nvalues = 1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (COUNT_UNIQUE == unique)
-	{
-		switch (item->value_type)
-		{
-			case ITEM_VALUE_TYPE_UINT64:
-				zbx_vector_history_record_sort(&values,
-						(zbx_compare_func_t)history_record_uint64_compare);
-				zbx_vector_history_record_uniq(&values,
-						(zbx_compare_func_t)history_record_uint64_compare);
-				break;
-			case ITEM_VALUE_TYPE_FLOAT:
-				zbx_vector_history_record_sort(&values,
-						(zbx_compare_func_t)history_record_float_compare);
-				zbx_vector_history_record_uniq(&values,
-						(zbx_compare_func_t)history_record_float_compare);
-				break;
-			case ITEM_VALUE_TYPE_LOG:
-				zbx_vector_history_record_sort(&values,
-						(zbx_compare_func_t)history_record_log_compare);
-				zbx_vector_history_record_log_uniq(&values,
-						(zbx_compare_func_t)history_record_log_compare);
-				break;
-			default:
-				zbx_vector_history_record_sort(&values,
-						(zbx_compare_func_t)history_record_str_compare);
-				zbx_vector_history_record_str_uniq(&values,
-						(zbx_compare_func_t)history_record_str_compare);
-		}
-	}
-
-	/* skip counting values one by one if both pattern and operator are empty or "" is searched in text values */
-	if ((NULL != pattern && '\0' != *pattern) || (NULL != operator && '\0' != *operator &&
-			OP_LIKE != op && OP_REGEXP != op && OP_IREGEXP != op))
-	{
-		switch (item->value_type)
-		{
-			case ITEM_VALUE_TYPE_UINT64:
-				if (0 != numeric_search)
-				{
-					for (i = 0; i < values.values_num && count < limit; i++)
-					{
-						count_one_ui64(&count, op, values.values[i].value.ui64, pattern_ui64,
-								pattern2_ui64);
-					}
-				}
-				else
-				{
-					for (i = 0; i < values.values_num && FAIL != count && count < limit; i++)
-					{
-						zbx_snprintf(buf, sizeof(buf), ZBX_FS_UI64,
-								values.values[i].value.ui64);
-						count_one_str(&count, op, buf, pattern, &regexps);
-					}
-				}
-				break;
-			case ITEM_VALUE_TYPE_FLOAT:
-				if (0 != numeric_search)
-				{
-					for (i = 0; i < values.values_num && count < limit; i++)
-						count_one_dbl(&count, op, values.values[i].value.dbl, arg3_dbl);
-				}
-				else
-				{
-					for (i = 0; i < values.values_num && FAIL != count && count < limit; i++)
-					{
-						zbx_snprintf(buf, sizeof(buf), ZBX_FS_DBL_EXT(4),
-								values.values[i].value.dbl);
-						count_one_str(&count, op, buf, pattern, &regexps);
-					}
-				}
-				break;
-			case ITEM_VALUE_TYPE_LOG:
-				for (i = 0; i < values.values_num && FAIL != count && count < limit; i++)
-					count_one_str(&count, op, values.values[i].value.log->value, pattern, &regexps);
-				break;
-			default:
-				for (i = 0; i < values.values_num && FAIL != count && count < limit; i++)
-					count_one_str(&count, op, values.values[i].value.str, pattern, &regexps);
-		}
-
-		if (FAIL == count)
-		{
-			*error = zbx_strdup(*error, "invalid regular expression");
-			goto out;
-		}
-	}
-	else
-	{
-		if ((count = values.values_num) > limit)
-			count = limit;
-	}
-
-	zbx_variant_set_dbl(value, count);
-
-	ret = SUCCEED;
-out:
-	zbx_free(operator);
-	zbx_free(pattern);
-
-	zbx_regexp_clean_expressions(&regexps);
-	zbx_vector_ptr_destroy(&regexps);
-
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-#undef OP_UNKNOWN
-#undef OP_EQ
-#undef OP_NE
-#undef OP_GT
-#undef OP_GE
-#undef OP_LT
-#undef OP_LE
-#undef OP_LIKE
-#undef OP_REGEXP
-#undef OP_IREGEXP
-#undef OP_BITAND
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_SUM                                                     *
- *                                                                            *
- * Purpose: evaluate function 'sum' for the item                              *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameters - number of seconds/values and time shift (optional)*
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_SUM(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts, char **error)
-{
-	int				arg1, i, ret = FAIL, seconds = 0, nvalues = 0, time_shift;
-	zbx_value_type_t		arg1_type;
-	zbx_vector_history_record_t	values;
-	history_value_t			result;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (1 != num_param(parameters))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
-			ZBX_VALUE_NONE == arg1_type)
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	ts_end.sec -= time_shift;
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
-	{
-		result.dbl = 0;
-
-		for (i = 0; i < values.values_num; i++)
-			result.dbl += values.values[i].value.dbl;
-	}
-	else
-	{
-		result.ui64 = 0;
-
-		for (i = 0; i < values.values_num; i++)
-			result.ui64 += values.values[i].value.ui64;
-	}
-
-	zbx_history_value2variant(&result, item->value_type, value);
-	ret = SUCCEED;
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_AVG                                                     *
- *                                                                            *
- * Purpose: evaluate function 'avg' for the item                              *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameters - number of seconds/values and time shift (optional)*
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_AVG(zbx_variant_t  *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts, char **error)
-{
-	int				arg1, ret = FAIL, i, seconds = 0, nvalues = 0, time_shift;
-	zbx_value_type_t		arg1_type;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (1 != num_param(parameters))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
-			ZBX_VALUE_NONE == arg1_type)
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	ts_end.sec -= time_shift;
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (0 < values.values_num)
-	{
-		double	avg = 0;
-
-		if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
-		{
-			for (i = 0; i < values.values_num; i++)
-				avg += values.values[i].value.dbl / (i + 1) - avg / (i + 1);
-		}
-		else
-		{
-			for (i = 0; i < values.values_num; i++)
-				avg += (double)values.values[i].value.ui64;
-
-			avg = avg / values.values_num;
-		}
-		zbx_variant_set_dbl(value, avg);
-
-		ret = SUCCEED;
-	}
-	else
-	{
-		zabbix_log(LOG_LEVEL_DEBUG, "result for AVG is empty");
-		*error = zbx_strdup(*error, "not enough data");
-	}
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_LAST                                                    *
- *                                                                            *
- * Purpose: evaluate function 'last' for the item                             *
- *                                                                            *
- * Parameters: value - dynamic buffer                                         *
- *             item - item (performance metric)                               *
- *             parameters - Nth last value and time shift (optional)          *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_LAST(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		char **error)
-{
-	int			ret;
-	zbx_history_record_t	vc_value;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	if (SUCCEED == (ret = get_last_n_value(item, parameters, ts, &vc_value, error)))
-	{
-		zbx_history_value2variant(&vc_value.value, item->value_type, value);
-		zbx_history_record_clear(&vc_value, item->value_type);
-	}
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_MIN                                                     *
- *                                                                            *
- * Purpose: evaluate function 'min' for the item                              *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameters - number of seconds/values and time shift (optional)*
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_MIN(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts, char **error)
-{
-	int				arg1, i, ret = FAIL, seconds = 0, nvalues = 0, time_shift;
-	zbx_value_type_t		arg1_type;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (1 != num_param(parameters))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
-			ZBX_VALUE_NONE == arg1_type)
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	ts_end.sec -= time_shift;
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (0 < values.values_num)
-	{
-		int	index = 0;
-
-		if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
-		{
-			for (i = 1; i < values.values_num; i++)
-			{
-				if (values.values[i].value.ui64 < values.values[index].value.ui64)
-					index = i;
-			}
-		}
-		else
-		{
-			for (i = 1; i < values.values_num; i++)
-			{
-				if (values.values[i].value.dbl < values.values[index].value.dbl)
-					index = i;
-			}
-		}
-
-		zbx_history_value2variant(&values.values[index].value, item->value_type, value);
-		ret = SUCCEED;
-	}
-	else
-	{
-		zabbix_log(LOG_LEVEL_DEBUG, "result for MIN is empty");
-		*error = zbx_strdup(*error, "not enough data");
-	}
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_MAX                                                     *
- *                                                                            *
- * Purpose: evaluate function 'max' for the item                              *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameters - number of seconds/values and time shift (optional)*
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_MAX(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts, char **error)
-{
-	int				arg1, ret = FAIL, i, seconds = 0, nvalues = 0, time_shift;
-	zbx_value_type_t		arg1_type;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (1 != num_param(parameters))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
-			ZBX_VALUE_NONE == arg1_type)
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	ts_end.sec -= time_shift;
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (0 < values.values_num)
-	{
-		int	index = 0;
-
-		if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
-		{
-			for (i = 1; i < values.values_num; i++)
-			{
-				if (values.values[i].value.ui64 > values.values[index].value.ui64)
-					index = i;
-			}
-		}
-		else
-		{
-			for (i = 1; i < values.values_num; i++)
-			{
-				if (values.values[i].value.dbl > values.values[index].value.dbl)
-					index = i;
-			}
-		}
-
-		zbx_history_value2variant(&values.values[index].value, item->value_type, value);
-
-		ret = SUCCEED;
-	}
-	else
-	{
-		zabbix_log(LOG_LEVEL_DEBUG, "result for MAX is empty");
-		*error = zbx_strdup(*error, "not enough data");
-	}
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_PERCENTILE                                              *
- *                                                                            *
- * Purpose: evaluate function 'percentile' for the item                       *
- *                                                                            *
- * Parameters: item       - [IN] item (performance metric)                    *
- *             parameters - [IN] seconds/values, time shift (optional),       *
- *                               percentage                                   *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in        *
- *                         'value'                                            *
- *               FAIL    - failed to evaluate function                        *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_PERCENTILE(zbx_variant_t  *value, DC_ITEM *item, const char *parameters,
-		const zbx_timespec_t *ts, char **error)
-{
-	int				arg1, time_shift, ret = FAIL, seconds = 0, nvalues = 0;
-	zbx_value_type_t		arg1_type;
-	double				percentage;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (2 != num_param(parameters))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
-			ZBX_VALUE_NONE == arg1_type)
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	ts_end.sec -= time_shift;
-
-	if (SUCCEED != get_function_parameter_float(parameters, 2, ZBX_FLAG_DOUBLE_PLAIN, &percentage) ||
-			0.0 > percentage || 100.0 < percentage)
-	{
-		*error = zbx_strdup(*error, "invalid third parameter");
-		goto out;
-	}
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (0 < values.values_num)
-	{
-		int	index;
-
-		if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
-			zbx_vector_history_record_sort(&values, (zbx_compare_func_t)history_record_float_compare);
-		else
-			zbx_vector_history_record_sort(&values, (zbx_compare_func_t)history_record_uint64_compare);
-
-		if (0 == percentage)
-			index = 1;
-		else
-			index = (int)ceil(values.values_num * (percentage / 100));
-
-		zbx_history_value2variant(&values.values[index - 1].value, item->value_type, value);
-
-		ret = SUCCEED;
-	}
-	else
-	{
-		zabbix_log(LOG_LEVEL_DEBUG, "result for PERCENTILE is empty");
-		*error = zbx_strdup(*error, "not enough data");
-	}
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_NODATA                                                  *
- *                                                                            *
- * Purpose: evaluate function 'nodata' for the item                           *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameter - number of seconds                                  *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_NODATA(zbx_variant_t *value, DC_ITEM *item, const char *parameters, char **error)
-{
-	int				arg1, num, period, lazy = 1, ret = FAIL;
-	zbx_value_type_t		arg1_type;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts;
-	char				*arg2 = NULL;
-	zbx_proxy_suppress_t		nodata_win;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (2 < (num = num_param(parameters)))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) ||
-			ZBX_VALUE_SECONDS != arg1_type || 0 >= arg1)
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	if (1 < num && (SUCCEED != get_function_parameter_str(parameters, 2, &arg2) ||
-			('\0' != *arg2 && 0 != (lazy = strcmp("strict", arg2)))))
-	{
-		*error = zbx_strdup(*error, "invalid third parameter");
-		goto out;
-	}
-
-	zbx_timespec(&ts);
-	nodata_win.flags = ZBX_PROXY_SUPPRESS_DISABLE;
-
-	if (0 != item->host.proxy_hostid && 0 != lazy)
-	{
-		int			lastaccess;
-
-		if (SUCCEED != DCget_proxy_nodata_win(item->host.proxy_hostid, &nodata_win, &lastaccess))
-		{
-			*error = zbx_strdup(*error, "cannot retrieve proxy last access");
-			goto out;
-		}
-
-		period = arg1 + (ts.sec - lastaccess);
-	}
-	else
-		period = arg1;
-
-	if (SUCCEED == zbx_vc_get_values(item->itemid, item->value_type, &values, period, 1, &ts) &&
-			1 == values.values_num)
-	{
-		zbx_variant_set_dbl(value, 0);
-	}
-	else
-	{
-		int	seconds;
-
-		if (SUCCEED != DCget_data_expected_from(item->itemid, &seconds))
-		{
-			*error = zbx_strdup(*error, "item does not exist, is disabled or belongs to a disabled host");
-			goto out;
-		}
-
-		if (seconds + arg1 > ts.sec)
-		{
-			*error = zbx_strdup(*error,
-					"item does not have enough data after server start or item creation");
-			goto out;
-		}
-
-		if (0 != (nodata_win.flags & ZBX_PROXY_SUPPRESS_ACTIVE))
-		{
-			*error = zbx_strdup(*error, "historical data transfer from proxy is still in progress");
-			goto out;
-		}
-
-		zbx_variant_set_dbl(value, 1);
-
-		if (0 != item->host.proxy_hostid && 0 != lazy)
-		{
-			zabbix_log(LOG_LEVEL_TRACE, "Nodata in %s() flag:%d values_num:%d start_time:%d period:%d",
-					__func__, nodata_win.flags, nodata_win.values_num, ts.sec - period, period);
-		}
-	}
-
-	ret = SUCCEED;
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-	zbx_free(arg2);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_CHANGE                                                  *
- *                                                                            *
- * Purpose: evaluate function 'change' for the item                           *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameter - number of seconds                                  *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_CHANGE(zbx_variant_t *value, DC_ITEM *item, const zbx_timespec_t *ts, char **error)
-{
-	int				ret = FAIL;
-	zbx_vector_history_record_t	values;
-	double				result;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (SUCCEED != zbx_vc_get_values(item->itemid, item->value_type, &values, 0, 2, ts) ||
-			2 > values.values_num)
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	switch (item->value_type)
-	{
-		case ITEM_VALUE_TYPE_FLOAT:
-			result = values.values[0].value.dbl - values.values[1].value.dbl;
-			break;
-		case ITEM_VALUE_TYPE_UINT64:
-			/* to avoid overflow */
-			if (values.values[0].value.ui64 >= values.values[1].value.ui64)
-				result = values.values[0].value.ui64 - values.values[1].value.ui64;
-			else
-				result = -(double)(values.values[1].value.ui64 - values.values[0].value.ui64);
-			break;
-		case ITEM_VALUE_TYPE_LOG:
-			if (0 == strcmp(values.values[0].value.log->value, values.values[1].value.log->value))
-				result = 0;
-			else
-				result = 1;
-			break;
-
-		case ITEM_VALUE_TYPE_STR:
-		case ITEM_VALUE_TYPE_TEXT:
-			if (0 == strcmp(values.values[0].value.str, values.values[1].value.str))
-				result = 0;
-			else
-				result = 1;
-			break;
-		default:
-			*error = zbx_strdup(*error, "invalid value type");
-			goto out;
-	}
-
-	zbx_variant_set_dbl(value, result);
-	ret = SUCCEED;
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_FUZZYTIME                                               *
- *                                                                            *
- * Purpose: evaluate function 'fuzzytime' for the item                        *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameter - number of seconds                                  *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_FUZZYTIME(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		char **error)
-{
-	int			arg1, ret = FAIL;
-	zbx_value_type_t	arg1_type;
-	zbx_history_record_t	vc_value;
-	zbx_uint64_t		fuzlow, fuzhig;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (1 < num_param(parameters))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) || 0 >= arg1)
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	if (ZBX_VALUE_SECONDS != arg1_type || ts->sec <= arg1)
-	{
-		*error = zbx_strdup(*error, "invalid argument type or value");
-		goto out;
-	}
-
-	if (SUCCEED != zbx_vc_get_value(item->itemid, item->value_type, ts, &vc_value))
-	{
-		*error = zbx_strdup(*error, "cannot get value from value cache");
-		goto out;
-	}
-
-	fuzlow = (int)(ts->sec - arg1);
-	fuzhig = (int)(ts->sec + arg1);
-
-	if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
-	{
-		if (vc_value.value.ui64 >= fuzlow && vc_value.value.ui64 <= fuzhig)
-			zbx_variant_set_dbl(value, 1);
-		else
-			zbx_variant_set_dbl(value, 0);
-	}
-	else
-	{
-		if (vc_value.value.dbl >= fuzlow && vc_value.value.dbl <= fuzhig)
-			zbx_variant_set_dbl(value, 1);
-		else
-			zbx_variant_set_dbl(value, 0);
-	}
-
-	zbx_history_record_clear(&vc_value, item->value_type);
-
-	ret = SUCCEED;
-out:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_BITAND                                                  *
- *                                                                            *
- * Purpose: evaluate logical bitwise function 'and' for the item              *
- *                                                                            *
- * Parameters: value - dynamic buffer                                         *
- *             item - item (performance metric)                               *
- *             parameters - to 2 comma-separated fields:                      *
- *                            (1) same as the 1st parameter for function      *
- *                                evaluate_LAST() (see documentation of       *
- *                                trigger function last()),                   *
- *                            (2) mask to bitwise AND with (mandatory),       *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_BITAND(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		char **error)
-{
-	char		*last_parameters = NULL;
-	int		ret = FAIL;
-	zbx_uint64_t	mask;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	if (ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto clean;
-	}
-
-	if (2 < num_param(parameters))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto clean;
-	}
-
-	if (SUCCEED != get_function_parameter_uint64(parameters, 2, &mask))
-	{
-		*error = zbx_strdup(*error, "invalid third parameter");
-		goto clean;
-	}
-
-	/* prepare the 1st and the 3rd parameter for passing to evaluate_LAST() */
-	last_parameters = zbx_function_get_param_dyn(parameters, 1);
-
-	if (SUCCEED == evaluate_LAST(value, item, last_parameters, ts, error))
-	{
-		/* the evaluate_LAST() should return uint64 value, but just to be sure try to convert it */
-		if (SUCCEED != zbx_variant_convert(value, ZBX_VARIANT_UI64))
-		{
-			*error = zbx_strdup(*error, "invalid value type");
-			goto clean;
-		}
-		zbx_variant_set_dbl(value, value->data.ui64 & (zbx_uint64_t)mask);
-		ret = SUCCEED;
-	}
-
-	zbx_free(last_parameters);
-clean:
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_FORECAST                                                *
- *                                                                            *
- * Purpose: evaluate function 'forecast' for the item                         *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameters - number of seconds/values and time shift (optional)*
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_FORECAST(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		char **error)
-{
-	char				*fit_str = NULL, *mode_str = NULL;
-	double				*t = NULL, *x = NULL;
-	int				nparams, time, arg1, i, ret = FAIL, seconds = 0, nvalues = 0, time_shift;
-	zbx_value_type_t		time_type, arg1_type;
-	unsigned int			k = 0;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			zero_time;
-	zbx_fit_t			fit;
-	zbx_mode_t			mode;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (2 > (nparams = num_param(parameters)) || nparams > 4)
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
-			ZBX_VALUE_NONE == arg1_type)
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_int(parameters, 2, ZBX_PARAM_MANDATORY, &time, &time_type) ||
-			ZBX_VALUE_SECONDS != time_type)
-	{
-		*error = zbx_strdup(*error, "invalid third parameter");
-		goto out;
-	}
-
-	if (3 <= nparams)
-	{
-		if (SUCCEED != get_function_parameter_str(parameters, 3, &fit_str) ||
-				SUCCEED != zbx_fit_code(fit_str, &fit, &k, error))
-		{
-			*error = zbx_strdup(*error, "invalid fourth parameter");
-			goto out;
-		}
-	}
-	else
-	{
-		fit = FIT_LINEAR;
-	}
-
-	if (4 == nparams)
-	{
-		if (SUCCEED != get_function_parameter_str(parameters, 4, &mode_str) ||
-				SUCCEED != zbx_mode_code(mode_str, &mode, error))
-		{
-			*error = zbx_strdup(*error, "invalid fifth parameter");
-			goto out;
-		}
-	}
-	else
-	{
-		mode = MODE_VALUE;
-	}
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	ts_end.sec -= time_shift;
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (0 < values.values_num)
-	{
-		t = (double *)zbx_malloc(t, values.values_num * sizeof(double));
-		x = (double *)zbx_malloc(x, values.values_num * sizeof(double));
-
-		zero_time.sec = values.values[values.values_num - 1].timestamp.sec;
-		zero_time.ns = values.values[values.values_num - 1].timestamp.ns;
-
-		if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
-		{
-			for (i = 0; i < values.values_num; i++)
-			{
-				t[i] = values.values[i].timestamp.sec - zero_time.sec + 1.0e-9 *
-						(values.values[i].timestamp.ns - zero_time.ns + 1);
-				x[i] = values.values[i].value.dbl;
-			}
-		}
-		else
-		{
-			for (i = 0; i < values.values_num; i++)
-			{
-				t[i] = values.values[i].timestamp.sec - zero_time.sec + 1.0e-9 *
-						(values.values[i].timestamp.ns - zero_time.ns + 1);
-				x[i] = values.values[i].value.ui64;
-			}
-		}
-
-		zbx_variant_set_dbl(value, zbx_forecast(t, x, values.values_num,
-				ts->sec - zero_time.sec - 1.0e-9 * (zero_time.ns + 1), time, fit, k, mode));
-	}
-	else
-	{
-		zbx_variant_set_dbl(value, ZBX_MATH_ERROR);
-	}
-
-	ret = SUCCEED;
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zbx_free(fit_str);
-	zbx_free(mode_str);
-
-	zbx_free(t);
-	zbx_free(x);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_TIMELEFT                                                *
- *                                                                            *
- * Purpose: evaluate function 'timeleft' for the item                         *
- *                                                                            *
- * Parameters: item - item (performance metric)                               *
- *             parameters - number of seconds/values and time shift (optional)*
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_TIMELEFT(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		char **error)
-{
-	char				*fit_str = NULL;
-	double				*t = NULL, *x = NULL, threshold;
-	int				nparams, arg1, i, ret = FAIL, seconds = 0, nvalues = 0, time_shift;
-	zbx_value_type_t		arg1_type;
-	unsigned			k = 0;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			zero_time;
-	zbx_fit_t			fit;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	if (2 > (nparams = num_param(parameters)) || nparams > 3)
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
-			ZBX_VALUE_NONE == arg1_type)
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_float(parameters, 2, ZBX_FLAG_DOUBLE_SUFFIX, &threshold))
-	{
-		*error = zbx_strdup(*error, "invalid third parameter");
-		goto out;
-	}
-
-	if (3 == nparams)
-	{
-		if (SUCCEED != get_function_parameter_str(parameters, 3, &fit_str) ||
-				SUCCEED != zbx_fit_code(fit_str, &fit, &k, error))
-		{
-			*error = zbx_strdup(*error, "invalid fourth parameter");
-			goto out;
-		}
-	}
-	else
-	{
-		fit = FIT_LINEAR;
-	}
-
-	if ((FIT_EXPONENTIAL == fit || FIT_POWER == fit) && 0.0 >= threshold)
-	{
-		*error = zbx_strdup(*error, "exponential and power functions are always positive");
-		goto out;
-	}
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	ts_end.sec -= time_shift;
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (0 < values.values_num)
-	{
-		t = (double *)zbx_malloc(t, values.values_num * sizeof(double));
-		x = (double *)zbx_malloc(x, values.values_num * sizeof(double));
-
-		zero_time.sec = values.values[values.values_num - 1].timestamp.sec;
-		zero_time.ns = values.values[values.values_num - 1].timestamp.ns;
-
-		if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
-		{
-			for (i = 0; i < values.values_num; i++)
-			{
-				t[i] = values.values[i].timestamp.sec - zero_time.sec + 1.0e-9 *
-						(values.values[i].timestamp.ns - zero_time.ns + 1);
-				x[i] = values.values[i].value.dbl;
-			}
-		}
-		else
-		{
-			for (i = 0; i < values.values_num; i++)
-			{
-				t[i] = values.values[i].timestamp.sec - zero_time.sec + 1.0e-9 *
-						(values.values[i].timestamp.ns - zero_time.ns + 1);
-				x[i] = values.values[i].value.ui64;
-			}
-		}
-
-		zbx_variant_set_dbl(value, zbx_timeleft(t, x, values.values_num,
-				ts->sec - zero_time.sec - 1.0e-9 * (zero_time.ns + 1), threshold, fit, k));
-	}
-	else
-	{
-		zbx_variant_set_dbl(value, ZBX_MATH_ERROR);
-	}
-
-	ret = SUCCEED;
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zbx_free(fit_str);
-
-	zbx_free(t);
-	zbx_free(x);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_TREND                                                   *
- *                                                                            *
- * Purpose: evaluate trend* functions for the item                            *
- *                                                                            *
- * Parameters: value      - [OUT] the function result                         *
- *             item       - [IN] item (performance metric)                    *
- *             func       - [IN] the trend function to evaluate               *
- *                               (avg, sum, count, delta, max, min)           *
- *             parameters - [IN] function parameters                          *
- *             ts         - [IN] the historical time when function must be    *
- *                               evaluated                                    *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_TREND(zbx_variant_t *value, DC_ITEM *item, const char *func, const char *parameters,
-		const zbx_timespec_t *ts, char **error)
-{
-	int		ret = FAIL, start, end;
-	char		*period = NULL;
-	const char	*table;
-	double		value_dbl;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	if (1 != num_param(parameters))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_str(parameters, 1, &period))
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	if (SUCCEED != zbx_trends_parse_range(ts->sec, period, &start, &end, error))
-		goto out;
-
-	switch (item->value_type)
-	{
-		case ITEM_VALUE_TYPE_FLOAT:
-			table = "trends";
-			break;
-		case ITEM_VALUE_TYPE_UINT64:
-			table = "trends_uint";
-			break;
-		default:
-			*error = zbx_strdup(*error, "unsupported value type");
-			goto out;
-	}
-
-	if (0 == strcmp(func, "avg"))
-	{
-		ret = zbx_trends_eval_avg(table, item->itemid, start, end, &value_dbl, error);
-	}
-	else if (0 == strcmp(func, "count"))
-	{
-		ret = zbx_trends_eval_count(table, item->itemid, start, end, &value_dbl, error);
-	}
-	else if (0 == strcmp(func, "max"))
-	{
-		ret = zbx_trends_eval_max(table, item->itemid, start, end, &value_dbl, error);
-	}
-	else if (0 == strcmp(func, "min"))
-	{
-		ret = zbx_trends_eval_min(table, item->itemid, start, end, &value_dbl, error);
-	}
-	else if (0 == strcmp(func, "sum"))
-	{
-		ret = zbx_trends_eval_sum(table, item->itemid, start, end, &value_dbl, error);
-	}
-	else
-	{
-		*error = zbx_strdup(*error, "unknown trend function");
-		goto out;
-	}
-
-	if (SUCCEED == ret)
-		zbx_variant_set_dbl(value, value_dbl);
-out:
-	zbx_free(period);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-static int	validate_params_and_get_data(DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		zbx_vector_history_record_t *values, char **error)
-{
-	int			arg1, seconds = 0, nvalues = 0, time_shift;
-	zbx_value_type_t	arg1_type;
-	zbx_timespec_t		ts_end = *ts;
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		return FAIL;
-	}
-
-	if (1 != num_param(parameters))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		return FAIL;
-	}
-
-	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
-			ZBX_VALUE_NONE == arg1_type)
-	{
-		*error = zbx_strdup(*error, "invalid parameter");
-		return FAIL;
-	}
-
-	ts_end.sec -= time_shift;
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			*error = zbx_strdup(*error, "invalid type of first argument");
-			THIS_SHOULD_NEVER_HAPPEN;
-			return FAIL;
-	}
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		return FAIL;
-	}
-
-	return SUCCEED;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_FIRST                                                   *
- *                                                                            *
- * Purpose: evaluate function 'first' for the item                            *
- *                                                                            *
- * Parameters: value - dynamic buffer                                         *
- *             item - item (performance metric)                               *
- *             parameters - Nth first value and time shift (optional)         *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_FIRST(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		char **error)
-{
-	int				arg1 = 1, ret = FAIL, seconds = 0, time_shift;
-	zbx_value_type_t		arg1_type = ZBX_VALUE_NVALUES;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (1 != num_param(parameters))
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift))
-	{
-		*error = zbx_strdup(*error, "invalid parameter");
-		goto out;
-	}
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NONE:
-			*error = zbx_strdup(*error, "the first argument is not specified");
-			goto out;
-		case ZBX_VALUE_NVALUES:
-			*error = zbx_strdup(*error, "the first argument cannot be number of value");
-			goto out;
-		default:
-			*error = zbx_strdup(*error, "invalid type of first argument");
-			THIS_SHOULD_NEVER_HAPPEN;
-			goto out;
-	}
-
-	if (0 >= arg1)
-	{
-		*error = zbx_strdup(*error, "the first argument must be greater than 0");
-		goto out;
-	}
-
-	ts_end.sec -= time_shift;
-
-	if (SUCCEED == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, 0, &ts_end))
-	{
-		if (0 < values.values_num)
-		{
-			zbx_history_value2variant(&values.values[values.values_num - 1].value, item->value_type, value);
-			ret = SUCCEED;
-		}
-		else
-		{
-			*error = zbx_strdup(*error, "not enough data");
-			goto out;
-		}
-	}
-	else
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/* flags for evaluate_MONO() */
-#define MONOINC		0
-#define MONODEC		1
-
-#define CHECK_MONOTONICITY(type, mode_op, epsi_op)					\
-	for (i = 0; i < values.values_num - 1; i++)					\
-	{										\
-		if (0 == strict && values.values[i + 1].value.type mode_op		\
-				(epsi_op + values.values[i].value.type))		\
-		{									\
-			res = 0;							\
-			break;								\
-		}									\
-		else if (1 == strict && values.values[i + 1].value.type mode_op##=	\
-				(epsi_op + values.values[i].value.type ) )		\
-		{									\
-			res = 0;							\
-			break;								\
-		}									\
-	}										\
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_MONO                                                    *
- *                                                                            *
- * Purpose: evaluate functions 'monoinc' and 'monodec' for the item           *
- *                                                                            *
- * Parameters: value      - [OUT] the function return value                   *
- *             item       - [IN] item (performance metric)                    *
- *             parameters - [IN] mode, strict or weak monotonicity            *
- *             ts         - [IN] the function execution time                  *
- *             gradient   - [IN] check increase or decrease of monotonicity   *
- *             error      - [OUT] the error message if function failed        *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_MONO(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
-		int gradient, char **error)
-{
-	int				arg1, i, num, time_shift, strict = 0, ret = FAIL, seconds = 0, nvalues = 0;
-	char				*arg2 = NULL;
-	zbx_uint64_t			res;
-	zbx_value_type_t		arg1_type;
-	zbx_vector_history_record_t	values;
-	zbx_timespec_t			ts_end = *ts;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (ITEM_VALUE_TYPE_FLOAT != item->value_type && ITEM_VALUE_TYPE_UINT64 != item->value_type)
-	{
-		*error = zbx_strdup(*error, "invalid value type");
-		goto out;
-	}
-
-	num = num_param(parameters);
-
-	if (1 > num || 2 < num )
-	{
-		*error = zbx_strdup(*error, "invalid number of parameters");
-		goto out;
-	}
-
-	if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 1, &arg1, &arg1_type, &time_shift) ||
-			ZBX_VALUE_NONE == arg1_type)
-	{
-		*error = zbx_strdup(*error, "invalid second parameter");
-		goto out;
-	}
-
-	if (1 < num && (SUCCEED != get_function_parameter_str(parameters, 2, &arg2) ||
-			('\0' != *arg2 && 0 == (strict = (0 == strcmp("strict", arg2))) &&
-			0 != strcmp("weak", arg2))))
-	{
-		*error = zbx_strdup(*error, "invalid third parameter");
-		goto out;
-	}
-
-	ts_end.sec -= time_shift;
-
-	switch (arg1_type)
-	{
-		case ZBX_VALUE_SECONDS:
-			seconds = arg1;
-			break;
-		case ZBX_VALUE_NVALUES:
-			nvalues = arg1;
-			break;
-		default:
-			THIS_SHOULD_NEVER_HAPPEN;
-	}
-
-	if (FAIL == zbx_vc_get_values(item->itemid, item->value_type, &values, seconds, nvalues, &ts_end))
-	{
-		*error = zbx_strdup(*error, "cannot get values from value cache");
-		goto out;
-	}
-
-	if (0 < values.values_num)
-	{
-		res = 1;
-
-		if (ITEM_VALUE_TYPE_FLOAT == item->value_type)
-		{
-			if (MONOINC == gradient)
-			{
-				CHECK_MONOTONICITY(dbl, >, +ZBX_DOUBLE_EPSILON);
-			}
-			else if (MONODEC == gradient)
-			{
-				CHECK_MONOTONICITY(dbl, <, -ZBX_DOUBLE_EPSILON);
-			}
-			else
-			{
-				THIS_SHOULD_NEVER_HAPPEN;
-			}
-		}
-		else if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
-		{
-			if (MONOINC == gradient)
-			{
-				CHECK_MONOTONICITY(ui64, >, 0);
-			}
-			else if (MONODEC == gradient)
-			{
-				CHECK_MONOTONICITY(ui64, <, 0);
-			}
-			else
-			{
-				THIS_SHOULD_NEVER_HAPPEN;
-			}
-		}
-		else
-		{
-			THIS_SHOULD_NEVER_HAPPEN;
-		}
-		zbx_variant_set_ui64(value, res);
-		ret = SUCCEED;
-	}
-	else
-	{
-		if (MONOINC == gradient)
-			zabbix_log(LOG_LEVEL_DEBUG, "result for MONOINC is empty");
-		else if (MONODEC == gradient)
-			zabbix_log(LOG_LEVEL_DEBUG, "result for MONODEC is empty");
-		else
-			THIS_SHOULD_NEVER_HAPPEN;
-
-		*error = zbx_strdup(*error, "not enough data");
-	}
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-	zbx_free(arg2);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-static void	history_to_dbl_vector(const zbx_history_record_t *v, int n, unsigned char value_type,
-		zbx_vector_dbl_t *values)
-{
-	int	i;
-
-	zbx_vector_dbl_reserve(values, (size_t)n);
-
-	if (ITEM_VALUE_TYPE_FLOAT == value_type)
-	{
-		for (i = 0; i < n; i++)
-			zbx_vector_dbl_append(values, v[i].value.dbl);
-	}
-	else
-	{
-		for (i = 0; i < n; i++)
-			zbx_vector_dbl_append(values, (double)v[i].value.ui64);
-	}
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_statistical_func                                        *
- *                                                                            *
- * Purpose: common operations for aggregate function calculation              *
- *                                                                            *
- * Parameters: value      - [OUT] result                                      *
- *             item       - [IN] item (performance metric)                    *
- *             parameters - [IN] number of seconds/values and time shift      *
- *                               (optional)                                   *
- *             ts         - [IN] time shift                                   *
- *             stat_func  - [IN] pointer to aggregate function to be called   *
- *             min_values - [IN] minimum data values required                 *
- *             error      - [OUT] the error message in the case of failure    *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
- *               FAIL - failed to evaluate function                           *
- *                                                                            *
- ******************************************************************************/
-static int	evaluate_statistical_func(zbx_variant_t *value, DC_ITEM *item, const char *parameters,
-		const zbx_timespec_t *ts, zbx_statistical_func_t stat_func, int min_values, char **error)
-{
-	int				ret = FAIL;
-	zbx_vector_history_record_t	values;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
-
-	zbx_history_record_vector_create(&values);
-
-	if (SUCCEED != validate_params_and_get_data(item, parameters, ts, &values, error))
-		goto out;
-
-	if (min_values <= values.values_num)
-	{
-		zbx_vector_dbl_t	values_dbl;
-		double			result;
-
-		zbx_vector_dbl_create(&values_dbl);
-
-		history_to_dbl_vector(values.values, values.values_num, item->value_type, &values_dbl);
-
-		if (SUCCEED == (ret = stat_func(&values_dbl, &result, error)))
-			zbx_variant_set_dbl(value, result);
-
-		zbx_vector_dbl_destroy(&values_dbl);
-	}
-	else
-		*error = zbx_strdup(*error, "not enough data");
-out:
-	zbx_history_record_vector_destroy(&values, item->value_type);
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: evaluate_function                                                *
- *                                                                            *
- * Purpose: evaluate function                                                 *
- *                                                                            *
- * Parameters: item      - item to calculate function for                     *
- *             function  - function (for example, 'max')                      *
- *             parameter - parameter of the function                          *
- *                                                                            *
- * Return value: SUCCEED - evaluated successfully, value contains its value   *
- *               FAIL - evaluation failed                                     *
- *                                                                            *
- ******************************************************************************/
-int	evaluate_function2(zbx_variant_t *value, DC_ITEM *item, const char *function, const char *parameter,
-		const zbx_timespec_t *ts, char **error)
-{
-	int	ret;
-
-	zabbix_log(LOG_LEVEL_DEBUG, "In %s() function:'%s(/%s/%s,%s)' ts:'%s\'", __func__,
-			function, item->host.host, item->key_orig, parameter, zbx_timespec_str(ts));
-
-	if (0 == strcmp(function, "last"))
-	{
-		ret = evaluate_LAST(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "min"))
-	{
-		ret = evaluate_MIN(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "max"))
-	{
-		ret = evaluate_MAX(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "avg"))
-	{
-		ret = evaluate_AVG(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "sum"))
-	{
-		ret = evaluate_SUM(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "percentile"))
-	{
-		ret = evaluate_PERCENTILE(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "count"))
-	{
-		ret = evaluate_COUNT(value, item, parameter, ts, ZBX_MAX_UINT31_1, COUNT_ALL, error);
-	}
-	else if (0 == strcmp(function, "countunique"))
-	{
-		ret = evaluate_COUNT(value, item, parameter, ts, ZBX_MAX_UINT31_1, COUNT_UNIQUE, error);
-	}
-	else if (0 == strcmp(function, "nodata"))
-	{
-		ret = evaluate_NODATA(value, item, parameter, error);
-	}
-	else if (0 == strcmp(function, "change"))
-	{
-		ret = evaluate_CHANGE(value, item, ts, error);
-	}
-	else if (0 == strcmp(function, "find"))
-	{
-		ret = evaluate_COUNT(value, item, parameter, ts, 1, COUNT_ALL, error);
-	}
-	else if (0 == strcmp(function, "fuzzytime"))
-	{
-		ret = evaluate_FUZZYTIME(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "logeventid"))
-	{
-		ret = evaluate_LOGEVENTID(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "logseverity"))
-	{
-		ret = evaluate_LOGSEVERITY(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "logsource"))
-	{
-		ret = evaluate_LOGSOURCE(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "bitand"))
-	{
-		ret = evaluate_BITAND(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "forecast"))
-	{
-		ret = evaluate_FORECAST(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "timeleft"))
-	{
-		ret = evaluate_TIMELEFT(value, item, parameter, ts, error);
-	}
-	else if (0 == strncmp(function, "trend", 5))
-	{
-		ret = evaluate_TREND(value, item, function + 5, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "first"))
-	{
-		ret = evaluate_FIRST(value, item, parameter, ts, error);
-	}
-	else if (0 == strcmp(function, "kurtosis"))
-	{
-		ret = evaluate_statistical_func(value, item, parameter, ts, zbx_eval_calc_kurtosis, 1, error);
-	}
-	else if (0 == strcmp(function, "mad"))
-	{
-		ret = evaluate_statistical_func(value, item, parameter, ts, zbx_eval_calc_mad, 1, error);
-	}
-	else if (0 == strcmp(function, "skewness"))
-	{
-		ret = evaluate_statistical_func(value, item, parameter, ts, zbx_eval_calc_skewness, 1, error);
-	}
-	else if (0 == strcmp(function, "stddevpop"))
-	{
-		ret = evaluate_statistical_func(value, item, parameter, ts, zbx_eval_calc_stddevpop, 1, error);
-	}
-	else if (0 == strcmp(function, "stddevsamp"))
-	{
-		ret = evaluate_statistical_func(value, item, parameter, ts, zbx_eval_calc_stddevsamp, 2, error);
-	}
-	else if (0 == strcmp(function, "sumofsquares"))
-	{
-		ret = evaluate_statistical_func(value, item, parameter, ts, zbx_eval_calc_sumofsquares, 1, error);
-	}
-	else if (0 == strcmp(function, "varpop"))
-	{
-		ret = evaluate_statistical_func(value, item, parameter, ts, zbx_eval_calc_varpop, 1, error);
-	}
-	else if (0 == strcmp(function, "varsamp"))
-	{
-		ret = evaluate_statistical_func(value, item, parameter, ts, zbx_eval_calc_varsamp, 2, error);
-	}
-	else if (0 == strcmp(function, "monoinc"))
-	{
-		ret = evaluate_MONO(value, item, parameter, ts, MONOINC, error);
-	}
-	else if (0 == strcmp(function, "monodec"))
-	{
-		ret = evaluate_MONO(value, item, parameter, ts, MONODEC, error);
-	}
-	else
-	{
-		*error = zbx_strdup(*error, "function is not supported");
-		ret = FAIL;
-	}
-
-	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s value:'%s' of type:'%s'", __func__, zbx_result_string(ret),
-			zbx_variant_value_desc(value), zbx_variant_type_desc(value));
-
-	return ret;
-}
-
-/******************************************************************************
- *                                                                            *
- * Function: zbx_is_trigger_function                                          *
- *                                                                            *
- * Purpose: check if the specified function is a trigger function             *
- *                                                                            *
- * Parameters: name - [IN] the function name to check                         *
- *             len  - [IN] the length of function name                        *
- *                                                                            *
- * Return value: SUCCEED - the function is a trigger function                 *
- *               FAIL - otherwise                                             *
- *                                                                            *
- ******************************************************************************/
-int	zbx_is_trigger_function(const char *name, size_t len)
-{
-	char	*functions[] = {"last", "min", "max", "avg", "sum", "percentile", "count", "countunique", "nodata",
-			"change", "find", "fuzzytime", "logeventid", "logseverity", "logsource", "bitand", "forecast",
-			"timeleft", "trendavg", "trendcount", "trendmax", "trendmin", "trendsum", "abs", "cbrt",
-			"ceil", "exp", "floor", "log", "log10", "power", "round", "rand", "signum", "sqrt", "truncate",
-			"acos", "asin", "atan", "cos", "cosh", "cot", "sin", "sinh", "tan", "degrees", "radians", "mod",
-			"pi", "e", "expm1", "atan2", "first", "kurtosis", "mad", "skewness", "stddevpop", "stddevsamp",
-			"sumofsquares", "varpop", "varsamp", "ascii", "bitlength", "char", "concat", "insert", "lcase",
-			"left", "ltrim", "bytelength", "repeat", "replace", "right", "rtrim", "mid", "trim", "between",
-			"in", "bitor", "bitxor", "bitnot", "bitlshift", "bitrshift", NULL};
-	char	**ptr;
-
-	for (ptr = functions; NULL != *ptr; ptr++)
-	{
-		size_t	compare_len;
-
-		compare_len = strlen(*ptr);
-		if (compare_len == len && 0 == memcmp(*ptr, name, len))
-			return SUCCEED;
-	}
-
-	return FAIL;
-}
diff --git a/src/libs/zbxserver/expression_eval.c b/src/libs/zbxserver/expression_eval.c
index c83c2f76c6f..67e8dcf8114 100644
--- a/src/libs/zbxserver/expression_eval.c
+++ b/src/libs/zbxserver/expression_eval.c
@@ -1068,6 +1068,8 @@ out:
 #define ZBX_VALUE_FUNC_LAST	6
 #define ZBX_ITEM_FUNC_EXISTS	7
 #define ZBX_ITEM_FUNC_ITEMCOUNT	8
+#define ZBX_ITEM_FUNC_BPERCENTL	9
+#define ZBX_MIXVALUE_FUNC_BRATE	10
 
 #define MATCH_STRING(x, name, len)	ZBX_CONST_STRLEN(x) == len && 0 == memcmp(name, x, len)
 
@@ -1098,6 +1100,12 @@ static int	get_function_by_name(const char *name, size_t len)
 	if (MATCH_STRING("item_count", name, len))
 		return ZBX_ITEM_FUNC_ITEMCOUNT;
 
+	if (MATCH_STRING("bucket_percentile", name, len))
+		return ZBX_ITEM_FUNC_BPERCENTL;
+
+	if (MATCH_STRING("bucket_rate_foreach", name, len))
+		return ZBX_MIXVALUE_FUNC_BRATE;
+
 	return ZBX_VALUE_FUNC_UNKNOWN;
 }
 
@@ -1317,6 +1325,22 @@ static DC_ITEM	*get_dcitem(zbx_vector_ptr_t *dcitem_refs, zbx_uint64_t itemid)
 	return dcitem_refs->values[index];
 }
 
+/******************************************************************************
+ *                                                                            *
+ * Function: expression_eval_exists                                           *
+ *                                                                            *
+ * Purpose: evaluate functions 'exists_foreach' and 'item_count'              *
+ *          for multiple items                                                *
+ *                                                                            *
+ * Parameters: eval      - [IN] the evaluation data                           *
+ *             query     - [IN] the calculated item query                     *
+ *             item_func - [IN] the function id                               *
+ *             value     - [OUT] the function return value                    *
+ *                                                                            *
+ * Return value: SUCCEED - the function was executed successfully             *
+ *               FAIL    - otherwise                                          *
+ *                                                                            *
+ ******************************************************************************/
 static void	expression_eval_exists(zbx_expression_eval_t *eval, zbx_expression_query_t *query, int item_func,
 		zbx_variant_t *value)
 {
@@ -1361,6 +1385,195 @@ static void	expression_eval_exists(zbx_expression_eval_t *eval, zbx_expression_q
 
 /******************************************************************************
  *                                                                            *
+ * Function: expression_eval_bucket_rate                                      *
+ *                                                                            *
+ * Purpose: evaluate functions 'bucket_rate_foreach' for 'histogram_quantile' *
+ *          and evaluate functions 'bucket_percentile'                        *
+ *                                                                            *
+ * Parameters: eval      - [IN] the evaluation data                           *
+ *             query     - [IN] the calculated item query                     *
+ *             args_num  - [IN] the number of function arguments              *
+ *             args      - [IN] an array of the function arguments.           *
+ *             data      - [IN] the caller data used for function evaluation  *
+ *             ts        - [IN] the function execution time                   *
+ *             item_func - [IN] the function id                               *
+ *             value     - [OUT] the function return value                    *
+ *             error     - [OUT] the error message if function failed         *
+ *                                                                            *
+ * Return value: SUCCEED - the function was executed successfully             *
+ *               FAIL    - otherwise                                          *
+ *                                                                            *
+ ******************************************************************************/
+static int	expression_eval_bucket_rate(zbx_expression_eval_t *eval, zbx_expression_query_t *query,
+		int args_num, const zbx_variant_t *args, const zbx_timespec_t *ts, int item_func, zbx_variant_t *value,
+		char **error)
+{
+	zbx_expression_query_many_t	*data;
+	int				i, pos, ret = FAIL;
+	zbx_vector_dbl_t		*results = NULL;
+	double				percentage, result;
+	char				*param = NULL, *backet = NULL;
+	const char			*log_fn = (ZBX_ITEM_FUNC_BPERCENTL == item_func ?
+							"bucket_percentile" : "bucket_rate_foreach");
+
+	if (1 > args_num || 2 < args_num || (ZBX_ITEM_FUNC_BPERCENTL == item_func && 2 != args_num))
+	{
+		*error = zbx_strdup(NULL, "invalid number of function parameters");
+		goto err;
+	}
+
+	if (ZBX_VARIANT_STR == args[0].type)
+	{
+		param = zbx_strdup(NULL, args[0].data.str);
+	}
+	else
+	{
+		zbx_variant_t	arg;
+
+		zbx_variant_copy(&arg, &args[0]);
+
+		if (SUCCEED != zbx_variant_convert(&arg, ZBX_VARIANT_STR))
+		{
+			zbx_variant_clear(&arg);
+			*error = zbx_strdup(NULL, "invalid second parameter");
+			goto err;
+		}
+
+		param = zbx_strdup(NULL, arg.data.str);
+		zbx_variant_clear(&arg);
+	}
+
+	if (ZBX_ITEM_FUNC_BPERCENTL == item_func)
+	{
+		if (ZBX_VARIANT_DBL == args[1].type)
+		{
+			percentage = args[1].data.dbl;
+		}
+		else
+		{
+			zbx_variant_t	val_copy;
+
+			zbx_variant_copy(&val_copy, &args[1]);
+
+			if (SUCCEED != zbx_variant_convert(&val_copy, ZBX_VARIANT_DBL))
+			{
+				zbx_variant_clear(&val_copy);
+				*error = zbx_strdup(NULL, "invalid third parameter");
+				goto err;
+			}
+
+			percentage = val_copy.data.dbl;
+		}
+
+		if (100 < percentage || 0 > percentage)
+		{
+			*error = zbx_strdup(NULL, "invalid value of percentile");
+			goto err;
+		}
+
+		pos = 1;
+	}
+	else if (2 == args_num)
+	{
+		if (ZBX_VARIANT_STR == args[1].type)
+		{
+			if (SUCCEED != is_ushort(args[1].data.str, &pos) || 0 >= pos)
+			{
+				*error = zbx_strdup(NULL, "invalid third parameter");
+				goto err;
+			}
+		}
+		else if (ZBX_VARIANT_UI64 == args[1].type)
+		{
+			if (0 >= (pos = (int)args[1].data.ui64))
+			{
+				*error = zbx_strdup(NULL, "invalid third parameter");
+				goto err;
+			}
+		}
+		else
+		{
+			*error = zbx_strdup(NULL, "invalid third parameter");
+			goto err;
+		}
+	}
+	else
+	{
+		pos = 1;
+	}
+
+	data = (zbx_expression_query_many_t *)query->data;
+	results = (zbx_vector_dbl_t *)zbx_malloc(NULL, sizeof(zbx_vector_dbl_t));
+	zbx_vector_dbl_create(results);
+
+	for (i = 0; i < data->itemids.values_num; i++)
+	{
+		DC_ITEM		*dcitem;
+		zbx_variant_t	rate;
+		double		le;
+		const char	*s;
+
+
+		if (NULL == (dcitem = get_dcitem(&eval->dcitem_refs, data->itemids.values[i])))
+			continue;
+
+		if (ITEM_STATUS_ACTIVE != dcitem->status)
+			continue;
+
+		if (HOST_STATUS_MONITORED != dcitem->host.status)
+			continue;
+
+		if (ITEM_VALUE_TYPE_FLOAT != dcitem->value_type && ITEM_VALUE_TYPE_UINT64 != dcitem->value_type)
+			continue;
+
+		zbx_free(backet);
+
+		for (s = dcitem->key_orig; SUCCEED == is_key_char((unsigned char)*s); s++)
+			;
+
+		if (dcitem->key_orig == s || NULL == (backet = get_param_dyn(s, pos, NULL)))	/* the key is empty */
+			continue;
+
+		zbx_strupper(backet);
+
+		if (0 == strcmp(backet, "+INF") || 0 == strcmp(backet, "INF"))
+			le = ZBX_INFINITY;
+		else if (SUCCEED != is_double(backet, &le))
+			continue;
+
+		if (SUCCEED != (ret = zbx_evaluate_RATE(&rate, dcitem, param, ts, error)))
+			goto err;
+
+		zbx_vector_dbl_append(results, le);
+		zbx_vector_dbl_append(results, rate.data.dbl);
+	}
+
+	if (ZBX_MIXVALUE_FUNC_BRATE == item_func)
+	{
+		zbx_variant_set_dbl_vector(value, results);
+		results = NULL;
+		ret = SUCCEED;
+	}
+	else if (ZBX_ITEM_FUNC_BPERCENTL == item_func && SUCCEED == (
+			ret = zbx_eval_calc_histogram_quantile(percentage / 100, results, log_fn, &result, error)))
+	{
+		zbx_variant_set_dbl(value, result);
+	}
+err:
+	zbx_free(param);
+	zbx_free(backet);
+
+	if (NULL != results)
+	{
+		zbx_vector_dbl_destroy(results);
+		zbx_free(results);
+	}
+
+	return ret;
+}
+
+/******************************************************************************
+ *                                                                            *
  * Function: expression_eval_many                                             *
  *                                                                            *
  * Purpose: evaluate historical function for multiple items (aggregate checks)*
@@ -1453,6 +1666,10 @@ static int	expression_eval_many(zbx_expression_eval_t *eval, zbx_expression_quer
 			count = 0;
 
 			break;
+		case ZBX_ITEM_FUNC_BPERCENTL:
+		case ZBX_MIXVALUE_FUNC_BRATE:
+			ret = expression_eval_bucket_rate(eval, query, args_num, args, ts, item_func, value, error);
+			goto out;
 		default:
 			*error = zbx_strdup(NULL, "unsupported function");
 			goto out;
@@ -1522,7 +1739,7 @@ static int	expression_eval_history(const char *name, size_t len, int args_num, c
 		void *data, const zbx_timespec_t *ts, zbx_variant_t *value, char **error)
 {
 	int			ret = FAIL;
-	zbx_expression_eval_t		*eval;
+	zbx_expression_eval_t	*eval;
 	zbx_expression_query_t	*query;
 	char			*errmsg = NULL;
 
diff --git a/src/libs/zbxsysinfo/Makefile.am b/src/libs/zbxsysinfo/Makefile.am
index 7bfedfeedbd..6ac138b4fbb 100644
--- a/src/libs/zbxsysinfo/Makefile.am
+++ b/src/libs/zbxsysinfo/Makefile.am
@@ -34,6 +34,7 @@ noinst_LIBRARIES = \
 libzbxagentsysinfo_a_CFLAGS = \
 	-DWITH_AGENT_METRICS \
 	-DWITH_COMMON_METRICS \
+	-DWITH_HTTP_METRICS \
 	-DWITH_SIMPLE_METRICS \
 	-DWITH_SPECIFIC_METRICS \
 	-DWITH_HOSTNAME_METRIC
@@ -53,6 +54,7 @@ libzbxagent2sysinfo_a_SOURCES = \
 # SERVER version of sysinfo library
 libzbxserversysinfo_a_CFLAGS = \
 	-DWITH_COMMON_METRICS \
+	-DWITH_HTTP_METRICS \
 	-DWITH_SIMPLE_METRICS
 
 libzbxserversysinfo_a_SOURCES = \
@@ -61,6 +63,7 @@ libzbxserversysinfo_a_SOURCES = \
 # PROXY version of sysinfo library
 libzbxproxysysinfo_a_CFLAGS = \
 	-DWITH_COMMON_METRICS \
+	-DWITH_HTTP_METRICS \
 	-DWITH_SIMPLE_METRICS \
 	-DWITH_HOSTNAME_METRIC
 
diff --git a/src/libs/zbxsysinfo/common/Makefile.am b/src/libs/zbxsysinfo/common/Makefile.am
index c63ec6be318..d6326a28ab2 100644
--- a/src/libs/zbxsysinfo/common/Makefile.am
+++ b/src/libs/zbxsysinfo/common/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libcommonsysinfo.a
+noinst_LIBRARIES = libcommonsysinfo.a libcommonsysinfo_http.a libcommonsysinfo_httpmetrics.a
 
 libcommonsysinfo_a_CFLAGS = -I@top_srcdir@/src/zabbix_agent/
 
@@ -15,11 +15,17 @@ libcommonsysinfo_a_SOURCES = \
 	dns.h \
 	file.c \
 	file.h \
-	http.c \
-	http.h \
 	net.c \
 	net.h \
 	system.c \
 	system.h \
 	zabbix_stats.c \
 	zabbix_stats.h
+
+libcommonsysinfo_http_a_SOURCES = \
+	http.c \
+	http.h
+
+libcommonsysinfo_httpmetrics_a_SOURCES = \
+	http_metrics.c \
+	http_metrics.h
diff --git a/src/libs/zbxsysinfo/common/common.c b/src/libs/zbxsysinfo/common/common.c
index 9fa1705fe30..89016fbafcf 100644
--- a/src/libs/zbxsysinfo/common/common.c
+++ b/src/libs/zbxsysinfo/common/common.c
@@ -24,7 +24,6 @@
 
 #include "file.h"
 #include "dir.h"
-#include "http.h"
 #include "net.h"
 #include "dns.h"
 #include "system.h"
@@ -60,10 +59,6 @@ ZBX_METRIC	parameters_common[] =
 	{"system.localtime",	CF_HAVEPARAMS,	SYSTEM_LOCALTIME,	"utc"},
 	{"system.run",		CF_HAVEPARAMS,	SYSTEM_RUN,		"echo test"},
 
-	{"web.page.get",	CF_HAVEPARAMS,	WEB_PAGE_GET,		"localhost,,80"},
-	{"web.page.perf",	CF_HAVEPARAMS,	WEB_PAGE_PERF,		"localhost,,80"},
-	{"web.page.regexp",	CF_HAVEPARAMS,	WEB_PAGE_REGEXP,	"localhost,,80,OK"},
-
 	{"vfs.file.size",	CF_HAVEPARAMS,	VFS_FILE_SIZE,		VFS_TEST_FILE},
 	{"vfs.file.time",	CF_HAVEPARAMS,	VFS_FILE_TIME,		VFS_TEST_FILE ",modify"},
 	{"vfs.file.exists",	CF_HAVEPARAMS,	VFS_FILE_EXISTS,	VFS_TEST_FILE},
diff --git a/ui/app/partials/js/common.filter.item.js.php b/src/libs/zbxsysinfo/common/http_metrics.c
index 44065f4b163..5d41a0f3d14 100644
--- a/ui/app/partials/js/common.filter.item.js.php
+++ b/src/libs/zbxsysinfo/common/http_metrics.c
@@ -1,4 +1,3 @@
-<?php declare(strict_types=1);
 /*
 ** Zabbix
 ** Copyright (C) 2001-2021 Zabbix SIA
@@ -18,30 +17,14 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
+#include "http.h"
 
-/**
- * @var CPartial $this
- */
-?>
+ZBX_METRIC	parameters_common_http[] =
+/*	KEY			FLAG		FUNCTION		TEST PARAMETERS */
+{
+	{"web.page.get",	CF_HAVEPARAMS,	WEB_PAGE_GET,		"localhost,,80"},
+	{"web.page.perf",	CF_HAVEPARAMS,	WEB_PAGE_PERF,		"localhost,,80"},
+	{"web.page.regexp",	CF_HAVEPARAMS,	WEB_PAGE_REGEXP,	"localhost,,80,OK"},
 
-<script type="text/x-jquery-tmpl" id="filter-tag-row-tmpl">
-	<?= CTagFilterFieldHelper::getTemplate(); ?>
-</script>
-
-<script type="text/javascript">
-	(function($) {
-		$(function() {
-			$('#filter-tags')
-				.dynamicRows({ template: '#filter-tag-row-tmpl' })
-				.on('afteradd.dynamicRows', function() {
-					var rows = this.querySelectorAll('.form_row');
-					new CTagFilterItem(rows[rows.length - 1]);
-				});
-
-			// Init existing fields once loaded.
-			document.querySelectorAll('#filter-tags .form_row').forEach(row => {
-				new CTagFilterItem(row);
-			});
-		});
-	})(jQuery);
-</script>
+	{NULL}
+};
diff --git a/ui/app/views/service.statusrule.validate.php b/src/libs/zbxsysinfo/common/http_metrics.h
index 3a32769700e..8799a0d455c 100644
--- a/ui/app/views/service.statusrule.validate.php
+++ b/src/libs/zbxsysinfo/common/http_metrics.h
@@ -1,4 +1,3 @@
-<?php declare(strict_types = 1);
 /*
 ** Zabbix
 ** Copyright (C) 2001-2021 Zabbix SIA
@@ -18,24 +17,11 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
+#include "sysinfo.h"
 
-/**
- * @var CView $this
- */
+#ifndef ZABBIX_SYSINFO_COMMON_HTTP_METRICS_H
+#define ZABBIX_SYSINFO_COMMON_HTTP_METRICS_H
 
-$output = [
-	'body' => (new CPartial('service.statusrule.row', [
-		'row_index' => $data['row_index'],
-		'new_status' => $data['form']['new_status'],
-		'type' => $data['form']['type'],
-		'limit_value' => $data['form']['limit_value'],
-		'limit_status' => $data['form']['limit_status']
-	]))->getOutput()
-];
+extern ZBX_METRIC	parameters_common_http[];
 
-if ($data['user']['debug_mode'] == GROUP_DEBUG_MODE_ENABLED) {
-	CProfiler::getInstance()->stop();
-	$output['debug'] = CProfiler::getInstance()->make()->toString();
-}
-
-echo json_encode($output);
+#endif /* ZABBIX_SYSINFO_COMMON_HTTP_METRICS_H */
diff --git a/src/libs/zbxsysinfo/sysinfo.c b/src/libs/zbxsysinfo/sysinfo.c
index 9d9a0a0bfee..757553d36ee 100644
--- a/src/libs/zbxsysinfo/sysinfo.c
+++ b/src/libs/zbxsysinfo/sysinfo.c
@@ -38,6 +38,10 @@
 #	include "common/common.h"
 #endif
 
+#ifdef WITH_HTTP_METRICS
+#	include "common/http_metrics.h"
+#endif
+
 #ifdef WITH_SIMPLE_METRICS
 #	include "simple/simple.h"
 #endif
@@ -241,6 +245,17 @@ void	init_metrics(void)
 	}
 #endif
 
+#ifdef WITH_HTTP_METRICS
+	for (i = 0; NULL != parameters_common_http[i].key; i++)
+	{
+		if (SUCCEED != add_metric(&parameters_common_http[i], error, sizeof(error)))
+		{
+			zabbix_log(LOG_LEVEL_CRIT, "cannot add item key: %s", error);
+			exit(EXIT_FAILURE);
+		}
+	}
+#endif
+
 #ifdef WITH_SPECIFIC_METRICS
 	for (i = 0; NULL != parameters_specific[i].key; i++)
 	{
diff --git a/src/libs/zbxsysinfo/win32/wmi.cpp b/src/libs/zbxsysinfo/win32/wmi.cpp
index d74ca3a9a5e..b0b8c2c040b 100644
--- a/src/libs/zbxsysinfo/win32/wmi.cpp
+++ b/src/libs/zbxsysinfo/win32/wmi.cpp
@@ -124,7 +124,7 @@ extern "C" void	zbx_co_uninitialize()
  *             error       - [OUT] the error description                      *
  *                                                                            *
  * Return value: SYSINFO_RET_OK   - wmi_values contains the retrieved value   *
- *               SYSINFO_RET_FAIL - retreiving WMI value failed               *
+ *               SYSINFO_RET_FAIL - retrieving WMI value failed               *
  *                                                                            *
  * Comments: one value is the value from the first property of the first      *
  *           instance from search result                                      *
@@ -206,7 +206,7 @@ out:
  *             error       - [OUT] the error description                      *
  *                                                                            *
  * Return value: SYSINFO_RET_OK   - wmi_values contains the retrieved values  *
- *               SYSINFO_RET_FAIL - retreiving WMI value failed               *
+ *               SYSINFO_RET_FAIL - retrieving WMI value failed               *
  *                                                                            *
  ******************************************************************************/
 extern "C" static int	parse_all(IEnumWbemClassObject *pEnumerator, double timeout,
@@ -439,7 +439,7 @@ out:
  *             result  - [OUT] one value of property from WMI Class           *
  *                                                                            *
  * Return value: SYSINFO_RET_OK   - result contains the retrieved WMI value   *
- *               SYSINFO_RET_FAIL - retreiving WMI value failed               *
+ *               SYSINFO_RET_FAIL - retrieving WMI value failed               *
  *                                                                            *
  ******************************************************************************/
 extern "C" int	WMI_GET(AGENT_REQUEST *request, AGENT_RESULT *result)
diff --git a/src/zabbix_agent/Makefile.am b/src/zabbix_agent/Makefile.am
index fc9d3831a4c..d2006c2399f 100644
--- a/src/zabbix_agent/Makefile.am
+++ b/src/zabbix_agent/Makefile.am
@@ -47,6 +47,8 @@ zabbix_agentd_LDADD = \
 	$(top_builddir)/src/libs/zbxsysinfo/$(ARCH)/libspechostnamesysinfo.a \
 	$(top_builddir)/src/libs/zbxsysinfo/agent/libagentsysinfo.a \
 	$(top_builddir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
+	$(top_builddir)/src/libs/zbxsysinfo/common/libcommonsysinfo_httpmetrics.a \
+	$(top_builddir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
 	$(top_builddir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
 	$(top_builddir)/src/libs/zbxlog/libzbxlog.a \
 	$(top_builddir)/src/libs/zbxregexp/libzbxregexp.a \
diff --git a/src/zabbix_agent/zbxconf.c b/src/zabbix_agent/zbxconf.c
index 388ef1b3ee2..6bf3c7ff1fd 100644
--- a/src/zabbix_agent/zbxconf.c
+++ b/src/zabbix_agent/zbxconf.c
@@ -35,7 +35,7 @@
  *                                                                            *
  * Purpose: load aliases from configuration                                   *
  *                                                                            *
- * Parameters: lines - aliase entries from configuration file                 *
+ * Parameters: lines - aliases from configuration file                        *
  *                                                                            *
  * Comments: calls add_alias() for each entry                                 *
  *                                                                            *
diff --git a/src/zabbix_agent/zbxkstat.c b/src/zabbix_agent/zbxkstat.c
index 8d213ce7f58..90dc6fe8ee7 100644
--- a/src/zabbix_agent/zbxkstat.c
+++ b/src/zabbix_agent/zbxkstat.c
@@ -43,7 +43,7 @@ static zbx_mutex_t	kstat_lock = ZBX_MUTEX_NULL;
  * Parameters: error - [OUT] the error message                                *
  *                                                                            *
  * Return value: SUCCEED - the kstat environment was refreshed successfully   *
- *               FAIL - otherwose                                             *
+ *               FAIL - otherwise                                             *
  *                                                                            *
  ******************************************************************************/
 static int	zbx_kstat_refresh(char **error)
@@ -78,7 +78,7 @@ static int	zbx_kstat_refresh(char **error)
  *             error - [OUT] the error message                                *
  *                                                                            *
  * Return value: SUCCEED - the kstat environment was initialized successfully *
- *               FAIL - otherwose                                             *
+ *               FAIL - otherwise                                             *
  *                                                                            *
  ******************************************************************************/
 int	zbx_kstat_init(zbx_kstat_t *kstat, char **error)
diff --git a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
index 4b0c262696e..492fae3ef17 100644
--- a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
+++ b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
@@ -22,9 +22,9 @@ package com.zabbix.gateway;
 class GeneralInformation
 {
 	static final String APPLICATION_NAME = "Zabbix Java Gateway";
-	static final String REVISION_DATE = "20 September 2021";
+	static final String REVISION_DATE = "6 October 2021";
 	static final String REVISION = "{ZABBIX_REVISION}";
-	static final String VERSION = "6.0.0alpha4";
+	static final String VERSION = "6.0.0alpha5";
 
 	static void printVersion()
 	{
diff --git a/src/zabbix_proxy/Makefile.am b/src/zabbix_proxy/Makefile.am
index 227e9cacedf..ca6f0cb7502 100644
--- a/src/zabbix_proxy/Makefile.am
+++ b/src/zabbix_proxy/Makefile.am
@@ -45,6 +45,8 @@ zabbix_proxy_LDADD = \
 	$(top_builddir)/src/zabbix_server/availability/libavailability.a \
 	$(top_builddir)/src/libs/zbxsysinfo/libzbxproxysysinfo.a \
 	$(top_builddir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
+	$(top_builddir)/src/libs/zbxsysinfo/common/libcommonsysinfo_httpmetrics.a \
+	$(top_builddir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
 	$(top_builddir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
 	$(top_builddir)/src/libs/zbxsysinfo/$(ARCH)/libspechostnamesysinfo.a \
 	$(top_builddir)/src/libs/zbxlog/libzbxlog.a \
diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am
index 85e1b0ac814..a95827dd09b 100644
--- a/src/zabbix_server/Makefile.am
+++ b/src/zabbix_server/Makefile.am
@@ -82,6 +82,8 @@ zabbix_server_LDADD = \
 	$(top_builddir)/src/libs/zbxprometheus/libzbxprometheus.a \
 	$(top_builddir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
 	$(top_builddir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
+	$(top_builddir)/src/libs/zbxsysinfo/common/libcommonsysinfo_httpmetrics.a \
+	$(top_builddir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
 	$(top_builddir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
 	$(top_builddir)/src/libs/zbxlog/libzbxlog.a \
 	$(top_builddir)/src/libs/zbxdbcache/libzbxdbcache.a \
diff --git a/src/zabbix_server/alerter/alert_manager.c b/src/zabbix_server/alerter/alert_manager.c
index 44df7f8f9e7..21782a6af9d 100644
--- a/src/zabbix_server/alerter/alert_manager.c
+++ b/src/zabbix_server/alerter/alert_manager.c
@@ -503,7 +503,7 @@ static void	am_update_mediatype(zbx_am_t *manager, zbx_uint64_t mediatypeid, uns
  * Parameters: manager   - [IN] the alert manager                             *
  *             mediatype - [IN] the media type                                *
  *                                                                            *
- * Comments: The media tyep is inserted into queue only if it was not already *
+ * Comments: The media type is inserted into queue only if it was not already *
  *           queued and if the number of media type alerts being processed    *
  *           not reached the limit.                                           *
  *           If media type is already queued only its location in the queue   *
diff --git a/src/zabbix_server/ha/ha_manager.c b/src/zabbix_server/ha/ha_manager.c
index 30513ba1374..e5ecb30b570 100644
--- a/src/zabbix_server/ha/ha_manager.c
+++ b/src/zabbix_server/ha/ha_manager.c
@@ -1345,8 +1345,9 @@ static void	ha_set_failover_delay(zbx_ha_info_t *info, zbx_ipc_client_t *client,
 
 		ZBX_STR2UINT64(configid, row[0]);
 		zbx_audit_init(info->auditlog);
-		zbx_audit_settings_create_entry(AUDIT_ACTION_UPDATE, 1);
-		zbx_audit_update_json_update_int(1, "settings.ha_failover_delay", atoi(row[1]), delay);
+		zbx_audit_settings_create_entry(AUDIT_ACTION_UPDATE, configid);
+		zbx_audit_update_json_update_int(configid, AUDIT_CONFIG_ID, "settings.ha_failover_delay", atoi(row[1]),
+				delay);
 		ha_flush_audit(info);
 	}
 	else
diff --git a/src/zabbix_server/housekeeper/history_compress.c b/src/zabbix_server/housekeeper/history_compress.c
index 2edd8f42907..68e21744cb7 100644
--- a/src/zabbix_server/housekeeper/history_compress.c
+++ b/src/zabbix_server/housekeeper/history_compress.c
@@ -267,7 +267,7 @@ void	hk_history_compression_init(void)
 
 	if (0 == zbx_strcmp_null(cfg.db.extension, ZBX_CONFIG_DB_EXTENSION_TIMESCALE))
 	{
-		/* surpress notice logs during DB initialization */
+		/* suppress notice logs during DB initialization */
 		result = DBselect("show client_min_messages");
 
 		if (NULL != (row = DBfetch(result)))
diff --git a/src/zabbix_server/lld/lld_common.c b/src/zabbix_server/lld/lld_common.c
index a5242265207..a6b1c77870a 100644
--- a/src/zabbix_server/lld/lld_common.c
+++ b/src/zabbix_server/lld/lld_common.c
@@ -22,6 +22,8 @@
 #include "db.h"
 
 #include "../../libs/zbxaudit/audit_item.h"
+#include "../../libs/zbxaudit/audit_graph.h"
+#include "../../libs/zbxaudit/audit_trigger.h"
 
 /******************************************************************************
  *                                                                            *
@@ -120,6 +122,16 @@ void	lld_remove_lost_objects(const char *table, const char *id_name, const zbx_v
 					zbx_audit_item_create_entry_for_delete(id, name,
 							(int)ZBX_FLAG_DISCOVERY_CREATED);
 				}
+				else if (0 == strcmp(table, "graph_discovery"))
+				{
+					zbx_audit_graph_create_entry(AUDIT_ACTION_DELETE, id, name,
+							(int)ZBX_FLAG_DISCOVERY_CREATED);
+				}
+				else if (0 == strcmp(table, "trigger_discovery"))
+				{
+					zbx_audit_trigger_create_entry(AUDIT_ACTION_DELETE, id, name,
+							ZBX_FLAG_DISCOVERY_CREATED);
+				}
 			}
 			else if (object_ts_delete != ts_delete)
 			{
diff --git a/src/zabbix_server/lld/lld_graph.c b/src/zabbix_server/lld/lld_graph.c
index c2fccbbab92..78de51511d5 100644
--- a/src/zabbix_server/lld/lld_graph.c
+++ b/src/zabbix_server/lld/lld_graph.c
@@ -22,14 +22,30 @@
 #include "log.h"
 #include "zbxalgo.h"
 #include "zbxserver.h"
+#include "../../libs/zbxaudit/audit_graph.h"
 
 typedef struct
 {
 	zbx_uint64_t		graphid;
 	char			*name;
 	char			*name_orig;
+	zbx_uint64_t		ymin_itemid_orig;
 	zbx_uint64_t		ymin_itemid;
+	zbx_uint64_t		ymax_itemid_orig;
 	zbx_uint64_t		ymax_itemid;
+	int 			width_orig;
+	int 			height_orig;
+	double 			yaxismin_orig;
+	double 			yaxismax_orig;
+	unsigned char 		show_work_period_orig;
+	unsigned char 		show_triggers_orig;
+	unsigned char 		graphtype_orig;
+	unsigned char 		show_legend_orig;
+	unsigned char 		show_3d_orig;
+	double 			percent_left_orig;
+	double 			percent_right_orig;
+	unsigned char 		ymin_type_orig;
+	unsigned char 		ymax_type_orig;
 	zbx_vector_ptr_t	gitems;
 #define ZBX_FLAG_LLD_GRAPH_UNSET			__UINT64_C(0x00000000)
 #define ZBX_FLAG_LLD_GRAPH_DISCOVERED			__UINT64_C(0x00000001)
@@ -67,12 +83,19 @@ zbx_lld_graph_t;
 typedef struct
 {
 	zbx_uint64_t		gitemid;
+	zbx_uint64_t		itemid_orig;
 	zbx_uint64_t		itemid;
+	char			*color_orig;
 	char			*color;
+	int			sortorder_orig;
 	int			sortorder;
+	unsigned char		drawtype_orig;
 	unsigned char		drawtype;
+	unsigned char		yaxisside_orig;
 	unsigned char		yaxisside;
+	unsigned char		calc_fnc_orig;
 	unsigned char		calc_fnc;
+	unsigned char		type_orig;
 	unsigned char		type;
 #define ZBX_FLAG_LLD_GITEM_UNSET			__UINT64_C(0x0000)
 #define ZBX_FLAG_LLD_GITEM_DISCOVERED			__UINT64_C(0x0001)
@@ -90,6 +113,7 @@ typedef struct
 		ZBX_FLAG_LLD_GITEM_UPDATE_TYPE)
 #define ZBX_FLAG_LLD_GITEM_DELETE			__UINT64_C(0x0100)
 	zbx_uint64_t		flags;
+	zbx_uint64_t		graphid;
 }
 zbx_lld_gitem_t;
 
@@ -114,6 +138,7 @@ static void	lld_items_free(zbx_vector_ptr_t *items)
 static void	lld_gitem_free(zbx_lld_gitem_t *gitem)
 {
 	zbx_free(gitem->color);
+	zbx_free(gitem->color_orig);
 	zbx_free(gitem);
 }
 
@@ -156,7 +181,6 @@ static void	lld_graphs_get(zbx_uint64_t parent_graphid, zbx_vector_ptr_t *graphs
 {
 	DB_RESULT	result;
 	DB_ROW		row;
-	zbx_lld_graph_t	*graph;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
@@ -171,7 +195,7 @@ static void	lld_graphs_get(zbx_uint64_t parent_graphid, zbx_vector_ptr_t *graphs
 
 	while (NULL != (row = DBfetch(result)))
 	{
-		graph = (zbx_lld_graph_t *)zbx_malloc(NULL, sizeof(zbx_lld_graph_t));
+		zbx_lld_graph_t	*graph = (zbx_lld_graph_t *)zbx_malloc(NULL, sizeof(zbx_lld_graph_t));
 
 		ZBX_STR2UINT64(graph->graphid, row[0]);
 		graph->name = zbx_strdup(NULL, row[1]);
@@ -179,48 +203,63 @@ static void	lld_graphs_get(zbx_uint64_t parent_graphid, zbx_vector_ptr_t *graphs
 
 		graph->flags = ZBX_FLAG_LLD_GRAPH_UNSET;
 
-		if (atoi(row[2]) != width)
+		graph->width_orig = atoi(row[2]);
+		if (graph->width_orig != width)
 			graph->flags |= ZBX_FLAG_LLD_GRAPH_UPDATE_WIDTH;
 
-		if (atoi(row[3]) != height)
+		graph->height_orig = atoi(row[3]);
+		if (graph->height_orig != height)
 			graph->flags |= ZBX_FLAG_LLD_GRAPH_UPDATE_HEIGHT;
 
-		if (FAIL == zbx_double_compare(atof(row[4]), yaxismin))
+		graph->yaxismin_orig = atof(row[4]);
+		if (FAIL == zbx_double_compare(graph->yaxismin_orig, yaxismin))
 			graph->flags |= ZBX_FLAG_LLD_GRAPH_UPDATE_YAXISMIN;
 
-		if (FAIL == zbx_double_compare(atof(row[5]), yaxismax))
+		graph->yaxismax_orig = atof(row[5]);
+		if (FAIL == zbx_double_compare(graph->yaxismax_orig, yaxismax))
 			graph->flags |= ZBX_FLAG_LLD_GRAPH_UPDATE_YAXISMAX;
 
-		if ((unsigned char)atoi(row[6]) != show_work_period)
+		graph->show_work_period_orig = (unsigned char)atoi(row[6]);
+		if (graph->show_work_period_orig != show_work_period)
 			graph->flags |= ZBX_FLAG_LLD_GRAPH_UPDATE_SHOW_WORK_PERIOD;
 
-		if ((unsigned char)atoi(row[7]) != show_triggers)
+		graph->show_triggers_orig = (unsigned char)atoi(row[7]);
+		if (graph->show_triggers_orig != show_triggers)
 			graph->flags |= ZBX_FLAG_LLD_GRAPH_UPDATE_SHOW_TRIGGERS;
 
-		if ((unsigned char)atoi(row[8]) != graphtype)
+		graph->graphtype_orig = (unsigned char)atoi(row[8]);
+		if (graph->graphtype_orig != graphtype)
 			graph->flags |= ZBX_FLAG_LLD_GRAPH_UPDATE_GRAPHTYPE;
 
-		if ((unsigned char)atoi(row[9]) != show_legend)
+		graph->show_legend_orig = (unsigned char)atoi(row[9]);
+		if (graph->show_legend_orig != show_legend)
 			graph->flags |= ZBX_FLAG_LLD_GRAPH_UPDATE_SHOW_LEGEND;
 
-		if ((unsigned char)atoi(row[10]) != show_3d)
+		graph->show_3d_orig = (unsigned char)atoi(row[10]);
+		if (graph->show_3d_orig != show_3d)
 			graph->flags |= ZBX_FLAG_LLD_GRAPH_UPDATE_SHOW_3D;
 
-		if (FAIL == zbx_double_compare(atof(row[11]), percent_left))
+		graph->percent_left_orig = atof(row[11]);
+		if (FAIL == zbx_double_compare(graph->percent_left_orig, percent_left))
 			graph->flags |= ZBX_FLAG_LLD_GRAPH_UPDATE_PERCENT_LEFT;
 
-		if (FAIL == zbx_double_compare(atof(row[12]), percent_right))
+		graph->percent_right_orig = atof(row[12]);
+		if (FAIL == zbx_double_compare(graph->percent_right_orig, percent_right))
 			graph->flags |= ZBX_FLAG_LLD_GRAPH_UPDATE_PERCENT_RIGHT;
 
-		if ((unsigned char)atoi(row[13]) != ymin_type)
+		graph->ymin_type_orig = (unsigned char)atoi(row[13]);
+		if (graph->ymin_type_orig != ymin_type)
 			graph->flags |= ZBX_FLAG_LLD_GRAPH_UPDATE_YMIN_TYPE;
 
 		ZBX_DBROW2UINT64(graph->ymin_itemid, row[14]);
+		graph->ymin_itemid_orig = graph->ymin_itemid;
 
-		if ((unsigned char)atoi(row[15]) != ymax_type)
+		graph->ymax_type_orig = (unsigned char)atoi(row[15]);
+		if (graph->ymax_type_orig != ymax_type)
 			graph->flags |= ZBX_FLAG_LLD_GRAPH_UPDATE_YMAX_TYPE;
 
 		ZBX_DBROW2UINT64(graph->ymax_itemid, row[16]);
+		graph->ymax_itemid_orig = graph->ymax_itemid;
 
 		graph->lastcheck = atoi(row[17]);
 		graph->ts_delete = atoi(row[18]);
@@ -247,10 +286,8 @@ static void	lld_graphs_get(zbx_uint64_t parent_graphid, zbx_vector_ptr_t *graphs
 static void	lld_gitems_get(zbx_uint64_t parent_graphid, zbx_vector_ptr_t *gitems_proto,
 		zbx_vector_ptr_t *graphs)
 {
-	int			i, index;
+	int			i;
 	zbx_lld_graph_t		*graph;
-	zbx_lld_gitem_t		*gitem;
-	zbx_uint64_t		graphid;
 	zbx_vector_uint64_t	graphids;
 	DB_RESULT		result;
 	DB_ROW			row;
@@ -286,17 +323,27 @@ static void	lld_gitems_get(zbx_uint64_t parent_graphid, zbx_vector_ptr_t *gitems
 
 	while (NULL != (row = DBfetch(result)))
 	{
-		gitem = (zbx_lld_gitem_t *)zbx_malloc(NULL, sizeof(zbx_lld_gitem_t));
+		int			index;
+		zbx_uint64_t		graphid;
+		zbx_lld_gitem_t		*gitem = (zbx_lld_gitem_t *)zbx_malloc(NULL, sizeof(zbx_lld_gitem_t));
 
 		ZBX_STR2UINT64(gitem->gitemid, row[0]);
 		ZBX_STR2UINT64(graphid, row[1]);
 		ZBX_STR2UINT64(gitem->itemid, row[2]);
+		gitem->itemid_orig = gitem->itemid;
 		ZBX_STR2UCHAR(gitem->drawtype, row[3]);
+		gitem->drawtype_orig = gitem->drawtype;
 		gitem->sortorder = atoi(row[4]);
+		gitem->sortorder_orig = gitem->sortorder;
 		gitem->color = zbx_strdup(NULL, row[5]);
+		gitem->color_orig = NULL;
 		ZBX_STR2UCHAR(gitem->yaxisside, row[6]);
+		gitem->yaxisside_orig = gitem->yaxisside;
 		ZBX_STR2UCHAR(gitem->calc_fnc, row[7]);
+		gitem->calc_fnc_orig = gitem->calc_fnc;
 		ZBX_STR2UCHAR(gitem->type, row[8]);
+		gitem->type_orig = gitem->type;
+		gitem->graphid = graphid;
 
 		gitem->flags = ZBX_FLAG_LLD_GITEM_UNSET;
 
@@ -351,8 +398,6 @@ static void	lld_items_get(const zbx_vector_ptr_t *gitems_proto, zbx_uint64_t ymi
 {
 	DB_RESULT		result;
 	DB_ROW			row;
-	const zbx_lld_gitem_t	*gitem;
-	zbx_lld_item_t		*item;
 	zbx_vector_uint64_t	itemids;
 	int			i;
 
@@ -362,7 +407,7 @@ static void	lld_items_get(const zbx_vector_ptr_t *gitems_proto, zbx_uint64_t ymi
 
 	for (i = 0; i < gitems_proto->values_num; i++)
 	{
-		gitem = (zbx_lld_gitem_t *)gitems_proto->values[i];
+		const zbx_lld_gitem_t	*gitem = (const zbx_lld_gitem_t *)gitems_proto->values[i];
 
 		zbx_vector_uint64_append(&itemids, gitem->itemid);
 	}
@@ -394,7 +439,7 @@ static void	lld_items_get(const zbx_vector_ptr_t *gitems_proto, zbx_uint64_t ymi
 
 		while (NULL != (row = DBfetch(result)))
 		{
-			item = (zbx_lld_item_t *)zbx_malloc(NULL, sizeof(zbx_lld_item_t));
+			zbx_lld_item_t	*item = (zbx_lld_item_t *)zbx_malloc(NULL, sizeof(zbx_lld_item_t));
 
 			ZBX_STR2UINT64(item->itemid, row[0]);
 			ZBX_STR2UCHAR(item->flags, row[1]);
@@ -462,7 +507,7 @@ static zbx_lld_graph_t	*lld_graph_get(zbx_vector_ptr_t *graphs, const zbx_vector
 
 	for (i = 0; i < item_links->values_num; i++)
 	{
-		const zbx_lld_item_link_t	*item_link = (zbx_lld_item_link_t *)item_links->values[i];
+		const zbx_lld_item_link_t	*item_link = (const zbx_lld_item_link_t *)item_links->values[i];
 
 		if (NULL != (graph = lld_graph_by_item(graphs, item_link->itemid)))
 			return graph;
@@ -511,18 +556,17 @@ static int	lld_item_get(zbx_uint64_t itemid_proto, const zbx_vector_ptr_t *items
 }
 
 static int	lld_gitems_make(const zbx_vector_ptr_t *gitems_proto, zbx_vector_ptr_t *gitems,
-		const zbx_vector_ptr_t *items, const zbx_vector_ptr_t *item_links)
+		const zbx_vector_ptr_t *items, const zbx_vector_ptr_t *item_links, uint64_t grpahid)
 {
 	int			i, ret = FAIL;
-	const zbx_lld_gitem_t	*gitem_proto;
 	zbx_lld_gitem_t		*gitem;
-	zbx_uint64_t		itemid;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
 	for (i = 0; i < gitems_proto->values_num; i++)
 	{
-		gitem_proto = (zbx_lld_gitem_t *)gitems_proto->values[i];
+		zbx_uint64_t		itemid;
+		const zbx_lld_gitem_t	*gitem_proto = (const zbx_lld_gitem_t *)gitems_proto->values[i];
 
 		if (SUCCEED != lld_item_get(gitem_proto->itemid, items, item_links, &itemid))
 			goto out;
@@ -533,12 +577,20 @@ static int	lld_gitems_make(const zbx_vector_ptr_t *gitems_proto, zbx_vector_ptr_
 
 			gitem->gitemid = 0;
 			gitem->itemid = itemid;
+			gitem->itemid_orig = gitem->itemid;
 			gitem->drawtype = gitem_proto->drawtype;
+			gitem->drawtype_orig = gitem->drawtype;
 			gitem->sortorder = gitem_proto->sortorder;
+			gitem->sortorder_orig = gitem->sortorder;
 			gitem->color = zbx_strdup(NULL, gitem_proto->color);
+			gitem->color_orig = NULL;
 			gitem->yaxisside = gitem_proto->yaxisside;
+			gitem->yaxisside_orig = gitem->yaxisside;
 			gitem->calc_fnc = gitem_proto->calc_fnc;
+			gitem->calc_fnc_orig = gitem->calc_fnc;
 			gitem->type = gitem_proto->type;
+			gitem->type_orig = gitem->type;
+			gitem->graphid = grpahid;
 
 			gitem->flags = ZBX_FLAG_LLD_GITEM_DISCOVERED;
 
@@ -550,42 +602,49 @@ static int	lld_gitems_make(const zbx_vector_ptr_t *gitems_proto, zbx_vector_ptr_
 
 			if (gitem->itemid != itemid)
 			{
+				gitem->itemid_orig = gitem->itemid;
 				gitem->itemid = itemid;
 				gitem->flags |= ZBX_FLAG_LLD_GITEM_UPDATE_ITEMID;
 			}
 
 			if (gitem->drawtype != gitem_proto->drawtype)
 			{
+				gitem->drawtype_orig = gitem->drawtype;
 				gitem->drawtype = gitem_proto->drawtype;
 				gitem->flags |= ZBX_FLAG_LLD_GITEM_UPDATE_DRAWTYPE;
 			}
 
 			if (gitem->sortorder != gitem_proto->sortorder)
 			{
+				gitem->sortorder_orig = gitem->sortorder;
 				gitem->sortorder = gitem_proto->sortorder;
 				gitem->flags |= ZBX_FLAG_LLD_GITEM_UPDATE_SORTORDER;
 			}
 
 			if (0 != strcmp(gitem->color, gitem_proto->color))
 			{
-				gitem->color = zbx_strdup(gitem->color, gitem_proto->color);
+				gitem->color_orig = gitem->color;
+				gitem->color = zbx_strdup(NULL, gitem_proto->color);
 				gitem->flags |= ZBX_FLAG_LLD_GITEM_UPDATE_COLOR;
 			}
 
 			if (gitem->yaxisside != gitem_proto->yaxisside)
 			{
+				gitem->yaxisside_orig = gitem->yaxisside;
 				gitem->yaxisside = gitem_proto->yaxisside;
 				gitem->flags |= ZBX_FLAG_LLD_GITEM_UPDATE_YAXISSIDE;
 			}
 
 			if (gitem->calc_fnc != gitem_proto->calc_fnc)
 			{
+				gitem->calc_fnc_orig = gitem->calc_fnc;
 				gitem->calc_fnc = gitem_proto->calc_fnc;
 				gitem->flags |= ZBX_FLAG_LLD_GITEM_UPDATE_CALC_FNC;
 			}
 
 			if (gitem->type != gitem_proto->type)
 			{
+				gitem->type_orig = gitem->type;
 				gitem->type = gitem_proto->type;
 				gitem->flags |= ZBX_FLAG_LLD_GITEM_UPDATE_TYPE;
 			}
@@ -620,7 +679,6 @@ static void 	lld_graph_make(const zbx_vector_ptr_t *gitems_proto, zbx_vector_ptr
 		unsigned char discover_proto, const zbx_lld_row_t *lld_row, const zbx_vector_ptr_t *lld_macro_paths)
 {
 	zbx_lld_graph_t			*graph = NULL;
-	char				*buffer = NULL;
 	const struct zbx_json_parse	*jp_row = &lld_row->jp_row;
 	zbx_uint64_t			ymin_itemid, ymax_itemid;
 
@@ -638,9 +696,11 @@ static void 	lld_graph_make(const zbx_vector_ptr_t *gitems_proto, zbx_vector_ptr
 
 	if (NULL != (graph = lld_graph_get(graphs, &lld_row->item_links)))
 	{
-		buffer = zbx_strdup(buffer, name_proto);
+		char	*buffer = zbx_strdup(NULL, name_proto);
+
 		substitute_lld_macros(&buffer, jp_row, lld_macro_paths, ZBX_MACRO_ANY, NULL, 0);
 		zbx_lrtrim(buffer, ZBX_WHITESPACE);
+
 		if (0 != strcmp(graph->name, buffer))
 		{
 			graph->name_orig = graph->name;
@@ -648,6 +708,8 @@ static void 	lld_graph_make(const zbx_vector_ptr_t *gitems_proto, zbx_vector_ptr
 			buffer = NULL;
 			graph->flags |= ZBX_FLAG_LLD_GRAPH_UPDATE_NAME;
 		}
+		else
+			zbx_free(buffer);
 
 		lld_override_graph(&lld_row->overrides, graph->name, &discover_proto);
 
@@ -656,12 +718,14 @@ static void 	lld_graph_make(const zbx_vector_ptr_t *gitems_proto, zbx_vector_ptr
 
 		if (graph->ymin_itemid != ymin_itemid)
 		{
+			graph->ymin_itemid_orig = graph->ymin_itemid;
 			graph->ymin_itemid = ymin_itemid;
 			graph->flags |= ZBX_FLAG_LLD_GRAPH_UPDATE_YMIN_ITEMID;
 		}
 
 		if (graph->ymax_itemid != ymax_itemid)
 		{
+			graph->ymax_itemid_orig = graph->ymax_itemid;
 			graph->ymax_itemid = ymax_itemid;
 			graph->flags |= ZBX_FLAG_LLD_GRAPH_UPDATE_YMAX_ITEMID;
 		}
@@ -698,12 +762,11 @@ static void 	lld_graph_make(const zbx_vector_ptr_t *gitems_proto, zbx_vector_ptr
 		zbx_vector_ptr_append(graphs, graph);
 	}
 
-	if (SUCCEED != lld_gitems_make(gitems_proto, &graph->gitems, items, &lld_row->item_links))
+	if (SUCCEED != lld_gitems_make(gitems_proto, &graph->gitems, items, &lld_row->item_links, graph->graphid))
 		return;
 
 	graph->flags |= ZBX_FLAG_LLD_GRAPH_DISCOVERED;
 out:
-	zbx_free(buffer);
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
 }
 
@@ -936,13 +999,11 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 		double percent_left, double percent_right, unsigned char ymin_type, unsigned char ymax_type)
 {
 	int			ret = SUCCEED, i, j, new_graphs = 0, upd_graphs = 0, new_gitems = 0;
-	zbx_lld_graph_t		*graph;
-	zbx_lld_gitem_t		*gitem;
 	zbx_vector_ptr_t	upd_gitems; 	/* the ordered list of graphs_items which will be updated */
 	zbx_vector_uint64_t	del_gitemids;
 
 	zbx_uint64_t		graphid = 0, gitemid = 0;
-	char			*sql = NULL, *name_esc, *color_esc;
+	char			*sql = NULL;
 	size_t			sql_alloc = 8 * ZBX_KIBIBYTE, sql_offset = 0;
 	zbx_db_insert_t		db_insert, db_insert_gdiscovery, db_insert_gitems;
 
@@ -953,7 +1014,7 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 
 	for (i = 0; i < graphs->values_num; i++)
 	{
-		graph = (zbx_lld_graph_t *)graphs->values[i];
+		const zbx_lld_graph_t	*graph = (const zbx_lld_graph_t *)graphs->values[i];
 
 		if (0 == (graph->flags & ZBX_FLAG_LLD_GRAPH_DISCOVERED))
 			continue;
@@ -963,19 +1024,30 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 		else if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE))
 			upd_graphs++;
 
+		if (0 != graph->graphid)
+		{
+			zbx_audit_graph_create_entry(AUDIT_ACTION_UPDATE, graph->graphid, (NULL == graph->name_orig) ?
+					graph->name : graph->name_orig, ZBX_FLAG_DISCOVERY_CREATED);
+		}
+
 		for (j = 0; j < graph->gitems.values_num; j++)
 		{
-			gitem = (zbx_lld_gitem_t *)graph->gitems.values[j];
+			zbx_lld_gitem_t	*gitem = (zbx_lld_gitem_t *)graph->gitems.values[j];
 
 			if (0 != (gitem->flags & ZBX_FLAG_LLD_GITEM_DELETE))
 			{
 				zbx_vector_uint64_append(&del_gitemids, gitem->gitemid);
+
+				zbx_audit_graph_update_json_delete_gitems(graph->graphid,
+						ZBX_FLAG_DISCOVERY_CREATED, gitem->gitemid);
 				continue;
 			}
 
 			if (0 == (gitem->flags & ZBX_FLAG_LLD_GITEM_DISCOVERED))
 				continue;
 
+			gitem->graphid = graph->graphid;
+
 			if (0 == gitem->gitemid)
 				new_gitems++;
 			else if (0 != (gitem->flags & ZBX_FLAG_LLD_GITEM_UPDATE))
@@ -1027,7 +1099,7 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 
 	for (i = 0; i < graphs->values_num; i++)
 	{
-		graph = (zbx_lld_graph_t *)graphs->values[i];
+		zbx_lld_graph_t	*graph = (zbx_lld_graph_t *)graphs->values[i];
 
 		if (0 == (graph->flags & ZBX_FLAG_LLD_GRAPH_DISCOVERED))
 			continue;
@@ -1039,6 +1111,14 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 					(int)show_3d, percent_left, percent_right, (int)ymin_type, graph->ymin_itemid,
 					(int)ymax_type, graph->ymax_itemid, (int)ZBX_FLAG_DISCOVERY_CREATED);
 
+			zbx_audit_graph_create_entry(AUDIT_ACTION_ADD, graphid, graph->name,
+					ZBX_FLAG_DISCOVERY_CREATED);
+
+			zbx_audit_graph_update_json_add_data(graphid, graph->name, width, height, yaxismin, yaxismax, 0,
+					(int)show_work_period, (int)show_triggers, (int)graphtype, (int)show_legend,
+					(int)show_3d, percent_left, percent_right, (int)ymin_type, (int)ymax_type,
+					graph->ymin_itemid, graph->ymax_itemid,	ZBX_FLAG_DISCOVERY_CREATED, 0);
+
 			zbx_db_insert_add_values(&db_insert_gdiscovery, graphid, parent_graphid);
 
 			graph->graphid = graphid++;
@@ -1051,22 +1131,32 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 
 			if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_NAME))
 			{
-				name_esc = DBdyn_escape_string(graph->name);
+				char	*name_esc = DBdyn_escape_string(graph->name);
+
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "name='%s'", name_esc);
 				zbx_free(name_esc);
 				d = ",";
+
+				zbx_audit_graph_update_json_update_name(graph->graphid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+						graph->name_orig, graph->name);
 			}
 
 			if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_WIDTH))
 			{
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%swidth=%d", d, width);
 				d = ",";
+
+				zbx_audit_graph_update_json_update_width(graph->graphid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, graph->width_orig, width);
 			}
 
 			if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_HEIGHT))
 			{
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%sheight=%d", d, height);
 				d = ",";
+
+				zbx_audit_graph_update_json_update_height(graph->graphid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, graph->height_orig, height);
 			}
 
 			if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_YAXISMIN))
@@ -1074,6 +1164,9 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%syaxismin=" ZBX_FS_DBL64_SQL, d,
 						yaxismin);
 				d = ",";
+
+				zbx_audit_graph_update_json_update_yaxismin(graph->graphid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, graph->yaxismin_orig, yaxismin);
 			}
 
 			if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_YAXISMAX))
@@ -1081,6 +1174,9 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%syaxismax=" ZBX_FS_DBL64_SQL, d,
 						yaxismax);
 				d = ",";
+
+				zbx_audit_graph_update_json_update_yaxismax(graph->graphid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, graph->yaxismax_orig, yaxismax);
 			}
 
 			if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_SHOW_WORK_PERIOD))
@@ -1088,6 +1184,10 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%sshow_work_period=%d", d,
 						(int)show_work_period);
 				d = ",";
+
+				zbx_audit_graph_update_json_update_show_work_period(graph->graphid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, graph->show_work_period_orig,
+						(int)show_work_period);
 			}
 
 			if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_SHOW_TRIGGERS))
@@ -1095,6 +1195,10 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%sshow_triggers=%d", d,
 						(int)show_triggers);
 				d = ",";
+
+				zbx_audit_graph_update_json_update_show_triggers(graph->graphid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, graph->show_triggers_orig,
+						(int)show_triggers);
 			}
 
 			if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_GRAPHTYPE))
@@ -1102,6 +1206,10 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%sgraphtype=%d", d,
 						(int)graphtype);
 				d = ",";
+
+				zbx_audit_graph_update_json_update_graphtype(graph->graphid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, (int)graph->graphtype_orig,
+						(int)graphtype);
 			}
 
 			if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_SHOW_LEGEND))
@@ -1109,12 +1217,20 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%sshow_legend=%d", d,
 						(int)show_legend);
 				d = ",";
+
+				zbx_audit_graph_update_json_update_show_legend(graph->graphid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, (int)graph->show_legend_orig,
+						(int)show_legend);
 			}
 
 			if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_SHOW_3D))
 			{
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%sshow_3d=%d", d, (int)show_3d);
 				d = ",";
+
+				zbx_audit_graph_update_json_update_show_3d(graph->graphid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, (int)graph->show_3d_orig,
+						(int)show_3d);
 			}
 
 			if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_PERCENT_LEFT))
@@ -1122,6 +1238,10 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%spercent_left=" ZBX_FS_DBL64_SQL, d,
 						percent_left);
 				d = ",";
+
+				zbx_audit_graph_update_json_update_percent_left(graph->graphid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, graph->percent_left_orig,
+						percent_left);
 			}
 
 			if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_PERCENT_RIGHT))
@@ -1129,6 +1249,10 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
 						"%spercent_right=" ZBX_FS_DBL64_SQL, d, percent_right);
 				d = ",";
+
+				zbx_audit_graph_update_json_update_percent_right(graph->graphid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, graph->percent_right_orig,
+						percent_right);
 			}
 
 			if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_YMIN_TYPE))
@@ -1136,6 +1260,10 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%symin_type=%d", d,
 						(int)ymin_type);
 				d = ",";
+
+				zbx_audit_graph_update_json_update_ymin_type(graph->graphid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, (int)graph->ymin_type_orig,
+						(int)ymin_type);
 			}
 
 			if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_YMIN_ITEMID))
@@ -1143,6 +1271,10 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%symin_itemid=%s", d,
 						DBsql_id_ins(graph->ymin_itemid));
 				d = ",";
+
+				zbx_audit_graph_update_json_update_ymin_itemid(graph->graphid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, graph->ymin_itemid_orig,
+						graph->ymin_itemid);
 			}
 
 			if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_YMAX_TYPE))
@@ -1150,12 +1282,20 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%symax_type=%d", d,
 						(int)ymax_type);
 				d = ",";
+
+				zbx_audit_graph_update_json_update_ymax_type(graph->graphid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, (int)graph->ymax_type_orig,
+						(int)ymax_type);
 			}
 
 			if (0 != (graph->flags & ZBX_FLAG_LLD_GRAPH_UPDATE_YMAX_ITEMID))
 			{
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%symax_itemid=%s", d,
 						DBsql_id_ins(graph->ymax_itemid));
+
+				zbx_audit_graph_update_json_update_ymax_itemid(graph->graphid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, graph->ymax_itemid_orig,
+						graph->ymax_itemid);
 			}
 
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, " where graphid=" ZBX_FS_UI64 ";\n",
@@ -1164,7 +1304,7 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 
 		for (j = 0; j < graph->gitems.values_num; j++)
 		{
-			gitem = (zbx_lld_gitem_t *)graph->gitems.values[j];
+			zbx_lld_gitem_t	*gitem = (zbx_lld_gitem_t *)graph->gitems.values[j];
 
 			if (0 != (gitem->flags & ZBX_FLAG_LLD_GITEM_DELETE))
 				continue;
@@ -1178,6 +1318,11 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 						(int)gitem->drawtype, gitem->sortorder, gitem->color,
 						(int)gitem->yaxisside, (int)gitem->calc_fnc, (int)gitem->type);
 
+				zbx_audit_graph_update_json_add_gitems(graph->graphid, (int)ZBX_FLAG_DISCOVERY_CREATED,
+						gitemid, (int)gitem->drawtype, gitem->sortorder, gitem->color,
+						(int)gitem->yaxisside, (int)gitem->calc_fnc,(int)gitem->type,
+						gitem->itemid);
+
 				gitem->gitemid = gitemid++;
 			}
 		}
@@ -1185,9 +1330,8 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 
 	for (i = 0; i < upd_gitems.values_num; i++)
 	{
-		const char	*d = "";
-
-		gitem = (zbx_lld_gitem_t *)upd_gitems.values[i];
+		const char		*d = "";
+		const zbx_lld_gitem_t	*gitem = (const zbx_lld_gitem_t *)upd_gitems.values[i];
 
 		zbx_strcpy_alloc(&sql, &sql_alloc, &sql_offset, "update graphs_items set ");
 
@@ -1195,26 +1339,43 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 		{
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "itemid=" ZBX_FS_UI64, gitem->itemid);
 			d = ",";
+
+			zbx_audit_graph_update_json_update_gitem_update_itemid(gitem->graphid,
+					(int)ZBX_FLAG_DISCOVERY_CREATED, gitem->gitemid, gitem->itemid_orig,
+					gitem->itemid);
 		}
 
 		if (0 != (gitem->flags & ZBX_FLAG_LLD_GITEM_UPDATE_DRAWTYPE))
 		{
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%sdrawtype=%d", d, (int)gitem->drawtype);
 			d = ",";
+
+			zbx_audit_graph_update_json_update_gitem_update_drawtype(gitem->graphid,
+					(int)ZBX_FLAG_DISCOVERY_CREATED, gitem->gitemid, (int)gitem->drawtype_orig,
+					(int)gitem->drawtype);
 		}
 
 		if (0 != (gitem->flags & ZBX_FLAG_LLD_GITEM_UPDATE_SORTORDER))
 		{
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%ssortorder=%d", d, gitem->sortorder);
 			d = ",";
+
+			zbx_audit_graph_update_json_update_gitem_update_sortorder(gitem->graphid,
+					(int)ZBX_FLAG_DISCOVERY_CREATED, gitem->gitemid, gitem->sortorder_orig,
+					gitem->sortorder);
 		}
 
 		if (0 != (gitem->flags & ZBX_FLAG_LLD_GITEM_UPDATE_COLOR))
 		{
-			color_esc = DBdyn_escape_string(gitem->color);
+			char	*color_esc = DBdyn_escape_string(gitem->color);
+
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%scolor='%s'", d, color_esc);
 			zbx_free(color_esc);
 			d = ",";
+
+			zbx_audit_graph_update_json_update_gitem_update_color(gitem->graphid,
+					(int)ZBX_FLAG_DISCOVERY_CREATED, gitem->gitemid, gitem->color_orig,
+					gitem->color);
 		}
 
 		if (0 != (gitem->flags & ZBX_FLAG_LLD_GITEM_UPDATE_YAXISSIDE))
@@ -1222,17 +1383,31 @@ static int	lld_graphs_save(zbx_uint64_t hostid, zbx_uint64_t parent_graphid, zbx
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%syaxisside=%d", d,
 					(int)gitem->yaxisside);
 			d = ",";
+
+			zbx_audit_graph_update_json_update_gitem_update_yaxisside(gitem->graphid,
+					(int)ZBX_FLAG_DISCOVERY_CREATED, gitem->gitemid, (int)gitem->yaxisside_orig,
+					(int)gitem->yaxisside);
 		}
 
 		if (0 != (gitem->flags & ZBX_FLAG_LLD_GITEM_UPDATE_CALC_FNC))
 		{
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%scalc_fnc=%d", d, (int)gitem->calc_fnc);
 			d = ",";
+
+			zbx_audit_graph_update_json_update_gitem_update_calc_fnc(gitem->graphid,
+					(int)ZBX_FLAG_DISCOVERY_CREATED, gitem->gitemid, (int)gitem->calc_fnc_orig,
+					(int)gitem->calc_fnc);
 		}
 
 		if (0 != (gitem->flags & ZBX_FLAG_LLD_GITEM_UPDATE_TYPE))
+		{
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%stype=%d", d, (int)gitem->type);
 
+			zbx_audit_graph_update_json_update_gitem_update_type(gitem->graphid,
+					(int)ZBX_FLAG_DISCOVERY_CREATED, gitem->gitemid, (int)gitem->type_orig,
+					(int)gitem->type);
+		}
+
 		zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, " where gitemid=" ZBX_FS_UI64 ";\n",
 				gitem->gitemid);
 	}
diff --git a/src/zabbix_server/lld/lld_host.c b/src/zabbix_server/lld/lld_host.c
index 27d8655d5d4..7cd513b5d91 100644
--- a/src/zabbix_server/lld/lld_host.c
+++ b/src/zabbix_server/lld/lld_host.c
@@ -452,7 +452,7 @@ static void	lld_hosts_get(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts, z
 		host->tls_psk_identity_orig = NULL;
 		host->tls_psk_orig = NULL;
 		host->jp_row = NULL;
-		host->inventory_mode = 0;
+		host->inventory_mode = HOST_INVENTORY_DISABLED;
 		host->status = 0;
 		host->custom_interfaces_orig = 0;
 		host->proxy_hostid_orig = 0;
@@ -1101,8 +1101,10 @@ static void	lld_hostgroups_make(const zbx_vector_uint64_t *groupids, zbx_vector_
 				/* host groups which should be unlinked */
 				ZBX_STR2UINT64(hostgroupid, row[2]);
 				zbx_vector_uint64_append(del_hostgroupids, hostgroupid);
+
 				zbx_audit_host_create_entry(AUDIT_ACTION_UPDATE, hostid,
-						(NULL == host->name_orig) ? host->name : host->name_orig);
+						(NULL == host->host_orig) ? host->host : host->host_orig);
+
 				zbx_audit_hostgroup_update_json_delete_group(hostid, hostgroupid, groupid);
 			}
 			else
@@ -2734,14 +2736,16 @@ static void	lld_hosts_save(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts,
 		else
 		{
 			zbx_audit_host_create_entry(AUDIT_ACTION_UPDATE, host->hostid,
-					(NULL == host->name_orig) ? host->name : host->name_orig);
+					(NULL == host->host_orig) ? host->host : host->host_orig);
 
 			if (0 != (host->flags & ZBX_FLAG_LLD_HOST_UPDATE))
 				upd_hosts++;
 
 			if (host->inventory_mode_orig != host->inventory_mode)
 			{
-				zbx_audit_host_update_json_add_inventory_mode(host->hostid, (int)host->inventory_mode);
+				zbx_audit_host_update_json_update_inventory_mode(host->hostid,
+						(int)host->inventory_mode_orig, (int)host->inventory_mode);
+
 				if (HOST_INVENTORY_DISABLED == host->inventory_mode)
 					zbx_vector_uint64_append(&del_host_inventory_hostids, host->hostid);
 				else if (HOST_INVENTORY_DISABLED == host->inventory_mode_orig)
@@ -2780,8 +2784,10 @@ static void	lld_hosts_save(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts,
 			else if (0 != (interface->flags & ZBX_FLAG_LLD_INTERFACE_REMOVE))
 			{
 				zbx_vector_uint64_append(&del_interfaceids, interface->interfaceid);
+
 				zbx_audit_host_create_entry(AUDIT_ACTION_UPDATE,
-						host->hostid, (NULL == host->name_orig) ? host->name : host->name_orig);
+						host->hostid, (NULL == host->host_orig) ? host->host : host->host_orig);
+
 				zbx_audit_host_update_json_delete_interface(
 						host->hostid, interface->interfaceid);
 			}
@@ -2789,8 +2795,10 @@ static void	lld_hosts_save(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts,
 			if (0 != (interface->flags & ZBX_FLAG_LLD_INTERFACE_SNMP_REMOVE))
 			{
 				zbx_vector_uint64_append(&del_snmp_ids, interface->interfaceid);
+
 				zbx_audit_host_create_entry(AUDIT_ACTION_UPDATE,
-						host->hostid, (NULL == host->name_orig) ? host->name : host->name_orig);
+						host->hostid, (NULL == host->host_orig) ? host->host : host->host_orig);
+
 				zbx_audit_host_update_json_delete_interface(
 						host->hostid, interface->interfaceid);
 			}
@@ -2824,7 +2832,8 @@ static void	lld_hosts_save(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts,
 				zbx_vector_uint64_append(&del_hostmacroids, hostmacro->hostmacroid);
 
 				zbx_audit_host_create_entry(AUDIT_ACTION_UPDATE,
-						host->hostid, (NULL == host->name_orig) ? host->name : host->name_orig);
+						host->hostid, (NULL == host->host_orig) ? host->host : host->host_orig);
+
 				zbx_audit_host_update_json_delete_hostmacro(
 						host->hostid, hostmacro->hostmacroid);
 			}
@@ -2845,7 +2854,7 @@ static void	lld_hosts_save(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts,
 				zbx_vector_uint64_append(&del_tagids, host->tags.values[j]->tagid);
 
 				zbx_audit_host_prototype_create_entry(AUDIT_ACTION_UPDATE, host->hostid,
-						host->name);
+						host->host);
 				zbx_audit_host_update_json_delete_tag(host->hostid, host->tags.values[j]->tagid);
 			}
 		}
@@ -2950,18 +2959,22 @@ static void	lld_hosts_save(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts,
 					(int)host->status, (int)ZBX_FLAG_DISCOVERY_CREATED, (int)tls_connect,
 					(int)tls_accept, tls_issuer, tls_subject, tls_psk_identity, tls_psk,
 					(int)host->custom_interfaces);
-			zbx_audit_host_create_entry(AUDIT_ACTION_ADD, host->hostid, host->name);
+
+			zbx_audit_host_create_entry(AUDIT_ACTION_ADD, host->hostid, host->host);
 
 			zbx_db_insert_add_values(&db_insert_hdiscovery, host->hostid, parent_hostid, host_proto);
 
+			if (HOST_INVENTORY_DISABLED != host->inventory_mode)
+			{
+				zbx_db_insert_add_values(&db_insert_hinventory, host->hostid,
+						(int)host->inventory_mode);
+			}
+
 			zbx_audit_host_update_json_add_details(host->hostid, host->host, proxy_hostid,
 					(int)ipmi_authtype, (int)ipmi_privilege, ipmi_username, ipmi_password,
 					(int)host->status, (int)ZBX_FLAG_DISCOVERY_CREATED, (int)tls_connect,
 					(int)tls_accept, tls_issuer, tls_subject, tls_psk_identity, tls_psk,
-					host->custom_interfaces);
-
-			if (HOST_INVENTORY_DISABLED != host->inventory_mode)
-				zbx_db_insert_add_values(&db_insert_hinventory, host->hostid, (int)host->inventory_mode);
+					host->custom_interfaces, host->inventory_mode);
 		}
 		else
 		{
@@ -3100,11 +3113,13 @@ static void	lld_hosts_save(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts,
 					zbx_snprintf_alloc(&sql1, &sql1_alloc, &sql1_offset,
 							"%stls_psk_identity='%s'", d, value_esc);
 					d = ",";
+					zbx_free(value_esc);
 
 					zbx_audit_host_update_json_update_tls_psk_identity(host->hostid,
-							host->tls_psk_identity_orig, value_esc);
-
-					zbx_free(value_esc);
+							(0 == strcmp("", host->tls_psk_identity_orig) ?
+							"" : ZBX_MACRO_SECRET_MASK),
+							(0 == strcmp("", tls_psk_identity) ?
+							"" : ZBX_MACRO_SECRET_MASK));
 				}
 				if (0 != (host->flags & ZBX_FLAG_LLD_HOST_UPDATE_TLS_PSK))
 				{
@@ -3113,11 +3128,12 @@ static void	lld_hosts_save(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts,
 					zbx_snprintf_alloc(&sql1, &sql1_alloc, &sql1_offset,
 							"%stls_psk='%s'", d, value_esc);
 					d = ",";
+					zbx_free(value_esc);
 
 					zbx_audit_host_update_json_update_tls_psk(host->hostid,
-							host->tls_psk_orig, value_esc);
-
-					zbx_free(value_esc);
+							(0 == strcmp("", host->tls_psk_orig) ?
+							"" : ZBX_MACRO_SECRET_MASK),
+							(0 == strcmp("", tls_psk) ? "" : ZBX_MACRO_SECRET_MASK));
 				}
 				if (0 != (host->flags & ZBX_FLAG_LLD_HOST_UPDATE_CUSTOM_INTERFACES))
 				{
diff --git a/src/zabbix_server/lld/lld_item.c b/src/zabbix_server/lld/lld_item.c
index 10d3b8855c6..089c4856353 100644
--- a/src/zabbix_server/lld/lld_item.c
+++ b/src/zabbix_server/lld/lld_item.c
@@ -3259,7 +3259,8 @@ static void	lld_item_prepare_update(const zbx_lld_item_prototype_t *item_prototy
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%spassword='%s'", d, value_esc);
 		d = ",";
 		zbx_audit_item_update_json_update_password(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
-				ZBX_MACRO_SECRET_MASK, ZBX_MACRO_SECRET_MASK);
+				(0 == strcmp("", item->password_orig) ? "" : ZBX_MACRO_SECRET_MASK),
+				(0 == strcmp("", item->password) ? "" : ZBX_MACRO_SECRET_MASK));
 		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_PUBLICKEY))
@@ -3441,7 +3442,8 @@ static void	lld_item_prepare_update(const zbx_lld_item_prototype_t *item_prototy
 		zbx_snprintf_alloc(sql, sql_alloc, sql_offset, "%sssl_key_password='%s'", d, value_esc);
 		d = ",";
 		zbx_audit_item_update_json_update_ssl_key_password(item->itemid, (int)ZBX_FLAG_DISCOVERY_CREATED,
-				ZBX_MACRO_SECRET_MASK, ZBX_MACRO_SECRET_MASK);
+				(0 == strcmp("", item->ssl_key_password_orig) ? "" : ZBX_MACRO_SECRET_MASK),
+				(0 == strcmp("", item->ssl_key_password) ? "" : ZBX_MACRO_SECRET_MASK));
 		zbx_free(value_esc);
 	}
 	if (0 != (item->flags & ZBX_FLAG_LLD_ITEM_UPDATE_VERIFY_PEER))
diff --git a/src/zabbix_server/lld/lld_trigger.c b/src/zabbix_server/lld/lld_trigger.c
index 1a04d4b696d..238ef0431b2 100644
--- a/src/zabbix_server/lld/lld_trigger.c
+++ b/src/zabbix_server/lld/lld_trigger.c
@@ -22,6 +22,7 @@
 #include "log.h"
 #include "zbxalgo.h"
 #include "zbxserver.h"
+#include "../../libs/zbxaudit/audit_trigger.h"
 
 typedef struct
 {
@@ -101,7 +102,12 @@ typedef struct
 	int			lastcheck;
 	int			ts_delete;
 	unsigned char		status;
+	unsigned char		priority_orig;
 	unsigned char		priority;
+	unsigned char		manual_close_orig;
+	unsigned char		correlation_mode_orig;
+	unsigned char		recovery_mode_orig;
+	unsigned char		type_orig;
 }
 zbx_lld_trigger_t;
 
@@ -143,7 +149,9 @@ zbx_lld_dependency_t;
 typedef struct
 {
 	zbx_uint64_t	triggertagid;
+	char		*tag_orig;
 	char		*tag;
+	char		*value_orig;
 	char		*value;
 #define ZBX_FLAG_LLD_TAG_UNSET				__UINT64_C(0x00)
 #define ZBX_FLAG_LLD_TAG_DISCOVERED			__UINT64_C(0x01)
@@ -224,7 +232,9 @@ zbx_lld_trigger_node_iter_t;
 static void	lld_tag_free(zbx_lld_tag_t *tag)
 {
 	zbx_free(tag->tag);
+	zbx_free(tag->tag_orig);
 	zbx_free(tag->value);
+	zbx_free(tag->value_orig);
 	zbx_free(tag);
 }
 
@@ -312,14 +322,16 @@ static void	lld_trigger_prototypes_get(zbx_uint64_t lld_ruleid, zbx_vector_ptr_t
 	char				*errmsg = NULL;
 
 	result = DBselect(
-			"select distinct t.triggerid,t.description,t.expression,t.status,t.type,t.priority,t.comments,"
+			"select t.triggerid,t.description,t.expression,t.status,t.type,t.priority,t.comments,"
 				"t.url,t.recovery_expression,t.recovery_mode,t.correlation_mode,t.correlation_tag,"
 				"t.manual_close,t.opdata,t.discover,t.event_name"
-			" from triggers t,functions f,items i,item_discovery id"
-			" where t.triggerid=f.triggerid"
-				" and f.itemid=i.itemid"
-				" and i.itemid=id.itemid"
-				" and id.parent_itemid=" ZBX_FS_UI64,
+			" from triggers t"
+			" where t.triggerid in (select distinct tg.triggerid"
+				" from triggers tg,functions f,items i,item_discovery id"
+				" where tg.triggerid=f.triggerid"
+					" and f.itemid=i.itemid"
+					" and i.itemid=id.itemid"
+					" and id.parent_itemid=" ZBX_FS_UI64 ")",
 			lld_ruleid);
 
 	/* run through trigger prototypes */
@@ -402,7 +414,7 @@ static void	lld_triggers_get(const zbx_vector_ptr_t *trigger_prototypes, zbx_vec
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
 	zbx_vector_uint64_create(&parent_triggerids);
-	zbx_vector_uint64_reserve(&parent_triggerids, trigger_prototypes->values_num);
+	zbx_vector_uint64_reserve(&parent_triggerids, (size_t)trigger_prototypes->values_num);
 
 	for (i = 0; i < trigger_prototypes->values_num; i++)
 	{
@@ -437,6 +449,7 @@ static void	lld_triggers_get(const zbx_vector_ptr_t *trigger_prototypes, zbx_vec
 		const zbx_lld_trigger_prototype_t	*trigger_prototype;
 		zbx_lld_trigger_t			*trigger;
 		int					index;
+		unsigned char				uc;
 
 		ZBX_STR2UINT64(parent_triggerid, row[0]);
 
@@ -459,22 +472,39 @@ static void	lld_triggers_get(const zbx_vector_ptr_t *trigger_prototypes, zbx_vec
 		trigger->expression_orig = NULL;
 		trigger->recovery_expression = zbx_strdup(NULL, row[8]);
 		trigger->recovery_expression_orig = NULL;
+		trigger->type_orig = 0;
 
 		trigger->flags = ZBX_FLAG_LLD_TRIGGER_UNSET;
 
-		if ((unsigned char)atoi(row[4]) != trigger_prototype->type)
+		if (trigger_prototype->type != (uc = (unsigned char)atoi(row[4])))
+		{
+			trigger->type_orig = uc;
 			trigger->flags |= ZBX_FLAG_LLD_TRIGGER_UPDATE_TYPE;
+		}
 
 		trigger->priority = (unsigned char)atoi(row[5]);
+		trigger->priority_orig = trigger->priority;
+		trigger->manual_close_orig = 0;
+		trigger->correlation_mode_orig = 0;
+		trigger->recovery_mode_orig = 0;
 
-		if ((unsigned char)atoi(row[9]) != trigger_prototype->recovery_mode)
+		if (trigger_prototype->recovery_mode != (uc = (unsigned char)atoi(row[9])))
+		{
+			trigger->recovery_mode_orig = uc;
 			trigger->flags |= ZBX_FLAG_LLD_TRIGGER_UPDATE_RECOVERY_MODE;
+		}
 
-		if ((unsigned char)atoi(row[10]) != trigger_prototype->correlation_mode)
+		if (trigger_prototype->correlation_mode != (uc = (unsigned char)atoi(row[10])))
+		{
+			trigger->correlation_mode_orig = uc;
 			trigger->flags |= ZBX_FLAG_LLD_TRIGGER_UPDATE_CORRELATION_MODE;
+		}
 
-		if ((unsigned char)atoi(row[12]) != trigger_prototype->manual_close)
+		if (trigger_prototype->manual_close != (uc = (unsigned char)atoi(row[12])))
+		{
+			trigger->manual_close_orig = uc;
 			trigger->flags |= ZBX_FLAG_LLD_TRIGGER_UPDATE_MANUAL_CLOSE;
+		}
 
 		trigger->comments = zbx_strdup(NULL, row[6]);
 		trigger->comments_orig = NULL;
@@ -736,18 +766,16 @@ static void	lld_dependencies_get(zbx_vector_ptr_t *trigger_prototypes, zbx_vecto
  * Purpose: retrieve trigger tags                                             *
  *                                                                            *
  ******************************************************************************/
-static void	lld_tags_get(zbx_vector_ptr_t *trigger_prototypes, zbx_vector_ptr_t *triggers)
+static void	lld_tags_get(const zbx_vector_ptr_t *trigger_prototypes, zbx_vector_ptr_t *triggers)
 {
 	DB_RESULT			result;
 	DB_ROW				row;
 	zbx_vector_uint64_t		triggerids;
-	int				i, index;
+	int				i;
 	zbx_lld_trigger_prototype_t	*trigger_prototype;
 	zbx_lld_trigger_t		*trigger;
-	zbx_lld_tag_t			*tag;
 	char				*sql = NULL;
 	size_t				sql_alloc = 256, sql_offset = 0;
-	zbx_uint64_t			triggerid;
 
 	zbx_vector_uint64_create(&triggerids);
 
@@ -784,12 +812,16 @@ static void	lld_tags_get(zbx_vector_ptr_t *trigger_prototypes, zbx_vector_ptr_t
 
 	while (NULL != (row = DBfetch(result)))
 	{
-		tag = (zbx_lld_tag_t *)zbx_malloc(NULL, sizeof(zbx_lld_tag_t));
+		int		index;
+		zbx_uint64_t	triggerid;
+		zbx_lld_tag_t	*tag = (zbx_lld_tag_t *)zbx_malloc(NULL, sizeof(zbx_lld_tag_t));
 
 		ZBX_STR2UINT64(tag->triggertagid, row[0]);
 		ZBX_STR2UINT64(triggerid, row[1]);
 		tag->tag = zbx_strdup(NULL, row[2]);
+		tag->tag_orig = NULL;
 		tag->value = zbx_strdup(NULL, row[3]);
+		tag->value_orig = NULL;
 		tag->flags = ZBX_FLAG_LLD_DEPENDENCY_UNSET;
 
 		if (FAIL != (index = zbx_vector_ptr_bsearch(trigger_prototypes, &triggerid,
@@ -809,10 +841,10 @@ static void	lld_tags_get(zbx_vector_ptr_t *trigger_prototypes, zbx_vector_ptr_t
 		else
 		{
 			THIS_SHOULD_NEVER_HAPPEN;
-			zbx_ptr_free(tag);
+			lld_tag_free(tag);
 		}
-
 	}
+
 	DBfree_result(result);
 
 	for (i = 0; i < trigger_prototypes->values_num; i++)
@@ -856,7 +888,7 @@ static void	lld_items_get(zbx_vector_ptr_t *trigger_prototypes, zbx_vector_ptr_t
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
 	zbx_vector_uint64_create(&parent_triggerids);
-	zbx_vector_uint64_reserve(&parent_triggerids, trigger_prototypes->values_num);
+	zbx_vector_uint64_reserve(&parent_triggerids, (size_t)trigger_prototypes->values_num);
 
 	for (i = 0; i < trigger_prototypes->values_num; i++)
 	{
@@ -961,7 +993,7 @@ static void	lld_eval_expression_index_functions(zbx_eval_context_t *ctx, zbx_vec
 		{
 			function = (zbx_lld_function_t *)functions->values[index];
 
-			function->index = index + 1;
+			function->index = (zbx_uint64_t)(index + 1);
 			zbx_variant_set_ui64(&token->value, function->index);
 		}
 	}
@@ -1610,7 +1642,7 @@ out:
 
 static zbx_hash_t	items_triggers_hash_func(const void *data)
 {
-	const zbx_lld_item_trigger_t	*item_trigger = (zbx_lld_item_trigger_t *)data;
+	const zbx_lld_item_trigger_t	*item_trigger = (const zbx_lld_item_trigger_t *)data;
 	zbx_hash_t			hash;
 
 	hash = ZBX_DEFAULT_UINT64_HASH_FUNC(&item_trigger->parent_triggerid);
@@ -1621,7 +1653,8 @@ static zbx_hash_t	items_triggers_hash_func(const void *data)
 
 static int	items_triggers_compare_func(const void *d1, const void *d2)
 {
-	const zbx_lld_item_trigger_t	*item_trigger1 = (zbx_lld_item_trigger_t *)d1, *item_trigger2 = (zbx_lld_item_trigger_t *)d2;
+	const zbx_lld_item_trigger_t	*item_trigger1 = (const zbx_lld_item_trigger_t *)d1,
+					*item_trigger2 = (const zbx_lld_item_trigger_t *)d2;
 
 	ZBX_RETURN_IF_NOT_EQUAL(item_trigger1->parent_triggerid, item_trigger2->parent_triggerid);
 	ZBX_RETURN_IF_NOT_EQUAL(item_trigger1->itemid, item_trigger2->itemid);
@@ -1689,7 +1722,7 @@ static void 	lld_trigger_dependency_make(const zbx_lld_trigger_prototype_t *trig
 {
 	zbx_lld_trigger_t			*trigger, *dep_trigger;
 	const zbx_lld_trigger_prototype_t	*dep_trigger_prototype;
-	zbx_lld_dependency_t			*dependency;
+	zbx_lld_dependency_t			*dependency = NULL;
 	zbx_uint64_t				triggerid_up;
 	int					i, j, index;
 
@@ -1886,14 +1919,11 @@ static void	lld_trigger_dependencies_make(const zbx_vector_ptr_t *trigger_protot
  * Purpose: create a trigger tag                                              *
  *                                                                            *
  ******************************************************************************/
-static void 	lld_trigger_tag_make(zbx_lld_trigger_prototype_t *trigger_prototype,
-		zbx_hashset_t *items_triggers, zbx_lld_row_t *lld_row, const zbx_vector_ptr_t *lld_macro_paths)
+static void 	lld_trigger_tag_make(const zbx_lld_trigger_prototype_t *trigger_prototype,
+		zbx_hashset_t *items_triggers, const zbx_lld_row_t *lld_row, const zbx_vector_ptr_t *lld_macro_paths)
 {
 	zbx_lld_trigger_t	*trigger;
 	int			i;
-	zbx_lld_tag_t		*tag;
-	char			*buffer = NULL;
-	const char		*key, *value;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
@@ -1904,6 +1934,9 @@ static void 	lld_trigger_tag_make(zbx_lld_trigger_prototype_t *trigger_prototype
 
 	for (i = 0; i < trigger_prototype->tags.values_num + trigger->override_tags.values_num; i++)
 	{
+		zbx_lld_tag_t	*tag;
+		const char	*key, *value;
+
 		if (i < trigger_prototype->tags.values_num)
 		{
 			zbx_lld_tag_t	*tag_proto;
@@ -1923,14 +1956,17 @@ static void 	lld_trigger_tag_make(zbx_lld_trigger_prototype_t *trigger_prototype
 
 		if (i < trigger->tags.values_num)
 		{
+			char	*buffer = NULL;
+
 			tag = (zbx_lld_tag_t *)trigger->tags.values[i];
 
 			buffer = zbx_strdup(buffer, key);
 			substitute_lld_macros(&buffer, &lld_row->jp_row, lld_macro_paths, ZBX_MACRO_FUNC, NULL, 0);
 			zbx_lrtrim(buffer, ZBX_WHITESPACE);
+
 			if (0 != strcmp(buffer, tag->tag))
 			{
-				zbx_free(tag->tag);
+				tag->tag_orig = tag->tag;
 				tag->tag = buffer;
 				buffer = NULL;
 				tag->flags |= ZBX_FLAG_LLD_TAG_UPDATE_TAG;
@@ -1939,13 +1975,16 @@ static void 	lld_trigger_tag_make(zbx_lld_trigger_prototype_t *trigger_prototype
 			buffer = zbx_strdup(buffer, value);
 			substitute_lld_macros(&buffer, &lld_row->jp_row, lld_macro_paths, ZBX_MACRO_FUNC, NULL, 0);
 			zbx_lrtrim(buffer, ZBX_WHITESPACE);
+
 			if (0 != strcmp(buffer, tag->value))
 			{
-				zbx_free(tag->value);
+				tag->value_orig = tag->value;
 				tag->value = buffer;
 				buffer = NULL;
 				tag->flags |= ZBX_FLAG_LLD_TAG_UPDATE_VALUE;
 			}
+
+			zbx_free(buffer);
 		}
 		else
 		{
@@ -1954,24 +1993,23 @@ static void 	lld_trigger_tag_make(zbx_lld_trigger_prototype_t *trigger_prototype
 			tag->triggertagid = 0;
 
 			tag->tag = zbx_strdup(NULL, key);
+			tag->tag_orig = NULL;
 			substitute_lld_macros(&tag->tag, &lld_row->jp_row, lld_macro_paths, ZBX_MACRO_FUNC, NULL, 0);
 			zbx_lrtrim(tag->tag, ZBX_WHITESPACE);
 
 			tag->value = zbx_strdup(NULL, value);
+			tag->value_orig = NULL;
 			substitute_lld_macros(&tag->value, &lld_row->jp_row, lld_macro_paths, ZBX_MACRO_FUNC, NULL, 0);
 			zbx_lrtrim(tag->value, ZBX_WHITESPACE);
 
 			tag->flags = ZBX_FLAG_LLD_TAG_UNSET;
 
 			zbx_vector_ptr_append(&trigger->tags, tag);
-
 		}
 
 		tag->flags |= ZBX_FLAG_LLD_TAG_DISCOVERED;
 	}
 out:
-	zbx_free(buffer);
-
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
 }
 
@@ -1982,7 +2020,7 @@ out:
  * Purpose: create a trigger tags                                             *
  *                                                                            *
  ******************************************************************************/
-static void	lld_trigger_tags_make(zbx_vector_ptr_t *trigger_prototypes, zbx_vector_ptr_t *triggers,
+static void	lld_trigger_tags_make(const zbx_vector_ptr_t *trigger_prototypes, zbx_vector_ptr_t *triggers,
 		const zbx_vector_ptr_t *lld_rows, const zbx_vector_ptr_t *lld_macro_paths)
 {
 	zbx_lld_trigger_prototype_t	*trigger_prototype;
@@ -2240,15 +2278,18 @@ static void	lld_triggers_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *trigger
 		sql = (char *)zbx_malloc(sql, sql_alloc);
 
 		zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
-				"select distinct t.triggerid,t.description,t.expression,t.recovery_expression"
-				" from triggers t,functions f,items i"
-				" where t.triggerid=f.triggerid"
-					" and f.itemid=i.itemid"
-					" and i.hostid=" ZBX_FS_UI64
-					" and",
+				"select t.triggerid,t.description,t.expression,t.recovery_expression"
+				" from triggers t"
+				" where t.triggerid in (select distinct t.triggerid"
+					" from triggers tg,functions f,items i"
+					" where tg.triggerid=f.triggerid"
+						" and f.itemid=i.itemid"
+						" and i.hostid=" ZBX_FS_UI64
+						" and",
 				hostid);
-		DBadd_str_condition_alloc(&sql, &sql_alloc, &sql_offset, "t.description",
+		DBadd_str_condition_alloc(&sql, &sql_alloc, &sql_offset, "tg.description",
 				(const char **)descriptions.values, descriptions.values_num);
+		zbx_chrcpy_alloc(&sql, &sql_alloc, &sql_offset, ')');
 
 		if (0 != triggerids.values_num)
 		{
@@ -2577,8 +2618,8 @@ out:
 static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigger_prototypes,
 		const zbx_vector_ptr_t *triggers)
 {
-	int					ret = SUCCEED, i, j, new_triggers = 0, upd_triggers = 0, new_functions = 0,
-						new_dependencies = 0, new_tags = 0, upd_tags = 0;
+	int					ret = SUCCEED, i, j, new_triggers = 0, upd_triggers = 0,
+						new_functions = 0, new_dependencies = 0, new_tags = 0, upd_tags = 0;
 	const zbx_lld_trigger_prototype_t	*trigger_prototype;
 	zbx_lld_trigger_t			*trigger;
 	zbx_lld_function_t			*function;
@@ -2586,11 +2627,12 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 	zbx_lld_tag_t				*tag;
 	zbx_vector_ptr_t			upd_functions;	/* the ordered list of functions which will be updated */
 	zbx_vector_uint64_t			del_functionids, del_triggerdepids, del_triggertagids, trigger_protoids;
-	zbx_uint64_t				triggerid = 0, functionid = 0, triggerdepid = 0, triggerid_up, triggertagid;
+	zbx_uint64_t				triggerid = 0, functionid = 0, triggerdepid = 0, triggerid_up,
+						triggertagid = 0;
 	char					*sql = NULL, *function_esc, *parameter_esc;
 	size_t					sql_alloc = 8 * ZBX_KIBIBYTE, sql_offset = 0;
-	zbx_db_insert_t				db_insert, db_insert_tdiscovery, db_insert_tfunctions, db_insert_tdepends,
-						db_insert_ttags;
+	zbx_db_insert_t				db_insert, db_insert_tdiscovery, db_insert_tfunctions,
+						db_insert_tdepends, db_insert_ttags;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
@@ -2612,6 +2654,13 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 		else if (0 != (trigger->flags & ZBX_FLAG_LLD_TRIGGER_UPDATE))
 			upd_triggers++;
 
+		if (0 != trigger->triggerid)
+		{
+			zbx_audit_trigger_create_entry(AUDIT_ACTION_UPDATE, trigger->triggerid,
+					(NULL == trigger->description_orig) ? trigger->description :
+					trigger->description_orig, ZBX_FLAG_DISCOVERY_CREATED);
+		}
+
 		for (j = 0; j < trigger->functions.values_num; j++)
 		{
 			function = (zbx_lld_function_t *)trigger->functions.values[j];
@@ -2638,6 +2687,9 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 			if (0 != (dependency->flags & ZBX_FLAG_LLD_DEPENDENCY_DELETE))
 			{
 				zbx_vector_uint64_append(&del_triggerdepids, dependency->triggerdepid);
+
+				zbx_audit_trigger_update_json_remove_dependency(ZBX_FLAG_DISCOVERY_NORMAL,
+						dependency->triggerdepid, trigger->triggerid);
 				continue;
 			}
 
@@ -2655,6 +2707,9 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 			if (0 != (tag->flags & ZBX_FLAG_LLD_TAG_DELETE))
 			{
 				zbx_vector_uint64_append(&del_triggertagids, tag->triggertagid);
+
+				zbx_audit_trigger_update_json_delete_tags(trigger->triggerid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, tag->triggertagid);
 				continue;
 			}
 
@@ -2803,6 +2858,22 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 					trigger->correlation_tag, (int)trigger_prototype->manual_close,
 					trigger->opdata, trigger->event_name);
 
+			zbx_audit_trigger_create_entry(AUDIT_ACTION_ADD,triggerid, trigger->description,
+					ZBX_FLAG_DISCOVERY_CREATED);
+
+			zbx_audit_trigger_update_json_add_data(triggerid, 0, (int)trigger_prototype->recovery_mode,
+					trigger->status, trigger_prototype->type, TRIGGER_VALUE_OK,
+					TRIGGER_STATE_NORMAL, trigger->priority, trigger->comments, trigger->url,
+					ZBX_FLAG_DISCOVERY_CREATED, trigger_prototype->correlation_mode,
+					trigger->correlation_tag, trigger_prototype->manual_close, trigger->opdata, 0,
+					trigger->event_name);
+
+			zbx_audit_trigger_update_json_add_expr(triggerid,
+					(int)ZBX_FLAG_DISCOVERY_CREATED, trigger->expression);
+
+			zbx_audit_trigger_update_json_add_rexpr(triggerid,
+					(int)ZBX_FLAG_DISCOVERY_CREATED, trigger->recovery_expression);
+
 			zbx_db_insert_add_values(&db_insert_tdiscovery, triggerid, trigger->parent_triggerid);
 
 			trigger->triggerid = triggerid++;
@@ -2822,6 +2893,10 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 						description_esc);
 				zbx_free(description_esc);
 				d = ",";
+
+				zbx_audit_trigger_update_json_update_description(trigger->triggerid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, trigger->description_orig,
+						trigger->description);
 			}
 
 			if (0 != (trigger->flags & ZBX_FLAG_LLD_TRIGGER_UPDATE_EXPRESSION))
@@ -2831,6 +2906,11 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 						expression_esc);
 				zbx_free(expression_esc);
 				d = ",";
+
+				lld_expression_create(trigger, &trigger->expression_orig, &trigger->functions);
+				zbx_audit_trigger_update_json_update_expression(trigger->triggerid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, trigger->expression_orig,
+						trigger->expression);
 			}
 
 			if (0 != (trigger->flags & ZBX_FLAG_LLD_TRIGGER_UPDATE_RECOVERY_EXPRESSION))
@@ -2840,6 +2920,11 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 						expression_esc);
 				zbx_free(expression_esc);
 				d = ",";
+
+				lld_expression_create(trigger, &trigger->recovery_expression_orig, &trigger->functions);
+				zbx_audit_trigger_update_json_update_recovery_expression(trigger->triggerid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, trigger->recovery_expression_orig,
+						trigger->recovery_expression);
 			}
 
 			if (0 != (trigger->flags & ZBX_FLAG_LLD_TRIGGER_UPDATE_RECOVERY_MODE))
@@ -2847,6 +2932,10 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%srecovery_mode=%d", d,
 						(int)trigger_prototype->recovery_mode);
 				d = ",";
+
+				zbx_audit_trigger_update_json_update_recovery_mode(trigger->triggerid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, (int)trigger->recovery_mode_orig,
+						(int)trigger_prototype->recovery_mode);
 			}
 
 			if (0 != (trigger->flags & ZBX_FLAG_LLD_TRIGGER_UPDATE_TYPE))
@@ -2854,6 +2943,10 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%stype=%d", d,
 						(int)trigger_prototype->type);
 				d = ",";
+
+				zbx_audit_trigger_update_json_update_type(trigger->triggerid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, (int)trigger->type_orig,
+						(int)trigger_prototype->type);
 			}
 
 			if (0 != (trigger->flags & ZBX_FLAG_LLD_TRIGGER_UPDATE_PRIORITY))
@@ -2861,6 +2954,10 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%spriority=%d", d,
 						(int)trigger->priority);
 				d = ",";
+
+				zbx_audit_trigger_update_json_update_priority(trigger->triggerid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, (int)trigger->priority_orig,
+						(int)trigger->priority);
 			}
 
 			if (0 != (trigger->flags & ZBX_FLAG_LLD_TRIGGER_UPDATE_COMMENTS))
@@ -2869,6 +2966,10 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%scomments='%s'", d, comments_esc);
 				zbx_free(comments_esc);
 				d = ",";
+
+				zbx_audit_trigger_update_json_update_comments(trigger->triggerid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, trigger->comments_orig,
+						trigger->comments);
 			}
 
 			if (0 != (trigger->flags & ZBX_FLAG_LLD_TRIGGER_UPDATE_URL))
@@ -2877,6 +2978,9 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%surl='%s'", d, url_esc);
 				zbx_free(url_esc);
 				d = ",";
+
+				zbx_audit_trigger_update_json_update_url(trigger->triggerid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, trigger->url_orig, trigger->url);
 			}
 
 			if (0 != (trigger->flags & ZBX_FLAG_LLD_TRIGGER_UPDATE_CORRELATION_MODE))
@@ -2884,6 +2988,10 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%scorrelation_mode=%d", d,
 						(int)trigger_prototype->correlation_mode);
 				d = ",";
+
+				zbx_audit_trigger_update_json_update_correlation_mode(trigger->triggerid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, (int)trigger->correlation_mode_orig,
+						(int)trigger_prototype->correlation_mode);
 			}
 
 			if (0 != (trigger->flags & ZBX_FLAG_LLD_TRIGGER_UPDATE_CORRELATION_TAG))
@@ -2893,6 +3001,10 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 						value_esc);
 				zbx_free(value_esc);
 				d = ",";
+
+				zbx_audit_trigger_update_json_update_correlation_tag(trigger->triggerid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, trigger->correlation_tag_orig,
+						trigger->correlation_tag);
 			}
 
 			if (0 != (trigger->flags & ZBX_FLAG_LLD_TRIGGER_UPDATE_MANUAL_CLOSE))
@@ -2900,6 +3012,10 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%smanual_close=%d", d,
 						(int)trigger_prototype->manual_close);
 				d = ",";
+
+				zbx_audit_trigger_update_json_update_manual_close(trigger->triggerid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, (int)trigger->manual_close_orig,
+						(int)trigger_prototype->manual_close);
 			}
 
 			if (0 != (trigger->flags & ZBX_FLAG_LLD_TRIGGER_UPDATE_OPDATA))
@@ -2908,6 +3024,9 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%sopdata='%s'", d, opdata_esc);
 				zbx_free(opdata_esc);
 				d = ",";
+
+				zbx_audit_trigger_update_json_update_opdata(trigger->triggerid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, trigger->opdata_orig, trigger->opdata);
 			}
 
 			if (0 != (trigger->flags & ZBX_FLAG_LLD_TRIGGER_UPDATE_EVENT_NAME))
@@ -2915,6 +3034,10 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 				event_name_esc = DBdyn_escape_string(trigger->event_name);
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%sevent_name='%s'", d, event_name_esc);
 				zbx_free(event_name_esc);
+
+				zbx_audit_trigger_update_json_update_event_name(trigger->triggerid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, trigger->event_name_orig,
+						trigger->event_name);
 			}
 
 			zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
@@ -2947,6 +3070,9 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 				zbx_db_insert_add_values(&db_insert_tdepends, triggerdepid, trigger->triggerid,
 						triggerid_up);
 
+				zbx_audit_trigger_update_json_add_dependency((int)ZBX_FLAG_DISCOVERY_CREATED,
+						triggerdepid, trigger->triggerid, triggerid_up);
+
 				dependency->triggerdepid = triggerdepid++;
 			}
 		}
@@ -2977,6 +3103,10 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 				tag->triggertagid = triggertagid++;
 				zbx_db_insert_add_values(&db_insert_ttags, tag->triggertagid, trigger->triggerid,
 						tag->tag, tag->value);
+
+				zbx_audit_trigger_update_json_add_tags_and_values(trigger->triggerid,
+						(int)ZBX_FLAG_DISCOVERY_CREATED, tag->triggertagid, tag->tag,
+						tag->value);
 			}
 			else if (0 != (tag->flags & ZBX_FLAG_LLD_TAG_UPDATE))
 			{
@@ -2990,6 +3120,9 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 					zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "tag='%s'", value_esc);
 					zbx_free(value_esc);
 					d = ",";
+
+					zbx_audit_trigger_update_json_update_tag_tag(trigger->triggerid,
+							tag->triggertagid, tag->tag_orig, tag->tag);
 				}
 
 				if (0 != (tag->flags & ZBX_FLAG_LLD_TAG_UPDATE_VALUE))
@@ -2997,6 +3130,9 @@ static int	lld_triggers_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *trigge
 					value_esc = DBdyn_escape_string(tag->value);
 					zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset, "%svalue='%s'", d, value_esc);
 					zbx_free(value_esc);
+
+					zbx_audit_trigger_update_json_update_tag_value(trigger->triggerid,
+							tag->triggertagid, tag->value_orig, tag->value);
 				}
 
 				zbx_snprintf_alloc(&sql, &sql_alloc, &sql_offset,
@@ -3326,7 +3462,7 @@ static void	lld_trigger_cache_init(zbx_hashset_t *cache, zbx_vector_ptr_t *trigg
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
-	zbx_hashset_create(cache, triggers->values_num, zbx_lld_trigger_ref_hash_func,
+	zbx_hashset_create(cache, (size_t)triggers->values_num, zbx_lld_trigger_ref_hash_func,
 			zbx_lld_trigger_ref_compare_func);
 
 	zbx_vector_uint64_create(&triggerids_down);
@@ -3681,7 +3817,7 @@ static void	lld_trigger_dependencies_validate(zbx_vector_ptr_t *triggers, char *
 	/* This will give some consistency in choosing what dependencies should be deleted in the case of   */
 	/* recursion.                                                                                       */
 	zbx_vector_ptr_create(&nodes);
-	zbx_vector_ptr_reserve(&nodes, cache.num_data);
+	zbx_vector_ptr_reserve(&nodes, (size_t)cache.num_data);
 
 	zbx_hashset_iter_reset(&cache, &iter);
 	while (NULL != (trigger_node = (zbx_lld_trigger_node_t *)zbx_hashset_iter_next(&iter)))
@@ -3731,9 +3867,7 @@ static void	lld_trigger_dependencies_validate(zbx_vector_ptr_t *triggers, char *
 static	void	get_trigger_info(const void *object, zbx_uint64_t *id, int *discovery_flag, int *lastcheck,
 		int *ts_delete, const char **name)
 {
-	zbx_lld_trigger_t	*trigger;
-
-	trigger = (zbx_lld_trigger_t *)object;
+	const zbx_lld_trigger_t	*trigger = (const zbx_lld_trigger_t *)object;
 
 	*id = trigger->triggerid;
 	*discovery_flag = trigger->flags & ZBX_FLAG_LLD_TRIGGER_DISCOVERED;
diff --git a/src/zabbix_server/operations.c b/src/zabbix_server/operations.c
index 81412b35563..982451a1ebe 100644
--- a/src/zabbix_server/operations.c
+++ b/src/zabbix_server/operations.c
@@ -447,12 +447,13 @@ static zbx_uint64_t	add_discovered_host(const DB_EVENT *event, int *status, zbx_
 				zbx_db_insert_clean(&db_insert);
 
 				zbx_audit_host_create_entry(AUDIT_ACTION_ADD, hostid, hostname);
-				zbx_audit_host_update_json_add_proxy_hostid_and_hostname(hostid, proxy_hostid,
-						host_unique);
 
 				if (HOST_INVENTORY_DISABLED != cfg->default_inventory_mode)
 					DBadd_host_inventory(hostid, cfg->default_inventory_mode);
 
+				zbx_audit_host_update_json_add_proxy_hostid_and_hostname_and_inventory_mode(hostid,
+						proxy_hostid, host_unique, cfg->default_inventory_mode);
+
 				interfaceid = DBadd_interface(hostid, interface_type, 1, row[2], row[3], port,
 						ZBX_CONN_DEFAULT);
 
@@ -577,10 +578,8 @@ static zbx_uint64_t	add_discovered_host(const DB_EVENT *event, int *status, zbx_
 						tls_accepted, tls_accepted, psk_identity, psk);
 
 					zbx_audit_host_create_entry(AUDIT_ACTION_ADD, hostid, hostname);
-					zbx_audit_host_update_json_add_proxy_hostid_and_hostname(hostid, proxy_hostid,
-							hostname);
 					zbx_audit_host_update_json_add_tls_and_psk(hostid, tls_accepted, tls_accepted,
-							AUDIT_SECRET_MASK, AUDIT_SECRET_MASK);
+							psk_identity, psk);
 				}
 				else
 				{
@@ -588,8 +587,6 @@ static zbx_uint64_t	add_discovered_host(const DB_EVENT *event, int *status, zbx_
 							"name", NULL);
 
 					zbx_audit_host_create_entry(AUDIT_ACTION_ADD, hostid, hostname);
-					zbx_audit_host_update_json_add_proxy_hostid_and_hostname(hostid, proxy_hostid,
-							hostname);
 					zbx_db_insert_add_values(&db_insert, hostid, proxy_hostid, hostname,
 							hostname);
 				}
@@ -600,6 +597,9 @@ static zbx_uint64_t	add_discovered_host(const DB_EVENT *event, int *status, zbx_
 				if (HOST_INVENTORY_DISABLED != cfg->default_inventory_mode)
 					DBadd_host_inventory(hostid, cfg->default_inventory_mode);
 
+				zbx_audit_host_update_json_add_proxy_hostid_and_hostname_and_inventory_mode(hostid,
+						proxy_hostid, hostname, cfg->default_inventory_mode);
+
 				DBadd_interface(hostid, INTERFACE_TYPE_AGENT, useip, row[2], row[3], port, flags);
 
 				add_discovered_host_groups(hostid, &groupids);
@@ -619,8 +619,9 @@ static zbx_uint64_t	add_discovered_host(const DB_EVENT *event, int *status, zbx_
 							" set proxy_hostid=%s"
 							" where hostid=" ZBX_FS_UI64,
 							DBsql_id_ins(proxy_hostid), hostid);
-					zbx_audit_update_json_append_uint64(hostid, AUDIT_DETAILS_ACTION_ADD,
-							"host.proxy_hostid", proxy_hostid);
+					zbx_audit_update_json_append_uint64(hostid, AUDIT_HOST_ID,
+							AUDIT_DETAILS_ACTION_ADD, "host.proxy_hostid", proxy_hostid,
+							"hosts", "proxy_hostid");
 				}
 
 				DBadd_interface(hostid, INTERFACE_TYPE_AGENT, useip, row[2], row[3], port, flags);
diff --git a/src/zabbix_server/poller/checks_simple_vmware.c b/src/zabbix_server/poller/checks_simple_vmware.c
index 2478e862444..6207821e5e9 100644
--- a/src/zabbix_server/poller/checks_simple_vmware.c
+++ b/src/zabbix_server/poller/checks_simple_vmware.c
@@ -205,6 +205,7 @@ out:
  *             instance  - [IN] the performance counter instance or "" for    *
  *                              aggregate data                                *
  *             coeff     - [IN] the coefficient to apply to the value         *
+ *             unit      - [IN] the counter unit info (kilo, mega, % etc)     *
  *             result    - [OUT] the output result                            *
  *                                                                            *
  * Return value: SYSINFO_RET_OK, result has value - performance counter value *
@@ -220,13 +221,12 @@ out:
  *                                                                            *
  ******************************************************************************/
 static int	vmware_service_get_counter_value_by_id(zbx_vmware_service_t *service, const char *type, const char *id,
-		zbx_uint64_t counterid, const char *instance, int coeff, AGENT_RESULT *result)
+		zbx_uint64_t counterid, const char *instance, unsigned int coeff, int unit, AGENT_RESULT *result)
 {
 	zbx_vmware_perf_entity_t	*entity;
 	zbx_vmware_perf_counter_t	*perfcounter;
 	zbx_str_uint64_pair_t		*perfvalue;
 	int				i, ret = SYSINFO_RET_FAIL;
-	zbx_uint64_t			value;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s() type:%s id:%s counterid:" ZBX_FS_UI64 " instance:%s", __func__,
 			type, id, counterid, instance);
@@ -286,8 +286,44 @@ static int	vmware_service_get_counter_value_by_id(zbx_vmware_service_t *service,
 		goto out;
 	}
 
-	value = perfvalue->value * coeff;
-	SET_UI64_RESULT(result, value);
+	if (0 != coeff)
+	{
+		SET_UI64_RESULT(result, perfvalue->value * coeff);
+	}
+	else
+	{
+		switch (unit)
+		{
+		case ZBX_VMWARE_UNIT_KILOBYTES:
+		case ZBX_VMWARE_UNIT_KILOBYTESPERSECOND:
+			SET_UI64_RESULT(result, perfvalue->value * ZBX_KIBIBYTE);
+			break;
+		case ZBX_VMWARE_UNIT_MEGABYTES:
+		case ZBX_VMWARE_UNIT_MEGABYTESPERSECOND:
+			SET_UI64_RESULT(result, perfvalue->value * ZBX_MEBIBYTE);
+			break;
+		case ZBX_VMWARE_UNIT_TERABYTES:
+			SET_UI64_RESULT(result, perfvalue->value * ZBX_TEBIBYTE);
+			break;
+		case ZBX_VMWARE_UNIT_PERCENT:
+			SET_DBL_RESULT(result, (double)perfvalue->value / 100.0);
+			break;
+		case ZBX_VMWARE_UNIT_JOULE:
+		case ZBX_VMWARE_UNIT_MEGAHERTZ:
+		case ZBX_VMWARE_UNIT_MICROSECOND:
+		case ZBX_VMWARE_UNIT_MILLISECOND:
+		case ZBX_VMWARE_UNIT_NUMBER:
+		case ZBX_VMWARE_UNIT_SECOND:
+		case ZBX_VMWARE_UNIT_WATT:
+			SET_UI64_RESULT(result, perfvalue->value);
+			break;
+		default:
+			SET_MSG_RESULT(result, zbx_dsprintf(NULL, "Performance counter type of unitInfo is unknown. "
+					"Counter id:" ZBX_FS_UI64, counterid));
+			goto out;
+		}
+	}
+
 	ret = SYSINFO_RET_OK;
 out:
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_sysinfo_ret_string(ret));
@@ -325,21 +361,22 @@ out:
  *                                                                            *
  ******************************************************************************/
 static int	vmware_service_get_counter_value_by_path(zbx_vmware_service_t *service, const char *type,
-		const char *id, const char *path, const char *instance, int coeff, AGENT_RESULT *result)
+		const char *id, const char *path, const char *instance, unsigned int coeff, AGENT_RESULT *result)
 {
 	zbx_uint64_t	counterid;
+	int		unit;
 
-	if (FAIL == zbx_vmware_service_get_counterid(service, path, &counterid))
+	if (FAIL == zbx_vmware_service_get_counterid(service, path, &counterid, &unit))
 	{
 		SET_MSG_RESULT(result, zbx_strdup(NULL, "Performance counter is not available."));
 		return SYSINFO_RET_FAIL;
 	}
 
-	return vmware_service_get_counter_value_by_id(service, type, id, counterid, instance, coeff, result);
+	return vmware_service_get_counter_value_by_id(service, type, id, counterid, instance, coeff, unit, result);
 }
 
 static int	vmware_service_get_vm_counter(zbx_vmware_service_t *service, const char *uuid, const char *instance,
-		const char *path, int coeff, AGENT_RESULT *result)
+		const char *path, unsigned int coeff, AGENT_RESULT *result)
 {
 	zbx_vmware_vm_t	*vm;
 	int		ret = SYSINFO_RET_FAIL;
@@ -947,7 +984,7 @@ int	check_vcenter_hv_cpu_usage_perf(AGENT_REQUEST *request, const char *username
 		goto unlock;
 	}
 
-	ret = vmware_service_get_counter_value_by_path(service, "HostSystem", hv->id, "cpu/usage[average]", "", 1,
+	ret = vmware_service_get_counter_value_by_path(service, "HostSystem", hv->id, "cpu/usage[average]", "", 0,
 			result);
 unlock:
 	zbx_vmware_unlock();
@@ -988,7 +1025,7 @@ int	check_vcenter_hv_cpu_utilization(AGENT_REQUEST *request, const char *usernam
 	}
 
 	ret = vmware_service_get_counter_value_by_path(service, "HostSystem", hv->id, "cpu/utilization[average]", "",
-			1, result);
+			0, result);
 unlock:
 	zbx_vmware_unlock();
 out:
@@ -2008,7 +2045,7 @@ int	check_vcenter_cl_perfcounter(AGENT_REQUEST *request, const char *username, c
 	zbx_vmware_service_t	*service;
 	zbx_vmware_cluster_t	*cluster;
 	zbx_uint64_t		counterid;
-	int			ret = SYSINFO_RET_FAIL;
+	int			unit, ret = SYSINFO_RET_FAIL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
@@ -2031,7 +2068,7 @@ int	check_vcenter_cl_perfcounter(AGENT_REQUEST *request, const char *username, c
 	if (NULL == (service = get_vmware_service(url, username, password, result, &ret)))
 		goto unlock;
 
-	if (FAIL == zbx_vmware_service_get_counterid(service, path, &counterid))
+	if (FAIL == zbx_vmware_service_get_counterid(service, path, &counterid, &unit))
 	{
 		SET_MSG_RESULT(result, zbx_strdup(NULL, "Performance counter is not available."));
 		goto unlock;
@@ -2053,7 +2090,7 @@ int	check_vcenter_cl_perfcounter(AGENT_REQUEST *request, const char *username, c
 
 	/* the performance counter is already being monitored, try to get the results from statistics */
 	ret = vmware_service_get_counter_value_by_id(service, "ClusterComputeResource", cluster->id, counterid,
-			instance, 1, result);
+			instance, 1, unit, result);
 unlock:
 	zbx_vmware_unlock();
 out:
@@ -2069,7 +2106,7 @@ int	check_vcenter_hv_perfcounter(AGENT_REQUEST *request, const char *username, c
 	zbx_vmware_service_t	*service;
 	zbx_vmware_hv_t		*hv;
 	zbx_uint64_t		counterid;
-	int			ret = SYSINFO_RET_FAIL;
+	int			unit, ret = SYSINFO_RET_FAIL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
@@ -2098,7 +2135,7 @@ int	check_vcenter_hv_perfcounter(AGENT_REQUEST *request, const char *username, c
 		goto unlock;
 	}
 
-	if (FAIL == zbx_vmware_service_get_counterid(service, path, &counterid))
+	if (FAIL == zbx_vmware_service_get_counterid(service, path, &counterid, &unit))
 	{
 		SET_MSG_RESULT(result, zbx_strdup(NULL, "Performance counter is not available."));
 		goto unlock;
@@ -2112,7 +2149,8 @@ int	check_vcenter_hv_perfcounter(AGENT_REQUEST *request, const char *username, c
 	}
 
 	/* the performance counter is already being monitored, try to get the results from statistics */
-	ret = vmware_service_get_counter_value_by_id(service, "HostSystem", hv->id, counterid, instance, 1, result);
+	ret = vmware_service_get_counter_value_by_id(service, "HostSystem", hv->id, counterid, instance, 1, unit,
+			result);
 unlock:
 	zbx_vmware_unlock();
 out:
@@ -2464,7 +2502,7 @@ static int	check_vcenter_datastore_latency(AGENT_REQUEST *request, const char *u
 	zbx_vmware_service_t	*service;
 	zbx_vmware_hv_t		*hv;
 	zbx_vmware_datastore_t	*datastore;
-	int			i, ret = SYSINFO_RET_FAIL, count = 0, ds_count = 0;
+	int			i, ret = SYSINFO_RET_FAIL, count = 0, ds_count = 0, unit;
 	zbx_uint64_t		latency = 0, counterid;
 	unsigned char		is_maxlatency = 0;
 
@@ -2508,7 +2546,7 @@ static int	check_vcenter_datastore_latency(AGENT_REQUEST *request, const char *u
 		goto unlock;
 	}
 
-	if (FAIL == zbx_vmware_service_get_counterid(service, perfcounter, &counterid))
+	if (FAIL == zbx_vmware_service_get_counterid(service, perfcounter, &counterid, &unit))
 	{
 		SET_MSG_RESULT(result, zbx_strdup(NULL, "Performance counter is not available."));
 		goto unlock;
@@ -2536,8 +2574,16 @@ static int	check_vcenter_datastore_latency(AGENT_REQUEST *request, const char *u
 		}
 
 		if (SYSINFO_RET_OK != (ret = vmware_service_get_counter_value_by_id(service, "HostSystem", hv->id,
-				counterid, datastore->uuid, 1, result)))
+				counterid, datastore->uuid, 1, unit, result)))
 		{
+			char	*err, *msg = *GET_MSG_RESULT(result);
+
+			*msg = (char)tolower(*msg);
+			err = zbx_dsprintf(NULL, "Counter %s for datastore %s is not available for hypervisor %s: %s",
+					perfcounter, datastore->name,
+					ZBX_NULL2EMPTY_STR(hv->props[ZBX_VMWARE_HVPROP_NAME]), msg);
+			UNSET_MSG_RESULT(result);
+			SET_MSG_RESULT(result, err);
 			goto unlock;
 		}
 
@@ -3123,7 +3169,8 @@ int	check_vcenter_vm_net_if_in(AGENT_REQUEST *request, const char *username, con
 {
 	zbx_vmware_service_t	*service;
 	const char		*path, *url, *uuid, *instance, *mode;
-	int 			coeff, ret = SYSINFO_RET_FAIL;
+	unsigned int 		coeff;
+	int 			ret = SYSINFO_RET_FAIL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
@@ -3185,7 +3232,8 @@ int	check_vcenter_vm_net_if_out(AGENT_REQUEST *request, const char *username, co
 {
 	zbx_vmware_service_t	*service;
 	const char		*path, *url, *uuid, *instance, *mode;
-	int 			coeff, ret = SYSINFO_RET_FAIL;
+	unsigned int 		coeff;
+	int 			ret = SYSINFO_RET_FAIL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
@@ -3372,7 +3420,8 @@ int	check_vcenter_vm_vfs_dev_read(AGENT_REQUEST *request, const char *username,
 {
 	zbx_vmware_service_t	*service;
 	const char		*path, *url, *uuid, *instance, *mode;
-	int			coeff, ret = SYSINFO_RET_FAIL;
+	unsigned int 		coeff;
+	int 			ret = SYSINFO_RET_FAIL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
@@ -3434,7 +3483,8 @@ int	check_vcenter_vm_vfs_dev_write(AGENT_REQUEST *request, const char *username,
 {
 	zbx_vmware_service_t	*service;
 	const char		*path, *url, *uuid, *instance, *mode;
-	int			coeff, ret = SYSINFO_RET_FAIL;
+	unsigned int 		coeff;
+	int 			ret = SYSINFO_RET_FAIL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
@@ -3639,7 +3689,7 @@ int	check_vcenter_vm_perfcounter(AGENT_REQUEST *request, const char *username, c
 	zbx_vmware_service_t	*service;
 	zbx_vmware_vm_t		*vm;
 	zbx_uint64_t		counterid;
-	int			ret = SYSINFO_RET_FAIL;
+	int			unit, ret = SYSINFO_RET_FAIL;
 
 	zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
 
@@ -3668,7 +3718,7 @@ int	check_vcenter_vm_perfcounter(AGENT_REQUEST *request, const char *username, c
 		goto unlock;
 	}
 
-	if (FAIL == zbx_vmware_service_get_counterid(service, path, &counterid))
+	if (FAIL == zbx_vmware_service_get_counterid(service, path, &counterid, &unit))
 	{
 		SET_MSG_RESULT(result, zbx_strdup(NULL, "Performance counter is not available."));
 		goto unlock;
@@ -3682,7 +3732,8 @@ int	check_vcenter_vm_perfcounter(AGENT_REQUEST *request, const char *username, c
 	}
 
 	/* the performance counter is already being monitored, try to get the results from statistics */
-	ret = vmware_service_get_counter_value_by_id(service, "VirtualMachine", vm->id, counterid, instance, 1, result);
+	ret = vmware_service_get_counter_value_by_id(service, "VirtualMachine", vm->id, counterid, instance, 1, unit,
+			result);
 unlock:
 	zbx_vmware_unlock();
 out:
@@ -3888,7 +3939,7 @@ int	check_vcenter_vm_memory_usage(AGENT_REQUEST *request, const char *username,
 	if (NULL == (service = get_vmware_service(url, username, password, result, &ret)))
 		goto unlock;
 
-	ret = vmware_service_get_vm_counter(service, uuid, "", "mem/usage[average]", 1, result);
+	ret = vmware_service_get_vm_counter(service, uuid, "", "mem/usage[average]", 0, result);
 unlock:
 	zbx_vmware_unlock();
 out:
@@ -3926,7 +3977,7 @@ int	check_vcenter_vm_cpu_latency(AGENT_REQUEST *request, const char *username, c
 	if (NULL == (service = get_vmware_service(url, username, password, result, &ret)))
 		goto unlock;
 
-	ret = vmware_service_get_vm_counter(service, uuid, "", "cpu/latency[average]", 1, result);
+	ret = vmware_service_get_vm_counter(service, uuid, "", "cpu/latency[average]", 0, result);
 unlock:
 	zbx_vmware_unlock();
 out:
@@ -3968,7 +4019,7 @@ int	check_vcenter_vm_cpu_readiness(AGENT_REQUEST *request, const char *username,
 	if (NULL == (service = get_vmware_service(url, username, password, result, &ret)))
 		goto unlock;
 
-	ret = vmware_service_get_vm_counter(service, uuid, instance, "cpu/readiness[average]", 1, result);
+	ret = vmware_service_get_vm_counter(service, uuid, instance, "cpu/readiness[average]", 0, result);
 unlock:
 	zbx_vmware_unlock();
 out:
@@ -4010,7 +4061,7 @@ int	check_vcenter_vm_cpu_swapwait(AGENT_REQUEST *request, const char *username,
 	if (NULL == (service = get_vmware_service(url, username, password, result, &ret)))
 		goto unlock;
 
-	ret = vmware_service_get_vm_counter(service, uuid, instance, "cpu/swapwait[summation]", 1, result);
+	ret = vmware_service_get_vm_counter(service, uuid, instance, "cpu/swapwait[summation]", 0, result);
 unlock:
 	zbx_vmware_unlock();
 out:
@@ -4048,7 +4099,7 @@ int	check_vcenter_vm_cpu_usage_perf(AGENT_REQUEST *request, const char *username
 	if (NULL == (service = get_vmware_service(url, username, password, result, &ret)))
 		goto unlock;
 
-	ret = vmware_service_get_vm_counter(service, uuid, "", "cpu/usage[average]", 1, result);
+	ret = vmware_service_get_vm_counter(service, uuid, "", "cpu/usage[average]", 0, result);
 unlock:
 	zbx_vmware_unlock();
 out:
diff --git a/src/zabbix_server/service/service_manager.c b/src/zabbix_server/service/service_manager.c
index d6499c451a1..d35259a0d3c 100644
--- a/src/zabbix_server/service/service_manager.c
+++ b/src/zabbix_server/service/service_manager.c
@@ -1729,6 +1729,35 @@ out:
 	return status;
 }
 
+typedef struct
+{
+	zbx_service_t	*service;
+	int		severity;
+}
+zbx_service_severity_t;
+
+static void	service_add_cause(zbx_vector_ptr_t *causes, zbx_service_t *service, int severity)
+{
+	int			i;
+	zbx_service_severity_t	*cause;
+
+	for (i = 0; i < causes->values_num; i++)
+	{
+		cause = (zbx_service_severity_t *)causes->values[i];
+		if (cause->service == service)
+		{
+			if (cause->severity > severity)
+				cause->severity = severity;
+			return;
+		}
+	}
+
+	cause = (zbx_service_severity_t *)zbx_malloc(NULL, sizeof(zbx_service_severity_t));
+	cause->service = service;
+	cause->severity = severity;
+	zbx_vector_ptr_append(causes, cause);
+}
+
 /******************************************************************************
  *                                                                            *
  * Function: service_get_causes                                               *
@@ -1737,26 +1766,70 @@ out:
  *          specified severity state                                          *
  *                                                                            *
  * Parameters: service   - [IN] the service                                   *
- *             severity  - [IN] the required severity                         *
- *             eventids  - [OUT] the services                                 *
+ *             severity  - [IN] the required severity (-1 if there is no      *
+ *                              minimum severity required)                    *
+ *             eventids  - [OUT] the root cause events                        *
  *                                                                            *
  * Comments: The returned list includes children, grandchildren etc           *
  *                                                                            *
  ******************************************************************************/
-static void	service_get_causes(const zbx_service_t *service, int severity, zbx_vector_ptr_t *services)
+static void	service_get_causes(const zbx_service_t *service, int severity, zbx_vector_uint64_t *eventids)
 {
-	int			status, child_status, i, index;
-	zbx_vector_ptr_t	children, causes;
+	int			i, min_severity;
+	zbx_vector_ptr_t	causes;
 	zbx_service_rule_t	*n_rule = NULL, *w_rule = NULL;
 
-	zbx_vector_ptr_create(&children);
+	/* calculate the minimum severity by reversing propagation rule */
+	if (ZBX_SERVICE_STATUS_OK != severity)
+	{
+		switch (service->propagation_rule)
+		{
+			case ZBX_SERVICE_STATUS_PROPAGATION_INCREASE:
+				min_severity = severity - service->propagation_value;
+				if (ZBX_SERVICE_STATUS_OK >= min_severity)
+					min_severity = ZBX_SERVICE_STATUS_OK + 1;
+				severity = min_severity;
+				break;
+			case ZBX_SERVICE_STATUS_PROPAGATION_DECREASE:
+				min_severity = severity + service->propagation_value;
+				if (TRIGGER_SEVERITY_COUNT <= min_severity)
+					min_severity = TRIGGER_SEVERITY_COUNT - 1;
+				severity = min_severity;
+				break;
+			case ZBX_SERVICE_STATUS_PROPAGATION_FIXED:
+				min_severity = TRIGGER_SEVERITY_NOT_CLASSIFIED;
+				severity = ZBX_SERVICE_STATUS_OK;
+				break;
+			default:
+				min_severity = severity;
+		}
+	}
+	else
+		min_severity = TRIGGER_SEVERITY_NOT_CLASSIFIED;
+
+	if (0 == service->children.values_num)
+	{
+		for (i = 0; i < service->service_problems.values_num; i++)
+		{
+			zbx_service_problem_t	*service_problem;
+
+			service_problem = (zbx_service_problem_t *)service->service_problems.values[i];
+
+			if (service_problem->severity >= min_severity)
+				zbx_vector_uint64_append(eventids, service_problem->eventid);
+		}
+
+		return;
+	}
+
 	zbx_vector_ptr_create(&causes);
 
-	if ((status = service_get_main_status(service)) >= severity)
+	if (service_get_main_status(service) >= min_severity)
 	{
 		for (i = 0; i < service->children.values_num; i++)
 		{
 			zbx_service_t	*child = (zbx_service_t *)service->children.values[i];
+			int		child_status;
 
 			if (SUCCEED != service_get_status(child, &child_status) ||
 					ZBX_SERVICE_STATUS_OK == child_status)
@@ -1764,40 +1837,25 @@ static void	service_get_causes(const zbx_service_t *service, int severity, zbx_v
 				continue;
 			}
 
-			if ((ZBX_SERVICE_STATUS_CALC_MOST_CRITICAL_ONE == service->algorithm &&
-					child_status >= severity) ||
-					ZBX_SERVICE_STATUS_CALC_MOST_CRITICAL_ALL == service->algorithm)
+			if (ZBX_SERVICE_STATUS_CALC_MOST_CRITICAL_ALL == service->algorithm)
+				service_add_cause(&causes, child, ZBX_SERVICE_STATUS_OK);
+
+			if (ZBX_SERVICE_STATUS_CALC_MOST_CRITICAL_ONE == service->algorithm &&
+					child_status >= min_severity)
 			{
-				zbx_vector_ptr_append(&causes, child);
+				service_add_cause(&causes, child, severity);
 			}
-			else
-				zbx_vector_ptr_append(&children, child);
 		}
 	}
-	else
-		zbx_vector_ptr_append_array(&children, service->children.values, service->children.values_num);
-
-	for (i = 0; i < causes.values_num; i++)
-	{
-		zbx_vector_ptr_append(services, causes.values[i]);
-		service_get_causes((const zbx_service_t *)causes.values[i], severity, services);
-	}
-
-	if (0 == children.values_num)
-		goto out;
-
-	zbx_vector_ptr_sort(&children, ZBX_DEFAULT_PTR_COMPARE_FUNC);
 
 	for (i = 0; i < service->status_rules.values_num; i++)
 	{
 		zbx_service_rule_t	*rule = (zbx_service_rule_t *)service->status_rules.values[i];
 
 		/* check if the rule can return status of acceptable severity */
-		if (rule->new_status < severity)
+		if (rule->new_status < min_severity)
 			continue;
 
-		zbx_vector_ptr_clear(&causes);
-
 		if (ZBX_SERVICE_STATUS_OK == service_get_rule_status(service, rule))
 			continue;
 
@@ -1819,64 +1877,51 @@ static void	service_get_causes(const zbx_service_t *service, int severity, zbx_v
 
 	if (NULL != n_rule)
 	{
-		int	total_weight, total_num;
-
-		zbx_vector_ptr_clear(&causes);
-		service_get_children_by_status(service, n_rule->limit_status, &causes, &total_weight, &total_num);
+		int			total_weight, total_num;
+		zbx_vector_ptr_t	children;
 
-		for (i = 0; i < causes.values_num && 0 != children.values_num; i++)
-		{
-			zbx_service_t	*child = (zbx_service_t *)causes.values[i];
+		zbx_vector_ptr_create(&children);
 
-			if (FAIL == (index = zbx_vector_ptr_bsearch(&children, child, ZBX_DEFAULT_PTR_COMPARE_FUNC)))
-				continue;
+		service_get_children_by_status(service, n_rule->limit_status, &children, &total_weight, &total_num);
 
-			zbx_vector_ptr_remove(&children, index);
-			zbx_vector_ptr_append(services, child);
-			service_get_causes(child, n_rule->limit_status, services);
-		}
+		for (i = 0; i < children.values_num; i++)
+			service_add_cause(&causes, (zbx_service_t *)children.values[i], n_rule->limit_status);
 
-		/* check if weight based rule is not covered by the count based rule */
-		if (NULL != w_rule && w_rule->limit_status >= n_rule->limit_status)
-			goto out;
+		zbx_vector_ptr_destroy(&children);
 	}
 
+	/* cause is only added once, even if weight based rule is covered by the count based rule */
 	if (NULL != w_rule)
 	{
-		int	total_weight, total_num;
+		int			total_weight, total_num;
+		zbx_vector_ptr_t	children;
 
-		zbx_vector_ptr_clear(&causes);
-		service_get_children_by_status(service, w_rule->limit_status, &causes, &total_weight, &total_num);
+		zbx_vector_ptr_create(&children);
 
-		/* children with 0 weight cannot affect weight based rule, skip them */
-		for (i = 0; i < children.values_num; )
+		service_get_children_by_status(service, w_rule->limit_status, &children, &total_weight, &total_num);
+
+		for (i = 0; i < children.values_num; i++)
 		{
 			zbx_service_t	*child = (zbx_service_t *)children.values[i];
 
 			if (0 == child->weight)
-				zbx_vector_ptr_remove(&children, i);
-			else
-				i++;
-		}
+				continue;
 
-		for (i = 0; i < causes.values_num && 0 != children.values_num; i++)
-		{
-			zbx_service_t	*child = (zbx_service_t *)causes.values[i];
+			service_add_cause(&causes, child, w_rule->limit_status);
+		}
 
-			if (0 == child->weight)
-				continue;
+		zbx_vector_ptr_destroy(&children);
+	}
 
-			if (FAIL == (index = zbx_vector_ptr_bsearch(&children, child, ZBX_DEFAULT_PTR_COMPARE_FUNC)))
-				continue;
+	for (i = 0; i < causes.values_num; i++)
+	{
+		zbx_service_severity_t	*cause = (zbx_service_severity_t *)causes.values[i];
 
-			zbx_vector_ptr_remove(&children, index);
-			zbx_vector_ptr_append(services, child);
-			service_get_causes(child, w_rule->limit_status, services);
-		}
+		service_get_causes(cause->service, cause->severity, eventids);
 	}
-out:
+
+	zbx_vector_ptr_clear_ext(&causes, zbx_ptr_free);
 	zbx_vector_ptr_destroy(&causes);
-	zbx_vector_ptr_destroy(&children);
 }
 
 /******************************************************************************
@@ -1891,35 +1936,7 @@ out:
  ******************************************************************************/
 void	service_get_rootcause_eventids(const zbx_service_t *parent, zbx_vector_uint64_t *eventids)
 {
-	zbx_vector_ptr_t	services;
-	int			i, j;
-
-	for (j = 0; j < parent->service_problems.values_num; j++)
-	{
-		zbx_service_problem_t	*service_problem;
-
-		service_problem = (zbx_service_problem_t *)parent->service_problems.values[j];
-		zbx_vector_uint64_append(eventids, service_problem->eventid);
-	}
-
-	zbx_vector_ptr_create(&services);
-
-	service_get_causes(parent, TRIGGER_SEVERITY_NOT_CLASSIFIED, &services);
-
-	for (i = 0; i < services.values_num; i++)
-	{
-		zbx_service_t	*service = (zbx_service_t *)services.values[i];
-
-		for (j = 0; j < service->service_problems.values_num; j++)
-		{
-			zbx_service_problem_t	*service_problem;
-
-			service_problem = (zbx_service_problem_t *)service->service_problems.values[j];
-			zbx_vector_uint64_append(eventids, service_problem->eventid);
-		}
-	}
-
-	zbx_vector_ptr_destroy(&services);
+	service_get_causes(parent, ZBX_SERVICE_STATUS_OK, eventids);
 
 	zbx_vector_uint64_sort(eventids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
 	zbx_vector_uint64_uniq(eventids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
@@ -2852,9 +2869,6 @@ static void	process_rootcause(const zbx_ipc_message_t *message, zbx_service_mana
 		if (0 == eventids.values_num)
 			continue;
 
-		zbx_vector_uint64_sort(&eventids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
-		zbx_vector_uint64_uniq(&eventids, ZBX_DEFAULT_UINT64_COMPARE_FUNC);
-
 		zbx_service_serialize_rootcause(&data, &data_alloc, &data_offset, serviceids.values[i], &eventids);
 		zbx_vector_uint64_clear(&eventids);
 	}
diff --git a/src/zabbix_server/trapper/nodecommand.c b/src/zabbix_server/trapper/nodecommand.c
index 4d1b0a061db..70cf242b3bf 100644
--- a/src/zabbix_server/trapper/nodecommand.c
+++ b/src/zabbix_server/trapper/nodecommand.c
@@ -438,6 +438,7 @@ static int	execute_script(zbx_uint64_t scriptid, zbx_uint64_t hostid, zbx_uint64
 	if (SUCCEED == (ret = zbx_script_prepare(&script, &host.hostid, error, sizeof(error))))
 	{
 		const char	*poutput = NULL, *perror = NULL;
+		int		audit_res;
 
 		if (0 == host.proxy_hostid || ZBX_SCRIPT_EXECUTE_ON_SERVER == script.execute_on ||
 				ZBX_SCRIPT_TYPE_WEBHOOK == script.type)
@@ -453,8 +454,14 @@ static int	execute_script(zbx_uint64_t scriptid, zbx_uint64_t hostid, zbx_uint64
 		else
 			perror = error;
 
-		zbx_auditlog_global_script(script.type, script.execute_on, script.command_orig, host.hostid, host.name,
-				eventid, host.proxy_hostid, user->userid, user->username, clientip, poutput, perror);
+		audit_res = zbx_auditlog_global_script(script.type, script.execute_on, script.command_orig, host.hostid,
+				host.name, eventid, host.proxy_hostid, user->userid, user->username, clientip, poutput,
+				perror);
+
+		/* At the moment, there is no special processing of audit failures. */
+		/* It can fail only due to the DB errors and those are visible in   */
+		/* the log anyway */
+		ZBX_UNUSED(audit_res);
 	}
 fail:
 	if (SUCCEED != ret)
diff --git a/src/zabbix_server/trapper/trapper.c b/src/zabbix_server/trapper/trapper.c
index 4dd0123cd01..327f08ceb07 100644
--- a/src/zabbix_server/trapper/trapper.c
+++ b/src/zabbix_server/trapper/trapper.c
@@ -565,7 +565,7 @@ static void	zbx_status_counters_free(void)
 }
 
 const zbx_status_section_t	status_sections[] = {
-/*	{SECTION NAME,			NUMBER OF SECTION ENTRIES	SECTION ACCESS LEVEL	SECTION READYNESS, */
+/*	{SECTION NAME,			NUMBER OF SECTION ENTRIES	SECTION ACCESS LEVEL	SECTION READINESS, */
 /*		{                                                                                                  */
 /*			{ENTRY INFORMATION,		COUNTER TYPE,                                              */
 /*				{                                                                                  */
diff --git a/src/zabbix_server/vmware/vmware.c b/src/zabbix_server/vmware/vmware.c
index 8603679a64c..c1c9e1398d7 100644
--- a/src/zabbix_server/vmware/vmware.c
+++ b/src/zabbix_server/vmware/vmware.c
@@ -140,6 +140,7 @@ typedef struct
 {
 	char		*path;
 	zbx_uint64_t	id;
+	int		unit;
 }
 zbx_vmware_counter_t;
 
@@ -2342,8 +2343,38 @@ static int	vmware_service_get_perf_counters(zbx_vmware_service_t *service, CURL
 		"</ns0:RetrievePropertiesEx>"							\
 		ZBX_POST_VSPHERE_FOOTER
 
+#	define STR2UNIT(unit, val)								\
+		if (0 == strcmp("joule",val))							\
+			unit = ZBX_VMWARE_UNIT_JOULE;						\
+		else if (0 == strcmp("kiloBytes",val))						\
+			unit = ZBX_VMWARE_UNIT_KILOBYTES;					\
+		else if (0 == strcmp("kiloBytesPerSecond",val))					\
+			unit = ZBX_VMWARE_UNIT_KILOBYTESPERSECOND;				\
+		else if (0 == strcmp("megaBytes",val))						\
+			unit = ZBX_VMWARE_UNIT_MEGABYTES;					\
+		else if (0 == strcmp("megaBytesPerSecond",val))					\
+			unit = ZBX_VMWARE_UNIT_MEGABYTESPERSECOND;				\
+		else if (0 == strcmp("megaHertz",val))						\
+			unit = ZBX_VMWARE_UNIT_MEGAHERTZ;					\
+		else if (0 == strcmp("microsecond",val))					\
+			unit = ZBX_VMWARE_UNIT_MICROSECOND;					\
+		else if (0 == strcmp("millisecond",val))					\
+			unit = ZBX_VMWARE_UNIT_MILLISECOND;					\
+		else if (0 == strcmp("number",val))						\
+			unit = ZBX_VMWARE_UNIT_NUMBER;						\
+		else if (0 == strcmp("percent",val))						\
+			unit = ZBX_VMWARE_UNIT_PERCENT;						\
+		else if (0 == strcmp("second",val))						\
+			unit = ZBX_VMWARE_UNIT_SECOND;						\
+		else if (0 == strcmp("teraBytes",val))						\
+			unit = ZBX_VMWARE_UNIT_TERABYTES;					\
+		else if (0 == strcmp("watt",val))						\
+			unit = ZBX_VMWARE_UNIT_WATT;						\
+		else										\
+			unit = ZBX_VMWARE_UNIT_UNDEFINED
+
 	char		tmp[MAX_STRING_LEN], *group = NULL, *key = NULL, *rollup = NULL, *stats = NULL,
-			*counterid = NULL;
+			*counterid = NULL, *unit = NULL;
 	xmlDoc		*doc = NULL;
 	xmlXPathContext	*xpathCtx;
 	xmlXPathObject	*xpathObj;
@@ -2389,12 +2420,21 @@ static int	vmware_service_get_perf_counters(zbx_vmware_service_t *service, CURL
 		rollup = zbx_xml_read_node_value(doc, nodeset->nodeTab[i], "*[local-name()='rollupType']");
 		stats = zbx_xml_read_node_value(doc, nodeset->nodeTab[i], "*[local-name()='statsType']");
 		counterid = zbx_xml_read_node_value(doc, nodeset->nodeTab[i], "*[local-name()='key']");
+		unit = zbx_xml_read_node_value(doc, nodeset->nodeTab[i],
+				"*[local-name()='unitInfo']/*[local-name()='key']");
 
-		if (NULL != group && NULL != key && NULL != rollup && NULL != counterid)
+		if (NULL != group && NULL != key && NULL != rollup && NULL != counterid && NULL != unit)
 		{
 			counter = (zbx_vmware_counter_t *)zbx_malloc(NULL, sizeof(zbx_vmware_counter_t));
 			counter->path = zbx_dsprintf(NULL, "%s/%s[%s]", group, key, rollup);
 			ZBX_STR2UINT64(counter->id, counterid);
+			STR2UNIT(counter->unit, unit);
+
+			if (ZBX_VMWARE_UNIT_UNDEFINED == counter->unit)
+			{
+				zabbix_log(LOG_LEVEL_WARNING, "Unknown performance counter " ZBX_FS_UI64
+						" type of unitInfo:%s", counter->id, unit);
+			}
 
 			zbx_vector_ptr_append(counters, counter);
 
@@ -2402,11 +2442,19 @@ static int	vmware_service_get_perf_counters(zbx_vmware_service_t *service, CURL
 					counter->id);
 		}
 
-		if (NULL != group && NULL != key && NULL != rollup && NULL != counterid && NULL != stats)
+		if (NULL != group && NULL != key && NULL != rollup && NULL != counterid && NULL != stats &&
+				NULL != unit)
 		{
 			counter = (zbx_vmware_counter_t *)zbx_malloc(NULL, sizeof(zbx_vmware_counter_t));
 			counter->path = zbx_dsprintf(NULL, "%s/%s[%s,%s]", group, key, rollup, stats);
 			ZBX_STR2UINT64(counter->id, counterid);
+			STR2UNIT(counter->unit, unit);
+
+			if (ZBX_VMWARE_UNIT_UNDEFINED == counter->unit)
+			{
+				zabbix_log(LOG_LEVEL_WARNING, "Unknown performance counter " ZBX_FS_UI64
+						" type of unitInfo:%s", counter->id, unit);
+			}
 
 			zbx_vector_ptr_append(counters, counter);
 
@@ -2419,6 +2467,7 @@ static int	vmware_service_get_perf_counters(zbx_vmware_service_t *service, CURL
 		zbx_free(rollup);
 		zbx_free(key);
 		zbx_free(group);
+		zbx_free(unit);
 	}
 
 	ret = SUCCEED;
@@ -2432,6 +2481,9 @@ out:
 	zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
 
 	return ret;
+
+#	undef STR2UNIT
+#	undef ZBX_POST_VMWARE_GET_PERFCOUNTER
 }
 
 /******************************************************************************
@@ -5336,7 +5388,7 @@ static void	vmware_service_add_perf_entity(zbx_vmware_service_t *service, const
 
 		for (i = 0; NULL != counters[i]; i++)
 		{
-			if (SUCCEED == zbx_vmware_service_get_counterid(service, counters[i], &counterid))
+			if (SUCCEED == zbx_vmware_service_get_counterid(service, counters[i], &counterid, NULL))
 				vmware_counters_add_new(&pentity->counters, counterid);
 			else
 				zabbix_log(LOG_LEVEL_DEBUG, "cannot find performance counter %s", counters[i]);
@@ -6393,18 +6445,19 @@ out:
  *                                                                            *
  * Function: zbx_vmware_service_get_counterid                                 *
  *                                                                            *
- * Purpose: gets vmware performance counter id by the path                    *
+ * Purpose: gets vmware performance counter id and unit info by the path      *
  *                                                                            *
  * Parameters: service   - [IN] the vmware service                            *
  *             path      - [IN] the path of counter to retrieve in format     *
  *                              <group>/<key>[<rollup type>]                  *
  *             counterid - [OUT] the counter id                               *
+ *             unit      - [OUT] the counter unit info (kilo, mega, % etc)    *
  *                                                                            *
  * Return value: SUCCEED if the counter was found, FAIL otherwise             *
  *                                                                            *
  ******************************************************************************/
 int	zbx_vmware_service_get_counterid(zbx_vmware_service_t *service, const char *path,
-		zbx_uint64_t *counterid)
+		zbx_uint64_t *counterid, int *unit)
 {
 #if defined(HAVE_LIBXML2) && defined(HAVE_LIBCURL)
 	zbx_vmware_counter_t	*counter;
@@ -6417,6 +6470,9 @@ int	zbx_vmware_service_get_counterid(zbx_vmware_service_t *service, const char *
 
 	*counterid = counter->id;
 
+	if (NULL != unit)
+		*unit = counter->unit;
+
 	zabbix_log(LOG_LEVEL_DEBUG, "%s() counterid:" ZBX_FS_UI64, __func__, *counterid);
 
 	ret = SUCCEED;
@@ -6782,7 +6838,7 @@ void	zbx_vmware_unlock(void)
  *                                                                            *
  * Parameters: stats   - [OUT] the vmware collector statistics                *
  *                                                                            *
- * Return value: SUCCEEED - the statistics were retrieved successfully        *
+ * Return value: SUCCEED - the statistics were retrieved successfully         *
  *               FAIL     - no vmware collectors are running                  *
  *                                                                            *
  ******************************************************************************/
diff --git a/src/zabbix_server/vmware/vmware.h b/src/zabbix_server/vmware/vmware.h
index 571e0b30e01..7d1a383dded 100644
--- a/src/zabbix_server/vmware/vmware.h
+++ b/src/zabbix_server/vmware/vmware.h
@@ -333,7 +333,8 @@ int	zbx_vmware_get_statistics(zbx_vmware_stats_t *stats);
 
 zbx_vmware_service_t	*zbx_vmware_get_service(const char* url, const char* username, const char* password);
 
-int	zbx_vmware_service_get_counterid(zbx_vmware_service_t *service, const char *path, zbx_uint64_t *counterid);
+int	zbx_vmware_service_get_counterid(zbx_vmware_service_t *service, const char *path, zbx_uint64_t *counterid,
+		int *unit);
 int	zbx_vmware_service_add_perf_counter(zbx_vmware_service_t *service, const char *type, const char *id,
 		zbx_uint64_t counterid, const char *instance);
 zbx_vmware_perf_entity_t	*zbx_vmware_service_get_perf_entity(zbx_vmware_service_t *service, const char *type,
@@ -397,6 +398,22 @@ zbx_vmware_perf_entity_t	*zbx_vmware_service_get_perf_entity(zbx_vmware_service_
 #define ZBX_VMWARE_SOAP_HV		"HostSystem"
 #define ZBX_VMWARE_SOAP_VM		"VirtualMachine"
 
+/* Indicates the unit of measure represented by a counter or statistical value */
+#define ZBX_VMWARE_UNIT_UNDEFINED		0
+#define ZBX_VMWARE_UNIT_JOULE			1
+#define ZBX_VMWARE_UNIT_KILOBYTES		2
+#define ZBX_VMWARE_UNIT_KILOBYTESPERSECOND	3
+#define ZBX_VMWARE_UNIT_MEGABYTES		4
+#define ZBX_VMWARE_UNIT_MEGABYTESPERSECOND	5
+#define ZBX_VMWARE_UNIT_MEGAHERTZ		6
+#define ZBX_VMWARE_UNIT_MICROSECOND		7
+#define ZBX_VMWARE_UNIT_MILLISECOND		8
+#define ZBX_VMWARE_UNIT_NUMBER			9
+#define ZBX_VMWARE_UNIT_PERCENT			10
+#define ZBX_VMWARE_UNIT_SECOND			11
+#define ZBX_VMWARE_UNIT_TERABYTES		12
+#define ZBX_VMWARE_UNIT_WATT			13
+
 #endif	/* defined(HAVE_LIBXML2) && defined(HAVE_LIBCURL) */
 
 #endif	/* ZABBIX_VMWARE_H */
diff --git a/templates/db/clickhouse_http/README.md b/templates/db/clickhouse_http/README.md
index 2f4b611990e..491b55351ae 100644
--- a/templates/db/clickhouse_http/README.md
+++ b/templates/db/clickhouse_http/README.md
@@ -31,8 +31,8 @@ create file /etc/clickhouse-server/users.d/zabbix.xml
         <allow_databases>
           <database>test</database>
         </allow_databases>
-        </zabbix>
-     </zabbix>
+      </zabbix>
+    </user>
   </yandex>   
 
 ```
diff --git a/templates/db/influxdb_http/README.md b/templates/db/influxdb_http/README.md
new file mode 100644
index 00000000000..e7a52075fe1
--- /dev/null
+++ b/templates/db/influxdb_http/README.md
@@ -0,0 +1,100 @@
+
+# InfluxDB by HTTP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template to monitor InfluxDB by Zabbix that works without any external scripts.
+Most of the metrics are collected in one go, thanks to Zabbix bulk data collection.
+
+Template `InfluxDB by HTTP` — collects metrics by HTTP agent from InfluxDB /metrics endpoint.
+See:
+
+
+
+This template was tested on:
+
+- InfluxDB, version 2.0
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/http) for basic instructions.
+
+This template works with self-hosted InfluxDB instances. Internal service metrics are collected from InfluxDB /metrics endpoint.
+For organization discovery template need to use Authorization via API token. See docs: https://docs.influxdata.com/influxdb/v2.0/security/tokens/
+
+Don't forget to change the macros {$INFLUXDB.URL},  {$INFLUXDB.API.TOKEN}.
+Also, see the Macros section for a list of macros used to set trigger values.
+*NOTE.* Some metrics may not be collected depending on your InfluxDB instance version and configuration.
+
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$INFLUXDB.API.TOKEN} |<p>InfluxDB API Authorization Token</p> |`` |
+|{$INFLUXDB.ORG_NAME.MATCHES} |<p>Filter of discoverable organizations</p> |`.*` |
+|{$INFLUXDB.ORG_NAME.NOT_MATCHES} |<p>Filter to exclude discovered organizations</p> |`CHANGE_IF_NEEDED` |
+|{$INFLUXDB.REQ.FAIL.MAX.WARN} |<p>Maximum number of query requests failures for trigger expression.</p> |`2` |
+|{$INFLUXDB.TASK.RUN.FAIL.MAX.WARN} |<p>Maximum number of tasks runs failures for trigger expression.</p> |`2` |
+|{$INFLUXDB.URL} |<p>InfluxDB instance URL</p> |`http://localhost:8086` |
+
+## Template links
+
+There are no template links in this template.
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Organizations discovery |<p>Discovery of organizations merics.</p> |HTTP_AGENT |influxdb.orgs.discovery<p>**Preprocessing**:</p><p>- JAVASCRIPT: `The text is too long. Please see the template.`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p><p>**Filter**:</p>AND <p>- A: {#ORG_NAME} NOT_MATCHES_REGEX `{$INFLUXDB.ORG_NAME.NOT_MATCHES}`</p><p>- B: {#ORG_NAME} MATCHES_REGEX `{$INFLUXDB.ORG_NAME.MATCHES}`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|InfluxDB |InfluxDB: Instance status |<p>Get the health of an instance.</p> |HTTP_AGENT |influx.healthcheck<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED<p>- JAVASCRIPT: `return JSON.parse(value).status == 'pass' ? 1: 0`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|InfluxDB |InfluxDB: Boltdb reads, rate |<p>Total number of boltdb reads per second.</p> |DEPENDENT |influxdb.boltdb_reads.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="boltdb_reads_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
+|InfluxDB |InfluxDB: Boltdb writes, rate |<p>Total number of boltdb writes per second.</p> |DEPENDENT |influxdb.boltdb_writes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="boltdb_writes_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
+|InfluxDB |InfluxDB: Buckets, total |<p>Number of total buckets on the server.</p> |DEPENDENT |influxdb.buckets.total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="influxdb_buckets_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|InfluxDB |InfluxDB: Dashboards, total |<p>Number of total dashboards on the server.</p> |DEPENDENT |influxdb.dashboards.total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="influxdb_dashboards_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|InfluxDB |InfluxDB: Organizations, total |<p>Number of total organizations on the server.</p> |DEPENDENT |influxdb.organizations.total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="influxdb_organizations_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|InfluxDB |InfluxDB: Scrapers, total |<p>Number of total scrapers on the server.</p> |DEPENDENT |influxdb.scrapers.total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="influxdb_scrapers_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|InfluxDB |InfluxDB: Telegraf plugins, total |<p>Number of individual telegraf plugins configured.</p> |DEPENDENT |influxdb.telegraf_plugins.total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="influxdb_telegraf_plugins_count")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|InfluxDB |InfluxDB: Telegrafs, total |<p>Number of total telegraf configurations on the server.</p> |DEPENDENT |influxdb.telegrafs.total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="influxdb_telegrafs_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|InfluxDB |InfluxDB: Tokens, total |<p>Number of total tokens on the server.</p> |DEPENDENT |influxdb.tokens.total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="influxdb_tokens_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|InfluxDB |InfluxDB: Users, total |<p>Number of total users on the server.</p> |DEPENDENT |influxdb.users.total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="influxdb_users_total")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `30m`</p> |
+|InfluxDB |InfluxDB: Version |<p>Version of the InfluxDB instance.</p> |DEPENDENT |influxdb.version<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="influxdb_info")].labels.version.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `3h`</p> |
+|InfluxDB |InfluxDB: Uptime |<p>InfluxDB process uptime in seconds.</p> |DEPENDENT |influxdb.uptime<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="influxdb_uptime_seconds")].value.first()`</p> |
+|InfluxDB |InfluxDB: Workers currently running |<p>Total number of workers currently running tasks.</p> |DEPENDENT |influxdb.task_executor_runs_active.total<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="task_executor_total_runs_active")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|InfluxDB |InfluxDB: Workers busy, pct |<p>Percent of total available workers that are currently busy.</p> |DEPENDENT |influxdb.task_executor_workers_busy.pct<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="task_executor_workers_busy")].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p> |
+|InfluxDB |InfluxDB: Task runs failed, rate |<p>Total number of failure runs across all tasks.</p> |DEPENDENT |influxdb.task_executor_complete.failed.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="task_executor_total_runs_complete" && @.labels.status == "failed")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
+|InfluxDB |InfluxDB: Task runs successful, rate |<p>Total number of runs successful completed across all tasks.</p> |DEPENDENT |influxdb.task_executor_complete.successful.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="task_executor_total_runs_complete" && @.labels.status == "success")].value.sum()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
+|InfluxDB |InfluxDB: [{#ORG_NAME}] Query requests bytes, success |<p>Count of bytes received with status 200 per second.</p> |DEPENDENT |influxdb.org.query_request_bytes.success.rate["{#ORG_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="http_query_request_bytes" && @.labels.status == "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
+|InfluxDB |InfluxDB: [{#ORG_NAME}] Query requests bytes, failed |<p>Count of bytes received with status not 200 per second.</p> |DEPENDENT |influxdb.org.query_request_bytes.failed.rate["{#ORG_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="http_query_request_bytes" && @.labels.status != "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
+|InfluxDB |InfluxDB: [{#ORG_NAME}] Query requests, failed |<p>Total number of query requests with status not 200 per second.</p> |DEPENDENT |influxdb.org.query_request.failed.rate["{#ORG_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="http_query_request_count" && @.labels.status != "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
+|InfluxDB |InfluxDB: [{#ORG_NAME}] Query requests, success |<p>Total number of query requests with status 200 per second.</p> |DEPENDENT |influxdb.org.query_request.success.rate["{#ORG_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="http_query_request_count" && @.labels.status == "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
+|InfluxDB |InfluxDB: [{#ORG_NAME}] Query response bytes, success |<p>Count of bytes returned with status 200 per second.</p> |DEPENDENT |influxdb.org.http_query_response_bytes.success.rate["{#ORG_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="http_query_response_bytes" && @.labels.status == "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
+|InfluxDB |InfluxDB: [{#ORG_NAME}] Query response bytes, failed |<p>Count of bytes returned with status not 200 per second.</p> |DEPENDENT |influxdb.org.http_query_response_bytes.failed.rate["{#ORG_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.name=="http_query_response_bytes" && @.labels.status != "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()`</p><p>⛔️ON_FAIL: `DISCARD_VALUE -> `</p><p>- CHANGE_PER_SECOND |
+|Zabbix_raw_items |InfluxDB: Get instance metrics |<p>-</p> |HTTP_AGENT |influx.get_metrics<p>**Preprocessing**:</p><p>- CHECK_NOT_SUPPORTED<p>- PROMETHEUS_TO_JSON |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|InfluxDB: Health check was failed |<p>The InfluxDB instance is not available or unhealthy.</p> |`last(/InfluxDB by HTTP/influx.healthcheck)=0` |HIGH | |
+|InfluxDB: Version has changed (new version: {ITEM.VALUE}) |<p>InfluxDB version has changed. Ack to close.</p> |`last(/InfluxDB by HTTP/influxdb.version,#1)<>last(/InfluxDB by HTTP/influxdb.version,#2) and length(last(/InfluxDB by HTTP/influxdb.version))>0` |INFO |<p>Manual close: YES</p> |
+|InfluxDB: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/InfluxDB by HTTP/influxdb.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|InfluxDB: Too many tasks failure runs (over {$INFLUXDB.TASK.RUN.FAIL.MAX.WARN} for 5m) |<p>"Number of failure runs completed across all tasks is too high."</p> |`min(/InfluxDB by HTTP/influxdb.task_executor_complete.failed.rate,5m)>{$INFLUXDB.TASK.RUN.FAIL.MAX.WARN}` |WARNING | |
+|InfluxDB: [{#ORG_NAME}]: Too many requests failures (over {$INFLUXDB.REQ.FAIL.MAX.WARN} for 5m) |<p>Too many query requests failed.</p> |`min(/InfluxDB by HTTP/influxdb.org.query_request.failed.rate["{#ORG_NAME}"],5m)>{$INFLUXDB.REQ.FAIL.MAX.WARN}` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+You can also provide a feedback, discuss the template or ask for help with it at [ZABBIX forums](https://www.zabbix.com/forum/zabbix-suggestions-and-feedback).
+
diff --git a/templates/db/influxdb_http/template_db_influxdb_http.yaml b/templates/db/influxdb_http/template_db_influxdb_http.yaml
new file mode 100644
index 00000000000..e6cd3f506c3
--- /dev/null
+++ b/templates/db/influxdb_http/template_db_influxdb_http.yaml
@@ -0,0 +1,1018 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-01T08:33:52Z'
+  groups:
+    -
+      uuid: a571c0d144b14fd4a87a9d9b2aa9fcd6
+      name: Templates/Applications
+  templates:
+    -
+      uuid: a6fe3640b23544e7ae15d438b38ce1cd
+      template: 'InfluxDB by HTTP'
+      name: 'InfluxDB by HTTP'
+      description: |
+        Get InfluxDB metrics by HTTP agent from Prometheus metrics endpoint.
+        For organization discovery template need to use Authorization via API token. See docs: https://docs.influxdata.com/influxdb/v2.0/security/tokens/
+        
+        Don't forget change macros {$INFLUXDB.URL}, {$INFLUXDB.API.TOKEN}.
+        Some metrics may not be collected depending on your InfluxDB instance version and configuration.
+        
+        You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback
+        
+        Template tooling version used: 0.39
+      groups:
+        -
+          name: Templates/Applications
+      items:
+        -
+          uuid: 286bb866060e47948c02408ebc841f1f
+          name: 'InfluxDB: Get instance metrics'
+          type: HTTP_AGENT
+          key: influx.get_metrics
+          history: '0'
+          trends: '0'
+          value_type: TEXT
+          preprocessing:
+            -
+              type: CHECK_NOT_SUPPORTED
+              parameters:
+                - ''
+            -
+              type: PROMETHEUS_TO_JSON
+              parameters:
+                - ''
+          url: '{$INFLUXDB.URL}/metrics'
+          tags:
+            -
+              tag: Data
+              value: Raw
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: HTTP
+        -
+          uuid: f8f514943c9040d7b41f14db92ca6c91
+          name: 'InfluxDB: Instance status'
+          type: HTTP_AGENT
+          key: influx.healthcheck
+          history: 7d
+          description: 'Get the health of an instance.'
+          valuemap:
+            name: 'InfluxDB healthcheck'
+          preprocessing:
+            -
+              type: CHECK_NOT_SUPPORTED
+              parameters:
+                - ''
+              error_handler: CUSTOM_VALUE
+              error_handler_params: '{"status":"fail"}]}'
+            -
+              type: JAVASCRIPT
+              parameters:
+                - 'return JSON.parse(value).status == ''pass'' ? 1: 0'
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 30m
+          url: '{$INFLUXDB.URL}/health'
+          tags:
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: HTTP
+            -
+              tag: type
+              value: State
+          triggers:
+            -
+              uuid: de130833b4514481aa56d3ba06e648fc
+              expression: 'last(/InfluxDB by HTTP/influx.healthcheck)=0'
+              name: 'InfluxDB: Health check was failed'
+              priority: HIGH
+              description: 'The InfluxDB instance is not available or unhealthy.'
+        -
+          uuid: 56b1a9f2eb454a9b96a0e0a73d5439cf
+          name: 'InfluxDB: Boltdb reads, rate'
+          type: DEPENDENT
+          key: influxdb.boltdb_reads.rate
+          delay: '0'
+          history: 7d
+          value_type: FLOAT
+          description: 'Total number of boltdb reads per second.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name=="boltdb_reads_total")].value.first()'
+              error_handler: DISCARD_VALUE
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          master_item:
+            key: influx.get_metrics
+          tags:
+            -
+              tag: resource
+              value: boltdb
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: dependent
+            -
+              tag: type
+              value: rate
+        -
+          uuid: 7bd505a8abb944c2bed17f8e4e5a8c84
+          name: 'InfluxDB: Boltdb writes, rate'
+          type: DEPENDENT
+          key: influxdb.boltdb_writes.rate
+          delay: '0'
+          history: 7d
+          value_type: FLOAT
+          description: 'Total number of boltdb writes per second.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name=="boltdb_writes_total")].value.first()'
+              error_handler: DISCARD_VALUE
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          master_item:
+            key: influx.get_metrics
+          tags:
+            -
+              tag: resource
+              value: boltdb
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: dependent
+            -
+              tag: type
+              value: rate
+        -
+          uuid: 5d5e26ee272a4af6ac979e69a83de74d
+          name: 'InfluxDB: Buckets, total'
+          type: DEPENDENT
+          key: influxdb.buckets.total
+          delay: '0'
+          history: 7d
+          description: 'Number of total buckets on the server.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name=="influxdb_buckets_total")].value.first()'
+              error_handler: DISCARD_VALUE
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 30m
+          master_item:
+            key: influx.get_metrics
+          tags:
+            -
+              tag: resource
+              value: buckets
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: dependent
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 1c5931f514804a95ac4bfba3ec4a7d82
+          name: 'InfluxDB: Dashboards, total'
+          type: DEPENDENT
+          key: influxdb.dashboards.total
+          delay: '0'
+          history: 7d
+          description: 'Number of total dashboards on the server.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name=="influxdb_dashboards_total")].value.first()'
+              error_handler: DISCARD_VALUE
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 30m
+          master_item:
+            key: influx.get_metrics
+          tags:
+            -
+              tag: resource
+              value: dashboards
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: dependent
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 915f00d9dc9847bb8bc8007d034bb80d
+          name: 'InfluxDB: Organizations, total'
+          type: DEPENDENT
+          key: influxdb.organizations.total
+          delay: '0'
+          history: 7d
+          description: 'Number of total organizations on the server.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name=="influxdb_organizations_total")].value.first()'
+              error_handler: DISCARD_VALUE
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 30m
+          master_item:
+            key: influx.get_metrics
+          tags:
+            -
+              tag: resource
+              value: organizations
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: dependent
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: e05aa2c424c140afa3794878ed2c3baa
+          name: 'InfluxDB: Scrapers, total'
+          type: DEPENDENT
+          key: influxdb.scrapers.total
+          delay: '0'
+          history: 7d
+          description: 'Number of total scrapers on the server.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name=="influxdb_scrapers_total")].value.first()'
+              error_handler: DISCARD_VALUE
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 30m
+          master_item:
+            key: influx.get_metrics
+          tags:
+            -
+              tag: resource
+              value: scrapers
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: dependent
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: f77894d5ede9481381a268670bc88766
+          name: 'InfluxDB: Task runs failed, rate'
+          type: DEPENDENT
+          key: influxdb.task_executor_complete.failed.rate
+          delay: '0'
+          history: 7d
+          description: 'Total number of failure runs across all tasks.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name=="task_executor_total_runs_complete" && @.labels.status == "failed")].value.sum()'
+              error_handler: DISCARD_VALUE
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          master_item:
+            key: influx.get_metrics
+          tags:
+            -
+              tag: resource
+              value: tasks
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: dependent
+            -
+              tag: type
+              value: rate
+          triggers:
+            -
+              uuid: f0d2137905bc477f979d035c06111844
+              expression: 'min(/InfluxDB by HTTP/influxdb.task_executor_complete.failed.rate,5m)>{$INFLUXDB.TASK.RUN.FAIL.MAX.WARN}'
+              name: 'InfluxDB: Too many tasks failure runs (over {$INFLUXDB.TASK.RUN.FAIL.MAX.WARN} for 5m)'
+              priority: WARNING
+              description: '"Number of failure runs completed across all tasks is too high."'
+        -
+          uuid: a0183b6d934c4612b358c027c75eda6e
+          name: 'InfluxDB: Task runs successful, rate'
+          type: DEPENDENT
+          key: influxdb.task_executor_complete.successful.rate
+          delay: '0'
+          history: 7d
+          description: 'Total number of runs successful completed across all tasks.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name=="task_executor_total_runs_complete" && @.labels.status == "success")].value.sum()'
+              error_handler: DISCARD_VALUE
+            -
+              type: CHANGE_PER_SECOND
+              parameters:
+                - ''
+          master_item:
+            key: influx.get_metrics
+          tags:
+            -
+              tag: resource
+              value: tasks
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: dependent
+            -
+              tag: type
+              value: rate
+        -
+          uuid: c3f147a2afb3438d8bacbb41fac6b1d0
+          name: 'InfluxDB: Workers currently running'
+          type: DEPENDENT
+          key: influxdb.task_executor_runs_active.total
+          delay: '0'
+          history: 7d
+          description: 'Total number of workers currently running tasks.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name=="task_executor_total_runs_active")].value.first()'
+              error_handler: DISCARD_VALUE
+          master_item:
+            key: influx.get_metrics
+          tags:
+            -
+              tag: resource
+              value: tasks
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: dependent
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 25595754557d49fca7c671df3f6a898c
+          name: 'InfluxDB: Workers busy, pct'
+          type: DEPENDENT
+          key: influxdb.task_executor_workers_busy.pct
+          delay: '0'
+          history: 7d
+          units: '%'
+          description: 'Percent of total available workers that are currently busy.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name=="task_executor_workers_busy")].value.first()'
+              error_handler: DISCARD_VALUE
+          master_item:
+            key: influx.get_metrics
+          tags:
+            -
+              tag: resource
+              value: tasks
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: dependent
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 94d98714ecce4847be0bdb7b8802f1ec
+          name: 'InfluxDB: Telegrafs, total'
+          type: DEPENDENT
+          key: influxdb.telegrafs.total
+          delay: '0'
+          history: 7d
+          description: 'Number of total telegraf configurations on the server.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name=="influxdb_telegrafs_total")].value.first()'
+              error_handler: DISCARD_VALUE
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 30m
+          master_item:
+            key: influx.get_metrics
+          tags:
+            -
+              tag: resource
+              value: telegraf
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: dependent
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 23bad615af024a2e9f06d4541cf6f910
+          name: 'InfluxDB: Telegraf plugins, total'
+          type: DEPENDENT
+          key: influxdb.telegraf_plugins.total
+          delay: '0'
+          history: 7d
+          description: 'Number of individual telegraf plugins configured.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name=="influxdb_telegraf_plugins_count")].value.sum()'
+              error_handler: DISCARD_VALUE
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 30m
+          master_item:
+            key: influx.get_metrics
+          tags:
+            -
+              tag: resource
+              value: telegraf
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: dependent
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 079c1eee7d93484b9126598b23921e9d
+          name: 'InfluxDB: Tokens, total'
+          type: DEPENDENT
+          key: influxdb.tokens.total
+          delay: '0'
+          history: 7d
+          description: 'Number of total tokens on the server.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name=="influxdb_tokens_total")].value.first()'
+              error_handler: DISCARD_VALUE
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 30m
+          master_item:
+            key: influx.get_metrics
+          tags:
+            -
+              tag: resource
+              value: tokens
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: dependent
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: 8699e951b7944659993422334a4cddc0
+          name: 'InfluxDB: Uptime'
+          type: DEPENDENT
+          key: influxdb.uptime
+          delay: '0'
+          history: 7d
+          value_type: FLOAT
+          units: s
+          description: 'InfluxDB process uptime in seconds.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name=="influxdb_uptime_seconds")].value.first()'
+          master_item:
+            key: influx.get_metrics
+          tags:
+            -
+              tag: resource
+              value: uptime
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: dependent
+            -
+              tag: type
+              value: gauge
+          triggers:
+            -
+              uuid: 335f27fb002544838f7150b11238d86b
+              expression: 'last(/InfluxDB by HTTP/influxdb.uptime)<10m'
+              name: 'InfluxDB: has been restarted (uptime < 10m)'
+              priority: INFO
+              description: 'Uptime is less than 10 minutes'
+              manual_close: 'YES'
+        -
+          uuid: 86357d43721f4e6aa6b1dd7e63dd2f47
+          name: 'InfluxDB: Users, total'
+          type: DEPENDENT
+          key: influxdb.users.total
+          delay: '0'
+          history: 7d
+          description: 'Number of total users on the server.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name=="influxdb_users_total")].value.first()'
+              error_handler: DISCARD_VALUE
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 30m
+          master_item:
+            key: influx.get_metrics
+          tags:
+            -
+              tag: resource
+              value: tokens
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: dependent
+            -
+              tag: type
+              value: gauge
+        -
+          uuid: d31e0d0823af4f6c999cae3d49b3815b
+          name: 'InfluxDB: Version'
+          type: DEPENDENT
+          key: influxdb.version
+          delay: '0'
+          history: 7d
+          trends: '0'
+          value_type: CHAR
+          description: 'Version of the InfluxDB instance.'
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[?(@.name=="influxdb_info")].labels.version.first()'
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 3h
+          master_item:
+            key: influx.get_metrics
+          tags:
+            -
+              tag: resource
+              value: version
+            -
+              tag: target
+              value: InfluxDB
+            -
+              tag: transport
+              value: dependent
+            -
+              tag: type
+              value: text
+          triggers:
+            -
+              uuid: d2b02cc426c748608968ae08c0823461
+              expression: 'last(/InfluxDB by HTTP/influxdb.version,#1)<>last(/InfluxDB by HTTP/influxdb.version,#2) and length(last(/InfluxDB by HTTP/influxdb.version))>0'
+              name: 'InfluxDB: Version has changed (new version: {ITEM.VALUE})'
+              priority: INFO
+              description: 'InfluxDB version has changed. Ack to close.'
+              manual_close: 'YES'
+      discovery_rules:
+        -
+          uuid: 41766fd081804c399c3a7e70dd1fbf03
+          name: 'Organizations discovery'
+          type: HTTP_AGENT
+          key: influxdb.orgs.discovery
+          delay: 10m
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#ORG_NAME}'
+                value: '{$INFLUXDB.ORG_NAME.NOT_MATCHES}'
+                operator: NOT_MATCHES_REGEX
+                formulaid: A
+              -
+                macro: '{#ORG_NAME}'
+                value: '{$INFLUXDB.ORG_NAME.MATCHES}'
+                formulaid: B
+          description: 'Discovery of organizations merics.'
+          item_prototypes:
+            -
+              uuid: c84ae278bd7c4387873bc8bbf6d8ba8f
+              name: 'InfluxDB: [{#ORG_NAME}] Query response bytes, failed'
+              type: DEPENDENT
+              key: 'influxdb.org.http_query_response_bytes.failed.rate["{#ORG_NAME}"]'
+              delay: '0'
+              history: 7d
+              value_type: FLOAT
+              units: Bps
+              description: 'Count of bytes returned with status not 200 per second.'
+              preprocessing:
+                -
+                  type: JSONPATH
+                  parameters:
+                    - '$[?(@.name=="http_query_response_bytes" && @.labels.status != "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()'
+                  error_handler: DISCARD_VALUE
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              master_item:
+                key: influx.get_metrics
+              tags:
+                -
+                  tag: organization
+                  value: '{#ORG_NAME}'
+                -
+                  tag: resource
+                  value: queries
+                -
+                  tag: target
+                  value: InfluxDB
+                -
+                  tag: transport
+                  value: dependent
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: fb13e133cf054e8783ba6bf5deaf1686
+              name: 'InfluxDB: [{#ORG_NAME}] Query response bytes, success'
+              type: DEPENDENT
+              key: 'influxdb.org.http_query_response_bytes.success.rate["{#ORG_NAME}"]'
+              delay: '0'
+              history: 7d
+              value_type: FLOAT
+              units: Bps
+              description: 'Count of bytes returned with status 200 per second.'
+              preprocessing:
+                -
+                  type: JSONPATH
+                  parameters:
+                    - '$[?(@.name=="http_query_response_bytes" && @.labels.status == "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()'
+                  error_handler: DISCARD_VALUE
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              master_item:
+                key: influx.get_metrics
+              tags:
+                -
+                  tag: organization
+                  value: '{#ORG_NAME}'
+                -
+                  tag: resource
+                  value: queries
+                -
+                  tag: target
+                  value: InfluxDB
+                -
+                  tag: transport
+                  value: dependent
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: 9688861c4268455193772389a957264f
+              name: 'InfluxDB: [{#ORG_NAME}] Query requests, failed'
+              type: DEPENDENT
+              key: 'influxdb.org.query_request.failed.rate["{#ORG_NAME}"]'
+              delay: '0'
+              history: 7d
+              value_type: FLOAT
+              units: Rps
+              description: 'Total number of query requests with status not 200 per second.'
+              preprocessing:
+                -
+                  type: JSONPATH
+                  parameters:
+                    - '$[?(@.name=="http_query_request_count" && @.labels.status != "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()'
+                  error_handler: DISCARD_VALUE
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              master_item:
+                key: influx.get_metrics
+              tags:
+                -
+                  tag: organization
+                  value: '{#ORG_NAME}'
+                -
+                  tag: resource
+                  value: queries
+                -
+                  tag: target
+                  value: InfluxDB
+                -
+                  tag: transport
+                  value: dependent
+                -
+                  tag: type
+                  value: rate
+              trigger_prototypes:
+                -
+                  uuid: 893fa5755b514c36aa177c4f4e25b254
+                  expression: 'min(/InfluxDB by HTTP/influxdb.org.query_request.failed.rate["{#ORG_NAME}"],5m)>{$INFLUXDB.REQ.FAIL.MAX.WARN}'
+                  name: 'InfluxDB: [{#ORG_NAME}]: Too many requests failures (over {$INFLUXDB.REQ.FAIL.MAX.WARN} for 5m)'
+                  priority: WARNING
+                  description: 'Too many query requests failed.'
+            -
+              uuid: da53d3185ba744c38fc264993c72b1b9
+              name: 'InfluxDB: [{#ORG_NAME}] Query requests, success'
+              type: DEPENDENT
+              key: 'influxdb.org.query_request.success.rate["{#ORG_NAME}"]'
+              delay: '0'
+              history: 7d
+              value_type: FLOAT
+              units: Rps
+              description: 'Total number of query requests with status 200 per second.'
+              preprocessing:
+                -
+                  type: JSONPATH
+                  parameters:
+                    - '$[?(@.name=="http_query_request_count" && @.labels.status == "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()'
+                  error_handler: DISCARD_VALUE
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              master_item:
+                key: influx.get_metrics
+              tags:
+                -
+                  tag: organization
+                  value: '{#ORG_NAME}'
+                -
+                  tag: resource
+                  value: queries
+                -
+                  tag: target
+                  value: InfluxDB
+                -
+                  tag: transport
+                  value: dependent
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: 4f8dbb16f7a842678e4fb4343c88b560
+              name: 'InfluxDB: [{#ORG_NAME}] Query requests bytes, failed'
+              type: DEPENDENT
+              key: 'influxdb.org.query_request_bytes.failed.rate["{#ORG_NAME}"]'
+              delay: '0'
+              history: 7d
+              value_type: FLOAT
+              units: Bps
+              description: 'Count of bytes received with status not 200 per second.'
+              preprocessing:
+                -
+                  type: JSONPATH
+                  parameters:
+                    - '$[?(@.name=="http_query_request_bytes" && @.labels.status != "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()'
+                  error_handler: DISCARD_VALUE
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              master_item:
+                key: influx.get_metrics
+              tags:
+                -
+                  tag: organization
+                  value: '{#ORG_NAME}'
+                -
+                  tag: resource
+                  value: queries
+                -
+                  tag: target
+                  value: InfluxDB
+                -
+                  tag: transport
+                  value: dependent
+                -
+                  tag: type
+                  value: rate
+            -
+              uuid: 6bbeb22e5c9b46a2bf480dcf41b4eb0e
+              name: 'InfluxDB: [{#ORG_NAME}] Query requests bytes, success'
+              type: DEPENDENT
+              key: 'influxdb.org.query_request_bytes.success.rate["{#ORG_NAME}"]'
+              delay: '0'
+              history: 7d
+              value_type: FLOAT
+              units: Bps
+              description: 'Count of bytes received with status 200 per second.'
+              preprocessing:
+                -
+                  type: JSONPATH
+                  parameters:
+                    - '$[?(@.name=="http_query_request_bytes" && @.labels.status == "200" && @.labels.endpoint == "/api/v2/query" && @.labels.org_id == "{#ORG_ID}") ].value.first()'
+                  error_handler: DISCARD_VALUE
+                -
+                  type: CHANGE_PER_SECOND
+                  parameters:
+                    - ''
+              master_item:
+                key: influx.get_metrics
+              tags:
+                -
+                  tag: organization
+                  value: '{#ORG_NAME}'
+                -
+                  tag: resource
+                  value: queries
+                -
+                  tag: target
+                  value: InfluxDB
+                -
+                  tag: transport
+                  value: dependent
+                -
+                  tag: type
+                  value: rate
+          graph_prototypes:
+            -
+              uuid: 925d6b2f79b2479ab031118d795811fb
+              name: 'InfluxDB: [{#ORG_NAME}]: Query requests'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'InfluxDB by HTTP'
+                    key: 'influxdb.org.query_request.success.rate["{#ORG_NAME}"]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'InfluxDB by HTTP'
+                    key: 'influxdb.org.query_request.failed.rate["{#ORG_NAME}"]'
+            -
+              uuid: 01921ee545c540bd8c0d51429bcce11b
+              name: 'InfluxDB: [{#ORG_NAME}]: Query traffic'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'InfluxDB by HTTP'
+                    key: 'influxdb.org.http_query_response_bytes.success.rate["{#ORG_NAME}"]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'InfluxDB by HTTP'
+                    key: 'influxdb.org.http_query_response_bytes.failed.rate["{#ORG_NAME}"]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'InfluxDB by HTTP'
+                    key: 'influxdb.org.query_request_bytes.failed.rate["{#ORG_NAME}"]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'InfluxDB by HTTP'
+                    key: 'influxdb.org.query_request_bytes.success.rate["{#ORG_NAME}"]'
+          url: '{$INFLUXDB.URL}/api/v2/orgs'
+          headers:
+            -
+              name: Content-type
+              value: application/json
+            -
+              name: Authorization
+              value: 'Token {$INFLUXDB.API.TOKEN}'
+          preprocessing:
+            -
+              type: JAVASCRIPT
+              parameters:
+                - |
+                  var result = [];
+                  
+                  JSON.parse(value).orgs.forEach(function (e) {
+                      result.push({
+                          "{#ORG_ID}": e.id,
+                          "{#ORG_NAME}": e.name,
+                          "{#ORG_DESCRIPTION}": e.description
+                      });
+                  });
+                  
+                  return JSON.stringify(result)
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1h
+      macros:
+        -
+          macro: '{$INFLUXDB.API.TOKEN}'
+          description: 'InfluxDB API Authorization Token'
+        -
+          macro: '{$INFLUXDB.ORG_NAME.MATCHES}'
+          value: '.*'
+          description: 'Filter of discoverable organizations'
+        -
+          macro: '{$INFLUXDB.ORG_NAME.NOT_MATCHES}'
+          value: CHANGE_IF_NEEDED
+          description: 'Filter to exclude discovered organizations'
+        -
+          macro: '{$INFLUXDB.REQ.FAIL.MAX.WARN}'
+          value: '2'
+          description: 'Maximum number of query requests failures for trigger expression.'
+        -
+          macro: '{$INFLUXDB.TASK.RUN.FAIL.MAX.WARN}'
+          value: '2'
+          description: 'Maximum number of tasks runs failures for trigger expression.'
+        -
+          macro: '{$INFLUXDB.URL}'
+          value: 'http://localhost:8086'
+          description: 'InfluxDB instance URL'
+      valuemaps:
+        -
+          uuid: d1b4478bdfc44c6db79a4a262f605d92
+          name: 'InfluxDB healthcheck'
+          mappings:
+            -
+              value: '0'
+              newvalue: Failed
+            -
+              value: '1'
+              newvalue: Ok
+  graphs:
+    -
+      uuid: dd6b62b969594ddbb82895a8f8fc5623
+      name: 'InfluxDB: Tasks runs'
+      graph_items:
+        -
+          color: 1A7C11
+          item:
+            host: 'InfluxDB by HTTP'
+            key: influxdb.task_executor_complete.failed.rate
+        -
+          sortorder: '1'
+          color: 2774A4
+          item:
+            host: 'InfluxDB by HTTP'
+            key: influxdb.task_executor_complete.successful.rate
diff --git a/templates/media/github/README.md b/templates/media/github/README.md
new file mode 100644
index 00000000000..7adf36e49b8
--- /dev/null
+++ b/templates/media/github/README.md
@@ -0,0 +1,43 @@
+
+# Github webhook 
+
+This guide describes how to integrate your Zabbix installation with Github issues using the Zabbix webhook feature. This guide will provide instructions on setting up a media type, a user and an action in Zabbix.
+<br/><br/>
+## In Github
+
+1\. Create or use existing user in Github with permission to create issues and 
+issue comments in desired repositories.
+
+2\. Please create an **personal access token** according to the original [instruction](https://docs.github.com/en/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token).
+
+
+Example of permissions for private repository.
+
+[![](images/thumb.2.jpg?raw=true)](images/2.jpg)
+
+3\. Copy the **personal access token** of your new integration to use it in Zabbix.
+<br/><br/>
+## In Zabbix
+
+The configuration consists of a _media type_ in Zabbix, which will invoke the webhook to send alerts to Github issues through the Github Rest API.
+
+
+1\. [Import](https://www.zabbix.com/documentation/6.0/manual/web_interface/frontend_sections/administration/mediatypes) the Github media type from file [media_github.yaml](media_github.yaml).
+
+2\. Change in the imported media the values of the variable github_token.
+
+Change github_url ony in case if will integrate with Github Enterprise.
+
+For more information about the Zabbix Webhook configuration, please see the [documentation](https://www.zabbix.com/documentation/6.0/manual/config/notifications/media/webhook).
+
+3\. Create user and add Github media type to it. In field "Send to" use your full repo name (\<owner\>/\<project name\>) e.g. johndoe/example-project.
+
+[![](images/thumb.1.jpg?raw=true)](images/1.jpg)
+
+4\. Set up a global macro {$ZABBIX.URL} with URL of current zabbix. Please notice that HTTPS will be used by default if HTTP/HTTPS schema is not present in the URL.
+
+For more information, please see [Zabbix](https://www.zabbix.com/documentation/6.0/manual/config/notifications) and [Github](https://docs.github.com/en/rest) documentation.
+<br/><br/>
+## Supported Versions
+
+Zabbix 6.0, Github RestApi v3
diff --git a/templates/media/github/images/1.jpg b/templates/media/github/images/1.jpg
new file mode 100644
index 00000000000..aa6ad237eed
--- /dev/null
+++ b/templates/media/github/images/1.jpg
diff --git a/templates/media/github/images/2.jpg b/templates/media/github/images/2.jpg
new file mode 100644
index 00000000000..8ed6ab1615a
--- /dev/null
+++ b/templates/media/github/images/2.jpg
diff --git a/templates/media/github/images/thumb.1.jpg b/templates/media/github/images/thumb.1.jpg
new file mode 100644
index 00000000000..de9bcc69f9a
--- /dev/null
+++ b/templates/media/github/images/thumb.1.jpg
diff --git a/templates/media/github/images/thumb.2.jpg b/templates/media/github/images/thumb.2.jpg
new file mode 100644
index 00000000000..fc607a33a67
--- /dev/null
+++ b/templates/media/github/images/thumb.2.jpg
diff --git a/templates/media/github/media_github.yaml b/templates/media/github/media_github.yaml
new file mode 100644
index 00000000000..f52acb245e6
--- /dev/null
+++ b/templates/media/github/media_github.yaml
@@ -0,0 +1,325 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-09-29T15:51:36Z'
+  media_types:
+    -
+      name: Github
+      type: WEBHOOK
+      parameters:
+        0:
+          name: alert_message
+          value: '{ALERT.MESSAGE}'
+        1:
+          name: alert_subject
+          value: '{ALERT.SUBJECT}'
+        14:
+          name: event_id
+          value: '{EVENT.ID}'
+        2:
+          name: event_recovery_value
+          value: '{EVENT.RECOVERY.VALUE}'
+        3:
+          name: event_severity
+          value: '{EVENT.SEVERITY}'
+        4:
+          name: event_source
+          value: '{EVENT.SOURCE}'
+        5:
+          name: event_update_status
+          value: '{EVENT.UPDATE.STATUS}'
+        6:
+          name: event_value
+          value: '{EVENT.VALUE}'
+        11:
+          name: github_issue_number
+          value: '{EVENT.TAGS.__zbx_github_issue_number}'
+        7:
+          name: github_repo
+          value: '{ALERT.SENDTO}'
+        8:
+          name: github_token
+          value: '<PLACE GITHUB TOKEN>'
+        9:
+          name: github_url
+          value: 'https://api.github.com'
+        10:
+          name: github_user_agent
+          value: Zabbix/6.0
+        12:
+          name: trigger_id
+          value: '{TRIGGER.ID}'
+        13:
+          name: zabbix_url
+          value: '{$ZABBIX.URL}'
+      script: |
+        var Github = {
+            params: {},
+        
+            setParams: function (params) {
+                if (typeof params !== 'object') {
+                    return;
+                }
+                Github.params = params;
+            },
+        
+            setProxy: function (HTTPProxy) {
+                Github.HTTPProxy = HTTPProxy;
+            },
+        
+            urlCheckFormat: function (url) {
+        
+                if (typeof url === 'string' && !url.endsWith('/')) {
+                    url += '/';
+                }
+        
+                if (url.indexOf('http://') === -1 && url.indexOf('https://') === -1) {
+                    url = 'https://' + url;
+                }
+        
+                return url;
+            },
+        
+            createProblemURL: function (zabbix_url, triggerid, eventid, event_source) {
+                var problem_url = zabbix_url;
+        
+                if (event_source === '0') {
+                    problem_url += 'tr_events.php?triggerid=' + triggerid + '&eventid=' + eventid;
+                }
+        
+                return problem_url;
+            },
+        
+            request: function (method, url, data) {
+                ['token', 'user_agent'].forEach(function (field) {
+                    if (typeof Github.params !== 'object' || typeof Github.params[field] === 'undefined' || Github.params[field] === '') {
+                        throw 'Required Github param is not set: "' + field + '".';
+                    }
+                });
+        
+                var response,
+                    request = new HttpRequest();
+        
+                request.addHeader('User-Agent: ' + Github.params.user_agent);
+                request.addHeader('Accept: application/vnd.github.v3+json');
+                request.addHeader('Authorization: token ' + Github.params.token);
+        
+                if (typeof Github.HTTPProxy !== 'undefined' && Github.HTTPProxy !== '') {
+                    request.setProxy(Github.HTTPProxy);
+                }
+        
+                if (typeof data !== 'undefined') {
+                    data = JSON.stringify(data);
+                }
+        
+                Zabbix.log(4, '[ Github Webhook ] Sending request: ' + url + ((typeof data === 'string')
+                    ? ('\n' + data)
+                    : ''));
+        
+                switch (method) {
+                    case 'post':
+                        response = request.post(url, data);
+                        break;
+        
+                    case 'patch':
+                        response = request.patch(url, data);
+                        break;
+        
+                    default:
+                        throw 'Unsupported HTTP request method: ' + method;
+                }
+        
+                Zabbix.log(4, '[ Github Webhook ] Received response with status code ' +
+                    request.getStatus() + '\n' + response);
+        
+                if (response !== null) {
+                    try {
+                        response = JSON.parse(response);
+                    }
+                    catch (error) {
+                        Zabbix.log(4, '[ Github Webhook ] Failed to parse response received from Github');
+                        response = null;
+                    }
+                }
+        
+                if (typeof response !== 'object') {
+                    throw 'Failed to process response received from Github. Check debug log for more information.';
+                }
+        
+                if (request.getStatus() < 200 || request.getStatus() >= 300) {
+                    var message = 'Request failed with status code ' + request.getStatus();
+        
+                    if (response.message) {
+                        message += ': ' + response.message;
+                    }
+        
+                    throw message + ' Check debug log for more information.';
+                }
+        
+                return response;
+            }
+        };
+        
+        try {
+            var params = JSON.parse(value),
+                github = {},
+                url = '',
+                data = {},
+                comment_data,
+                result = { tags: {} },
+                required_params = [
+                    'alert_subject', 'alert_message', 'event_source', 'event_value',
+                    'event_update_status', 'event_recovery_value', 'event_severity',
+                    'event_id', 'trigger_id', 'zabbix_url',
+                    'github_token', 'github_url', 'github_user_agent'
+                ],
+                method = 'post',
+                process_tags = true;
+        
+            Object.keys(params)
+                .forEach(function (key) {
+                    if (key.startsWith('github_')) {
+                        github[key.substring(7)] = params[key];
+                    }
+                    else if (required_params.indexOf(key) !== -1 && params[key] === '') {
+                        throw 'Parameter "' + key + '" can\'t be empty.';
+                    }
+                });
+        
+            if ([0, 1, 2, 3].indexOf(parseInt(params.event_source)) === -1) {
+                throw 'Incorrect "event_source" parameter given: ' + params.event_source + '\nMust be 0-3.';
+            }
+        
+            // Check {EVENT.VALUE} for trigger-based and internal events.
+            if (params.event_value !== '0' && params.event_value !== '1'
+                && (params.event_source === '0' || params.event_source === '3')) {
+                throw 'Incorrect "event_value" parameter given: ' + params.event_value + '\nMust be 0 or 1.';
+            }
+        
+            // Check {EVENT.UPDATE.STATUS} only for trigger-based events.
+            if (params.event_update_status !== '0' && params.event_update_status !== '1' && params.event_source === '0') {
+                throw 'Incorrect "event_update_status" parameter given: ' + params.event_update_status + '\nMust be 0 or 1.';
+            }
+        
+            if (params.event_source !== '0' && params.event_recovery_value === '0') {
+                throw 'Recovery operations are supported only for trigger-based actions.';
+            }
+        
+            if (typeof params.zabbix_url !== 'string' || params.zabbix_url.trim() === '' || params.zabbix_url === '{$ZABBIX.URL}') {
+                throw 'Field "zabbix_url" cannot be empty.';
+            }
+        
+            // Check for backslash in the end of url and schema.
+            github.url = Github.urlCheckFormat(github.url);
+            params.zabbix_url = Github.urlCheckFormat(params.zabbix_url);
+        
+            // Default url for creating issue
+            url = github.url + 'repos/' + github.repo + '/issues';
+        
+            data.title = params.alert_subject;
+            data.body = params.alert_message;
+            data.labels = [
+                { name: "Zabbix" }
+            ];
+        
+            // Adding label corresponding to trigger severity in Zabbix.
+            if (params.event_severity !== 'undefined' && params.event_source === '0') {
+                data.labels.push({ name: params.event_severity });
+            }
+        
+            // In case of update or resolve event.
+            if (params.event_source === '0' && (params.event_value === '0' || params.event_update_status === '1')) {
+                process_tags = false;
+                method = 'patch';
+                url = github.url + 'repos/' + github.repo + '/issues/' + github.issue_number;
+                comment_data = Object.assign({}, data);
+                delete data.body;
+            } else {
+                problem_url = Github.createProblemURL(params.zabbix_url, params.trigger_id, params.event_id, params.event_source);
+                data.body += '\nEvent details in Zabbix: [' + problem_url + '](' + problem_url + ')';
+            }
+        
+            Github.setParams(github);
+            Github.setProxy(params.HTTPProxy);
+        
+            var response = Github.request(method, url, data);
+        
+            // Leave a comment if comment_data present.
+            if (typeof comment_data === 'object') {
+                url = github.url + 'repos/' + github.repo + '/issues/' + github.issue_number + '/comments';
+                Github.request("post", url, comment_data);
+            }
+        
+            if (process_tags) {
+                result.tags.__zbx_github_issue_number = response.number;
+                result.tags.__zbx_github_repo = github.repo;
+                result.tags.__zbx_github_link = response.html_url;
+            }
+        
+            Zabbix.log(4, '[ Github Webhook ] Result: ' + JSON.stringify(result));
+            return JSON.stringify(result);
+        }
+        catch (error) {
+            Zabbix.log(4, '[ Github Webhook ] ERROR: ' + error);
+            throw 'Sending failed: ' + error;
+        }
+      process_tags: 'YES'
+      show_event_menu: 'YES'
+      event_menu_url: '{EVENT.TAGS.__zbx_github_link}'
+      event_menu_name: 'Github: Issue {EVENT.TAGS.__zbx_github_issue_number}'
+      message_templates:
+        -
+          event_source: TRIGGERS
+          operation_mode: PROBLEM
+          subject: '[{EVENT.STATUS}] {EVENT.NAME}'
+          message: |
+            Problem started at {EVENT.TIME} on {EVENT.DATE}
+            Problem name: {EVENT.NAME}
+            Host: {HOST.NAME}
+            Severity: {EVENT.SEVERITY}
+            Operational data: {EVENT.OPDATA}
+            Original problem ID: {EVENT.ID}
+            {TRIGGER.URL}
+        -
+          event_source: TRIGGERS
+          operation_mode: RECOVERY
+          subject: '[{EVENT.STATUS}] {EVENT.NAME}'
+          message: |
+            Problem has been resolved in {EVENT.DURATION} at {EVENT.RECOVERY.TIME} on {EVENT.RECOVERY.DATE}
+            Problem name: {EVENT.NAME}
+            Host: {HOST.NAME}
+            Severity: {EVENT.SEVERITY}
+            Original problem ID: {EVENT.ID}
+            {TRIGGER.URL}
+        -
+          event_source: TRIGGERS
+          operation_mode: UPDATE
+          subject: '[{EVENT.STATUS}] {EVENT.NAME}'
+          message: |
+            {USER.FULLNAME} {EVENT.UPDATE.ACTION} problem at {EVENT.UPDATE.DATE} {EVENT.UPDATE.TIME}.
+            {EVENT.UPDATE.MESSAGE}
+            
+            Current problem status is {EVENT.STATUS}, acknowledged: {EVENT.ACK.STATUS}.
+        -
+          event_source: DISCOVERY
+          operation_mode: PROBLEM
+          subject: 'Discovery: {DISCOVERY.DEVICE.STATUS} {DISCOVERY.DEVICE.IPADDRESS}'
+          message: |
+            Discovery rule: {DISCOVERY.RULE.NAME}
+            
+            Device IP: {DISCOVERY.DEVICE.IPADDRESS}
+            Device DNS: {DISCOVERY.DEVICE.DNS}
+            Device status: {DISCOVERY.DEVICE.STATUS}
+            Device uptime: {DISCOVERY.DEVICE.UPTIME}
+            
+            Device service name: {DISCOVERY.SERVICE.NAME}
+            Device service port: {DISCOVERY.SERVICE.PORT}
+            Device service status: {DISCOVERY.SERVICE.STATUS}
+            Device service uptime: {DISCOVERY.SERVICE.UPTIME}
+        -
+          event_source: AUTOREGISTRATION
+          operation_mode: PROBLEM
+          subject: 'Autoregistration: {HOST.HOST}'
+          message: |
+            Host name: {HOST.HOST}
+            Host IP: {HOST.IP}
+            Agent port: {HOST.PORT}
diff --git a/templates/media/msteams/README.md b/templates/media/msteams/README.md
index 62dc944f6ee..67d855ccd90 100644
--- a/templates/media/msteams/README.md
+++ b/templates/media/msteams/README.md
@@ -4,6 +4,8 @@ This guide describes how to integrate Zabbix 5.0 with MS Teams using the Zabbix
 This integration is supported only for **Teams** as part of Office 365. Note, that **Teams** free plan does not support [incoming webhook](https://docs.microsoft.com/en-US/microsoftteams/platform/webhooks-and-connectors/how-to/add-incoming-webhook) feature.
 
 ## Setting up webhook in MS Teams 
+Microsoft Teams webhook only supports integrating with a single channel.
+
 First, you need to get a webhook URL for the channel. There are two ways to do this:
 
 - Add official **Zabbix webhook** connector from MS Teams apps for the channel, where you want to receive notifications. (Check [how to add a connector to a channel](https://docs.microsoft.com/en-us/microsoftteams/office-365-custom-connectors#add-a-connector-to-a-channel))
@@ -18,6 +20,7 @@ First, you need to get a webhook URL for the channel. There are two ways to do t
 Good examples:<br>
 http://zabbix.com<br>
 https://zabbix.lan/<br>
+http://server.zabbix.lan/</br>
 http://localhost<br>
 http://127.0.0.1:8080<br>
 
diff --git a/templates/module/smart_agent2/README.md b/templates/module/smart_agent2/README.md
index be02c71ad94..88d6981477e 100644
--- a/templates/module/smart_agent2/README.md
+++ b/templates/module/smart_agent2/README.md
@@ -13,7 +13,6 @@ and with attribute IDs in {$SMART.ATTRIBUTE.ID.MATCHES} macros on the host level
 
 This template was tested on:
 
-- Zabbix, version 5.4 and later
 - Smartmontools, version 7.1 and later
 
 ## Setup
@@ -44,8 +43,8 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Disk discovery |<p>Discovery SMART disks.</p> |ZABBIX_PASSIVE |smart.disk.discovery |
-|Attribute discovery |<p>Discovery SMART Vendor Specific Attributes of disks.</p> |ZABBIX_PASSIVE |smart.attribute.discovery |
+|Disk discovery |<p>Discovery SMART disks.</p> |ZABBIX_PASSIVE |smart.disk.discovery<p>**Overrides:**</p><p>Self-test<br> - {#DISKTYPE} MATCHES_REGEX `nvme`<br>  - ITEM_PROTOTYPE LIKE `Self-test` - NO_DISCOVER</p><p>Not NVMe<br> - {#DISKTYPE} NOT_MATCHES_REGEX `nvme`<br>  - ITEM_PROTOTYPE REGEXP `Media|Percentage|Critical` - NO_DISCOVER</p> |
+|Attribute discovery |<p>Discovery SMART Vendor Specific Attributes of disks.</p> |ZABBIX_PASSIVE |smart.attribute.discovery<p>**Overrides:**</p><p>ID filter<br> - {#ID} MATCHES_REGEX `{$SMART.ATTRIBUTE.ID.MATCHES}` - {#NAME} MATCHES_REGEX `{$SMART.DISK.NAME.MATCHES}`<br>  - ITEM_PROTOTYPE REGEXP `` - NO_DISCOVER</p> |
 
 ## Items collected
 
@@ -56,22 +55,23 @@ There are no template links in this template.
 |Zabbix_raw_items |SMART [{#NAME}]: Serial number |<p>-</p> |DEPENDENT |smart.disk.sn[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].serial_number.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Zabbix_raw_items |SMART [{#NAME}]: Self-test passed |<p>The disk is passed the SMART self-test or not.</p> |DEPENDENT |smart.disk.test[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].ata_smart_data.self_test.status.passed.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Zabbix_raw_items |SMART [{#NAME}]: Temperature |<p>Current drive temperature.</p> |DEPENDENT |smart.disk.temperature[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].temperature.current.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Zabbix_raw_items |SMART [{#NAME}]: Power on hours |<p>Count of hours in power-on state. The raw value of this attribute shows total count of hours (or minutes, or seconds, depending on manufacturer) in power-on state. "By default, the total expected lifetime of a hard disk in perfect condition is defined as 5 years (running every day and night on all days). This is equal to 1825 days in 24/7 mode or 43800 hours." On some pre-2005 drives, this raw value may advance erratically and/or "wrap around" (reset to zero periodically). https://en.wikipedia.org/wiki/S.M.A.R.T.#Known_ATA_S.M.A.R.T._attributes</p> |DEPENDENT |smart.disk.hours[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].power_on_time.hours.first()`</p> |
+|Zabbix_raw_items |SMART [{#NAME}]: Power on hours |<p>Count of hours in power-on state. The raw value of this attribute shows total count of hours (or minutes, or seconds, depending on manufacturer) in power-on state. "By default, the total expected lifetime of a hard disk in perfect condition is defined as 5 years (running every day and night on all days). This is equal to 1825 days in 24/7 mode or 43800 hours." On some pre-2005 drives, this raw value may advance erratically and/or "wrap around" (reset to zero periodically). https://en.wikipedia.org/wiki/S.M.A.R.T.#Known_ATA_S.M.A.R.T._attributes</p> |DEPENDENT |smart.disk.hours[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].power_on_time.hours.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Zabbix_raw_items |SMART [{#NAME}]: Percentage used |<p>Contains a vendor specific estimate of the percentage of NVM subsystem life used based on the actual usage and the manufacturer’s prediction of NVM life. A value of 100 indicates that the estimated endurance of the NVM in the NVM subsystem has been consumed, but may not indicate an NVM subsystem failure. The value is allowed to exceed 100. Percentages greater than 254 shall be represented as 255. This value shall be updated once per power-on hour (when the controller is not in a sleep state).</p> |DEPENDENT |smart.disk.percentage_used[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].nvme_smart_health_information_log.percentage_used.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Zabbix_raw_items |SMART [{#NAME}]: Critical warning |<p>This field indicates critical warnings for the state of the controller.</p> |DEPENDENT |smart.disk.critical_warning[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].nvme_smart_health_information_log.critical_warning.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Zabbix_raw_items |SMART [{#NAME}]: Media errors |<p>Contains the number of occurrences where the controller detected an unrecovered data integrity error. Errors such as uncorrectable ECC, CRC checksum failure, or LBA tag mismatch are included in this field.</p> |DEPENDENT |smart.disk.media_errors[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].nvme_smart_health_information_log.media_errors.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Zabbix_raw_items |SMART [{#NAME}]: ID {#ID} {#ATTRNAME} |<p>-</p> |DEPENDENT |smart.disk.error[{#NAME},{#ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].ata_smart_attributes.table[?(@.id=={#ID})].value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Zabbix_raw_items |SMART [{#NAME}]: ID {#ID} {#ATTRNAME} raw value |<p>-</p> |DEPENDENT |smart.disk.attr.raw[{#NAME},{#ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].ata_smart_attributes.table[?(@.id=={#ID})].raw.string.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|SMART [{#NAME}]: Disk has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close.</p> |`{TEMPLATE_NAME:smart.disk.sn[{#NAME}].diff()}=1 and {TEMPLATE_NAME:smart.disk.sn[{#NAME}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|SMART [{#NAME}]: Disk self-test is not passed | |`{TEMPLATE_NAME:smart.disk.test[{#NAME}].last()}="false"` |HIGH | |
-|SMART [{#NAME}]: Average disk temperature is too high (over {$SMART.TEMPERATURE.MAX.WARN}°C for 5m) | |`{TEMPLATE_NAME:smart.disk.temperature[{#NAME}].avg(5m)}>{$SMART.TEMPERATURE.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- SMART [{#NAME}]: Average disk temperature is critical (over {$SMART.TEMPERATURE.MAX.CRIT}°C for 5m)</p> |
-|SMART [{#NAME}]: Average disk temperature is critical (over {$SMART.TEMPERATURE.MAX.CRIT}°C for 5m) | |`{TEMPLATE_NAME:smart.disk.temperature[{#NAME}].avg(5m)}>{$SMART.TEMPERATURE.MAX.CRIT}` |AVERAGE | |
-|SMART [{#NAME}]: NVMe disk percentage using is over 90% of estimated endurance | |`{TEMPLATE_NAME:smart.disk.percentage_used[{#NAME}].last()}>90` |AVERAGE | |
-|SMART [{#NAME}]: Attribute {#ID} {#ATTRNAME} is failed |<p>The value should be greater than THRESH.</p> |`{TEMPLATE_NAME:smart.disk.error[{#NAME},{#ID}].last()} <= {#THRESH}` |WARNING | |
+|SMART [{#NAME}]: Disk has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close.</p> |`last(/SMART by Zabbix agent 2/smart.disk.sn[{#NAME}],#1)<>last(/SMART by Zabbix agent 2/smart.disk.sn[{#NAME}],#2) and length(last(/SMART by Zabbix agent 2/smart.disk.sn[{#NAME}]))>0` |INFO |<p>Manual close: YES</p> |
+|SMART [{#NAME}]: Disk self-test is not passed |<p>-</p> |`last(/SMART by Zabbix agent 2/smart.disk.test[{#NAME}])="false"` |HIGH | |
+|SMART [{#NAME}]: Average disk temperature is too high (over {$SMART.TEMPERATURE.MAX.WARN}°C for 5m) |<p>-</p> |`avg(/SMART by Zabbix agent 2/smart.disk.temperature[{#NAME}],5m)>{$SMART.TEMPERATURE.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- SMART [{#NAME}]: Average disk temperature is critical (over {$SMART.TEMPERATURE.MAX.CRIT}°C for 5m)</p> |
+|SMART [{#NAME}]: Average disk temperature is critical (over {$SMART.TEMPERATURE.MAX.CRIT}°C for 5m) |<p>-</p> |`avg(/SMART by Zabbix agent 2/smart.disk.temperature[{#NAME}],5m)>{$SMART.TEMPERATURE.MAX.CRIT}` |AVERAGE | |
+|SMART [{#NAME}]: NVMe disk percentage using is over 90% of estimated endurance |<p>-</p> |`last(/SMART by Zabbix agent 2/smart.disk.percentage_used[{#NAME}])>90` |AVERAGE | |
+|SMART [{#NAME}]: Attribute {#ID} {#ATTRNAME} is failed |<p>The value should be greater than THRESH.</p> |`last(/SMART by Zabbix agent 2/smart.disk.error[{#NAME},{#ID}]) <= {#THRESH}` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/module/smart_agent2/template_module_smart_agent2.yaml b/templates/module/smart_agent2/template_module_smart_agent2.yaml
index 6ac12604467..1b8c0c184d5 100644
--- a/templates/module/smart_agent2/template_module_smart_agent2.yaml
+++ b/templates/module/smart_agent2/template_module_smart_agent2.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:35Z'
+  version: '6.0'
+  date: '2021-10-01T14:12:43Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -15,7 +15,7 @@ zabbix_export:
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/415662-discussion-thread-for-official-zabbix-smart-disk-monitoring
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.39
       groups:
         -
           name: Templates/Modules
@@ -40,6 +40,30 @@ zabbix_export:
           description: 'Discovery SMART Vendor Specific Attributes of disks.'
           item_prototypes:
             -
+              uuid: 04718ade5247478da0450f1cd497b782
+              name: 'SMART [{#NAME}]: ID {#ID} {#ATTRNAME} raw value'
+              type: DEPENDENT
+              key: 'smart.disk.attr.raw[{#NAME},{#ID}]'
+              delay: '0'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              preprocessing:
+                -
+                  type: JSONPATH
+                  parameters:
+                    - '$[?(@.disk_name==''{#NAME}'')].ata_smart_attributes.table[?(@.id=={#ID})].raw.string.first()'
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 6h
+              master_item:
+                key: smart.disk.get
+              tags:
+                -
+                  tag: Application
+                  value: '{#DISKTYPE} {#NAME}'
+            -
               uuid: 2af3d630a99a4989b94e2afd782a3f78
               name: 'SMART [{#NAME}]: ID {#ID} {#ATTRNAME}'
               type: DEPENDENT
@@ -125,13 +149,16 @@ zabbix_export:
               key: 'smart.disk.hours[{#NAME}]'
               delay: '0'
               history: 7d
-              units: s
               description: 'Count of hours in power-on state. The raw value of this attribute shows total count of hours (or minutes, or seconds, depending on manufacturer) in power-on state. "By default, the total expected lifetime of a hard disk in perfect condition is defined as 5 years (running every day and night on all days). This is equal to 1825 days in 24/7 mode or 43800 hours." On some pre-2005 drives, this raw value may advance erratically and/or "wrap around" (reset to zero periodically). https://en.wikipedia.org/wiki/S.M.A.R.T.#Known_ATA_S.M.A.R.T._attributes'
               preprocessing:
                 -
                   type: JSONPATH
                   parameters:
                     - '$[?(@.disk_name==''{#NAME}'')].power_on_time.hours.first()'
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 6h
               master_item:
                 key: smart.disk.get
               tags:
diff --git a/templates/module/smart_agent2_active/README.md b/templates/module/smart_agent2_active/README.md
index e4779190e12..8961223cf43 100644
--- a/templates/module/smart_agent2_active/README.md
+++ b/templates/module/smart_agent2_active/README.md
@@ -5,7 +5,7 @@
 
 For Zabbix version: 5.4 and higher  
 The template for monitoring S.M.A.R.T. attributes of physical disk that works without any external scripts.  
-It collects metrics by Zabbix agent active 2 version 5.0 and later with Smartmontools version 7.1 and later.  
+It collects metrics by Zabbix agent 2 version 5.0 and later with Smartmontools version 7.1 and later.  
 Disk discovery LLD rule finds all HDD, SSD, NVMe disks with S.M.A.R.T. enabled. Attribute discovery LLD rule finds all Vendor Specific Attributes  
 for each disk. If you want to skip some attributes, please set regular expressions with disk names in {$SMART.DISK.NAME.MATCHES}  
 and with attribute IDs in {$SMART.ATTRIBUTE.ID.MATCHES} macros on the host level.
@@ -13,7 +13,6 @@ and with attribute IDs in {$SMART.ATTRIBUTE.ID.MATCHES} macros on the host level
 
 This template was tested on:
 
-- Zabbix, version 5.4 and later
 - Smartmontools, version 7.1 and later
 
 ## Setup
@@ -44,8 +43,8 @@ There are no template links in this template.
 
 |Name|Description|Type|Key and additional info|
 |----|-----------|----|----|
-|Disk discovery |<p>Discovery SMART disks.</p> |ZABBIX_ACTIVE |smart.disk.discovery |
-|Attribute discovery |<p>Discovery SMART Vendor Specific Attributes of disks.</p> |ZABBIX_ACTIVE |smart.attribute.discovery |
+|Disk discovery |<p>Discovery SMART disks.</p> |ZABBIX_ACTIVE |smart.disk.discovery<p>**Overrides:**</p><p>Self-test<br> - {#DISKTYPE} MATCHES_REGEX `nvme`<br>  - ITEM_PROTOTYPE LIKE `Self-test` - NO_DISCOVER</p><p>Not NVMe<br> - {#DISKTYPE} NOT_MATCHES_REGEX `nvme`<br>  - ITEM_PROTOTYPE REGEXP `Media|Percentage|Critical` - NO_DISCOVER</p> |
+|Attribute discovery |<p>Discovery SMART Vendor Specific Attributes of disks.</p> |ZABBIX_ACTIVE |smart.attribute.discovery<p>**Overrides:**</p><p>ID filter<br> - {#ID} MATCHES_REGEX `{$SMART.ATTRIBUTE.ID.MATCHES}` - {#NAME} MATCHES_REGEX `{$SMART.DISK.NAME.MATCHES}`<br>  - ITEM_PROTOTYPE REGEXP `` - NO_DISCOVER</p> |
 
 ## Items collected
 
@@ -56,22 +55,23 @@ There are no template links in this template.
 |Zabbix_raw_items |SMART [{#NAME}]: Serial number |<p>-</p> |DEPENDENT |smart.disk.sn[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].serial_number.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Zabbix_raw_items |SMART [{#NAME}]: Self-test passed |<p>The disk is passed the SMART self-test or not.</p> |DEPENDENT |smart.disk.test[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].ata_smart_data.self_test.status.passed.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Zabbix_raw_items |SMART [{#NAME}]: Temperature |<p>Current drive temperature.</p> |DEPENDENT |smart.disk.temperature[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].temperature.current.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Zabbix_raw_items |SMART [{#NAME}]: Power on hours |<p>Count of hours in power-on state. The raw value of this attribute shows total count of hours (or minutes, or seconds, depending on manufacturer) in power-on state. "By default, the total expected lifetime of a hard disk in perfect condition is defined as 5 years (running every day and night on all days). This is equal to 1825 days in 24/7 mode or 43800 hours." On some pre-2005 drives, this raw value may advance erratically and/or "wrap around" (reset to zero periodically). https://en.wikipedia.org/wiki/S.M.A.R.T.#Known_ATA_S.M.A.R.T._attributes</p> |DEPENDENT |smart.disk.hours[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].power_on_time.hours.first()`</p> |
+|Zabbix_raw_items |SMART [{#NAME}]: Power on hours |<p>Count of hours in power-on state. The raw value of this attribute shows total count of hours (or minutes, or seconds, depending on manufacturer) in power-on state. "By default, the total expected lifetime of a hard disk in perfect condition is defined as 5 years (running every day and night on all days). This is equal to 1825 days in 24/7 mode or 43800 hours." On some pre-2005 drives, this raw value may advance erratically and/or "wrap around" (reset to zero periodically). https://en.wikipedia.org/wiki/S.M.A.R.T.#Known_ATA_S.M.A.R.T._attributes</p> |DEPENDENT |smart.disk.hours[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].power_on_time.hours.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Zabbix_raw_items |SMART [{#NAME}]: Percentage used |<p>Contains a vendor specific estimate of the percentage of NVM subsystem life used based on the actual usage and the manufacturer’s prediction of NVM life. A value of 100 indicates that the estimated endurance of the NVM in the NVM subsystem has been consumed, but may not indicate an NVM subsystem failure. The value is allowed to exceed 100. Percentages greater than 254 shall be represented as 255. This value shall be updated once per power-on hour (when the controller is not in a sleep state).</p> |DEPENDENT |smart.disk.percentage_used[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].nvme_smart_health_information_log.percentage_used.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Zabbix_raw_items |SMART [{#NAME}]: Critical warning |<p>This field indicates critical warnings for the state of the controller.</p> |DEPENDENT |smart.disk.critical_warning[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].nvme_smart_health_information_log.critical_warning.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Zabbix_raw_items |SMART [{#NAME}]: Media errors |<p>Contains the number of occurrences where the controller detected an unrecovered data integrity error. Errors such as uncorrectable ECC, CRC checksum failure, or LBA tag mismatch are included in this field.</p> |DEPENDENT |smart.disk.media_errors[{#NAME}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].nvme_smart_health_information_log.media_errors.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 |Zabbix_raw_items |SMART [{#NAME}]: ID {#ID} {#ATTRNAME} |<p>-</p> |DEPENDENT |smart.disk.error[{#NAME},{#ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].ata_smart_attributes.table[?(@.id=={#ID})].value.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
+|Zabbix_raw_items |SMART [{#NAME}]: ID {#ID} {#ATTRNAME} raw value |<p>-</p> |DEPENDENT |smart.disk.attr.raw[{#NAME},{#ID}]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.disk_name=='{#NAME}')].ata_smart_attributes.table[?(@.id=={#ID})].raw.string.first()`</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
 
 ## Triggers
 
 |Name|Description|Expression|Severity|Dependencies and additional info|
 |----|-----------|----|----|----|
-|SMART [{#NAME}]: Disk has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close.</p> |`{TEMPLATE_NAME:smart.disk.sn[{#NAME}].diff()}=1 and {TEMPLATE_NAME:smart.disk.sn[{#NAME}].strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|SMART [{#NAME}]: Disk self-test is not passed | |`{TEMPLATE_NAME:smart.disk.test[{#NAME}].last()}="false"` |HIGH | |
-|SMART [{#NAME}]: Average disk temperature is too high (over {$SMART.TEMPERATURE.MAX.WARN}°C for 5m) | |`{TEMPLATE_NAME:smart.disk.temperature[{#NAME}].avg(5m)}>{$SMART.TEMPERATURE.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- SMART [{#NAME}]: Average disk temperature is critical (over {$SMART.TEMPERATURE.MAX.CRIT}°C for 5m)</p> |
-|SMART [{#NAME}]: Average disk temperature is critical (over {$SMART.TEMPERATURE.MAX.CRIT}°C for 5m) | |`{TEMPLATE_NAME:smart.disk.temperature[{#NAME}].avg(5m)}>{$SMART.TEMPERATURE.MAX.CRIT}` |AVERAGE | |
-|SMART [{#NAME}]: NVMe disk percentage using is over 90% of estimated endurance | |`{TEMPLATE_NAME:smart.disk.percentage_used[{#NAME}].last()}>90` |AVERAGE | |
-|SMART [{#NAME}]: Attribute {#ID} {#ATTRNAME} is failed |<p>The value should be greater than THRESH.</p> |`{TEMPLATE_NAME:smart.disk.error[{#NAME},{#ID}].last()} <= {#THRESH}` |WARNING | |
+|SMART [{#NAME}]: Disk has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close.</p> |`last(/SMART by Zabbix agent active 2/smart.disk.sn[{#NAME}],#1)<>last(/SMART by Zabbix agent active 2/smart.disk.sn[{#NAME}],#2) and length(last(/SMART by Zabbix agent active 2/smart.disk.sn[{#NAME}]))>0` |INFO |<p>Manual close: YES</p> |
+|SMART [{#NAME}]: Disk self-test is not passed |<p>-</p> |`last(/SMART by Zabbix agent active 2/smart.disk.test[{#NAME}])="false"` |HIGH | |
+|SMART [{#NAME}]: Average disk temperature is too high (over {$SMART.TEMPERATURE.MAX.WARN}°C for 5m) |<p>-</p> |`avg(/SMART by Zabbix agent active 2/smart.disk.temperature[{#NAME}],5m)>{$SMART.TEMPERATURE.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- SMART [{#NAME}]: Average disk temperature is critical (over {$SMART.TEMPERATURE.MAX.CRIT}°C for 5m)</p> |
+|SMART [{#NAME}]: Average disk temperature is critical (over {$SMART.TEMPERATURE.MAX.CRIT}°C for 5m) |<p>-</p> |`avg(/SMART by Zabbix agent active 2/smart.disk.temperature[{#NAME}],5m)>{$SMART.TEMPERATURE.MAX.CRIT}` |AVERAGE | |
+|SMART [{#NAME}]: NVMe disk percentage using is over 90% of estimated endurance |<p>-</p> |`last(/SMART by Zabbix agent active 2/smart.disk.percentage_used[{#NAME}])>90` |AVERAGE | |
+|SMART [{#NAME}]: Attribute {#ID} {#ATTRNAME} is failed |<p>The value should be greater than THRESH.</p> |`last(/SMART by Zabbix agent active 2/smart.disk.error[{#NAME},{#ID}]) <= {#THRESH}` |WARNING | |
 
 ## Feedback
 
diff --git a/templates/module/smart_agent2_active/template_module_smart_agent2_active.yaml b/templates/module/smart_agent2_active/template_module_smart_agent2_active.yaml
index d5833defcd1..7d71fe56938 100644
--- a/templates/module/smart_agent2_active/template_module_smart_agent2_active.yaml
+++ b/templates/module/smart_agent2_active/template_module_smart_agent2_active.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:34Z'
+  version: '6.0'
+  date: '2021-10-01T14:12:43Z'
   groups:
     -
       uuid: 57b7ae836ca64446ba2c296389c009b7
@@ -11,11 +11,11 @@ zabbix_export:
       template: 'SMART by Zabbix agent active 2'
       name: 'SMART by Zabbix agent active 2'
       description: |
-        The template for monitoring S.M.A.R.T. attributes of physical disk that works without any external scripts. It collects metrics by Zabbix agent active 2 version 5.0 and later with Smartmontools version 7.1 and later. Disk discovery LLD rule finds all HDD, SSD, NVMe disks with S.M.A.R.T. enabled. Attribute discovery LLD rule finds all Vendor Specific Attributes for each disk. If you want to skip some attributes, please set regular expressions with disk names in {$SMART.DISK.NAME.MATCHES} and with attribute IDs in {$SMART.ATTRIBUTE.ID.MATCHES} macros on the host level.
+        The template for monitoring S.M.A.R.T. attributes of physical disk that works without any external scripts. It collects metrics by Zabbix agent 2 version 5.0 and later with Smartmontools version 7.1 and later. Disk discovery LLD rule finds all HDD, SSD, NVMe disks with S.M.A.R.T. enabled. Attribute discovery LLD rule finds all Vendor Specific Attributes for each disk. If you want to skip some attributes, please set regular expressions with disk names in {$SMART.DISK.NAME.MATCHES} and with attribute IDs in {$SMART.ATTRIBUTE.ID.MATCHES} macros on the host level.
         
         You can discuss this template or leave feedback on our forum https://www.zabbix.com/forum/zabbix-suggestions-and-feedback/415662-discussion-thread-for-official-zabbix-smart-disk-monitoring
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.39
       groups:
         -
           name: Templates/Modules
@@ -42,6 +42,30 @@ zabbix_export:
           description: 'Discovery SMART Vendor Specific Attributes of disks.'
           item_prototypes:
             -
+              uuid: 5c09ba32ad72321bce5042d5f4dc59d2
+              name: 'SMART [{#NAME}]: ID {#ID} {#ATTRNAME} raw value'
+              type: DEPENDENT
+              key: 'smart.disk.attr.raw[{#NAME},{#ID}]'
+              delay: '0'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              preprocessing:
+                -
+                  type: JSONPATH
+                  parameters:
+                    - '$[?(@.disk_name==''{#NAME}'')].ata_smart_attributes.table[?(@.id=={#ID})].raw.string.first()'
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 6h
+              master_item:
+                key: smart.disk.get
+              tags:
+                -
+                  tag: Application
+                  value: '{#DISKTYPE} {#NAME}'
+            -
               uuid: 498a4f1b4b7442b5a38c52400646cc47
               name: 'SMART [{#NAME}]: ID {#ID} {#ATTRNAME}'
               type: DEPENDENT
@@ -128,13 +152,16 @@ zabbix_export:
               key: 'smart.disk.hours[{#NAME}]'
               delay: '0'
               history: 7d
-              units: s
               description: 'Count of hours in power-on state. The raw value of this attribute shows total count of hours (or minutes, or seconds, depending on manufacturer) in power-on state. "By default, the total expected lifetime of a hard disk in perfect condition is defined as 5 years (running every day and night on all days). This is equal to 1825 days in 24/7 mode or 43800 hours." On some pre-2005 drives, this raw value may advance erratically and/or "wrap around" (reset to zero periodically). https://en.wikipedia.org/wiki/S.M.A.R.T.#Known_ATA_S.M.A.R.T._attributes'
               preprocessing:
                 -
                   type: JSONPATH
                   parameters:
                     - '$[?(@.disk_name==''{#NAME}'')].power_on_time.hours.first()'
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 6h
               master_item:
                 key: smart.disk.get
               tags:
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/README.md
new file mode 100644
index 00000000000..4219b9c59b4
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CCR1009-7G-1C-1S+PC SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik CCR1009-7G-1C-1S+PC.
+
+7x Gigabit Ethernet, 1x Combo port (SFP or Gigabit Ethernet), 1xSFP+ cage, 9 cores x 1GHz CPU, 2GB RAM, LCD panel, passive cooling desktop enclosure, SmartCard slot, RouterOS L6, PSU
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CCR1009-7G-1C-1SPC SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1009-7G-1C-1SPC SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1009-7G-1C-1SPC SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1009-7G-1C-1SPC SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1009-7G-1C-1SPC SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CCR1009-7G-1C-1SPC SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CCR1009-7G-1C-1SplusPC
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+PC_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+PC_snmp.yaml
new file mode 100644
index 00000000000..9c790308b66
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+PC_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:06:44Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: d596d6d231bf49c08890aa3ff135ecc6
+      template: 'MikroTik CCR1009-7G-1C-1SPC SNMP'
+      name: 'MikroTik CCR1009-7G-1C-1S+PC SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik CCR1009-7G-1C-1S+PC.
+        7x Gigabit Ethernet, 1x Combo port (SFP or Gigabit Ethernet), 1xSFP+ cage, 9 cores x 1GHz CPU, 2GB RAM, LCD panel, passive cooling desktop enclosure, SmartCard slot, RouterOS L6, PSU
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 4367659d4f49400aa0a4674c74ad00b8
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 79b791b5ce1a4e5e8f68b561aeaac838
+              expression: 'last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 3d375341d2a140679973c46fe7281dd5
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: b1233463a69346b68d538f1c43aa467d
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: a981ac3d5e7843049eb581ab284edd04
+              expression: 'last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: f9d30c789f16452d89ee417a2aee11f1
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: f7e4983c483944869d44fe5ea4289786
+              expression: 'last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 5546cedfd50648d2a893b6ea59fd7453
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 5a78d97bd5f14a6b97873a3abe41db20
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: dc5f8ec0557c4e9980f2224e150e89e7
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 6a571f6691ec459bbc63e1a8dece1c04
+              expression: 'min(/MikroTik CCR1009-7G-1C-1SPC SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: b5d7f793a40449af9342a0751d606c04
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 39223b273e314bf88eccfa23d2bdf520
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 1586816e4cfe4060b9c2d4c305439e4d
+                  expression: 'min(/MikroTik CCR1009-7G-1C-1SPC SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 473d7e39becc4c56bef6687d3e197dd8
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-1SPC SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: f3b3f73ab8ad4138b4acb0f3ff7aa732
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: f52a2b2e6f6045119473176e6680fb67
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 7662e3eded674ca996c98d5af253d767
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: ad69a0bc0507456787ef21628985e22f
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: d66e0fa34fbf4fc49ac5ebfed3f6dbb0
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: bea5c8de3a354405a60f417e7c3f9852
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: b2ac80947a314b8590500aed1ba15b34
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: d9e2f17aa26d47239ba7ee40d5b39759
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: f6bcaf561a23406e84a22549aed2485d
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: fcf0566a31b9400c9790638caad03e34
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1009-7G-1C-1SPC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: d7d28fbb900742f58ba741a7b2810656
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 89139aaa90244af89be5b13e31e568db
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 88449b36f96740349cd1e08127b7b39c
+                  expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 5f60c2de483e4aae8fbedc50798f3bb9
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: cdab150de72d4e8bb2af4e412be6de27
+                  expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: df09bd33847c4cf9931b68c49fa0cc2e
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 5eb2071556a749b382e8d6668fc7c699
+                  expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 10459f3a756e48f991bbddf9e466f5bb
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 9e119f5f5ae74caeb58e9736f5e7e8b1
+                  expression: 'max(/MikroTik CCR1009-7G-1C-1SPC SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 38deeca2121f4698834d9f8c984be4bf
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-1SPC SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-1SPC SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-1SPC SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-1SPC SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 2f9915f91c984f56af4f9505c52aea9a
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 0bfd56d26ed04702904b7846f9d27d89
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e9b16dbe554948ffac6a124c2545e8ed
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: ec6db43c1009423db17a9db20c193801
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f6b5c40031a9451d93e0c1a53c60d90e
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 4fe579127b3249b08c210c8b3f767f7a
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 8bb2e43eaeae433381360f436151ca96
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 2ae0d22024c74c80ba6be1549fa4f17e
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 9e85e8cd51f0489d8aaefdc31ccbffd4
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 2844bdd0d5094a38a88f756e1fed71ad
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 16791055befb41f3b12dabf4aa0c6540
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: f282823a66354c1aa88b2338efb376f0
+                  expression: 'last(/MikroTik CCR1009-7G-1C-1SPC SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: d8ff7af06d6d4fe39d7ab93eb803978a
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 30dd1b502cac45538f16b4d985966d55
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 565b745c23864f1797a2cb3a11eedf7f
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 8cfa6b214639494fa8db1cb673f45e1d
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 93eaacd1543d440c93faa4b7c4fcd02d
+              expression: |
+                last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 70397fb0b0754a42a9c97c77c2037d2a
+              expression: |
+                last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-1SPC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: bff3cf781de1430d81a20a71a055e35d
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-1SPC SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-1SPC SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 852cd213b59640f09cd62303fa4c0d9d
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CCR1009-7G-1C-1SPC SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/README.md
new file mode 100644
index 00000000000..2948f7011de
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CCR1009-7G-1C-1S+ SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik CCR1009-7G-1C-1S+.
+
+1U rackmount, 7x Gigabit Ethernet, 1x Combo port (SFP or Gigabit Ethernet), 1xSFP+ cage, 9 cores x 1.2GHz CPU, 2GB RAM, LCD panel, Dual Power supplies, SmartCard slot, RouterOS L6
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CCR1009-7G-1C-1S SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CCR1009-7G-1C-1S SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1009-7G-1C-1S SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1009-7G-1C-1S SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CCR1009-7G-1C-1S SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1009-7G-1C-1S SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1009-7G-1C-1S SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CCR1009-7G-1C-1S SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1009-7G-1C-1S SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1009-7G-1C-1S SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CCR1009-7G-1C-1S SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1009-7G-1C-1S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1009-7G-1C-1S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1009-7G-1C-1S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1009-7G-1C-1S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CCR1009-7G-1C-1S SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CCR1009-7G-1C-1Splus
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+_snmp.yaml
new file mode 100644
index 00000000000..6881948a9b3
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:06:45Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: a809695fbc784b75adcd4833c86bca8d
+      template: 'MikroTik CCR1009-7G-1C-1S SNMP'
+      name: 'MikroTik CCR1009-7G-1C-1S+ SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik CCR1009-7G-1C-1S+.
+        1U rackmount, 7x Gigabit Ethernet, 1x Combo port (SFP or Gigabit Ethernet), 1xSFP+ cage, 9 cores x 1.2GHz CPU, 2GB RAM, LCD panel, Dual Power supplies, SmartCard slot, RouterOS L6
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: cdf7d11d3d47482ca5dad14596256025
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 7469aef39ea84a729b87d06d3dd0e9af
+              expression: 'last(/MikroTik CCR1009-7G-1C-1S SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1009-7G-1C-1S SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1009-7G-1C-1S SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: ad2df2ad5b4d4bac8da4a24e2c082ad1
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: d55015e95d2e4eebb72168b5311f7512
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: a30f1485711d4a649503638fd3a7d702
+              expression: 'last(/MikroTik CCR1009-7G-1C-1S SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1009-7G-1C-1S SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1009-7G-1C-1S SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 6004aeb9600c42b5a74155f06cdf8af0
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 8574af8f375a4443bbf030ebf8d904b5
+              expression: 'last(/MikroTik CCR1009-7G-1C-1S SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1009-7G-1C-1S SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1009-7G-1C-1S SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: cef294e9c4874526a093935ac3f093b6
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 3b3a0def1cf740f496bbd345de5ed605
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: d7dadc80881a4d3c9be8f1b660232c03
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 18ae9503588a4d398f387ab0d9015e26
+              expression: 'min(/MikroTik CCR1009-7G-1C-1S SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 3d3038d06ddb4fc282940f4a76e4ec85
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 58dbd69b7c9446169824fd5ef009cb89
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 2f1676c21f7044a289a8fd3077f9c95f
+                  expression: 'min(/MikroTik CCR1009-7G-1C-1S SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 5154454506aa483b8683638345709c0f
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-1S SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 12abe276614d445d9e958122c5608f9c
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: d1d55d21b8ca40d88221086d66b919e7
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 306d44e9256041089e0499678d0a9b6b
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 3ef08416c6e649469b036b730f756a35
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: db4a2f3baf9c44058e81df8924c51714
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 28fc52f85b454d24bf7e99f971f0bac4
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 6d1b24e94e8840c884c1cac3e8842eea
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 3de221d9357541e68cb0e949f58b0f3c
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 21158d7b18b64861b373be6718006753
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: c1c9783678e846ec88d1b68486abd5a0
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1009-7G-1C-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 873a002d903f440b8861dfae848d9bc9
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 9cd95e5678be442b8e7377f513c97888
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 86e76d6d249a4f339ca2841d9b433204
+                  expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: bb6f2eb38a2c4aee968332eefcca5f7a
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 4b5ad89e3ecf4d38a8bdb75b10028ba2
+                  expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 59124b030d4f498094eb01952c42b1da
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 404195780f234277874f9c1d88ce286a
+                  expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 79f14b61c0044e7a92745288c7cf0159
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 1e58c3aaa1a9469bb170fc50b75e1686
+                  expression: 'max(/MikroTik CCR1009-7G-1C-1S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 7cbf0b34c2154834b34f25ef18c70748
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-1S SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-1S SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-1S SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-1S SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 805d0b67d5e14d1abf2e1d3426c98691
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: ab6c29dc1dc6416a95480dd0114283e4
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 06452635ff154445b04377dd42ea3f0d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: ee7e17722ffa4a71ba337b9cb2b8d05e
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 06295e345bb948d196a22baa485ecedd
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7d9df48a9bd74cbc8be35a78dded0701
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 43f128e426044f5b82419ad75ca6e17c
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 4f7a3606547d46ad86820784f2c59d64
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: a3d138d7663b43ddbf11b71377f33e19
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 0939fc0eddef42698e6bb505159c5a4e
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 6aa454cc8cac42b79045c71393b88130
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: cb698e80cd15409bad16d476fc637a61
+                  expression: 'last(/MikroTik CCR1009-7G-1C-1S SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 11edf7c91daf4377ae12c38f16066d3a
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 43f8b0a75131483cb6dd5e800fb400b4
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 9fc01e7f1027439cbf1d0e35e0c7d353
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 58593e0ecf5c42f79340a7da5f1c1e86
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: e6500e2d99fa46dea445d9cc469df81e
+              expression: |
+                last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 33a9e94bff174f31978be450df1f3c40
+              expression: |
+                last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: ec4206d099ad41b79c2c65f1c684a8ae
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-1S SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-1S SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 5ba0ddfa9e4444bca1221b9ba2f833ce
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CCR1009-7G-1C-1S SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/README.md
new file mode 100644
index 00000000000..f052d8b4a60
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CCR1009-7G-1C-PC SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik CCR1009-7G-1C-PC.
+
+7x Gigabit Ethernet, 1x Combo port (SFP or Gigabit Ethernet), 9 cores x 1GHz CPU, 1GB RAM, passive cooling case, RouterOS L6
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CCR1009-7G-1C-PC SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CCR1009-7G-1C-PC SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1009-7G-1C-PC SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1009-7G-1C-PC SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CCR1009-7G-1C-PC SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1009-7G-1C-PC SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1009-7G-1C-PC SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CCR1009-7G-1C-PC SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1009-7G-1C-PC SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1009-7G-1C-PC SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CCR1009-7G-1C-PC SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1009-7G-1C-PC SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1009-7G-1C-PC SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1009-7G-1C-PC SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1009-7G-1C-PC SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CCR1009-7G-1C-PC SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CCR1009-7G-1C-PC
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/template_net_mikrotik_CCR1009-7G-1C-PC_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/template_net_mikrotik_CCR1009-7G-1C-PC_snmp.yaml
new file mode 100644
index 00000000000..d8095c0c3d6
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/template_net_mikrotik_CCR1009-7G-1C-PC_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:06:47Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 012e7043ff9849e197c42bf41cdf4d9a
+      template: 'MikroTik CCR1009-7G-1C-PC SNMP'
+      name: 'MikroTik CCR1009-7G-1C-PC SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik CCR1009-7G-1C-PC.
+        7x Gigabit Ethernet, 1x Combo port (SFP or Gigabit Ethernet), 9 cores x 1GHz CPU, 1GB RAM, passive cooling case, RouterOS L6
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 701b0e5e1b0d4f6199836c12bbeb23fb
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: de61b57b4fd54166a207bc040aa482a4
+              expression: 'last(/MikroTik CCR1009-7G-1C-PC SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1009-7G-1C-PC SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1009-7G-1C-PC SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 3172eba914574fd894cd4ab3c1295ed7
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: c5ade5b11ba84948ba84c0f975c6cbbe
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 1776f8b97fba4feb962b0a47e4780076
+              expression: 'last(/MikroTik CCR1009-7G-1C-PC SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1009-7G-1C-PC SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1009-7G-1C-PC SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 6f1cabbfe9b84535b77ba2d7b32706fc
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 0b8bd128fed047c591b839f3f46412dd
+              expression: 'last(/MikroTik CCR1009-7G-1C-PC SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1009-7G-1C-PC SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1009-7G-1C-PC SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: aef1126fc6354f5083ce2b35d03aaa3c
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: f3f71753cbe14516929027f5f7c39380
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: bde1da2443a3415296281c5259bc0b10
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 2dec63fe94b943549c8351fe1e737975
+              expression: 'min(/MikroTik CCR1009-7G-1C-PC SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: e6521ab9c51647ccaac14af8d146eb7f
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 97a47249871c4977bb68762cbc0c7b7d
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: e25580100dde402eaf640b6653223a82
+                  expression: 'min(/MikroTik CCR1009-7G-1C-PC SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: d8eb7cb6b67348c0911756a89bfffe99
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-PC SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: c53b0d6476944defadfb0746ccae7ae6
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 494a81d5b48047e0bce42dd126f573cb
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 5b950c6be6494ba7b743a572a208fd42
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: f091c3d0b2754d1a883ad9e5f96f7037
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: e9c78b7e0b0d4d64b420b5802c91f02a
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: b6389e2689eb439183ad1a25590f421d
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 311bd2dea3ea4db896d92ba8a82429bf
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 67f8c41b8c4748a6b5ab836821e79610
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: d18498b9f4df42fca625f01ec465d819
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: b457b4345c694e3a9963b74c9c2992c6
+                  expression: 'avg(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1009-7G-1C-PC SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 182d09c6f9764ffc9481f0930039dd95
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: a330dd93ef5b478480de6ab2be32e887
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 0f5a0e7593b447e2a9a5071f2ec4a30b
+                  expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: f99cdf9843ab4b67a2160e29ed5ab333
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 932fe21bdb6c460581093fb523b3c4b2
+                  expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 055aeb31cf1e4964b5e55e5caf090acd
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d6dcbaaaa89c4cfe80060830c595e4bb
+                  expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: ac8523f8566a43a5afd01dd074f24a6d
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d6e15977be5242edb4dd4bb8dcd0fbd0
+                  expression: 'max(/MikroTik CCR1009-7G-1C-PC SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 15c4b3a688e4485ca2ab76a990e43ce1
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-PC SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-PC SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-PC SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-PC SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: a244eb79522f47a6983a9a346fbc947a
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 7e359ae7be7f4c56bf8495c9fca6f4d2
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 9b04a4945910475c945ac92a1558ee41
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 1c06ee28e2b242f1b6449340b9250c4c
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 67d9b1ca3e80411691981c86dc571373
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: ce995698b4ec4af18a3687eb9212c6ee
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: ed8c46d319f742cb90cf948822cff340
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: cc2e1021e5b34fd59ad7c4f83f765d44
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 8980ce3faa3f4c45963255029ced713d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 49f612f570814c809330e4d940a85ddf
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 64617cafa0e74284ba3662e6ee4cee0b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 36dc48462d28464787978c8e6f74cafe
+                  expression: 'last(/MikroTik CCR1009-7G-1C-PC SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 2dd57c81d5e645a2a321d0519522310b
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 0e374b652a644f1f8db14960e0bd9457
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 4d9c4d471c7e4919b9a8d801e514a7db
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 1471eee2cfc8486da6b20358954a512e
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: fc93929bd60542d3896fbcdd590479be
+              expression: |
+                last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 6aa796b2784848a7ab26a7e6da8993a9
+              expression: |
+                last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1009-7G-1C-PC SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: ee6f2f6f632a4e04849e64251bcd7eeb
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-PC SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CCR1009-7G-1C-PC SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 0d8972aadf0f4e19bb93ce9bed6723fa
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CCR1009-7G-1C-PC SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/README.md
new file mode 100644
index 00000000000..d7e1ede116b
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CCR1016-12G SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik CCR1016-12G.
+
+1U rackmount, 12x Gigabit Ethernet, LCD, 16 cores x 1.2GHz CPU, 2GB RAM, 17.8mpps fastpath, Up to 12Gbit/s throughput, RouterOS L6, Dual PSU
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CCR1016-12G SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CCR1016-12G SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1016-12G SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1016-12G SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CCR1016-12G SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1016-12G SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1016-12G SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CCR1016-12G SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1016-12G SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1016-12G SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CCR1016-12G SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1016-12G SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12G SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1016-12G SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12G SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1016-12G SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1016-12G SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1016-12G SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1016-12G SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CCR1016-12G SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CCR1016-12G
diff --git a/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/template_net_mikrotik_CCR1016-12G_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/template_net_mikrotik_CCR1016-12G_snmp.yaml
new file mode 100644
index 00000000000..2058843241a
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/template_net_mikrotik_CCR1016-12G_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:06:49Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 5ed19d1f74224588bf5f53ac47003acc
+      template: 'MikroTik CCR1016-12G SNMP'
+      name: 'MikroTik CCR1016-12G SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik CCR1016-12G.
+        1U rackmount, 12x Gigabit Ethernet, LCD, 16 cores x 1.2GHz CPU, 2GB RAM, 17.8mpps fastpath, Up to 12Gbit/s throughput, RouterOS L6, Dual PSU
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 929df02b3b7a462f949c948d655d2f77
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 4ff0ad1fe7a043f28e46403ab4ce500b
+              expression: 'last(/MikroTik CCR1016-12G SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1016-12G SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1016-12G SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 9e85d395c80b4db8868d5bccf64edfaa
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 14b7fb61e1e64fbd900fd376ee087a40
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 0abb489d471e414b84d9bfe5d6d0e453
+              expression: 'last(/MikroTik CCR1016-12G SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1016-12G SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1016-12G SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 6cd07fdee09249c092abbee25f526c9a
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 3146fc39809741a09a46852ef392b694
+              expression: 'last(/MikroTik CCR1016-12G SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1016-12G SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1016-12G SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: e6db19f9ea46407dac1744adc4caa945
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: d05360006eb148a6a66f157513bfe26f
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 1ccd49102df74a0da7bc068ef3e6c81c
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 4093f81ecb9f4320b5c5ca719a6b8574
+              expression: 'min(/MikroTik CCR1016-12G SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 9edfde07815b4a03895c24f7703fbe9e
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 8fa7a6a3038e4dbfaa9d82a83e8e990e
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 20cfcbcae14b4b7fb9c86486f4e6b972
+                  expression: 'min(/MikroTik CCR1016-12G SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 4bd6447ec4e54e45b12893adf4a92bc3
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1016-12G SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 902597a2a07e40e59035f62cf623fd9b
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: f0e80b87c6874ed8acea53ff369c9f61
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: c84e4932a71849549be90027810335ea
+                  expression: 'avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 67d43cb946d94556bb921b0b120d58ee
+                  expression: 'avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: cd3aaf374f81487f98f0056920870782
+                  expression: 'avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: aeb7b829ab72424f96c53ac8d5788dfe
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: c6d9685ed59d4d719205cea9e750cae3
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 1e6346dade484f4aad2a63c03ebf32d4
+                  expression: 'avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 9eafc6dc38614e26a301d943f4f8dd5d
+                  expression: 'avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: d6cc20f91d5748fd85ab8743b5152be6
+                  expression: 'avg(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1016-12G SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: e4dddf65df514c03993ef70372bbdb78
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 13ed66b5078249179ebbb076461e4358
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 6c73b57b26b1484c83d7a8185829bd85
+                  expression: 'max(/MikroTik CCR1016-12G SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 8d84ea1e90a0441ca84c4d0922a6489b
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 5eafa20544ed463fad00fb233b34f92c
+                  expression: 'max(/MikroTik CCR1016-12G SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: a5e73872ef424a6082f408e3217502eb
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 0d079b01ba334fcd8f3e527ec7102c3b
+                  expression: 'max(/MikroTik CCR1016-12G SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: eaaceff4c42949ff86c7557ba5f994dc
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: fddf1697f5c04bae95c4752d2627856f
+                  expression: 'max(/MikroTik CCR1016-12G SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 3048504b46b7470ca54ef976cf973411
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1016-12G SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CCR1016-12G SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CCR1016-12G SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CCR1016-12G SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: adb864eee4b744328d91e8f9339bc79c
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: a715384f98d44f609be86fccb780a6e4
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b3ae9d00db964983a878382f52b3a171
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 85e91fc9812543228e069b97f1fcce30
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 78d7ad1a885e46a3a94a7d9014addf60
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7cc3ec557e144b4e83038c29a9d3bddd
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 7a5ef1da8c6d4d569a6d01bb76d4700e
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 76a32e833625423eb441305aacbfe13b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 5803d60c0a96463f9768627847b306aa
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 4697cee2b20944d49e31c3727c67db66
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: a504100b84894c01890a70c6fbbecb97
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 815c19538e7b48edb63bd46ad4d641d3
+                  expression: 'last(/MikroTik CCR1016-12G SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: ed6a12f9caca4aa2875e2dfd28ae73e2
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: fa8acc788ee34826ab8f593c40aa4129
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 99dbbdae777d4910939c2993a70f6892
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 7ce857423f0b4eb188bf07434449e600
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 79b2a705172743a88de436aa62be33ad
+              expression: |
+                last(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1016-12G SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12G SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 8c8e59c2079d4bfcbd775b0c38bbf253
+              expression: |
+                last(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1016-12G SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12G SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CCR1016-12G SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12G SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1016-12G SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 7fb9b943f8ce49a88f48095d24f9efda
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CCR1016-12G SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CCR1016-12G SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 7c3a67d410e44adc9ec226715dcbe88d
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CCR1016-12G SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/README.md
new file mode 100644
index 00000000000..d3926ec9a72
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CCR1016-12S-1S+ SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik CCR1016-12S-1S+.
+
+1U rackmount, 12xSFP cage, 1xSFP+ cage, 16 cores x 1.2GHz CPU, 2GB RAM, LCD panel, Dual Power supplies, RouterOS L6
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CCR1016-12S-1S SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CCR1016-12S-1S SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1016-12S-1S SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1016-12S-1S SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CCR1016-12S-1S SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1016-12S-1S SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1016-12S-1S SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CCR1016-12S-1S SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1016-12S-1S SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1016-12S-1S SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CCR1016-12S-1S SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1016-12S-1S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1016-12S-1S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1016-12S-1S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1016-12S-1S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CCR1016-12S-1S SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CCR1016-12S-1Splus
diff --git a/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/template_net_mikrotik_CCR1016-12S-1S+_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/template_net_mikrotik_CCR1016-12S-1S+_snmp.yaml
new file mode 100644
index 00000000000..e4f1851e198
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/template_net_mikrotik_CCR1016-12S-1S+_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:06:50Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 654910b270d9464f863ed085ba7302ce
+      template: 'MikroTik CCR1016-12S-1S SNMP'
+      name: 'MikroTik CCR1016-12S-1S+ SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik CCR1016-12S-1S+.
+        1U rackmount, 12xSFP cage, 1xSFP+ cage, 16 cores x 1.2GHz CPU, 2GB RAM, LCD panel, Dual Power supplies, RouterOS L6
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 9bb0cd6e869b4e00800c2893b4cf43bf
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 8012e0275fc24d9e9688cfccb3134aae
+              expression: 'last(/MikroTik CCR1016-12S-1S SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1016-12S-1S SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1016-12S-1S SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 6d2bed107e30443ea44f3c3cd61f7cf5
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 460078d3884e4927818a3015dc36ec17
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: c6e011ff0a1f41c5b90bb8fba507fe7d
+              expression: 'last(/MikroTik CCR1016-12S-1S SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1016-12S-1S SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1016-12S-1S SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: c71d909522214671afd2b636aa54a06d
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: f8ac6aaa8c06474d9a9b86e5e43b5ed5
+              expression: 'last(/MikroTik CCR1016-12S-1S SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1016-12S-1S SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1016-12S-1S SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 1077bedb2f1b48509ec5a4f299aac7cf
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: b24d15e975cd4423a4ef27008ee5fda1
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 3ea0ffecf896435284e268758203272d
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 63e95c315b6f422e9d4f6e532e847e9c
+              expression: 'min(/MikroTik CCR1016-12S-1S SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 574e87197ce64d3ba47b7f99ee1bf45d
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 363e697a888342a2974be7d51728b144
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: a8920b239ceb42e6b3e26ffd310a409a
+                  expression: 'min(/MikroTik CCR1016-12S-1S SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 0c73159da76a4b61bbc7c8116af9d7fc
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1016-12S-1S SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 53f14b1963614f2e8061c840c384f401
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 107afb2b34884a5d968d820be0ad4ceb
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: c3b13c3d1f8c4d53b1fa67f9abc168bd
+                  expression: 'avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 80fd1bd8bf564aecbe37b77294c84ae6
+                  expression: 'avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 335090c080c04b909f1b46b404dd025c
+                  expression: 'avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 7d321af0e12c4149a2c61e22326d4074
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 48385fb97a77406bbf7f6da6f76c02fc
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 5b86f67e1e184ef79b7023760d951747
+                  expression: 'avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: c62972c2c47d403bb92d43ff7b9b5a20
+                  expression: 'avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: fc2ffec9e7054c82880a560da071781a
+                  expression: 'avg(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1016-12S-1S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 6c3a1517e3ab441db0bb102f9efe3aed
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 9aec7b05f5be4b03b5627b38eac0a8e1
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 42329cfbff37430f87adfefa852b39fe
+                  expression: 'max(/MikroTik CCR1016-12S-1S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: f752e73907bb485391661bde8301c894
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 0259421d33e745d992e5eb03091b787a
+                  expression: 'max(/MikroTik CCR1016-12S-1S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 7a0c2eafe0e0464788dea620cdb16cb0
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: ac07e47a3ce447febb5049da33931109
+                  expression: 'max(/MikroTik CCR1016-12S-1S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 9b02e4b2f89349ec9b364f023d0f999a
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: ef75c9ab974c46a99579c544e43a2c2c
+                  expression: 'max(/MikroTik CCR1016-12S-1S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 43b1fee8802d46ed838db745daff8be1
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1016-12S-1S SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CCR1016-12S-1S SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CCR1016-12S-1S SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CCR1016-12S-1S SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 274527cab9a440f4b7ec6b65998338ec
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 53b3902bab07498f9db3fb888a023392
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 045edf92e0084089961529eb7d5b1baf
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: a351cfdfce4a474fa08282338accc213
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: d0447954c1214428841537404b2ca7fd
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 0fe201eb562b4080bdef34e6fe43ae30
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 3d3ffa19c93e4d6aaaf63178cf2c3728
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 51f998a0c59846178819f51a3ee1b72b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 9ed7d527871e428282ac08c5c4b94ad4
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7cdfe024544f494f9cc241ace013be76
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f7655d3d40d742f5abec39dfc753dbc2
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: ff2543e8251945f29036cb43fda69c72
+                  expression: 'last(/MikroTik CCR1016-12S-1S SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 8c4d698df0b044018e22d6ae97e3ffeb
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 9976d1dea8234a8c9baccac8cde90796
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 31b78c198bf54971b7d523341538ac55
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 0774ba4162ca42e68b7ad37e76e9ef7b
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 7e201487d2ed496492eb2dbb1a169021
+              expression: |
+                last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: fcc24d6aa85a4ae4b104d9523afe073d
+              expression: |
+                last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1016-12S-1S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 8a71589751e94467973c7f52af45f440
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CCR1016-12S-1S SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CCR1016-12S-1S SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 745d4ccb40fc47299aa0fce0d534ff7d
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CCR1016-12S-1S SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/README.md
new file mode 100644
index 00000000000..2f1479a187e
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CCR1036-12G-4S-EM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik CCR1036-12G-4S-EM.
+
+1U rackmount, 12x Gigabit Ethernet, 4xSFP cages, LCD, 36 cores x 1.2GHz CPU, 8GB RAM, 24 mpps fastpath, Up to 16Gbit/s throughput, RouterOS L6, Dual PSU
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CCR1036-12G-4S-EM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CCR1036-12G-4S-EM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1036-12G-4S-EM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1036-12G-4S-EM SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CCR1036-12G-4S-EM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1036-12G-4S-EM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1036-12G-4S-EM SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CCR1036-12G-4S-EM SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1036-12G-4S-EM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1036-12G-4S-EM SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CCR1036-12G-4S-EM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1036-12G-4S-EM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1036-12G-4S-EM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1036-12G-4S-EM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1036-12G-4S-EM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CCR1036-12G-4S-EM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CCR1036-12G-4S-EM
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/template_net_mikrotik_CCR1036-12G-4S-EM_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/template_net_mikrotik_CCR1036-12G-4S-EM_snmp.yaml
new file mode 100644
index 00000000000..c60ec5395ea
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/template_net_mikrotik_CCR1036-12G-4S-EM_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:06:52Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 930c0e0534a9424fb01f2b6218d8ce59
+      template: 'MikroTik CCR1036-12G-4S-EM SNMP'
+      name: 'MikroTik CCR1036-12G-4S-EM SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik CCR1036-12G-4S-EM.
+        1U rackmount, 12x Gigabit Ethernet, 4xSFP cages, LCD, 36 cores x 1.2GHz CPU, 8GB RAM, 24 mpps fastpath, Up to 16Gbit/s throughput, RouterOS L6, Dual PSU
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 3b45bf2cd74b496e8882ef8421f3075f
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: e0decdba5c7a44ef9983da4d0912ba37
+              expression: 'last(/MikroTik CCR1036-12G-4S-EM SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1036-12G-4S-EM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1036-12G-4S-EM SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 11cf922dd6534e9faad83972f43021f0
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 87694d7f0a6742c5922fc3f1d3c4c950
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: ee34d0bdac3f4b0489fc96a3feecb72b
+              expression: 'last(/MikroTik CCR1036-12G-4S-EM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1036-12G-4S-EM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1036-12G-4S-EM SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 4118b55b18df44798e3593e7c4ab1dd7
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 65ac535fb0114cc098bd89d1e2a5cfed
+              expression: 'last(/MikroTik CCR1036-12G-4S-EM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1036-12G-4S-EM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1036-12G-4S-EM SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 9c918b9f51a14b5aabe9bf662d459a45
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 4664580c7f80415a8813dfac83c3f616
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 635ee2092ff64314910c0612fc33ee6c
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 1ed5e95e003d4119bd578ac4f572ba16
+              expression: 'min(/MikroTik CCR1036-12G-4S-EM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: d00d9cce234d4d75ac0035da246aad00
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: b1099ed1cd3742ffaaa1a5aae3cd27aa
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 519211164f324540a624c3f1046dbd44
+                  expression: 'min(/MikroTik CCR1036-12G-4S-EM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 7ad0424405ea4a1d9e9269d3f4c70fdd
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1036-12G-4S-EM SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 657a8813b0784c7b9034b320f9d90a7f
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 814160afbb4f4a5e9b3c8c2add8aeddb
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 09b73cf701ab4f4aac2fdbb4ff26e893
+                  expression: 'avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 3e86bb9cfaa5410d8b932f80c413e340
+                  expression: 'avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 5f52e2e9403544b987568c00046deaea
+                  expression: 'avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: fa20d2b065454093b058086c5936dff3
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 3c392ed2b8194b9ebdc88a3865f3c03f
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 6c46256f6d124cf9b3d602f7536a4788
+                  expression: 'avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 8b61d889f30e43f28102163a6284c8d4
+                  expression: 'avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: edbf42873c99405cb77d0eb3fd6986a8
+                  expression: 'avg(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1036-12G-4S-EM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 1022bfe65683409f92d390a005250d35
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 1c4f1f6d7a374db0a15411a7ba8b300c
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: bbe7c7f1238649119b44e657c5f0d292
+                  expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 060e1a17f8244cf48f55605e9977bf36
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 8f858819c89542bc88afa76981b4639a
+                  expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 66389bb0e1a846f8a26567d0d9e182fe
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: ad82b43ac27c44258f4a4f3ca212cdbf
+                  expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: b6f955df3ab04d85baf81d60ad41eb4c
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 6a3ce63f84ef4df9b8e9cc231ddf3fe0
+                  expression: 'max(/MikroTik CCR1036-12G-4S-EM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 687618f8d1c74502b6cf0fa90bd634a1
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1036-12G-4S-EM SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CCR1036-12G-4S-EM SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CCR1036-12G-4S-EM SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CCR1036-12G-4S-EM SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 7b29429668f84059956e617b64d58373
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 77422704136d4a80908a28fe79c7242f
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: a026d85a54c04205833a36b39d5f0b73
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b5e956501870483fb045df1655751b69
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e2a923c0d22e4872acc473e3783ccdb6
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 8017849385a648df8f45e35a8a1a080a
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 04c6bcdd1e634c129707b0b39c86cc8c
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 88aa7fca3e0b4e778674da7ece8cf4dc
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 5edccab248474bf6beb3132626be1675
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 13f3f91149694ed8bd33067fa82979d8
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b244af1db2374fbb865c735e81a56ae8
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 4a5a914ac69f42eb8fa9ca5ef30e63cc
+                  expression: 'last(/MikroTik CCR1036-12G-4S-EM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: da85811fdfe24a82b4d7a13a243893ba
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 1eb7fcbc95d34a108cf8deb3dce47784
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 24a12296bd844160b4d34988be84f368
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 159cecb702d2450e9e868c108903e360
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 07a38ca5caf7408fa0e61ec5bb2d2c9a
+              expression: |
+                last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 313ea923495e4a0289519b8c228f018a
+              expression: |
+                last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-12G-4S-EM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 07380c601c834361b6ccec958d64a643
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CCR1036-12G-4S-EM SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CCR1036-12G-4S-EM SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: e1b400bae7da404e8e808dfeb54bc2ce
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CCR1036-12G-4S-EM SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/README.md
new file mode 100644
index 00000000000..079e7ad1b05
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CCR1036-12G-4S SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik CCR1036-12G-4S.
+
+1U rackmount, 12x Gigabit Ethernet, 4xSFP cages, LCD, 36 cores x 1.2GHz CPU, 4GB RAM, 24 mpps fastpath, Up to 16Gbit/s throughput, RouterOS L6, Dual PSU
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CCR1036-12G-4S SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CCR1036-12G-4S SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1036-12G-4S SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1036-12G-4S SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CCR1036-12G-4S SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1036-12G-4S SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1036-12G-4S SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CCR1036-12G-4S SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1036-12G-4S SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1036-12G-4S SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CCR1036-12G-4S SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1036-12G-4S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1036-12G-4S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1036-12G-4S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1036-12G-4S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CCR1036-12G-4S SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CCR1036-12G-4S-149
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/template_net_mikrotik_CCR1036-12G-4S_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/template_net_mikrotik_CCR1036-12G-4S_snmp.yaml
new file mode 100644
index 00000000000..5cf8c3e5e50
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/template_net_mikrotik_CCR1036-12G-4S_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:06:53Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 82b428ad78d34988b93f3d577f2b6adc
+      template: 'MikroTik CCR1036-12G-4S SNMP'
+      name: 'MikroTik CCR1036-12G-4S SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik CCR1036-12G-4S.
+        1U rackmount, 12x Gigabit Ethernet, 4xSFP cages, LCD, 36 cores x 1.2GHz CPU, 4GB RAM, 24 mpps fastpath, Up to 16Gbit/s throughput, RouterOS L6, Dual PSU
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 9316b737e8174862b0ce60ad10dca68b
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 565c94a00dde43c1af72f8c2d00edcb5
+              expression: 'last(/MikroTik CCR1036-12G-4S SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1036-12G-4S SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1036-12G-4S SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: c758cdb68e854cedbb9fc53d361c878b
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: b04e3b3b91294e3b9a5968e475166473
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 6d02cc3ff4144efda53554446feb0058
+              expression: 'last(/MikroTik CCR1036-12G-4S SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1036-12G-4S SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1036-12G-4S SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: d0d399bd9e7e4aca86de1b4aa23cfa0c
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 18900918495f4dd99cbde564a071bf34
+              expression: 'last(/MikroTik CCR1036-12G-4S SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1036-12G-4S SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1036-12G-4S SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 8be77fd4f4704108aedd5ab35a212172
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: b8102bbf381c4a6e9d759e3ae3902616
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 383e2e5544ef439199784bcf81cced10
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: d89ab73e0c534f84ae9481a1a48d5064
+              expression: 'min(/MikroTik CCR1036-12G-4S SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: e3e28fe259aa4a43b30e5b919d44afcd
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 5e2e23eecdb64096bd797eec839e8c3d
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 24667b99976c417985bbb1a307184d88
+                  expression: 'min(/MikroTik CCR1036-12G-4S SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 29baf5d5e81846de97fd1dd470d55583
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1036-12G-4S SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: f2726d5b184f49b38b7911c4357a7a13
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 6edefebb1b15445f80742f9d3d3e7f02
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: aa6398ab43ec491ab5aa96c8d8422112
+                  expression: 'avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 186b82ffb7934fe8a62a150970dc2468
+                  expression: 'avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 58357816e19b4c9986e8d26165c4f29a
+                  expression: 'avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 99d9e2e9d49241158e7e6a4b582be953
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 651743f22cbb4fb58233a5af65bb66f3
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 522ee0ddfd7e40a4b81612d4ba4266cf
+                  expression: 'avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 6a5b1f729c054ec7acc3665ffb831bcc
+                  expression: 'avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: f4198424045742619f84410ee7a2939c
+                  expression: 'avg(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1036-12G-4S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: be0f695c529c4eb299ec52cf35894748
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 4356a26c242f4a3a9f4d8f6db98d21f8
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: b7d3eebe1d6944b88ed8afa923caf884
+                  expression: 'max(/MikroTik CCR1036-12G-4S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 34bf54ed6a5f4e53986f359d544c30cb
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 94c9e778f2a7471c8002dfa6918dde8f
+                  expression: 'max(/MikroTik CCR1036-12G-4S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 3823c35804ca433c8bcb5911f72bcea1
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 77e69f355f7348a4bc823a8428980356
+                  expression: 'max(/MikroTik CCR1036-12G-4S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: b978cd0e8ea54e76ac2306550880c3bb
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c1926140ee5d4532adeecf590f740e96
+                  expression: 'max(/MikroTik CCR1036-12G-4S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 610a541bb14d4913bf2da6621c34e374
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1036-12G-4S SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CCR1036-12G-4S SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CCR1036-12G-4S SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CCR1036-12G-4S SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 1a244ce7f50e465bbea8774ce17a334c
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: df991a11507f4a29ae4b9d49ff210a25
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 50e5ff8d2fcd40969e84bfeb4337a3f3
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e618a4a331f744a4b3803197d49560af
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 16cdd7e0531a4e589f6a80516afa05f4
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b8c258ea4d8d43e2a76563cd67e310ae
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 12c3d78774c74147a6117369b96b4256
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 529e53e857584a1b9f9baa4ffbe711b4
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f9436b34ccd54749adcf2ce4250306fa
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e230eabed9c346ea953cfd1d74e7539d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 2c38689dacdb426b93a933693e6aa400
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d32004c5c1804105aee11b22722556e1
+                  expression: 'last(/MikroTik CCR1036-12G-4S SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: a32b1f9c2e3049e7bcd3af65c4b107f6
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: ea30a631843d404c8eac9fe189ef0d74
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 9186466c7a374a9d9a243bec3e00efdc
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 9bdbfc448dcb4d3fbfff2fc1a78b938d
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 73127568919e45ca9df89ab08285a3b5
+              expression: |
+                last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 954903eaecf54c26874d9e5ce47e044b
+              expression: |
+                last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-12G-4S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: d9d444f2cfd5498d857d74aed0678406
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CCR1036-12G-4S SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CCR1036-12G-4S SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 4ed5a17cbf3b46d2a68d6e29a71147c9
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CCR1036-12G-4S SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/README.md
new file mode 100644
index 00000000000..2f55f313688
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CCR1036-8G-2S+EM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik CCR1036-8G-2S+EM.
+
+1U rackmount, 8x Gigabit Ethernet, 2xSFP+ cages, LCD, 36 cores x 1.2GHz CPU, 8GB RAM, 41.5mpps fastpath, Up to 28Gbit/s throughput, RouterOS L6, Dual PSU
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CCR1036-8G-2SEM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CCR1036-8G-2SEM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1036-8G-2SEM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1036-8G-2SEM SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CCR1036-8G-2SEM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1036-8G-2SEM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1036-8G-2SEM SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CCR1036-8G-2SEM SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1036-8G-2SEM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1036-8G-2SEM SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CCR1036-8G-2SEM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1036-8G-2SEM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1036-8G-2SEM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1036-8G-2SEM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1036-8G-2SEM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CCR1036-8G-2SEM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CCR1036-8G-2SplusEM
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/template_net_mikrotik_CCR1036-8G-2S+EM_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/template_net_mikrotik_CCR1036-8G-2S+EM_snmp.yaml
new file mode 100644
index 00000000000..066f5a92a49
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/template_net_mikrotik_CCR1036-8G-2S+EM_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:06:55Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 7b3ecb24366f4685970df8e1143323f0
+      template: 'MikroTik CCR1036-8G-2SEM SNMP'
+      name: 'MikroTik CCR1036-8G-2S+EM SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik CCR1036-8G-2S+EM.
+        1U rackmount, 8x Gigabit Ethernet, 2xSFP+ cages, LCD, 36 cores x 1.2GHz CPU, 8GB RAM, 41.5mpps fastpath, Up to 28Gbit/s throughput, RouterOS L6, Dual PSU
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: a808f02d217e4b338fbd5d8f52474d7d
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: a42442ce9d7d4a378964296eed6a6b33
+              expression: 'last(/MikroTik CCR1036-8G-2SEM SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1036-8G-2SEM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1036-8G-2SEM SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 721918724f3f47189db3d73a51eed73e
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 028dcc2c59f34754b646c0a07e6e4709
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 2da3a78731324233be1563691f353d04
+              expression: 'last(/MikroTik CCR1036-8G-2SEM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1036-8G-2SEM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1036-8G-2SEM SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 5f186d66075841689596629ffecd1d45
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 855a1e17110e49eaaaf4dd263f16a591
+              expression: 'last(/MikroTik CCR1036-8G-2SEM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1036-8G-2SEM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1036-8G-2SEM SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 19a2d0e30b0c4123899147a6230863cf
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 8b64d82e4b7b46a28cc88b1fc6c772d8
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: a1a1e9109bb24cefb67b397dc94d3ed9
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 9a83e6b6a0874a49a983cb610a7e0e50
+              expression: 'min(/MikroTik CCR1036-8G-2SEM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: c10d4bba94a54260853ce18bb4a1dbac
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: d7d582f52ddd4c14ad45bbcf98e7cce3
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: bc07372dff2f4f72a6b1b7c0e02f79c7
+                  expression: 'min(/MikroTik CCR1036-8G-2SEM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 01ef650a4abb4a1f9ff59f507ba15528
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1036-8G-2SEM SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 43bfef9ab73c4111a6781bc0a6ed4831
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 5a085632c4b54eb5a6ce87d2634f722c
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: b3ce44c470a64dc49bc169c06bf9761d
+                  expression: 'avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 876a62a4aa6a449d888f1233c24c0dbc
+                  expression: 'avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 79304fcbafe349d4adeebe277858d23a
+                  expression: 'avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: a5a949d4fee442ffa2feb45f703396dd
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: efe26a08e5244aba9529e2a19512b022
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 80af013716d944e8be4cef996aabfef2
+                  expression: 'avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: ab46cd19e709417ebeb5c3b9964e2eee
+                  expression: 'avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 06e95d596af74a288b3787cb665255bb
+                  expression: 'avg(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1036-8G-2SEM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: abc09b388f484f10aa5d7e7203bdbbcf
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 2923109d73144954a1da93508c2ae589
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 4f9b8def6c3e4d72b7afeb50808cae21
+                  expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 0d85d562ee204270becddfe118253dcd
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: aa5d408235834a5e8492a55e178f5dc7
+                  expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 67ef3c61b30048fda4139fbc29cb7abc
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 5c4489b0d28649a9a487d65833043589
+                  expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: afc1517dbedf49c089eacf2467392963
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 1d77ead6601b40d5b22afc9098a8a211
+                  expression: 'max(/MikroTik CCR1036-8G-2SEM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 594db09a7c024245a5eead39296b3c2c
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1036-8G-2SEM SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CCR1036-8G-2SEM SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CCR1036-8G-2SEM SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CCR1036-8G-2SEM SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 474fc7c380b74f11b366fc548b4e2fbf
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: f86eddbb80e04ed594c87c16bd4d0bba
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 105399b0d5d84b9094b7eb75603d75b3
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 8d0b0fca17b343dab54abe2b3f4b49f9
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e17ac687194544698dee18404081a7d9
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7d942107cdaf4ff58c9ad7a1a21f260d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 543247e3c8a74ebcb21aec300625eceb
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 54047484e062468ebbca526199a823ac
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7ffae69ac5c644efa17ba9db8e3d16bd
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 03fdd1fb023d4e109e1a69bd01e1b588
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 139d2b1d8a0946f5b3febab4e9fd0587
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 1b02cd1523474c949dcabd004a01089f
+                  expression: 'last(/MikroTik CCR1036-8G-2SEM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: f6f52142e7464eaa829cab9823eff606
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 95b91a8569934b29b89d500cd3673d03
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 79e5b2ee35d648d3b3a5f4988f3e7592
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 6bce04e7abea4d16bb901d81e618f186
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 768953b43aab47d0bfcf9eeef75625ad
+              expression: |
+                last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 74b9590a3e2448bc926fdd29bc6ec153
+              expression: |
+                last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-8G-2SEM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 2cd5ec756edb4c189a003a1cfa4f5cb4
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CCR1036-8G-2SEM SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CCR1036-8G-2SEM SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 4e79fe4d16424ead95e1d5ea25382120
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CCR1036-8G-2SEM SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/README.md
new file mode 100644
index 00000000000..ae7a1d56a24
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CCR1036-8G-2S+ SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik CCR1036-8G-2S+.
+
+1U rackmount, 8x Gigabit Ethernet, 2xSFP+ cages, LCD, 36 cores x 1.2GHz CPU, 4GB RAM, 41.5mpps fastpath, Up to 28Gbit/s throughput, RouterOS L6, Dual PSU
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CCR1036-8G-2S SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CCR1036-8G-2S SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1036-8G-2S SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1036-8G-2S SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CCR1036-8G-2S SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1036-8G-2S SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1036-8G-2S SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CCR1036-8G-2S SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1036-8G-2S SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1036-8G-2S SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CCR1036-8G-2S SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1036-8G-2S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1036-8G-2S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1036-8G-2S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1036-8G-2S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CCR1036-8G-2S SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CCR1036-8G-2Splus
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/template_net_mikrotik_CCR1036-8G-2S+_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/template_net_mikrotik_CCR1036-8G-2S+_snmp.yaml
new file mode 100644
index 00000000000..af2a232a1b0
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/template_net_mikrotik_CCR1036-8G-2S+_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:06:57Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 7f44e67e3f564ec9894c9142d7276553
+      template: 'MikroTik CCR1036-8G-2S SNMP'
+      name: 'MikroTik CCR1036-8G-2S+ SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik CCR1036-8G-2S+.
+        1U rackmount, 8x Gigabit Ethernet, 2xSFP+ cages, LCD, 36 cores x 1.2GHz CPU, 4GB RAM, 41.5mpps fastpath, Up to 28Gbit/s throughput, RouterOS L6, Dual PSU
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: e565515e2bfe469db344bd78bdfcba74
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 26d7b5b5fc4149d4869a4e3a94173172
+              expression: 'last(/MikroTik CCR1036-8G-2S SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1036-8G-2S SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1036-8G-2S SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 2ef71aac4f8b462cb4103327331c359c
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 5d766873d7ee41ddad6d90199c1e8a38
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 79405589edba4a878d7d2ab5d0399076
+              expression: 'last(/MikroTik CCR1036-8G-2S SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1036-8G-2S SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1036-8G-2S SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 56f7e706b7f84fdf827f5a14fb3bdc7c
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 1ed2e0368bb94a4fbfa8a82764b3b40d
+              expression: 'last(/MikroTik CCR1036-8G-2S SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1036-8G-2S SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1036-8G-2S SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 818712f7986b40e8a3ce3994f43199ea
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 0b3849a88cf9436284dea73e86f70405
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: deb60e7c19b74431aed7b6c26fb7616b
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 03cdc40813dd4d5093512db3c5e574ff
+              expression: 'min(/MikroTik CCR1036-8G-2S SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: c58edbe489db4e26a93a75c58c88a1f3
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 76610d269fa74931b5942475c179e840
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: a9f3354cf2044306ba8ca1aae227ee60
+                  expression: 'min(/MikroTik CCR1036-8G-2S SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 58020e927fcb4113a0339a9f2458f711
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1036-8G-2S SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: d86c3660acfb4595946453fce47eb8df
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: d46e25089d8144d1b56062cc2d3e9059
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: f399cf1f48d24ec3b3f33159cb7b4fe0
+                  expression: 'avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 0c240046f1434ffb8c2cba26e4b0e61d
+                  expression: 'avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: f810f58531c54e3bbcf6d0e677100237
+                  expression: 'avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: db9785c59e4b4b1e922fd5a6ded18ae6
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 1798378de4a34ef39db1c9b22a1131e8
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 773c5f9316c44d8297b4fd3cdd236da1
+                  expression: 'avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 3d688fda4da843e192c26d955d8d8dd9
+                  expression: 'avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 2a21380034244b29878bbb198cca6712
+                  expression: 'avg(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1036-8G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: ccebe51b33a6459b99847e6a379f6037
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 774a4dd9c60a441b8bcac9a771f89a3d
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 67152820f4884d51a16966f339947955
+                  expression: 'max(/MikroTik CCR1036-8G-2S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 1ee273ffb87749a897d5de628694eef2
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: ca8b841c9830497dabd0138fafade175
+                  expression: 'max(/MikroTik CCR1036-8G-2S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: c35c822a0f3f4dd3bd80beb1d9bbdd05
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: e8f613b6301b43efa4a2e84d62ec520f
+                  expression: 'max(/MikroTik CCR1036-8G-2S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 676b0104a7d94496a139ddd470bf7b2a
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c215c39df396474e865ae9b36c40545f
+                  expression: 'max(/MikroTik CCR1036-8G-2S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: e95ab4bef8354ea2bd66e421a2c63460
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1036-8G-2S SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CCR1036-8G-2S SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CCR1036-8G-2S SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CCR1036-8G-2S SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 364c87891bd34038a38c3339e6367c60
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 98d33e0d19a7401293471c0c26f8657e
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: acf03c7db037477c99bfa298ff11c976
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 37c8c5e1dfaf4b7c841a21c2519bc699
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: ca04a3369ba347ffaf2c67825bd2d200
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 5e7de2ae51d5463e835eb73b9f07186e
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 6130a63b523a4d5780cc7c6187e25092
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 220f9e350c134b59bbaa38142996274b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 4d2b9aaebdb1460dba179e2139802b66
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 0447138203d9420287fe3317148ffdd7
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: c00fb1e73f1b495c8994bbaf3d6d4d50
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 587ccbe7d604489783b66411a3b21cb1
+                  expression: 'last(/MikroTik CCR1036-8G-2S SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: df12abb1cede4e059dd54454550f2501
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: dbb260b0d9334f60a27e59536c05873c
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 175c5f77af65445fb21d0d876fcb3983
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 827812e4bfef4bc5aa61630a8965d56f
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 72a2fc862c354ab0a3d8fb491aaed9e1
+              expression: |
+                last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: d66a941be43a440fb13386d9a319a5b3
+              expression: |
+                last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1036-8G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: f724179d92fa44b4adc25a2808522fc6
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CCR1036-8G-2S SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CCR1036-8G-2S SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 0dc1b1e2370940a2974ce4e00c2aa27e
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CCR1036-8G-2S SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/README.md
new file mode 100644
index 00000000000..2aa99f301a6
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CCR1072-1G-8S+ SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik CCR1072-1G-8S+.
+
+1U rackmount, 1x Gigabit Ethernet, 8xSFP+ cages, LCD, 72 cores x 1GHz CPU, 16GB RAM, up to 120 million packets per second, 80Gbps throughput, RouterOS L6
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CCR1072-1G-8S SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CCR1072-1G-8S SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1072-1G-8S SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1072-1G-8S SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CCR1072-1G-8S SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1072-1G-8S SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1072-1G-8S SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CCR1072-1G-8S SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1072-1G-8S SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1072-1G-8S SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CCR1072-1G-8S SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1072-1G-8S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR1072-1G-8S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1072-1G-8S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR1072-1G-8S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CCR1072-1G-8S SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CCR1072-1G-8Splus
diff --git a/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/template_net_mikrotik_CCR1072-1G-8S+_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/template_net_mikrotik_CCR1072-1G-8S+_snmp.yaml
new file mode 100644
index 00000000000..36670ee11a1
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/template_net_mikrotik_CCR1072-1G-8S+_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:06:59Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: e7894db1c4c94e0f8715977e751368b3
+      template: 'MikroTik CCR1072-1G-8S SNMP'
+      name: 'MikroTik CCR1072-1G-8S+ SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik CCR1072-1G-8S+.
+        1U rackmount, 1x Gigabit Ethernet, 8xSFP+ cages, LCD, 72 cores x 1GHz CPU, 16GB RAM, up to 120 million packets per second, 80Gbps throughput, RouterOS L6
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: e06462712e7c45f296fa8dc0c53871d0
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 385231b6c7eb4ce6a275969b437c8d44
+              expression: 'last(/MikroTik CCR1072-1G-8S SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR1072-1G-8S SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR1072-1G-8S SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: b1a6e11a8ba64f9e9270db35847b3421
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 0fa99ad0d0744f24ab49ad9be423b3d4
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: bb2cc5758a154bc0ad07138e87f353a4
+              expression: 'last(/MikroTik CCR1072-1G-8S SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR1072-1G-8S SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR1072-1G-8S SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 00ed6d0e4cd84395a74a5015e3440877
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: ff7510d9e2d44057a089b9486af74971
+              expression: 'last(/MikroTik CCR1072-1G-8S SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR1072-1G-8S SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR1072-1G-8S SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: f7c0ee962f1c4fab9262181dd9dee211
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: d3c3ff16e7dd4d2e811e72cb0279a827
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: ee81aaa76f1d40a898ba48e0dde79d13
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: a7fa3a261f0c4362938700ff8954cdc9
+              expression: 'min(/MikroTik CCR1072-1G-8S SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 1abbf37ece7c40ca93bb925c7bd27d89
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: df4993b4508b4f4bba6a328323e8cc0a
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: a47faa0771b348ed8fd040027deebd95
+                  expression: 'min(/MikroTik CCR1072-1G-8S SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 3370f88daa5947b3b23514c98202cd48
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1072-1G-8S SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 4a85e5aaa45a4a289323e0438e6f5f09
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: d4687d0ffe8d4ac39d027fc8e9647c0d
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: b32ecc16390c42bfbc0ad23305f59392
+                  expression: 'avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: fb39a804a60e4154ad6602fad05c399d
+                  expression: 'avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: e35e3256fd58439d923ca54b7e33e64c
+                  expression: 'avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 4cc4ce99e8c2450aa6a74075306f1b13
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 7765ee205fe64485a341109b2173e85f
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: ea9da810d00445f3b4649f8aec0d9ef7
+                  expression: 'avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 28a883547a4449ea96c1168aef939a65
+                  expression: 'avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 760505068a3946edbd38294f867e08e5
+                  expression: 'avg(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR1072-1G-8S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 750de67c2b6043a3a317ece3f2d182a5
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: f4ba5f4c17d2408b80f6962782d3527b
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: eacd5dec75404c9e80bd18d5ea0f3bff
+                  expression: 'max(/MikroTik CCR1072-1G-8S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 676d18905c9b43c4ad36b45c90bc6248
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 0e79530582ee4e3aa270d8a43a96f7f0
+                  expression: 'max(/MikroTik CCR1072-1G-8S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: af72ce8fb6344e6ebb946ea81453b276
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: ddbe2cfcdd6f4d5895780fa6510acb73
+                  expression: 'max(/MikroTik CCR1072-1G-8S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: a78be7de743d49d8b9fa9070d32e4db9
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 5f8087b4f9ae4d3693d55d189c1f99f4
+                  expression: 'max(/MikroTik CCR1072-1G-8S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: cfccdd73e3b246c9b2b4f9b242964699
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR1072-1G-8S SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CCR1072-1G-8S SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CCR1072-1G-8S SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CCR1072-1G-8S SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 81214dcd098f44d4aa3c3e33a8f23e0b
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: d9b11f3313d24adcbe7146ec9df681fe
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7e24b5bc03d74b1aa2ee0c9e4c56ac89
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 80fa9dbbb386432d9c534cbc86de36f7
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: d258ab237f1f4e79a31778d42ef14447
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 0b7cd68c901d46fea18594cb7b1df015
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: ded0e3b9a1c84f84aa7fb6e05f0afded
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 572e7a2adba6465986872543912bc2b8
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 29efa5a1a2fe4076a2a178374a52ada1
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: c5a823ac8d684b8fb386090e3f48eaeb
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f8d680f85dae470296e8c25e692a3a0f
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: e25c484ec45a4a01b51f961318813e30
+                  expression: 'last(/MikroTik CCR1072-1G-8S SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 036680a2cc2e4c568a221b6456821b47
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 0b5ebfdb1d72421dbaf381bf1dd609ca
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 47623ca42a2c4b80b9140d4672329d26
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: cf424ebd271a4cda9ce1f69a3c735dfb
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 044aabf4d95c4c9ba7ccec76446f50af
+              expression: |
+                last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 3a5a7043d1b64fe5a7fdefc341fcc22a
+              expression: |
+                last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR1072-1G-8S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 719dcbc5a85e4d3e99a7906e8b9ee28d
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CCR1072-1G-8S SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CCR1072-1G-8S SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: b7c290c65f1b4af7b22627824350bb21
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CCR1072-1G-8S SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/README.md
new file mode 100644
index 00000000000..5a69c61cf63
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CCR2004-16G-2S+ SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik CCR2004-16G-2S+.
+
+This powerful and affordable router crushes all previous CCR models in single-core performance. 16x Gigabit Ethernet ports, 2x10G SFP+ cages, active cooling and the best single-core performance per watt & best overall performance per watt among all the CCR devices.
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CCR2004-16G-2S SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CCR2004-16G-2S SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR2004-16G-2S SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR2004-16G-2S SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CCR2004-16G-2S SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR2004-16G-2S SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR2004-16G-2S SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CCR2004-16G-2S SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR2004-16G-2S SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR2004-16G-2S SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CCR2004-16G-2S SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR2004-16G-2S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR2004-16G-2S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR2004-16G-2S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR2004-16G-2S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CCR2004-16G-2S SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/ccr2004_16g_2s_
diff --git a/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/template_net_mikrotik_CCR2004-16G-2S+_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/template_net_mikrotik_CCR2004-16G-2S+_snmp.yaml
new file mode 100644
index 00000000000..1b3a412018b
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/template_net_mikrotik_CCR2004-16G-2S+_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:01Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: ab871d051e304f83950171c5243aa4db
+      template: 'MikroTik CCR2004-16G-2S SNMP'
+      name: 'MikroTik CCR2004-16G-2S+ SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik CCR2004-16G-2S+.
+        This powerful and affordable router crushes all previous CCR models in single-core performance. 16x Gigabit Ethernet ports, 2x10G SFP+ cages, active cooling and the best single-core performance per watt & best overall performance per watt among all the CCR devices.
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: b74cbfd6dbc84c0c916402c81fb11fe9
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 6172f360bcca4bc6a105a5093be8665c
+              expression: 'last(/MikroTik CCR2004-16G-2S SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR2004-16G-2S SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR2004-16G-2S SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 3c8159ac8de24685be689387f69e0e20
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: cc917e510e004211be5fc624b071fc95
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 80072866ba994094a279eb45020311d1
+              expression: 'last(/MikroTik CCR2004-16G-2S SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR2004-16G-2S SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR2004-16G-2S SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 4776598588384d30ac472ec39df3ef25
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: d66d2b488b784574943c90f20d0153ce
+              expression: 'last(/MikroTik CCR2004-16G-2S SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR2004-16G-2S SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR2004-16G-2S SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 0260f825e71e419da953e2f6285318bc
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 49b860cd17af4bed904651fbe620d533
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 4a339ee32bc047a790562e1d17c4f733
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 02a8b7e7ebbb4d1baf5ee155167e36ba
+              expression: 'min(/MikroTik CCR2004-16G-2S SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: fac0b2a001034a888731ce9ff4d0a0b1
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 76c25cbcbd7a415e821917887b552440
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: a81f9bcd4d4d4c4593654293b55f864d
+                  expression: 'min(/MikroTik CCR2004-16G-2S SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 1695386899b54ad5b5b3e9268f323801
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR2004-16G-2S SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: b1f40fbc259f44db830072b49a5825ad
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 69c3af5ff75f4a6296f6cecd8c8259ba
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: ac0cfe319121487fb2009436d27f4f2b
+                  expression: 'avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: c1c53cec6a204411b9739eac84447c2a
+                  expression: 'avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: f0d3f01db5d44b74826326048bca05a8
+                  expression: 'avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: f65e9753464a4521bb8a537daab08a5b
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 44c8106b4f174854962a97a5fe3fc3c8
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: dbfb3ba672c944149aea12b3f4a1cdbe
+                  expression: 'avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 8c4ffcc25b254dc29928ac1ac0272b7a
+                  expression: 'avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: df1aa24cf39947528099405c6cd311f4
+                  expression: 'avg(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR2004-16G-2S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 33669092f8b542fea3911e23337feb2f
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 338524bc1bdf414686576671882b5f68
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: f929a190e2624171a7a4b80919ae025e
+                  expression: 'max(/MikroTik CCR2004-16G-2S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 2fd85f6131924caeb2e73a630c7970e5
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: dff7058dd39f4cb294533048160b3b75
+                  expression: 'max(/MikroTik CCR2004-16G-2S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: e2133a97d7c4406e9b708c31b1ad691f
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: e57c17fcddd04bdf921a9f1b6151ccb2
+                  expression: 'max(/MikroTik CCR2004-16G-2S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: f52a4a4442894479bfd0f9acf9b92945
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 95e376a33c1642c9a7d33b40bcda3389
+                  expression: 'max(/MikroTik CCR2004-16G-2S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 6c9bc962ee1040c8b1c0a3b3d2353b61
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR2004-16G-2S SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CCR2004-16G-2S SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CCR2004-16G-2S SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CCR2004-16G-2S SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: ac44d8d2afa445aa9684549d0d951a3a
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: deed4c15fd03467ba270ef2476dbdd44
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 85cdb71f2f184c73baef88358c86fc27
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e77874f460dc4a8580c63076388af10c
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7d033a3bf8644f3aa7f66dddd6d45f44
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 1f70e9c256b64e698affb2216d124d24
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: f072c431d2e24b84bfd3eba28cebd3fc
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: cac2679f249c41cab8047a266b63f685
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: ef0f673527f4462e9728ef06b73d9e99
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 455d7ff186ae4990a1d60a8c3c165344
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 2e9d6f80bfa445beb64b4d5b17125800
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 569c6b51c3714d84bce3522093e442a6
+                  expression: 'last(/MikroTik CCR2004-16G-2S SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: a03cd6a56cd540dea337b63f8ca5a1a1
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 6a9a5fa133dd4b1c9e4fb2f21a5ec905
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 8b2f31738f90436b984801b4cef65b66
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: dbc682e6a824455db742449efb76b4cf
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 8ddf161b19eb4716b1ec7cb270970703
+              expression: |
+                last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 0a19983ae1d443bbb4224a61d46b62de
+              expression: |
+                last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR2004-16G-2S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 90c58f1e92914a32a4189f0029a5a5fc
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CCR2004-16G-2S SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CCR2004-16G-2S SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 7b8e1c45b866470fb94ead58b60e852c
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CCR2004-16G-2S SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/README.md
new file mode 100644
index 00000000000..6f415d226e7
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CCR2004-1G-12S+2XS SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik CCR2004-1G-12S+2XS.
+
+The Connectivity Router - your best companion when it comes to SFP, SFP+ and SFP28 management! 1, 10 and 25 Gbps ports in a single device to make your life easier.
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CCR2004-1G-12S2XS SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CCR2004-1G-12S2XS SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR2004-1G-12S2XS SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR2004-1G-12S2XS SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CCR2004-1G-12S2XS SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR2004-1G-12S2XS SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR2004-1G-12S2XS SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CCR2004-1G-12S2XS SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR2004-1G-12S2XS SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR2004-1G-12S2XS SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CCR2004-1G-12S2XS SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR2004-1G-12S2XS SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CCR2004-1G-12S2XS SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR2004-1G-12S2XS SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CCR2004-1G-12S2XS SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CCR2004-1G-12S2XS SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/ccr2004_1g_12s_2xs
diff --git a/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/template_net_mikrotik_CCR2004-1G-12S+2XS_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/template_net_mikrotik_CCR2004-1G-12S+2XS_snmp.yaml
new file mode 100644
index 00000000000..8d1e03e7a68
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/template_net_mikrotik_CCR2004-1G-12S+2XS_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:02Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: f2efeb94f4bd4ed9ab34a973c0363eb8
+      template: 'MikroTik CCR2004-1G-12S2XS SNMP'
+      name: 'MikroTik CCR2004-1G-12S+2XS SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik CCR2004-1G-12S+2XS.
+        The Connectivity Router - your best companion when it comes to SFP, SFP+ and SFP28 management! 1, 10 and 25 Gbps ports in a single device to make your life easier.
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 9f94a0e5d26b401d84ca8a58b8121f2e
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 324d699f4767400e88e16f37ffcd2abd
+              expression: 'last(/MikroTik CCR2004-1G-12S2XS SNMP/system.hw.firmware,#1)<>last(/MikroTik CCR2004-1G-12S2XS SNMP/system.hw.firmware,#2) and length(last(/MikroTik CCR2004-1G-12S2XS SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: be05eb6603df4b2b974319c0b90dd543
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: c147284d49cb43b3950a28de281cf4a0
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 53e8fc3eac46426fbce375cc2ce983c8
+              expression: 'last(/MikroTik CCR2004-1G-12S2XS SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CCR2004-1G-12S2XS SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CCR2004-1G-12S2XS SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 1da1f71f2dfd4c9ca450217a07068872
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 2a0736cbd3324122b51c4ac4629c1323
+              expression: 'last(/MikroTik CCR2004-1G-12S2XS SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CCR2004-1G-12S2XS SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CCR2004-1G-12S2XS SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 4b1df0f8bebc443398bdb240a7a30db5
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 370e2a4ed66f4cc8ba31abdcff08598f
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 8fef22e8a7e0484b8e4ca48b66b322a1
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 8246aab86f954be8968169f55889a842
+              expression: 'min(/MikroTik CCR2004-1G-12S2XS SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: d006aef2136542aab3e97092fff6ba09
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 76e284355196457393427df6475672c4
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: bc2854ed0ff645ae9a932ab5baa62a91
+                  expression: 'min(/MikroTik CCR2004-1G-12S2XS SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 13064af8424048bca2e925c4bc050700
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR2004-1G-12S2XS SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: d135fc6382b74d1dac9287de6140adda
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 0da61f3ed2b64dd0b261e56e55e52e29
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: b3d35f977375429a8a0f4b76dabf294c
+                  expression: 'avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 3be96603ac0a474694bf53d2b8aa8487
+                  expression: 'avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 809c702cedf749b6b53f591ee37c56ba
+                  expression: 'avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: db3d7ea3f60f4e4fa53156f9ae87b651
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 6e122ae0407044ad9359fd2ce74b5897
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 973e5d05599c4ee79d8cc210b004f38d
+                  expression: 'avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 58c9f09a52ed48f7b65a4ab6a7b19c35
+                  expression: 'avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: cfb884d37884407fbba3f93515020352
+                  expression: 'avg(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CCR2004-1G-12S2XS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: d7d673db00e445b98ed9109f51f4a16e
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 93cb7e4e0fd2443d9c1c3ae472200980
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: f5bf9d28bfb344728e481a3a478c6986
+                  expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 32087595f17c44d9b94d7762ef427ba5
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 0b427fe9c54d486792c9388b8c2968cc
+                  expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 5a65177ee82a417f924cffbc6a92b593
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 130cdbfb721646ef92c6c1664dffce72
+                  expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: c42347e1e0e046b68f557ce011be1886
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 2df17dc1ca8f4d9fb135c23f86fb50d3
+                  expression: 'max(/MikroTik CCR2004-1G-12S2XS SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 2d92488ff5874fbb9b13065df937a315
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CCR2004-1G-12S2XS SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CCR2004-1G-12S2XS SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CCR2004-1G-12S2XS SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CCR2004-1G-12S2XS SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 99450e2d4e3c4dfb8e1b7c28430cdebf
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 7be1291f79874e29aee64798671a6c80
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7ed23e95f7144fddb4f7c5797ea462b9
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7d94a281ff544e5bbabd0d41f3672174
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e184a832057f43b6bdacd2b6f3cb0c0a
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 8c7307d75f5345dfb389cfad66cb88aa
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: f69f464b8b59471f808b43772e1f5f4e
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 8012ad63d0e24bf0bfddc428389384de
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e6e8db7c216d41fcbfd28845c541255d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e272eecff3f343eab7b6641e6429c47a
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 024d36a1f48f4976848bdfff2ee18fba
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d1a52557a4f746da96893c3d1436b3f2
+                  expression: 'last(/MikroTik CCR2004-1G-12S2XS SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 2d71376139af4ae9a723edde527f5373
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: c84b3754fea94a91972a12d024a7ea34
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 2b54aec93faf4db280732db48075ff49
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: d02b3ec6c2d3489da7c29e85996d1a7c
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: dfcf03d83fb147b18be991b65d2298d6
+              expression: |
+                last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 95f44fd2b533449593e2095edda00fc9
+              expression: |
+                last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CCR2004-1G-12S2XS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 379200cf5dd64fcf8986b18d9ecc4cd5
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CCR2004-1G-12S2XS SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CCR2004-1G-12S2XS SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 9bda3903ad57436e831cfabedbf8295f
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CCR2004-1G-12S2XS SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/README.md
new file mode 100644
index 00000000000..44d983325dd
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS106-1C-5S SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS106-1C-5S.
+
+Smart Switch, 5x SFP cages, 1x Combo port (SFP or Gigabit Ethernet), 400MHz CPU, 128MB RAM, desktop case, RouterOS L5
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS106-1C-5S SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS106-1C-5S SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS106-1C-5S SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS106-1C-5S SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS106-1C-5S SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS106-1C-5S SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS106-1C-5S SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS106-1C-5S SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS106-1C-5S SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS106-1C-5S SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS106-1C-5S SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS106-1C-5S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS106-1C-5S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS106-1C-5S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS106-1C-5S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS106-1C-5S SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CRS106-1C-5S
diff --git a/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/template_net_mikrotik_CRS106-1C-5S_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/template_net_mikrotik_CRS106-1C-5S_snmp.yaml
new file mode 100644
index 00000000000..63a5f688835
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/template_net_mikrotik_CRS106-1C-5S_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:06Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 20ea139663264c21bca0dcecf2e95589
+      template: 'MikroTik CRS106-1C-5S SNMP'
+      name: 'MikroTik CRS106-1C-5S SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS106-1C-5S.
+        Smart Switch, 5x SFP cages, 1x Combo port (SFP or Gigabit Ethernet), 400MHz CPU, 128MB RAM, desktop case, RouterOS L5
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 1a2326a0d3884a679d05e4430f24f9cd
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 6739b5af597443449dcfb946d2b89393
+              expression: 'last(/MikroTik CRS106-1C-5S SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS106-1C-5S SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS106-1C-5S SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 2c11a09561a447949a86bbb75b9b7b08
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 8d750b95502a462dbca47ff6aacd24da
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: dfc2b8c7f27049a6bd51c283cc6a29ce
+              expression: 'last(/MikroTik CRS106-1C-5S SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS106-1C-5S SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS106-1C-5S SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 4f4d1445451a41758afc06ba2a287805
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: dc48fc089a314b7ebae646f2dfb925c5
+              expression: 'last(/MikroTik CRS106-1C-5S SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS106-1C-5S SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS106-1C-5S SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: af7785e1221c4c458a333189d70208a2
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: ecb4ad0744b04ad9a9e650012e394e6b
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 2a8f4c7d1c52496093779c4a70e01668
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: fdcc98f2475247f29fdf48c3a4a69058
+              expression: 'min(/MikroTik CRS106-1C-5S SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 6ac6410ae08249bf9c726821804aa003
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: bb72b4f6a895437a9eaf0d36a3ad5b68
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 08ca4ad1230144488299a8f4eaacef7f
+                  expression: 'min(/MikroTik CRS106-1C-5S SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 9be53d92e0294bd095ee45b175187503
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS106-1C-5S SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: a3099e04128b4ff7abbd6ac772306bc5
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 4dcd1df8ddf147c7b6dfd406ab6b6a6d
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 3f1ce913660a493387485d5dab3ebfc4
+                  expression: 'avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: e7a78d2798b44c438a81c308d1a1c0ed
+                  expression: 'avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 890865ebc7ea41ef8e9d3c794395092b
+                  expression: 'avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 255e1f84524643ea8d827ad0492d5a73
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 461a7262a99f43cf99856fec3482dab7
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 0c035a51301746588e0bc01bb0bf425a
+                  expression: 'avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: efc19507ca614ef487d0a9a637a8f7a6
+                  expression: 'avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 54b7d721900742acbb1548714c34c7c2
+                  expression: 'avg(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS106-1C-5S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: bd83bc1bdaf54b2595e8199219a6fa48
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 018eedc3f8c1435e9fad6581baaf6870
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 9c9bab7ccb354d478ae1d5f7ab66f5ea
+                  expression: 'max(/MikroTik CRS106-1C-5S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 9bb9bc5e259d40c0aca83914d08385d9
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: f44e31574a68494cbcefbc961662063b
+                  expression: 'max(/MikroTik CRS106-1C-5S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 9ef5ed92e2e84b309dd05b862646970e
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 9ebee838e00c46bba067094ea9732f6d
+                  expression: 'max(/MikroTik CRS106-1C-5S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 44f45954c01d4aa4bec812cb70bdedc4
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 90fc1e486dd9409aacf0f68f86caf80c
+                  expression: 'max(/MikroTik CRS106-1C-5S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 512de641fee14826b8c0f7c3d16e176f
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS106-1C-5S SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS106-1C-5S SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS106-1C-5S SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS106-1C-5S SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 2319b534a79449108a419e8c866e66bd
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 5f92245ccdad4191980caa0b44b24a56
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 71fbf20e2ec8495c920df331edd59f11
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 59b84a7a0419432fb0651a86e437c88a
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 62208faa28fa42bb8444408f054b1a90
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f1966c50faf640539d3c3bbad1202b4a
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 032c67a20a064ca180eb0f23a43a67ea
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 8af73d5a781a4bcea86ef627eecc90b6
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7c86d11f26724fbc820aefb5c8a5f036
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e8bc0e639cc342eda083157fe6a0e187
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: ae5b708b4a044e81ac6f5be93762fed9
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 2e15eff553614e51a59590c6e3df4a42
+                  expression: 'last(/MikroTik CRS106-1C-5S SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 6378383173b54dd4add56b5b8b3a6e49
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: c958dc4fb8b54d6c809b69478f92a991
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 341aa7a1559c4af48c2a8b5446930f2f
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: d0e6479c9b004f8b95fe47f197779b82
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 6a2a5c6ce51b4f6b912a01e45d1a5409
+              expression: |
+                last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 0df7d927286d47998fcf15c41bce944f
+              expression: |
+                last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS106-1C-5S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS106-1C-5S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: a58c6530ebe04f54ad52abca0629ca3d
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS106-1C-5S SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS106-1C-5S SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 68f84aa153e54bc29be28a81d70f99e8
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS106-1C-5S SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/README.md
new file mode 100644
index 00000000000..1518d9b7817
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS109-8G-1S-2HnD-IN SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS109-8G-1S-2HnD-IN.
+
+8x Gigabit Smart Switch, 1x SFP cage, LCD, 802.11b/g/n Dual Chain wireless, 600MHz CPU, 128MB RAM, Metal desktop case, RouterOS L5, supports 10-57V, 802.3af/at compliant
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CRS109-8G-1S-2HnD-IN
diff --git a/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS109-8G-1S-2HnD-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS109-8G-1S-2HnD-IN_snmp.yaml
new file mode 100644
index 00000000000..49283cc5980
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS109-8G-1S-2HnD-IN_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:07Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: fac16383680c4454be48b6db870d975e
+      template: 'MikroTik CRS109-8G-1S-2HnD-IN SNMP'
+      name: 'MikroTik CRS109-8G-1S-2HnD-IN SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS109-8G-1S-2HnD-IN.
+        8x Gigabit Smart Switch, 1x SFP cage, LCD, 802.11b/g/n Dual Chain wireless, 600MHz CPU, 128MB RAM, Metal desktop case, RouterOS L5, supports 10-57V, 802.3af/at compliant
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: af43dfeeeb7c4f2ea7636e3409e70f1f
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 07248a02609a4964be773df77f86f30a
+              expression: 'last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 74bfb7d4834a499a8946c8275012ee76
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 13fa6f235afa4f968f9de61b0727dced
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: a79318151008414cb9a0c3d788b76f76
+              expression: 'last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: b6e1b6013d3b41c68b4a0cc85bb539d6
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 829598b7b1b4404bbd959ae186734251
+              expression: 'last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 53c2b19776d14395832025f398d613eb
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 644de67163d14fe384128d7a89780d09
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 9b69a0a71c2a410783d8275a732b800a
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 7f44b9ee964f4ae798f3af4c12799e12
+              expression: 'min(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: b65b318fff444191b92f52c023bdee21
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: abec452fb1d54a13819afa0449a6c91d
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 37579561f5e74042827d0d3fc5dc85e7
+                  expression: 'min(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: f5d0c8258423411d86e9daf1a14418b1
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS109-8G-1S-2HnD-IN SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 0c527e54de0f40d28c01d597cee2b37c
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: e65a3b598bd64bbfaf434ec1549d0ef6
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 50a28d8380d64feca6fb2691e2477fed
+                  expression: 'avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 6bd9170284ef49b4825cf347e1f43548
+                  expression: 'avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: ccda9a03941b42b0ac184e22aa23666c
+                  expression: 'avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 5afeb3e22aa4479ba0f2cfde3e39155a
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: ca23bb18b5df4e9f9f447b27ff453c1a
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 2c4b897afc03484fb7e435af025ac9a3
+                  expression: 'avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 8de55e3f0a2d46f69d430362b208654b
+                  expression: 'avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 5d4582baab9b4b98ba6d6e3e78678280
+                  expression: 'avg(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 1040b8ec32f947d4bfce2fba18d7caae
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: ced1ce9c4d494243810034ddad5cb1bd
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: b3abf2a74b1444d7af3cdfc8ac550ec4
+                  expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: b6cf57437c7043a584ebb8376d658ef4
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: e3300b34a9f34bbd91af48f5b8e89d9e
+                  expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: a68c39fc6e4248d9b6b073a67f58f4ac
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 7a06e44d440b4b85ad3b102fccf24309
+                  expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 46d0b195b09e4def9ecce5f0d306add9
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 6950612291f84d1d805b2f250c133096
+                  expression: 'max(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 8099417bb7b44a5da8e0d7d05fc3c6e4
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS109-8G-1S-2HnD-IN SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS109-8G-1S-2HnD-IN SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS109-8G-1S-2HnD-IN SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS109-8G-1S-2HnD-IN SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 64ab5419005745f68eb2d06b0e48c6ac
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: c0a00ab0bfa543988d32114409df5dc5
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 5d4556364513438399429334cc12f3d6
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 689e40655841450b9b8c91595a26774a
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: bac9f6f2692348348abdc29cc4ead952
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: eb067e2b305642599ad39cacac524902
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: f02ad98b3cb94232b322c4b66683e4b7
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 3ee889778c50431ead46cafe033b6945
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7666985eaeca4e78b03e8097acb39ca5
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 6717ff0736644482be60d2dc2a6b6f1a
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 175056db73b443acbc16e9943cb83660
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 68fac07f6dd045ba8040c7fe813bdf2e
+                  expression: 'last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 8c2a6cde808244e3b99408f942095c5b
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: e12df58e65b94ae7b63f56f745d85857
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: e1fe51aa353d4808bce466924ccfc280
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 6169a9872cde47b7888e6e2c3b8f90cd
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 463c460bdff441ce9af1ea170ea4dbc2
+              expression: |
+                last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: a758c3e0841e4fff93ff4bcaa41505eb
+              expression: |
+                last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS109-8G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 1ef7e8e42a954db4b7293a080a00bc9d
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS109-8G-1S-2HnD-IN SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS109-8G-1S-2HnD-IN SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: f06f354dfd2b4ca881efdece1f8ed149
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS109-8G-1S-2HnD-IN SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/README.md
new file mode 100644
index 00000000000..bc1c5137f69
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS112-8G-4S-IN SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS112-8G-4S-IN.
+
+8x Gigabit Ethernet Smart Switch, 4x SFP cages, 400MHz CPU, 128MB RAM, desktop case, RouterOS L5
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS112-8G-4S-IN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS112-8G-4S-IN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS112-8G-4S-IN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS112-8G-4S-IN SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS112-8G-4S-IN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS112-8G-4S-IN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS112-8G-4S-IN SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS112-8G-4S-IN SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS112-8G-4S-IN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS112-8G-4S-IN SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS112-8G-4S-IN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS112-8G-4S-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS112-8G-4S-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS112-8G-4S-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS112-8G-4S-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS112-8G-4S-IN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CRS112-8G-4S-IN
diff --git a/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/template_net_mikrotik_CRS112-8G-4S-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/template_net_mikrotik_CRS112-8G-4S-IN_snmp.yaml
new file mode 100644
index 00000000000..8b0cd498877
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/template_net_mikrotik_CRS112-8G-4S-IN_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:09Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 8d7d49fd0b3f4b1f9046dc0e94457931
+      template: 'MikroTik CRS112-8G-4S-IN SNMP'
+      name: 'MikroTik CRS112-8G-4S-IN SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS112-8G-4S-IN.
+        8x Gigabit Ethernet Smart Switch, 4x SFP cages, 400MHz CPU, 128MB RAM, desktop case, RouterOS L5
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 5c3719bbbd424403b78d73824fdb45aa
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 6729f53f42ff445c8ab26b91cdb811e2
+              expression: 'last(/MikroTik CRS112-8G-4S-IN SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS112-8G-4S-IN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS112-8G-4S-IN SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 35142b0597a348838f0f77cf7c11266f
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 0a2b5f7921d74498bb1761e5bb773dec
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 24e52c80e5544295b778c677d0de35b2
+              expression: 'last(/MikroTik CRS112-8G-4S-IN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS112-8G-4S-IN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS112-8G-4S-IN SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: c98293d0ebe844d390474d48a937d0fc
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 8846801d462142938e7e0683dd481087
+              expression: 'last(/MikroTik CRS112-8G-4S-IN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS112-8G-4S-IN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS112-8G-4S-IN SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 545eb326fcd94bbcafd561824f1759db
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 8a6c7605ff3d45c092dff46fdc9fa1f8
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 8b8c952075db4ac6884cb0b352a75496
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: d9f9ee61646a4881bcb34a5e564738f3
+              expression: 'min(/MikroTik CRS112-8G-4S-IN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 58462afd23c44a788d49469d4ba5f5b4
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: d44241dbf0384aaa85346f42720497a4
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 9fc63b1881da411baea0e78cd671606a
+                  expression: 'min(/MikroTik CRS112-8G-4S-IN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: f3bb0b7df1904d698e1ec9e5c6b1254d
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS112-8G-4S-IN SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: b3042bcb96014348a57d25cd12829795
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: f720cbe0adb243c5b66f303bda66dc5c
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 9ab9bb63b838495f863feee9d62fcb72
+                  expression: 'avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 1f68799afde34df49dd0d693872aa19a
+                  expression: 'avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 21a3e86813114562a8e382bd3120030f
+                  expression: 'avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: fc23fc78ca3145798b76216070acb4d5
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: e78b76cc8a864070b275f1e82d5a0cd0
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 52e3b8b493eb4ab09bacb707ed7454ab
+                  expression: 'avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 00ed3d5d280f47a1b20073e87f6ec6f0
+                  expression: 'avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 0e8120688a774b63823848119deaf4a5
+                  expression: 'avg(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS112-8G-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 2b33d07e9e4049feb9344a226d019e5c
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 678ca89bd7f7423e8e2d8d6dd21f7992
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 4d8a166e4cc8442c87c2989fa87b8e1d
+                  expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: aae34986ae5f4641891454a28570a71c
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 1affa10b3e2d477c92951193292f57d0
+                  expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 6b3e94493e3d4e2fa5a02850646131f2
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: bb085163f97341259cd0d42e38c1685e
+                  expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 7e0266ca1918400abb2acfb74cb1208f
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 4b214d3637994c89816ef4f951ce8828
+                  expression: 'max(/MikroTik CRS112-8G-4S-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 68b35ab5b6314e7c919cbcb7a6a5983c
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS112-8G-4S-IN SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS112-8G-4S-IN SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS112-8G-4S-IN SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS112-8G-4S-IN SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 813fcc3573204df59efc2f4c83a14402
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 5062d6176d4c4ede829fb7679e093e56
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 57f9dfd940c84045a71a0d3032ec408b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7219178010374790b7d121431223a50c
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 423a6fa257f14693b5669a663fbaa184
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 5deabb9273f74a60bc5d869c8a744060
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 3e5cfaec61a145a3b6dd2236da486408
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 8685d4c133e146d19389698719a19d6e
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 54a475089c49498ea96d0e063b37f678
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e69f18d991704f349e551e0f4024e685
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 787f088f58794997b39d55864ffcf25a
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 9b32c491ea3d41bca60ab53c664ee369
+                  expression: 'last(/MikroTik CRS112-8G-4S-IN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 0b14bb3471344128b65c76460c69edcb
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: b40d1fecfb4d45318642012a60debe15
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: a659baef4d94473caa9cfe962d04ffd9
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: f0584dd985664955b7513c97cce54f83
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 572cb48de9bd4010b907cff6efa9f3a8
+              expression: |
+                last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 10639cc4b8de4879a99c70061d5d48ea
+              expression: |
+                last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS112-8G-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: a3cb6c6211b745469b2e42d7f10d2fda
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS112-8G-4S-IN SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS112-8G-4S-IN SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: c16ba646be654f1ba85a9fa5955e15de
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS112-8G-4S-IN SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/README.md
new file mode 100644
index 00000000000..1568d6e3347
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS112-8P-4S-IN SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS112-8P-4S-IN.
+
+8x Gigabit Ethernet Smart Switch with PoE-out, 4x SFP cages, 400MHz CPU, 128MB RAM, desktop case, RouterOS L5
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS112-8P-4S-IN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS112-8P-4S-IN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS112-8P-4S-IN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS112-8P-4S-IN SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS112-8P-4S-IN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS112-8P-4S-IN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS112-8P-4S-IN SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS112-8P-4S-IN SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS112-8P-4S-IN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS112-8P-4S-IN SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS112-8P-4S-IN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS112-8P-4S-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS112-8P-4S-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS112-8P-4S-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS112-8P-4S-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS112-8P-4S-IN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/crs112_8p_4s_in
diff --git a/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/template_net_mikrotik_CRS112-8P-4S-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/template_net_mikrotik_CRS112-8P-4S-IN_snmp.yaml
new file mode 100644
index 00000000000..cee8311b0f6
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/template_net_mikrotik_CRS112-8P-4S-IN_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:11Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 538ec67ce01341a9b281dbd86d86d2a2
+      template: 'MikroTik CRS112-8P-4S-IN SNMP'
+      name: 'MikroTik CRS112-8P-4S-IN SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS112-8P-4S-IN.
+        8x Gigabit Ethernet Smart Switch with PoE-out, 4x SFP cages, 400MHz CPU, 128MB RAM, desktop case, RouterOS L5
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 23de7a030b324ae2bee4fa96d6a724da
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 0f66010aec32455eb56414c1ba576982
+              expression: 'last(/MikroTik CRS112-8P-4S-IN SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS112-8P-4S-IN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS112-8P-4S-IN SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: c41bb4d7171b44aca3656092aa2b12b8
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: de134343b324455c9e17396c75aac869
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 59c929b470d342b691b01b5d12f87456
+              expression: 'last(/MikroTik CRS112-8P-4S-IN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS112-8P-4S-IN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS112-8P-4S-IN SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 709a68530d314d448fbf9f9339af594f
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: c9fb96d72f6942d1b4320014b2e40b0c
+              expression: 'last(/MikroTik CRS112-8P-4S-IN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS112-8P-4S-IN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS112-8P-4S-IN SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: d80810c2936846d9b037f5e9d00eb6f6
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 82807a05026644379df67c28026b9696
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 7bfd8141f2d34548a16f73ff7bb665eb
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 72863d07fe654e78b740e2f48e0cebe5
+              expression: 'min(/MikroTik CRS112-8P-4S-IN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 1a85ac0568c2458f90a90cb7a0642370
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 768094b0e66b42beb95b8f67003b1650
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: a2148ac68e78401c81ea5ef66cddc04c
+                  expression: 'min(/MikroTik CRS112-8P-4S-IN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: f4d14cb6ccdd44ccb5e43d449baa8d65
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS112-8P-4S-IN SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 50423572f0824002b674a005262086bb
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 0e27fff5b5264b7dbaf9b3bd6babebeb
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 0e9494a8018f4943a84c1e6b6304439f
+                  expression: 'avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 6877c6d086354b5eac351ddbe1dc5656
+                  expression: 'avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 608d5359e01148a2b8dcc507a11f5ea3
+                  expression: 'avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 715783a411ee47bb9cca13c7ef7b5938
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 078f3735ac0d4403b539c27a77284658
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 5eff445458ec4f2f9b9b9085f9487f7d
+                  expression: 'avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 3d9498b115df444981717267ccbe926b
+                  expression: 'avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: c3b94c3a222746cc9f88c5f44c3e882b
+                  expression: 'avg(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS112-8P-4S-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 4ec79e9f9a65495eae664a3b8a503978
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 5993db957ee9482d8145eb73f9e47d4f
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d3b264a57365416ba32dd5ee7f3b2c72
+                  expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: ccfcd108155b4d359388311b7d74c988
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c69186a3c737437696414d1d1c434a3c
+                  expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 9e9296bb427c42828eede79f5ec62c1a
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 8179d0962048402c9843878c34f3a45c
+                  expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 53fd3660ee2b45eeadb7300962bb1ac4
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: fdb14600d90a448a83bdc51dd170296b
+                  expression: 'max(/MikroTik CRS112-8P-4S-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 5cdf7db912de4880950b91606659976a
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS112-8P-4S-IN SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS112-8P-4S-IN SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS112-8P-4S-IN SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS112-8P-4S-IN SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 67a4605912ca4fc0a37325b87e637600
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 1cd0e51853ff4209a21912f6ea9bd1b6
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 73bcd9521b2e4a13898d1dab0632e76e
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 332f17f8800145088ea65fbd56bcc355
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 5d3d6f97506b4fc3a5cef2c6a03cdbaf
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f74d9c3ed71c45bb910f08bcb0fb3eda
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 5ace2ebfb2734287abf9d361fedfb4f3
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 22afbe0ad8394eb4a37788884df98278
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: d171d2cc8f774581ac7bb39ec8749bcd
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 2527a7e7306640dc83a0c810a9ff248c
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: a1f9dec23d75439b9d47670c93881360
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: f60557875559490a891eb81c11e0cf37
+                  expression: 'last(/MikroTik CRS112-8P-4S-IN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 1c4b3868273546bb8d2a95f30cc9d1ed
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: edc44941d5e449b4ba5400e3c614861d
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 1fe1c3ed7e1d413e9c5717f7bc511845
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: bffab5765d194dd6a8f74b5b40f2ec8f
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 2e7f4f0eaf384c68acaf1bafadc6296a
+              expression: |
+                last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 380f830e3e714a99b9c7b30c1fbce14b
+              expression: |
+                last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS112-8P-4S-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 3923f122da254a36b7c89cf96d85dc02
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS112-8P-4S-IN SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS112-8P-4S-IN SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: f68d99090e0c421288deee125650eba0
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS112-8P-4S-IN SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/README.md
new file mode 100644
index 00000000000..674f5ec778a
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS125-24G-1S-2HnD-IN SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS125-24G-1S-2HnD-IN.
+
+24x Gigabit Ethernet layer 3 Smart Switch, 1x SFP cage, LCD, 802.11b/g/n Dual Chain wireless, 600MHz CPU, 128MB RAM, Metal desktop case, RouterOS L5
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CRS125-24G-1S-2HnD-IN
diff --git a/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS125-24G-1S-2HnD-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS125-24G-1S-2HnD-IN_snmp.yaml
new file mode 100644
index 00000000000..03fdab4b426
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS125-24G-1S-2HnD-IN_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:13Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: c8db153405704d859ba5ee19f08b46f3
+      template: 'MikroTik CRS125-24G-1S-2HnD-IN SNMP'
+      name: 'MikroTik CRS125-24G-1S-2HnD-IN SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS125-24G-1S-2HnD-IN.
+        24x Gigabit Ethernet layer 3 Smart Switch, 1x SFP cage, LCD, 802.11b/g/n Dual Chain wireless, 600MHz CPU, 128MB RAM, Metal desktop case, RouterOS L5
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 2fc0c608418046d0bbfc371f5f8d8c22
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: f0c59541e6df4c649e7c2ef76d7bda4b
+              expression: 'last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 6a3ca4bce4da4e8eb6a15a2dcf51bce1
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 589cacbe509547bf944f7c8e3a518c7d
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: a1cf2d27ddc447988aa808318aef167f
+              expression: 'last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 31fb56c30de1477bbe69306c2b9e3d69
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 9bfebd1764bb4acc82fa8c7f175c0b87
+              expression: 'last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: cb66968d87fe41a2ad4c5cb769849be4
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 62b4597135824686b5de3cd51fcd46f4
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 414bec3767eb49c39bd67a135f60ba02
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 9af92a1dddd0405587bb090b8fd5757d
+              expression: 'min(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 6d574937fd7e47c8ba7da4fc7df2b812
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: bbf74ce8d13f4b3eb6e3a949f9fc95fc
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: c06050c48eac4f8f90df94c6d125f369
+                  expression: 'min(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 7af56504cad442c68f801cbfff17952b
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS125-24G-1S-2HnD-IN SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 4001b2da26774319b5e8754eccb9ace6
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: e998ed1fcfc7498a873448c59d912f48
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 9f6533c6505948abb10869f4d0a11070
+                  expression: 'avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: e683521cc3de43eaa7c8ecbbb360fb7d
+                  expression: 'avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 2d1bba8f19694737a6cb59e12289327c
+                  expression: 'avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: fd1e16940eef4715906c2f8241df141e
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: b9b599a6f7d746959af746bf348c3c45
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 8db96c9e7d164b0fa6d2af61899ea427
+                  expression: 'avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 33c12e280a464d20960ae73341ea3dbe
+                  expression: 'avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 4fa5ef5d55fd4fc8a21516dbfb0ff7eb
+                  expression: 'avg(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 6da207d2ffa84756a676fa7e7bd19e40
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 28a57925dbcf410287cc33e680208531
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: fd43c6f8ed834db3a69e6c30c29878ed
+                  expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: bf05683ec6bd4882af965c5671bca4c8
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 685f5eba5ddd4b2ba3173fc82367b476
+                  expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 39b0a1c4d5134fb7a2a6bd114278a773
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 4a4f14e171504413ae16d92597fe1024
+                  expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 250f123915b94618b4af6aa4166f6e9a
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: ed070d7bccb649a49b29eda9b8a02192
+                  expression: 'max(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: efcb23bafcdc48f1b64090c437c18799
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS125-24G-1S-2HnD-IN SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS125-24G-1S-2HnD-IN SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS125-24G-1S-2HnD-IN SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS125-24G-1S-2HnD-IN SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: e6a361bc321a401dbcc3a362799d450a
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: cbaec92328d34e08a4c168961cfc8833
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: ede61f7e21cc41e2abe7e8931aef6b95
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 3ce1884489f4482a887756abf92248e5
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 56bdd3739b874e8db259ac6e4736affb
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f952b47d2a4e4f2991db17dd89e79f24
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: a2e92faea0da45b59a9dd254440c875b
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: dfcc5d5ab4584fd48ea22b5f5e00e8c6
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 6509bb0c5e044c0580398ca99b768b75
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 8661f6e91dbf4d9a93785f07157eec93
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: ec83a91a8b284f3a9137c8c4cf36a9c3
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 89940e123e8c4c04b402a436c977d999
+                  expression: 'last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 6b80e43f0d004ab4baeb51a772d91457
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 929ef695efdf4e60a2e47cc0be74e69c
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 1c12733c14eb45a8bb36b3fcb8ef7ce7
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 6202b55760514c64832b9df48828c344
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: e5df295edd2848329708aaf765a8e8be
+              expression: |
+                last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 31ff4cd8ae95435193ecc37238327c4c
+              expression: |
+                last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS125-24G-1S-2HnD-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: e4d5a4fb28804aacb284c58ce3b8cc09
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS125-24G-1S-2HnD-IN SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS125-24G-1S-2HnD-IN SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 468ff969bf854e30b118c517caa85d82
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS125-24G-1S-2HnD-IN SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/README.md
new file mode 100644
index 00000000000..de105334356
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS212-1G-10S-1S+IN SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS212-1G-10S-1S+IN.
+
+Smart Switch, 1x Gigabit LAN, 10x SFP cages, 1x SFP+ cage, LCD, 400MHz CPU, 64MB RAM, Metal desktop case, RouterOS L5
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS212-1G-10S-1SIN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS212-1G-10S-1SIN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS212-1G-10S-1SIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS212-1G-10S-1SIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS212-1G-10S-1SIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS212-1G-10S-1SIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS212-1G-10S-1SIN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CRS212-1G-10S-1SplusIN
diff --git a/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/template_net_mikrotik_CRS212-1G-10S-1S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/template_net_mikrotik_CRS212-1G-10S-1S+IN_snmp.yaml
new file mode 100644
index 00000000000..92844448c5c
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/template_net_mikrotik_CRS212-1G-10S-1S+IN_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:15Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: cdb6ebceb1174bada392dd24889b14d9
+      template: 'MikroTik CRS212-1G-10S-1SIN SNMP'
+      name: 'MikroTik CRS212-1G-10S-1S+IN SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS212-1G-10S-1S+IN.
+        Smart Switch, 1x Gigabit LAN, 10x SFP cages, 1x SFP+ cage, LCD, 400MHz CPU, 64MB RAM, Metal desktop case, RouterOS L5
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 86226852333f4573b461e7283ae93c8a
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 70a98e004bd34fb48e9c410ca52f4bc0
+              expression: 'last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: cf0cd44044154f0097685ac4da1e0f6b
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 3ec9f238ffa643c28011036ece349c2e
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: e4da63844b774f4eb9e0188f659f256d
+              expression: 'last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 8ebce52c1fe045ef9e774aefb3359667
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 9f738a1caee34259a3d38e52ddb6c791
+              expression: 'last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS212-1G-10S-1SIN SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 1ca1d02815cb46dba0b2b27de86cd1d4
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 891105963e744b8283682a5e4520347b
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: b78b6b52884148f6b925e99b418f1838
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 640203769816409d883d5ba38a6ff4e5
+              expression: 'min(/MikroTik CRS212-1G-10S-1SIN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 17aca6820fbf4ae3b7c0bbd36ae191a5
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 0617289aa301456381283c8d42ca6edb
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 087f5705a7ce4a88a8c699541ee704be
+                  expression: 'min(/MikroTik CRS212-1G-10S-1SIN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: acbf5458996a46428574c0a90df0958b
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS212-1G-10S-1SIN SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: dde29665f66f4a74bda66ffe6896b8e8
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: f3302ebef61b469898e0f37ac3607723
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 8aa17694ab184951b24093d8a765eae0
+                  expression: 'avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 3c33429067c84714b68c4bbd8f729bc7
+                  expression: 'avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 100002ca08614467b16f313dfeda6e68
+                  expression: 'avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 1b64317c196f4a31b8c7dfd614b285a7
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 412e6077aaed46bebb182343f1b97023
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 757ac3b43a62450f9e49885dd654167f
+                  expression: 'avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 71f8b72b4c7240a8a4e10b503a2aec9f
+                  expression: 'avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 818f218a8ee3455db507dcded146c3ea
+                  expression: 'avg(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS212-1G-10S-1SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 708e4d3595004248a8acece9641eb4d6
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 7e39549bb6e34cefbd03c9f789ff5f83
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 6a8f6966f59a45e48a68f0343c372973
+                  expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 7486c89623e34e8a84d51df4ea38347a
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 0b4661e442014e21a98e56b8b332a6ba
+                  expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 8b1a41af48da46e5a0c37e78a68127df
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d04782f202c44772b039867d744582de
+                  expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 0c18873c93914367a7aa54156964e0f8
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d8d6a75db4de4ff7b8b2f4ab1f8d7258
+                  expression: 'max(/MikroTik CRS212-1G-10S-1SIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 52ae7c9217d64fc89821768bb16df21c
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS212-1G-10S-1SIN SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS212-1G-10S-1SIN SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS212-1G-10S-1SIN SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS212-1G-10S-1SIN SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 05c6b3cfcb15488d801fcfbd2df1d68c
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: b306260935274f8b93476cce0f740da6
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: fb5bb87dd9ec4ffd8ac9745dd7e5e698
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: a0576fd0cfbc47d3a48d651dfed2cf7f
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 29464ad001e944e2a007e9b6aedf07ca
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 9f93a69ba465474b8ff554e9017de788
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 9e73e76f915e447191c77ffa452d3a38
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: aa139caf38304d84b98a905b2d1f246a
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e5b5cdbce91946e38b4d194c3bc645c1
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 847ad6413af94fe89bf6d4f78a1fc449
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 3cc43df83ca24a50b44e8b6d899d29ff
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 6dfee746a74b4f96b103202b00ed3720
+                  expression: 'last(/MikroTik CRS212-1G-10S-1SIN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 2d496a1a38a14321bf35adf43537dce4
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: be9283a19af84ddb9cb2c9475d4a7170
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: ad99f629e6e94c8abad0215c9a914907
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 9c2accea5a7a488ab6ebc3dd31f3e797
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 2e330eb1ac0a4427ab150c2f1c3949b0
+              expression: |
+                last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: ba3b9fe3bb7041c5a2e7d9fec8bed517
+              expression: |
+                last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS212-1G-10S-1SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 712ea2b949224520bcde3bc03428d21e
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS212-1G-10S-1SIN SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS212-1G-10S-1SIN SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: c8af9bb0fa0f47d1a1ee3a36d346483f
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS212-1G-10S-1SIN SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/README.md
new file mode 100644
index 00000000000..ab320ae4de8
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS305-1G-4S+IN SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS305-1G-4S+IN.
+
+Five-port desktop switch with one Gigabit Ethernet port and four SFP+ 10Gbps ports
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS305-1G-4SIN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS305-1G-4SIN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS305-1G-4SIN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS305-1G-4SIN SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS305-1G-4SIN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS305-1G-4SIN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS305-1G-4SIN SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS305-1G-4SIN SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS305-1G-4SIN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS305-1G-4SIN SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS305-1G-4SIN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS305-1G-4SIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS305-1G-4SIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS305-1G-4SIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS305-1G-4SIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS305-1G-4SIN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/crs305_1g_4s_in
diff --git a/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/template_net_mikrotik_CRS305-1G-4S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/template_net_mikrotik_CRS305-1G-4S+IN_snmp.yaml
new file mode 100644
index 00000000000..b176aff101c
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/template_net_mikrotik_CRS305-1G-4S+IN_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:17Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 223101f878704022a04c30c3ff066e3f
+      template: 'MikroTik CRS305-1G-4SIN SNMP'
+      name: 'MikroTik CRS305-1G-4S+IN SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS305-1G-4S+IN.
+        Five-port desktop switch with one Gigabit Ethernet port and four SFP+ 10Gbps ports
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: a90c400056634a4b8e1befa2b5868e1c
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 66ea5bdabba4438ba8f9959e0c4b24ec
+              expression: 'last(/MikroTik CRS305-1G-4SIN SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS305-1G-4SIN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS305-1G-4SIN SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: d1a55ccf0dd640439c149672d9f86c11
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 4ab55ba9cf82449a8b683ded8c691a11
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 425777ce38e54daba1f6501bd4f6bf6b
+              expression: 'last(/MikroTik CRS305-1G-4SIN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS305-1G-4SIN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS305-1G-4SIN SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: dcb3f5f1561543959e170e62e61f1457
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 73aec359593a4ce9ae07e66a39ea2275
+              expression: 'last(/MikroTik CRS305-1G-4SIN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS305-1G-4SIN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS305-1G-4SIN SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 4cf79d752ffe4eeeb80db78bd1f39813
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 4682ebaf961d4782b7447de52646dfd4
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 805237bf56894386acfc37c7f38ad907
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 179753654a4849d48935c10417994eb7
+              expression: 'min(/MikroTik CRS305-1G-4SIN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: dcc0b3e7e4304c27b9156deb1fb56781
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: d6a562ef91ef4c608232e2d0f98dfcd9
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 295ec169c36b482790f9091db3a39357
+                  expression: 'min(/MikroTik CRS305-1G-4SIN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: aec4c254cd944a1f8ac6bc911e6ab77c
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS305-1G-4SIN SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 1805474bc45841be9203aa4431c6e5f6
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: c1d7c3be659d46b79a6122a3b07053d1
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: ae05e13963974301850e66f5e4f33a2c
+                  expression: 'avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: f5b55111b94e427082a07baa856bb4fb
+                  expression: 'avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 1e19d78e1b394165ab9dc6da8c072ab8
+                  expression: 'avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 13c315f3af5747deb5590a52d979f2df
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 6915ae48936a4ce084412df12c92b80f
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 588874bb24d64ca6b10179eab36fa7c2
+                  expression: 'avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 40cd8afdf46a4d03aa426cedd7ce7d9a
+                  expression: 'avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: ae2260c1ecdd44e48e72d43ce1936222
+                  expression: 'avg(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS305-1G-4SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 87ca6cf207f147bc926d521530449c81
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: ae2ffeed2a7749dba00ab3a2b65d4091
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 1e1893cd271a4b1f9d04afb520cd6925
+                  expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 9e1d91dcc55b43b9a9a33a50e08f7037
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c045d57678f4478cb6caf5fb0a80d0e9
+                  expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 45cb37b6dcb64115b7fc021359f5e2e1
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 8125b0058dfd42e786bcf3cac7ab4c88
+                  expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: da44c19b868a41058a5c91792e4153b0
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: bf70869515ec4c35814efa05b8305403
+                  expression: 'max(/MikroTik CRS305-1G-4SIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 15a4213a18ae489f8f11aa948a075e68
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS305-1G-4SIN SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS305-1G-4SIN SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS305-1G-4SIN SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS305-1G-4SIN SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 5db9feb9d197453aaafd348c3d525f3c
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: f07162a9b65f4b8ba99e9ad37ea78141
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: c57390f8e3764add926431b9b6351ea0
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 4723a555cf1e4c179e9af54cd8c7ca10
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 0004683dd9e84d3b92bb5f6b5304bb9b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b4e81fbbecf2479798c604c3514b25d9
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 26e3b6942ca64f0ca17080a7149d695c
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: bc35de18a55042b2a090d3bdaa87029c
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b06f561f915f43c198d4fd011ea676f0
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f14009a9bae64d0ba293f710149ca764
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 62ae5c6fc3504346b37b997798bd635e
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 9b78a081991540cda9aad21e6255b632
+                  expression: 'last(/MikroTik CRS305-1G-4SIN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 94d8fa584eef4573acc2861060902fc1
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 32902345efc2483d86aa7dfd2d02d6c0
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: afec00d5d90c4386b2d32c03f22a6374
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: b3bb874134804e9f8370a774867715bd
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 7589fe3f0e3e4c26ac21cd314b1c07e7
+              expression: |
+                last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 30977d9643d6482c89fe5a08030c559a
+              expression: |
+                last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS305-1G-4SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 7924cfc798e048918fc496133557bea2
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS305-1G-4SIN SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS305-1G-4SIN SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: cc0355295c4545f08e2499321ac6a787
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS305-1G-4SIN SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/README.md
new file mode 100644
index 00000000000..0263899bf71
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS309-1G-8S+IN SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS309-1G-8S+IN.
+
+Desktop switch with one Gigabit Ethernet port and eight SFP+ 10Gbps ports
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS309-1G-8SIN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS309-1G-8SIN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS309-1G-8SIN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS309-1G-8SIN SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS309-1G-8SIN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS309-1G-8SIN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS309-1G-8SIN SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS309-1G-8SIN SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS309-1G-8SIN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS309-1G-8SIN SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS309-1G-8SIN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS309-1G-8SIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS309-1G-8SIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS309-1G-8SIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS309-1G-8SIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS309-1G-8SIN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/crs309_1g_8s_in
diff --git a/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/template_net_mikrotik_CRS309-1G-8S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/template_net_mikrotik_CRS309-1G-8S+IN_snmp.yaml
new file mode 100644
index 00000000000..dc0ba1e391a
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/template_net_mikrotik_CRS309-1G-8S+IN_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:19Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: bcc01f2b466345c4bcbe0cea1a7884d1
+      template: 'MikroTik CRS309-1G-8SIN SNMP'
+      name: 'MikroTik CRS309-1G-8S+IN SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS309-1G-8S+IN.
+        Desktop switch with one Gigabit Ethernet port and eight SFP+ 10Gbps ports
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: a66560b690d544ef8fc657812a602157
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 32127aca202644c5915255006e9544b5
+              expression: 'last(/MikroTik CRS309-1G-8SIN SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS309-1G-8SIN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS309-1G-8SIN SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: c8239bb961ee453da2885a8abef9be34
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: df405f764813407eb03d6f7a6308c5cc
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 7bb01da1713c42c1ab28c1ae2adc1260
+              expression: 'last(/MikroTik CRS309-1G-8SIN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS309-1G-8SIN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS309-1G-8SIN SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 55775fa17c604dddb86c7644556830e6
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 28568c2163ee4a0aa262241064922c7d
+              expression: 'last(/MikroTik CRS309-1G-8SIN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS309-1G-8SIN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS309-1G-8SIN SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 14aff8f369f9440aac2110a4a52e7eb5
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: cbe45fbc0f9e4b1a94966ccb859463ae
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 03626c0f7cf24394b47f24a1af36dcd0
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 7224d01c717a4dd3800fbd8d8e9399b8
+              expression: 'min(/MikroTik CRS309-1G-8SIN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 3c978b9c2e4c4c01b7ec7ce7af02f27a
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 521d764377654b93816ee70e8c80fc0a
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: d6343a3648f0493bb786d598a8e51ab4
+                  expression: 'min(/MikroTik CRS309-1G-8SIN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 00464f2edb3f47cdbd60b0801ffeff2a
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS309-1G-8SIN SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 8afd22083a1343cf81d947e42516583e
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 165ef578bc8144c79e3bb23cf9aece72
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 6b909503dc46413fad04d4cf4d7b6939
+                  expression: 'avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 94833673685645f68729a8f98b5a213e
+                  expression: 'avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: aac8de5837494421a642793cc5a9009c
+                  expression: 'avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 24e13986d6224173bec425a3ca2562fa
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 9909cd00a6a24e7693bcee846e806bd2
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 3d4dc47de9db4049a4baebf68df16b1e
+                  expression: 'avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: cf105fee78774aa7ae119f2638528423
+                  expression: 'avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 1bf28981db8d414199c3fb7bd20e669a
+                  expression: 'avg(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS309-1G-8SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 9acd8e04d272467c8c1cd0452068bf93
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: f07ac80125fe425bb87aeb409ae198db
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c27c37092c5f48f1944417cbd47f6c25
+                  expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: a418c6b3e88f45a398daf2c0fc529d13
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 9525ed0ec7bb426587ffcf4879590d5b
+                  expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: e0659a14e4c14779a02bc4bd5fa2b8cf
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d7c501de314140aeb2b6f344bad2c501
+                  expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 2fe3fa0e2ec84a098add91a09ff9332d
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: f124b3bbba784fff966adef3c722eb70
+                  expression: 'max(/MikroTik CRS309-1G-8SIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 2c2721344ed74562912a7c7526f84314
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS309-1G-8SIN SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS309-1G-8SIN SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS309-1G-8SIN SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS309-1G-8SIN SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: fe6101d8772d482e999e0351c40ccbd1
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 918507201ca94b3284d3ea0790e5dfcb
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 2cac58114b934cd4bf6738db973f04e7
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: eb1304a13add439b8a0eba33f0be85bd
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 9135865a5f6341449f661b2effe38c19
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 10ca39f536ec49e081e0edc5c0b2972f
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 2b6a52cd5f1b4786a6176b4ea11887fb
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: a736f4197c594f10b144ca1775111d1d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 17646c7e68fa4733a8ecccd3321513c5
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 3c0beda9dfe0447f953a3be51fba7e48
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: d327bafe453345468ed568b30c3c0ca5
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: aa16e2906256441bb0c6680e9c95f547
+                  expression: 'last(/MikroTik CRS309-1G-8SIN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: fc051342ffd646fd86702f89ad9da14b
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: e7e62890c210420882a04af7dd07cde9
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 9bcda8136943432eaedfa8ed80dd48e7
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 19b70b4990ca4813a0237a5bd6b8915b
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 2d873bbec47d4b3281b1aa33c87c60a0
+              expression: |
+                last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 6bab52e75f8e4286a7c4ec7336a4d417
+              expression: |
+                last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS309-1G-8SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 9a733d07f30643769872935987fbbc14
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS309-1G-8SIN SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS309-1G-8SIN SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: ae3d51bc351f4da7a17565928cfe6e0b
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS309-1G-8SIN SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/README.md
new file mode 100644
index 00000000000..9f8b8265978
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS312-4C+8XG-RM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS312-4C+8XG-RM.
+
+Switch of the future: the first MikroTik product with 10G RJ45 Ethernet ports and SFP+
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS312-4C8XG-RM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS312-4C8XG-RM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS312-4C8XG-RM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS312-4C8XG-RM SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS312-4C8XG-RM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS312-4C8XG-RM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS312-4C8XG-RM SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS312-4C8XG-RM SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS312-4C8XG-RM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS312-4C8XG-RM SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS312-4C8XG-RM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS312-4C8XG-RM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS312-4C8XG-RM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS312-4C8XG-RM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS312-4C8XG-RM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS312-4C8XG-RM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/crs312_4c_8xg_rm
diff --git a/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/template_net_mikrotik_CRS312-4C+8XG-RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/template_net_mikrotik_CRS312-4C+8XG-RM_snmp.yaml
new file mode 100644
index 00000000000..b664c79ed44
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/template_net_mikrotik_CRS312-4C+8XG-RM_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:20Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 8da94e2f01ff46e28becf0b08ff09ace
+      template: 'MikroTik CRS312-4C8XG-RM SNMP'
+      name: 'MikroTik CRS312-4C+8XG-RM SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS312-4C+8XG-RM.
+        Switch of the future: the first MikroTik product with 10G RJ45 Ethernet ports and SFP+
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 7befae11c37c415c821465a2b923d901
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 58b860a92baa43158419a843ae89687f
+              expression: 'last(/MikroTik CRS312-4C8XG-RM SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS312-4C8XG-RM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS312-4C8XG-RM SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: f533de2af2824b30a43995499f5ec467
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 4cb71c3fa0aa4ca8aa4c2c03a017a28a
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 54368f9d9e9f494ba55f8f5fac20196b
+              expression: 'last(/MikroTik CRS312-4C8XG-RM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS312-4C8XG-RM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS312-4C8XG-RM SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 1e0024446d5f4696919f3a246dda3868
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: dd39ada0b3b14009968866d766e9e16d
+              expression: 'last(/MikroTik CRS312-4C8XG-RM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS312-4C8XG-RM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS312-4C8XG-RM SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 06bdef85cb3849819a6fa43dfcdf7ba1
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 05b7592dca7744e39bbea87e73b6062c
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: f39b87bfab3347b1bc016a35aa58f1be
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: de55f957c95d404380cb490126f88e3d
+              expression: 'min(/MikroTik CRS312-4C8XG-RM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 9f244f13f1c346feb1852908e347a9ce
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 67bd6121ef4946ac9e73fc3974eb72ed
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 693899638cc1411a9f178cdf6d53b22a
+                  expression: 'min(/MikroTik CRS312-4C8XG-RM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 57470db47a7543ae906b1a567f31b0df
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS312-4C8XG-RM SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 0ea5fe1af3f14c258407cdcf5c8492cd
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 99d748b7c76e4ea493784fd62348cc55
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 9084cab74227494d9ebd02ea9a4309d2
+                  expression: 'avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 5dc37a79bb254104a9a46383b14b0e3e
+                  expression: 'avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 35fd07bdd3d84ccab6172255af3989ac
+                  expression: 'avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 0b6e7345eb5d48ce88d577f1023a7479
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 1e429d1a498044d3b95d2a73db924f77
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: d26213a8d92e4845a7767a0a7fe340b6
+                  expression: 'avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 47e2acacb8414731b56ec86e1a9e3e3c
+                  expression: 'avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 69c54b6ef3a04343bd9df41153398067
+                  expression: 'avg(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS312-4C8XG-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: e3d529ed5a1b4d89b156e1a2bdd73905
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 41ac19f7e4d2423e8211517127be3e4e
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 6e805c219d884cb38bcd51dde95af1a4
+                  expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: fdffd7bb090b4acc85692c0fa113aed6
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 93ca96ceac4043fbbd88004165d94c3a
+                  expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: c8b7cde011cf45efbfbdb54a99f7afb9
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 0f7f11abdba9495fa4fa33ad1a872244
+                  expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: ce8dc75d99944f88afc937e1025f4bcc
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: da0b1d4940d64a5c9b96c83600cb4963
+                  expression: 'max(/MikroTik CRS312-4C8XG-RM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 6223ee7e40ed4b0ebfeb64a48d8401b9
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS312-4C8XG-RM SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS312-4C8XG-RM SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS312-4C8XG-RM SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS312-4C8XG-RM SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 174a070e450a4b6a851e6f774cea0496
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 0b0aa41ec369423ba346cf6c9f7c9075
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 40aa76b4a7e74961a20a6891e5084fa6
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 34e0b4d61e954c5598df74624eec7de4
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 4484896071184e62992201bf6590ed4f
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 2fadfc227fbb418f9d0bccf1af2a871c
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 009b58f603c74f66a5341db132e489ba
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 9ad3feaeee5f4663b598e95e18fd81e2
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 2938eec3c8dd4dcf931d52d64191a68d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 43db9c3fcc074d4d8c9d041ed0d40ade
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 231504212d1a4f688a35b77014e9ef20
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: b885a22b88114ea7a275f0758d82210c
+                  expression: 'last(/MikroTik CRS312-4C8XG-RM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: a52c622d98b643dfb67459f5b6b63e3d
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: ac51787aeada4d6596deee43a66818e8
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 8b12975b2d1f4c03adce5fd9aaacd8e2
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 4445602fc420442db98c58cd28d68b46
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 49a1cefb001c47bbae541e71673d5eb5
+              expression: |
+                last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 5145ea5e4fb04f9c9dfc90d61ca65d1b
+              expression: |
+                last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS312-4C8XG-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 71de1b81db87432bbd66eafdc123e767
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS312-4C8XG-RM SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS312-4C8XG-RM SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: a586c06ba9ad4299a4f26cde5c14478d
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS312-4C8XG-RM SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/README.md
new file mode 100644
index 00000000000..9b51f163016
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS317-1G-16S+RM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS317-1G-16S+RM.
+
+Smart Switch, 1 x Gigabit LAN, 16 x SFP+ cages, Dual Core 800MHz CPU, 1GB RAM, 1U rackmount passive cooling case, Dual Power Supplies
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS317-1G-16SRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS317-1G-16SRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS317-1G-16SRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS317-1G-16SRM SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS317-1G-16SRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS317-1G-16SRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS317-1G-16SRM SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS317-1G-16SRM SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS317-1G-16SRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS317-1G-16SRM SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS317-1G-16SRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS317-1G-16SRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS317-1G-16SRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS317-1G-16SRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS317-1G-16SRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS317-1G-16SRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/crs317_1g_16s_rm
diff --git a/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/template_net_mikrotik_CRS317-1G-16S+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/template_net_mikrotik_CRS317-1G-16S+RM_snmp.yaml
new file mode 100644
index 00000000000..65c732b963a
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/template_net_mikrotik_CRS317-1G-16S+RM_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:22Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: f474ff823fe84d689b9e4c6a4f0ce59e
+      template: 'MikroTik CRS317-1G-16SRM SNMP'
+      name: 'MikroTik CRS317-1G-16S+RM SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS317-1G-16S+RM.
+        Smart Switch, 1 x Gigabit LAN, 16 x SFP+ cages, Dual Core 800MHz CPU, 1GB RAM, 1U rackmount passive cooling case, Dual Power Supplies
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: d2ae97a860254ce8935a939ad715d583
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 0d646e6c03f14c259b81862187a6eec1
+              expression: 'last(/MikroTik CRS317-1G-16SRM SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS317-1G-16SRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS317-1G-16SRM SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: bad88a688384478b841c24f935d5c3a1
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: dd694bbf5faf4c7a8a30d5ffd817b678
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 992d3bd742224ad7abc375d20e60e1af
+              expression: 'last(/MikroTik CRS317-1G-16SRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS317-1G-16SRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS317-1G-16SRM SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 2906c09ebcc34c908a6ab8530804b67f
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: b3e063c9221d4bf69acb21a16859bb15
+              expression: 'last(/MikroTik CRS317-1G-16SRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS317-1G-16SRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS317-1G-16SRM SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 6417f5bc08084fa29f2dab421c5093fd
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 01618781ca974f5e8b1bf58b65092038
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: ffee597574084c638b668fb11a735962
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 95ac8c277d8940ecb1545be2dc514c54
+              expression: 'min(/MikroTik CRS317-1G-16SRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 43a205f5dd7d4874a68c1a9930f43260
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: c510805ee348445b851bc93e95daf8f6
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 9e5d5b925a5c42a2af13b3a6727a4cb9
+                  expression: 'min(/MikroTik CRS317-1G-16SRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: cd07ebaa31e84139be82ee2f018656ca
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS317-1G-16SRM SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: d7dee0d21034492e80cd52070f242131
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 48068386e2fa47afbac7f41fd8c36a72
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: ba13b39c8a6146bf9b3b6d46fb71fcc6
+                  expression: 'avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 3a469cd75bac4782b18aff3011c766b3
+                  expression: 'avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 11f6f7f659a445e7930b7ab3532a8ebb
+                  expression: 'avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 33b7e69a7e3b44548c14b5d290518d23
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 2ba207937e5146adaa5e02903ae70b8b
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 3392f74fc5974701b62673f5c51700d4
+                  expression: 'avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 0e4acbc3bad54347a362cbf57c0464e3
+                  expression: 'avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 42c7cd22b6c74fc7b36f5b6593db02e5
+                  expression: 'avg(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS317-1G-16SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 3824e4d95d2d47ea858f7885d3fadbb8
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 161f4066cd2d4cc393afad6bac50dcc5
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 027b0481f1de4967973208e3477c0094
+                  expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 3728775b43bb4fd9927cc83b31441e73
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 7dc5c0d4f77441a5a29239b1aa77d00b
+                  expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 25aeaf59b6a446428d81743da8fad36f
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 95d3868b6d1c45629acc756865cf6f78
+                  expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 5696d89760ef4e168e79a68c9503a752
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 94cb13b08f4f46c2bccd3b5ac22ccb3e
+                  expression: 'max(/MikroTik CRS317-1G-16SRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 3691a1aa1379413ea25118524890d3be
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS317-1G-16SRM SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS317-1G-16SRM SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS317-1G-16SRM SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS317-1G-16SRM SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: d4d7077e3d1c45de8320982d2d2757f7
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: a5b2a6adc309482f8f4ae0ac696b6188
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 1f5889a3511e423eba944249026cade2
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 116c9e2164244af7ac233192cc2c0fa8
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7f66614630514280a2e4694f601527e1
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 6a1710f2a57546bbb825fa30dff7dfc6
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: ca977ba6126442d2b4fe511ccf78c021
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: fa5d5e176fd540299ef75d4a9693ed09
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 1bdcdd568543421e8e5cbd953698bbd2
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 8ea83d2c84144a209c0ed5592207027c
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 8525fbb691d4494b8e03eb7b1b4a7ecd
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 1317af27066547e2a07f2dd27923e22b
+                  expression: 'last(/MikroTik CRS317-1G-16SRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 9164b9995cf2443189314c8177353070
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: d710a862bf0043aca18a6c961320ecba
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 20ca55174f764308933c395b1f8c25b6
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: b1293070b58b4859b3cc730a08e24f1c
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: ee1e3d1444c947d2898cf120dc3fc53f
+              expression: |
+                last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: a6f92ac3ee824ef486a82f441fb60a67
+              expression: |
+                last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS317-1G-16SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 94e91ae74ed048fdaee82856f500f28b
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS317-1G-16SRM SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS317-1G-16SRM SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: bc108737d87842138ef5e53d50950722
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS317-1G-16SRM SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/README.md
new file mode 100644
index 00000000000..4d08812c4dc
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS326-24G-2S+IN SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS326-24G-2S+IN.
+
+24 Gigabit ports, 2 SFP+ cages and a desktop case – server room power for your home!
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS326-24G-2SIN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS326-24G-2SIN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS326-24G-2SIN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS326-24G-2SIN SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS326-24G-2SIN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS326-24G-2SIN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS326-24G-2SIN SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS326-24G-2SIN SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS326-24G-2SIN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS326-24G-2SIN SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS326-24G-2SIN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS326-24G-2SIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS326-24G-2SIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS326-24G-2SIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS326-24G-2SIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS326-24G-2SIN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/crs326_24g_2s_in
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/template_net_mikrotik_CRS326-24G-2S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/template_net_mikrotik_CRS326-24G-2S+IN_snmp.yaml
new file mode 100644
index 00000000000..3cb431bee9b
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/template_net_mikrotik_CRS326-24G-2S+IN_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:24Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: c5f41fe0f54f470f9e304384838f150a
+      template: 'MikroTik CRS326-24G-2SIN SNMP'
+      name: 'MikroTik CRS326-24G-2S+IN SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS326-24G-2S+IN.
+        24 Gigabit ports, 2 SFP+ cages and a desktop case – server room power for your home!
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 8da4bc75729549f8ba60c5edd47f1419
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 65e43afe1d04447fb334d5efbd76c185
+              expression: 'last(/MikroTik CRS326-24G-2SIN SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS326-24G-2SIN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS326-24G-2SIN SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 05352d9bfb6d48b682c4d5e23ff28daf
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 19bfda7a644b462880226d790eebd154
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 3a3ac7e0d5fc4feca67eb2447fcbcf34
+              expression: 'last(/MikroTik CRS326-24G-2SIN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS326-24G-2SIN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS326-24G-2SIN SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: aca36fae2c2f4856a8cacf7348a31b54
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 2f18268819414337aca3f919343d6577
+              expression: 'last(/MikroTik CRS326-24G-2SIN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS326-24G-2SIN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS326-24G-2SIN SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 2ee29a6f60eb45fdb1193283ed54e7bc
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: aef42cabe6cb4c8dbb0c6cea532c6a3f
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 0012d55c993c43f4b620e282a9799cd8
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: cfd67344627840a081d286d8188c0888
+              expression: 'min(/MikroTik CRS326-24G-2SIN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 55e1dad7a38743f2ba0ba1546a55638d
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 602f38f90f3545adbc070d035539ec8d
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: d9f63d9be04940949d9dd655cf1a7bd2
+                  expression: 'min(/MikroTik CRS326-24G-2SIN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 5add7060d926465da9707003ba6e69e7
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS326-24G-2SIN SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 69bb93aca6c140959ad2ddd484a774e7
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 987908255779438fa44009e8cc021daf
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: bf5e439b3dfe4a5b82df00c0ed291895
+                  expression: 'avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: bc428b5477294722a18477dc061a59e9
+                  expression: 'avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 21aa13901d7449a39f64a41cb151d687
+                  expression: 'avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 2298f69eb20647468f92dfee2740d653
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: b22c36030deb4143a6843bfeb3ea1ebe
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 0a2cde44b8ea45178e0859ae7c1125e5
+                  expression: 'avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 0379f91f1b4e40d1b35c30ac538a8b61
+                  expression: 'avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 7d4b709e7b5c4e9aa68a9c6f8df69e75
+                  expression: 'avg(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS326-24G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 94742faea5cb4922af607bcf66494c75
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: fda8316e54e2457492d19ad3f0fdefba
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 4ae567c4a5be46a4a1a135a5f61aece8
+                  expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 9b636bb8baa54fec808391d5387affb1
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 1e6aca20d3c140f69580920d37820c9a
+                  expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: ce63b34ac4ed4e98af2e9cf165fd4edd
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 65a6c1de5d8e4a4d8857a4b97fcb1a7a
+                  expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 2879b1fddfa3422d81f3d54bf10eeba9
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: df73d669f65940a79065915e11a3e3bf
+                  expression: 'max(/MikroTik CRS326-24G-2SIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: b19bb2dd693444b8b1cfc5b3e53ef8e8
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS326-24G-2SIN SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS326-24G-2SIN SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS326-24G-2SIN SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS326-24G-2SIN SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 4c8b8a486e7348c383f28ffcb4db6182
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: cc0acc56261542178aef0227e886a582
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: a29816c787c3404f8e2c2492b3c97fc3
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: da4acf2e97e44415951f9a22042e7722
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b6a61875bfbb47ad9e1ffc93f11f533a
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7c62e6580f44467e9d1ceaef77394a5e
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: c256b93e9a9d4c25a4c347ebd4ce87a0
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: da4b16ed30de474dac4a260b8d813f69
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: ae5c0adc6b05408ca1cf362d4c01eafe
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 321b92fdbbde4c5c91ca04c28861fe11
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: da85b9260e374c58946d337686158519
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 233fb21420794842b00c0fb12db86e51
+                  expression: 'last(/MikroTik CRS326-24G-2SIN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: d4eb86620709480a93c863cc4080ceef
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: ea8ea45343ad4b86bc67c631326b2b9d
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: bf9374d0427c4e5493752ee648ee5bb1
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: b8a263e710ad4864bd7406e637b44c21
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 3e07aa63774040ef9369b3280cae156d
+              expression: |
+                last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: caae865a278946958a38fa40a41f180f
+              expression: |
+                last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: ae2d847c53c14a619217843f10c9695e
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS326-24G-2SIN SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS326-24G-2SIN SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 1db45fd5a6664e6e954ba08a305faaa4
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS326-24G-2SIN SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/README.md
new file mode 100644
index 00000000000..097b1d4a6c3
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS326-24G-2S+RM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS326-24G-2S+RM.
+
+24 Gigabit port switch with 2 x SFP+ cages in 1U rackmount case, Dual boot (RouterOS or SwitchOS)
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS326-24G-2SRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS326-24G-2SRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS326-24G-2SRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS326-24G-2SRM SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS326-24G-2SRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS326-24G-2SRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS326-24G-2SRM SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS326-24G-2SRM SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS326-24G-2SRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS326-24G-2SRM SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS326-24G-2SRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS326-24G-2SRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS326-24G-2SRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS326-24G-2SRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS326-24G-2SRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS326-24G-2SRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CRS326-24G-2SplusRM
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/template_net_mikrotik_CRS326-24G-2S+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/template_net_mikrotik_CRS326-24G-2S+RM_snmp.yaml
new file mode 100644
index 00000000000..0cfa053fbf5
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/template_net_mikrotik_CRS326-24G-2S+RM_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:26Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: bc80883918ac4f879427ca145122b5cb
+      template: 'MikroTik CRS326-24G-2SRM SNMP'
+      name: 'MikroTik CRS326-24G-2S+RM SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS326-24G-2S+RM.
+        24 Gigabit port switch with 2 x SFP+ cages in 1U rackmount case, Dual boot (RouterOS or SwitchOS)
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: b6b5e17543b54d32a6efac05a346717b
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: f91e54b227304a688092ffcbabf88d41
+              expression: 'last(/MikroTik CRS326-24G-2SRM SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS326-24G-2SRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS326-24G-2SRM SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: da7d1bace5b84ec59f2a669c090c3b1f
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 903370300c154ba09796eaca48f5e54f
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: aeb6d1d52ee24d7393a4a5a31f7267fb
+              expression: 'last(/MikroTik CRS326-24G-2SRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS326-24G-2SRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS326-24G-2SRM SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 823e2b2060f64bed86d2a99d5e1487c5
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: be2544b8b967408288a750c82a8f9059
+              expression: 'last(/MikroTik CRS326-24G-2SRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS326-24G-2SRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS326-24G-2SRM SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: ef5f00c33dea46b59b756eda8bb62f26
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: da09619f39da49d59cf0125b45d567a6
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: ec6c40e7c02c49efbb7116bc6917b42b
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 4fbf859b65774291850b37f700945a36
+              expression: 'min(/MikroTik CRS326-24G-2SRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 4f4f6561dbaa4b89a77461a91339d552
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: d2396df3e96d472289886c54bbb6fca2
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 6b4d22ac23db45beb398d591a157782e
+                  expression: 'min(/MikroTik CRS326-24G-2SRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 355ef2168d414a4ebce1cc754e9f53e8
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS326-24G-2SRM SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 9c0018fd8715414887115820c3094146
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: f3670784a4e34fb6b9ed84c4c43998ed
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 519c8f4f6a62492fbf739c2303f76aa5
+                  expression: 'avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 4b2e16580fe6436aa3e37813c83fde98
+                  expression: 'avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 6cf5bdc92724485ba64f5d06b01f4656
+                  expression: 'avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 732470e573084fd6b7d27d99189004ba
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: ce36e933fd9146c29d9d46ebfef95489
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 2218bd775d8c421992346f40d0b38fa4
+                  expression: 'avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 093386c3b35f45bab6cea6d6396064b1
+                  expression: 'avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 17ac58cd999d49f1ae31bc6a9280f887
+                  expression: 'avg(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 846190a30b804bfda47b31796819f8fb
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 222211769ab340509fba69d8f354029b
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 1f7f8781515a44b4b12db1a162e9a8f4
+                  expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: f6c1350d1a694bae98bf59d862ac8f59
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 79166253631142cf87660a658c77169e
+                  expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 7242abcbe9314f23ac5512edbf4c39a1
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: e5d37873211c44aca51f7926a9b2add6
+                  expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: fc2d8f9f26da4e4abb625394e66b194a
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 51c15917a456414ca6fef2cc86156484
+                  expression: 'max(/MikroTik CRS326-24G-2SRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 97b0559a53d64cd1aa0e0dfd1720c15b
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS326-24G-2SRM SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS326-24G-2SRM SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS326-24G-2SRM SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS326-24G-2SRM SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 18f56223df0a415fb99869ba8a8ee514
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 36b565d6f34a47b29a859ca50a0b557e
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f4c638ed14314c8790e34b9e32ee6f17
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 2986ecfb1d7641289cd1aca79e1f206f
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f2ceea0e555440808c983d61d4cd620e
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 3f8622b3bd154ec5b2bf8fc75e35183f
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: c475a511980841b49b7615b93c873eae
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 8337fdf60e9b45c2b4c1a155d5b2603d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 6ecceab4ba1345708fa806542ce85051
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 9da88d1a5d3649f0ac023319f529026d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 2c0ffadf84784e20af33236fbe6aa763
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: e9057c50ee5148119a922bd170e7463f
+                  expression: 'last(/MikroTik CRS326-24G-2SRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 77cfcc80cb8d407ca178ba7b9e50f182
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 48fa37490d794fafaa3585510b4ebda9
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 306d4dbbacd949b58631f178937c667e
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 29c812f5a94f49a5a28690af05553bbf
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: c01561923734478abc70b7c02d2d9add
+              expression: |
+                last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: e53a74871f2b4fadb8ff206f348fc90c
+              expression: |
+                last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 228fb326e5f94c4f8df119f610be831f
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS326-24G-2SRM SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS326-24G-2SRM SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 33edde1a5a2946b9aef99e55e6bea4fa
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS326-24G-2SRM SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/README.md
new file mode 100644
index 00000000000..e83159c3403
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS326-24S+2Q+RM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS326-24S+2Q+RM.
+
+Our fastest switch for the most demanding setups
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS326-24S2QRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS326-24S2QRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS326-24S2QRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS326-24S2QRM SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS326-24S2QRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS326-24S2QRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS326-24S2QRM SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS326-24S2QRM SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS326-24S2QRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS326-24S2QRM SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS326-24S2QRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS326-24S2QRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS326-24S2QRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS326-24S2QRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS326-24S2QRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS326-24S2QRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/crs326_24s_2q_rm
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/template_net_mikrotik_CRS326-24S+2Q+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/template_net_mikrotik_CRS326-24S+2Q+RM_snmp.yaml
new file mode 100644
index 00000000000..c3556d4f0f9
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/template_net_mikrotik_CRS326-24S+2Q+RM_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:28Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: e7ed0e0cbd0b439394f6498ea90dc31d
+      template: 'MikroTik CRS326-24S2QRM SNMP'
+      name: 'MikroTik CRS326-24S+2Q+RM SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS326-24S+2Q+RM.
+        Our fastest switch for the most demanding setups
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 8ac79dd0cff146c9ae018a8ba626f9e7
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: db665e87151d441395fce421949a9bb0
+              expression: 'last(/MikroTik CRS326-24S2QRM SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS326-24S2QRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS326-24S2QRM SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 8b6f433b2de14edcb0efb036c562b090
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 484e12b0d4a24d19b9edfd300cfef958
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: a5e267a8584a4d099f0d36d30ce17d0b
+              expression: 'last(/MikroTik CRS326-24S2QRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS326-24S2QRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS326-24S2QRM SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 9c810b41d48243668158812fdfdea4f7
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 9fe8a423c0a8411191337e48818cd835
+              expression: 'last(/MikroTik CRS326-24S2QRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS326-24S2QRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS326-24S2QRM SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: b34dda68e02640f88df173b7eeab267f
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 561afbad2b3d4d20a3fbe9753abd8623
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: f605ea1480d947b3bad4d1592c215643
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: ef73c971f14444f18a8b0956c8bd5796
+              expression: 'min(/MikroTik CRS326-24S2QRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 315ea6f2b17e4bb5a019394e8cd50a59
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: aa3298d983b8462b86d3dde1e34130a5
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 887bf529d1aa43dbaec9a92a390fc0cd
+                  expression: 'min(/MikroTik CRS326-24S2QRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 22d8af79856d488a947501bb351d3431
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS326-24S2QRM SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 3b40ad0d38434b10a190ed2563b7ebee
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 50d3a1b778cc4981b069dffe98a21ba2
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 4ec904a360ff48668e5273ba4dd223fa
+                  expression: 'avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: c8dcfe797232437991ab8da001e9855e
+                  expression: 'avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 90cea4e309944224abe0052a9eeb2e59
+                  expression: 'avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: b606e130e79e4664892e94f25bbdb7ee
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 32fa64de0bb44217907a3f8ca6683036
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: b0718bee8c8d422683e5f9f2915a35c0
+                  expression: 'avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: bb57907f2cec4eeda6e7ace60d90a2f3
+                  expression: 'avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 7c1161969d7f490fba58d113a7cf9da2
+                  expression: 'avg(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS326-24S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: d7a8644f9af749afa7194b9bda688f74
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 85213524f70d47a98dd3067ad69bef9f
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: ce0b05960b714a03b34f626d262f410a
+                  expression: 'max(/MikroTik CRS326-24S2QRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: b51fb106f4724770b841a0f604655d2e
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: e97689431f51481db6836b937214a926
+                  expression: 'max(/MikroTik CRS326-24S2QRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: b7520a6b109a421b8d2c051751c62aae
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: de8a3e44f9494ae0b9506785386c0604
+                  expression: 'max(/MikroTik CRS326-24S2QRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: eb86d792431b41b0ad214e5ddf37cafe
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 4c4e3d9b71974e3192070aa344e37221
+                  expression: 'max(/MikroTik CRS326-24S2QRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 895e92a3343f40a393cfae577148bc73
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS326-24S2QRM SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS326-24S2QRM SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS326-24S2QRM SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS326-24S2QRM SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 5039dfabeb7c493c8f8fdc0e448f921d
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: ba279749a9a34c31b54c21c2ece7a277
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 96176e87857f422fae7e82eb10b75037
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 6dc6a1f0f3254cd89cc643796480e820
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 8ef96b8baa8b4e1187479213a46aca29
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 8dd35e2eedf545399834152eba4ac03a
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: cc00fd051776439cb2267611af6d9b9b
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 23dd58dbfcc841fd893869ecc3d8af41
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b73c3270404e4dd3a25bf128a6cc0ef2
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: fe0b8b2c15ef45b7b61a97e2624d40f8
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f5080d802e114edea1a74513cad65043
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 034fd6289a4a4d549ea927ae48d8b225
+                  expression: 'last(/MikroTik CRS326-24S2QRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 2117133adbd14de6beb78907eec23c77
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 418e091863284108b3db341b7d897430
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 0fde6656cbcb41839171e972e6fea8ac
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: a73e8eeae6044e6098e55abc93010a29
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: e6c0c2401c0940ef8edae9aa38aa49e3
+              expression: |
+                last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: d72e1d5537ec498788f6e7e57e18f65d
+              expression: |
+                last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS326-24S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: f93f28ba09be4fadac28a304b1050c00
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS326-24S2QRM SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS326-24S2QRM SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 1dae33c6c10340ffa674ad86d3eded57
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS326-24S2QRM SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/README.md
new file mode 100644
index 00000000000..02936695d08
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS328-24P-4S+RM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS328-24P-4S+RM.
+
+24 port Gigabit Ethernet router/switch with four 10Gbps SFP+ ports in 1U rackmount case, Dual Boot and PoE output, 500W
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS328-24P-4SRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS328-24P-4SRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS328-24P-4SRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS328-24P-4SRM SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS328-24P-4SRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS328-24P-4SRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS328-24P-4SRM SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS328-24P-4SRM SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS328-24P-4SRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS328-24P-4SRM SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS328-24P-4SRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS328-24P-4SRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS328-24P-4SRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS328-24P-4SRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS328-24P-4SRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS328-24P-4SRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/crs328_24p_4s_rm
diff --git a/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/template_net_mikrotik_CRS328-24P-4S+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/template_net_mikrotik_CRS328-24P-4S+RM_snmp.yaml
new file mode 100644
index 00000000000..dfe8d0620de
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/template_net_mikrotik_CRS328-24P-4S+RM_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:30Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: dcf88bca5aaf4123a10eb3daab28a9af
+      template: 'MikroTik CRS328-24P-4SRM SNMP'
+      name: 'MikroTik CRS328-24P-4S+RM SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS328-24P-4S+RM.
+        24 port Gigabit Ethernet router/switch with four 10Gbps SFP+ ports in 1U rackmount case, Dual Boot and PoE output, 500W
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: a4b55762b7ad446fa5c213883b8eebd2
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 98b8b373def34eec9e814c039dcfb20b
+              expression: 'last(/MikroTik CRS328-24P-4SRM SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS328-24P-4SRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS328-24P-4SRM SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: f5c605a329274039883a04e6993d1e22
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 1d0da69b54a24b938cc1e9b37163dca3
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: da1a900485be412996f607b9669daf83
+              expression: 'last(/MikroTik CRS328-24P-4SRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS328-24P-4SRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS328-24P-4SRM SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 8fe83ecd500341999fc23e74d61dcf6b
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 41ec834afc7a49409cc9996459b15452
+              expression: 'last(/MikroTik CRS328-24P-4SRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS328-24P-4SRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS328-24P-4SRM SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: f79fd8f841404f88aa130513c8264e27
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 05cfdd5f009843a3a2b80939fb6f773d
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 26765cfd258e46d18c3d085c170c1004
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 86bc4c3dbd024d8d84a90f25fa8c0932
+              expression: 'min(/MikroTik CRS328-24P-4SRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 06ffa927f56746138f8bb938b1875c51
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: f9f2d060eebe444f893916e756f10d41
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: dfedf883e0e043a8924796421d0836da
+                  expression: 'min(/MikroTik CRS328-24P-4SRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 50d486acb91e4c3d801caa22b74d46d3
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS328-24P-4SRM SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 318eae7c977a44f9b24891376cefc129
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: ee1b96c22a8d4d87bbd8cdd28ff75859
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: cc60802009c449eaa49992f38c176f8c
+                  expression: 'avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: f83dac15be7a4f6a891406fe1e307074
+                  expression: 'avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 7044f89f39fd4fa7ba1bc790e86fc960
+                  expression: 'avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 4376a8c9a1d94d9da621d66f41546644
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 4ee4e5b2384e48bd86df5e6f26d37e84
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 2cc0f3a6c39340b78e6b1795b90ee052
+                  expression: 'avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 5f460952122241d5900e83f68e097e32
+                  expression: 'avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: e729643fce2d43d8b5de5a5f3d0fa184
+                  expression: 'avg(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS328-24P-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: bcf3a43092af4746bd6260c0fbc0961e
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 98abf29563eb46bfabe324973333e806
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: de98377f082840a0929e2f9024eb873d
+                  expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: c9ffc4c45804499aa820715d6d939448
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 4cf201a794cf48dfbaf574a04f8111b6
+                  expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 26a591c37a114fd8bdcc16a7144aa92c
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 3666c8cb456a4e4581c4ebac22db115a
+                  expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: cc7ca6b56a1f46ce9ed350511a8b2f17
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 4b0a6c73bc1f4e7692cb9196dbdf059c
+                  expression: 'max(/MikroTik CRS328-24P-4SRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: badd6b852574497db920e2fd65c42cf6
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS328-24P-4SRM SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS328-24P-4SRM SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS328-24P-4SRM SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS328-24P-4SRM SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: e9ac830b1f3a41c19739f09a1d89e2e7
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 5258a6d10fc14c66b721df917aaf13b0
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: d41f53d1a100475699f3afa9ec75eb14
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: ab3b88358f934afb9f9f3d9be2d32ded
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 02bd9f30327d4061809dc2a6ec76d152
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: d4b928ebdc964a86a6e10b054d73bf1b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 054261dc7c2141c3b176c8692f1d9709
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 65a5879884a944e9925c54f312c61dc5
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 0807ecb116b24ff09018962be0d0e457
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 27e9f662777645aa902981947c954800
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 679353503cb74edc85886f48b34d1f7d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 26baba4f44aa436fbe96c86a4a511156
+                  expression: 'last(/MikroTik CRS328-24P-4SRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 8f1b9e4dcc914aaf945ca40f78f48d87
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: b069c0bfdd034fa39baf37234ca93052
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: f2329eab56e1412b89b33f7e4a39fe29
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: ffd4528f23d14c55ad0cc37e96c0037d
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: e9f77bfbd9e64dc0a9549c0e54da0582
+              expression: |
+                last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: ff9b2a577fc64bdeb0c8e1feaac80862
+              expression: |
+                last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS328-24P-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 5d51c5894f3745c58fbd83fe408b38f8
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS328-24P-4SRM SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS328-24P-4SRM SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 24acb886bb9343bcaf125e58419e67a9
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS328-24P-4SRM SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/README.md
new file mode 100644
index 00000000000..21707f66b0c
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS328-4C-20S-4S+RM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS328-4C-20S-4S+RM.
+
+Smart Switch, 20 x SFP cages, 4 x SFP+ cages, 4 x Combo ports (Gigabit Ethernet or SFP), 800MHz CPU, 512MB RAM, 1U rackmount case, Dual Power Supplies, RouterOS L5 or SwitchOS (Dual Boot)
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS328-4C-20S-4SRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS328-4C-20S-4SRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS328-4C-20S-4SRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS328-4C-20S-4SRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS328-4C-20S-4SRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS328-4C-20S-4SRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS328-4C-20S-4SRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/crs328_4c_20s_4s_rm
diff --git a/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/template_net_mikrotik_CRS328-4C-20S-4S+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/template_net_mikrotik_CRS328-4C-20S-4S+RM_snmp.yaml
new file mode 100644
index 00000000000..9522aa01bc4
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/template_net_mikrotik_CRS328-4C-20S-4S+RM_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:32Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 6742f5ed33ca4c19b8e61203770e5fe5
+      template: 'MikroTik CRS328-4C-20S-4SRM SNMP'
+      name: 'MikroTik CRS328-4C-20S-4S+RM SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS328-4C-20S-4S+RM.
+        Smart Switch, 20 x SFP cages, 4 x SFP+ cages, 4 x Combo ports (Gigabit Ethernet or SFP), 800MHz CPU, 512MB RAM, 1U rackmount case, Dual Power Supplies, RouterOS L5 or SwitchOS (Dual Boot)
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 1b876d8c8ea3422a82e4b571853bee64
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 656a970a84fd4f65adc021b317f8db04
+              expression: 'last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: ecb890a4585f47989973617ca4fcce42
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: c283b3b41d074d9596145d97f33d132b
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: ba6f7f02b3dc47b6a15a40f81c86ee1e
+              expression: 'last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: f2e20d27ca50462c88220e91f24b11c8
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: b720a6b27e14473db885682085ce07e1
+              expression: 'last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS328-4C-20S-4SRM SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 9c917c649b6e4a849283c5cd8c9f3c93
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 357a2467154c4dd283f76b9cdbdff62e
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: e5e85e7c2e0440cb90dcff96deffd559
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 6d68e3acb5a34a9eb68f6ea1e329241d
+              expression: 'min(/MikroTik CRS328-4C-20S-4SRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 06aae70f34df4409af34ca144482a0eb
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 400249b05da24140970579ae8d488406
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 000c63d6cf4d44f28c2705098ce88918
+                  expression: 'min(/MikroTik CRS328-4C-20S-4SRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 8153f104b6d54637a07df2a38faade77
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS328-4C-20S-4SRM SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: b3f51cd4147748e197e79c4497a26d3b
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: ef785b02dd6742b797ec65468c385499
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 23eaad92fd06421a94ed77347ed7805f
+                  expression: 'avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: e596c08e59974762a21d5e7c2bb06eb5
+                  expression: 'avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 8faa5c80c64545b8bde41c02bf450288
+                  expression: 'avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 3d3d5ab7c4d54019bdf8030ed47bad6a
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 4b18f19aca9e44d6bad22909cb335657
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 6e77737e71a640b1b0832fb8a317a848
+                  expression: 'avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 9ea2d3a683994dcc816d7210cfda6f38
+                  expression: 'avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 82fc4ea36e9e4a388e38bf4fb5d46148
+                  expression: 'avg(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS328-4C-20S-4SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: b50ab71d8aea456cb6f9c9248d4f7dbf
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 5630a05024904a749c7b01d6ae94d783
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: eab50deb6a2e45e8b7bcd447dc6c28e9
+                  expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 4c8305bf9bdf40a8bade711fe408f825
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: a12e8f4ef8c2496aacc7cbc35b9ede34
+                  expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: bdca12c838c045d487053f390a6d8722
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 32cb826e59324b90910717b778a714f2
+                  expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 9d3604bde08943debef2b5e7c794c902
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 4220c67e66074f048261a4b42092c381
+                  expression: 'max(/MikroTik CRS328-4C-20S-4SRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: e95b0db7e92b43fa8bd9c357027c4fcb
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS328-4C-20S-4SRM SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS328-4C-20S-4SRM SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS328-4C-20S-4SRM SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS328-4C-20S-4SRM SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 8a86e70394b14aca90cbd379f6aba7a3
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 5e600d097e8b42c283fac75c41b4f032
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 1ba331166f2443f1940863a41904f241
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: c5dd9be7abc0465c8fbacf67f1ad5267
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 02aa0fbddbd34a9db73896ea41e35045
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 5a3e0dbe67f74cad870becbb1363a577
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 2ea30a7ef6064f93967dc2c6e33eeb3a
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 89bafc75794a491f87f97f7eb5a5c499
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 8ab55cb0548f41c0ad2a98bd409be417
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f95630ccf4364ac995854d22918a0dbf
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 5f9ad684c36e4050beb3e6fd5851ec30
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: bd6dc784f23746d19a09b6ea322ecf24
+                  expression: 'last(/MikroTik CRS328-4C-20S-4SRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 840e6b4e7d664308b2ce4912effc36f7
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: e2ce3e31898447259ad7631d70f8f192
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: fec4bc35fb504363b8dac0473735b1d9
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: d4cc931928874bed96935faa743aaff2
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 708c6b4a613c4795bd2b3c8b10b9fed4
+              expression: |
+                last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 1220479e0e0b4dbbb7590ec2b8359009
+              expression: |
+                last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS328-4C-20S-4SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 3ce597bd788841829b006adfc17034a2
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS328-4C-20S-4SRM SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS328-4C-20S-4SRM SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 2fbbbe5c78d14824a1a2234769e4e687
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS328-4C-20S-4SRM SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/README.md
new file mode 100644
index 00000000000..86ae10f176a
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS354-48G-4S+2Q+RM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS354-48G-4S+2Q+RM.
+
+Best price and best performance on the market – this 48 port switch will rock any setup, including 40 Gbps devices!
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS354-48G-4S2QRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS354-48G-4S2QRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS354-48G-4S2QRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS354-48G-4S2QRM SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS354-48G-4S2QRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS354-48G-4S2QRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS354-48G-4S2QRM SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS354-48G-4S2QRM SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS354-48G-4S2QRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS354-48G-4S2QRM SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS354-48G-4S2QRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS354-48G-4S2QRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS354-48G-4S2QRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS354-48G-4S2QRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS354-48G-4S2QRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS354-48G-4S2QRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/crs354_48g_4splus2qplusrm
diff --git a/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48G-4S+2Q+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48G-4S+2Q+RM_snmp.yaml
new file mode 100644
index 00000000000..844efe50556
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48G-4S+2Q+RM_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:34Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: d1c1ab5db2c34c17ae3541407f8b7faa
+      template: 'MikroTik CRS354-48G-4S2QRM SNMP'
+      name: 'MikroTik CRS354-48G-4S+2Q+RM SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS354-48G-4S+2Q+RM.
+        Best price and best performance on the market – this 48 port switch will rock any setup, including 40 Gbps devices!
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: e24fe19f052f4901aeb9feab8199e461
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 7e708c7bf76445959909bf03adf676dc
+              expression: 'last(/MikroTik CRS354-48G-4S2QRM SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS354-48G-4S2QRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS354-48G-4S2QRM SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: f054bfb710c14307ade4081fb441e840
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 941a740a1dcc40cf88dd56039f26cf92
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 0b2e29ba173346248fb4d799f7e16cf1
+              expression: 'last(/MikroTik CRS354-48G-4S2QRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS354-48G-4S2QRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS354-48G-4S2QRM SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 73fd8a7f00b2442c8d5bfab913d8eff9
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: b0c3673f0aee4a23a7811f54416924bf
+              expression: 'last(/MikroTik CRS354-48G-4S2QRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS354-48G-4S2QRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS354-48G-4S2QRM SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 011ea07e21a24cd1a4b42149ffe128db
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 902a71cc5c094a62a2a7f735d07643cf
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 4ae4d4e6fe0d4bf290f96e1d430f2655
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 5e104649223b40cdadeaa338321ca690
+              expression: 'min(/MikroTik CRS354-48G-4S2QRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 506fab7cb3c045f890437a7e959f2171
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: f5b155d37a2148e694ab5815b3738894
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: f8801c652f414d4b881715e10d1a69ac
+                  expression: 'min(/MikroTik CRS354-48G-4S2QRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: f44de058c1ac47a182203d3ebb97e1ad
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS354-48G-4S2QRM SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: ddf965753be54765afd2ce23a0895ba7
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 5235b45eb9be42748cd9740626734961
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 5e2a48b70bb5491791e1e796d9b57700
+                  expression: 'avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 6064422d708f4ee3a54dd0dccd6c2ef4
+                  expression: 'avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: b61c653ea25c47f397288e7a6c88c343
+                  expression: 'avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: aa5a9445830441ee9795763529df49ae
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 454aab3736a24babaa379f7526a41e5d
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 7f1abc774f4e48928a52a755f9655d33
+                  expression: 'avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 4c3b3b0c4e4c4903856c673ed34c32b2
+                  expression: 'avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 46ce97f9fd33406996e21d7c4cfe4615
+                  expression: 'avg(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS354-48G-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 714fc311cc2a46659cb42859cb196902
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 69c1e3a5f4694ee59207ea3c56d3f643
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 5caa686e721a40e991d0f4b71eaecc7f
+                  expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: bfceb2b2627a467ba9a3916b3c34d27f
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: ce67126d64254dabb9d5df68dcdb5a69
+                  expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 7284e5a86c6e43c485e8c7b9ec633cad
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 7401d1955be04599b1d0e5dfb3d2a4f5
+                  expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 8309561fc4f14ccdb69da3728c4fb0eb
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d668e892231d4614af5673f11d8070cf
+                  expression: 'max(/MikroTik CRS354-48G-4S2QRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 417c7efde3d44f27894d47ac2f6ce025
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS354-48G-4S2QRM SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS354-48G-4S2QRM SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS354-48G-4S2QRM SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS354-48G-4S2QRM SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: e35084133a5e4693aea5f84b96a6480a
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 56f594fa8595463886e857977c172eb3
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 48bba64f95304974819ef7a15bbbce85
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 401390a283de4ec29bfb1c0c99820a7e
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b67454e3882d4c16bb51094017775630
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: db3274433926415b97f8e34a9f04a9ac
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 1512667e82b743f09392103d73374861
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 92e6fbfd1cf843fbb26a62aed1360214
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: c1d0e3150e5a4ad39f39cebe0a381aaa
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: c176e70d536e42c9aa62f4952e166c9b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: df1e4f1603d14e07b5308d5fd5eb55b0
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: a5ac3a7a8ac447bdb1d35b9456351624
+                  expression: 'last(/MikroTik CRS354-48G-4S2QRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 5222de6258624467a0b0245312047307
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: b2f996b4a5e842d3b3b3ec3813faf82f
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 8303806786424c7499d013d4a55d4b6a
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: f9361907c6b944a0b282fc8ecabe050f
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: adf6f10ebb2e42989ed41b69e3411431
+              expression: |
+                last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: da4dd8436d6f4787801e6d2f10b59a47
+              expression: |
+                last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS354-48G-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: f85b7f7ab6a4454ebd777f5b8cc00900
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS354-48G-4S2QRM SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS354-48G-4S2QRM SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 4c949d698efc46ca8b4db208fbffbf79
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS354-48G-4S2QRM SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/README.md
new file mode 100644
index 00000000000..73b6aa02009
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CRS354-48P-4S+2Q+RM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CRS354-48P-4S+2Q+RM.
+
+The 48 port champion you’ve been waiting for - now with PoE-out!
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CRS354-48P-4S2QRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CRS354-48P-4S2QRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS354-48P-4S2QRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS354-48P-4S2QRM SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CRS354-48P-4S2QRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS354-48P-4S2QRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS354-48P-4S2QRM SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CRS354-48P-4S2QRM SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS354-48P-4S2QRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS354-48P-4S2QRM SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CRS354-48P-4S2QRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS354-48P-4S2QRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CRS354-48P-4S2QRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS354-48P-4S2QRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CRS354-48P-4S2QRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CRS354-48P-4S2QRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/crs354_48p_4s_2q_rm
diff --git a/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48P-4S+2Q+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48P-4S+2Q+RM_snmp.yaml
new file mode 100644
index 00000000000..f69510f8d75
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48P-4S+2Q+RM_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:36Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: fa5e5e131eb34bbea1b1f7b2352a853d
+      template: 'MikroTik CRS354-48P-4S2QRM SNMP'
+      name: 'MikroTik CRS354-48P-4S+2Q+RM SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CRS354-48P-4S+2Q+RM.
+        The 48 port champion you’ve been waiting for - now with PoE-out!
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 397dce267b79414fb563dc2f184d2930
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 9b20e7d8a4c844069a75adc95dcb6223
+              expression: 'last(/MikroTik CRS354-48P-4S2QRM SNMP/system.hw.firmware,#1)<>last(/MikroTik CRS354-48P-4S2QRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CRS354-48P-4S2QRM SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: cc3d781f3ba64faa9914d34a4d450fd6
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: d611ea9fbcff489e9175dcb6f0ffe2d1
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: ec99b185eb1d4af2943cd49f4b1e3dcf
+              expression: 'last(/MikroTik CRS354-48P-4S2QRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CRS354-48P-4S2QRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CRS354-48P-4S2QRM SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 4257226c6b90413baaa7a2b8beeb3c01
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 54ca398b57a8450ba004aa15a310f599
+              expression: 'last(/MikroTik CRS354-48P-4S2QRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CRS354-48P-4S2QRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CRS354-48P-4S2QRM SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: b319b01c532f453aa0b39c6cac9c06e8
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 7522d72e76254a60b59fc2c67590701a
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 4b9d180956ca4f17abc9c232856f1a78
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: a60e5b95514e4a6ba5bdc1d2bc95818c
+              expression: 'min(/MikroTik CRS354-48P-4S2QRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 95a34c80dcd848e3b5ccad0f57a06532
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: a1d0f17280d543bb825830f808dad88a
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: c5ddc3a0e73943ef939341972db502e1
+                  expression: 'min(/MikroTik CRS354-48P-4S2QRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: c23045bfa1ef442490ecc2d3c9120018
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS354-48P-4S2QRM SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 84b79932cea04e7fa9dc64fe119a2825
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 13f73255283f4f6b923edae51f98f5f6
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 963f7342ba58427189be8e5d482bd1db
+                  expression: 'avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 3bc320302ce64512bf5cabdddbf8827a
+                  expression: 'avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 2341cc2581aa47629ba79efb0dde8f12
+                  expression: 'avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 2ed1bdac264e4d05b1873e69c17cc288
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 1d1fbc3838c341cc9b874721a824deef
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 310fc63d695d4d79adb61b152467dc6b
+                  expression: 'avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 45d51b9e79ce4086934b7a93837855fd
+                  expression: 'avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 84ea7da850864101a35eb96acb475dec
+                  expression: 'avg(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CRS354-48P-4S2QRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 1250fe89b2b645adb6d8a444e286c34a
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 65bd1f9096914fa5952a842f869376e3
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 832ceaf8547b4395a4495ad2d64c9f3e
+                  expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: da6ebd895cb7465d964de43bb1f97125
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 64e8b603db0240bda81435df0ec8f275
+                  expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 817d4b9c195c4b74a986dee3f509d56f
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 8085843742774a44ada60c14cf33aeb4
+                  expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 3031a59f08914941ae9f7fc8f494b132
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: e315b7387f1943eb9432986565aee291
+                  expression: 'max(/MikroTik CRS354-48P-4S2QRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 5e4a66d716554e8da4f9d85f5a5ba138
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CRS354-48P-4S2QRM SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CRS354-48P-4S2QRM SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CRS354-48P-4S2QRM SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CRS354-48P-4S2QRM SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: e8d513955f9b4f819c408cf3aac35ec1
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 22665dbacc9d48d985d7ca4e463319b5
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 18664eb3c8dd4e768f9de382ee8bba85
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: a6badb125d8d412a8d9142882ab4b956
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: bb2ad51473f04db188bd4e335591b94b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 8afb3efbe69e4541bc74760ab4ba3130
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 829a233a44aa4cd2880732ad863d2d27
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: b2a8832875e14a0f9639de640f260e92
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7e4ba0da31a24287b12f07940f449131
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 30511ea997e740d2a6313005e7f56a71
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 01e691a3d2fb401484af4e768cab09b7
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 611cb0ad354a4ac0b52715483b4426ad
+                  expression: 'last(/MikroTik CRS354-48P-4S2QRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 0cad2cd6715f44d6a912a63cdc15926b
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 00bc5ff9329240978654621ee37af739
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 435c8ca87deb4fbfad0df451c9b3dc57
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 5c7b4cf01d2d4b8f9cb5022a54b4593d
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 63d24ac83bc24eb5b64ecc47c75c1c4a
+              expression: |
+                last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: ed3c082e9f264f20862f9cd20d4e9724
+              expression: |
+                last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CRS354-48P-4S2QRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 17e8f43e55f74e8a9d648003153eae55
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CRS354-48P-4S2QRM SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CRS354-48P-4S2QRM SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 00dee725174d41488e156ed07764be15
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CRS354-48P-4S2QRM SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/README.md
new file mode 100644
index 00000000000..01a088d5e6d
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CSS326-24G-2S+RM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CSS326-24G-2S+RM.
+
+SwOS powered 24 port Gigabit Ethernet switch with two SFP+ ports in 1U rackmount case
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CSS326-24G-2SRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CSS326-24G-2SRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CSS326-24G-2SRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CSS326-24G-2SRM SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CSS326-24G-2SRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CSS326-24G-2SRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CSS326-24G-2SRM SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CSS326-24G-2SRM SNMP/system.hw.firmware,#1)<>last(/MikroTik CSS326-24G-2SRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CSS326-24G-2SRM SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CSS326-24G-2SRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CSS326-24G-2SRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CSS326-24G-2SRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CSS326-24G-2SRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CSS326-24G-2SRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CSS326-24G-2SRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/CSS326-24G-2SplusRM
diff --git a/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/template_net_mikrotik_CSS326-24G-2S+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/template_net_mikrotik_CSS326-24G-2S+RM_snmp.yaml
new file mode 100644
index 00000000000..e839810d031
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/template_net_mikrotik_CSS326-24G-2S+RM_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:38Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 75ada0d6fb22416a9e6e5f44c2c3f64a
+      template: 'MikroTik CSS326-24G-2SRM SNMP'
+      name: 'MikroTik CSS326-24G-2S+RM SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CSS326-24G-2S+RM.
+        SwOS powered 24 port Gigabit Ethernet switch with two SFP+ ports in 1U rackmount case
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: ac47dac361224d288e4455e9a689d690
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 6be0e3bc49134d8c9823736e1c4dcb98
+              expression: 'last(/MikroTik CSS326-24G-2SRM SNMP/system.hw.firmware,#1)<>last(/MikroTik CSS326-24G-2SRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik CSS326-24G-2SRM SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 01ef36b50b394e4bb9670abd48a05369
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 2321d2d106f6432a9de5b5a633315e5e
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: a6c0fe000ca34b7490c4a56f5c57346b
+              expression: 'last(/MikroTik CSS326-24G-2SRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CSS326-24G-2SRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CSS326-24G-2SRM SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: ae9626b78f3e4e89842fb82592e2f520
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 660fbce28f334bb79afc6a9ba8596316
+              expression: 'last(/MikroTik CSS326-24G-2SRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CSS326-24G-2SRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CSS326-24G-2SRM SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 4972cad8ac8f44d8a3d01278d602b21d
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: a66e0f5458094b13bbdb7c9193b334e5
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 5c095d3737054b68a32f491e34f4ab32
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: ac97984b2153426c89247bd88797b4a2
+              expression: 'min(/MikroTik CSS326-24G-2SRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: a67f85c892114c60bf0daac055b2a8b4
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 4869b0ebcc9a4b7aa230dea7fecdc772
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 62fb5cb70674493ea1c7db4df42cf8f4
+                  expression: 'min(/MikroTik CSS326-24G-2SRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: b14c854295504c2fbbb0481bebd5db00
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CSS326-24G-2SRM SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 8fa3b36e1d7943c7b1d7b9a75c65d087
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 39a398bdbb564bb7b9b120b36e01115c
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 43a5c40a58f541faa120a514dc47451e
+                  expression: 'avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: bb4a5e936ba74269b8a8fa2e1ca2b27e
+                  expression: 'avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 46754e9a44b04fdeabc9d6a1370505dc
+                  expression: 'avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: be5b2f204fa545d4b581201dfbf57335
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: a3c4ebcac6134235a5f51ad0a825acae
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 5b25032a33c3443585d74f3412f13d3e
+                  expression: 'avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 44f2b8515564492c9b2e68985f753cf9
+                  expression: 'avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: cd9978c41951477c9d3ef44f7d4d717c
+                  expression: 'avg(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CSS326-24G-2SRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 92d612ae6ba74d01a369713b27732da4
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 2461a98399364aabb2774f0330a09f38
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 889e25ecd5104014bd798cb577f59bd5
+                  expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 932b36d99dea4cc6b41daef5b452adb2
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 8733d8912d8d400b9dafcc845854cb3a
+                  expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: e2d2db403dce4b8e980dce441399c31c
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: a801c0260917479f9f905a8b32085fc6
+                  expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 18d7874870c74f9e93bafba284a038d2
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: cfcecfe761064f5baa312a0c54633261
+                  expression: 'max(/MikroTik CSS326-24G-2SRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 0e692d0869b14d84a2aafd12aa424d29
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CSS326-24G-2SRM SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CSS326-24G-2SRM SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CSS326-24G-2SRM SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CSS326-24G-2SRM SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 479f5860d57c4a89869b03c98cb17e0d
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: bd884aa372ad4c29bc0431068a6d665b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 57f41aedeaf947c7b2b99e11a8f5f6a9
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 46026e2ec35649f181707026f49055a3
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 885b452398fd4131a80ae84b484018ac
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b685866be093464f96fc8731e6cb24a6
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 6177e332ddf1464a843560c8aaef03f8
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 39cd37fd8f5b49d0ada87b665a3af974
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 4249cd712d244445a4d69affa771b387
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 78346d4d85e045bdb151fb51108d81ed
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f836d1e069cc40fa9e31fd12456a9155
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 0a36e10a866e455f98f1954b4c663d64
+                  expression: 'last(/MikroTik CSS326-24G-2SRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 9d5a922b41df4c9ba2e6c806aaa86ea5
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 4844d14f11a24be48f31ae5084e803d9
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 0496f8a356b14caa8a06ec4be8b04e65
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 7805deb172f0405ca211e47bb49eb557
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 7e550dcc8005425db0c20785d3818466
+              expression: |
+                last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 92d4b209c4e249fcab9d72eae2da160d
+              expression: |
+                last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CSS326-24G-2SRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: a6a6dffb9d24445aaf4de5d0c5f386e0
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CSS326-24G-2SRM SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CSS326-24G-2SRM SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 7a77d8dfe791413ea16222e4159c7ef4
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CSS326-24G-2SRM SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/README.md
new file mode 100644
index 00000000000..90f34e62c6b
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik CSS610-8G-2S+IN SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik CSS610-8G-2S+IN.
+
+Eight 1G Ethernet ports and two SFP+ ports for 10G fiber connectivity. Portable, powerful and extremely cost-effective – this switch is an instant classic!
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik CSS610-8G-2SIN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik CSS610-8G-2SIN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CSS610-8G-2SIN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CSS610-8G-2SIN SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik CSS610-8G-2SIN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CSS610-8G-2SIN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CSS610-8G-2SIN SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik CSS610-8G-2SIN SNMP/system.hw.firmware,#1)<>last(/MikroTik CSS610-8G-2SIN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CSS610-8G-2SIN SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik CSS610-8G-2SIN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CSS610-8G-2SIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik CSS610-8G-2SIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CSS610-8G-2SIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik CSS610-8G-2SIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik CSS610-8G-2SIN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/css610_8g_2s_in
diff --git a/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/template_net_mikrotik_CSS610-8G-2S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/template_net_mikrotik_CSS610-8G-2S+IN_snmp.yaml
new file mode 100644
index 00000000000..c650cd7c018
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/template_net_mikrotik_CSS610-8G-2S+IN_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:40Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 8d22b4d1a9c6457fbd6fd959263f91db
+      template: 'MikroTik CSS610-8G-2SIN SNMP'
+      name: 'MikroTik CSS610-8G-2S+IN SNMP'
+      description: |
+        The template for monitoring Switch MikroTik CSS610-8G-2S+IN.
+        Eight 1G Ethernet ports and two SFP+ ports for 10G fiber connectivity. Portable, powerful and extremely cost-effective – this switch is an instant classic!
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: c7582351ce394433b50aef17cc01b5b2
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 1a920e11feb447deba1aa2d8fbb24f85
+              expression: 'last(/MikroTik CSS610-8G-2SIN SNMP/system.hw.firmware,#1)<>last(/MikroTik CSS610-8G-2SIN SNMP/system.hw.firmware,#2) and length(last(/MikroTik CSS610-8G-2SIN SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 9e5fac593cf94a9d973ba8b604e1dfd2
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: f5531013912c4ed68e6b0b4d89165803
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 1167a5bf26e24eb89479904841ef890b
+              expression: 'last(/MikroTik CSS610-8G-2SIN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik CSS610-8G-2SIN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik CSS610-8G-2SIN SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 86323c3d935642f980f158e5868f35e0
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 4a1aacf6350844e5858c3eed35b544eb
+              expression: 'last(/MikroTik CSS610-8G-2SIN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik CSS610-8G-2SIN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik CSS610-8G-2SIN SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 3ab4fc5c9fba4e098977500051a8ac98
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: df10ebd3cfa44fe6838889ff81e8cab0
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 132ff52c4648491c9743bcf11b680236
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: f58eb093a57948f1bf674be6a207b0d3
+              expression: 'min(/MikroTik CSS610-8G-2SIN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: fc9d85ea9e364ae58f4bd34dc702bd29
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: afc355f3e1ed467ea0103f8bbcd426e0
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 4a30b05ebe764253bfe646c3d68aef41
+                  expression: 'min(/MikroTik CSS610-8G-2SIN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 1d1ce73e95dc4ad9b20d19010e524344
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CSS610-8G-2SIN SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: b2e8ea00836544f78a33586ba8b92b45
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: f77d01ca88eb4851951df2a481208bca
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 7475c0fe7374472db189a828aeca7b60
+                  expression: 'avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 225e0c1c96c94a32a84511107b71ea6d
+                  expression: 'avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: b5300fdf6fe8405d84fdd7a8821ac504
+                  expression: 'avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 4b3d7a1cf06e4fa184403f3796c3ed13
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 0cb6b32ae5a84259ab847d0cc802f16c
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: e208be80d815435ea6fc35df960bd2f6
+                  expression: 'avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 7153cf7699df438d8d04e5d3163e37b3
+                  expression: 'avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 30adf35ae2764123a80f64e81c11c9dd
+                  expression: 'avg(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik CSS610-8G-2SIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 7040fb77df5b4300bc9084b76b901940
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 12c180e262234293a6f1546424797d21
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 35142b5bd9064d63a661b07b24381564
+                  expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: cfb4d7bc97054f2fa76d9b945f65f151
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: ddd0efc2e01e4b6ca2948a5d3973dcd5
+                  expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 8d134db6ad6342308926fa1de66a1f42
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 90f360f3394d49a19413dcbf0dc0eab6
+                  expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: de1b466fd287481cacebcbea3339d984
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: f753e8c0d5fe43779fc3c427fcb087dd
+                  expression: 'max(/MikroTik CSS610-8G-2SIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: d1ff1951fe214755acf84088b44616cd
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik CSS610-8G-2SIN SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik CSS610-8G-2SIN SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik CSS610-8G-2SIN SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik CSS610-8G-2SIN SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 740cd4e70898478caef811525702e0eb
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: da1b743f2888401394de67c74e54aa72
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 9132dd54ff2f44cc8ddcb152c892ee06
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 867d40ce9bf44892b0f70f8465f727b0
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f16dcddcb1344f3db732c7e794bd5bad
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: cfe19d4825d14a91975023848a7464d8
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 6059d2ecbecd480b85d1c4e94eb65059
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: b9d03050f7234ec48d380fc686ea35c7
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 71332c155c18442ab89d0f3bf49a11e3
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 706ba145d130418995b4e61b19df3a6d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: a852223b28574abc9d76dc0053699209
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 0ec46a410f97442fb9308a0922d43648
+                  expression: 'last(/MikroTik CSS610-8G-2SIN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 9eb6e527f56c445f8ca77717742472a7
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: c5b9a5819b1f4c34acb71d9cc12b7ef1
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: acd377f6db0f4a7eab0c1289309b69ad
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 7a66d6925e3d48c6aae02daaf1051860
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 1f6e2a2bdf04499eabb18118fdbfcc4f
+              expression: |
+                last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 7fe3563d08ad470f909545c146b1b2c1
+              expression: |
+                last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik CSS610-8G-2SIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: b3730be1499f4aa094217acb7a84148f
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik CSS610-8G-2SIN SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik CSS610-8G-2SIN SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: c03e4e6d267d4529a68fd193f9f4923d
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik CSS610-8G-2SIN SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_FiberBox_snmp/README.md b/templates/net/mikrotik/mikrotik_FiberBox_snmp/README.md
new file mode 100644
index 00000000000..eb99341d919
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_FiberBox_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik FiberBox SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik FiberBox.
+
+An outdoor switch with five SFP ports
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik FiberBox SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik FiberBox SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik FiberBox SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik FiberBox SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik FiberBox SNMP/system.hw.serialnumber,#1)<>last(/MikroTik FiberBox SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik FiberBox SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik FiberBox SNMP/system.hw.firmware,#1)<>last(/MikroTik FiberBox SNMP/system.hw.firmware,#2) and length(last(/MikroTik FiberBox SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik FiberBox SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik FiberBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik FiberBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik FiberBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik FiberBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik FiberBox SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik FiberBox SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik FiberBox SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik FiberBox SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik FiberBox SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/fiberbox
diff --git a/templates/net/mikrotik/mikrotik_FiberBox_snmp/template_net_mikrotik_FiberBox_snmp.yaml b/templates/net/mikrotik/mikrotik_FiberBox_snmp/template_net_mikrotik_FiberBox_snmp.yaml
new file mode 100644
index 00000000000..e95517c71ff
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_FiberBox_snmp/template_net_mikrotik_FiberBox_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:41Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 2bd6f566391d49dab6bee184522ab5fa
+      template: 'MikroTik FiberBox SNMP'
+      name: 'MikroTik FiberBox SNMP'
+      description: |
+        The template for monitoring Switch MikroTik FiberBox.
+        An outdoor switch with five SFP ports
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 079bddb94e6d427b9b4232ba4da15b53
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 2a00f0a84a274bf98254d1bbb9f1ad93
+              expression: 'last(/MikroTik FiberBox SNMP/system.hw.firmware,#1)<>last(/MikroTik FiberBox SNMP/system.hw.firmware,#2) and length(last(/MikroTik FiberBox SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: c787c308e66348c2a2041c612ef70513
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 87b44381d4154c34bb1de1d8e56bc0f9
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 519f97f0275f4e9caf7e320e932ee911
+              expression: 'last(/MikroTik FiberBox SNMP/system.hw.serialnumber,#1)<>last(/MikroTik FiberBox SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik FiberBox SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 3a8bf0dd575f4718a87c007408f98a80
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 97933a27c0eb4e0cb67fceb9877641d9
+              expression: 'last(/MikroTik FiberBox SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik FiberBox SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik FiberBox SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: f5291559b3da497ba0cb9d7d36f531aa
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 40578c7f19bd4d2b9045abb2ccdd247f
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: f076a1ed65f340579771f6f9c6f5d724
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 72662034829d4d008f19cd3231b18bd1
+              expression: 'min(/MikroTik FiberBox SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 169cb8a2290645ef8b19b1fb559471cd
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 9056ec8b1cf84e4c972b77897908e8af
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: c5c743eec5fd430385a3ab3f1b9ccd61
+                  expression: 'min(/MikroTik FiberBox SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: cc63e64026b24e5ea1324ecc1049f5e9
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik FiberBox SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: ba436d334f7648db8a7b792418232fde
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 8c341838dcb7463caa565c5b50b131bd
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 788f637f7c28499cb0b8227bbcfddbf6
+                  expression: 'avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: f2952ccdadf0474a85e626eeae67ee8f
+                  expression: 'avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: fbd7daacdcde41fa9395a3dba62c7365
+                  expression: 'avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: bd5ed76fb50d44e0925cf59b9f7b33b2
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 3bcaff90977a4c68812498d86efdb0c4
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 732a162ce6aa424e8660882cccfaf40b
+                  expression: 'avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 64daf72dc6824976bbc28c0e76b9318c
+                  expression: 'avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 3a6e8742e68d4e4cb77931acec6202f2
+                  expression: 'avg(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik FiberBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 7ff8e43421a3408d99e3cf038cd1d32c
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 74dbe99ea3f84e25b5c9b675615d6234
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 89422cbc4e294e5392352b3daa42a27b
+                  expression: 'max(/MikroTik FiberBox SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 6044310bd6814fcea1bfc496fdb4e1cd
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 1f5dbc7e06fb4a48a516f21095ad95eb
+                  expression: 'max(/MikroTik FiberBox SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: a34aaedb745d46c3b60a53ba3f4619fd
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 13229b29783c42119d9242d4e2d795ef
+                  expression: 'max(/MikroTik FiberBox SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 777ea9e79ab24c9b9cc524317c5d7a3e
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: acdd956a5d49476a86ced8d9ac561979
+                  expression: 'max(/MikroTik FiberBox SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: c0d3b6d20f554a9c8014d9cf9d0f9055
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik FiberBox SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik FiberBox SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik FiberBox SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik FiberBox SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 8dccf29262d64d02aa9ec070a113e9c5
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 7da2dfc825894d23830e461da773d2a8
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 02f7b1b3fb6f4a66bc4b02dedc2e08dd
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 59a008e602744b87a435d43ffcbd7270
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 41d0a02df0d6474895eb69c559da7d86
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 479ac2c04b3144ababdeddb75a0437f8
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 03b7a6369c624c169416d85d6bdd8bd3
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: e7fabf081a154b6bb345bdf08bb655ca
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 54de59401d8b40f3b6446780d13a89f8
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: d32f654355f64421aeae49b6fbedd976
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b5341b9ed36045ce951f455232b74983
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: a6f2bfc1407f4b96ac51aa7ec69b234d
+                  expression: 'last(/MikroTik FiberBox SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 4f9aab06d404429095f58719a45169df
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 42dca57a2239444484284cb7cd999af2
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 1065889d15ad41cea31648c789a72035
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 8eb65066ede74a32968a87485801775a
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: d48fafd1402e4774a5e7c2d854e3ebbc
+              expression: |
+                last(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik FiberBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik FiberBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 802aa708fd8e42fdaa61d1aa3394c58b
+              expression: |
+                last(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik FiberBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik FiberBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik FiberBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik FiberBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik FiberBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 2a6511d5067b4377936d922609939d6c
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik FiberBox SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik FiberBox SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 9e157495c5ef4961beff72c4f500c2a1
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik FiberBox SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/README.md b/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/README.md
new file mode 100644
index 00000000000..653947ef31c
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik PowerBox Pro SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik PowerBox Pro.
+
+Five Gigabit Ethernet Router with 4xPoE-out ports, SFP cage and outdoor enclosure
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik PowerBox Pro SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik PowerBox Pro SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik PowerBox Pro SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik PowerBox Pro SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik PowerBox Pro SNMP/system.hw.serialnumber,#1)<>last(/MikroTik PowerBox Pro SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik PowerBox Pro SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik PowerBox Pro SNMP/system.hw.firmware,#1)<>last(/MikroTik PowerBox Pro SNMP/system.hw.firmware,#2) and length(last(/MikroTik PowerBox Pro SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik PowerBox Pro SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik PowerBox Pro SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox Pro SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik PowerBox Pro SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox Pro SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik PowerBox Pro SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik PowerBox Pro SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik PowerBox Pro SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik PowerBox Pro SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik PowerBox Pro SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/RB960PGS-PB
diff --git a/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/template_net_mikrotik_PowerBox_Pro_snmp.yaml b/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/template_net_mikrotik_PowerBox_Pro_snmp.yaml
new file mode 100644
index 00000000000..7841b18fe94
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/template_net_mikrotik_PowerBox_Pro_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:59Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: c03e1ab0128a4ae1847bc04a34f5634e
+      template: 'MikroTik PowerBox Pro SNMP'
+      name: 'MikroTik PowerBox Pro SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik PowerBox Pro.
+        Five Gigabit Ethernet Router with 4xPoE-out ports, SFP cage and outdoor enclosure
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 0647d4e175d8467ca7f7579f92c56b82
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: fe286c10b77a4178b53136d088c09977
+              expression: 'last(/MikroTik PowerBox Pro SNMP/system.hw.firmware,#1)<>last(/MikroTik PowerBox Pro SNMP/system.hw.firmware,#2) and length(last(/MikroTik PowerBox Pro SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 1237d193c49a4110bce86971e3c142f1
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 2e56609d113d4e7ab304ac20c4debb97
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: b84f0bcdae4a4ef7887877b7f054ca3c
+              expression: 'last(/MikroTik PowerBox Pro SNMP/system.hw.serialnumber,#1)<>last(/MikroTik PowerBox Pro SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik PowerBox Pro SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 3013805399d449c9ac4469b1310504db
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 8d2847030c154c958ae3cc72841f7b73
+              expression: 'last(/MikroTik PowerBox Pro SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik PowerBox Pro SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik PowerBox Pro SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 2d7199ec103340b280154f08de8699f6
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 54c72d743ada42dcaa0c39e9493517f8
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 9aa6bb105738415e8971772cdb9273cc
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 4e4df5360a9b40b5a4f6d1aa706d23d7
+              expression: 'min(/MikroTik PowerBox Pro SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 25d6d157fcd943fb9f0c56077cd77c9b
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: bca98eb13b794c299f72820136883671
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 4d838f76e7d14c73a89a6a8cab585e77
+                  expression: 'min(/MikroTik PowerBox Pro SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: b98fcdee076b497e84bb8613d2697b6e
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik PowerBox Pro SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 19ae76cf5af647a4ab5e3dd32f9e4509
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: b91e83c420b14d32a65bb19bca8ec5fe
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 70bcead0c721429ea2140eb12e32e5a9
+                  expression: 'avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 04687ea5280b4448844b17afa9c655c6
+                  expression: 'avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 62fd1bbcbe9e4db7851ad08b75d9f54f
+                  expression: 'avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 46b03489e77c4100b49aa05c9e860879
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 02b57d8b31cf4a618daa8021b8c926b6
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 9d035691d2344fa0bd64e6724828626e
+                  expression: 'avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 869eb891b56e4d499586a9e40fdb5f95
+                  expression: 'avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 5d18aa2f47154e999e9077f3cb06e3ed
+                  expression: 'avg(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik PowerBox Pro SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 11214845bb78433d85ffbc220a53384a
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 2ff135f602264e0199f6cc0e622a9cf3
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: bca448bbec634737adbc1935bfb96395
+                  expression: 'max(/MikroTik PowerBox Pro SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 668dc62196eb4aae90a39ca3dc039b07
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d7894ea315a24f42936eb44d85f60a8a
+                  expression: 'max(/MikroTik PowerBox Pro SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 2d38d81dfcf24505962a0f6b03c7734d
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: fb73c03756734684b5b1078de2d485ab
+                  expression: 'max(/MikroTik PowerBox Pro SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 191ddb89d1bb47a3bed0dc8b22eb2234
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c0bc438b1ee248109e3471d6af153c14
+                  expression: 'max(/MikroTik PowerBox Pro SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 1a664f38671a469793eab15850dda3a5
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik PowerBox Pro SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik PowerBox Pro SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik PowerBox Pro SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik PowerBox Pro SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 132311b3514a496b9668605a9b37e22a
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 7caf1b16bfb34b83ad1883f5270bea00
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 1bd56573eac644f7b76ec3dd1099e6ea
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 729b8bf1472c4ddda72ccb601740ccbb
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: fcd60ae4386a4eb2bac72c7544d915df
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 9089bdc9a64a41f9b4b69b241ae27b5b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 54e807c66d9e42089ace3bae82bce367
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: de6f8a579d4e4ccd858e5f017c787653
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 790cae75cd274f279c221854015e2ba0
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: ab549ccfcdb7413a913ed6fe33430cc8
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e773a8468b604062b7838b19039a21c4
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 91ea1c2de293413c9b24932282a673ee
+                  expression: 'last(/MikroTik PowerBox Pro SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 708837461f69453cac8eeddac2ed95ff
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 0ec6cd6ed5d142d6a17a3637f2884a0f
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: d581f883c370430ba37c89a43a7ffab6
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: e36052b8960b4107a1222cda719dfb35
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 21b45f8f32344ed9a2323ef940fdb564
+              expression: |
+                last(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik PowerBox Pro SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox Pro SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 13db9f1c26754199937d4447976591ce
+              expression: |
+                last(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik PowerBox Pro SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox Pro SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik PowerBox Pro SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox Pro SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik PowerBox Pro SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 35d96744ce7f47e292c09f85c114c549
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik PowerBox Pro SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik PowerBox Pro SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: a7d7e7246e46435ea688b55a66652dfd
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik PowerBox Pro SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_PowerBox_snmp/README.md b/templates/net/mikrotik/mikrotik_PowerBox_snmp/README.md
new file mode 100644
index 00000000000..5885e9e6f4b
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_PowerBox_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik PowerBox SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik PowerBox.
+
+650MHz CPU, 64MB RAM, 5xEthernet with PoE output for four ports, RouterOS L4, outdoor case, PSU
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik PowerBox SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik PowerBox SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik PowerBox SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik PowerBox SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik PowerBox SNMP/system.hw.serialnumber,#1)<>last(/MikroTik PowerBox SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik PowerBox SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik PowerBox SNMP/system.hw.firmware,#1)<>last(/MikroTik PowerBox SNMP/system.hw.firmware,#2) and length(last(/MikroTik PowerBox SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik PowerBox SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik PowerBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik PowerBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik PowerBox SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik PowerBox SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik PowerBox SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik PowerBox SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik PowerBox SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/RB750P-PBr2
diff --git a/templates/net/mikrotik/mikrotik_PowerBox_snmp/template_net_mikrotik_PowerBox_snmp.yaml b/templates/net/mikrotik/mikrotik_PowerBox_snmp/template_net_mikrotik_PowerBox_snmp.yaml
new file mode 100644
index 00000000000..a70bbcb60c6
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_PowerBox_snmp/template_net_mikrotik_PowerBox_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:08:01Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 0c7b3c03a5854f868b56f3ab63e2d3f7
+      template: 'MikroTik PowerBox SNMP'
+      name: 'MikroTik PowerBox SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik PowerBox.
+        650MHz CPU, 64MB RAM, 5xEthernet with PoE output for four ports, RouterOS L4, outdoor case, PSU
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: f44c0f3952034baab2a7051ef835ad6a
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 2deae9223199442b895df43cb2b0904c
+              expression: 'last(/MikroTik PowerBox SNMP/system.hw.firmware,#1)<>last(/MikroTik PowerBox SNMP/system.hw.firmware,#2) and length(last(/MikroTik PowerBox SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: d1826b39b0004104bb5e81b3c6a5e944
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: ddd2fc89869f4feca6141ed16d6cfe1c
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: ae8533bd4fa84d8f8e8969498d5530ed
+              expression: 'last(/MikroTik PowerBox SNMP/system.hw.serialnumber,#1)<>last(/MikroTik PowerBox SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik PowerBox SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 2e106a43efd24438adb62bec628e2176
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: b0b935a8197e4188962b7d859d2b412b
+              expression: 'last(/MikroTik PowerBox SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik PowerBox SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik PowerBox SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 3067b57e3dd841959b11a972903b8f35
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 981a289b960f4df19cc0e2728618bb3e
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 477247613d5546bc95b4d2b7e1695743
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: f9d7f4390619408eb5a20baa5e4ebbfe
+              expression: 'min(/MikroTik PowerBox SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: c3b780f997184c4582d1f78ab246ee5b
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: f97d176c12434b40acf7c78ba16281c3
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: acf19a5a27674b8db8b4913257534506
+                  expression: 'min(/MikroTik PowerBox SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: ff17c33d5a8743f8aff8a2b2a0ab314e
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik PowerBox SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 2376b53a6f4045fcacbd6d6c0d78d0bc
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: c602a12c83ca48ff84c875d818528a87
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 93deb16896994ddf8509332b293f078a
+                  expression: 'avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: bbe383abfe5a48ad8a0b4a9c943cfd11
+                  expression: 'avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 915d9a838c0945d0bad74aa2fb79da79
+                  expression: 'avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: a221763ac5874a0ab8b9c76aa10809e6
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 02fed23773644b0ea25f5363cf732b45
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 9b3e19c885d34128b47b87d071d959f1
+                  expression: 'avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 921ad5dc74e44e139a523ef11dd2743e
+                  expression: 'avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 0501798bf83342c5ac1f960649163a58
+                  expression: 'avg(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik PowerBox SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 4fede59bf19241c6a0b730ca22a41a95
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: e29ee4177ba844ad81f1a806c6fe6249
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c5709dbe38eb40e1ae8ae0cc564543b4
+                  expression: 'max(/MikroTik PowerBox SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: c091457e6f3c40afa1ccc9bf925d3051
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 96e644aa6f2c4399853ab05a7ada5afa
+                  expression: 'max(/MikroTik PowerBox SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 9e7ace2975934b8ba3e30af079be073d
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d4e38db917ca40da8ebd3da22442696e
+                  expression: 'max(/MikroTik PowerBox SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 6b58214098e54179b47c797dc6ef24d9
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 5837ae05e1694017ad026d215af06683
+                  expression: 'max(/MikroTik PowerBox SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 72f1bbbe190e48d8a45c4b2bf13e9f19
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik PowerBox SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik PowerBox SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik PowerBox SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik PowerBox SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: ce069decd92a49b1b9e119214db8b454
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: d11505d36324428ab52aaeebdd745e3b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 04eae1230e61488d8dff502aa879182d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 4eb4222707b14888b9385a8d39711a52
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 0cfca6cd2419475d94a3f6ca8dfdfe90
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 956eb6d3e03143edb7b1c23e5a081842
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 53309eb8dfcb4772a0adb0c81cb4f155
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 37fc95a13ea043b7ada13a147e2ab280
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 3c0821c1de9d43e58780de3729fb27c4
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 6fd532b46b944a7d8b8f188f9d0b11d1
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 38a6aba4e8df4833926424670f198be4
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 722a78d3b55d4a66be1dba0b705704d8
+                  expression: 'last(/MikroTik PowerBox SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 008a264a38134966870cf3834e5843c0
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: ec15b56d865b4ce8a2f09a6358c88f84
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 1107dc2e53fa47d6ab9678e50b824d7f
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: da751c6f6d0d4c1ea7615f96f0213113
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 3e812901cab94bbc9d5f15e8b70da4a0
+              expression: |
+                last(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik PowerBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: bee86ff10a084f76b4b266aa5e20df22
+              expression: |
+                last(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik PowerBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik PowerBox SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik PowerBox SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik PowerBox SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: d2c0b6dba77f4a9b99dc4e3693227514
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik PowerBox SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik PowerBox SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 8704623362864987b9f699a2c8fff1d0
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik PowerBox SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/README.md b/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/README.md
new file mode 100644
index 00000000000..9e77804e0f8
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik RB1100AHx4 Dude Edition SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik RB1100AHx4 Dude Edition.
+
+Powerful 1U rackmount router with 13x Gigabit Ethernet ports, 60GB M.2 drive for Dude database
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik RB1100AHx4 Dude Edition SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.hw.firmware,#1)<>last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik RB1100AHx4 Dude Edition SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB1100AHx4 Dude Edition SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB1100AHx4 Dude Edition SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB1100AHx4 Dude Edition SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB1100AHx4 Dude Edition SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik RB1100AHx4 Dude Edition SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/RB1100Dx4
diff --git a/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/template_net_mikrotik_RB1100AHx4_Dude_Edition_snmp.yaml b/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/template_net_mikrotik_RB1100AHx4_Dude_Edition_snmp.yaml
new file mode 100644
index 00000000000..0dee037a54d
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/template_net_mikrotik_RB1100AHx4_Dude_Edition_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:08:04Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: fac50638cb77468598c29a6a47520c24
+      template: 'MikroTik RB1100AHx4 Dude Edition SNMP'
+      name: 'MikroTik RB1100AHx4 Dude Edition SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik RB1100AHx4 Dude Edition.
+        Powerful 1U rackmount router with 13x Gigabit Ethernet ports, 60GB M.2 drive for Dude database
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: fea2d45d484c40d5bbd0a63bbcf32f38
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 9f571e3e7d7b4025a62cb4d61684a63f
+              expression: 'last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.hw.firmware,#1)<>last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 21aa5025c29a45d4ac5961d07f03f5ca
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: e2160944535143e5a9768b9dc1041bb9
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 6c56d13df5a84f8c81e3b11b5979fe2f
+              expression: 'last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: c1b8a435332a4608a833703409c3844e
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: cbc5e573f7ff4d4186782e18abb18323
+              expression: 'last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB1100AHx4 Dude Edition SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 0f96c2050b2d407d9355406ff3ba57da
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: a4ba4c5b3c2e48b08231bd8f1ca9acf1
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 0b6a0a9ba8c5454594c7b6dff8b32963
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 41dc7494d2d04e2e8fd9f31d744cdf94
+              expression: 'min(/MikroTik RB1100AHx4 Dude Edition SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 430a8cab45af4c24b72972d6373fccd9
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: c11b3e4201f24576bd2947f464af430d
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 40af64475bf54290b74ac2ed6f3183f2
+                  expression: 'min(/MikroTik RB1100AHx4 Dude Edition SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: e1da6708532c4582a7404ccce8e5f1c0
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB1100AHx4 Dude Edition SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 3bcc104afb9a4ca29c0fe55a88484b08
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: f8fe2949e8b247289e731d52c57abf4d
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: a1116b45b6e341dabc44b226c4741f97
+                  expression: 'avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 7b61f191e2634044a81981627fb52483
+                  expression: 'avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: c62859952edc45fd8c09a267e6badab9
+                  expression: 'avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 7add1dd4dfd84661b86fcf3f932e3ffb
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: ce006f12a6d342539ee9f2f20ff987aa
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 9980a1f6561c4b16935e204dfdf67c65
+                  expression: 'avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: c0be5c2bae7f45e780addd984a3f77c4
+                  expression: 'avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: ee368004b1f24293b8162d78b456a6d0
+                  expression: 'avg(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB1100AHx4 Dude Edition SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: fe42e32d477d4718bf37ff36ff630bb7
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: a56f2452a3a4404a8fad38827100fce4
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 6b1a507739c940ffb528a41d5af76069
+                  expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 4d1753721a72454f8681ca87affad3a9
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 0b2b0b8cdf964cc48d7ece2be62d115e
+                  expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: ea0e06c8297147bc9afb9c878f757efe
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 4d271b81500f4513a1408dfa8f0e1e29
+                  expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 6c9e70511a6c400a968eee3119cb32a3
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 8875480665294938bee208b23d416d34
+                  expression: 'max(/MikroTik RB1100AHx4 Dude Edition SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 1bc26beb83ed42d1a5818082ca17e1e5
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB1100AHx4 Dude Edition SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik RB1100AHx4 Dude Edition SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik RB1100AHx4 Dude Edition SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik RB1100AHx4 Dude Edition SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 9dab50003a824e0faddea18cf89e88b2
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 0cd27b4eb0ac4eed88c3804848186016
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 1d48037aa1f844d49029ed722defe80e
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 554c6d88b86641a1a9fc6d1bde08eeb9
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 44f03138eed845a693b071a9d7171c68
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 41192738c7564ca0ad454ab525046438
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 1d8f0b4f75a044a0a5d8547471514346
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 8ed53c72c98940a79c5eb8c840c884f3
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: a23cdf72497c47769a089496d4b06773
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 94a9518972d041a4b82e9237311c6ff4
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: c88218013c5242dc934d0d92775f27e3
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c529624e4a254ecba9659fc9d43f9df4
+                  expression: 'last(/MikroTik RB1100AHx4 Dude Edition SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 8a9272779331436896db3a69fac40bb7
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: fbca4c6a7a9e4dbbb44319976eaccbbc
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 0b10047762544ca4b56a3fa543257cfd
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 149563c5cf7e42a18f3aaed2cc32c6bd
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 47a1f1bee8f64507900f48de26bba052
+              expression: |
+                last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 419bd5a8f90d4e879be3707a3ad3f551
+              expression: |
+                last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB1100AHx4 Dude Edition SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: c64a26d248d344d5bf8f64d7265fd7f9
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik RB1100AHx4 Dude Edition SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik RB1100AHx4 Dude Edition SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 443e4ca5308d4e839fce0b7fc1da4932
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik RB1100AHx4 Dude Edition SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/README.md b/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/README.md
new file mode 100644
index 00000000000..ee6cfa561df
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik RB1100AHx4 SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik RB1100AHx4.
+
+Powerful 1U rackmount router with 13x Gigabit Ethernet ports
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik RB1100AHx4 SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik RB1100AHx4 SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB1100AHx4 SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB1100AHx4 SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik RB1100AHx4 SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB1100AHx4 SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB1100AHx4 SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik RB1100AHx4 SNMP/system.hw.firmware,#1)<>last(/MikroTik RB1100AHx4 SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB1100AHx4 SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik RB1100AHx4 SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB1100AHx4 SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB1100AHx4 SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB1100AHx4 SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB1100AHx4 SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB1100AHx4 SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB1100AHx4 SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik RB1100AHx4 SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/rb1100ahx4
diff --git a/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/template_net_mikrotik_RB1100AHx4_snmp.yaml b/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/template_net_mikrotik_RB1100AHx4_snmp.yaml
new file mode 100644
index 00000000000..256029e98a3
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/template_net_mikrotik_RB1100AHx4_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:08:06Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 3dfd1a55987848e5aa6ffe92c228f63b
+      template: 'MikroTik RB1100AHx4 SNMP'
+      name: 'MikroTik RB1100AHx4 SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik RB1100AHx4.
+        Powerful 1U rackmount router with 13x Gigabit Ethernet ports
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 3442b390250b480f887e1311b369c54e
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 9c552d88fc734c2d8b9976831396dcc4
+              expression: 'last(/MikroTik RB1100AHx4 SNMP/system.hw.firmware,#1)<>last(/MikroTik RB1100AHx4 SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB1100AHx4 SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 3f580252fdf44bd4a1172a73ea1b681f
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 737a739207f142e292cbce0d6f7208d5
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 59393bfb9a2b4fe9acf09735ab9b6dd7
+              expression: 'last(/MikroTik RB1100AHx4 SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB1100AHx4 SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB1100AHx4 SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: b9fc7b36a3394404be56c55176b20e39
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: d517281567044119bdc82dccb20c9724
+              expression: 'last(/MikroTik RB1100AHx4 SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB1100AHx4 SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB1100AHx4 SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 73ce1c102e3a4d4885438c16eff34ddf
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 9e2ee7cca26b49d3990b832eda44ee2a
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 7b1572625e04447eb308be35061921f2
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: ce1f7003b6dc4ca6a0e435c06aba6e1a
+              expression: 'min(/MikroTik RB1100AHx4 SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 4d7e84f0ed08471d8ec0717c93d410dc
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: bd42dc92c6b3407a909e979aff0e70a5
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 8ab046f6fb47499ebe6d34ad8ce20f59
+                  expression: 'min(/MikroTik RB1100AHx4 SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: ee998c9684054b1299161b15b243729f
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB1100AHx4 SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 978810fe8ed54f719c1b3816f539d0c9
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: fe90df42e8654cbdb521ecec3d428444
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 75e1b534632a42d08535fc863c280536
+                  expression: 'avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 117c3a91044a4d6da15b235017caf99f
+                  expression: 'avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: b20c703b353f444bb6d77d45433108fe
+                  expression: 'avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 7d8c3e389a3d44c1999028b92464a607
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 5674848e4bc44f81942d8fd5a1d08397
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: f63a8665f1bb4fce930c8e6d68ca9bc4
+                  expression: 'avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 61ef8b6e39fa4dfa9ad0398acab924a9
+                  expression: 'avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 92626f1037574adf9e25e175b6e5781b
+                  expression: 'avg(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB1100AHx4 SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 95cfcb66e6fb440d99b960637adfca93
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: c69a7cf907b940bda9881ffc4a13c6f9
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 3a29ebeb278444eb9940c6840b2e0a4e
+                  expression: 'max(/MikroTik RB1100AHx4 SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 9f0442c4c061485080d0f8ff5f7c831f
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 4c0dfdccda7a4a0a9b889b4a643d02e4
+                  expression: 'max(/MikroTik RB1100AHx4 SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 7eda5e5f336a4366801c4cf98cf13520
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 858fcf334125405aaed104a0f50d4097
+                  expression: 'max(/MikroTik RB1100AHx4 SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 79d3b5dad8af46c7972b28b208a439f6
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d6e6ca097afd4c1fa12e1c67f9a575db
+                  expression: 'max(/MikroTik RB1100AHx4 SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: bc3bcbb9babe4f3d8a27de335ab2352e
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB1100AHx4 SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik RB1100AHx4 SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik RB1100AHx4 SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik RB1100AHx4 SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: cd991f115dfa4aed82ca363bea78c951
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: c8379a61cf50439ca8fcf6e7bd9e1882
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f1f871ee559e4cebb1fd1f535a38e01d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 0d04c1ee59454dc2a6207ef39dfbcc1b
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e0f09269707249ff95ccf4024c907f2f
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 3df5076b23ef4e05aa6bf24be663f6f0
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: cbd4c9b8a0f64ea394f9d2d542aa25ef
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 0e75174bf57445c3852ef11b342b2892
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 774b0b02798a40fd95127ad17e182a03
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: fffdd563250347e4b489c9fa4d61bc87
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 3c94839027f64bddbc6b3d5abd0cc0bf
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: f0f924ded1064d70964e5669eb1e3a62
+                  expression: 'last(/MikroTik RB1100AHx4 SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 731d669f787c45609df243f28ba610a3
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 5b2a71ca1ecc4b24a42415100fcfe2fd
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 89ebfc327e5b4b63ae6571bd671489d9
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 94c3ff07a2aa4e1f9e7a5fcd35ae0d33
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: e665c0343ae140d08b8ae96b6c28f4d4
+              expression: |
+                last(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB1100AHx4 SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: c685347700044a78a38e4e892d3dfec4
+              expression: |
+                last(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB1100AHx4 SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik RB1100AHx4 SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB1100AHx4 SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB1100AHx4 SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 15c1c509c03540449b26d7ae9ce99cdd
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik RB1100AHx4 SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik RB1100AHx4 SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: f74fdb024a054e26881e5e90804f9fee
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik RB1100AHx4 SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/README.md
new file mode 100644
index 00000000000..537ea09144d
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik RB2011UiAS-IN SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik RB2011UiAS-IN.
+
+Desktop metal case, 5xEthernet, 5xGigabit Ethernet, USB, LCD, PoE out on port 10, 600MHz CPU, 128MB RAM, RouterOS L5
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik RB2011UiAS-IN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik RB2011UiAS-IN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB2011UiAS-IN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB2011UiAS-IN SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik RB2011UiAS-IN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB2011UiAS-IN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB2011UiAS-IN SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik RB2011UiAS-IN SNMP/system.hw.firmware,#1)<>last(/MikroTik RB2011UiAS-IN SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB2011UiAS-IN SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik RB2011UiAS-IN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB2011UiAS-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB2011UiAS-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB2011UiAS-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB2011UiAS-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik RB2011UiAS-IN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/RB2011UiAS-IN
diff --git a/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/template_net_mikrotik_RB2011UiAS-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/template_net_mikrotik_RB2011UiAS-IN_snmp.yaml
new file mode 100644
index 00000000000..0bfa5a7146c
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/template_net_mikrotik_RB2011UiAS-IN_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:08:14Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 8cf537f34600403b9de31d3db4eb2a1d
+      template: 'MikroTik RB2011UiAS-IN SNMP'
+      name: 'MikroTik RB2011UiAS-IN SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik RB2011UiAS-IN.
+        Desktop metal case, 5xEthernet, 5xGigabit Ethernet, USB, LCD, PoE out on port 10, 600MHz CPU, 128MB RAM, RouterOS L5
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 1dfd38ddc91a4e70980734a4cfcc38e0
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 84b149555c7a4ba896260eef821e65e4
+              expression: 'last(/MikroTik RB2011UiAS-IN SNMP/system.hw.firmware,#1)<>last(/MikroTik RB2011UiAS-IN SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB2011UiAS-IN SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: e85420056601495aa0b7da67042a941a
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 4b177e4109404eebaa6674b8fc36953b
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 5444e9d45fd5482b9913f33a0e46afac
+              expression: 'last(/MikroTik RB2011UiAS-IN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB2011UiAS-IN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB2011UiAS-IN SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 54cf84706fad45a2af8d42f928108c4d
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 7297756962334a7e92bec8fba24cc346
+              expression: 'last(/MikroTik RB2011UiAS-IN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB2011UiAS-IN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB2011UiAS-IN SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 21c6ba2b92674bec82e2d438bcfc9bc0
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 23d7f8ca24e44c41a92fefa63b41e176
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 3008075b5b134c3db792e591ae7ca316
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 3f856c135f7a4124b606a368ddbaea70
+              expression: 'min(/MikroTik RB2011UiAS-IN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: b8d5bf8f5a274ef68254b5ba1bf2e06e
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: e8f42ba36969459bae7a4fbbbf9acd17
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 660252e504e242f39a8116ef95593088
+                  expression: 'min(/MikroTik RB2011UiAS-IN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: ae1265d4feac404f874035b440c0704b
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB2011UiAS-IN SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 9274cb0e9be74c7fa259dd5575fb3c96
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 3a8df6e05ca442c0888c58afe63cae06
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 8c905104ec08406bbb9eef074386d533
+                  expression: 'avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: b78a65cb7a81475390b652bb998bad77
+                  expression: 'avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: d86c54c62fcd456aa879a23aa539fdc7
+                  expression: 'avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: d1f11d8c8a4e42a9b77fe3c263c43d00
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: b6d115a3a9d84dfbbf6800b35a8988d5
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 0ce7d965b0ce4e259dad9ef1c964cf75
+                  expression: 'avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: e6e1ac1371c8479a8c9b30513f10c57b
+                  expression: 'avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 5f04a5beb30c4fc48c3553f41631ec8e
+                  expression: 'avg(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB2011UiAS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: f2ae9156eac7461183251fe44606a804
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 84c75bb385dc4a3fb17713eb169ef8e1
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 9e5b175a657040acb532677e5e3efd4e
+                  expression: 'max(/MikroTik RB2011UiAS-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 575cdf6fe364405d8f5815d6f511f551
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 3e5f0494aec9433ab7d7637fab2095f2
+                  expression: 'max(/MikroTik RB2011UiAS-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 91fd8a8ecde749a8a689da2014049c76
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 52cfc831296f4ebbb9bb9d66a164c129
+                  expression: 'max(/MikroTik RB2011UiAS-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 46641f0183c24377a291635a57fb5b15
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 22da96573bbd471785f694bbdbca7cd1
+                  expression: 'max(/MikroTik RB2011UiAS-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: ab60feb4736e4a50988b1d721e1caacf
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB2011UiAS-IN SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik RB2011UiAS-IN SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik RB2011UiAS-IN SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik RB2011UiAS-IN SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: e3027e0691a94961bd3955fdaeb10344
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: d1424ea6d6bb405dbcc828a7cd331fc2
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7a0f50f929db4a38985261b221885ea2
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e2113b513f02404c81ae0a924d51596d
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 18cb28a2ab264dc1acbb998f94a505ec
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: ff5d2e77f98e444690506781950f0421
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: ed8e11b608b84f5a803e37c11d22253c
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 85baf735bf374522aa03368ef023bd31
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b931d7192a004ec9bd0986617bf7d61e
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: d09039bc2f7f4f8b8ba5263c5e44bde1
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 6939f8f2f12342ca8ef18c87ed5e78d0
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c5d53608ecb34d68a3d1ffbe5807dabb
+                  expression: 'last(/MikroTik RB2011UiAS-IN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 18663281a59f4b2190affab16310ce72
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 5a365ef0ba0d42f390d0810dc0165187
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: ca68df704e444123a01895d9256b1f97
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 32c7e5e885304b859f223bc0575c92e1
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 388504f73df94d21bea32bdbda0fadb7
+              expression: |
+                last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: ef0ef8ddead24672adf8e65eed13f60f
+              expression: |
+                last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011UiAS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 34f9709c906243f0bc22557121a55f03
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik RB2011UiAS-IN SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik RB2011UiAS-IN SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 94e38f4bb3614d12917ffd17a0d544a1
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik RB2011UiAS-IN SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/README.md
new file mode 100644
index 00000000000..a3988b37a59
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik RB2011UiAS-RM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik RB2011UiAS-RM.
+
+1U rackmount, 5xEthernet, 5xGigabit Ethernet, USB, LCD, PoE out on port 10, 600MHz CPU, 128MB RAM, RouterOS L5
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik RB2011UiAS-RM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik RB2011UiAS-RM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB2011UiAS-RM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB2011UiAS-RM SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik RB2011UiAS-RM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB2011UiAS-RM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB2011UiAS-RM SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik RB2011UiAS-RM SNMP/system.hw.firmware,#1)<>last(/MikroTik RB2011UiAS-RM SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB2011UiAS-RM SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik RB2011UiAS-RM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB2011UiAS-RM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB2011UiAS-RM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB2011UiAS-RM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB2011UiAS-RM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik RB2011UiAS-RM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/RB2011UiAS-RM
diff --git a/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/template_net_mikrotik_RB2011UiAS-RM_snmp.yaml b/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/template_net_mikrotik_RB2011UiAS-RM_snmp.yaml
new file mode 100644
index 00000000000..3e4fa4e0686
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/template_net_mikrotik_RB2011UiAS-RM_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:08:16Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 969cf5dca58f47f0b271ccf62ef79c13
+      template: 'MikroTik RB2011UiAS-RM SNMP'
+      name: 'MikroTik RB2011UiAS-RM SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik RB2011UiAS-RM.
+        1U rackmount, 5xEthernet, 5xGigabit Ethernet, USB, LCD, PoE out on port 10, 600MHz CPU, 128MB RAM, RouterOS L5
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: df95ed3cd37c4460bf643d9c1ec30cae
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: e0f5e6575df14242a14813cf95f763d2
+              expression: 'last(/MikroTik RB2011UiAS-RM SNMP/system.hw.firmware,#1)<>last(/MikroTik RB2011UiAS-RM SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB2011UiAS-RM SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 5e688e8e57d84ec79f78cad69914ea96
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: a4028eb828784fef80489e16e3d78659
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 09d6eff5d5e24ba9801d29a594913c5e
+              expression: 'last(/MikroTik RB2011UiAS-RM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB2011UiAS-RM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB2011UiAS-RM SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 7c089e6fa1464c92ae25265351e46c61
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 2cfe859d44ee4088b3a62f832391091f
+              expression: 'last(/MikroTik RB2011UiAS-RM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB2011UiAS-RM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB2011UiAS-RM SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 796e3dc988dd43ff8a7ea11a8eeac257
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 456b72f5cd6d4a64871345d150068244
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 5e68cf8cdbed4517a7b6828be1cc4aab
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: f32f4750dd6f469d84560e0a27dad550
+              expression: 'min(/MikroTik RB2011UiAS-RM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 670bb575294046a48f794a2dc778a5da
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 9d2d64319d2d42d1be4381adce895a62
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 544c2e61e9b0434e962823246974ede8
+                  expression: 'min(/MikroTik RB2011UiAS-RM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 7fe947fc9d9e480a8d0fa0eac5c893ba
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB2011UiAS-RM SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 3872a0f5d79e4e8a97af4e82d1221407
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: f053aa3feb9047cc9c50da0e861ce16a
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 1dc430575d5546c188615191fdc50ae7
+                  expression: 'avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 04ef546dd200411d84f167a5e1ffd8ce
+                  expression: 'avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: f24798b46eea407cb2bd9e38068e68d9
+                  expression: 'avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 5ac26b1da21e436fa20f5234304acc75
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: ae93311998d34ec9bd1ce91b895d758d
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 81e424e84231418d888ca1a9126c29fa
+                  expression: 'avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 53bc0055eacf4e9d931498e89811e86e
+                  expression: 'avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 9635cda9637b4216adb68675640639c2
+                  expression: 'avg(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB2011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 70b4d26ec96d45e781afeebe746ba1e7
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: cb24ba6daff44ede865706f777e49558
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: bd8b0cbb30b144bc82b91f508de543e1
+                  expression: 'max(/MikroTik RB2011UiAS-RM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: b93fca52bea34a168af7374f8d2c04ee
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: b2c222622bd8405a8f3f8138969e4d00
+                  expression: 'max(/MikroTik RB2011UiAS-RM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 67cae98893f642d2b0c4bdf11db1a30b
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 3fe7fc4d601143a58ebd8affe7ee78a5
+                  expression: 'max(/MikroTik RB2011UiAS-RM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 6c149338df7843e6bd195558d9d12ee8
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c70991ad8d2b460bb2b4860b16ba45b4
+                  expression: 'max(/MikroTik RB2011UiAS-RM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: a48cfa3fb1e443448d7b2a2d5f93ac3b
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB2011UiAS-RM SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik RB2011UiAS-RM SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik RB2011UiAS-RM SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik RB2011UiAS-RM SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: b3809e90799748f5ba6f8215b17c80df
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 20ddae019a2c469ea1ae211e09d87b5d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e6fdab57c4ac4d7db29e020ca2be465a
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 9a9a7b48404b47b1bca12b6aace8a025
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 70d5dd712b5b4993bf050410fccd1794
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 99ae41fb9ba84763884d3eb02f70de96
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: bae34f809a49486193684d22232e315a
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 2ee6fbfd5e584b1485a9e2aa23e41945
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: ed5ba3fc1d4142f5a42dd75e57bf5583
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: fbb5e46eab824ff894528a54702ac824
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: c0b897b0fee1406fa0fe6a5d50debd27
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 555d5c8083fe42f09096097e1bb87499
+                  expression: 'last(/MikroTik RB2011UiAS-RM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 6c508160b0494f7da7b44c6952db5042
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 56ed6da227c44c3399700f2bb4eb936a
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 40724614055e428db71f41bd19d4924a
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 350d841e1f99454283606a8af07f20d8
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 728a9e55d14b4b859caf170cc910879e
+              expression: |
+                last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 12ffbe36a2e14c139f5d662ea509912d
+              expression: |
+                last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 9f02d5eaea4c4b7cbc3211d80841fa58
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik RB2011UiAS-RM SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik RB2011UiAS-RM SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: ebe8e5c8da874fdebb1f42864ca6b3e2
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik RB2011UiAS-RM SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/README.md
new file mode 100644
index 00000000000..09ca91966d5
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik RB2011iL-IN SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik RB2011iL-IN.
+
+Desktop metal case, 5xEthernet, 5xGigabit Ethernet, PoE out on port 10, 600MHz CPU, 64MB RAM, RouterOS L4
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik RB2011iL-IN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik RB2011iL-IN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB2011iL-IN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB2011iL-IN SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik RB2011iL-IN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB2011iL-IN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB2011iL-IN SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik RB2011iL-IN SNMP/system.hw.firmware,#1)<>last(/MikroTik RB2011iL-IN SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB2011iL-IN SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik RB2011iL-IN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iL-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iL-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB2011iL-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB2011iL-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB2011iL-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB2011iL-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik RB2011iL-IN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/RB2011iL-IN
diff --git a/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/template_net_mikrotik_RB2011iL-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/template_net_mikrotik_RB2011iL-IN_snmp.yaml
new file mode 100644
index 00000000000..b9d098fbf2a
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/template_net_mikrotik_RB2011iL-IN_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:08:08Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 141438a05f904b518c7d3ddfbbabf91f
+      template: 'MikroTik RB2011iL-IN SNMP'
+      name: 'MikroTik RB2011iL-IN SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik RB2011iL-IN.
+        Desktop metal case, 5xEthernet, 5xGigabit Ethernet, PoE out on port 10, 600MHz CPU, 64MB RAM, RouterOS L4
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: fce13abb920940cdb20cdf70f2e94d90
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 0bc8753d55d047cd870eb7bd2db7849c
+              expression: 'last(/MikroTik RB2011iL-IN SNMP/system.hw.firmware,#1)<>last(/MikroTik RB2011iL-IN SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB2011iL-IN SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 45bdf887a0a3433cbb77a9ce792f2fec
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 2f862ca4d6854c9bb56c46303cb5fd0a
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 4a87af156bc44861bcd76514d60183f5
+              expression: 'last(/MikroTik RB2011iL-IN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB2011iL-IN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB2011iL-IN SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 71a6d0a5cfd94c14b97af236ce4fc1c9
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: b5b061ff649547e6b63bdd9dc545c652
+              expression: 'last(/MikroTik RB2011iL-IN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB2011iL-IN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB2011iL-IN SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 54b4475f0bfb4c02b1f4fc68d4288bb7
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 2e60d597dcc94824bea105b5e51e5d06
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 700227d0426b44ee87a5f33ef5b5b29e
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 8e0b50b2687a4259ba9b9457c6a2d911
+              expression: 'min(/MikroTik RB2011iL-IN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: e909a37161a04c1794f5f27f817ef870
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: bb419ac3a71446909b89fea0503fe8b8
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: c90699faebaa41ccb0910a08ca56c014
+                  expression: 'min(/MikroTik RB2011iL-IN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 9334f197c1014cdcbc079895467af3dc
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB2011iL-IN SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 09873df4de564b1395b88c417a923b11
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 5b12bb4397794b308985b4a866b0f517
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 216c4b7093ce4b1688c24031c61b9e53
+                  expression: 'avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 2c1aefbb49d84198b9dc5b633cc510cb
+                  expression: 'avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: e56cea52d6d64a62a02856a74e32601b
+                  expression: 'avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 65646365a9fe475fa4aaa70dfd653fb9
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 69a55949c8df47d0894f6bdd2247c728
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 77015cbdfaf8411ea08a78982b15885c
+                  expression: 'avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: c3a882d877f94cf7965984128c314f99
+                  expression: 'avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 9c97fd1e8cb94e53a8f8d1bd15b94dcf
+                  expression: 'avg(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB2011iL-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 057ce43acaf24b6a970d0a6368c16092
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 7c28d5b873c241d598e84dead4674d62
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 40ec9ac31c784b6f8de50945dff9f414
+                  expression: 'max(/MikroTik RB2011iL-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: b638cb8d9d014947ae1937b3fae245c8
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: e29bb10956c64db1ba0809112449de26
+                  expression: 'max(/MikroTik RB2011iL-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: e7e5263b25a34b2fa176101cbb3d79c6
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: ae6d45eb89244d67b38408dcaf20424f
+                  expression: 'max(/MikroTik RB2011iL-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 1b3914c1eb1d4e53b38dc9d16670b61f
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: a02267b7d6d4497b98c1c2e465f92796
+                  expression: 'max(/MikroTik RB2011iL-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 847089ea1c2245b198b3a176b2d27fab
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB2011iL-IN SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik RB2011iL-IN SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik RB2011iL-IN SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik RB2011iL-IN SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 0f19e3b4d64c4ae6acedd0fbd2094942
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: bd7e6ea3407e4f798b978589ea6b8613
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 589dcc0883b94ab59cd9d549242aa01d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b7013da0523b4257ad6cf10919d2e446
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 1cfeb4f0b1c84205b20c007d52a20fdb
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: d79f7c775cdb48f39909b6ca7e4ef9d3
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: e8d6873c8ba344398cefa2b7cf0510ba
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: b0ec2ef595354dabadd0d8d4936ab73c
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: c24334458fd446c9b9b72f10c10df63b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 9d1fa283c578496b8dc757b277af72a4
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 2f13b2d5685640fc8290692c26261144
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 58d63b8b9c404a5382b44e25bf091feb
+                  expression: 'last(/MikroTik RB2011iL-IN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 983c946b09b9488690b43ccdaf3969b5
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: ce053243825b43e1818962addf49751c
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: c999deba04d846b38c31642447806540
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: b64d80a23f57425385d5fb8e36c015ad
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: a140f5a63cba423c8f59439efd8d501f
+              expression: |
+                last(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB2011iL-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: c3e3d8a9bcac473e8c641f116355ccbb
+              expression: |
+                last(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB2011iL-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik RB2011iL-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iL-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 3e3f290cf0054136af76e39706d521ad
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik RB2011iL-IN SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik RB2011iL-IN SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 6b29037c9b0143c883790da6cc9c2a28
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik RB2011iL-IN SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/README.md
new file mode 100644
index 00000000000..b28dfdb19ad
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik RB2011iL-RM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik RB2011iL-RM.
+
+1U rackmount, 5xEthernet, 5xGigabit Ethernet, PoE out on port 10, 600MHz CPU, 64MB RAM, RouterOS L4
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik RB2011iL-RM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik RB2011iL-RM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB2011iL-RM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB2011iL-RM SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik RB2011iL-RM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB2011iL-RM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB2011iL-RM SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik RB2011iL-RM SNMP/system.hw.firmware,#1)<>last(/MikroTik RB2011iL-RM SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB2011iL-RM SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik RB2011iL-RM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iL-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iL-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB2011iL-RM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB2011iL-RM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB2011iL-RM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB2011iL-RM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik RB2011iL-RM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/RB2011iL-RM
diff --git a/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/template_net_mikrotik_RB2011iL-RM_snmp.yaml b/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/template_net_mikrotik_RB2011iL-RM_snmp.yaml
new file mode 100644
index 00000000000..6ca9d0d69c0
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/template_net_mikrotik_RB2011iL-RM_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:08:10Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 6d9737c72e5540d39e3553b773a587b1
+      template: 'MikroTik RB2011iL-RM SNMP'
+      name: 'MikroTik RB2011iL-RM SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik RB2011iL-RM.
+        1U rackmount, 5xEthernet, 5xGigabit Ethernet, PoE out on port 10, 600MHz CPU, 64MB RAM, RouterOS L4
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: cb60ed419a0e4d43bd63fda86f86c12a
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 5924d076b0724fbcaa2090c786b20068
+              expression: 'last(/MikroTik RB2011iL-RM SNMP/system.hw.firmware,#1)<>last(/MikroTik RB2011iL-RM SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB2011iL-RM SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: ba01d10fe2254462b4c2eabaa6cf9d6c
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: fc5c04dc408f47708d69d04e51f25d7c
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 5df5c72272694a7f8a698ddda7b662cb
+              expression: 'last(/MikroTik RB2011iL-RM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB2011iL-RM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB2011iL-RM SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 6bc59bf95f73427eaea0c59598d0deb3
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 18fce4771aad421e949e78ec9484a888
+              expression: 'last(/MikroTik RB2011iL-RM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB2011iL-RM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB2011iL-RM SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 4b0e4a132da94cd4b20e1f4ab4428405
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 501e0023828440498faed0e1214efe1c
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 3ddbf0f659724782a930dd42154eb64a
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 454c77360eb44d6aacf067327d1aecbe
+              expression: 'min(/MikroTik RB2011iL-RM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 822fd977341648b0a79966a714e58257
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 070b9699eebe4938b06a464f33bd3154
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 00f27ff850b046faabdaeeae1b2a2fcd
+                  expression: 'min(/MikroTik RB2011iL-RM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: d49245850291438f9eb06c588a2f28cd
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB2011iL-RM SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 0f5f2641521c4f4094bfc3d113df6232
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 45f9905f21b34ac88e8a707b2280171a
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: d4d0bf767e7741fc98d9f930ade655f3
+                  expression: 'avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 4299f4f1519a46ed86d4727cefa01c1e
+                  expression: 'avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 3cc5640941bc491e9cc23cc9b467952e
+                  expression: 'avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 05b63a97b9f248098a9ab7c586f8a866
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 249a48a839cc4961a8949ee8323a6202
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 420f9002f53646729666658f193c733e
+                  expression: 'avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: af33ef97881a4ab48686aa63676c7a2d
+                  expression: 'avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 8aa51a89c64f4626aa8646f9e1717669
+                  expression: 'avg(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB2011iL-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: c08a3dd904394cf29846630497e87d5a
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 886f5cb0ec0544519ab2c3e69cea369a
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 32cb8289aea54c4099ee36d58dd31b72
+                  expression: 'max(/MikroTik RB2011iL-RM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 4e4ca30922404b0ea9dd78e47b26385a
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 32764a33204e41bfb1c5395a52302c27
+                  expression: 'max(/MikroTik RB2011iL-RM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: b006482c393f4f0790f25497b5da6c31
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: eab70beb20504b1d98be8d7cd82031fa
+                  expression: 'max(/MikroTik RB2011iL-RM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 55bb3ead60744b758a12b42c021d0e85
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c08f7ab1fb374e7db4f4c0525009cd93
+                  expression: 'max(/MikroTik RB2011iL-RM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: f1de2d4d636e4fafa6ec513988f3eac2
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB2011iL-RM SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik RB2011iL-RM SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik RB2011iL-RM SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik RB2011iL-RM SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 41277234ea344cb5b42cbb9b4862e1f5
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 138416a8fbbb450b86ab031adb8dcf00
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e70a0e3c001f47bf93fa7458d8a30bf8
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 3555a29c614e4927b577349e0ba3efc5
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 1f07e24ab5e446cabd93af0936878ca6
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: c48101c768414fb09a948bd237086107
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 8b4de033e601487eb8a97e5cdbb3ac88
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 243a3f623bba44c88f1ba3223a6de970
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b1af2acef4104aa5bff253add659c027
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 09b1511e2cd34810a2468ac47e36560e
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 846f7fb0449542b8b4081a98eebe3dd1
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 04bd0420c7474d90b10045328c5027a0
+                  expression: 'last(/MikroTik RB2011iL-RM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: d1f10311b85e4bf3b2c146cdbf888df2
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: e6dd665216134d83aca954fd64d5446b
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: a71336fb643e4c85b67e3fb18244df4b
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 669704d6f48f429eb4a872d8937dd00a
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: a4a3e86a03684038ba779bac1041eaec
+              expression: |
+                last(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB2011iL-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 7202bab5700444f58d4eabd9433f0efd
+              expression: |
+                last(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB2011iL-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik RB2011iL-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iL-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iL-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 1c6cfa9ff24044cebe60949a50aae44d
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik RB2011iL-RM SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik RB2011iL-RM SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: a444848444fc4c06bdec32a9bf7fcf17
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik RB2011iL-RM SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/README.md
new file mode 100644
index 00000000000..ecc69f47c0f
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik RB2011iLS-IN SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik RB2011iLS-IN.
+
+Desktop metal case, 5xEthernet, 5xGigabit Ethernet, SFP cage, PoE out on port 10, 600MHz CPU, 64MB RAM, RouterOS L4
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik RB2011iLS-IN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik RB2011iLS-IN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB2011iLS-IN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB2011iLS-IN SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik RB2011iLS-IN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB2011iLS-IN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB2011iLS-IN SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik RB2011iLS-IN SNMP/system.hw.firmware,#1)<>last(/MikroTik RB2011iLS-IN SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB2011iLS-IN SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik RB2011iLS-IN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB2011iLS-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB2011iLS-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB2011iLS-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB2011iLS-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik RB2011iLS-IN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/RB2011iLS-IN
diff --git a/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/template_net_mikrotik_RB2011iLS-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/template_net_mikrotik_RB2011iLS-IN_snmp.yaml
new file mode 100644
index 00000000000..1f1fed3c9ca
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/template_net_mikrotik_RB2011iLS-IN_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:08:12Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 318fd61c22fa4f1a92a71376814d6c32
+      template: 'MikroTik RB2011iLS-IN SNMP'
+      name: 'MikroTik RB2011iLS-IN SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik RB2011iLS-IN.
+        Desktop metal case, 5xEthernet, 5xGigabit Ethernet, SFP cage, PoE out on port 10, 600MHz CPU, 64MB RAM, RouterOS L4
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: ed51e55b8fa64c5599399fc93d81d329
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 2349e4eac44548349cc9f7806f8726db
+              expression: 'last(/MikroTik RB2011iLS-IN SNMP/system.hw.firmware,#1)<>last(/MikroTik RB2011iLS-IN SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB2011iLS-IN SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 692ccc1f29fe4f15ae7ca0bee54bf6b6
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 0645ecb1a28040d9b89af280ca3093ea
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: f43a3aa77c8e4e9f81add08ac624be88
+              expression: 'last(/MikroTik RB2011iLS-IN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB2011iLS-IN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB2011iLS-IN SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 551f25631a13497b924c1b285b93ee5f
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 76d4c429deaf491982b7b1049634550a
+              expression: 'last(/MikroTik RB2011iLS-IN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB2011iLS-IN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB2011iLS-IN SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: c077abb2ecc84c88b2173bff8e9ab9aa
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 4029907022564beeb405c065ae4febff
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 5521e149584846118dcb280496b3aca4
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: cfca5a71a1534e199e9c3b867b8c6c3b
+              expression: 'min(/MikroTik RB2011iLS-IN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 4de6b86871874118b83ed7cfd31f3113
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 4dcba527c8de49eb90a9cc58e881202e
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 1edf137678504b9d8dced37d9a1d3f5a
+                  expression: 'min(/MikroTik RB2011iLS-IN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 28b696fbb7ce4cf4941932ceb04700cb
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB2011iLS-IN SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: e738626cc9af4c9ba47f18ede6d6ffa3
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 0f06d2c64a2f4b6690736e3f74ea8e59
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: e9ab4a4bc78e47a19409d2bfe4d1d5fa
+                  expression: 'avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 1e81f6308a2748adbed17064d648b566
+                  expression: 'avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 3a679a3d653d42cabed24e238fa01c38
+                  expression: 'avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 6a9998434d8b4a93a7fba87eaf642600
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 53d76ef4e9224a63bd30e3d1fc89542f
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 88fc1612d1b14108a1d90313fa1cb0e7
+                  expression: 'avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 048ffb5e510746e6b56daec287db6739
+                  expression: 'avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: fcc70d3662ac49499a0f5bb68a13c007
+                  expression: 'avg(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB2011iLS-IN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 53adc733f3c34ddd943e5ccb41d1b536
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 23c7a946500a420a87ead3d7c923f176
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d9acbd875f514ce8a19638125c096aed
+                  expression: 'max(/MikroTik RB2011iLS-IN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 93254f62b3e74acaa3c5839b9f844363
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 569c192c940a49f7b180162e4b83be24
+                  expression: 'max(/MikroTik RB2011iLS-IN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 67eb22e623174b06a24460985521d3d4
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 7b31d412d15140d7be66d4b9963150de
+                  expression: 'max(/MikroTik RB2011iLS-IN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: dda3ef44c9204c46a8affb68aeeec803
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 7512216ac6e24d5f88a187621d0d7285
+                  expression: 'max(/MikroTik RB2011iLS-IN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 360063285da04ed29523562086c769c4
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB2011iLS-IN SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik RB2011iLS-IN SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik RB2011iLS-IN SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik RB2011iLS-IN SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 65ce926cc8bb4e55859204eb287c640b
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: bb7c28ff27104b0a8aa8f7052f71dd32
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 437edde63aa74619a3f4531039c1e73d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 091618c93d8a405a94d4147d18d985d7
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: af82a882030b45ca90805a13bf4390f5
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 616f6787b7e8427aa727711c115afbed
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 9ab6be8cd3f44b7ba6df32589b844e77
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 29efb756bbc44a2bbd772633279cd754
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 0921eb633d6d44f2add1031cbc5ae2fa
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: a7a9c42aa3054035b9190a38f3456e44
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 23b17acfff4246208f744864e5af2108
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: bcb6d9302db14ee3a7dd120304b7a5a5
+                  expression: 'last(/MikroTik RB2011iLS-IN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 162e5f08fbcc4ad88fdb633731bd942a
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: fbeab8db403d458b96fcd8084bd98f60
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: ad4d9e4a1a5341fa841eecdd84acf8b8
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: fa6b2e7962e84b53ad0f7909984e6bca
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: c3e8a5f013f34395afeffc5eabbe01ac
+              expression: |
+                last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 2199168e964c4bd79ad06de3c1226f1d
+              expression: |
+                last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB2011iLS-IN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB2011iLS-IN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: baa457270f57426da7d271df998f8c83
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik RB2011iLS-IN SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik RB2011iLS-IN SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 8a6c7b5e3e4d4cc580e3f323fbc623b4
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik RB2011iLS-IN SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_RB260GSP_snmp/README.md b/templates/net/mikrotik/mikrotik_RB260GSP_snmp/README.md
new file mode 100644
index 00000000000..6668a4a7b45
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB260GSP_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik RB260GSP SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik RB260GSP.
+
+5x Gigabit PoE out Ethernet Smart Switch, SFP cage, plastic case, SwOS
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik RB260GSP SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik RB260GSP SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB260GSP SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB260GSP SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik RB260GSP SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB260GSP SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB260GSP SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik RB260GSP SNMP/system.hw.firmware,#1)<>last(/MikroTik RB260GSP SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB260GSP SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik RB260GSP SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB260GSP SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GSP SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB260GSP SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GSP SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB260GSP SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB260GSP SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB260GSP SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB260GSP SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik RB260GSP SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/RB260GSP
diff --git a/templates/net/mikrotik/mikrotik_RB260GSP_snmp/template_net_mikrotik_RB260GSP_snmp.yaml b/templates/net/mikrotik/mikrotik_RB260GSP_snmp/template_net_mikrotik_RB260GSP_snmp.yaml
new file mode 100644
index 00000000000..855ec54e024
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB260GSP_snmp/template_net_mikrotik_RB260GSP_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:08:18Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 5331ecc3be9f47d6a8eb0732ae141239
+      template: 'MikroTik RB260GSP SNMP'
+      name: 'MikroTik RB260GSP SNMP'
+      description: |
+        The template for monitoring Switch MikroTik RB260GSP.
+        5x Gigabit PoE out Ethernet Smart Switch, SFP cage, plastic case, SwOS
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: df5bf48843cd4981bf719769b3194a3d
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 1f05ddb5fc1c4d18a5d9f5755b22a080
+              expression: 'last(/MikroTik RB260GSP SNMP/system.hw.firmware,#1)<>last(/MikroTik RB260GSP SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB260GSP SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 50100a89b236431d9ba7e4f2352fa2b9
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 65a753ce87934f75aa719e3e59f76dbd
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 9bc744f5b70748e68b13933b618f9550
+              expression: 'last(/MikroTik RB260GSP SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB260GSP SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB260GSP SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: b5a74fe98a7948a9b189953b457b2975
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 72cedbd4d23948c3941d5b2011f5cdab
+              expression: 'last(/MikroTik RB260GSP SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB260GSP SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB260GSP SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 806938d083e848b4b84b2c222c4f4d2e
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 0d4cc61a9f8c44f385606bc8394eaeb4
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 836ba120a51d4c659c034e3a94003c0f
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 971f8265db9348ce942f4e0adb49bd1a
+              expression: 'min(/MikroTik RB260GSP SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: f83ea9e9a0e646f5a9b8c7e1e0290512
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 11a2162c7c734d0d935ca5b5e03b0b1f
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 636401049a4e46c48e7b89e2b0c8c72b
+                  expression: 'min(/MikroTik RB260GSP SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 32c572f1f36545299c21cb9a3b46365f
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB260GSP SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 6ccb140a18804e2a955f89063f3d1fba
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: cff4aeb5cf4b4349858983fca3deb508
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: fac1eacc650b485faa1f05207a865ed6
+                  expression: 'avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: c604329ca3374ed5b29339c10070b9de
+                  expression: 'avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 37927a5941e245d9bce883ce155fefdf
+                  expression: 'avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: e0d8cd7456724c0690548859ea217994
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 77bba6eb9e9f4c7dafd8ecb0d895aa4d
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 4f2a304aba6e45c7a0186d8b069be904
+                  expression: 'avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 7ab0db29abff475d908e9db2e86ee16a
+                  expression: 'avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: ae7e34f53a3d407d86484baffad515fe
+                  expression: 'avg(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB260GSP SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 4176400783ec41aca75e6edb5a2e7950
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: a9d05b694288494c8a67065fae149b7e
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: a7d31dad39524586ad9cca3c52ab0802
+                  expression: 'max(/MikroTik RB260GSP SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 0da46f1b48e34e8d866bdcee4c4f318e
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: abae11ffeea140debcd8f32c34f10f31
+                  expression: 'max(/MikroTik RB260GSP SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 9960c89e7efd40ea8df4da693350156b
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: f7804db0113d42a49322193872ddc616
+                  expression: 'max(/MikroTik RB260GSP SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 8c703fdcb8fa4ce8978034d004c723fa
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 73f6c8071582400b952f945388a181c2
+                  expression: 'max(/MikroTik RB260GSP SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 00e2b89ffee645e4ac3d95a4219d63ab
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB260GSP SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik RB260GSP SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik RB260GSP SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik RB260GSP SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 5d0bb62dda9747f4bf10059b0b318088
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 82b095474acf43708ed38960e819bac1
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e493d9b31000454ab5322d128fc017dd
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 78e165faa8e84eb5a5b5e33de95667fb
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 3091e881221f4ac79337ee723e18bdae
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 00ffa0a22f24402ca0b28fcd8deb539a
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: faa2bf517e6e46aaa8aebdc4571007b7
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 895e3f8cb6774b13a2e51cbc10f2ddbb
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: dfe08b76e5794a918047afdeecd30244
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: fa59c976b98c4074a04183d569cc9c19
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 22ec1aa3f660417e9b99f341553ff158
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: e159cf84958443ec9d148c3e83cf8e41
+                  expression: 'last(/MikroTik RB260GSP SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 16ccb0c6d72f49e991f2034b06e7ad26
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 4616b7a26c5d4646abe4d8d87f988ae9
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: c227791696414ebf9167558b1e2933f5
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: dd45e3173ac148caa583f5e39aa12889
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: c8c7b25b435e4157a22c8f4d6fce9ea5
+              expression: |
+                last(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB260GSP SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GSP SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: e63fb086de874cfe86e0d03d2d57f157
+              expression: |
+                last(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB260GSP SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GSP SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik RB260GSP SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GSP SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB260GSP SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: eafa602b8f4a4d6883fcd65555057190
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik RB260GSP SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik RB260GSP SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 5a5125a0a5554baa842e1f41fcba86cb
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik RB260GSP SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_RB260GS_snmp/README.md b/templates/net/mikrotik/mikrotik_RB260GS_snmp/README.md
new file mode 100644
index 00000000000..afed53e78a3
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB260GS_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik RB260GS SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik RB260GS.
+
+5x Gigabit Ethernet Smart Switch, SFP cage, plastic case, SwOS
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik RB260GS SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik RB260GS SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB260GS SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB260GS SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik RB260GS SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB260GS SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB260GS SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik RB260GS SNMP/system.hw.firmware,#1)<>last(/MikroTik RB260GS SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB260GS SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik RB260GS SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB260GS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB260GS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB260GS SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB260GS SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB260GS SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB260GS SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik RB260GS SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/RB260GS
diff --git a/templates/net/mikrotik/mikrotik_RB260GS_snmp/template_net_mikrotik_RB260GS_snmp.yaml b/templates/net/mikrotik/mikrotik_RB260GS_snmp/template_net_mikrotik_RB260GS_snmp.yaml
new file mode 100644
index 00000000000..6775f3596aa
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB260GS_snmp/template_net_mikrotik_RB260GS_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:08:21Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 1a74dd95e7244493a1b13b94fe9dd9e8
+      template: 'MikroTik RB260GS SNMP'
+      name: 'MikroTik RB260GS SNMP'
+      description: |
+        The template for monitoring Switch MikroTik RB260GS.
+        5x Gigabit Ethernet Smart Switch, SFP cage, plastic case, SwOS
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 1f05547dfa4146bd837288c6cfb0b0e4
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: a5f7839a9a0d4272ae0312b8954a9313
+              expression: 'last(/MikroTik RB260GS SNMP/system.hw.firmware,#1)<>last(/MikroTik RB260GS SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB260GS SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 286376d7fb9e4fa9a608d7494b500f4f
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: ad481c4efe304683ac539107a121b10a
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 672fcd1d34374373b0992d80d46d885c
+              expression: 'last(/MikroTik RB260GS SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB260GS SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB260GS SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 111bd5c32550427682bb0e683754fda9
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 7538c487e4f14cdcb6fc3a6b415ed559
+              expression: 'last(/MikroTik RB260GS SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB260GS SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB260GS SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 1b352f84778349c78422b9d4c648d05b
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: f3f37d9595244448ab98704c49678800
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 10858c87568841f688e9b0b7e43811dd
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 6975f0abf1504caebd3a13193da1bdcc
+              expression: 'min(/MikroTik RB260GS SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 3c377424bbb24740bebe49250a6770f5
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 3285f355316a4c1d9171f8cacd8f4928
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: f6b89443734b4c79920496ff9244f6d3
+                  expression: 'min(/MikroTik RB260GS SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 9fc1b8a3fef146648e8e34ad5be8f5e3
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB260GS SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 16f1d8ca6a654816ae56e2cd00016ba1
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 57e73f67141a42ec92a04c3d9d394907
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: b9eee5f17d084ba7b6971aaf6165b313
+                  expression: 'avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 64193d2ccc1c4813b8585b5d3d81f962
+                  expression: 'avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: be0ff2612a014f2db296b4066c22cfdd
+                  expression: 'avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 12053fcb928a4b788734ea4010de08fd
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 6fcfd9b1a6324b23a5705a7118874be2
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 3035592657fe4a6a89fcacbd05f84573
+                  expression: 'avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 5ae663e6743744bba8606334ab17eb60
+                  expression: 'avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 635d0ddc5ba6442bbb51ea451f502662
+                  expression: 'avg(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB260GS SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 407a0b73cfc041e3a338d9e8fe637fe9
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 166695395ca44bfab7cdacb6737a2c29
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 6eb10d964aaf44bb8849f35f39e6b909
+                  expression: 'max(/MikroTik RB260GS SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 8f6aea26ce3744298233fa751137b0b0
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c8c83d70279b461c95f5c8f4deb59d7e
+                  expression: 'max(/MikroTik RB260GS SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 37c41907076142bfb5a8884f959960f0
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 557d79e0013b4b91a16ce2a0c507256a
+                  expression: 'max(/MikroTik RB260GS SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: e019cd1da3644f5592ccdb904f8eda47
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: fddeb17ef9dd4876b9ba818d732cbd40
+                  expression: 'max(/MikroTik RB260GS SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 7972b1fd0ffc46148f1a8f27bf4ac1b6
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB260GS SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik RB260GS SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik RB260GS SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik RB260GS SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 9ce0b88fb735494aa3854a64f2c84f4d
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 6cae369274a844128a5e524c2e453416
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 3e08aa7a5e9743b8bcc416a0e94c0310
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: fb4354c77ff94515954a4a4b537ac235
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 5c90dc649ab14bbfb174af66aa5cfb2b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 5eae6da3d4684988abad5add9da275fd
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: cb2ad2c7ab5c4399b70031fd7c31f772
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 2dd6648a8d9941b587b5fd248562c6e7
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 88092d9350254ce1ac44524b33f502b8
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 5cd10bfcae974f26865be0847bd481b1
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 05bba59e89ff4812a11393bc88e357ae
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: cc74f3058c1945a59c95d49e3fdbb47b
+                  expression: 'last(/MikroTik RB260GS SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 49c4ca48be2543ec9aab27b52c4a4f8b
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: ed6f9d957ccc4a85a638b239082d0013
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 7d835648f2f64bf1a1615e9e70822ccd
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: f078344e85614978973618685d022859
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 67f66bb09eba4cb2b823fbf96391e0ca
+              expression: |
+                last(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB260GS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: f28661579bf04f6eaa1bc06f92f8d8f2
+              expression: |
+                last(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB260GS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik RB260GS SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB260GS SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB260GS SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 2854850c8c14498b9256fd64027455d6
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik RB260GS SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik RB260GS SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: ee6f5b2202f14999b71f5713fdbf15fa
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik RB260GS SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/README.md b/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/README.md
new file mode 100644
index 00000000000..7f8942116a9
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik RB3011UiAS-RM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik RB3011UiAS-RM.
+
+1U rackmount, 10xGigabit Ethernet, SFP, USB 3.0, LCD, PoE out on port 10, 2x1.4GHz CPU, 1GB RAM, RouterOS L5
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik RB3011UiAS-RM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik RB3011UiAS-RM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB3011UiAS-RM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB3011UiAS-RM SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik RB3011UiAS-RM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB3011UiAS-RM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB3011UiAS-RM SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik RB3011UiAS-RM SNMP/system.hw.firmware,#1)<>last(/MikroTik RB3011UiAS-RM SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB3011UiAS-RM SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik RB3011UiAS-RM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB3011UiAS-RM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB3011UiAS-RM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB3011UiAS-RM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB3011UiAS-RM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik RB3011UiAS-RM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/RB3011UiAS-RM
diff --git a/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/template_net_mikrotik_RB3011UiAS-RM_snmp.yaml b/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/template_net_mikrotik_RB3011UiAS-RM_snmp.yaml
new file mode 100644
index 00000000000..602e5f6a26a
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/template_net_mikrotik_RB3011UiAS-RM_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:08:23Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: cc762a057f0f467ab571b6d76a9bb278
+      template: 'MikroTik RB3011UiAS-RM SNMP'
+      name: 'MikroTik RB3011UiAS-RM SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik RB3011UiAS-RM.
+        1U rackmount, 10xGigabit Ethernet, SFP, USB 3.0, LCD, PoE out on port 10, 2x1.4GHz CPU, 1GB RAM, RouterOS L5
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 354b56e7cce646c8b143434af11ebd1a
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 4a440903276347d9827dcfa3653d496c
+              expression: 'last(/MikroTik RB3011UiAS-RM SNMP/system.hw.firmware,#1)<>last(/MikroTik RB3011UiAS-RM SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB3011UiAS-RM SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 3da25a0046ac4f2c9ec35d3ac9db9ae7
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: a935a058a7644773b40d0cfbaae218e2
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 7b48c923659d4569b24692da4037b824
+              expression: 'last(/MikroTik RB3011UiAS-RM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB3011UiAS-RM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB3011UiAS-RM SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 14e1297549d74f48be28bdfe70746600
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 80b76f59fdfd407ea5c3294736113749
+              expression: 'last(/MikroTik RB3011UiAS-RM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB3011UiAS-RM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB3011UiAS-RM SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: b0a11ac957ff4b91b2d032ca2e97fd86
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 3702de756584423b93730807b797a1db
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 5e58d0e859a94279b4e52aa4b16d3702
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: d55a4746f70a4d539a9fadd9a335794f
+              expression: 'min(/MikroTik RB3011UiAS-RM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 261714f543bc43bbbbc2784aee405593
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 051141b1443a4312bade08bfa68d97c8
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: e20e628acaae44d58c7f385f98cdb126
+                  expression: 'min(/MikroTik RB3011UiAS-RM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 2567831d8429484887c61f9606cee3aa
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB3011UiAS-RM SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: b63bd0e852a7431cbff672703f5fa68f
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: fd85963c79484ab2964e7cbce4cd666e
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: d009789ee3204089bbd1e60b23fa757f
+                  expression: 'avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 51d2ea964a684bfa85e509e549be251b
+                  expression: 'avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 1cc47452c533402596797c5c6ae8351f
+                  expression: 'avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 9d802db2738d4e0cb7bac8cd574b4283
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 00ec9a3110f54225b1cf7ef17119b63f
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 49bf5605212f44e18a0a9f0e4afde82b
+                  expression: 'avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: d7d5fa71143e4601b41d24ce85031ed2
+                  expression: 'avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 2478f32c04984bd8a53cb9211953d7c2
+                  expression: 'avg(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB3011UiAS-RM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 2f495a17418a47bfb48d7df1128eddd2
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 9e1b7a12b16a4e0a868a34e81b37187e
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 6dcde689dccb4221bffd0c36f000dcf2
+                  expression: 'max(/MikroTik RB3011UiAS-RM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 20c47d65290648a49f68a723111b6d20
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d8d809f110c044bdab269c961b947f0a
+                  expression: 'max(/MikroTik RB3011UiAS-RM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 4f03ff31d0654285828e4a78c960bc5e
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: a935e2731aac466bb21fd0e3c092cb7c
+                  expression: 'max(/MikroTik RB3011UiAS-RM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 5cc7f564912c4827aedb940f59e574dd
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 2193529f37424dc29976bae9681cfff9
+                  expression: 'max(/MikroTik RB3011UiAS-RM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 3faa534c23d641348044d56d871307f0
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB3011UiAS-RM SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik RB3011UiAS-RM SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik RB3011UiAS-RM SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik RB3011UiAS-RM SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: ab13751dc03e482db3d9f98c74fb1e40
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 97f2d5c9a53b425fb490305bbdecb1d8
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 935ca7fa58e94bc2b4783676f57f1788
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b0c6132fffb04ab3a4d392f35d2d418d
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: c7e6451019bd4780bb2ffa717c98ddfd
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 4783ff6618d74aabab4a998467091b59
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 4a884bea9c754839befbf0faf07e39a8
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: bae785059d8b4d5ca3c29a0c64e52858
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: a01aec216aff475ab47c0d1ca9ebb6ac
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 5a6c2c39fd3e444eae67e221721463c0
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 859f9073a0b94928816ad037283b5e0b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 0f33b00af9164264b0d6fc91831a343e
+                  expression: 'last(/MikroTik RB3011UiAS-RM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 16d488e47b614bcca12af8f2493f8a0b
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 164b2f394aa3470faa18ba70e42b458f
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 4f634d0afb6542e0b27347ba8555d92b
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 5f55ba87f4084a4693c3c7f8818b5d6b
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: ccbd9c9dab504a7bab4f403386e5178f
+              expression: |
+                last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 9b4adeaeed41450f839967a3d049b027
+              expression: |
+                last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB3011UiAS-RM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 15a9b60d61574e46a0684cf9ec893347
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik RB3011UiAS-RM SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik RB3011UiAS-RM SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 36790292e1ba4b8db9cd6f9420e8ef06
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik RB3011UiAS-RM SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/README.md
new file mode 100644
index 00000000000..0538d752c18
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik RB4011iGS+RM SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik RB4011iGS+RM.
+
+Powerful 10xGigabit port router with a Quad-core 1.4Ghz CPU, 1GB RAM, SFP+ 10Gbps cage and desktop case with rack ears
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik RB4011iGSRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik RB4011iGSRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB4011iGSRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB4011iGSRM SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik RB4011iGSRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB4011iGSRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB4011iGSRM SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik RB4011iGSRM SNMP/system.hw.firmware,#1)<>last(/MikroTik RB4011iGSRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB4011iGSRM SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik RB4011iGSRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB4011iGSRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB4011iGSRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB4011iGSRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB4011iGSRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB4011iGSRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB4011iGSRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB4011iGSRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB4011iGSRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik RB4011iGSRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/rb4011igs_rm
diff --git a/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/template_net_mikrotik_RB4011iGS+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/template_net_mikrotik_RB4011iGS+RM_snmp.yaml
new file mode 100644
index 00000000000..66e8a3f9baa
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/template_net_mikrotik_RB4011iGS+RM_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:08:25Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 780c4a9a657e42fc83f1ab9a535f5184
+      template: 'MikroTik RB4011iGSRM SNMP'
+      name: 'MikroTik RB4011iGS+RM SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik RB4011iGS+RM.
+        Powerful 10xGigabit port router with a Quad-core 1.4Ghz CPU, 1GB RAM, SFP+ 10Gbps cage and desktop case with rack ears
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: e98ee47f44a24acab59bf6d10a1f6612
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: a61fd73d9dea4257bfbfc3d705475ae5
+              expression: 'last(/MikroTik RB4011iGSRM SNMP/system.hw.firmware,#1)<>last(/MikroTik RB4011iGSRM SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB4011iGSRM SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 176f7b3c6e4848c79f0f0f99021c644f
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: fffcae15a44d4165af9f293a4dfc3134
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: c31be8015ce640629af6cd3ed09dc617
+              expression: 'last(/MikroTik RB4011iGSRM SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB4011iGSRM SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB4011iGSRM SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: a46b0c33e93840e182208a099e6206df
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 991217a368944e34abe41bd465921a47
+              expression: 'last(/MikroTik RB4011iGSRM SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB4011iGSRM SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB4011iGSRM SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 4255253ed78749d597385af02b95c8fe
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: fb1cd4666b1d4ee48141c77a7b9f07db
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 430682c60e8644baa65bcfa66dcd1b37
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 5b0479439c444be284cac4c699f64b53
+              expression: 'min(/MikroTik RB4011iGSRM SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 70b02231b6874b13a6f4f32808c7d7a9
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 54c47bf1d9d64e9c8f45f8d9cfc135a6
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 08f3a59bf7324ff4904737f2c6b94989
+                  expression: 'min(/MikroTik RB4011iGSRM SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 7e342bf419d54f9081e0447dbd3d40ae
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB4011iGSRM SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: f31ffac30e7e40b7bd113a17862810ef
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 6d84a0c0f8904b4db46a4f185c4438d6
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 1c270c25cfdb4b44b35ad7115105dfbc
+                  expression: 'avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 3941319b74e64d8a921714b4748003f1
+                  expression: 'avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 4b669ac2471b442dbfd82e70b0dba586
+                  expression: 'avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: a273bbb0f2744f229f08f83002f9ef09
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: b0106d75e8484aea9c4431ff319a35c3
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: a3bcec91e98349fa9d53cb96aeb377ac
+                  expression: 'avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 9a03df6c9c3141e4845382ea5ae2d609
+                  expression: 'avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: f53807b0daa24b2f9bd3d6ab755008fb
+                  expression: 'avg(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB4011iGSRM SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 3de8323ff508430eac61e3f1104d72d5
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 5d3a719d567647c0914c7f5a742282c9
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 001e4d76e846438592bd8c7b76025e51
+                  expression: 'max(/MikroTik RB4011iGSRM SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 5d1bd43223bf41a699abb04ec1f6bf66
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c8adfeee1f4b42b38ba756919d18ffce
+                  expression: 'max(/MikroTik RB4011iGSRM SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 840ffc4306d843e6ba23b57fe736de14
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c826e712355c4c40a4699346581c1032
+                  expression: 'max(/MikroTik RB4011iGSRM SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: ab9d6abcd72b46dc9fadd9bd638084a8
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: ab44544163f14c31b2c45fe890b62ea4
+                  expression: 'max(/MikroTik RB4011iGSRM SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: c2d5d609a81e41c0b16f1537239761cd
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB4011iGSRM SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik RB4011iGSRM SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik RB4011iGSRM SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik RB4011iGSRM SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: cb00ced4d3d04160a4074cf74455e7ca
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: e88ae445d283419da86347c21756ac8d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 389996b0d06b403da09ea7ad26d2058b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 4126c7d4e1bc442ab3d64decbaf5bc2b
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 8b46ce31662e4784901bb62d8d427db6
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: da476e57bb0545ea9c5586dd359a8016
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 9cbb1cad26b745ad9d18f4666a6380f7
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: ca4f60a9add646869fbed2d3a9c669e4
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 47ad66f9b9be48a2b28bc1c294bc088e
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 3dd8fd21a42f493e81d42799c395f25b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 1fe7cef52ef1453a97a7f23292cf7f6c
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 7830a4b9c5b24762ab083a24c978cf44
+                  expression: 'last(/MikroTik RB4011iGSRM SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: dd1c96b4ca6a4dffb18c17227ccbe0f6
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 4f25df9f57b443e5acd933712e07c480
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 2fd43d9ea33a480286e331118e10bc11
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: c3d7e0d1fed74855897397a27938b090
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 7ec2dad6b1de421d800a086ad45e8fdd
+              expression: |
+                last(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB4011iGSRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB4011iGSRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: e91014be808f40ceba0123f0e59e9975
+              expression: |
+                last(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB4011iGSRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB4011iGSRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik RB4011iGSRM SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB4011iGSRM SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB4011iGSRM SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: a552f5e0c0cc44cfaf344d581d522885
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik RB4011iGSRM SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik RB4011iGSRM SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 9d12a71550b440b4b4b9574a523b5b5b
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik RB4011iGSRM SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/README.md
new file mode 100644
index 00000000000..b9b9ca87570
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik RB5009UG+S+IN SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik RB5009UG+S+IN.
+
+The ultimate heavy-duty home lab router with USB 3.0, 1G and 2.5G Ethernet and a 10G SFP+ cage. You can mount four of these new routers in a single 1U rackmount space! Unprecedented processing power in such a small form factor.
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik RB5009UGSIN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik RB5009UGSIN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB5009UGSIN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB5009UGSIN SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik RB5009UGSIN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB5009UGSIN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB5009UGSIN SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik RB5009UGSIN SNMP/system.hw.firmware,#1)<>last(/MikroTik RB5009UGSIN SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB5009UGSIN SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik RB5009UGSIN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB5009UGSIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB5009UGSIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik RB5009UGSIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB5009UGSIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB5009UGSIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik RB5009UGSIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB5009UGSIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik RB5009UGSIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik RB5009UGSIN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/rb5009ug_s_in
diff --git a/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/template_net_mikrotik_RB5009UG+S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/template_net_mikrotik_RB5009UG+S+IN_snmp.yaml
new file mode 100644
index 00000000000..0a2fdbc741b
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/template_net_mikrotik_RB5009UG+S+IN_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:08:27Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 7b6f7a12a6b449ca926e74c894eca354
+      template: 'MikroTik RB5009UGSIN SNMP'
+      name: 'MikroTik RB5009UG+S+IN SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik RB5009UG+S+IN.
+        The ultimate heavy-duty home lab router with USB 3.0, 1G and 2.5G Ethernet and a 10G SFP+ cage. You can mount four of these new routers in a single 1U rackmount space! Unprecedented processing power in such a small form factor.
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 2031dfc697c244c59e036a0b166772e2
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: d6de889ff3dc4c07a57bb5396a25a760
+              expression: 'last(/MikroTik RB5009UGSIN SNMP/system.hw.firmware,#1)<>last(/MikroTik RB5009UGSIN SNMP/system.hw.firmware,#2) and length(last(/MikroTik RB5009UGSIN SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 6b8b9d12f8d449a5be35d89d8c68719d
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 20e6d99fff5943ff85c2beedb0b292f3
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 6c509b4e298e4df7b4e9cecc064dc8eb
+              expression: 'last(/MikroTik RB5009UGSIN SNMP/system.hw.serialnumber,#1)<>last(/MikroTik RB5009UGSIN SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik RB5009UGSIN SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 2b704d1b595b4fe5aec1f855ff6574ea
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: aafa92f02db4429b8ea5c43f1e13ad4e
+              expression: 'last(/MikroTik RB5009UGSIN SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik RB5009UGSIN SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik RB5009UGSIN SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: aa54b9f3cf6746b897c07e7f3eac3c1f
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: b5a826e18b2941aeb1f3e091928225e0
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 767414861593473896fb39004ea488d4
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 570f6f393cf24ee9b0731978bca9d7d7
+              expression: 'min(/MikroTik RB5009UGSIN SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: b68414c0aaaf439cbf0c1c48bbd7203a
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: e8aa4a6608c64edba3aa8a5dd4008350
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 745e204551104bbca3a2db75f55f04cc
+                  expression: 'min(/MikroTik RB5009UGSIN SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 36b36fdd03504844b5df446a542abc10
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB5009UGSIN SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: c2630a4fef56441895dde6e8dbf415b6
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: d84c08e7bfde4fff825120e5e2431575
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: f7f22555f0524fab8addb969f565b12b
+                  expression: 'avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: a291daa1248f4bfca3bdded26cdd3562
+                  expression: 'avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 4952d45ee57747de90b71e7073da13bc
+                  expression: 'avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 8e19febc9ea54bdfbe8dd05538f03d41
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 63a9a283529a47c1921b9e91925783f5
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: d6ae3c415fa842339e6f1085296fdca3
+                  expression: 'avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 3baba3844f1644e29fa20addb4c483e4
+                  expression: 'avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: f81d3388b38845f1921e30332a487335
+                  expression: 'avg(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik RB5009UGSIN SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 1fe627df6dea431593ca811a29049908
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 7eec5f18909443408ac504689dd3035b
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 77565b5e0dbb4415b5f24ebe91d6e5b9
+                  expression: 'max(/MikroTik RB5009UGSIN SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: cad3593fb06346f7b8e5d293c570dc32
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 271d7342775141cabcebb53ecb7e9a14
+                  expression: 'max(/MikroTik RB5009UGSIN SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: bbd99dc8983d44e2956f81592def392c
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: bea4466e83fd4733b269d92657e1107e
+                  expression: 'max(/MikroTik RB5009UGSIN SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: a7b2478c97854e1b8eab67bb0da603f1
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 53ef6c7af6114f5e8f76d15aa82d33d8
+                  expression: 'max(/MikroTik RB5009UGSIN SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: e00f330b8e514a87b6d08c298b7d03f6
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik RB5009UGSIN SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik RB5009UGSIN SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik RB5009UGSIN SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik RB5009UGSIN SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 568c8d68683744a091aa4c40ea902e5d
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: ab249acfd6fd4e4384b08caa78975a27
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 6a4a5b09f98c48aca9f95166549411cd
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 803e24bc996e4ad69242c12b62040f19
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 4c6a4b99a41248a28779e5c3ed5f195f
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 1442e5f206ed4fa99f9a0b711da2e40d
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: f6efd53d717a49dc9b9e96cc6a670181
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 4cfce086b7904dbf859af6049c31e1bf
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b0f8d38a88534138a571429d09d2a728
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: da3f58e212c44b5aa39475a65038595c
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: aaf43960f1554a9986d09de5d19238b7
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 67152198cf984ffeb453d6f149aae38f
+                  expression: 'last(/MikroTik RB5009UGSIN SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 110e21a587044f2486479bd583cb21e1
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: d268756d1e3b4557ace5aac8491e1fc8
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 303a899d2a19448dab031c6265a5ebdd
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: cd0f312fa6044c639abb345c6297ab6b
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: da49d6b3b96c4c32b1439d13a289a2ef
+              expression: |
+                last(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB5009UGSIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB5009UGSIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: dd9a814580fd47be8982b9ca83217070
+              expression: |
+                last(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik RB5009UGSIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB5009UGSIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik RB5009UGSIN SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik RB5009UGSIN SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik RB5009UGSIN SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 2bcf421df683424fa9bff018ec7135b7
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik RB5009UGSIN SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik RB5009UGSIN SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 00b301e0452b4c43abdba945529c667d
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik RB5009UGSIN SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/README.md
new file mode 100644
index 00000000000..ef3f63dfc2c
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik hEX PoE lite SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik hEX PoE lite.
+
+5xEthernet with PoE output for four ports, USB, 650MHz CPU, 64MB RAM, RouterOS L4
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik hEX PoE lite SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik hEX PoE lite SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik hEX PoE lite SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik hEX PoE lite SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik hEX PoE lite SNMP/system.hw.serialnumber,#1)<>last(/MikroTik hEX PoE lite SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik hEX PoE lite SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik hEX PoE lite SNMP/system.hw.firmware,#1)<>last(/MikroTik hEX PoE lite SNMP/system.hw.firmware,#2) and length(last(/MikroTik hEX PoE lite SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik hEX PoE lite SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX PoE lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX PoE lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik hEX PoE lite SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik hEX PoE lite SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik hEX PoE lite SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik hEX PoE lite SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik hEX PoE lite SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/RB750UPr2
diff --git a/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/template_net_mikrotik_hEX_PoE_lite_snmp.yaml b/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/template_net_mikrotik_hEX_PoE_lite_snmp.yaml
new file mode 100644
index 00000000000..9012c6b498c
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/template_net_mikrotik_hEX_PoE_lite_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:45Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: a5ddacdd5ac64b82bf5183769cc03e8c
+      template: 'MikroTik hEX PoE lite SNMP'
+      name: 'MikroTik hEX PoE lite SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik hEX PoE lite.
+        5xEthernet with PoE output for four ports, USB, 650MHz CPU, 64MB RAM, RouterOS L4
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: f9085ebffffa4e2abca0aa7c0e50599f
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 81f162170b3f4cf0a5376f43ba8c826d
+              expression: 'last(/MikroTik hEX PoE lite SNMP/system.hw.firmware,#1)<>last(/MikroTik hEX PoE lite SNMP/system.hw.firmware,#2) and length(last(/MikroTik hEX PoE lite SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 3d8a9da605f74a9089b49def0f6a4bff
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: e35a6c46c241466a9d96f1017bf3b467
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: ba2f0b5e00a94aff9db6b436a64b91bd
+              expression: 'last(/MikroTik hEX PoE lite SNMP/system.hw.serialnumber,#1)<>last(/MikroTik hEX PoE lite SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik hEX PoE lite SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: c25789ed5a2e40b090016c759c5a96cc
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 857cc7715ae243879509d5ba827f0533
+              expression: 'last(/MikroTik hEX PoE lite SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik hEX PoE lite SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik hEX PoE lite SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: c45124bc11da4ebebf0dc1a9cd7c261e
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 45ec9416e047428b8c535f95985bb61d
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: d7aa64e64e534b1e9dbd65dd2bdda819
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: f328399a209d4adaa8fed3dc9577539f
+              expression: 'min(/MikroTik hEX PoE lite SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 2a630c50c8bc4b5d895accbe43af54f8
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 3cc001fddd7848d29d829479fbb74279
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: ecb6b125d94643cf80b38078f1d42ad2
+                  expression: 'min(/MikroTik hEX PoE lite SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 150c76d3d44a4025904f4b0b57ff37be
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik hEX PoE lite SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 9abd143a230545b5912e56ebdeff5fad
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 69b35a7a4e60483c9bf69367b6151d06
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: b7ab6a1e8efd4accaeef15ed26b66308
+                  expression: 'avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 5a24a5c02664439da2ee76753e25ec8a
+                  expression: 'avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: c21ad0f3058d4a57a1dc137576217655
+                  expression: 'avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 399c977682b54f21a2de66c620e30f13
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: bbd42a0a59854a0cb8e8661a43308585
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: de90614e78854f81822379c9b5ffc74e
+                  expression: 'avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 11e619b8b2144751995926ecc71add69
+                  expression: 'avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 931a8a585db94a6eadbaa2cc6ef7c730
+                  expression: 'avg(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik hEX PoE lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 76bb411f762949169d70dc5f69ce43f7
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: ad25c7037c8246558c996ebca60f97ad
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 09762405d2114ec79510f7954dcdae86
+                  expression: 'max(/MikroTik hEX PoE lite SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 7424d9ceb77b4a06a935b44f7c1ba568
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 3f6e42b8dbcb4cd4b47c067fe5b7d1ea
+                  expression: 'max(/MikroTik hEX PoE lite SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: f3a86df3351f4dd080031a9c821f5252
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: e4778ad9d8ee4568b212241439a79e27
+                  expression: 'max(/MikroTik hEX PoE lite SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: e551b72d1cd04297a9c9ea0e64e29255
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 3eb7aa8563c54b72b7193ef83793acc0
+                  expression: 'max(/MikroTik hEX PoE lite SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: aa8108d017b74c4e81bc5bb4c659ff18
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik hEX PoE lite SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik hEX PoE lite SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik hEX PoE lite SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik hEX PoE lite SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 814d31895b51492db101ebb5c184ce03
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 21ca9e298c2b4e469eac9de27d00f3e1
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 4bf8c167c8f743bc8a5f0adf32d546fb
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f9953f3ff399439eb71e80f410ebb4a2
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: be0690e2061e46709c35b4d1645eb4f6
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 27f4310379d14bf7bb6b30eebfabf2cc
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 63b0a6b344984f679f06c11089b6bedc
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: a75ecbdb067e4b8e89fca2c467689822
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: dfa45dda12b448109f9cc04003c63812
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 65fdd09f484a4923bf5a379a9e5d5a8f
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f49f8079f71948858ae1b158b6aa186f
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c3737199ab5342829ca6fae6d1de74f9
+                  expression: 'last(/MikroTik hEX PoE lite SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 567a3273ef3e464c8f5d995c3af5ff21
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 97ddda9d5c8542f8b5f905e4bb9d7479
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 868c3c9fe3c54e3193f3e0b6329828db
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: e75b2f65357c40e487b9b9f3387fcb0a
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: b911cb33e9044a599d10c06e5b0f90fb
+              expression: |
+                last(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik hEX PoE lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: eada2d5bde184483bc0496677aff2c3c
+              expression: |
+                last(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik hEX PoE lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik hEX PoE lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX PoE lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: edc8dcfebff945e6b3131aa3d12e497c
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik hEX PoE lite SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik hEX PoE lite SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: a927d6e3b4f7401281acf19a4f83dae9
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik hEX PoE lite SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/README.md
new file mode 100644
index 00000000000..c4bcfbda8cc
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik hEX PoE SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik hEX PoE.
+
+5x Gigabit Ethernet with PoE output for four ports, SFP, USB, 800MHz CPU, 128MB RAM, RouterOS L4
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik hEX PoE SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik hEX PoE SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik hEX PoE SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik hEX PoE SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik hEX PoE SNMP/system.hw.serialnumber,#1)<>last(/MikroTik hEX PoE SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik hEX PoE SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik hEX PoE SNMP/system.hw.firmware,#1)<>last(/MikroTik hEX PoE SNMP/system.hw.firmware,#2) and length(last(/MikroTik hEX PoE SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik hEX PoE SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX PoE SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX PoE SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik hEX PoE SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik hEX PoE SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik hEX PoE SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik hEX PoE SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik hEX PoE SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/RB960PGS
diff --git a/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/template_net_mikrotik_hEX_PoE_snmp.yaml b/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/template_net_mikrotik_hEX_PoE_snmp.yaml
new file mode 100644
index 00000000000..8fc7a5afcbb
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/template_net_mikrotik_hEX_PoE_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:47Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: ff57532daf924030b364e3b75acb74c4
+      template: 'MikroTik hEX PoE SNMP'
+      name: 'MikroTik hEX PoE SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik hEX PoE.
+        5x Gigabit Ethernet with PoE output for four ports, SFP, USB, 800MHz CPU, 128MB RAM, RouterOS L4
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 3521c975bbb443b1b66ec32ea561745f
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: fe1e4e312e5a4ee48fecb03895b51201
+              expression: 'last(/MikroTik hEX PoE SNMP/system.hw.firmware,#1)<>last(/MikroTik hEX PoE SNMP/system.hw.firmware,#2) and length(last(/MikroTik hEX PoE SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 6178d9f5c5e947fe8e3fb774cc5a373a
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: c449cc37420643ee8493419bde54aac6
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 250374059d8a45f78107f1f5b9bda7b1
+              expression: 'last(/MikroTik hEX PoE SNMP/system.hw.serialnumber,#1)<>last(/MikroTik hEX PoE SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik hEX PoE SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 65da6e280942476e842effb8a08e2c6f
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 2615116273594f659184fdc9f2612c91
+              expression: 'last(/MikroTik hEX PoE SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik hEX PoE SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik hEX PoE SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: b4ce328c64a2471e98a1f608028797d5
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 9a7746065ea84c8da33740d3552c7073
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: d294f3fa005b4c90a82fbc3fd5037fb7
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 851e15f5b81a43b3be5d3eda921c9430
+              expression: 'min(/MikroTik hEX PoE SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 9311078329d04ea5a752806a0ee89918
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 81d1874fd7d14f04b5c8511f34156869
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 87ea6ae2f5374f68acfbd4d368c8aae8
+                  expression: 'min(/MikroTik hEX PoE SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 1646642b07fd4dcaa99e1ad91cf34b52
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik hEX PoE SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 9a9de341ab9042ba93a59bc755a67d07
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 544db32c591a4ed1ab8113212de6e920
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 89ccd80168694f6cb7742f79ab2f02ae
+                  expression: 'avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: a27c393597ac4618846b7c9d906167c7
+                  expression: 'avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 648519d0cc5b4795ab917893a71f1872
+                  expression: 'avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 361b9a2d66864d14806c8ef41ddf958a
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: edd3813705ad49cf84ee609e51c0b04e
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 48244ed562b144c192177e64b06d268c
+                  expression: 'avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 1b239ec1f0834b6ebe1ebc974121504b
+                  expression: 'avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: d31b9428aef346d49ec00acd2388f657
+                  expression: 'avg(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik hEX PoE SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 2dd64ba5c59643f78d472e2281870390
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: eaeb2ee093644c169dffd897c7563704
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 573a668131014af2bc2989edbcdbf8b8
+                  expression: 'max(/MikroTik hEX PoE SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 0a022c73ee604112a46dac1d80312b35
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 8b6d36e582d34ed7bdec1aaa406d0939
+                  expression: 'max(/MikroTik hEX PoE SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: d51b890123044db4bbbbbb2bf8255f11
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 7e8ac19ee7aa43d7bc849f5a093e846a
+                  expression: 'max(/MikroTik hEX PoE SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 6a60892c64f44ba39ac4db3ea3b06a76
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 36404ef697ea49329f0572be3940fbd6
+                  expression: 'max(/MikroTik hEX PoE SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: d96cc35ffec845a0bfdc742d9c789011
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik hEX PoE SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik hEX PoE SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik hEX PoE SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik hEX PoE SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 63dc090d3529456e9e9a2eb19c288165
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 4c2272fcee0445d9bc1214c1ba3816bf
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 38db6983c1044493ba02a2ca204ed981
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 58ba2fb7ac314593924d11dfddf96dcc
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e6b23b9175eb4a97bce37e07d33891d0
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b80ecc7de8714f48831cf1c6bb1870b9
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: ba0e7757c7b645c98b67fda025e7c1d6
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 8c1c9f22250c470caa565a55c70bf108
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 6be247ddc3a94489b25bee5595e7efea
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 1ea73c7d20834a168ebb4a5afca21e32
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 767c4c5614ff4802b8447079b31bbd42
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: f75775427c074c83a1002b716733aa7f
+                  expression: 'last(/MikroTik hEX PoE SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: e626b00e480f4ff8a059be7e85934bf8
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: a6bdcbcf646d4735a4698ce3636ea7a1
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 05023f80d98c4234830e56c2c42059f7
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: f6dd161551a0414ca51e4f7c5b1de616
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 6d5b2060b6c946c7835867727dec0f87
+              expression: |
+                last(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik hEX PoE SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: e05e7d6b7b6c45f7974f39a258a754f8
+              expression: |
+                last(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik hEX PoE SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik hEX PoE SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX PoE SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX PoE SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: afe07c8019d5460f9624577328d8c3a6
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik hEX PoE SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik hEX PoE SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: c80620de3cdf4e42820898df686e2935
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik hEX PoE SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_hEX_S_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_S_snmp/README.md
new file mode 100644
index 00000000000..0a218d03903
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_hEX_S_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik hEX S SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik hEX S.
+
+5x Gigabit Ethernet, SFP, Dual Core 880MHz CPU, 256MB RAM, USB, microSD, RouterOS L4, IPsec hardware encryption support and The Dude server package
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik hEX S SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik hEX S SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik hEX S SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik hEX S SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik hEX S SNMP/system.hw.serialnumber,#1)<>last(/MikroTik hEX S SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik hEX S SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik hEX S SNMP/system.hw.firmware,#1)<>last(/MikroTik hEX S SNMP/system.hw.firmware,#2) and length(last(/MikroTik hEX S SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik hEX S SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik hEX S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik hEX S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik hEX S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik hEX S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik hEX S SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/hex_s
diff --git a/templates/net/mikrotik/mikrotik_hEX_S_snmp/template_net_mikrotik_hEX_S_snmp.yaml b/templates/net/mikrotik/mikrotik_hEX_S_snmp/template_net_mikrotik_hEX_S_snmp.yaml
new file mode 100644
index 00000000000..463204851d3
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_hEX_S_snmp/template_net_mikrotik_hEX_S_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:52Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 7802db8c2f9c4a7eba7b381b8f3fa5c5
+      template: 'MikroTik hEX S SNMP'
+      name: 'MikroTik hEX S SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik hEX S.
+        5x Gigabit Ethernet, SFP, Dual Core 880MHz CPU, 256MB RAM, USB, microSD, RouterOS L4, IPsec hardware encryption support and The Dude server package
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: dd3b07cbd6d74fec88e1d371846b48a4
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: bdc6d6b5a4be4bba95f1635d8cf165d7
+              expression: 'last(/MikroTik hEX S SNMP/system.hw.firmware,#1)<>last(/MikroTik hEX S SNMP/system.hw.firmware,#2) and length(last(/MikroTik hEX S SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: ea51e70e43e24056b25309ce0fa8f9d8
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: a577dbe3cfde4294ab93e0ab114c24c7
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 9bcc039b8f1e4b3c84414d0d62d6c52d
+              expression: 'last(/MikroTik hEX S SNMP/system.hw.serialnumber,#1)<>last(/MikroTik hEX S SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik hEX S SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 34a57dc1a4f54f7ea156fa5c7b5f61de
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 21dd8dc14526470493b31ebddf14574c
+              expression: 'last(/MikroTik hEX S SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik hEX S SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik hEX S SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 4d8039dcceb344dcb4de5c4895a4e199
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 664555ffcf5e48039bdcf98bf79247ef
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 8aa0e7e65d12468e9fdf4e2faebd3450
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: bdd1ff379f214b1896c0e7ee5d6e6e16
+              expression: 'min(/MikroTik hEX S SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 455bfeb9d0b14c77a43129d489e3140b
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: e0fd55cedc7340f2a453865f02f3a668
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: ca6c0d5b13a24f6b9e28296818ae1624
+                  expression: 'min(/MikroTik hEX S SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 37edfa6825394b30b3742eac201a3a58
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik hEX S SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: f328cfadd7c149c98d8e6694ff8a1d16
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 7c007188eb6b465c8b56f415ac1a8efc
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 21775fd4ca0143838ea2c2c7c16c4b75
+                  expression: 'avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 7c75f3db8a8341819bb4455d4a6440e3
+                  expression: 'avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 3247cd9062894b59bb736c3c75bf2f67
+                  expression: 'avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 7f462b2b67494acc8e968a38ae2949e7
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 219015883daa4871be424d46c4af4126
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: ce2928b0b45a4e74976c4ebb01f769b6
+                  expression: 'avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 9401397315604181973ac4a5e0c6a5ba
+                  expression: 'avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 466053cdfce44600bf1ff0ced3c4fce4
+                  expression: 'avg(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik hEX S SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 9bab04f1de2b4bb59ee2f5116b67829e
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 88a280a7905449e793add1d1217f92f9
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 9a48a8512ac74bff9c44733842d21693
+                  expression: 'max(/MikroTik hEX S SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: b04b0c8358f84225bd33ba0a4494bc91
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c5e6899f9dee47d7812366a26e5191d9
+                  expression: 'max(/MikroTik hEX S SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 9600e46ee74e48b48d169399b2dda431
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 207bea70b82e4a6087f104cb1ec1f8a2
+                  expression: 'max(/MikroTik hEX S SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 67466da7befe41a9a0a6d84b6c2508d2
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 3b7135afe54a4acfbf5d14510f6b22c1
+                  expression: 'max(/MikroTik hEX S SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 709b83b504d5409091a71fc4351f06f7
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik hEX S SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik hEX S SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik hEX S SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik hEX S SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 0e917c0aa21343248fe29278d61b961a
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 6e320401044041cda2c048b4af73fb8e
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: ad811b6b140844e59dd6ac2618e1b9bb
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 9e3847a985c14de59faf61670478b6bf
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 51174e5e7d41479fab6b9077ef5d40d9
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: bd2ece0be43f48b1a390d6f44c796f4a
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: edb9c0ee0f4e4de2819919ddb2a88a99
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: b867fd906472452ba9c503fe7f82f680
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e96e64d9fe5944b4b5bb1324fb2845b0
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 720d95d0ef294d019fc91b2ed2debb14
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 4d8828d7d008441fa7497dbc88d6d065
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: de36b7b78e8b4bea936347995a0eaeb1
+                  expression: 'last(/MikroTik hEX S SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 63c54ef0b1a54c2a9cce978a5923d83f
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 6cddae4271784cc5bb19102f2f8f44a0
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: abea1d8e522a48fcb35d3b05b41cd576
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: ed5fce36f7904eb7bf5929b90fd5b535
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: f303b6ce2be34c8ca0f51e5c73e47715
+              expression: |
+                last(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik hEX S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: cdef153d2e914c12ba3303c938489359
+              expression: |
+                last(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik hEX S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik hEX S SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX S SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX S SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: b5b0436352614bf1ab0f84731dc4f627
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik hEX S SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik hEX S SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 1df82d3644a941869ea2fe632982e2aa
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik hEX S SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_hEX_lite_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_lite_snmp/README.md
new file mode 100644
index 00000000000..6fe228f7b15
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_hEX_lite_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik hEX lite SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik hEX lite.
+
+5x Ethernet, Small plastic case, 850MHz CPU, 64MB RAM, Most affordable MPLS router, RouterOS L4
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik hEX lite SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik hEX lite SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik hEX lite SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik hEX lite SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik hEX lite SNMP/system.hw.serialnumber,#1)<>last(/MikroTik hEX lite SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik hEX lite SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik hEX lite SNMP/system.hw.firmware,#1)<>last(/MikroTik hEX lite SNMP/system.hw.firmware,#2) and length(last(/MikroTik hEX lite SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik hEX lite SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik hEX lite SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik hEX lite SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik hEX lite SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik hEX lite SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik hEX lite SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/RB750r2
diff --git a/templates/net/mikrotik/mikrotik_hEX_lite_snmp/template_net_mikrotik_hEX_lite_snmp.yaml b/templates/net/mikrotik/mikrotik_hEX_lite_snmp/template_net_mikrotik_hEX_lite_snmp.yaml
new file mode 100644
index 00000000000..b5edb3f21bd
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_hEX_lite_snmp/template_net_mikrotik_hEX_lite_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:43Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 2785d83763c641a7a7937b516665d93a
+      template: 'MikroTik hEX lite SNMP'
+      name: 'MikroTik hEX lite SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik hEX lite.
+        5x Ethernet, Small plastic case, 850MHz CPU, 64MB RAM, Most affordable MPLS router, RouterOS L4
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: c15fe701615f41809cdb9440e308339c
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 8fb6d0748d5a4e589e397f0523944bc5
+              expression: 'last(/MikroTik hEX lite SNMP/system.hw.firmware,#1)<>last(/MikroTik hEX lite SNMP/system.hw.firmware,#2) and length(last(/MikroTik hEX lite SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 10cecca7315d4732badc194787d6e58f
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: ab2590092f894a1c97787d5edb470b65
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: c76bf7b6d13b49a4916a00709ee7c9ba
+              expression: 'last(/MikroTik hEX lite SNMP/system.hw.serialnumber,#1)<>last(/MikroTik hEX lite SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik hEX lite SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 0c40e8e1ccca4418b9bfc22a84c08b4e
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: b5cddf34bbe74bb08663b85c83035f57
+              expression: 'last(/MikroTik hEX lite SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik hEX lite SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik hEX lite SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 93743e909ba5414294005084cb83fc93
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 039d0c2fe2224a57b77def7dd4dd2cfd
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: bdb11b0d08184bd188276b7559286e65
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 4a08a50891814c0d813c39a4615bffac
+              expression: 'min(/MikroTik hEX lite SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 9c7a81a8e2654d58acf463a00cce14f5
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: a9c3336d847a44e6b6e652e6acc6844b
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 4910a9cc5fdf4eefa05e1e0f339828c4
+                  expression: 'min(/MikroTik hEX lite SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 2c545076c11b4783b2bd951b38a58618
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik hEX lite SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 89af9490b6c74ab8ae81630c171e4326
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: e7b3d6ee055c4aad8697c7fe6b46321f
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 0a16b13ef86e4b968690de77d4fdd851
+                  expression: 'avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 26ad73c494494a83a6b7eab785efe3ce
+                  expression: 'avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 19c2754a812c48bd87fd250aac01b97b
+                  expression: 'avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 132954d3fced48d9a272be2f748c915d
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: caff962e717e4d2f93d2c67a59316aa6
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: fada5a58781c4684b70e7aea77a96040
+                  expression: 'avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 87d04ed8af6040f1b2230244b7ffcc18
+                  expression: 'avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: e5ca03c450eb4ccfa4dc94de0d6eeaaf
+                  expression: 'avg(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik hEX lite SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 78120670dc214ff5833e8b65c830b9bf
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 53d319fb092540c490a945a1918b04a8
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: ef64375fbe9b456d895d5fa75b524bc4
+                  expression: 'max(/MikroTik hEX lite SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 1da2986f9f9542b58781f141c95a268b
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: ccc2b5cabd164f2c94268bd8fbb17299
+                  expression: 'max(/MikroTik hEX lite SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 889d3fa6f6fb416bb66be28fbe59ea1e
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 07ac669be6d14c878ed3824adbcaa035
+                  expression: 'max(/MikroTik hEX lite SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 4291982f94354c16812ffa4522e74a9b
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: e351a08588664f29aab5a784ff3bbc1c
+                  expression: 'max(/MikroTik hEX lite SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 3336863bfebf4480aeac28755c770954
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik hEX lite SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik hEX lite SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik hEX lite SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik hEX lite SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 39954b6664a74494a1af7de587704e43
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: 522e6177173542d7b83e109447765c7a
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 01984514830c48d7a8b716700181bd19
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 40ba0370ec1b4432814c654bc65558fb
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 9984f8a346b1452d8ccac4e471ff6a18
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 21f387d4d01d47bc98852aee0cbc3e03
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: c2d5d79d5dc14876ae9951c8813804cb
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 84066dd7587748e1908b38eae4029121
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7dd11163c97f4d31b46b7fade589b135
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 84248b4499ec4b3399905bbb2a7d9e76
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 8a7f54f2f8b747bba0de16dd53750679
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 9361f7dd8cba43e4a237678d00eb26b6
+                  expression: 'last(/MikroTik hEX lite SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: e89f36e5fdfd4ff0a22370dd45a900be
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 836926c431cb48a9ab94ad752243a60a
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 4e63d5682c0147f3a314ab6def8043b7
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 2c8d3e482b6a453e8f46ea59ea75445f
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: cd0ef8f6c93340a1aadd0559ef302476
+              expression: |
+                last(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik hEX lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 0460d9d1f873497ea57430cf067c786e
+              expression: |
+                last(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik hEX lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik hEX lite SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX lite SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX lite SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 277327e948d24186a0723bc0fe4debf4
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik hEX lite SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik hEX lite SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: e05047c0d48043218995a5342d291480
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik hEX lite SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_hEX_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_snmp/README.md
new file mode 100644
index 00000000000..83d6313326f
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_hEX_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik hEX SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Ethernet router MikroTik hEX.
+
+5x Gigabit Ethernet, Dual Core 880MHz CPU, 256MB RAM, USB, microSD, RouterOS L4
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik hEX SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik hEX SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik hEX SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik hEX SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik hEX SNMP/system.hw.serialnumber,#1)<>last(/MikroTik hEX SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik hEX SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik hEX SNMP/system.hw.firmware,#1)<>last(/MikroTik hEX SNMP/system.hw.firmware,#2) and length(last(/MikroTik hEX SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik hEX SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik hEX SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik hEX SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik hEX SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik hEX SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik hEX SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik hEX SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/RB750Gr3
diff --git a/templates/net/mikrotik/mikrotik_hEX_snmp/template_net_mikrotik_hEX_snmp.yaml b/templates/net/mikrotik/mikrotik_hEX_snmp/template_net_mikrotik_hEX_snmp.yaml
new file mode 100644
index 00000000000..b6c2d17fb54
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_hEX_snmp/template_net_mikrotik_hEX_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:50Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 68c2034014f24115ae9e910962530472
+      template: 'MikroTik hEX SNMP'
+      name: 'MikroTik hEX SNMP'
+      description: |
+        The template for monitoring Ethernet router MikroTik hEX.
+        5x Gigabit Ethernet, Dual Core 880MHz CPU, 256MB RAM, USB, microSD, RouterOS L4
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 7154ef6b0f0b4d4a99fdf1d7ec8b2262
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 0c58b3a529a541c5813e6d374fb1af38
+              expression: 'last(/MikroTik hEX SNMP/system.hw.firmware,#1)<>last(/MikroTik hEX SNMP/system.hw.firmware,#2) and length(last(/MikroTik hEX SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 0e326a00dadf46928949a2270a4e7619
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 17dd769754ca4559b53b191baa8ac571
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 3a683df3455e4c3b9693f70d7cc2312c
+              expression: 'last(/MikroTik hEX SNMP/system.hw.serialnumber,#1)<>last(/MikroTik hEX SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik hEX SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 7df965b410944b07a5effd80fc3e5514
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 752e3b231fb9428baa28a7dffd90b2a5
+              expression: 'last(/MikroTik hEX SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik hEX SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik hEX SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 3698fb3739a8435da6e40f4c2245b78e
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: b15a14a08a06417a9ca3586754a3c968
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: ac044f3cfc33483db97ef1daecaafd6e
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 3887f8ec0f8a4eadb45b3d3388fdd3bf
+              expression: 'min(/MikroTik hEX SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 8bdd4763b58b4bb5ae2cd68f28a7d5aa
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: cf88e868bd54481e8992495620b76886
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 2d0e7e1624ef40de9a7ba351917ec339
+                  expression: 'min(/MikroTik hEX SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 8dd00c34191d4daab61d4b9b9abe76af
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik hEX SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: ce444de5ad9944b3bfb8dffb26e0314a
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 401bd6a8a97643d5888157488dd9a4b6
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 3b40b247aeb14a6d833a3c67594938ae
+                  expression: 'avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: cf13c4a9be634dd09d1f14a9774a0009
+                  expression: 'avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 16f478f052aa47328ac6e23e778d353c
+                  expression: 'avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 6da7e4227e054a3ca41950f208cd8c01
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 82aeb0418e3445bd92a6626e75d25b7a
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 8b2e3dedb9884c81a8370732a1f3a367
+                  expression: 'avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: c5c22051e035432eba2ad5f77da002c0
+                  expression: 'avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 9b49825517f44a7fa37d2d96abd8848b
+                  expression: 'avg(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik hEX SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 485845b1ea494e12a042e6e55f8758bb
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 156f0fb44c0d43dba742edfd66ad7144
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 1491814409194648a9d98bcb18ac77cc
+                  expression: 'max(/MikroTik hEX SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 379ec65a6b9f4136950b21a9d90cc547
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: e7a5fc01703c4474add6aac174ef5b16
+                  expression: 'max(/MikroTik hEX SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: f4de2c971a664990a8c6bafc42c089fd
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d529f287404945b9a265fefff65768d5
+                  expression: 'max(/MikroTik hEX SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: de256c8eb72a457d81fb33f192320037
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 2f85f97d29774922b6fecc19379726d8
+                  expression: 'max(/MikroTik hEX SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 70a56aeed598461e8d41997d056b83fd
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik hEX SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik hEX SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik hEX SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik hEX SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: e6c42eb8ef5b4827852b41e577924d82
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: dd0be192693f476e97455b7e05f85aee
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 85ae5fc4ef5e404ebd0ffcb14a14d8b7
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 2412519dbd114cb3b8a16dcb8c11d087
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 01abec24a89f4112991dfb272512a716
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: de7416fa19824a9abf3223dc2dc77c26
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: f26774cbab2949f69b634eb8b5821e58
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: ead6f31f7dd74d019223d242513eaef9
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: e704ea4180ed4e33ba1aee5402e01101
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: aba46c2b5c614cc7873d2edaeb1d3493
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 17a2738e73924bb9928eedd098f3ba7c
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 92cf3f4cf7a64de58347d2e459321f92
+                  expression: 'last(/MikroTik hEX SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: 6bac0ef3a12748a5b63a7bbe39dc0a13
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 4110589dc6ee47bdaf23dade490edffb
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 8e9bb2413bd142d194d0563590441797
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 5021e0a0f78b4d6f80965efb0975fe04
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 927bf28b0d7f4409ab7b2de288e59b66
+              expression: |
+                last(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik hEX SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: ca6639ac0950404da35738314aa3b88e
+              expression: |
+                last(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik hEX SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik hEX SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik hEX SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik hEX SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: a7e05919813b4ebb9fc0e4535d342807
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik hEX SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik hEX SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 60d570c2447d418f90d0a64842f970b0
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik hEX SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/README.md b/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/README.md
new file mode 100644
index 00000000000..2443fedb045
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik netPower 15FR SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik netPower 15FR.
+
+An outdoor 18 port switch with 15 reverse PoE ports and SFP. Cut costs, not speed – choose GPEN over GPON!
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik netPower 15FR SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik netPower 15FR SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik netPower 15FR SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik netPower 15FR SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik netPower 15FR SNMP/system.hw.serialnumber,#1)<>last(/MikroTik netPower 15FR SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik netPower 15FR SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik netPower 15FR SNMP/system.hw.firmware,#1)<>last(/MikroTik netPower 15FR SNMP/system.hw.firmware,#2) and length(last(/MikroTik netPower 15FR SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik netPower 15FR SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower 15FR SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 15FR SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower 15FR SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 15FR SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik netPower 15FR SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik netPower 15FR SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik netPower 15FR SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik netPower 15FR SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik netPower 15FR SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/crs318_1fi_15fr_2s_out
diff --git a/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/template_net_mikrotik_netPower_15FR_snmp.yaml b/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/template_net_mikrotik_netPower_15FR_snmp.yaml
new file mode 100644
index 00000000000..47bbe27bb06
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/template_net_mikrotik_netPower_15FR_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:53Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: f1928e12f9554599a9adb516f38b6bf6
+      template: 'MikroTik netPower 15FR SNMP'
+      name: 'MikroTik netPower 15FR SNMP'
+      description: |
+        The template for monitoring Switch MikroTik netPower 15FR.
+        An outdoor 18 port switch with 15 reverse PoE ports and SFP. Cut costs, not speed – choose GPEN over GPON!
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: c3a06a34c55c42c89d9158ac8e735564
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 86d3bc7830274e24b19f0b7120f9c957
+              expression: 'last(/MikroTik netPower 15FR SNMP/system.hw.firmware,#1)<>last(/MikroTik netPower 15FR SNMP/system.hw.firmware,#2) and length(last(/MikroTik netPower 15FR SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 350020213bbd4ca59fad42e8347abd67
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 3540413716f141329c4ffadb402a051d
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 8964055d1c7445e68b9ba2eb30faf1fc
+              expression: 'last(/MikroTik netPower 15FR SNMP/system.hw.serialnumber,#1)<>last(/MikroTik netPower 15FR SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik netPower 15FR SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: d8413ee1e46846fabbc3f7239d74df02
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: ad61f9029ba449aab240fee852d1e49e
+              expression: 'last(/MikroTik netPower 15FR SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik netPower 15FR SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik netPower 15FR SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: d80ed64a5916414091a72caf33d650ee
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: bd680110f05848aaa2754da8d00f60e4
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 1a8c279dc19c4944804d27e0e6f7b5b3
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 660db85a472349e7878bcdf41faa4689
+              expression: 'min(/MikroTik netPower 15FR SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 41c63da374c3490ca27e7bc3298f269d
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: d28ec3c6c00741eda325a53cb7e45e4d
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 6fa6e471c9594ea9a65d54a72a7a7b54
+                  expression: 'min(/MikroTik netPower 15FR SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 308c726fa1ac419490b645f68bde63de
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik netPower 15FR SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: 8575e3af9dc841c489d0d72cf3880da1
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 8fc500e6a2b743cf9c948b099839dc8a
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 46615aebb0e2414b9094e5e25c0a6314
+                  expression: 'avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: db07d94668634efca75ab714cc2cf083
+                  expression: 'avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 664ab6cc5ce044af8d6899473ea0a8b1
+                  expression: 'avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: fe69d484c5734fc88eb7cb9d8e79288e
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 511cdf90845747b5bfc43c46c245aec5
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: f81db05dfee24aaaa8cc27aca30e7455
+                  expression: 'avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: edab3732eb9a41f4b42da927ee8996a7
+                  expression: 'avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 0ef1463290ce45ab83838acb51e9d5ab
+                  expression: 'avg(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik netPower 15FR SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 325f04ecd27949d6a5c486850e7d189c
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: b615320ad07f48ecbf8cae0fed33a492
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 30101628e09d4c67a1d4d7938b7b5674
+                  expression: 'max(/MikroTik netPower 15FR SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: f4f48561aad24599886457011a6a4995
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 179fb6a3947f4a4bad4d914dfbf2727e
+                  expression: 'max(/MikroTik netPower 15FR SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: f492fe605f56443d98b136a4d6d81d70
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d92f9fa8a9a648ad817295ba5b26c254
+                  expression: 'max(/MikroTik netPower 15FR SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 32b98a463dc74c11b4e1695970fca8fc
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: df1dc76e73904e35850f1b104dca01ea
+                  expression: 'max(/MikroTik netPower 15FR SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 3282106194e14f4e935d10a97d85a536
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik netPower 15FR SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik netPower 15FR SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik netPower 15FR SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik netPower 15FR SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: aef802a72bea446781b9456246984457
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: c501d4366af34a3a8e30b6e224c3fafa
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b723d3bf59c047039fc23568f445aa98
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 9ba87c338496445dbc1fb2019a07941e
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 3d1256ace78141cc94a8b36ddcd5578c
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: c9c7f1e0788845398a415a6e649e3818
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: 802b868d392d4f65bb47178566fc113c
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: ccaff01089e04fad846522db993649db
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 26b0c07f668e43718e6fea333f68fc63
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 8ea5913e43c740b19c28647eef54c3ae
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 3ddfb23ff23c44ee9d9690374f82d028
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: fb10d55898f74edbb7a1541481cbde49
+                  expression: 'last(/MikroTik netPower 15FR SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: f72f57ef12e84957aea8cd402b3061c2
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: e97a95f91dc24615ac510da4e1e13c60
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: a1838a262c5446d798d1ca6f5b9237c1
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 517b5e46327f48e9b3db685167a77d13
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 2ba297940326432dbbc91974ed99d53d
+              expression: |
+                last(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik netPower 15FR SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 15FR SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: e3054ae302bd4c29b81b6f4c58c39021
+              expression: |
+                last(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik netPower 15FR SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 15FR SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik netPower 15FR SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 15FR SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower 15FR SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 9d68b0bd14fb432bb730cf1c69098dd7
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik netPower 15FR SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik netPower 15FR SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 0840a833bec844fcbbbda3398b8f2d81
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik netPower 15FR SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_netPower_16P_snmp/README.md b/templates/net/mikrotik/mikrotik_netPower_16P_snmp/README.md
new file mode 100644
index 00000000000..7114fa5b76f
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_netPower_16P_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik netPower 16P SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik netPower 16P.
+
+An outdoor 18 port switch with 16 Gigabit PoE-out ports and 2 SFP+. Power all your access points anywhere!
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik netPower 16P SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik netPower 16P SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik netPower 16P SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik netPower 16P SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik netPower 16P SNMP/system.hw.serialnumber,#1)<>last(/MikroTik netPower 16P SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik netPower 16P SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik netPower 16P SNMP/system.hw.firmware,#1)<>last(/MikroTik netPower 16P SNMP/system.hw.firmware,#2) and length(last(/MikroTik netPower 16P SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik netPower 16P SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower 16P SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 16P SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower 16P SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 16P SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik netPower 16P SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik netPower 16P SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik netPower 16P SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik netPower 16P SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik netPower 16P SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/netpower_16p
diff --git a/templates/net/mikrotik/mikrotik_netPower_16P_snmp/template_net_mikrotik_netPower_16P_snmp.yaml b/templates/net/mikrotik/mikrotik_netPower_16P_snmp/template_net_mikrotik_netPower_16P_snmp.yaml
new file mode 100644
index 00000000000..7449b840834
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_netPower_16P_snmp/template_net_mikrotik_netPower_16P_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:55Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: b126aaf4499d49d7b4fcee0329b7dea7
+      template: 'MikroTik netPower 16P SNMP'
+      name: 'MikroTik netPower 16P SNMP'
+      description: |
+        The template for monitoring Switch MikroTik netPower 16P.
+        An outdoor 18 port switch with 16 Gigabit PoE-out ports and 2 SFP+. Power all your access points anywhere!
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: 166760a906dd4377a9b548a4809da3fd
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 4b2840d437844c54aa8328a2af6ab16a
+              expression: 'last(/MikroTik netPower 16P SNMP/system.hw.firmware,#1)<>last(/MikroTik netPower 16P SNMP/system.hw.firmware,#2) and length(last(/MikroTik netPower 16P SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: fd26be143fce4e5bb10c61899b518eb2
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: 17f7aa01b647470382387fa9698bb80d
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 356423e8d963491c84c0ff910a324db9
+              expression: 'last(/MikroTik netPower 16P SNMP/system.hw.serialnumber,#1)<>last(/MikroTik netPower 16P SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik netPower 16P SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 6f2ceb1729884e39a364207defb39b96
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 381ec628763d43e8a7f287d4bab024ee
+              expression: 'last(/MikroTik netPower 16P SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik netPower 16P SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik netPower 16P SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: efdb24ce66d8410cae4a932160c12bf2
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 3d359d909fef46ec96fd6f66a7be6d3b
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: ca6584d0bc71410bb93a7c295e6993b3
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 35b88fa6b15845e78a3a7211fe2ed0af
+              expression: 'min(/MikroTik netPower 16P SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: c8e3efbae6ae49a19192b5df2ee9fea8
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 53ba83109bb34b21a689cba89cd80ee2
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: e40966f36f804bbab518eb0cbc711fca
+                  expression: 'min(/MikroTik netPower 16P SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: d8f0a7f28ec647eebdeb1db630e63249
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik netPower 16P SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: bbef794582294a2ea1321ac233a4af43
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 351f9998f3a24e21a18570d9aa782734
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: 725caccdc4fe495e93e2cfa438f52674
+                  expression: 'avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: ea9e2193843d4a71bd24bead9394685d
+                  expression: 'avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: ac521e5e0c9d416ba0f61563a85a66ff
+                  expression: 'avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: 6db4d343f263423aa2429e64efbef34b
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: 9ea80b6d187a4117aea55f07c782f336
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: b5a55e90742148ae91fb30394d79a50a
+                  expression: 'avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: f5ccdff135ee46ed81889d2882d54b3a
+                  expression: 'avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: dd21e53afab64548ae180079d705dee5
+                  expression: 'avg(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik netPower 16P SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: b26cd292bf634d3e9c7cbf96fae9a9c1
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: a204035a215842089680883e013f6162
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 1119a5651b6b469199e6cd8484ea000b
+                  expression: 'max(/MikroTik netPower 16P SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: c6fb1da5c6d642579285caf0712e870c
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 22c7a42c10524dfab69c6e9566a28150
+                  expression: 'max(/MikroTik netPower 16P SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: 766550d88a2b46ee905b611dd2b740f8
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 14f69778aac0476290fd2ddff01693fd
+                  expression: 'max(/MikroTik netPower 16P SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: a5af3f3c24fa4804b7ce63e7fb377f64
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: a6e1255d7904488788f4e5358b4b1a70
+                  expression: 'max(/MikroTik netPower 16P SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 955940cc271f48b89a14caebc9cd7adf
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik netPower 16P SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik netPower 16P SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik netPower 16P SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik netPower 16P SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: ddb15a63887e4581b375f8462a645c14
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: b7a7dab289b04d1baada39071b8dfeed
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 7b987144335b4ba58231327e9686bfef
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: fa450c03ad6f4628915bfe5148d3f159
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: bba6280d021147ae98ba429ad2c58f80
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: c46c846e04784177b8cfb1efb8678391
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: a0b2f2d19eda41f78501d076da56be98
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: 624a0f31d0214e968545a64d7bf14184
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 493ac987474b4d59969765d1ac7e9053
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: d16e8308541043209d509d8c7f1d502c
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: f8da5dbe8a684455b7e384372ede531b
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: d332b384052e4538869186b6c44ae332
+                  expression: 'last(/MikroTik netPower 16P SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: af98fd7de06d4f48920cbdb96f0b6165
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 8a5e4dbb9a194daa918c30f2a12d8b95
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 45a98099bb5443f192d997c0207503b7
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: c823bfe0913b4316b28079aecac9c5f1
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 5f17a45877b44fbab75b614db365db47
+              expression: |
+                last(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik netPower 16P SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 16P SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: c5c80f5a24484c05b62d7bb5474f2091
+              expression: |
+                last(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik netPower 16P SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 16P SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik netPower 16P SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower 16P SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower 16P SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 37977ee583bd41ba95521c2907457999
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik netPower 16P SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik netPower 16P SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 91052db6edb34215856dfe7479114987
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik netPower 16P SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/README.md b/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/README.md
new file mode 100644
index 00000000000..e09aff9f760
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/README.md
@@ -0,0 +1,121 @@
+
+# MikroTik netPower Lite 7R SNMP
+
+## Overview
+
+For Zabbix version: 6.0 and higher  
+The template for monitoring Switch MikroTik netPower Lite 7R.
+
+An outdoor reverse PoE switch with Gigabit Ethernet and 10G SFP+ ports.
+
+## Setup
+
+> See [Zabbix template operation](https://www.zabbix.com/documentation/6.0/manual/config/templates_out_of_the_box/network_devices) for basic instructions.
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/MikroTik netPower Lite 7R SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/MikroTik netPower Lite 7R SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik netPower Lite 7R SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik netPower Lite 7R SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/MikroTik netPower Lite 7R SNMP/system.hw.serialnumber,#1)<>last(/MikroTik netPower Lite 7R SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik netPower Lite 7R SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/MikroTik netPower Lite 7R SNMP/system.hw.firmware,#1)<>last(/MikroTik netPower Lite 7R SNMP/system.hw.firmware,#2) and length(last(/MikroTik netPower Lite 7R SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/MikroTik netPower Lite 7R SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower Lite 7R SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower Lite 7R SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/MikroTik netPower Lite 7R SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower Lite 7R SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik netPower Lite 7R SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/MikroTik netPower Lite 7R SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik netPower Lite 7R SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/MikroTik netPower Lite 7R SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/MikroTik netPower Lite 7R SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+
+## References
+
+https://mikrotik.com/product/netpower_lite_7r
diff --git a/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/template_net_mikrotik_netPower_Lite_7R_snmp.yaml b/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/template_net_mikrotik_netPower_Lite_7R_snmp.yaml
new file mode 100644
index 00000000000..1d2c44f6e42
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/template_net_mikrotik_netPower_Lite_7R_snmp.yaml
@@ -0,0 +1,940 @@
+zabbix_export:
+  version: '6.0'
+  date: '2021-10-11T06:07:57Z'
+  groups:
+    -
+      uuid: 36bff6c29af64692839d077febfc7079
+      name: 'Templates/Network devices'
+  templates:
+    -
+      uuid: 1782caa5bf724f66a23e7dbb96ef7ba2
+      template: 'MikroTik netPower Lite 7R SNMP'
+      name: 'MikroTik netPower Lite 7R SNMP'
+      description: |
+        The template for monitoring Switch MikroTik netPower Lite 7R.
+        An outdoor reverse PoE switch with Gigabit Ethernet and 10G SFP+ ports.
+        
+        MIBs used:
+        HOST-RESOURCES-MIB
+        MIKROTIK-MIB
+        
+        Template tooling version used: 0.39
+      templates:
+        -
+          name: 'Generic SNMP'
+        -
+          name: 'Interfaces SNMP'
+      groups:
+        -
+          name: 'Templates/Network devices'
+      items:
+        -
+          uuid: bece431938dc48d79221aae1c14bb118
+          name: 'Firmware version'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.4.0
+          key: system.hw.firmware
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Current firmware version.
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: c9b18f3abf444a849606d278d9db0924
+              expression: 'last(/MikroTik netPower Lite 7R SNMP/system.hw.firmware,#1)<>last(/MikroTik netPower Lite 7R SNMP/system.hw.firmware,#2) and length(last(/MikroTik netPower Lite 7R SNMP/system.hw.firmware))>0'
+              name: 'Firmware has changed'
+              opdata: 'Current value: {ITEM.LASTVALUE1}'
+              priority: INFO
+              description: 'Firmware version has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: d25a80f7bc97479690fcb07d44462606
+          name: 'Hardware model name'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.1.1.0
+          key: system.hw.model
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          inventory_link: MODEL
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+        -
+          uuid: e9b1a9ee39334a7e986ca5fa85baea41
+          name: 'Hardware serial number'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.7.3.0
+          key: system.hw.serialnumber
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            RouterBOARD serial number.
+          inventory_link: SERIALNO_A
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 42d7e9c9f03e4b2a8af09b1c54913bba
+              expression: 'last(/MikroTik netPower Lite 7R SNMP/system.hw.serialnumber,#1)<>last(/MikroTik netPower Lite 7R SNMP/system.hw.serialnumber,#2) and length(last(/MikroTik netPower Lite 7R SNMP/system.hw.serialnumber))>0'
+              name: 'Device has been replaced (new serial number received)'
+              priority: INFO
+              description: 'Device serial number has changed. Ack to close'
+              manual_close: 'YES'
+        -
+          uuid: 8a2568f84b394419b6f8ede2872dc3f1
+          name: 'Operating system'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.4.1.14988.1.1.4.4.0
+          key: 'system.sw.os[mtxrLicVersion.0]'
+          delay: 1h
+          history: 2w
+          trends: '0'
+          value_type: CHAR
+          description: |
+            MIB: MIKROTIK-MIB
+            Software version.
+          inventory_link: OS
+          preprocessing:
+            -
+              type: DISCARD_UNCHANGED_HEARTBEAT
+              parameters:
+                - 1d
+          tags:
+            -
+              tag: Application
+              value: Inventory
+          triggers:
+            -
+              uuid: 4400b69762f948f78365b74569ed54af
+              expression: 'last(/MikroTik netPower Lite 7R SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/MikroTik netPower Lite 7R SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/MikroTik netPower Lite 7R SNMP/system.sw.os[mtxrLicVersion.0]))>0'
+              name: 'Operating system description has changed'
+              priority: INFO
+              description: 'Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.'
+              manual_close: 'YES'
+        -
+          uuid: 2a897066661b413fb7d0f6ae795a8b78
+          name: 'Total memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.5.65536
+          key: 'vm.memory.total[hrStorageSize.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The size of the storage represented by this entry, in
+            units of hrStorageAllocationUnits. This object is
+            writable to allow remote configuration of the size of
+            the storage area in those cases where such an
+            operation makes sense and is possible on the
+            underlying system. For example, the amount of main
+            memory allocated to a buffer pool might be modified or
+            the amount of disk space allocated to virtual memory
+            might be modified.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 194e39cf188e40ba88b4c1f41b01b0c9
+          name: 'Used memory'
+          type: SNMP_AGENT
+          snmp_oid: 1.3.6.1.2.1.25.2.3.1.6.65536
+          key: 'vm.memory.used[hrStorageUsed.Memory]'
+          history: 7d
+          units: B
+          description: |
+            MIB: HOST-RESOURCES-MIB
+            The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+          preprocessing:
+            -
+              type: MULTIPLIER
+              parameters:
+                - '1024'
+          tags:
+            -
+              tag: Application
+              value: Memory
+        -
+          uuid: 0d8527333e0a4f509b9fe0699577b081
+          name: 'Memory utilization'
+          type: CALCULATED
+          key: 'vm.memory.util[memoryUsedPercentage.Memory]'
+          history: 7d
+          value_type: FLOAT
+          units: '%'
+          params: 'last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100'
+          description: 'Memory utilization in %'
+          tags:
+            -
+              tag: Application
+              value: Memory
+          triggers:
+            -
+              uuid: 348923e33c3049ea8b27a5d920528300
+              expression: 'min(/MikroTik netPower Lite 7R SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}'
+              name: 'High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)'
+              priority: AVERAGE
+              description: 'The system is running out of free memory.'
+      discovery_rules:
+        -
+          uuid: 583f23a35ad84a808a6029b7a46b24fc
+          name: 'CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.3.3.1.1]'
+          key: hrProcessorLoad.discovery
+          delay: 1h
+          description: 'HOST-RESOURCES-MIB::hrProcessorTable discovery'
+          item_prototypes:
+            -
+              uuid: 5a0fdf4fa043461dabd6d581ce58a8a4
+              name: '#{#SNMPINDEX}: CPU utilization'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.3.3.1.2.{#SNMPINDEX}'
+              key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
+              tags:
+                -
+                  tag: Application
+                  value: CPU
+              trigger_prototypes:
+                -
+                  uuid: 6c1a7d6fd11541fb93a8e73f8712db83
+                  expression: 'min(/MikroTik netPower Lite 7R SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}'
+                  name: '#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)'
+                  opdata: 'Current utilization: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'CPU utilization is too high. The system might be slow to respond.'
+          graph_prototypes:
+            -
+              uuid: 29d6c58dd153437a9a62c95fdaa0d016
+              name: '#{#SNMPINDEX}: CPU utilization'
+              ymin_type_1: FIXED
+              ymax_type_1: FIXED
+              graph_items:
+                -
+                  drawtype: GRADIENT_LINE
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik netPower Lite 7R SNMP'
+                    key: 'system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]'
+        -
+          uuid: d37741d8f523452381e8400eb0ac11cb
+          name: 'Temperature CPU discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.11]'
+          key: mtxrHlProcessorTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlProcessorTemperature
+            Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: e6290dc78db8453c94c22eee0940fc01
+              name: 'CPU: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.11.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: e51ab41e7ac142afabac3ddbe622fc0b
+                  expression: 'avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                  name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 8046c8fbb72f4cf3afe0154fc2e41d6d
+                  expression: 'avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3'
+                  name: 'CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}'
+                      expression: 'avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}'
+                      recovery_expression: 'max(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3'
+                -
+                  uuid: 3a4f8decfaf44650bb4066141e36f42a
+                  expression: 'avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3'
+                  name: 'CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: ebc661ab6f4d48da8294d4199172dc1a
+          name: 'Temperature sensor discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.4.1.14988.1.1.3.10]'
+          key: mtxrHlTemperature.discovery
+          delay: 1h
+          description: |
+            MIKROTIK-MIB::mtxrHlTemperature
+            Since temperature sensor is not available on all Mikrotik hardware,
+            this is done to avoid unsupported items.
+          item_prototypes:
+            -
+              uuid: f1f656e272c8469b98bda73e0cc6a861
+              name: 'Device: Temperature'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.3.10.{#SNMPINDEX}'
+              key: 'sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]'
+              delay: 3m
+              value_type: FLOAT
+              units: °C
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrHlTemperature Device temperature in Celsius (degrees C).
+                Might be missing in entry models (RB750, RB450G..).
+                
+                Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '0.1'
+              tags:
+                -
+                  tag: Application
+                  value: Temperature
+              trigger_prototypes:
+                -
+                  uuid: db6e52bc27714f51bc61e7cc3c3ebad1
+                  expression: 'avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                  name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: HIGH
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                -
+                  uuid: 9e1b2270bc144295a7b0edc2ba98c81b
+                  expression: 'avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'max(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3'
+                  name: 'Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: WARNING
+                  description: 'This trigger uses temperature sensor values as well as temperature sensor status if available'
+                  dependencies:
+                    -
+                      name: 'Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}'
+                      expression: 'avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}'
+                      recovery_expression: 'max(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3'
+                -
+                  uuid: 27e033be9fd94be2bbc3969e9cb51ac4
+                  expression: 'avg(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}'
+                  recovery_mode: RECOVERY_EXPRESSION
+                  recovery_expression: 'min(/MikroTik netPower Lite 7R SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3'
+                  name: 'Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}'
+                  opdata: 'Current value: {ITEM.LASTVALUE1}'
+                  priority: AVERAGE
+        -
+          uuid: e161530a74ca473993b1be2cd03a45a8
+          name: 'LTE modem discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrLTEModem.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.LTEMODEM.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrLTEModemInterfaceIndex'
+          item_prototypes:
+            -
+              uuid: 534301e9868e4cd0b71d6556164b3d70
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.4.{#SNMPINDEX}'
+              key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRP Reference Signal Received Power.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 0161455f62224813a81ed396716437db
+                  expression: 'max(/MikroTik netPower Lite 7R SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: 6b7494b2ddac49d9b72e31a1c18fc9e1
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.3.{#SNMPINDEX}'
+              key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSRQ Reference Signal Received Quality.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: c54da31a0d9f4219b8f5a4f47e30fb4e
+                  expression: 'max(/MikroTik netPower Lite 7R SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)'
+                  priority: WARNING
+            -
+              uuid: ce8f8d1d78bd451f962cb25130f829ce
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.2.{#SNMPINDEX}'
+              key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: dbm
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalRSSI Received Signal Strength Indicator.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 5e1e679028cf499d80484e1fc11e8ba6
+                  expression: 'max(/MikroTik netPower Lite 7R SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)'
+                  priority: WARNING
+            -
+              uuid: ac1f673cad3d4e45a870b09a4d33a1fa
+              name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.16.1.1.7.{#SNMPINDEX}'
+              key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: db
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: e1610c79b6704dfc948f77117d928b5d
+                  expression: 'max(/MikroTik netPower Lite 7R SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)'
+                  priority: WARNING
+          graph_prototypes:
+            -
+              uuid: 0d03f46cbb0c44b99e6369bd256a6cfb
+              name: 'Interface {#IFNAME}({#IFALIAS}): Modem Signal. {#SNMPINDEX}'
+              graph_items:
+                -
+                  color: 1A7C11
+                  item:
+                    host: 'MikroTik netPower Lite 7R SNMP'
+                    key: 'lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: 2774A4
+                  item:
+                    host: 'MikroTik netPower Lite 7R SNMP'
+                    key: 'lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]'
+                -
+                  sortorder: '2'
+                  color: F63100
+                  item:
+                    host: 'MikroTik netPower Lite 7R SNMP'
+                    key: 'lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]'
+                -
+                  sortorder: '3'
+                  color: A54F10
+                  item:
+                    host: 'MikroTik netPower Lite 7R SNMP'
+                    key: 'lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]'
+        -
+          uuid: 01c811631d98499d83c296f34ce36aee
+          name: 'AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3,{#IFADMINSTATUS},1.3.6.1.2.1.2.2.1.7]'
+          key: mtxrWlAp.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^71$
+                formulaid: B
+              -
+                macro: '{#IFADMINSTATUS}'
+                value: ^1$
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlAp'
+          item_prototypes:
+            -
+              uuid: c046aa8719a44d598328182e56d3162c
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.11.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: fe51564fb48a4434875eb376ec52fd60
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP band'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.8.{#SNMPINDEX}'
+              key: 'ssid.band[mtxrWlApBand.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApBand
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: a8688972d13f4757b027c4f257193ff8
+              name: 'Interface {#IFNAME}({#IFALIAS}): SSID'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.4.{#SNMPINDEX}'
+              key: 'ssid.name[mtxrWlApSsid.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApSsid Service Set Identifier.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 10dd0b3680c04bde89d521fd8c705887
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP noise floor'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.9.{#SNMPINDEX}'
+              key: 'ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApNoiseFloor
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 15m
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 1a6dd112444a4c64a556dda3833fd6d2
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.3.1.6.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+        -
+          uuid: de8845213cb14554aa0306b19c997e47
+          name: 'CAPsMAN AP channel discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#IFNAME},1.3.6.1.4.1.14988.1.1.14.1.1.2,{#IFALIAS},1.3.6.1.2.1.31.1.1.1.18,{#IFTYPE},1.3.6.1.2.1.2.2.1.3]'
+          key: mtxrWlCMChannel.discovery
+          delay: 1h
+          filter:
+            evaltype: AND
+            conditions:
+              -
+                macro: '{#IFTYPE}'
+                value: ^1$
+                formulaid: B
+              -
+                macro: '{#IFNAME}'
+                value: '{$IFNAME.WIFI.MATCHES}'
+                formulaid: A
+          description: 'MIKROTIK-MIB::mtxrWlCMChannel'
+          item_prototypes:
+            -
+              uuid: c130a29f18a146d483cde32122880e23
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP authenticated clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.3.{#SNMPINDEX}'
+              key: 'ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMAuthClientCount Number of authentication clients.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: b80079f3815c438bb45a76febc53d531
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP channel'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.5.{#SNMPINDEX}'
+              key: 'ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMChannel
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 1dc8656481a2470c92e97bef53f17d41
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP registered clients'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.2.{#SNMPINDEX}'
+              key: 'ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]'
+              history: 7d
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+            -
+              uuid: 489322ce283c434684d4f59829c257d2
+              name: 'Interface {#IFNAME}({#IFALIAS}): AP state'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.4.1.14988.1.1.1.7.1.4.{#SNMPINDEX}'
+              key: 'ssid.state[mtxrWlCMState.{#SNMPINDEX}]'
+              history: 7d
+              trends: '0'
+              value_type: CHAR
+              description: |
+                MIB: MIKROTIK-MIB
+                mtxrWlCMState Wireless interface state.
+              preprocessing:
+                -
+                  type: DISCARD_UNCHANGED_HEARTBEAT
+                  parameters:
+                    - 1h
+              tags:
+                -
+                  tag: Application
+                  value: 'Interface {#IFNAME}({#IFALIAS})'
+              trigger_prototypes:
+                -
+                  uuid: 0c4ff636a9834ee39a16032fd5cd2048
+                  expression: 'last(/MikroTik netPower Lite 7R SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"'
+                  name: 'Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running'
+                  priority: WARNING
+                  description: 'Access point interface can be not running by different reasons - disabled interface, power off, network link down.'
+        -
+          uuid: ffe565a9cbb24c5ba7112a5db9d43231
+          name: 'Storage discovery'
+          type: SNMP_AGENT
+          snmp_oid: 'discovery[{#SNMPVALUE},1.3.6.1.2.1.25.2.3.1.3,{#ALLOC_UNITS},1.3.6.1.2.1.25.2.3.1.4,{#STORAGE_TYPE},1.3.6.1.2.1.25.2.3.1.2]'
+          key: storage.discovery
+          delay: 1h
+          filter:
+            evaltype: OR
+            conditions:
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+4$
+                formulaid: A
+              -
+                macro: '{#STORAGE_TYPE}'
+                value: .+hrStorageFixedDisk
+                formulaid: B
+          description: 'HOST-RESOURCES-MIB::hrStorage discovery with storage filter'
+          item_prototypes:
+            -
+              uuid: 926e106ebed847cb8179f1672be567b9
+              name: 'Disk-{#SNMPINDEX}: Space utilization'
+              type: CALCULATED
+              key: 'vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              value_type: FLOAT
+              units: '%'
+              params: '(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100'
+              description: 'Space utilization in % for Disk-{#SNMPINDEX}'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: e308837cc63741b7af3175521c7a66ec
+              name: 'Disk-{#SNMPINDEX}: Total space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.5.{#SNMPINDEX}'
+              key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The size of the storage represented by this entry, in
+                units of hrStorageAllocationUnits. This object is
+                writable to allow remote configuration of the size of
+                the storage area in those cases where such an
+                operation makes sense and is possible on the
+                underlying system. For example, the amount of main
+                memory allocated to a buffer pool might be modified or
+                the amount of disk space allocated to virtual memory
+                might be modified.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+            -
+              uuid: 36d4268675794bfcba1ca0b2a586770d
+              name: 'Disk-{#SNMPINDEX}: Used space'
+              type: SNMP_AGENT
+              snmp_oid: '1.3.6.1.2.1.25.2.3.1.6.{#SNMPINDEX}'
+              key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+              history: 7d
+              units: B
+              description: |
+                MIB: HOST-RESOURCES-MIB
+                The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
+              preprocessing:
+                -
+                  type: MULTIPLIER
+                  parameters:
+                    - '1024'
+              tags:
+                -
+                  tag: Application
+                  value: Storage
+          trigger_prototypes:
+            -
+              uuid: 1019a14b0998497daff1707692bc38ac
+              expression: |
+                last(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik netPower Lite 7R SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower Lite 7R SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: AVERAGE
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 5G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+            -
+              uuid: 1c431594950944138617449b126c5d92
+              expression: |
+                last(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and
+                ((last(/MikroTik netPower Lite 7R SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower Lite 7R SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+              name: 'Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)'
+              opdata: 'Space used: {ITEM.LASTVALUE3} of {ITEM.LASTVALUE2} ({ITEM.LASTVALUE1})'
+              priority: WARNING
+              description: |
+                Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.
+                 Second condition should be one of the following:
+                 - The disk free space is less than 10G.
+                 - The disk will be full in less than 24 hours.
+              manual_close: 'YES'
+              dependencies:
+                -
+                  name: 'Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)'
+                  expression: |
+                    last(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and
+                    ((last(/MikroTik netPower Lite 7R SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/MikroTik netPower Lite 7R SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/MikroTik netPower Lite 7R SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d)
+          graph_prototypes:
+            -
+              uuid: 43b64db05b454192adb237afed0b7b02
+              name: 'Disk-{#SNMPINDEX}: Disk space usage'
+              width: '600'
+              height: '340'
+              type: PIE
+              show_3d: 'YES'
+              graph_items:
+                -
+                  color: '969696'
+                  calc_fnc: LAST
+                  type: GRAPH_SUM
+                  item:
+                    host: 'MikroTik netPower Lite 7R SNMP'
+                    key: 'vfs.fs.total[hrStorageSize.{#SNMPINDEX}]'
+                -
+                  sortorder: '1'
+                  color: C80000
+                  calc_fnc: LAST
+                  item:
+                    host: 'MikroTik netPower Lite 7R SNMP'
+                    key: 'vfs.fs.used[hrStorageSize.{#SNMPINDEX}]'
+      macros:
+        -
+          macro: '{$CPU.UTIL.CRIT}'
+          value: '90'
+        -
+          macro: '{$IFNAME.LTEMODEM.MATCHES}'
+          value: ^lte
+          description: 'This macro is used in LTE modem discovery. It can be overridden on the host.'
+        -
+          macro: '{$IFNAME.WIFI.MATCHES}'
+          value: WIFI
+          description: 'This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.'
+        -
+          macro: '{$LTEMODEM.RSRP.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSRP minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSRQ.MIN.WARN}'
+          value: '-20'
+          description: 'The LTE modem RSRQ minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.RSSI.MIN.WARN}'
+          value: '-100'
+          description: 'The LTE modem RSSI minimum value for warning trigger expression.'
+        -
+          macro: '{$LTEMODEM.SINR.MIN.WARN}'
+          value: '0'
+          description: 'The LTE modem SINR minimum value for warning trigger expression.'
+        -
+          macro: '{$MEMORY.UTIL.MAX}'
+          value: '90'
+        -
+          macro: '{$TEMP_CRIT}'
+          value: '60'
+        -
+          macro: '{$TEMP_CRIT:"CPU"}'
+          value: '75'
+        -
+          macro: '{$TEMP_CRIT_LOW}'
+          value: '5'
+        -
+          macro: '{$TEMP_WARN}'
+          value: '50'
+        -
+          macro: '{$TEMP_WARN:"CPU"}'
+          value: '70'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.CRIT}'
+          value: '90'
+        -
+          macro: '{$VFS.FS.PUSED.MAX.WARN}'
+          value: '80'
+  graphs:
+    -
+      uuid: 7416ed490d2649a19930540ed8bfff7d
+      name: 'Memory utilization'
+      ymin_type_1: FIXED
+      ymax_type_1: FIXED
+      graph_items:
+        -
+          drawtype: GRADIENT_LINE
+          color: 1A7C11
+          item:
+            host: 'MikroTik netPower Lite 7R SNMP'
+            key: 'vm.memory.util[memoryUsedPercentage.Memory]'
diff --git a/templates/net/mikrotik/mikrotik_snmp/README.md b/templates/net/mikrotik/mikrotik_snmp/README.md
new file mode 100644
index 00000000000..f358132d791
--- /dev/null
+++ b/templates/net/mikrotik/mikrotik_snmp/README.md
@@ -0,0 +1,121 @@
+
+# Mikrotik SNMP
+
+## Overview
+
+For Zabbix version: 5.4 and higher  
+
+## Setup
+
+Refer to the vendor documentation.
+
+## Zabbix configuration
+
+No specific Zabbix configuration is required.
+
+### Macros used
+
+|Name|Description|Default|
+|----|-----------|-------|
+|{$CPU.UTIL.CRIT} |<p>-</p> |`90` |
+|{$IFNAME.LTEMODEM.MATCHES} |<p>This macro is used in LTE modem discovery. It can be overridden on the host.</p> |`^lte` |
+|{$IFNAME.WIFI.MATCHES} |<p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> |`WIFI` |
+|{$LTEMODEM.RSRP.MIN.WARN} |<p>The LTE modem RSRP minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.RSRQ.MIN.WARN} |<p>The LTE modem RSRQ minimum value for warning trigger expression.</p> |`-20` |
+|{$LTEMODEM.RSSI.MIN.WARN} |<p>The LTE modem RSSI minimum value for warning trigger expression.</p> |`-100` |
+|{$LTEMODEM.SINR.MIN.WARN} |<p>The LTE modem SINR minimum value for warning trigger expression.</p> |`0` |
+|{$MEMORY.UTIL.MAX} |<p>-</p> |`90` |
+|{$TEMP_CRIT:"CPU"} |<p>-</p> |`75` |
+|{$TEMP_CRIT_LOW} |<p>-</p> |`5` |
+|{$TEMP_CRIT} |<p>-</p> |`60` |
+|{$TEMP_WARN:"CPU"} |<p>-</p> |`70` |
+|{$TEMP_WARN} |<p>-</p> |`50` |
+|{$VFS.FS.PUSED.MAX.CRIT} |<p>-</p> |`90` |
+|{$VFS.FS.PUSED.MAX.WARN} |<p>-</p> |`80` |
+
+## Template links
+
+|Name|
+|----|
+|Generic SNMP |
+|Interfaces SNMP |
+
+## Discovery rules
+
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|CPU discovery |<p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p> |SNMP |hrProcessorLoad.discovery |
+|Temperature CPU discovery |<p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> |SNMP |mtxrHlProcessorTemperature.discovery |
+|Temperature sensor discovery |<p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p> |SNMP |mtxrHlTemperature.discovery |
+|LTE modem discovery |<p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p> |SNMP |mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p> |
+|AP channel discovery |<p>MIKROTIK-MIB::mtxrWlAp</p> |SNMP |mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p> |
+|CAPsMAN AP channel discovery |<p>MIKROTIK-MIB::mtxrWlCMChannel</p> |SNMP |mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p> |
+|Storage discovery |<p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p> |SNMP |storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
+
+## Items collected
+
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|CPU |#{#SNMPINDEX}: CPU utilization |<p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p> |SNMP |system.cpu.util[hrProcessorLoad.{#SNMPINDEX}] |
+|Inventory |Operating system |<p>MIB: MIKROTIK-MIB</p><p>Software version.</p> |SNMP |system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware model name |<p>-</p> |SNMP |system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Hardware serial number |<p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p> |SNMP |system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Inventory |Firmware version |<p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p> |SNMP |system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p> |
+|Memory |Used memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Total memory |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Memory |Memory utilization |<p>Memory utilization in %</p> |CALCULATED |vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last(//vm.memory.used[hrStorageUsed.Memory])/last(//vm.memory.total[hrStorageSize.Memory])*100` |
+|Storage |Disk-{#SNMPINDEX}: Used space |<p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p> |SNMP |vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Total space |<p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> |SNMP |vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p> |
+|Storage |Disk-{#SNMPINDEX}: Space utilization |<p>Space utilization in % for Disk-{#SNMPINDEX}</p> |CALCULATED |vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last(//vfs.fs.used[hrStorageSize.{#SNMPINDEX}])/last(//vfs.fs.total[hrStorageSize.{#SNMPINDEX}]))*100` |
+|Temperature |CPU: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p> |SNMP |sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Temperature |Device: Temperature |<p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p> |SNMP |sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p> |SNMP |lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p> |SNMP |lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p> |SNMP |lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): LTE modem SINR |<p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p> |SNMP |lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
+
+## Triggers
+
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|#{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m) |<p>CPU utilization is too high. The system might be slow to respond.</p> |`min(/Mikrotik SNMP/system.cpu.util[hrProcessorLoad.{#SNMPINDEX}],5m)>{$CPU.UTIL.CRIT}` |WARNING | |
+|Operating system description has changed |<p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p> |`last(/Mikrotik SNMP/system.sw.os[mtxrLicVersion.0],#1)<>last(/Mikrotik SNMP/system.sw.os[mtxrLicVersion.0],#2) and length(last(/Mikrotik SNMP/system.sw.os[mtxrLicVersion.0]))>0` |INFO |<p>Manual close: YES</p> |
+|Device has been replaced (new serial number received) |<p>Device serial number has changed. Ack to close</p> |`last(/Mikrotik SNMP/system.hw.serialnumber,#1)<>last(/Mikrotik SNMP/system.hw.serialnumber,#2) and length(last(/Mikrotik SNMP/system.hw.serialnumber))>0` |INFO |<p>Manual close: YES</p> |
+|Firmware has changed |<p>Firmware version has changed. Ack to close</p> |`last(/Mikrotik SNMP/system.hw.firmware,#1)<>last(/Mikrotik SNMP/system.hw.firmware,#2) and length(last(/Mikrotik SNMP/system.hw.firmware))>0` |INFO |<p>Manual close: YES</p> |
+|High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`min(/Mikrotik SNMP/vm.memory.util[memoryUsedPercentage.Memory],5m)>{$MEMORY.UTIL.MAX}` |AVERAGE | |
+|Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/Mikrotik SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and ((last(/Mikrotik SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/Mikrotik SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<5G or timeleft(/Mikrotik SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |AVERAGE |<p>Manual close: YES</p> |
+|Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%) |<p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> |`last(/Mikrotik SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}])>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and ((last(/Mikrotik SNMP/vfs.fs.total[hrStorageSize.{#SNMPINDEX}])-last(/Mikrotik SNMP/vfs.fs.used[hrStorageSize.{#SNMPINDEX}]))<10G or timeleft(/Mikrotik SNMP/vfs.fs.pused[hrStorageSize.{#SNMPINDEX}],1h,100)<1d) ` |WARNING |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
+|CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Mikrotik SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`max(/Mikrotik SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"CPU"}-3` |WARNING |<p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p> |
+|CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Mikrotik SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`max(/Mikrotik SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"CPU"}-3` |HIGH | |
+|CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"} |<p>-</p> |`avg(/Mikrotik SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`min(/Mikrotik SNMP/sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"CPU"}+3` |AVERAGE | |
+|Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Mikrotik SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`max(/Mikrotik SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_WARN:"Device"}-3` |WARNING |<p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p> |
+|Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"} |<p>This trigger uses temperature sensor values as well as temperature sensor status if available</p> |`avg(/Mikrotik SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`max(/Mikrotik SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT:"Device"}-3` |HIGH | |
+|Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"} |<p>-</p> |`avg(/Mikrotik SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`min(/Mikrotik SNMP/sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}],5m)>{$TEMP_CRIT_LOW:"Device"}+3` |AVERAGE | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/Mikrotik SNMP/lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}],5m) < {$LTEMODEM.RSSI.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m) |<p>-</p> |`max(/Mikrotik SNMP/lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRP.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m) |<p>-</p> |`max(/Mikrotik SNMP/lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}],5m) < {$LTEMODEM.RSRQ.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m) |<p>-</p> |`max(/Mikrotik SNMP/lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}],5m) < {$LTEMODEM.SINR.MIN.WARN}` |WARNING | |
+|Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running |<p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p> |`last(/Mikrotik SNMP/ssid.state[mtxrWlCMState.{#SNMPINDEX}])<>"running-ap"` |WARNING | |
+
+## Feedback
+
+Please report any issues with the template at https://support.zabbix.com
+
+## Known Issues
+
+- Description: Doesn't have ifHighSpeed filled. fixed in more recent versions
+  - Version: RouterOS 6.28 or lower
+
+- Description: Doesn't have any temperature sensors
+  - Version: RouterOS 6.38.5
+  - Device: Mikrotik 941-2nD, Mikrotik 951G-2HnD
+
diff --git a/templates/net/mikrotik_snmp/template_net_mikrotik_snmp.yaml b/templates/net/mikrotik/mikrotik_snmp/template_net_mikrotik_snmp.yaml
index 10a758bf2b0..46f1ca9360a 100644
--- a/templates/net/mikrotik_snmp/template_net_mikrotik_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_snmp/template_net_mikrotik_snmp.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
-  version: '5.4'
-  date: '2021-05-11T08:05:10Z'
+  version: '6.0'
+  date: '2021-10-08T17:48:38Z'
   groups:
     -
       uuid: 36bff6c29af64692839d077febfc7079
@@ -26,7 +26,7 @@ zabbix_export:
           Version: RouterOS 6.38.5
           Device: Mikrotik 941-2nD, Mikrotik 951G-2HnD
         
-        Template tooling version used: 0.38
+        Template tooling version used: 0.39
       templates:
         -
           name: 'Generic SNMP'
diff --git a/templates/net/mikrotik_snmp/README.md b/templates/net/mikrotik_snmp/README.md
deleted file mode 100644
index b8e00862390..00000000000
--- a/templates/net/mikrotik_snmp/README.md
+++ /dev/null
@@ -1,121 +0,0 @@
-
-# Mikrotik SNMP
-
-## Overview
-
-For Zabbix version: 5.4 and higher  
-
-## Setup
-
-Refer to the vendor documentation.
-
-## Zabbix configuration
-
-No specific Zabbix configuration is required.
-
-### Macros used
-
-| Name                       | Description                                                                                        | Default |
-|----------------------------|----------------------------------------------------------------------------------------------------|---------|
-| {$CPU.UTIL.CRIT}           | <p>-</p>                                                                                           | `90`    |
-| {$IFNAME.LTEMODEM.MATCHES} | <p>This macro is used in LTE modem discovery. It can be overridden on the host.</p>                | `^lte`  |
-| {$IFNAME.WIFI.MATCHES}     | <p>This macro is used in CAPsMAN AP channel discovery. It can be overridden on the host level.</p> | `WIFI`  |
-| {$LTEMODEM.RSRP.MIN.WARN}  | <p>The LTE modem RSRP minimum value for warning trigger expression.</p>                            | `-100`  |
-| {$LTEMODEM.RSRQ.MIN.WARN}  | <p>The LTE modem RSRQ minimum value for warning trigger expression.</p>                            | `-20`   |
-| {$LTEMODEM.RSSI.MIN.WARN}  | <p>The LTE modem RSSI minimum value for warning trigger expression.</p>                            | `-100`  |
-| {$LTEMODEM.SINR.MIN.WARN}  | <p>The LTE modem SINR minimum value for warning trigger expression.</p>                            | `0`     |
-| {$MEMORY.UTIL.MAX}         | <p>-</p>                                                                                           | `90`    |
-| {$TEMP_CRIT:"CPU"}         | <p>-</p>                                                                                           | `75`    |
-| {$TEMP_CRIT_LOW}           | <p>-</p>                                                                                           | `5`     |
-| {$TEMP_CRIT}               | <p>-</p>                                                                                           | `60`    |
-| {$TEMP_WARN:"CPU"}         | <p>-</p>                                                                                           | `70`    |
-| {$TEMP_WARN}               | <p>-</p>                                                                                           | `50`    |
-| {$VFS.FS.PUSED.MAX.CRIT}   | <p>-</p>                                                                                           | `90`    |
-| {$VFS.FS.PUSED.MAX.WARN}   | <p>-</p>                                                                                           | `80`    |
-
-## Template links
-
-| Name            |
-|-----------------|
-| Generic SNMP    |
-| Interfaces SNMP |
-
-## Discovery rules
-
-| Name                         | Description                                                                                                                                                        | Type | Key and additional info                                                                                                                                |
-|------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|------|--------------------------------------------------------------------------------------------------------------------------------------------------------|
-| CPU discovery                | <p>HOST-RESOURCES-MIB::hrProcessorTable discovery</p>                                                                                                              | SNMP | hrProcessorLoad.discovery                                                                                                                              |
-| Temperature CPU discovery    | <p>MIKROTIK-MIB::mtxrHlProcessorTemperature</p><p>Since temperature of CPU is not available on all Mikrotik hardware, this is done to avoid unsupported items.</p> | SNMP | mtxrHlProcessorTemperature.discovery                                                                                                                   |
-| Temperature sensor discovery | <p>MIKROTIK-MIB::mtxrHlTemperature</p><p>Since temperature sensor is not available on all Mikrotik hardware,</p><p>this is done to avoid unsupported items.</p>    | SNMP | mtxrHlTemperature.discovery                                                                                                                            |
-| LTE modem discovery          | <p>MIKROTIK-MIB::mtxrLTEModemInterfaceIndex</p>                                                                                                                    | SNMP | mtxrLTEModem.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.LTEMODEM.MATCHES}`</p>  |
-| AP channel discovery         | <p>MIKROTIK-MIB::mtxrWlAp</p>                                                                                                                                      | SNMP | mtxrWlAp.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^71$`</p><p>- B: {#IFADMINSTATUS} MATCHES_REGEX `^1$`</p>                     |
-| CAPsMAN AP channel discovery | <p>MIKROTIK-MIB::mtxrWlCMChannel</p>                                                                                                                               | SNMP | mtxrWlCMChannel.discovery<p>**Filter**:</p>AND <p>- A: {#IFTYPE} MATCHES_REGEX `^1$`</p><p>- B: {#IFNAME} MATCHES_REGEX `{$IFNAME.WIFI.MATCHES}`</p>   |
-| Storage discovery            | <p>HOST-RESOURCES-MIB::hrStorage discovery with storage filter</p>                                                                                                 | SNMP | storage.discovery<p>**Filter**:</p>OR <p>- B: {#STORAGE_TYPE} MATCHES_REGEX `.+4$`</p><p>- A: {#STORAGE_TYPE} MATCHES_REGEX `.+hrStorageFixedDisk`</p> |
-
-## Items collected
-
-| Group       | Name                                                      | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | Type       | Key and additional info                                                                                                                                                |
-|-------------|-----------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| CPU         | #{#SNMPINDEX}: CPU utilization                            | <p>MIB: HOST-RESOURCES-MIB</p><p>The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.</p>                                                                                                                                                                                                                                                                                                              | SNMP       | system.cpu.util[hrProcessorLoad.{#SNMPINDEX}]                                                                                                                          |
-| Inventory   | Operating system                                          | <p>MIB: MIKROTIK-MIB</p><p>Software version.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | SNMP       | system.sw.os[mtxrLicVersion.0]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                      |
-| Inventory   | Hardware model name                                       | <p>-</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | SNMP       | system.hw.model<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                     |
-| Inventory   | Hardware serial number                                    | <p>MIB: MIKROTIK-MIB</p><p>RouterBOARD serial number.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | SNMP       | system.hw.serialnumber<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                              |
-| Inventory   | Firmware version                                          | <p>MIB: MIKROTIK-MIB</p><p>Current firmware version.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | SNMP       | system.hw.firmware<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1d`</p>                                                                                  |
-| Memory      | Used memory                                               | <p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p>                                                                                                                                                                                                                                                                                                                                                                               | SNMP       | vm.memory.used[hrStorageUsed.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                               |
-| Memory      | Total memory                                              | <p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> | SNMP       | vm.memory.total[hrStorageSize.Memory]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                              |
-| Memory      | Memory utilization                                        | <p>Memory utilization in %</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | CALCULATED | vm.memory.util[memoryUsedPercentage.Memory]<p>**Expression**:</p>`last("vm.memory.used[hrStorageUsed.Memory]")/last("vm.memory.total[hrStorageSize.Memory]")*100`      |
-| Storage     | Disk-{#SNMPINDEX}: Used space                             | <p>MIB: HOST-RESOURCES-MIB</p><p>The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.</p>                                                                                                                                                                                                                                                                                                                                                                               | SNMP       | vfs.fs.used[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                            |
-| Storage     | Disk-{#SNMPINDEX}: Total space                            | <p>MIB: HOST-RESOURCES-MIB</p><p>The size of the storage represented by this entry, in</p><p>units of hrStorageAllocationUnits. This object is</p><p>writable to allow remote configuration of the size of</p><p>the storage area in those cases where such an</p><p>operation makes sense and is possible on the</p><p>underlying system. For example, the amount of main</p><p>memory allocated to a buffer pool might be modified or</p><p>the amount of disk space allocated to virtual memory</p><p>might be modified.</p> | SNMP       | vfs.fs.total[hrStorageSize.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `1024`</p>                                                                           |
-| Storage     | Disk-{#SNMPINDEX}: Space utilization                      | <p>Space utilization in % for Disk-{#SNMPINDEX}</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | CALCULATED | vfs.fs.pused[hrStorageSize.{#SNMPINDEX}]<p>**Expression**:</p>`(last("vfs.fs.used[hrStorageSize.{#SNMPINDEX}]")/last("vfs.fs.total[hrStorageSize.{#SNMPINDEX}]"))*100` |
-| Temperature | CPU: Temperature                                          | <p>MIB: MIKROTIK-MIB</p><p>mtxrHlProcessorTemperature Processor temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p>                                                                                                                                                                                                                                                                                                                                                               | SNMP       | sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p>                                                          |
-| Temperature | Device: Temperature                                       | <p>MIB: MIKROTIK-MIB</p><p>mtxrHlTemperature Device temperature in Celsius (degrees C).</p><p>Might be missing in entry models (RB750, RB450G..).</p><p>Reference: http://wiki.mikrotik.com/wiki/Manual:SNMP</p>                                                                                                                                                                                                                                                                                                                | SNMP       | sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.1`</p>                                                                   |
-| Wireless    | Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI           | <p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSSI Received Signal Strength Indicator.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                       | SNMP       | lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}]                                                                                                                    |
-| Wireless    | Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP           | <p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRP Reference Signal Received Power.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                          | SNMP       | lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}]                                                                                                                    |
-| Wireless    | Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ           | <p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalRSRQ Reference Signal Received Quality.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                        | SNMP       | lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}]                                                                                                                    |
-| Wireless    | Interface {#IFNAME}({#IFALIAS}): LTE modem SINR           | <p>MIB: MIKROTIK-MIB</p><p>mtxrLTEModemSignalSINR Signal to Interference & Noise Ratio.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                     | SNMP       | lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}]                                                                                                                    |
-| Wireless    | Interface {#IFNAME}({#IFALIAS}): SSID                     | <p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                             | SNMP       | ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                |
-| Wireless    | Interface {#IFNAME}({#IFALIAS}): AP band                  | <p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | SNMP       | ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                                |
-| Wireless    | Interface {#IFNAME}({#IFALIAS}): AP noise floor           | <p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | SNMP       | ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p>                                                        |
-| Wireless    | Interface {#IFNAME}({#IFALIAS}): AP registered clients    | <p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p>                                                                                                                                                                                                                                                                                                                                                                     | SNMP       | ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}]                                                                                                                       |
-| Wireless    | Interface {#IFNAME}({#IFALIAS}): AP authenticated clients | <p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                        | SNMP       | ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}]                                                                                                                  |
-| Wireless    | Interface {#IFNAME}({#IFALIAS}): AP channel               | <p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | SNMP       | ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                          |
-| Wireless    | Interface {#IFNAME}({#IFALIAS}): AP state                 | <p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                                          | SNMP       | ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p>                                                              |
-| Wireless    | Interface {#IFNAME}({#IFALIAS}): AP registered clients    | <p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p>                                                                                                                                                                                                                                                                                                                                                                  | SNMP       | ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}]                                                                                                                    |
-| Wireless    | Interface {#IFNAME}({#IFALIAS}): AP authenticated clients | <p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p>                                                                                                                                                                                                                                                                                                                                                                                                                                        | SNMP       | ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}]                                                                                                                  |
-
-## Triggers
-
-| Name                                                                                                   | Description                                                                                                                                                                                                                                                                             | Expression                                                                                                                                                                                                                                                                                                                                 | Severity | Dependencies and additional info                                                                                                                              |
-|--------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| #{#SNMPINDEX}: High CPU utilization (over {$CPU.UTIL.CRIT}% for 5m)                                    | <p>CPU utilization is too high. The system might be slow to respond.</p>                                                                                                                                                                                                                | `{TEMPLATE_NAME:system.cpu.util[hrProcessorLoad.{#SNMPINDEX}].min(5m)}>{$CPU.UTIL.CRIT}`                                                                                                                                                                                                                                                   | WARNING  |                                                                                                                                                               |
-| Operating system description has changed                                                               | <p>Operating system description has changed. Possible reasons that system has been updated or replaced. Ack to close.</p>                                                                                                                                                               | `{TEMPLATE_NAME:system.sw.os[mtxrLicVersion.0].diff()}=1 and {TEMPLATE_NAME:system.sw.os[mtxrLicVersion.0].strlen()}>0`                                                                                                                                                                                                                    | INFO     | <p>Manual close: YES</p>                                                                                                                                      |
-| Device has been replaced (new serial number received)                                                  | <p>Device serial number has changed. Ack to close</p>                                                                                                                                                                                                                                   | `{TEMPLATE_NAME:system.hw.serialnumber.diff()}=1 and {TEMPLATE_NAME:system.hw.serialnumber.strlen()}>0`                                                                                                                                                                                                                                    | INFO     | <p>Manual close: YES</p>                                                                                                                                      |
-| Firmware has changed                                                                                   | <p>Firmware version has changed. Ack to close</p>                                                                                                                                                                                                                                       | `{TEMPLATE_NAME:system.hw.firmware.diff()}=1 and {TEMPLATE_NAME:system.hw.firmware.strlen()}>0`                                                                                                                                                                                                                                            | INFO     | <p>Manual close: YES</p>                                                                                                                                      |
-| High memory utilization (>{$MEMORY.UTIL.MAX}% for 5m)                                                  | <p>The system is running out of free memory.</p>                                                                                                                                                                                                                                        | `{TEMPLATE_NAME:vm.memory.util[memoryUsedPercentage.Memory].min(5m)}>{$MEMORY.UTIL.MAX}`                                                                                                                                                                                                                                                   | AVERAGE  |                                                                                                                                                               |
-| Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%) | <p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 5G.</p><p> - The disk will be full in less than 24 hours.</p>  | `{TEMPLATE_NAME:vfs.fs.pused[hrStorageSize.{#SNMPINDEX}].last()}>{$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"} and (({Mikrotik SNMP:vfs.fs.total[hrStorageSize.{#SNMPINDEX}].last()}-{Mikrotik SNMP:vfs.fs.used[hrStorageSize.{#SNMPINDEX}].last()})<5G or {TEMPLATE_NAME:vfs.fs.pused[hrStorageSize.{#SNMPINDEX}].timeleft(1h,,100)}<1d)`  | AVERAGE  | <p>Manual close: YES</p>                                                                                                                                      |
-| Disk-{#SNMPINDEX}: Disk space is low (used > {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}%)            | <p>Two conditions should match: First, space utilization should be above {$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"}.</p><p> Second condition should be one of the following:</p><p> - The disk free space is less than 10G.</p><p> - The disk will be full in less than 24 hours.</p> | `{TEMPLATE_NAME:vfs.fs.pused[hrStorageSize.{#SNMPINDEX}].last()}>{$VFS.FS.PUSED.MAX.WARN:"Disk-{#SNMPINDEX}"} and (({Mikrotik SNMP:vfs.fs.total[hrStorageSize.{#SNMPINDEX}].last()}-{Mikrotik SNMP:vfs.fs.used[hrStorageSize.{#SNMPINDEX}].last()})<10G or {TEMPLATE_NAME:vfs.fs.pused[hrStorageSize.{#SNMPINDEX}].timeleft(1h,,100)}<1d)` | WARNING  | <p>Manual close: YES</p><p>**Depends on**:</p><p>- Disk-{#SNMPINDEX}: Disk space is critically low (used > {$VFS.FS.PUSED.MAX.CRIT:"Disk-{#SNMPINDEX}"}%)</p> |
-| CPU: Temperature is above warning threshold: >{$TEMP_WARN:"CPU"}                                       | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                                                                                                                                                                                    | `{TEMPLATE_NAME:sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"CPU"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"CPU"}-3`                                                                                                | WARNING  | <p>**Depends on**:</p><p>- CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}</p>                                                              |
-| CPU: Temperature is above critical threshold: >{$TEMP_CRIT:"CPU"}                                      | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                                                                                                                                                                                    | `{TEMPLATE_NAME:sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"CPU"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"CPU"}-3`                                                                                                | HIGH     |                                                                                                                                                               |
-| CPU: Temperature is too low: <{$TEMP_CRIT_LOW:"CPU"}                                                   | <p>-</p>                                                                                                                                                                                                                                                                                | `{TEMPLATE_NAME:sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"CPU"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[mtxrHlProcessorTemperature.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"CPU"}+3`                                                                                        | AVERAGE  |                                                                                                                                                               |
-| Device: Temperature is above warning threshold: >{$TEMP_WARN:"Device"}                                 | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                                                                                                                                                                                    | `{TEMPLATE_NAME:sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"Device"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"Device"}-3`                                                                                                            | WARNING  | <p>**Depends on**:</p><p>- Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}</p>                                                        |
-| Device: Temperature is above critical threshold: >{$TEMP_CRIT:"Device"}                                | <p>This trigger uses temperature sensor values as well as temperature sensor status if available</p>                                                                                                                                                                                    | `{TEMPLATE_NAME:sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"Device"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"Device"}-3`                                                                                                            | HIGH     |                                                                                                                                                               |
-| Device: Temperature is too low: <{$TEMP_CRIT_LOW:"Device"}                                             | <p>-</p>                                                                                                                                                                                                                                                                                | `{TEMPLATE_NAME:sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}].avg(5m)}<{$TEMP_CRIT_LOW:"Device"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:sensor.temp.value[mtxrHlTemperature.{#SNMPINDEX}].min(5m)}>{$TEMP_CRIT_LOW:"Device"}+3`                                                                                                    | AVERAGE  |                                                                                                                                                               |
-| Interface {#IFNAME}({#IFALIAS}): LTE modem RSSI is low (below {$LTEMODEM.RSSI.MIN.WARN}dbm for 5m)     | <p>-</p>                                                                                                                                                                                                                                                                                | `{TEMPLATE_NAME:lte.modem.rssi[mtxrLTEModemSignalRSSI.{#SNMPINDEX}].max(5m)} < {$LTEMODEM.RSSI.MIN.WARN}`                                                                                                                                                                                                                                  | WARNING  |                                                                                                                                                               |
-| Interface {#IFNAME}({#IFALIAS}): LTE modem RSRP is low (below {$LTEMODEM.RSRP.MIN.WARN}dbm for 5m)     | <p>-</p>                                                                                                                                                                                                                                                                                | `{TEMPLATE_NAME:lte.modem.rsrp[mtxrLTEModemSignalRSRP.{#SNMPINDEX}].max(5m)} < {$LTEMODEM.RSRP.MIN.WARN}`                                                                                                                                                                                                                                  | WARNING  |                                                                                                                                                               |
-| Interface {#IFNAME}({#IFALIAS}): LTE modem RSRQ is low (below {$LTEMODEM.RSRQ.MIN.WARN}db for 5m)      | <p>-</p>                                                                                                                                                                                                                                                                                | `{TEMPLATE_NAME:lte.modem.rsrq[mtxrLTEModemSignalRSRQ.{#SNMPINDEX}].max(5m)} < {$LTEMODEM.RSRQ.MIN.WARN}`                                                                                                                                                                                                                                  | WARNING  |                                                                                                                                                               |
-| Interface {#IFNAME}({#IFALIAS}): LTE modem SINR is low (below {$LTEMODEM.SINR.MIN.WARN}db for 5m)      | <p>-</p>                                                                                                                                                                                                                                                                                | `{TEMPLATE_NAME:lte.modem.sinr[mtxrLTEModemSignalSINR.{#SNMPINDEX}].max(5m)} < {$LTEMODEM.SINR.MIN.WARN}`                                                                                                                                                                                                                                  | WARNING  |                                                                                                                                                               |
-| Interface {#IFNAME}({#IFALIAS}): AP interface {#IFNAME}({#IFALIAS}) is not running                     | <p>Access point interface can be not running by different reasons - disabled interface, power off, network link down.</p>                                                                                                                                                               | `{TEMPLATE_NAME:ssid.state[mtxrWlCMState.{#SNMPINDEX}].last()}<>"running-ap"`                                                                                                                                                                                                                                                              | WARNING  |                                                                                                                                                               |
-
-## Feedback
-
-Please report any issues with the template at https://support.zabbix.com
-
-## Known Issues
-
-- Description: Doesn't have ifHighSpeed filled. fixed in more recent versions
-  - Version: RouterOS 6.28 or lower
-
-- Description: Doesn't have any temperature sensors
-  - Version: RouterOS 6.38.5
-  - Device: Mikrotik 941-2nD, Mikrotik 951G-2HnD
-
diff --git a/tests/libs/zbxcommon/Makefile.am b/tests/libs/zbxcommon/Makefile.am
index 38383a6dea9..e2c3585d578 100644
--- a/tests/libs/zbxcommon/Makefile.am
+++ b/tests/libs/zbxcommon/Makefile.am
@@ -66,6 +66,8 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxserver/libzbxserver.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_httpmetrics.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
 	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
 	$(top_srcdir)/src/libs/zbxmemory/libzbxmemory.a \
diff --git a/tests/libs/zbxdbcache/Makefile.am b/tests/libs/zbxdbcache/Makefile.am
index 4cecca22612..422a9299a0f 100644
--- a/tests/libs/zbxdbcache/Makefile.am
+++ b/tests/libs/zbxdbcache/Makefile.am
@@ -51,6 +51,8 @@ CACHE_LIBS = \
 	$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
 	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_httpmetrics.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
 	$(top_srcdir)/src/libs/zbxhistory/libzbxhistory.a \
 	$(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \
diff --git a/tests/libs/zbxdbhigh/Makefile.am b/tests/libs/zbxdbhigh/Makefile.am
index 5cd66d01ee6..17e6c42c3c9 100644
--- a/tests/libs/zbxdbhigh/Makefile.am
+++ b/tests/libs/zbxdbhigh/Makefile.am
@@ -76,10 +76,14 @@ SERVER_COMMON_LIB = \
 	$(top_srcdir)/src/zabbix_server/preprocessor/libpreprocessor.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_httpmetrics.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
 	$(top_srcdir)/src/libs/zbxserver/libzbxserver.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_httpmetrics.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
 	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
 	$(top_srcdir)/src/libs/zbxeval/libzbxeval.a \
@@ -130,6 +134,8 @@ PROXY_COMMON_LIB = \
 	$(top_srcdir)/src/zabbix_proxy/libzbxproxy.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/libzbxproxysysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_httpmetrics.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/linux/libspechostnamesysinfo.a \
 	$(COMMON_LIB)
diff --git a/tests/libs/zbxeval/zbx_eval_execute.yaml b/tests/libs/zbxeval/zbx_eval_execute.yaml
index ca7f2307959..d24a1779ef3 100644
--- a/tests/libs/zbxeval/zbx_eval_execute.yaml
+++ b/tests/libs/zbxeval/zbx_eval_execute.yaml
@@ -2147,4 +2147,78 @@ in:
   expression: 'power(10,300)*power(10,300)'
 out:
   result: FAIL
+---
+test case: Expression 'histogram_quantile(0.8, 0.1, 1, 0.2, 2, +Inf, 3)'
+in:
+  rules: [ZBX_EVAL_PARSE_FUNCTION,ZBX_EVAL_PARSE_VAR]
+  expression: 'histogram_quantile(0.8, 0.1, 1, 0.2, 2, "+Inf", 3)'
+out:
+  result: SUCCEED
+  value: '0.2'
+---
+test case: Expression 'histogram_quantile(0.8, 0.2, 10, 0.4, 20, 1.0, 60, 1.2, 70, +Inf, 80)'
+in:
+  rules: [ZBX_EVAL_PARSE_FUNCTION,ZBX_EVAL_PARSE_VAR]
+  expression: 'histogram_quantile(0.8, 0.2, 10, 0.4, 20, 1.0, 60, 1.2, 70, "+Inf", 80)'
+out:
+  result: SUCCEED
+  value: '1.08'
+---
+test case: Expression 'histogram_quantile(0.8, 0.2, 10, 0.4, 20, 1.0, 25, 1.0, 35, 1.2, 70, +Inf, 80)'
+in:
+  rules: [ZBX_EVAL_PARSE_FUNCTION,ZBX_EVAL_PARSE_VAR]
+  expression: 'histogram_quantile(0.8, 0.2, 10, 0.4, 20, 1.0, 25, 1.0, 35, 1.2, 70, "+Inf", 80)'
+out:
+  result: SUCCEED
+  value: '1.08'
+---
+test case: Expression 'histogram_quantile(0.8, 0.2, 10, 1.0, 60, 0.4, 20, 1.2, 70, +Inf, 80)'
+in:
+  rules: [ZBX_EVAL_PARSE_FUNCTION,ZBX_EVAL_PARSE_VAR]
+  expression: 'histogram_quantile(0.8, 0.2, 10, 1.0, 60, 0.4, 20, 1.2, 70, "+Inf", 80)'
+out:
+  result: SUCCEED
+  value: '1.08'
+---
+test case: Expression 'histogram_quantile(0.8, 0.1, 1)'
+in:
+  rules: [ZBX_EVAL_PARSE_FUNCTION,ZBX_EVAL_PARSE_VAR]
+  expression: 'histogram_quantile(0.8, 0.1, 1)'
+out:
+  result: FAIL
+---
+test case: Expression 'histogram_quantile(0.8, 0.1, 1, 0.2, 2, 0.3, 3)'
+in:
+  rules: [ZBX_EVAL_PARSE_FUNCTION,ZBX_EVAL_PARSE_VAR]
+  expression: 'histogram_quantile(0.8, 0.1, 1, 0.2, 2, 0.3, 3)'
+out:
+  result: FAIL
+---
+test case: Expression 'histogram_quantile(0.8, 0.2, 2, 0.1, "+Inf", 3)'
+in:
+  rules: [ZBX_EVAL_PARSE_FUNCTION,ZBX_EVAL_PARSE_VAR]
+  expression: 'histogram_quantile(0.8, 0.2, 2, 0.1, "+Inf", 3)'
+out:
+  result: FAIL
+---
+test case: Expression 'histogram_quantile(0.8, 0.1, 1, 0.2, 2, +Inf, 0)'
+in:
+  rules: [ZBX_EVAL_PARSE_FUNCTION,ZBX_EVAL_PARSE_VAR]
+  expression: 'histogram_quantile(0.8, 0.1, 1, 0.2, 2, "+Inf", 0)'
+out:
+  result: FAIL
+---
+test case: Expression 'histogram_quantile(-0.1, 0.2, 10, 0.4, 20, 1.0, 60, 1.2, 70, +Inf, 80)'
+in:
+  rules: [ZBX_EVAL_PARSE_FUNCTION,ZBX_EVAL_PARSE_VAR]
+  expression: 'histogram_quantile(-0.1, 0.2, 10, 0.4, 20, 1.0, 60, 1.2, 70, "+Inf", 80)'
+out:
+  result: FAIL
+---
+test case: Expression 'histogram_quantile(1.1, 0.2, 10, 0.4, 20, 1.0, 60, 1.2, 70, +Inf, 80)'
+in:
+  rules: [ZBX_EVAL_PARSE_FUNCTION,ZBX_EVAL_PARSE_VAR]
+  expression: 'histogram_quantile(1.1, 0.2, 10, 0.4, 20, 1.0, 60, 1.2, 70, "+Inf", 80)'
+out:
+  result: FAIL
 ...
diff --git a/tests/libs/zbxserver/Makefile.am b/tests/libs/zbxserver/Makefile.am
index 9149eedfcca..48bcd7a0228 100755
--- a/tests/libs/zbxserver/Makefile.am
+++ b/tests/libs/zbxserver/Makefile.am
@@ -33,6 +33,15 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/zabbix_server/odbc/libzbxodbc.a \
 	$(top_srcdir)/src/zabbix_server/scripts/libzbxscripts.a \
 	$(top_srcdir)/src/zabbix_server/preprocessor/libpreprocessor.a \
+	$(top_srcdir)/src/libs/zbxserver/libzbxserver.a \
+	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+	$(top_srcdir)/src/libs/zbxtrends/libzbxtrends.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_httpmetrics.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
+	$(top_srcdir)/src/libs/zbxmemory/libzbxmemory.a \
 	$(top_srcdir)/src/libs/zbxself/libzbxself.a \
 	$(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
 	$(top_srcdir)/src/libs/zbxsys/libzbxsys.a \
diff --git a/tests/libs/zbxserver/evaluate_function.yaml b/tests/libs/zbxserver/evaluate_function.yaml
index 7a7c2955a68..bb8ac8013be 100644
--- a/tests/libs/zbxserver/evaluate_function.yaml
+++ b/tests/libs/zbxserver/evaluate_function.yaml
@@ -3466,4 +3466,234 @@ in:
 out:
   return: FAIL
   value:
+---
+test case: Evaluate rate(), with DOUBLE data
+in:
+  history:
+  - itemid: 1
+    value type: ITEM_VALUE_TYPE_FLOAT
+    data:
+    - value: 1
+      ts: 2021-03-27 10:01:00.000000001 +00:00
+    - value: 2
+      ts: 2021-03-27 10:01:01.000000000 +00:00
+    - value: 3
+      ts: 2021-03-27 10:01:02.000000000 +00:00
+  time: 2021-03-27 10:01:02.000000000 +00:00
+  function: rate
+  params: '2'
+out:
+  return: SUCCEED
+  value: 1
+---
+test case: Evaluate rate(), with UINT64 data
+in:
+  history:
+  - itemid: 1
+    value type: ITEM_VALUE_TYPE_UINT64
+    data:
+    - value: 1
+      ts: 2021-03-27 10:01:00.000000001 +00:00
+    - value: 2
+      ts: 2021-03-27 10:01:01.000000000 +00:00
+    - value: 3
+      ts: 2021-03-27 10:01:02.000000000 +00:00
+  time: 2021-03-27 10:01:02.000000000 +00:00
+  function: rate
+  params: '2'
+out:
+  return: SUCCEED
+  value: 1
+---
+test case: Evaluate rate() extrapolation, with DOUBLE data
+in:
+  history:
+  - itemid: 1
+    value type: ITEM_VALUE_TYPE_FLOAT
+    data:
+    - value: 1
+      ts: 2021-03-27 10:01:00.000000001 +00:00
+    - value: 2
+      ts: 2021-03-27 10:01:01.000000000 +00:00
+    - value: 3
+      ts: 2021-03-27 10:01:02.000000000 +00:00
+  time: 2021-03-27 10:01:02.500000000 +00:00
+  function: rate
+  params: '3'
+out:
+  return: SUCCEED
+  value: 1
+---
+test case: Evaluate rate() extrapolation, with UINT64 data
+in:
+  history:
+  - itemid: 1
+    value type: ITEM_VALUE_TYPE_UINT64
+    data:
+    - value: 1
+      ts: 2021-03-27 10:01:00.000000001 +00:00
+    - value: 2
+      ts: 2021-03-27 10:01:01.000000000 +00:00
+    - value: 3
+      ts: 2021-03-27 10:01:02.000000000 +00:00
+  time: 2021-03-27 10:01:02.500000000 +00:00
+  function: rate
+  params: '3'
+out:
+  return: SUCCEED
+  value: 1
+---
+test case: Evaluate rate() with reset and DOUBLE data
+in:
+  history:
+  - itemid: 1
+    value type: ITEM_VALUE_TYPE_FLOAT
+    data:
+    - value: 1
+      ts: 2021-03-27 10:01:00.000000001 +00:00
+    - value: 2
+      ts: 2021-03-27 10:01:01.000000000 +00:00
+    - value: 1
+      ts: 2021-03-27 10:01:02.000000000 +00:00
+    - value: 2
+      ts: 2021-03-27 10:01:03.000000000 +00:00
+    - value: 3
+      ts: 2021-03-27 10:01:04.000000000 +00:00
+  time: 2021-03-27 10:01:04.000000000 +00:00
+  function: rate
+  params: '4'
+out:
+  return: SUCCEED
+  value: 1
+
+---
+test case: Evaluate rate() with reset and UINT64 data
+in:
+  history:
+  - itemid: 1
+    value type: ITEM_VALUE_TYPE_UINT64
+    data:
+    - value: 1
+      ts: 2021-03-27 10:01:00.000000001 +00:00
+    - value: 2
+      ts: 2021-03-27 10:01:01.000000000 +00:00
+    - value: 1
+      ts: 2021-03-27 10:01:02.000000000 +00:00
+    - value: 2
+      ts: 2021-03-27 10:01:03.000000000 +00:00
+    - value: 3
+      ts: 2021-03-27 10:01:04.000000000 +00:00
+  time: 2021-03-27 10:01:04.000000000 +00:00
+  function: rate
+  params: '4'
+out:
+  return: SUCCEED
+  value: 1
+---
+test case: Evaluate rate() extrapolation without change UINT64 data
+in:
+  history:
+  - itemid: 1
+    value type: ITEM_VALUE_TYPE_UINT64
+    data:
+    - value: 1
+      ts: 2021-03-27 10:01:00.000000001 +00:00
+    - value: 1
+      ts: 2021-03-27 10:01:01.000000000 +00:00
+    - value: 1
+      ts: 2021-03-27 10:01:02.000000000 +00:00
+  time: 2021-03-27 10:01:02.500000000 +00:00
+  function: rate
+  params: '3'
+out:
+  return: SUCCEED
+  value: 0
+---
+test case: Evaluate rate() extrapolation without change DOUBLE data
+in:
+  history:
+  - itemid: 1
+    value type: ITEM_VALUE_TYPE_FLOAT
+    data:
+    - value: 1
+      ts: 2021-03-27 10:01:00.000000001 +00:00
+    - value: 1
+      ts: 2021-03-27 10:01:01.000000000 +00:00
+    - value: 1
+      ts: 2021-03-27 10:01:02.000000000 +00:00
+  time: 2021-03-27 10:01:02.500000000 +00:00
+  function: rate
+  params: '3'
+out:
+  return: SUCCEED
+  value: 0
+---
+test case: Evaluate rate() without DOUBLE data
+in:
+  history:
+  - itemid: 1
+    value type: ITEM_VALUE_TYPE_FLOAT
+    data:
+    - value: 1
+      ts: 2021-03-27 10:01:00.000000001 +00:00
+    - value: 2
+      ts: 2021-03-27 10:01:01.000000000 +00:00
+  time: 2021-03-27 10:01:04.500000000 +00:00
+  function: rate
+  params: '1'
+out:
+  return: FAIL
+  value: 0
+---
+test case: Evaluate rate() without 2 DOUBLE backet
+in:
+  history:
+  - itemid: 1
+    value type: ITEM_VALUE_TYPE_FLOAT
+    data:
+    - value: 1
+      ts: 2021-03-27 10:01:00.000000001 +00:00
+    - value: 2
+      ts: 2021-03-27 10:01:02.000000000 +00:00
+  time: 2021-03-27 10:01:02.500000000 +00:00
+  function: rate
+  params: '1'
+out:
+  return: FAIL
+  value: 0
+---
+test case: Evaluate rate() with STR data
+in:
+  history:
+  - itemid: 1
+    value type: ITEM_VALUE_TYPE_STR
+    data:
+    - value: 1
+      ts: 2021-03-27 10:01:00.000000001 +00:00
+    - value: 2
+      ts: 2021-03-27 10:01:02.000000000 +00:00
+  time: 2021-03-27 10:01:02.000000000 +00:00
+  function: rate
+  params: '2'
+out:
+  return: FAIL
+  value: 0
+---
+test case: Evaluate rate() with negative reset
+in:
+  history:
+  - itemid: 1
+    value type: ITEM_VALUE_TYPE_FLOAT
+    data:
+    - value: 11
+      ts: 2021-03-27 10:01:00.000000001 +00:00
+    - value: 1
+      ts: 2021-03-27 10:01:01.000000000 +00:00
+  time: 2021-03-27 10:01:01.000000000 +00:00
+  function: rate
+  params: '1'
+out:
+  return: SUCCEED
+  value: 1
+
 ...
diff --git a/tests/libs/zbxsysinfo/Makefile.am b/tests/libs/zbxsysinfo/Makefile.am
index a721aa4bbcb..17de2bbc969 100644
--- a/tests/libs/zbxsysinfo/Makefile.am
+++ b/tests/libs/zbxsysinfo/Makefile.am
@@ -9,6 +9,7 @@ endif
 if AGENT
 AGENT_tests = \
 	process \
+	process_http \
 	check_key_access_rules
 endif
 
@@ -49,6 +50,8 @@ parse_item_key_LDADD = \
 	$(top_srcdir)/src/libs/zbxserver/libzbxserver.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_httpmetrics.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
 	$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
 	$(top_srcdir)/src/libs/zbxhistory/libzbxhistory.a \
@@ -96,6 +99,7 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxsysinfo/agent/libagentsysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_httpmetrics.a \
 	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
 	$(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \
 	$(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
@@ -118,13 +122,12 @@ process_SOURCES = \
 	process.c \
 	../../zbxmocktest.h
 
-process_LDADD = $(COMMON_LIB_FILES)
+process_LDADD = $(COMMON_LIB_FILES) \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
+	$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a
 
 process_WRAP_FUNCS = \
 	-Wl,--wrap=SYSTEM_LOCALTIME \
-	-Wl,--wrap=WEB_PAGE_GET \
-	-Wl,--wrap=WEB_PAGE_PERF \
-	-Wl,--wrap=WEB_PAGE_REGEXP \
 	-Wl,--wrap=VFS_FILE_SIZE \
 	-Wl,--wrap=VFS_FILE_TIME \
 	-Wl,--wrap=VFS_FILE_EXISTS \
@@ -144,6 +147,25 @@ process_LDFLAGS = @AGENT_LDFLAGS@ $(process_WRAP_FUNCS)
 
 process_CFLAGS = -DZABBIX_DAEMON -I@top_srcdir@/tests
 
+# process_http
+
+process_http_SOURCES = \
+	process_http.c \
+	../../zbxmocktest.h
+
+process_http_LDADD = $(COMMON_LIB_FILES)
+
+process_http_WRAP_FUNCS = \
+	-Wl,--wrap=WEB_PAGE_GET \
+	-Wl,--wrap=WEB_PAGE_PERF \
+	-Wl,--wrap=WEB_PAGE_REGEXP
+
+process_http_LDADD += @AGENT_LIBS@
+
+process_http_LDFLAGS = @AGENT_LDFLAGS@
+
+process_http_CFLAGS = $(process_http_WRAP_FUNCS) -I@top_srcdir@/tests
+
 # check_key_access_rules
 
 check_key_access_rules_SOURCES = \
@@ -152,6 +174,7 @@ check_key_access_rules_SOURCES = \
 
 check_key_access_rules_LDADD = $(COMMON_LIB_FILES) \
 	$(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
 	$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a
 
 check_key_access_rules_LDADD += @AGENT_LIBS@
diff --git a/tests/libs/zbxsysinfo/common/Makefile.am b/tests/libs/zbxsysinfo/common/Makefile.am
index d6f7fa874be..b66785e1c36 100644
--- a/tests/libs/zbxsysinfo/common/Makefile.am
+++ b/tests/libs/zbxsysinfo/common/Makefile.am
@@ -18,6 +18,8 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxsysinfo/agent/libagentsysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_httpmetrics.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
 	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
 	$(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \
 	$(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
diff --git a/tests/libs/zbxsysinfo/linux/Makefile.am b/tests/libs/zbxsysinfo/linux/Makefile.am
index 93ad477029f..38112ac4c52 100644
--- a/tests/libs/zbxsysinfo/linux/Makefile.am
+++ b/tests/libs/zbxsysinfo/linux/Makefile.am
@@ -26,6 +26,8 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxsysinfo/agent/libagentsysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/simple/libsimplesysinfo.a \
 	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_httpmetrics.a \
+	$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo_http.a \
 	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
 	$(top_srcdir)/src/libs/zbxregexp/libzbxregexp.a \
 	$(top_srcdir)/src/libs/zbxalgo/libzbxalgo.a \
diff --git a/tests/libs/zbxsysinfo/process.c b/tests/libs/zbxsysinfo/process.c
index c208b82ed56..048bd9dbc4e 100644
--- a/tests/libs/zbxsysinfo/process.c
+++ b/tests/libs/zbxsysinfo/process.c
@@ -29,9 +29,6 @@
 static char	*called_key = NULL;
 
 int	__wrap_SYSTEM_LOCALTIME(const char *command, AGENT_RESULT *result);
-int	__wrap_WEB_PAGE_GET(const char *command, AGENT_RESULT *result);
-int	__wrap_WEB_PAGE_PERF(const char *command, AGENT_RESULT *result);
-int	__wrap_WEB_PAGE_REGEXP(const char *command, AGENT_RESULT *result);
 int	__wrap_VFS_FILE_SIZE(const char *command, AGENT_RESULT *result);
 int	__wrap_VFS_FILE_TIME(const char *command, AGENT_RESULT *result);
 int	__wrap_VFS_FILE_EXISTS(const char *command, AGENT_RESULT *result);
@@ -95,36 +92,6 @@ int	__wrap_SYSTEM_LOCALTIME(const char *command, AGENT_RESULT *result)
 	return SUCCEED;
 }
 
-int	__wrap_WEB_PAGE_GET(const char *command, AGENT_RESULT *result)
-{
-	ZBX_UNUSED(command);
-	ZBX_UNUSED(result);
-
-	called_key = "web.page.get";
-
-	return SUCCEED;
-}
-
-int	__wrap_WEB_PAGE_PERF(const char *command, AGENT_RESULT *result)
-{
-	ZBX_UNUSED(command);
-	ZBX_UNUSED(result);
-
-	called_key = "web.page.perf";
-
-	return SUCCEED;
-}
-
-int	__wrap_WEB_PAGE_REGEXP(const char *command, AGENT_RESULT *result)
-{
-	ZBX_UNUSED(command);
-	ZBX_UNUSED(result);
-
-	called_key = "web.page.regexp";
-
-	return SUCCEED;
-}
-
 int	__wrap_VFS_FILE_SIZE(const char *command, AGENT_RESULT *result)
 {
 	ZBX_UNUSED(command);
diff --git a/tests/libs/zbxsysinfo/process.yaml b/tests/libs/zbxsysinfo/process.yaml
index 25181ebb6b8..49655beebed 100644
--- a/tests/libs/zbxsysinfo/process.yaml
+++ b/tests/libs/zbxsysinfo/process.yaml
@@ -4,21 +4,6 @@ in:
   in_command: system.localtime[utc]
   flags: 4
 ---
-test case: successfully called WEB_PAGE_GET function
-in:
-  in_command: web.page.get[localhost,,80]
-  flags: 4
----
-test case: successfully called WEB_PAGE_PERF function
-in:
-  in_command: web.page.perf[localhost,,80]
-  flags: 4
----
-test case: successfully called WEB_PAGE_REGEXP function
-in:
-  in_command: web.page.regexp[localhost,,80,OK]
-  flags: 4
----
 test case: successfully called VFS_FILE_SIZE function
 in:
   in_command: vfs.file.size[/etc/passwd]
diff --git a/tests/libs/zbxsysinfo/process_http.c b/tests/libs/zbxsysinfo/process_http.c
new file mode 100644
index 00000000000..f29e35544af
--- /dev/null
+++ b/tests/libs/zbxsysinfo/process_http.c
@@ -0,0 +1,99 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+#include "zbxmocktest.h"
+#include "zbxmockdata.h"
+
+#include "db.h"
+#include "sysinfo.h"
+
+static char	*called_key = NULL;
+
+int	__wrap_WEB_PAGE_GET(const char *command, AGENT_RESULT *result);
+int	__wrap_WEB_PAGE_PERF(const char *command, AGENT_RESULT *result);
+int	__wrap_WEB_PAGE_REGEXP(const char *command, AGENT_RESULT *result);
+
+void	zbx_mock_test_entry(void **state)
+{
+	zbx_mock_error_t	error;
+	zbx_mock_handle_t	in_command, in_flags;
+	const char		*in_command_string, *flags_string, *p;
+	char			key[ITEM_KEY_LEN];
+	unsigned		flags_uint32;
+	AGENT_RESULT		result;
+
+	ZBX_UNUSED(state);
+
+	if (ZBX_MOCK_SUCCESS != (error = zbx_mock_in_parameter("in_command", &in_command)) ||
+			ZBX_MOCK_SUCCESS != (error = zbx_mock_string(in_command, &in_command_string)))
+	{
+		fail_msg("Cannot get in_command from test case data: %s", zbx_mock_error_string(error));
+	}
+
+	if (ZBX_MOCK_SUCCESS != (error = zbx_mock_in_parameter("flags", &in_flags)) ||
+			ZBX_MOCK_SUCCESS != (error = zbx_mock_string(in_flags, &flags_string)))
+	{
+		fail_msg("Cannot get flags from test case data: %s", zbx_mock_error_string(error));
+	}
+	if (SUCCEED != is_uint32(flags_string, &flags_uint32))
+		fail_msg("Cannot convert flags to unsigned 32 bit integer.");
+
+	init_metrics();
+
+	process(in_command_string, flags_uint32, &result);
+
+	if (NULL != (p = strchr(in_command_string, '[')))
+		zbx_strlcpy(key, in_command_string, p - in_command_string + 1);
+
+	if (called_key == NULL || 0 != strcmp((NULL == p ? in_command_string : key), called_key))
+	{
+		fail_msg("Unexpected called item '%s' instead of '%s' as a key.",
+				ZBX_NULL2STR(called_key), in_command_string);
+	}
+}
+
+int	__wrap_WEB_PAGE_GET(const char *command, AGENT_RESULT *result)
+{
+	ZBX_UNUSED(command);
+	ZBX_UNUSED(result);
+
+	called_key = "web.page.get";
+
+	return SUCCEED;
+}
+
+int	__wrap_WEB_PAGE_PERF(const char *command, AGENT_RESULT *result)
+{
+	ZBX_UNUSED(command);
+	ZBX_UNUSED(result);
+
+	called_key = "web.page.perf";
+
+	return SUCCEED;
+}
+
+int	__wrap_WEB_PAGE_REGEXP(const char *command, AGENT_RESULT *result)
+{
+	ZBX_UNUSED(command);
+	ZBX_UNUSED(result);
+
+	called_key = "web.page.regexp";
+
+	return SUCCEED;
+}
diff --git a/tests/libs/zbxsysinfo/process_http.yaml b/tests/libs/zbxsysinfo/process_http.yaml
new file mode 100644
index 00000000000..b2fd1b62caf
--- /dev/null
+++ b/tests/libs/zbxsysinfo/process_http.yaml
@@ -0,0 +1,16 @@
+---
+test case: successfully called WEB_PAGE_GET function
+in:
+  in_command: web.page.get[localhost,,80]
+  flags: 4
+---
+test case: successfully called WEB_PAGE_PERF function
+in:
+  in_command: web.page.perf[localhost,,80]
+  flags: 4
+---
+test case: successfully called WEB_PAGE_REGEXP function
+in:
+  in_command: web.page.regexp[localhost,,80,OK]
+  flags: 4
+...
diff --git a/tests/zabbix_server/service/service_get_rootcause_eventids.yaml b/tests/zabbix_server/service/service_get_rootcause_eventids.yaml
index 7ce4ae9d264..0aadf3ef696 100644
--- a/tests/zabbix_server/service/service_get_rootcause_eventids.yaml
+++ b/tests/zabbix_server/service/service_get_rootcause_eventids.yaml
@@ -142,4 +142,180 @@ in:
   service: S27
 out:
   events: [19]
+---
+test case: Accounting for propagation rules with default status calculation
+in:
+  services: 
+  - name: S1
+    status: 2
+    children: [S2]
+    algorithm: MIN
+  - name: S2
+    status: 3
+    children: [S3, S4]
+    algorithm: MIN
+    propagation: {"action": DECREASE, "value": 1}
+  - name: S3
+    status: 2
+    events: 
+    - {"id":3, "severity":2}
+  - name: S4
+    status: 3
+    events: 
+    - {"id":4, "severity":3}
+  service: S1
+out:
+  events: [3, 4]
+---
+test case: Accounting for propagation rules with additional rules (1)
+in:
+  services: 
+  - name: S1
+    status: 2
+    children: [S2]
+    algorithm: OK
+    rules:
+    - {"type": N_GE, "limit":2, "value":1, "status":3}
+  - name: S2
+    status: 3
+    children: [S3, S4]
+    algorithm: MIN
+    propagation: {"action": DECREASE, "value": 1}
+  - name: S3
+    status: 2
+    events: 
+    - {"id":3, "severity":2}
+  - name: S4
+    status: 3
+    events: 
+    - {"id":4, "severity":3}
+  service: S1
+out:
+  events: [4]
+---
+test case: Accounting for propagation rules with additional rules (2)
+in:
+  services: 
+  - name: S1
+    status: 2
+    children: [S2]
+    algorithm: OK
+    rules:
+    - {"type": N_GE, "limit":3, "value":1, "status":3}
+  - name: S2
+    status: 2
+    children: [S3, S4]
+    algorithm: MIN
+    propagation: {"action": SET, "value": 3}
+  - name: S3
+    status: 1
+    events: 
+    - {"id":3, "severity":1}
+  - name: S4
+    status: 2
+    events: 
+    - {"id":4, "severity":2}
+  service: S1
+out:
+  events: [3, 4]
+---
+test case: Overriding min-status of default rules with additional rules
+in:
+  services: 
+  - name: S1
+    status: 3
+    children: [S2]
+    algorithm: OK
+    rules:
+    - {"type": N_GE, "limit":2, "value":1, "status":3}
+  - name: S2
+    status: 3
+    children: [S3, S4, S5]
+    algorithm: MIN
+    rules:
+    - {"type": N_GE, "limit":1, "value":1, "status":2}
+  - name: S3
+    status: 1
+    events: 
+    - {"id":3, "severity":1}
+  - name: S4
+    status: 2
+    children: [S6, S7]
+    algorithm: MIN
+  - name: S5
+    status: 3
+    algorithm: MIN
+    events: 
+    - {"id":5, "severity":3}
+  - name: S6
+    status: 1
+    events: 
+    - {"id":6, "severity":1}
+  - name: S7
+    status: 2
+    events: 
+    - {"id":7, "severity":2}
+  service: S1
+out:
+  events: [3, 5, 6, 7]
+---
+test case: Applying min-status to events (min)
+in:
+  services: 
+  - name: S1
+    status: 2
+    children: [S2]
+    algorithm: OK
+    rules:
+    - {"type": N_GE, "limit":3, "value":1, "status":3}
+  - name: S2
+    status: 3
+    children: [S3, S4]
+    algorithm: MIN
+    status: 3
+  - name: S3
+    status: 3
+    events: 
+    - {"id":1, "severity":1}
+    - {"id":2, "severity":2}
+    - {"id":3, "severity":3}
+  - name: S4
+    status: 3
+    events: 
+    - {"id":4, "severity":1}
+    - {"id":5, "severity":2}
+    - {"id":6, "severity":3}
+  service: S1
+out:
+  events: [3, 6]
+---
+test case: Applying min-status to events (max)
+in:
+  services: 
+  - name: S1
+    status: 2
+    children: [S2]
+    algorithm: OK
+    rules:
+    - {"type": N_GE, "limit":3, "value":1, "status":3}
+  - name: S2
+    status: 3
+    children: [S3, S4]
+    algorithm: MAX
+    status: 3
+  - name: S3
+    status: 3
+    events: 
+    - {"id":1, "severity":1}
+    - {"id":2, "severity":2}
+    - {"id":3, "severity":3}
+  - name: S4
+    status: 3
+    events: 
+    - {"id":4, "severity":1}
+    - {"id":5, "severity":2}
+    - {"id":6, "severity":3}
+  service: S1
+out:
+  events: [1, 2, 3, 4, 5, 6]
 ...
diff --git a/ui/app/controllers/CControllerAuditLogList.php b/ui/app/controllers/CControllerAuditLogList.php
index 7ac01fbd456..a4795e8d783 100644
--- a/ui/app/controllers/CControllerAuditLogList.php
+++ b/ui/app/controllers/CControllerAuditLogList.php
@@ -104,7 +104,7 @@ class CControllerAuditLogList extends CController {
 				'resourcename', 'details', 'recordsetid'
 			],
 			'filter' => $filter,
-			'sortfield' => 'clock',
+			'sortfield' => 'auditid',
 			'sortorder' => ZBX_SORT_DOWN,
 			'limit' => CSettingsHelper::get(CSettingsHelper::SEARCH_LIMIT) + 1
 		];
@@ -194,7 +194,8 @@ class CControllerAuditLogList extends CController {
 			CAudit::ACTION_ADD => _('Add'),
 			CAudit::ACTION_UPDATE => _('Update'),
 			CAudit::ACTION_DELETE => _('Delete'),
-			CAudit::ACTION_EXECUTE => _('Execute')
+			CAudit::ACTION_EXECUTE => _('Execute'),
+			CAudit::ACTION_HISTORY_CLEAR => _('History clear')
 		];
 	}
 
diff --git a/ui/app/controllers/CControllerAutoregUpdate.php b/ui/app/controllers/CControllerAutoregUpdate.php
index 1151334b01a..7b643f5138f 100644
--- a/ui/app/controllers/CControllerAutoregUpdate.php
+++ b/ui/app/controllers/CControllerAutoregUpdate.php
@@ -31,7 +31,7 @@ class CControllerAutoregUpdate extends CController {
 		$ret = $this->validateInput($fields);
 
 		if (!$ret) {
-			switch ($this->GetValidationError()) {
+			switch ($this->getValidationError()) {
 				case self::VALIDATION_ERROR:
 					$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
 						->setArgument('action', 'autoreg.edit')
diff --git a/ui/app/controllers/CControllerCorrelationCreate.php b/ui/app/controllers/CControllerCorrelationCreate.php
index aa7f74218ae..4f7b23f00ee 100644
--- a/ui/app/controllers/CControllerCorrelationCreate.php
+++ b/ui/app/controllers/CControllerCorrelationCreate.php
@@ -23,15 +23,15 @@ class CControllerCorrelationCreate extends CController {
 
 	protected function checkInput() {
 		$fields = [
-			'name'          => 'db correlation.name|required|not_empty',
-			'description'   => 'db correlation.description',
-			'evaltype'      => 'db correlation.evaltype|required|in '.implode(',', [CONDITION_EVAL_TYPE_AND_OR, CONDITION_EVAL_TYPE_AND, CONDITION_EVAL_TYPE_OR, CONDITION_EVAL_TYPE_EXPRESSION]),
-			'status'        => 'db correlation.status|required|in '.implode(',', [ZBX_CORRELATION_ENABLED, ZBX_CORRELATION_DISABLED]),
-			'formula'       => 'db correlation.formula',
-			'op_close_new'  => 'in 1',
-			'op_close_old'  => 'in 1',
-			'conditions'    => 'array',
-			'form_refresh'  => 'int32'
+			'name'         => 'db correlation.name|required|not_empty',
+			'description'  => 'db correlation.description',
+			'evaltype'     => 'db correlation.evaltype|required|in '.implode(',', [CONDITION_EVAL_TYPE_AND_OR, CONDITION_EVAL_TYPE_AND, CONDITION_EVAL_TYPE_OR, CONDITION_EVAL_TYPE_EXPRESSION]),
+			'status'       => 'db correlation.status|required|in '.implode(',', [ZBX_CORRELATION_ENABLED, ZBX_CORRELATION_DISABLED]),
+			'formula'      => 'db correlation.formula',
+			'op_close_new' => 'in 1',
+			'op_close_old' => 'in 1',
+			'conditions'   => 'array',
+			'form_refresh' => 'int32'
 		];
 
 		$ret = $this->validateInput($fields);
@@ -40,8 +40,8 @@ class CControllerCorrelationCreate extends CController {
 		if (!$ret) {
 			switch ($error) {
 				case self::VALIDATION_ERROR:
-					$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-						->setArgument('action', 'correlation.edit')
+					$response = new CControllerResponseRedirect(
+						(new CUrl('zabbix.php'))->setArgument('action', 'correlation.edit')
 					);
 					$response->setFormData($this->getInputAll());
 					CMessageHelper::setErrorTitle(_('Cannot update correlation'));
@@ -62,54 +62,54 @@ class CControllerCorrelationCreate extends CController {
 	}
 
 	protected function doAction() {
-		$data = [
-			'conditions' => [],
-			'status' => ZBX_CORRELATION_DISABLED
-		];
-
-		$this->getInputs($data, ['name', 'description', 'evaltype', 'status', 'formula', 'op_close_new', 'op_close_old',
-			'conditions', 'new_condition'
-		]);
-
 		$correlation = [
-			'name' => $data['name'],
-			'description' => $data['description'],
-			'status' => $data['status'],
+			'name' => $this->getInput('name'),
+			'description' => $this->getInput('description', ''),
+			'status' => $this->getInput('status'),
 			'filter' => [
-				'evaltype' => $data['evaltype'],
-				'formula' => $data['formula'],
-				'conditions' => $data['conditions']
+				'evaltype' => $this->getInput('evaltype'),
+				'conditions' => $this->getInput('conditions', [])
 			],
 			'operations' => []
 		];
 
-		if ($correlation['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION
-				&& count($correlation['filter']['conditions']) < 2) {
-			$correlation['filter']['formula'] = '';
-			$correlation['filter']['evaltype'] = CONDITION_EVAL_TYPE_AND_OR;
+		if ($correlation['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
+			if (count($correlation['filter']['conditions']) > 1) {
+				$correlation['filter']['formula'] = $this->getInput('formula', '');
+			}
+			else {
+				$correlation['filter']['evaltype'] = CONDITION_EVAL_TYPE_AND_OR;
+			}
+		}
+		else {
+			foreach ($correlation['filter']['conditions'] as &$condition) {
+				unset($condition['formulaid']);
+			}
+			unset($condition);
 		}
 
-		if (array_key_exists('op_close_old', $data)) {
+		if ($this->hasInput('op_close_old')) {
 			$correlation['operations'][] = ['type' => ZBX_CORR_OPERATION_CLOSE_OLD];
 		}
 
-		if (array_key_exists('op_close_new', $data)) {
+		if ($this->hasInput('op_close_new')) {
 			$correlation['operations'][] = ['type' => ZBX_CORR_OPERATION_CLOSE_NEW];
 		}
 
 		$result = API::Correlation()->create($correlation);
 
 		if ($result) {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'correlation.list')
-				->setArgument('page', CPagerHelper::loadPage('correlation.list', null))
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))
+					->setArgument('action', 'correlation.list')
+					->setArgument('page', CPagerHelper::loadPage('correlation.list', null))
 			);
 			$response->setFormData(['uncheck' => '1']);
 			CMessageHelper::setSuccessTitle(_('Correlation added'));
 		}
 		else {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'correlation.edit')
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))->setArgument('action', 'correlation.edit')
 			);
 			$response->setFormData($this->getInputAll());
 			CMessageHelper::setErrorTitle(_('Cannot add correlation'));
diff --git a/ui/app/controllers/CControllerCorrelationEdit.php b/ui/app/controllers/CControllerCorrelationEdit.php
index 224d1f37089..a04d83546a3 100644
--- a/ui/app/controllers/CControllerCorrelationEdit.php
+++ b/ui/app/controllers/CControllerCorrelationEdit.php
@@ -19,8 +19,6 @@
 **/
 
 
-require_once __DIR__.'/../../include/correlation.inc.php';
-
 class CControllerCorrelationEdit extends CController {
 
 	private $correlation = [];
@@ -60,7 +58,7 @@ class CControllerCorrelationEdit extends CController {
 		if ($this->hasInput('correlationid') && !$this->hasInput('form_refresh')) {
 			$correlations = API::Correlation()->get([
 				'output' => ['correlationid', 'name', 'description', 'status'],
-				'selectFilter' => ['formula', 'conditions', 'evaltype', 'eval_formula'],
+				'selectFilter' => ['formula', 'conditions', 'evaltype'],
 				'selectOperations' => ['type'],
 				'correlationids' => $this->getInput('correlationid'),
 				'editable' => true
@@ -71,6 +69,8 @@ class CControllerCorrelationEdit extends CController {
 			}
 
 			$this->correlation = $correlations[0];
+			CArrayHelper::sort($this->correlation['filter']['conditions'], ['formulaid']);
+
 			$op_types = array_column($this->correlation['operations'], 'type', 'type');
 			$this->correlation['op_close_old'] = array_key_exists(ZBX_CORR_OPERATION_CLOSE_OLD, $op_types);
 			$this->correlation['op_close_new'] = array_key_exists(ZBX_CORR_OPERATION_CLOSE_NEW, $op_types);
@@ -84,8 +84,8 @@ class CControllerCorrelationEdit extends CController {
 	protected function doAction() {
 		$data = $this->correlation + DB::getDefaults('correlation') + [
 			'new_condition' => $this->getInput('new_condition', []),
-			'allowedOperations' => corrOperationTypes(),
-			'allowedConditions' => corrConditionTypes(),
+			'allowedOperations' => CCorrelationHelper::getOperationTypes(),
+			'allowedConditions' => CCorrelationHelper::getConditionTypes(),
 			'correlationid' => $this->getInput('correlationid', 0),
 			'op_close_new' => false,
 			'op_close_old' => false,
diff --git a/ui/app/controllers/CControllerCorrelationList.php b/ui/app/controllers/CControllerCorrelationList.php
index 41f531113ba..6843bd6ffee 100644
--- a/ui/app/controllers/CControllerCorrelationList.php
+++ b/ui/app/controllers/CControllerCorrelationList.php
@@ -19,8 +19,6 @@
 **/
 
 
-require_once __DIR__.'/../../include/correlation.inc.php';
-
 class CControllerCorrelationList extends CController {
 
 	protected function init() {
diff --git a/ui/app/controllers/CControllerCorrelationUpdate.php b/ui/app/controllers/CControllerCorrelationUpdate.php
index 5ca0672037a..b6ffc4ed7a2 100644
--- a/ui/app/controllers/CControllerCorrelationUpdate.php
+++ b/ui/app/controllers/CControllerCorrelationUpdate.php
@@ -71,55 +71,55 @@ class CControllerCorrelationUpdate extends CController {
 	}
 
 	protected function doAction() {
-		$data = [
-			'conditions' => [],
-			'status' => ZBX_CORRELATION_DISABLED
-		];
-
-		$this->getInputs($data, ['correlationid', 'name', 'description', 'evaltype', 'status', 'formula',
-			'op_close_new', 'op_close_old', 'conditions', 'new_condition'
-		]);
-
 		$correlation = [
-			'correlationid' => $data['correlationid'],
-			'name' => $data['name'],
-			'description' => $data['description'],
-			'status' => $data['status'],
+			'correlationid' => $this->getInput('correlationid'),
+			'name' => $this->getInput('name'),
+			'description' => $this->getInput('description', ''),
+			'status' => $this->getInput('status'),
 			'filter' => [
-				'evaltype' => $data['evaltype'],
-				'formula' => $data['formula'],
-				'conditions' => $data['conditions']
+				'evaltype' => $this->getInput('evaltype'),
+				'conditions' => $this->getInput('conditions', [])
 			],
 			'operations' => []
 		];
 
-		if ($correlation['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION
-				&& count($correlation['filter']['conditions']) < 2) {
-			$correlation['filter']['formula'] = '';
-			$correlation['filter']['evaltype'] = CONDITION_EVAL_TYPE_AND_OR;
+		if ($correlation['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
+			if (count($correlation['filter']['conditions']) > 1) {
+				$correlation['filter']['formula'] = $this->getInput('formula', '');
+			}
+			else {
+				$correlation['filter']['evaltype'] = CONDITION_EVAL_TYPE_AND_OR;
+			}
+		}
+		else {
+			foreach ($correlation['filter']['conditions'] as &$condition) {
+				unset($condition['formulaid']);
+			}
+			unset($condition);
 		}
 
-		if (array_key_exists('op_close_old', $data)) {
+		if ($this->hasInput('op_close_old')) {
 			$correlation['operations'][] = ['type' => ZBX_CORR_OPERATION_CLOSE_OLD];
 		}
 
-		if (array_key_exists('op_close_new', $data)) {
+		if ($this->hasInput('op_close_new')) {
 			$correlation['operations'][] = ['type' => ZBX_CORR_OPERATION_CLOSE_NEW];
 		}
 
 		$result = API::Correlation()->update($correlation);
 
 		if ($result) {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'correlation.list')
-				->setArgument('page', CPagerHelper::loadPage('correlation.list', null))
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))
+					->setArgument('action', 'correlation.list')
+					->setArgument('page', CPagerHelper::loadPage('correlation.list', null))
 			);
 			$response->setFormData(['uncheck' => '1']);
 			CMessageHelper::setSuccessTitle(_('Correlation updated'));
 		}
 		else {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'correlation.edit')
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))->setArgument('action', 'correlation.edit')
 			);
 			$response->setFormData($this->getInputAll());
 			CMessageHelper::setErrorTitle(_('Cannot update correlation'));
diff --git a/ui/app/controllers/CControllerDashboardPagePropertiesCheck.php b/ui/app/controllers/CControllerDashboardPagePropertiesCheck.php
index fcc4ba2e7a9..4c4f7890ecf 100644
--- a/ui/app/controllers/CControllerDashboardPagePropertiesCheck.php
+++ b/ui/app/controllers/CControllerDashboardPagePropertiesCheck.php
@@ -22,14 +22,13 @@
 class CControllerDashboardPagePropertiesCheck extends CController {
 
 	protected function init() {
-		$this->disableSIDValidation();
+		$this->setPostContentType(self::POST_CONTENT_TYPE_JSON);
 	}
 
 	protected function checkInput() {
 		$fields = [
-			'name' => 'required|db dashboard_page.name',
-			'display_period' => 'required|db dashboard_page.display_period|in '.
-				implode(',', array_merge([0], DASHBOARD_DISPLAY_PERIODS))
+			'name' =>			'required|db dashboard_page.name',
+			'display_period' =>	'required|db dashboard_page.display_period|in '.implode(',', array_merge([0], DASHBOARD_DISPLAY_PERIODS))
 		];
 
 		$ret = $this->validateInput($fields);
diff --git a/ui/app/controllers/CControllerDashboardPagePropertiesEdit.php b/ui/app/controllers/CControllerDashboardPagePropertiesEdit.php
index 3b3137be180..e3b051f8601 100644
--- a/ui/app/controllers/CControllerDashboardPagePropertiesEdit.php
+++ b/ui/app/controllers/CControllerDashboardPagePropertiesEdit.php
@@ -27,12 +27,10 @@ class CControllerDashboardPagePropertiesEdit extends CController {
 
 	protected function checkInput() {
 		$fields = [
-			'name' => 'db dashboard_page.name',
-			'dashboard_display_period' => 'required|db dashboard.display_period|in '.
-				implode(',', DASHBOARD_DISPLAY_PERIODS),
-			'display_period' => 'db dashboard_page.display_period|in '.
-				implode(',', array_merge([0], DASHBOARD_DISPLAY_PERIODS)),
-			'unique_id' => 'string'
+			'name' =>						'db dashboard_page.name',
+			'dashboard_display_period' =>	'required|db dashboard.display_period|in '.implode(',', DASHBOARD_DISPLAY_PERIODS),
+			'display_period' =>				'db dashboard_page.display_period|in '.implode(',', array_merge([0], DASHBOARD_DISPLAY_PERIODS)),
+			'unique_id' =>					'string'
 		];
 
 		$ret = $this->validateInput($fields);
diff --git a/ui/app/controllers/CControllerDashboardPrint.php b/ui/app/controllers/CControllerDashboardPrint.php
index a8ba4214144..25da83317fa 100755
--- a/ui/app/controllers/CControllerDashboardPrint.php
+++ b/ui/app/controllers/CControllerDashboardPrint.php
@@ -27,9 +27,9 @@ class CControllerDashboardPrint extends CController {
 
 	protected function checkInput() {
 		$fields = [
-			'dashboardid' => 'required|db dashboard.dashboardid',
-			'from' => 'range_time',
-			'to' => 'range_time'
+			'dashboardid' =>	'required|db dashboard.dashboardid',
+			'from' =>			'range_time',
+			'to' =>				'range_time'
 		];
 
 		$ret = $this->validateInput($fields) && $this->validateTimeSelectorPeriod();
diff --git a/ui/app/controllers/CControllerDashboardPropertiesCheck.php b/ui/app/controllers/CControllerDashboardPropertiesCheck.php
index 27fb9c14e31..2a65e2b32ad 100644
--- a/ui/app/controllers/CControllerDashboardPropertiesCheck.php
+++ b/ui/app/controllers/CControllerDashboardPropertiesCheck.php
@@ -22,16 +22,16 @@
 class CControllerDashboardPropertiesCheck extends CController {
 
 	protected function init() {
-		$this->disableSIDValidation();
+		$this->setPostContentType(self::POST_CONTENT_TYPE_JSON);
 	}
 
 	protected function checkInput() {
 		$fields = [
-			'template' => 'in 1',
-			'userid' => 'db users.userid',
-			'name' => 'required|db dashboard.name|not_empty',
-			'display_period' => 'required|db dashboard.display_period|in '.implode(',', DASHBOARD_DISPLAY_PERIODS),
-			'auto_start' => 'in 1'
+			'template' =>		'in 1',
+			'userid' =>			'db users.userid',
+			'name' =>			'required|db dashboard.name|not_empty',
+			'display_period' =>	'required|db dashboard.display_period|in '.implode(',', DASHBOARD_DISPLAY_PERIODS),
+			'auto_start' =>		'in 1'
 		];
 
 		$ret = $this->validateInput($fields);
diff --git a/ui/app/controllers/CControllerDashboardPropertiesEdit.php b/ui/app/controllers/CControllerDashboardPropertiesEdit.php
index 592980e8ebb..9234b3c636e 100644
--- a/ui/app/controllers/CControllerDashboardPropertiesEdit.php
+++ b/ui/app/controllers/CControllerDashboardPropertiesEdit.php
@@ -27,11 +27,11 @@ class CControllerDashboardPropertiesEdit extends CController {
 
 	protected function checkInput() {
 		$fields = [
-			'template' => 'in 1',
-			'userid' => 'db users.userid',
-			'name' => 'required|db dashboard.name',
-			'display_period' => 'required|db dashboard.display_period|in '.implode(',', DASHBOARD_DISPLAY_PERIODS),
-			'auto_start' => 'required|db dashboard.auto_start|in 0,1'
+			'template' =>		'in 1',
+			'userid' =>			'db users.userid',
+			'name' =>			'required|db dashboard.name',
+			'display_period' =>	'required|db dashboard.display_period|in '.implode(',', DASHBOARD_DISPLAY_PERIODS),
+			'auto_start' =>		'required|db dashboard.auto_start|in 0,1'
 		];
 
 		$ret = $this->validateInput($fields);
diff --git a/ui/app/controllers/CControllerDashboardShareUpdate.php b/ui/app/controllers/CControllerDashboardShareUpdate.php
index d848d0a97fb..1750c9896c6 100644
--- a/ui/app/controllers/CControllerDashboardShareUpdate.php
+++ b/ui/app/controllers/CControllerDashboardShareUpdate.php
@@ -23,15 +23,20 @@
  * Controller to update dashboard
  */
 class CControllerDashboardShareUpdate extends CController {
-	const EMPTY_USER = 'empty_user';
-	const EMPTY_GROUP = 'empty_group';
+
+	public const EMPTY_USER = 'empty_user';
+	public const EMPTY_GROUP = 'empty_group';
+
+	protected function init() {
+		$this->setPostContentType(self::POST_CONTENT_TYPE_JSON);
+	}
 
 	protected function checkInput() {
 		$fields = [
-			'dashboardid' => 'required|db dashboard.dashboardid',
-			'private' => 'db dashboard.private|in 0,1',
-			'users' => 'array',
-			'userGroups' => 'array'
+			'dashboardid' =>	'required|db dashboard.dashboardid',
+			'private' =>		'db dashboard.private|in 0,1',
+			'users' =>			'array',
+			'userGroups' =>		'array'
 		];
 
 		$ret = $this->validateInput($fields);
diff --git a/ui/app/controllers/CControllerDashboardUpdate.php b/ui/app/controllers/CControllerDashboardUpdate.php
index 2cfa0bd86f8..a4510bf5af0 100644
--- a/ui/app/controllers/CControllerDashboardUpdate.php
+++ b/ui/app/controllers/CControllerDashboardUpdate.php
@@ -23,15 +23,19 @@ class CControllerDashboardUpdate extends CController {
 
 	private $dashboard_pages;
 
+	protected function init() {
+		$this->setPostContentType(self::POST_CONTENT_TYPE_JSON);
+	}
+
 	protected function checkInput() {
 		$fields = [
-			'dashboardid' => 'db dashboard.dashboardid',
-			'name' => 'required|db dashboard.name|not_empty',
-			'userid' => 'required|db dashboard.userid',
-			'display_period' => 'required|db dashboard.display_period|in '.implode(',', DASHBOARD_DISPLAY_PERIODS),
-			'auto_start' => 'required|db dashboard.auto_start|in 0,1',
-			'pages' => 'array',
-			'sharing' => 'array'
+			'dashboardid' =>	'db dashboard.dashboardid',
+			'name' =>			'required|db dashboard.name|not_empty',
+			'userid' =>			'required|db dashboard.userid',
+			'display_period' =>	'required|db dashboard.display_period|in '.implode(',', DASHBOARD_DISPLAY_PERIODS),
+			'auto_start' =>		'required|db dashboard.auto_start|in 0,1',
+			'pages' =>			'array',
+			'sharing' =>		'array'
 		];
 
 		$ret = $this->validateInput($fields);
diff --git a/ui/app/controllers/CControllerDashboardView.php b/ui/app/controllers/CControllerDashboardView.php
index 23366703276..70ca07cca1a 100644
--- a/ui/app/controllers/CControllerDashboardView.php
+++ b/ui/app/controllers/CControllerDashboardView.php
@@ -27,14 +27,14 @@ class CControllerDashboardView extends CController {
 
 	protected function checkInput() {
 		$fields = [
-			'dashboardid' => 'db dashboard.dashboardid',
-			'source_dashboardid' => 'db dashboard.dashboardid',
-			'hostid' => 'db hosts.hostid',
-			'new' => 'in 1',
-			'cancel' => 'in 1',
-			'from' => 'range_time',
-			'to' => 'range_time',
-			'slideshow' => 'in 1'
+			'dashboardid' =>		'db dashboard.dashboardid',
+			'source_dashboardid' =>	'db dashboard.dashboardid',
+			'hostid' =>				'db hosts.hostid',
+			'new' =>				'in 1',
+			'cancel' =>				'in 1',
+			'from' =>				'range_time',
+			'to' =>					'range_time',
+			'slideshow' =>			'in 1'
 		];
 
 		$ret = $this->validateInput($fields) && $this->validateTimeSelectorPeriod();
diff --git a/ui/app/controllers/CControllerDashboardWidgetCheck.php b/ui/app/controllers/CControllerDashboardWidgetCheck.php
index e9b5ace678b..6bd65e3b832 100644
--- a/ui/app/controllers/CControllerDashboardWidgetCheck.php
+++ b/ui/app/controllers/CControllerDashboardWidgetCheck.php
@@ -23,12 +23,16 @@ class CControllerDashboardWidgetCheck extends CController {
 
 	private $context;
 
+	protected function init() {
+		$this->setPostContentType(self::POST_CONTENT_TYPE_JSON);
+	}
+
 	protected function checkInput() {
 		$fields = [
-			'templateid' => 'db dashboard.templateid',
-			'type' => 'required|string',
-			'name' => 'required|string',
-			'fields' => 'json'
+			'templateid' =>	'db dashboard.templateid',
+			'type' =>		'required|string',
+			'name' =>		'required|string',
+			'fields' =>		'json'
 		];
 
 		$ret = $this->validateInput($fields);
diff --git a/ui/app/controllers/CControllerDashboardWidgetConfigure.php b/ui/app/controllers/CControllerDashboardWidgetConfigure.php
index 44edcb0ac35..a71d24b64d4 100644
--- a/ui/app/controllers/CControllerDashboardWidgetConfigure.php
+++ b/ui/app/controllers/CControllerDashboardWidgetConfigure.php
@@ -23,15 +23,16 @@ class CControllerDashboardWidgetConfigure extends CController {
 
 	private $context;
 
+	protected function init() {
+		$this->setPostContentType(self::POST_CONTENT_TYPE_JSON);
+	}
+
 	protected function checkInput() {
 		$fields = [
-			'templateid' => 'db dashboard.templateid',
-			'type' => 'required|string',
-			'fields' => 'json',
-			'view_mode' => 'required|in '.implode(',', [
-				ZBX_WIDGET_VIEW_MODE_NORMAL,
-				ZBX_WIDGET_VIEW_MODE_HIDDEN_HEADER
-			])
+			'templateid' =>	'db dashboard.templateid',
+			'type' =>		'required|string',
+			'fields' =>		'json',
+			'view_mode' =>	'required|in '.implode(',', [ZBX_WIDGET_VIEW_MODE_NORMAL, ZBX_WIDGET_VIEW_MODE_HIDDEN_HEADER])
 		];
 
 		$ret = $this->validateInput($fields);
diff --git a/ui/app/controllers/CControllerDashboardWidgetEdit.php b/ui/app/controllers/CControllerDashboardWidgetEdit.php
index 9434898c8e1..67e4c2e1331 100644
--- a/ui/app/controllers/CControllerDashboardWidgetEdit.php
+++ b/ui/app/controllers/CControllerDashboardWidgetEdit.php
@@ -25,14 +25,14 @@ class CControllerDashboardWidgetEdit extends CController {
 
 	protected function checkInput() {
 		$fields = [
-			'templateid' => 'db dashboard.templateid',
-			'type' => 'string',
-			'name' => 'string',
-			'view_mode' => 'in '.implode(',', [ZBX_WIDGET_VIEW_MODE_NORMAL, ZBX_WIDGET_VIEW_MODE_HIDDEN_HEADER]),
-			'prev_type' => 'string',
-			'fields' => 'json',
-			'unique_id' => 'string',
-			'dashboard_page_unique_id' => 'string'
+			'templateid' =>					'db dashboard.templateid',
+			'type' =>						'string',
+			'name' =>						'string',
+			'view_mode' =>					'in '.implode(',', [ZBX_WIDGET_VIEW_MODE_NORMAL, ZBX_WIDGET_VIEW_MODE_HIDDEN_HEADER]),
+			'prev_type' =>					'string',
+			'fields' =>						'json',
+			'unique_id' =>					'string',
+			'dashboard_page_unique_id' =>	'string'
 		];
 
 		$ret = $this->validateInput($fields);
diff --git a/ui/app/controllers/CControllerDashboardWidgetRfRate.php b/ui/app/controllers/CControllerDashboardWidgetRfRate.php
index 8a2c5960d73..517734e174f 100644
--- a/ui/app/controllers/CControllerDashboardWidgetRfRate.php
+++ b/ui/app/controllers/CControllerDashboardWidgetRfRate.php
@@ -23,6 +23,10 @@ require_once dirname(__FILE__).'/../../include/blocks.inc.php';
 
 class CControllerDashboardWidgetRfRate extends CController {
 
+	protected function init() {
+		$this->setPostContentType(self::POST_CONTENT_TYPE_JSON);
+	}
+
 	protected function checkInput() {
 		$fields = [
 			'widgetid' =>	'required|db widget.widgetid',
diff --git a/ui/app/controllers/CControllerDashboardWidgetsSanitize.php b/ui/app/controllers/CControllerDashboardWidgetsSanitize.php
index 597e31c9a40..1190ade7fb1 100644
--- a/ui/app/controllers/CControllerDashboardWidgetsSanitize.php
+++ b/ui/app/controllers/CControllerDashboardWidgetsSanitize.php
@@ -27,10 +27,14 @@ class CControllerDashboardWidgetsSanitize extends CController {
 	private $context;
 	private $widgets = [];
 
+	protected function init() {
+		$this->setPostContentType(self::POST_CONTENT_TYPE_JSON);
+	}
+
 	protected function checkInput() {
 		$fields = [
-			'templateid' => 'db dashboard.templateid',
-			'widgets' => 'array'
+			'templateid' =>	'db dashboard.templateid',
+			'widgets' =>	'array'
 		];
 
 		$ret = $this->validateInput($fields);
diff --git a/ui/app/controllers/CControllerHostView.php b/ui/app/controllers/CControllerHostView.php
index 8b6ad6a7985..021732bbbab 100644
--- a/ui/app/controllers/CControllerHostView.php
+++ b/ui/app/controllers/CControllerHostView.php
@@ -55,7 +55,8 @@ class CControllerHostView extends CControllerHost {
 		// Validate tags filter.
 		if ($ret && $this->hasInput('tags')) {
 			foreach ($this->getInput('tags') as $filter_tag) {
-				if (count($filter_tag) != 3
+				if (!is_array($filter_tag)
+						|| count($filter_tag) != 3
 						|| !array_key_exists('tag', $filter_tag) || !is_string($filter_tag['tag'])
 						|| !array_key_exists('value', $filter_tag) || !is_string($filter_tag['value'])
 						|| !array_key_exists('operator', $filter_tag) || !is_string($filter_tag['operator'])) {
diff --git a/ui/app/controllers/CControllerIconMapCreate.php b/ui/app/controllers/CControllerIconMapCreate.php
index a9f8b4078a6..a40b8534e02 100644
--- a/ui/app/controllers/CControllerIconMapCreate.php
+++ b/ui/app/controllers/CControllerIconMapCreate.php
@@ -23,7 +23,7 @@ class CControllerIconMapCreate extends CController {
 
 	protected function checkInput() {
 		$fields = [
-			'iconmap'   => 'required | array'
+			'iconmap'   => 'required|array'
 		];
 
 		$ret = $this->validateInput($fields);
@@ -40,17 +40,17 @@ class CControllerIconMapCreate extends CController {
 	}
 
 	protected function doAction() {
-		$result = (bool) API::IconMap()->create((array) $this->getInput('iconmap'));
+		$result = (bool) API::IconMap()->create($this->getInput('iconmap'));
 
 		if ($result) {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'iconmap.list')
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))->setArgument('action', 'iconmap.list')
 			);
 			CMessageHelper::setSuccessTitle(_('Icon map created'));
 		}
 		else {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'iconmap.edit')
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))->setArgument('action', 'iconmap.edit')
 			);
 			$response->setFormData($this->getInputAll());
 			CMessageHelper::setErrorTitle(_('Cannot create icon map'));
diff --git a/ui/app/controllers/CControllerIconMapDelete.php b/ui/app/controllers/CControllerIconMapDelete.php
index b08d34afde1..970c2142235 100644
--- a/ui/app/controllers/CControllerIconMapDelete.php
+++ b/ui/app/controllers/CControllerIconMapDelete.php
@@ -23,7 +23,7 @@ class CControllerIconMapDelete extends CController {
 
 	protected function checkInput() {
 		$fields = [
-			'iconmapid' => 'required | db icon_map.iconmapid'
+			'iconmapid' => 'required|db icon_map.iconmapid'
 		];
 
 		$ret = $this->validateInput($fields);
@@ -42,24 +42,25 @@ class CControllerIconMapDelete extends CController {
 
 		return (bool) API::IconMap()->get([
 			'output' => [],
-			'iconmapids' => (array) $this->getInput('iconmapid'),
+			'iconmapids' => $this->getInput('iconmapid'),
 			'editable' => true
 		]);
 	}
 
 	protected function doAction() {
-		$result = (bool) API::IconMap()->delete((array) $this->getInput('iconmapid'));
+		$result = (bool) API::IconMap()->delete([$this->getInput('iconmapid')]);
 
 		if ($result) {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'iconmap.list')
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))->setArgument('action', 'iconmap.list')
 			);
 			CMessageHelper::setSuccessTitle(_('Icon map deleted'));
 		}
 		else {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'iconmap.edit')
-				->setArgument('iconmapid', $this->getInput('iconmapid'))
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))
+					->setArgument('action', 'iconmap.edit')
+					->setArgument('iconmapid', $this->getInput('iconmapid'))
 			);
 			CMessageHelper::setErrorTitle(_('Cannot delete icon map'));
 		}
diff --git a/ui/app/controllers/CControllerIconMapEdit.php b/ui/app/controllers/CControllerIconMapEdit.php
index 14bdcadb553..c2707a5debc 100644
--- a/ui/app/controllers/CControllerIconMapEdit.php
+++ b/ui/app/controllers/CControllerIconMapEdit.php
@@ -27,8 +27,8 @@ class CControllerIconMapEdit extends CController {
 
 	protected function checkInput() {
 		$fields = [
-			'iconmapid'      => 'db icon_map.iconmapid',
-			'iconmap'        => 'array'
+			'iconmapid' => 'db icon_map.iconmapid',
+			'iconmap'   => 'array'
 		];
 
 		$ret = $this->validateInput($fields);
@@ -45,44 +45,23 @@ class CControllerIconMapEdit extends CController {
 			return false;
 		}
 
-		$this->inventory_list = [];
-		$inventory_list = getHostInventories();
-		foreach ($inventory_list as $field) {
-			$this->inventory_list[$field['nr']] = $field['title'];
-		}
-
-		$this->images = [];
-		$images = API::Image()->get([
-			'output' => ['imageid', 'name'],
-			'filter' => ['imagetype' => IMAGE_TYPE_ICON]
-		]);
-
-		order_result($images, 'name');
-
-		foreach ($images as $icon) {
-			$this->images[$icon['imageid']] = $icon['name'];
-		}
-
-		reset($this->images);
-		$this->default_imageid = key($this->images);
-
 		if ($this->hasInput('iconmapid')) {
 			$iconmaps = API::IconMap()->get([
 				'output' => ['iconmapid', 'name', 'default_iconid'],
 				'selectMappings' => ['inventory_link', 'expression', 'iconid', 'sortorder'],
-				'iconmapids' => (array) $this->getInput('iconmapid')
+				'iconmapids' => $this->getInput('iconmapid')
 			]);
 
 			if (!$iconmaps) {
 				return false;
 			}
 
-			$this->iconmap = $this->getInput('iconmap', []) + reset($iconmaps);
+			$this->iconmap = $this->getInput('iconmap', []) + $iconmaps[0];
 		}
 		else {
 			$this->iconmap = $this->getInput('iconmap', []) + [
 				'name' => '',
-				'default_iconid' => $this->default_imageid,
+				'default_iconid' => 0,
 				'mappings' => []
 			];
 		}
@@ -93,15 +72,28 @@ class CControllerIconMapEdit extends CController {
 	protected function doAction() {
 		order_result($this->iconmap['mappings'], 'sortorder');
 
+		$images = API::Image()->get([
+			'output' => ['imageid', 'name'],
+			'filter' => ['imagetype' => IMAGE_TYPE_ICON]
+		]);
+
+		order_result($images, 'name');
+		$images = array_column($images, 'name', 'imageid');
+
+		$default_imageid = key($images);
+
+		if (!$this->hasInput('iconmapid')) {
+			$this->iconmap['default_iconid'] = $default_imageid;
+		}
+
 		$data = [
 			'iconmapid' => $this->getInput('iconmapid', 0),
-			'icon_list' => $this->images,
+			'icon_list' => $images,
 			'iconmap' => $this->iconmap,
-			'inventory_list' => $this->inventory_list
+			'inventory_list' => array_column(getHostInventories(), 'title', 'nr'),
+			'default_imageid' => $default_imageid
 		];
 
-		$data['default_imageid'] = $this->default_imageid;
-
 		$response = new CControllerResponseData($data);
 		$response->setTitle(_('Configuration of icon mapping'));
 
diff --git a/ui/app/controllers/CControllerIconMapList.php b/ui/app/controllers/CControllerIconMapList.php
index 15f40c85176..4c6a693cf02 100644
--- a/ui/app/controllers/CControllerIconMapList.php
+++ b/ui/app/controllers/CControllerIconMapList.php
@@ -65,7 +65,7 @@ class CControllerIconMapList extends CController {
 		}
 
 		$data['iconmaps'] = API::IconMap()->get([
-			'output' => ['mappings', 'name', 'iconmapid'],
+			'output' => ['iconmapid', 'name'],
 			'selectMappings' => ['inventory_link', 'expression', 'iconid'],
 			'editable' => true
 		]);
diff --git a/ui/app/controllers/CControllerIconMapUpdate.php b/ui/app/controllers/CControllerIconMapUpdate.php
index a3fd074d904..071e558e549 100644
--- a/ui/app/controllers/CControllerIconMapUpdate.php
+++ b/ui/app/controllers/CControllerIconMapUpdate.php
@@ -23,8 +23,8 @@ class CControllerIconMapUpdate extends CController {
 
 	protected function checkInput() {
 		$fields = [
-			'iconmapid' => 'fatal | required | db icon_map.iconmapid',
-			'iconmap'   => 'required | array'
+			'iconmapid' => 'fatal|required|db icon_map.iconmapid',
+			'iconmap'   => 'required|array'
 		];
 
 		$ret = $this->validateInput($fields);
@@ -40,7 +40,7 @@ class CControllerIconMapUpdate extends CController {
 		if ($this->checkAccess(CRoleHelper::UI_ADMINISTRATION_GENERAL)) {
 			return (bool) API::IconMap()->get([
 				'output' => [],
-				'iconmapids' => (array) $this->getInput('iconmapid')
+				'iconmapids' => $this->getInput('iconmapid')
 			]);
 		}
 
@@ -48,26 +48,22 @@ class CControllerIconMapUpdate extends CController {
 	}
 
 	protected function doAction() {
-		$iconmap = (array) $this->getInput('iconmap') + ['mappings' => []];
+		$iconmap = $this->getInput('iconmap') + ['mappings' => []];
 		$iconmap['iconmapid'] = $this->getInput('iconmapid');
 
-		foreach ($iconmap['mappings'] as &$mapping) {
-			$mapping['expression'] = trim($mapping['expression']);
-		}
-		unset($mapping);
-
 		$result = (bool) API::IconMap()->update($iconmap);
 
 		if ($result) {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'iconmap.list')
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))->setArgument('action', 'iconmap.list')
 			);
 			CMessageHelper::setSuccessTitle(_('Icon map updated'));
 		}
 		else {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'iconmap.edit')
-				->setArgument('iconmapid', $iconmap['iconmapid'])
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))
+					->setArgument('action', 'iconmap.edit')
+					->setArgument('iconmapid', $iconmap['iconmapid'])
 			);
 			$form_data = $this->getInputAll();
 			if (!array_key_exists('mappings', $form_data['iconmap'])) {
diff --git a/ui/app/controllers/CControllerImageCreate.php b/ui/app/controllers/CControllerImageCreate.php
index 41a2533003c..2362a5d3340 100644
--- a/ui/app/controllers/CControllerImageCreate.php
+++ b/ui/app/controllers/CControllerImageCreate.php
@@ -23,8 +23,8 @@ class CControllerImageCreate extends CController {
 
 	protected function checkInput() {
 		$fields = [
-			'name'      => 'required | not_empty | db images.name',
-			'imagetype' => 'required | fatal | db images.imagetype'
+			'name'      => 'required|not_empty|db images.name',
+			'imagetype' => 'required|fatal|db images.imagetype'
 		];
 
 		$ret = $this->validateInput($fields);
@@ -56,12 +56,6 @@ class CControllerImageCreate extends CController {
 			return false;
 		}
 
-		$this->image = [
-			'imageid'   => 0,
-			'imagetype' => $this->getInput('imagetype'),
-			'name'      => $this->getInput('name', '')
-		];
-
 		return true;
 	}
 
@@ -109,23 +103,30 @@ class CControllerImageCreate extends CController {
 			return $this->setResponse($response);
 		}
 
-		$result = API::Image()->create([
+		$options = [
 			'imagetype' => $this->getInput('imagetype'),
-			'name'      => $this->getInput('name'),
-			'image'     => $image
-		]);
+			'name' => $this->getInput('name')
+		];
+
+		if ($image != null) {
+			$options['image'] = $image;
+		}
+
+		$result = API::Image()->create($options);
 
 		if ($result) {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'image.list')
-				->setArgument('imagetype', $this->getInput('imagetype'))
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))
+					->setArgument('action', 'image.list')
+					->setArgument('imagetype', $this->getInput('imagetype'))
 			);
 			CMessageHelper::setSuccessTitle(_('Image added'));
 		}
 		else {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'image.edit')
-				->setArgument('imagetype', $this->getInput('imagetype'))
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))
+					->setArgument('action', 'image.edit')
+					->setArgument('imagetype', $this->getInput('imagetype'))
 			);
 			$response->setFormData($this->getInputAll());
 			CMessageHelper::setErrorTitle(_('Cannot add image'));
diff --git a/ui/app/controllers/CControllerImageDelete.php b/ui/app/controllers/CControllerImageDelete.php
index e4216685b6b..95dffe33347 100644
--- a/ui/app/controllers/CControllerImageDelete.php
+++ b/ui/app/controllers/CControllerImageDelete.php
@@ -23,8 +23,8 @@ class CControllerImageDelete extends CController {
 
 	protected function checkInput() {
 		$fields = [
-			'imageid'   => 'required | db images.imageid',
-			'imagetype' => 'required | db images.imagetype'
+			'imageid'   => 'required|db images.imageid',
+			'imagetype' => 'required|db images.imagetype'
 		];
 
 		$ret = $this->validateInput($fields);
@@ -41,7 +41,7 @@ class CControllerImageDelete extends CController {
 			return false;
 		}
 
-		$images = API::Image()->get(['imageids' => (array) $this->getInput('imageid')]);
+		$images = API::Image()->get(['imageids' => $this->getInput('imageid')]);
 		if (!$images) {
 			return false;
 		}
@@ -52,19 +52,21 @@ class CControllerImageDelete extends CController {
 	}
 
 	protected function doAction() {
-		$result = API::Image()->delete((array) $this->image['imageid']);
+		$result = API::Image()->delete([$this->image['imageid']]);
 
 		if ($result) {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'image.list')
-				->setArgument('imagetype', $this->getInput('imagetype'))
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))
+					->setArgument('action', 'image.list')
+					->setArgument('imagetype', $this->getInput('imagetype'))
 			);
 			CMessageHelper::setSuccessTitle(_('Image deleted'));
 		}
 		else {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'image.edit')
-				->setArgument('imageid', $this->getInput('imageid'))
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))
+					->setArgument('action', 'image.edit')
+					->setArgument('imageid', $this->getInput('imageid'))
 			);
 			CMessageHelper::setErrorTitle(_('Cannot delete image'));
 		}
diff --git a/ui/app/controllers/CControllerImageEdit.php b/ui/app/controllers/CControllerImageEdit.php
index 304a2e6a182..cfc11ee6898 100644
--- a/ui/app/controllers/CControllerImageEdit.php
+++ b/ui/app/controllers/CControllerImageEdit.php
@@ -28,7 +28,7 @@ class CControllerImageEdit extends CController {
 	protected function checkInput() {
 		$fields = [
 			'imageid'   => 'db images.imageid',
-			'imagetype' => 'db images.imagetype | in '.IMAGE_TYPE_ICON.','.IMAGE_TYPE_BACKGROUND,
+			'imagetype' => 'db images.imagetype|in '.IMAGE_TYPE_ICON.','.IMAGE_TYPE_BACKGROUND,
 			'name'      => 'db images.name'
 		];
 
@@ -60,7 +60,7 @@ class CControllerImageEdit extends CController {
 			return true;
 		}
 
-		$images = API::Image()->get(['imageids' => (array) $this->getInput('imageid')]);
+		$images = API::Image()->get(['imageids' => $this->getInput('imageid')]);
 		if (!$images) {
 			return false;
 		}
diff --git a/ui/app/controllers/CControllerImageList.php b/ui/app/controllers/CControllerImageList.php
index 53879f3f7e2..c9b970137c4 100644
--- a/ui/app/controllers/CControllerImageList.php
+++ b/ui/app/controllers/CControllerImageList.php
@@ -27,7 +27,7 @@ class CControllerImageList extends CController {
 
 	protected function checkInput() {
 		$fields = [
-			'imagetype' => 'db images.imagetype | in '.IMAGE_TYPE_ICON.','.IMAGE_TYPE_BACKGROUND
+			'imagetype' => 'db images.imagetype|in '.IMAGE_TYPE_ICON.','.IMAGE_TYPE_BACKGROUND
 		];
 
 		$ret = $this->validateInput($fields);
diff --git a/ui/app/controllers/CControllerImageUpdate.php b/ui/app/controllers/CControllerImageUpdate.php
index 43e11d3eb20..0750409e2ed 100644
--- a/ui/app/controllers/CControllerImageUpdate.php
+++ b/ui/app/controllers/CControllerImageUpdate.php
@@ -23,9 +23,9 @@ class CControllerImageUpdate extends CController {
 
 	protected function checkInput() {
 		$fields = [
-			'name'      => 'required | not_empty | db images.name',
-			'imageid'   => 'required | fatal | db images.imageid',
-			'imagetype' => 'required | fatal | db images.imagetype'
+			'name'      => 'required|not_empty|db images.name',
+			'imageid'   => 'required|fatal|db images.imageid',
+			'imagetype' => 'required|fatal|db images.imagetype'
 		];
 
 		$ret = $this->validateInput($fields);
@@ -58,7 +58,7 @@ class CControllerImageUpdate extends CController {
 			return false;
 		}
 
-		$images = API::Image()->get(['imageids' => (array) $this->getInput('imageid')]);
+		$images = API::Image()->get(['imageids' => $this->getInput('imageid')]);
 		if (!$images) {
 			return false;
 		}
@@ -100,10 +100,11 @@ class CControllerImageUpdate extends CController {
 		$image = $this->uploadImage($error);
 
 		if ($error) {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'image.edit')
-				->setArgument('imagetype', $this->getInput('imagetype'))
-				->setArgument('imageid', $this->getInput('imageid'))
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))
+					->setArgument('action', 'image.edit')
+					->setArgument('imagetype', $this->getInput('imagetype'))
+					->setArgument('imageid', $this->getInput('imageid'))
 			);
 			error($error);
 			$response->setFormData($this->getInputAll());
@@ -113,32 +114,44 @@ class CControllerImageUpdate extends CController {
 		}
 
 		if ($this->hasInput('imageid')) {
-			$result = API::Image()->update([
+			$options = [
 				'imageid' => $this->getInput('imageid'),
-				'name'    => $this->getInput('name'),
-				'image'   => $image
-			]);
+				'name' => $this->getInput('name')
+			];
+
+			if ($image !== null) {
+				$options['image'] = $image;
+			}
+
+			$result = API::Image()->update($options);
 		}
 		else {
-			$result = API::Image()->create([
+			$options = [
 				'imagetype' => $this->getInput('imagetype'),
-				'name'      => $this->getInput('name'),
-				'image'     => $image
-			]);
+				'name' => $this->getInput('name')
+			];
+
+			if ($image !== null) {
+				$options['image'] = $image;
+			}
+
+			$result = API::Image()->create($options);
 		}
 
 		if ($result) {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'image.list')
-				->setArgument('imagetype', $this->getInput('imagetype'))
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))
+					->setArgument('action', 'image.list')
+					->setArgument('imagetype', $this->getInput('imagetype'))
 			);
 			CMessageHelper::setSuccessTitle(_('Image updated'));
 		}
 		else {
-			$response = new CControllerResponseRedirect((new CUrl('zabbix.php'))
-				->setArgument('action', 'image.edit')
-				->setArgument('imagetype', $this->getInput('imagetype'))
-				->setArgument('imageid', $this->getInput('imageid'))
+			$response = new CControllerResponseRedirect(
+				(new CUrl('zabbix.php'))
+					->setArgument('action', 'image.edit')
+					->setArgument('imagetype', $this->getInput('imagetype'))
+					->setArgument('imageid', $this->getInput('imageid'))
 			);
 			$response->setFormData($this->getInputAll());
 			CMessageHelper::setErrorTitle(_('Cannot update image'));
diff --git a/ui/app/controllers/CControllerLatestView.php b/ui/app/controllers/CControllerLatestView.php
index e8b9d057af8..15a44cd47ef 100644
--- a/ui/app/controllers/CControllerLatestView.php
+++ b/ui/app/controllers/CControllerLatestView.php
@@ -136,18 +136,19 @@ class CControllerLatestView extends CControllerLatest {
 
 		$view_curl = (new CUrl('zabbix.php'))->setArgument('action', 'latest.view');
 
-		$refresh_curl = (new CUrl('zabbix.php'))
-			->setArgument('action', 'latest.view.refresh')
-			->setArgument('filter_groupids', $filter['groupids'])
-			->setArgument('filter_hostids', $filter['hostids'])
-			->setArgument('filter_select', $filter['select'])
-			->setArgument('filter_show_without_data', $filter['show_without_data'] ? 1 : null)
-			->setArgument('filter_show_details', $filter['show_details'] ? 1 : null)
-			->setArgument('filter_evaltype', $filter['evaltype'])
-			->setArgument('filter_tags', $filter['tags'])
-			->setArgument('sort', $sort_field)
-			->setArgument('sortorder', $sort_order)
-			->setArgument('page', $this->hasInput('page') ? $this->getInput('page') : null);
+		$refresh_curl = (new CUrl('zabbix.php'))->setArgument('action', 'latest.view.refresh');
+		$refresh_data = array_filter([
+			'filter_groupids' => $filter['groupids'],
+			'filter_hostids' => $filter['hostids'],
+			'filter_select' => $filter['select'],
+			'filter_show_without_data' => $filter['show_without_data'] ? 1 : null,
+			'filter_show_details' => $filter['show_details'] ? 1 : null,
+			'filter_evaltype' => $filter['evaltype'],
+			'filter_tags' => $filter['tags'],
+			'sort' => $sort_field,
+			'sortorder' => $sort_order,
+			'page' => $this->hasInput('page') ? $this->getInput('page') : null
+		]);
 
 		// data sort and pager
 		$prepared_data = $this->prepareData($filter, $sort_field, $sort_order);
@@ -163,6 +164,7 @@ class CControllerLatestView extends CControllerLatest {
 			'sort_order' => $sort_order,
 			'view_curl' => $view_curl,
 			'refresh_url' => $refresh_curl->getUrl(),
+			'refresh_data' => $refresh_data,
 			'refresh_interval' => CWebUser::getRefresh() * 1000,
 			'active_tab' => CProfile::get('web.latest.filter.active', 1),
 			'paging' => $paging,
diff --git a/ui/app/controllers/CControllerPopupItemTestSend.php b/ui/app/controllers/CControllerPopupItemTestSend.php
index 655cf7470a8..5566a2b3e63 100644
--- a/ui/app/controllers/CControllerPopupItemTestSend.php
+++ b/ui/app/controllers/CControllerPopupItemTestSend.php
@@ -224,7 +224,7 @@ class CControllerPopupItemTestSend extends CControllerPopupItemTest {
 
 		/*
 		 * Define values used to test preprocessing steps.
-		 * Steps array can be empty if only value convertation is tested.
+		 * Steps array can be empty if only value conversion is tested.
 		 */
 		$preproc_test_data = [
 			'value' => $this->getInput('value', ''),
diff --git a/ui/app/controllers/CControllerPopupServiceEdit.php b/ui/app/controllers/CControllerPopupServiceEdit.php
index 09b1e588da6..bfae43c702f 100644
--- a/ui/app/controllers/CControllerPopupServiceEdit.php
+++ b/ui/app/controllers/CControllerPopupServiceEdit.php
@@ -142,6 +142,39 @@ class CControllerPopupServiceEdit extends CController {
 		$defaults = DB::getDefaults('services');
 
 		if ($this->service !== null) {
+			foreach ($this->service['status_rules'] as $index => &$status_rule) {
+				$status_rule += [
+					'row_index' => $index,
+					'name' => CServiceHelper::formatStatusRuleType((int) $status_rule['type'],
+						(int) $status_rule['new_status'], (int) $status_rule['limit_value'],
+						(int) $status_rule['limit_status']
+					)
+				];
+			}
+			unset($status_rule);
+
+			foreach ($this->service['times'] as $index => &$service_time) {
+				switch ($service_time['type']) {
+					case SERVICE_TIME_TYPE_UPTIME:
+					case SERVICE_TIME_TYPE_DOWNTIME:
+						$from = dowHrMinToStr($service_time['ts_from']);
+						$till = dowHrMinToStr($service_time['ts_to'], true);
+						break;
+
+					case SERVICE_TIME_TYPE_ONETIME_DOWNTIME:
+						$from = zbx_date2str(DATE_TIME_FORMAT, $service_time['ts_from']);
+						$till = zbx_date2str(DATE_TIME_FORMAT, $service_time['ts_to']);
+						break;
+				}
+
+				$service_time += [
+					'row_index' => $index,
+					'from' => $from,
+					'till' => $till
+				];
+			}
+			unset($service_time);
+
 			$data = [
 				'title' => _('Service'),
 				'serviceid' => $this->service['serviceid'],
diff --git a/ui/app/controllers/CControllerPopupTriggerExpr.php b/ui/app/controllers/CControllerPopupTriggerExpr.php
index 100736be410..7557f7b00b4 100644
--- a/ui/app/controllers/CControllerPopupTriggerExpr.php
+++ b/ui/app/controllers/CControllerPopupTriggerExpr.php
@@ -842,6 +842,13 @@ class CControllerPopupTriggerExpr extends CController {
 				'description' => _('rand() - A random integer value'),
 				'allowed_types' => $this->allowedTypesAny
 			],
+			'rate' => [
+				'types' => [ZBX_FUNCTION_TYPE_HISTORY],
+				'description' => _('rate() - Returns per-second average rate for monotonically increasing counters'),
+				'params' => $this->param1Sec + $this->period_optional,
+				'allowed_types' => $this->allowedTypesNumeric,
+				'operators' => $this->operators
+			],
 			'repeat' => [
 				'types' => [ZBX_FUNCTION_TYPE_STRING],
 				'description' => _('repeat() - Returns a string composed of value repeated count times'),
diff --git a/ui/app/controllers/CControllerProblem.php b/ui/app/controllers/CControllerProblem.php
index 35fd022756a..60db5421b8e 100644
--- a/ui/app/controllers/CControllerProblem.php
+++ b/ui/app/controllers/CControllerProblem.php
@@ -91,7 +91,7 @@ abstract class CControllerProblem extends CController {
 	/**
 	 * Get additional data required for render filter as HTML.
 	 *
-	 * @param array $filter  Filter fileds values.
+	 * @param array $filter  Filter fields values.
 	 *
 	 * @return array
 	 */
diff --git a/ui/app/controllers/CControllerProblemView.php b/ui/app/controllers/CControllerProblemView.php
index c53f8389712..06702db59f5 100644
--- a/ui/app/controllers/CControllerProblemView.php
+++ b/ui/app/controllers/CControllerProblemView.php
@@ -119,9 +119,6 @@ class CControllerProblemView extends CControllerProblem {
 		}
 
 		$filter = $filter_tabs[$profile->selected];
-		$refresh_curl = (new CUrl('zabbix.php'));
-		$filter['action'] = 'problem.view.refresh';
-		array_map([$refresh_curl, 'setArgument'], array_keys($filter), $filter);
 
 		$data = [
 			'action' => $this->getAction(),
@@ -142,7 +139,6 @@ class CControllerProblemView extends CControllerProblem {
 				] + getTimeselectorActions($profile->from, $profile->to)
 			],
 			'filter_tabs' => $filter_tabs,
-			'refresh_url' => $refresh_curl->getUrl(),
 			'refresh_interval' => CWebUser::getRefresh() * 1000,
 			'inventories' => array_column(getHostInventories(), 'title', 'db_field'),
 			'sort' => $filter['sort'],
diff --git a/ui/app/controllers/CControllerProfileUpdate.php b/ui/app/controllers/CControllerProfileUpdate.php
index dc2687f49ae..f9b272348a5 100644
--- a/ui/app/controllers/CControllerProfileUpdate.php
+++ b/ui/app/controllers/CControllerProfileUpdate.php
@@ -59,7 +59,6 @@ class CControllerProfileUpdate extends CController {
 				case 'web.maintenance.filter.active':
 				case 'web.media_types.filter.active':
 				case 'web.modules.filter.active':
-				case 'web.overview.filter.active':
 				case 'web.problem.filter.active':
 				case 'web.proxies.filter.active':
 				case 'web.scheduledreport.filter.active':
diff --git a/ui/app/controllers/CControllerServiceCreate.php b/ui/app/controllers/CControllerServiceCreate.php
index 65245f46516..53f59fcfbf3 100644
--- a/ui/app/controllers/CControllerServiceCreate.php
+++ b/ui/app/controllers/CControllerServiceCreate.php
@@ -21,6 +21,10 @@
 
 class CControllerServiceCreate extends CController {
 
+	protected function init() {
+		$this->setPostContentType(self::POST_CONTENT_TYPE_JSON);
+	}
+
 	protected function checkInput(): bool {
 		$fields = [
 			'name' =>						'required|db services.name|not_empty',
diff --git a/ui/app/controllers/CControllerServiceList.php b/ui/app/controllers/CControllerServiceList.php
index 08df8bfbc8e..73ab4e3004d 100644
--- a/ui/app/controllers/CControllerServiceList.php
+++ b/ui/app/controllers/CControllerServiceList.php
@@ -54,22 +54,7 @@ class CControllerServiceList extends CControllerServiceListGeneral {
 			return false;
 		}
 
-		if ($this->hasInput('serviceid')) {
-			$db_service = API::Service()->get([
-				'output' => ['serviceid', 'name', 'status', 'goodsla', 'showsla', 'readonly'],
-				'serviceids' => $this->getInput('serviceid'),
-				'selectParents' => ['serviceid'],
-				'selectTags' => ['tag', 'value']
-			]);
-
-			if (!$db_service) {
-				return false;
-			}
-
-			$this->service = $db_service[0];
-		}
-
-		return true;
+		return parent::checkPermissions();
 	}
 
 	/**
@@ -150,6 +135,7 @@ class CControllerServiceList extends CControllerServiceListGeneral {
 			'output' => ['serviceid', 'name', 'status', 'goodsla', 'showsla', 'readonly'],
 			'selectParents' => $filter['filter_set'] ? ['serviceid', 'name'] : null,
 			'selectChildren' => API_OUTPUT_COUNT,
+			'selectProblemEvents' => ['eventid', 'severity', 'name'],
 			'selectTags' => ['tag', 'value'],
 			'serviceids' => $db_serviceids,
 			'sortfield' => ['sortorder', 'name'],
@@ -157,7 +143,7 @@ class CControllerServiceList extends CControllerServiceListGeneral {
 			'preservekeys' => true
 		]);
 
-		$data['events'] = $this->getProblemEvents($db_serviceids);
+		self::extendProblemEvents($data['services']);
 
 		$data['tags'] = makeTags($data['services'], true, 'serviceid', ZBX_TAG_COUNT_DEFAULT, $filter['tags']);
 
diff --git a/ui/app/controllers/CControllerServiceListEdit.php b/ui/app/controllers/CControllerServiceListEdit.php
index d024d4cd07b..43294f7aaf0 100755
--- a/ui/app/controllers/CControllerServiceListEdit.php
+++ b/ui/app/controllers/CControllerServiceListEdit.php
@@ -58,22 +58,7 @@ class CControllerServiceListEdit extends CControllerServiceListGeneral {
 			return false;
 		}
 
-		if ($this->hasInput('serviceid')) {
-			$db_service = API::Service()->get([
-				'output' => ['serviceid', 'name', 'status', 'goodsla', 'showsla', 'readonly'],
-				'serviceids' => $this->getInput('serviceid'),
-				'selectParents' => ['serviceid'],
-				'selectTags' => ['tag', 'value']
-			]);
-
-			if (!$db_service) {
-				return false;
-			}
-
-			$this->service = $db_service[0];
-		}
-
-		return true;
+		return parent::checkPermissions();
 	}
 
 	/**
@@ -176,6 +161,7 @@ class CControllerServiceListEdit extends CControllerServiceListGeneral {
 			'output' => ['serviceid', 'name', 'status', 'goodsla', 'showsla', 'readonly'],
 			'selectParents' => $filter['filter_set'] ? ['serviceid', 'name'] : null,
 			'selectChildren' => API_OUTPUT_COUNT,
+			'selectProblemEvents' => ['eventid', 'severity', 'name'],
 			'selectTags' => ['tag', 'value'],
 			'serviceids' => $db_serviceids,
 			'sortfield' => ['sortorder', 'name'],
@@ -183,7 +169,7 @@ class CControllerServiceListEdit extends CControllerServiceListGeneral {
 			'preservekeys' => true
 		]);
 
-		$data['events'] = $this->getProblemEvents($db_serviceids);
+		self::extendProblemEvents($data['services']);
 
 		$data['tags'] = makeTags($data['services'], true, 'serviceid', ZBX_TAG_COUNT_DEFAULT, $filter['tags']);
 
diff --git a/ui/app/controllers/CControllerServiceListEditRefresh.php b/ui/app/controllers/CControllerServiceListEditRefresh.php
index 899bbaeeec9..d342104c5a1 100755
--- a/ui/app/controllers/CControllerServiceListEditRefresh.php
+++ b/ui/app/controllers/CControllerServiceListEditRefresh.php
@@ -54,7 +54,11 @@ class CControllerServiceListEditRefresh extends CControllerServiceListGeneral {
 	}
 
 	protected function checkPermissions(): bool {
-		return $this->checkAccess(CRoleHelper::UI_MONITORING_SERVICES);
+		if (!$this->checkAccess(CRoleHelper::UI_MONITORING_SERVICES) || !$this->canEdit()) {
+			return false;
+		}
+
+		return parent::checkPermissions();
 	}
 
 	/**
@@ -131,6 +135,7 @@ class CControllerServiceListEditRefresh extends CControllerServiceListGeneral {
 			'output' => ['serviceid', 'name', 'status', 'goodsla', 'showsla', 'readonly'],
 			'selectParents' => $filter['filter_set'] ? ['serviceid', 'name'] : null,
 			'selectChildren' => API_OUTPUT_COUNT,
+			'selectProblemEvents' => ['eventid', 'severity', 'name'],
 			'selectTags' => ['tag', 'value'],
 			'serviceids' => $db_serviceids,
 			'sortfield' => ['sortorder', 'name'],
@@ -138,7 +143,7 @@ class CControllerServiceListEditRefresh extends CControllerServiceListGeneral {
 			'preservekeys' => true
 		]);
 
-		$data['events'] = $this->getProblemEvents($db_serviceids);
+		self::extendProblemEvents($data['services']);
 
 		$data['tags'] = makeTags($data['services'], true, 'serviceid', ZBX_TAG_COUNT_DEFAULT, $filter['tags']);
 
diff --git a/ui/app/controllers/CControllerServiceListGeneral.php b/ui/app/controllers/CControllerServiceListGeneral.php
index f1db52efc22..6a62827b0e8 100755
--- a/ui/app/controllers/CControllerServiceListGeneral.php
+++ b/ui/app/controllers/CControllerServiceListGeneral.php
@@ -33,6 +33,30 @@ abstract class CControllerServiceListGeneral extends CController {
 	protected $service;
 
 	/**
+	 * @return bool
+
+	 * @throws APIException
+	 */
+	protected function checkPermissions(): bool {
+		if ($this->hasInput('serviceid')) {
+			$db_service = API::Service()->get([
+				'output' => ['serviceid', 'name', 'status', 'goodsla', 'showsla', 'readonly'],
+				'serviceids' => $this->getInput('serviceid'),
+				'selectParents' => ['serviceid'],
+				'selectTags' => ['tag', 'value']
+			]);
+
+			if (!$db_service) {
+				return false;
+			}
+
+			$this->service = $db_service[0];
+		}
+
+		return true;
+	}
+
+	/**
 	 * @throws APIException
 	 */
 	protected function canEdit(): bool {
@@ -181,11 +205,9 @@ abstract class CControllerServiceListGeneral extends CController {
 		}
 
 		$options = [
-			'output' => [],
-			'selectParents' => ($filter['serviceid'] == self::WITHOUT_PARENTS_SERVICEID && !$is_filtered)
-				? null
-				: ['serviceid'],
-			'parentids' => !$is_filtered ? $filter['serviceid'] : null,
+			'output' => ['name'],
+			'parentids' => $filter['serviceid'],
+			'deep_parentids' => $is_filtered,
 			'childids' => $filter['without_children'] ? 0 : null,
 			'without_problem_tags' => $filter['without_problem_tags'],
 			'search' => ($filter['name'] === '')
@@ -209,8 +231,7 @@ abstract class CControllerServiceListGeneral extends CController {
 
 			if (!$filter['without_problem_tags']
 					&& ($filter['tag_source'] == ZBX_SERVICE_FILTER_TAGS_ANY
-						|| $filter['tag_source'] == ZBX_SERVICE_FILTER_TAGS_PROBLEM
-					)) {
+						|| $filter['tag_source'] == ZBX_SERVICE_FILTER_TAGS_PROBLEM)) {
 				$db_services += API::Service()->get($options + ['problem_tags' => $filter['tags']]);
 			}
 		}
@@ -218,85 +239,67 @@ abstract class CControllerServiceListGeneral extends CController {
 			$db_services += API::Service()->get($options);
 		}
 
-		if (!$db_services || !$is_filtered || $filter['serviceid'] == self::WITHOUT_PARENTS_SERVICEID) {
-			return array_keys($db_services);
+		return array_keys($db_services);
+	}
+
+	/**
+	 * @param array $services
+	 */
+	protected static function extendProblemEvents(array &$services): void {
+		$eventids = [];
+
+		foreach (array_column($services, 'problem_events') as $problem_events) {
+			$eventids += array_column($problem_events, 'eventid', 'eventid');
 		}
 
-		$filtered_serviceids = [];
+		$events = API::Event()->get([
+			'output' => ['objectid'],
+			'eventids' => $eventids,
+			'source' => EVENT_SOURCE_TRIGGERS,
+			'object' => EVENT_OBJECT_TRIGGER,
+			'value' => TRIGGER_VALUE_TRUE,
+			'preservekeys' => true
+		]);
+
+		foreach ($services as &$service) {
+			$problem_events = [];
 
-		do {
-			$parentids = [];
+			foreach ($service['problem_events'] as $problem_event) {
+				$triggerid = array_key_exists($problem_event['eventid'], $events)
+					? $events[$problem_event['eventid']]['objectid']
+					: 0;
 
-			foreach ($db_services as $db_serviceid => $db_service) {
-				$service_parentids = array_column($db_service['parents'], 'serviceid', 'serviceid');
+				if (!array_key_exists($triggerid, $problem_events)) {
+					$problem_events[$triggerid] = [];
+				}
 
-				if (array_key_exists($filter['serviceid'], $service_parentids)) {
-					$filtered_serviceids[$db_serviceid] = true;
-					unset($db_services[$db_serviceid]);
+				if (!array_key_exists($problem_event['name'], $problem_events[$triggerid])) {
+					$problem_events[$triggerid][$problem_event['name']] = $problem_event['severity'];
 				}
 				else {
-					$parentids += $service_parentids;
+					$problem_events[$triggerid][$problem_event['name']] = max($problem_event['severity'],
+						$problem_events[$triggerid][$problem_event['name']]
+					);
 				}
 			}
 
-			$db_parent_services = API::Service()->get([
-				'output' => [],
-				'selectParents' => ['serviceid'],
-				'serviceids' => $parentids,
-				'preservekeys' => true
-			]);
-
-			if (!$db_parent_services) {
-				break;
-			}
-
-			foreach ($db_services as &$db_service) {
-				$service_parentids = array_column($db_service['parents'], 'serviceid', 'serviceid');
+			$service['problem_events'] = [];
 
-				$parentids = [];
-				foreach ($service_parentids as $service_parentid) {
-					$parentids += array_column($db_parent_services[$service_parentid]['parents'], null, 'serviceid');
+			foreach ($problem_events as $triggerid => $problem_events) {
+				foreach ($problem_events as $name => $severity) {
+					$service['problem_events'][] = [
+						'triggerid' => $triggerid != 0 ? $triggerid : null,
+						'name' => $name,
+						'severity' => $severity
+					];
 				}
-
-				$db_service['parents'] = $parentids;
 			}
-			unset($db_service);
-		} while (true);
-
-		return array_keys($filtered_serviceids);
-	}
 
-	protected function getProblemEvents(array $serviceids): array {
-		$sla = API::Service()->getSla([
-			'serviceids' => $serviceids,
-			'intervals' => [['from' => 0, 'to' => 0]]
-		]);
-
-		$eventids_by_service = [];
-		$eventids = [];
-
-		foreach ($sla as $serviceid => $service_sla) {
-			$eventids_by_service[$serviceid] = array_column($service_sla['problems'], 'eventid', 'eventid');
-			$eventids += $eventids_by_service[$serviceid];
-		}
-
-		$events = API::Event()->get([
-			'output' => ['name', 'objectid', 'severity'],
-			'eventids' => $eventids,
-			'preservekeys' => true
-		]);
-
-		CArrayHelper::sort($events, [
-			['field' => 'severity', 'order' => ZBX_SORT_DOWN],
-			['field' => 'name', 'order' => ZBX_SORT_UP]
-		]);
-
-		$events_sorted = [];
-
-		foreach ($eventids_by_service as $serviceid => $service_events) {
-			$events_sorted[$serviceid] = array_intersect_key($events, $service_events);
+			CArrayHelper::sort($service['problem_events'], [
+				['field' => 'severity', 'order' => ZBX_SORT_DOWN],
+				['field' => 'name', 'order' => ZBX_SORT_UP]
+			]);
 		}
-
-		return $events_sorted;
+		unset($service);
 	}
 }
diff --git a/ui/app/controllers/CControllerServiceListRefresh.php b/ui/app/controllers/CControllerServiceListRefresh.php
index 3e1935c777f..d8d2a291307 100644
--- a/ui/app/controllers/CControllerServiceListRefresh.php
+++ b/ui/app/controllers/CControllerServiceListRefresh.php
@@ -51,7 +51,11 @@ class CControllerServiceListRefresh extends CControllerServiceListGeneral {
 	}
 
 	protected function checkPermissions(): bool {
-		return $this->checkAccess(CRoleHelper::UI_MONITORING_SERVICES);
+		if (!$this->checkAccess(CRoleHelper::UI_MONITORING_SERVICES)) {
+			return false;
+		}
+
+		return parent::checkPermissions();
 	}
 
 	protected function doAction(): void {
@@ -113,6 +117,7 @@ class CControllerServiceListRefresh extends CControllerServiceListGeneral {
 			'output' => ['serviceid', 'name', 'status', 'goodsla', 'showsla', 'readonly'],
 			'selectParents' => $filter['filter_set'] ? ['serviceid', 'name'] : null,
 			'selectChildren' => API_OUTPUT_COUNT,
+			'selectProblemEvents' => ['eventid', 'severity', 'name'],
 			'selectTags' => ['tag', 'value'],
 			'serviceids' => $db_serviceids,
 			'sortfield' => ['sortorder', 'name'],
@@ -120,7 +125,7 @@ class CControllerServiceListRefresh extends CControllerServiceListGeneral {
 			'preservekeys' => true
 		]);
 
-		$data['events'] = $this->getProblemEvents($db_serviceids);
+		self::extendProblemEvents($data['services']);
 
 		$data['tags'] = makeTags($data['services'], true, 'serviceid', ZBX_TAG_COUNT_DEFAULT, $filter['tags']);
 
diff --git a/ui/app/controllers/CControllerServiceStatusRuleValidate.php b/ui/app/controllers/CControllerServiceStatusRuleValidate.php
index df95e8315e7..3b20b8753a7 100644
--- a/ui/app/controllers/CControllerServiceStatusRuleValidate.php
+++ b/ui/app/controllers/CControllerServiceStatusRuleValidate.php
@@ -21,6 +21,10 @@
 
 class CControllerServiceStatusRuleValidate extends CController {
 
+	protected function init() {
+		$this->setPostContentType(self::POST_CONTENT_TYPE_JSON);
+	}
+
 	protected function checkInput(): bool {
 		$fields = [
 			'row_index' =>		'required|int32',
@@ -85,18 +89,24 @@ class CControllerServiceStatusRuleValidate extends CController {
 
 	protected function doAction(): void {
 		$data = [
-			'row_index' => $this->getInput('row_index'),
-			'form' => [
+			'body' => [
+				'row_index' => $this->getInput('row_index'),
+				'name' => CServiceHelper::formatStatusRuleType((int) $this->getInput('type'),
+					(int) $this->getInput('new_status'), (int) $this->getInput('limit_value'),
+					(int) $this->getInput('limit_status')
+				),
 				'type' => $this->getInput('type'),
 				'limit_value' => $this->getInput('limit_value'),
 				'limit_status' => $this->getInput('limit_status'),
 				'new_status' => $this->getInput('new_status')
-			],
-			'user' => [
-				'debug_mode' => $this->getDebugMode()
 			]
 		];
 
-		$this->setResponse(new CControllerResponseData($data));
+		if ($this->getDebugMode() == GROUP_DEBUG_MODE_ENABLED) {
+			CProfiler::getInstance()->stop();
+			$data['debug'] = CProfiler::getInstance()->make()->toString();
+		}
+
+		$this->setResponse(new CControllerResponseData(['main_block' => json_encode($data)]));
 	}
 }
diff --git a/ui/app/controllers/CControllerServiceTimeValidate.php b/ui/app/controllers/CControllerServiceTimeValidate.php
index 820ddd2f608..02d4c446ec9 100644
--- a/ui/app/controllers/CControllerServiceTimeValidate.php
+++ b/ui/app/controllers/CControllerServiceTimeValidate.php
@@ -24,6 +24,10 @@ class CControllerServiceTimeValidate extends CController {
 	private $ts_from;
 	private $ts_to;
 
+	protected function init() {
+		$this->setPostContentType(self::POST_CONTENT_TYPE_JSON);
+	}
+
 	protected function checkInput(): bool {
 		$fields = [
 			'row_index' =>		'required|int32',
@@ -109,19 +113,36 @@ class CControllerServiceTimeValidate extends CController {
 	}
 
 	protected function doAction(): void {
+		switch ($this->getInput('type')) {
+			case SERVICE_TIME_TYPE_UPTIME:
+			case SERVICE_TIME_TYPE_DOWNTIME:
+				$from = dowHrMinToStr($this->ts_from);
+				$till = dowHrMinToStr($this->ts_to, true);
+				break;
+
+			case SERVICE_TIME_TYPE_ONETIME_DOWNTIME:
+				$from = zbx_date2str(DATE_TIME_FORMAT, $this->ts_from);
+				$till = zbx_date2str(DATE_TIME_FORMAT, $this->ts_to);
+				break;
+		}
+
 		$data = [
-			'row_index' => $this->getInput('row_index'),
-			'form' => [
+			'body' => [
+				'row_index' => $this->getInput('row_index'),
 				'type' => $this->getInput('type'),
 				'ts_from' => $this->ts_from,
+				'from' => $from,
 				'ts_to' => $this->ts_to,
+				'till' => $till,
 				'note' => $this->getInput('note', '')
-			],
-			'user' => [
-				'debug_mode' => $this->getDebugMode()
 			]
 		];
 
-		$this->setResponse(new CControllerResponseData($data));
+		if ($this->getDebugMode() == GROUP_DEBUG_MODE_ENABLED) {
+			CProfiler::getInstance()->stop();
+			$data['debug'] = CProfiler::getInstance()->make()->toString();
+		}
+
+		$this->setResponse(new CControllerResponseData(['main_block' => json_encode($data)]));
 	}
 }
diff --git a/ui/app/controllers/CControllerServiceUpdate.php b/ui/app/controllers/CControllerServiceUpdate.php
index 73121b11ea0..41988240ad7 100644
--- a/ui/app/controllers/CControllerServiceUpdate.php
+++ b/ui/app/controllers/CControllerServiceUpdate.php
@@ -21,6 +21,10 @@
 
 class CControllerServiceUpdate extends CController {
 
+	protected function init() {
+		$this->setPostContentType(self::POST_CONTENT_TYPE_JSON);
+	}
+
 	protected function checkInput(): bool {
 		$fields = [
 			'serviceid' =>					'required|db services.serviceid',
diff --git a/ui/app/controllers/CControllerTemplateDashboardUpdate.php b/ui/app/controllers/CControllerTemplateDashboardUpdate.php
index f800ea579b2..58e664e7436 100644
--- a/ui/app/controllers/CControllerTemplateDashboardUpdate.php
+++ b/ui/app/controllers/CControllerTemplateDashboardUpdate.php
@@ -23,14 +23,18 @@ class CControllerTemplateDashboardUpdate extends CController {
 
 	private $dashboard_pages;
 
+	protected function init() {
+		$this->setPostContentType(self::POST_CONTENT_TYPE_JSON);
+	}
+
 	protected function checkInput() {
 		$fields = [
-			'templateid' => 'required|db dashboard.templateid',
-			'dashboardid' => 'db dashboard.dashboardid',
-			'name' => 'required|db dashboard.name|not_empty',
-			'display_period' => 'required|db dashboard.display_period|in '.implode(',', DASHBOARD_DISPLAY_PERIODS),
-			'auto_start' => 'required|db dashboard.auto_start|in 0,1',
-			'pages' => 'array'
+			'templateid' =>		'required|db dashboard.templateid',
+			'dashboardid' =>	'db dashboard.dashboardid',
+			'name' =>			'required|db dashboard.name|not_empty',
+			'display_period' =>	'required|db dashboard.display_period|in '.implode(',', DASHBOARD_DISPLAY_PERIODS),
+			'auto_start' =>		'required|db dashboard.auto_start|in 0,1',
+			'pages' =>			'array'
 		];
 
 		$ret = $this->validateInput($fields);
diff --git a/ui/app/controllers/CControllerUserroleCreate.php b/ui/app/controllers/CControllerUserroleCreate.php
index f2769954fb1..db948a52a1e 100644
--- a/ui/app/controllers/CControllerUserroleCreate.php
+++ b/ui/app/controllers/CControllerUserroleCreate.php
@@ -35,7 +35,6 @@ class CControllerUserroleCreate extends CControllerUserroleEditGeneral {
 			'ui_monitoring_dashboard' => 				'in 0,1',
 			'ui_monitoring_problems' => 				'in 0,1',
 			'ui_monitoring_hosts' => 					'in 0,1',
-			'ui_monitoring_overview' => 				'in 0,1',
 			'ui_monitoring_latest_data' => 				'in 0,1',
 			'ui_monitoring_maps' => 					'in 0,1',
 			'ui_monitoring_discovery' => 				'in 0,1',
diff --git a/ui/app/controllers/CControllerUserroleEdit.php b/ui/app/controllers/CControllerUserroleEdit.php
index 3df56448b35..bd76cbc2c7c 100644
--- a/ui/app/controllers/CControllerUserroleEdit.php
+++ b/ui/app/controllers/CControllerUserroleEdit.php
@@ -38,7 +38,6 @@ class CControllerUserroleEdit extends CControllerUserroleEditGeneral {
 			'ui_monitoring_dashboard' => 				'in 0,1',
 			'ui_monitoring_problems' => 				'in 0,1',
 			'ui_monitoring_hosts' => 					'in 0,1',
-			'ui_monitoring_overview' => 				'in 0,1',
 			'ui_monitoring_latest_data' => 				'in 0,1',
 			'ui_monitoring_maps' => 					'in 0,1',
 			'ui_monitoring_discovery' => 				'in 0,1',
diff --git a/ui/app/controllers/CControllerUserroleUpdate.php b/ui/app/controllers/CControllerUserroleUpdate.php
index 49bbd352576..e2a97d7b66c 100644
--- a/ui/app/controllers/CControllerUserroleUpdate.php
+++ b/ui/app/controllers/CControllerUserroleUpdate.php
@@ -34,7 +34,6 @@ class CControllerUserroleUpdate extends CControllerUserroleEditGeneral {
 			'ui_monitoring_dashboard' => 				'in 0,1',
 			'ui_monitoring_problems' => 				'in 0,1',
 			'ui_monitoring_hosts' => 					'in 0,1',
-			'ui_monitoring_overview' => 				'in 0,1',
 			'ui_monitoring_latest_data' => 				'in 0,1',
 			'ui_monitoring_maps' => 					'in 0,1',
 			'ui_monitoring_discovery' => 				'in 0,1',
diff --git a/ui/app/controllers/CControllerWidget.php b/ui/app/controllers/CControllerWidget.php
index ce4a7a7c244..f54fb2373a6 100644
--- a/ui/app/controllers/CControllerWidget.php
+++ b/ui/app/controllers/CControllerWidget.php
@@ -43,7 +43,7 @@ abstract class CControllerWidget extends CController {
 	 * Initialization function.
 	 */
 	protected function init() {
-		$this->disableSIDValidation();
+		$this->setPostContentType(self::POST_CONTENT_TYPE_JSON);
 	}
 
 	/**
diff --git a/ui/app/controllers/CControllerWidgetSvgGraphView.php b/ui/app/controllers/CControllerWidgetSvgGraphView.php
index 8bfa7ec0a84..82f31c75d79 100644
--- a/ui/app/controllers/CControllerWidgetSvgGraphView.php
+++ b/ui/app/controllers/CControllerWidgetSvgGraphView.php
@@ -38,8 +38,8 @@ class CControllerWidgetSvgGraphView extends CControllerWidget {
 			'content_width' => 'int32|ge '.self::GRAPH_WIDTH_MIN.'|le '.self::GRAPH_WIDTH_MAX,
 			'content_height' => 'int32|ge '.self::GRAPH_HEIGHT_MIN.'|le '.self::GRAPH_HEIGHT_MAX,
 			'preview' => 'in 1',
-			'from_ts' => 'string',
-			'to_ts' => 'string',
+			'from' => 'string',
+			'to' => 'string',
 			'fields' => 'json'
 		]);
 	}
@@ -98,23 +98,22 @@ class CControllerWidgetSvgGraphView extends CControllerWidget {
 			'overrides' => array_values($fields['or'])
 		];
 
-		// Use dashboard time.
 		if ($graph_data['dashboard_time'] && !$preview) {
-			$graph_data['time_period'] = [
-				'time_from' => $this->getInput('from_ts', 0),
-				'time_to' => $this->getInput('to_ts', 0)
-			];
+			$from = $this->getInput('from');
+			$to = $this->getInput('to');
 		}
-		// Otherwise, set graph time period options.
 		else {
-			$range_time_parser = new CRangeTimeParser();
+			$from = $fields['time_from'];
+			$to = $fields['time_to'];
+		}
 
-			$range_time_parser->parse($fields['time_from']);
-			$graph_data['time_period']['time_from'] = $range_time_parser->getDateTime(true)->getTimestamp();
+		$range_time_parser = new CRangeTimeParser();
 
-			$range_time_parser->parse($fields['time_to']);
-			$graph_data['time_period']['time_to'] = $range_time_parser->getDateTime(false)->getTimestamp();
-		}
+		$range_time_parser->parse($from);
+		$graph_data['time_period']['time_from'] = $range_time_parser->getDateTime(true)->getTimestamp();
+
+		$range_time_parser->parse($to);
+		$graph_data['time_period']['time_to'] = $range_time_parser->getDateTime(true)->getTimestamp();
 
 		$svg_options = CSvgGraphHelper::get($graph_data, $width, $height);
 		if ($svg_options['errors']) {
diff --git a/ui/app/partials/common.filter.item.php b/ui/app/partials/common.filter.item.php
deleted file mode 100644
index f9967365c19..00000000000
--- a/ui/app/partials/common.filter.item.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php declare(strict_types=1);
-/*
-** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**/
-
-
-/**
- * @var CPartial $this
- */
-
-$this->includeJsFile('common.filter.item.js.php');
-
-$filter_column_left = (new CFormList())
-	->addRow((new CLabel(_('Host groups'), 'filter_groupids__ms')),
-		(new CMultiSelect([
-			'multiple' => true,
-			'name' => 'filter_groupids[]',
-			'object_name' => 'hostGroup',
-			'data' => $data['filter']['groups'],
-			'popup' => [
-				'parameters' => [
-					'srctbl' => 'host_groups',
-					'srcfld1' => 'groupid',
-					'dstfrm' => 'zbx_filter',
-					'dstfld1' => 'filter_groupids_',
-					'with_monitored_items' => true
-				]
-			]
-		]))->setWidth(ZBX_TEXTAREA_FILTER_STANDARD_WIDTH)
-	)
-	->addRow((new CLabel(_('Hosts'), 'filter_hostids__ms')),
-		(new CMultiSelect([
-			'multiple' => true,
-			'name' => 'filter_hostids[]',
-			'object_name' => 'hosts',
-			'data' => $data['filter']['hosts'],
-			'popup' => [
-				'filter_preselect_fields' => [
-					'hostgroups' => 'filter_groupids_'
-				],
-				'parameters' => [
-					'srctbl' => 'hosts',
-					'srcfld1' => 'hostid',
-					'dstfrm' => 'zbx_filter',
-					'dstfld1' => 'filter_hostids_',
-					'monitored_hosts' => true,
-					'with_monitored_items' => true
-				]
-			]
-		]))->setWidth(ZBX_TEXTAREA_FILTER_STANDARD_WIDTH)
-	);
-
-$filter_column_right = (new CFormList())
-	->addRow(_('Tags'),
-		CTagFilterFieldHelper::getTagFilterField([
-			'evaltype' => $data['filter']['evaltype'],
-			'tags' => $data['filter']['tags']
-		])
-	)
-	->addRow(_('Show suppressed problems'),
-		(new CCheckBox('show_suppressed'))->setChecked(
-			$data['filter']['show_suppressed'] == ZBX_PROBLEM_SUPPRESSED_TRUE
-		)
-	);
-
-(new CFilter())
-	->setResetUrl((new CUrl('overview.php'))->setArgument('type', SHOW_DATA))
-	->addVar('type', SHOW_DATA)
-	->addFilterTab(_('Filter'), [$filter_column_left, $filter_column_right])
-	->setProfile($data['profileIdx'])
-	->setActiveTab($data['active_tab'])
-	->show();
diff --git a/ui/app/partials/common.filter.trigger.php b/ui/app/partials/common.filter.trigger.php
deleted file mode 100644
index b1e407811ed..00000000000
--- a/ui/app/partials/common.filter.trigger.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/*
-** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**/
-
-
-/**
- * @var CPartial $this
- */
-
-$inventory_fields = [];
-foreach (getHostInventories() as $inventory) {
-	$inventory_fields[$inventory['db_field']] = $inventory['title'];
-}
-
-$this->includeJsFile('common.filter.trigger.js.php', ['inventory_fields' => $inventory_fields]);
-
-$filterForm = (new CFilter())
-	->setResetUrl((new CUrl('overview.php'))->setArgument('type', SHOW_TRIGGERS))
-	->addVar('type', SHOW_TRIGGERS)
-	->setProfile($data['profileIdx'])
-	->setActiveTab($data['active_tab']);
-
-$severityNames = [];
-for ($severity = TRIGGER_SEVERITY_NOT_CLASSIFIED; $severity < TRIGGER_SEVERITY_COUNT; $severity++) {
-	$severityNames[] = CSeverityHelper::getName($severity);
-}
-
-$column1 = (new CFormList())
-	->addRow(_('Show'),
-		(new CRadioButtonList('show_triggers', (int) $data['filter']['showTriggers']))
-			->addValue(_('Recent problems'), TRIGGERS_OPTION_RECENT_PROBLEM)
-			->addValue(_('Problems'), TRIGGERS_OPTION_IN_PROBLEM)
-			->addValue(_('Any'), TRIGGERS_OPTION_ALL)
-			->setModern(true)
-	)
-	->addRow((new CLabel(_('Host groups'), 'filter_groupids__ms')),
-		(new CMultiSelect([
-			'multiple' => true,
-			'name' => 'filter_groupids[]',
-			'object_name' => 'hostGroup',
-			'data' => $data['filter']['groups'],
-			'popup' => [
-				'parameters' => [
-					'srctbl' => 'host_groups',
-					'srcfld1' => 'groupid',
-					'dstfrm' => 'zbx_filter',
-					'dstfld1' => 'filter_groupids_',
-					'with_monitored_triggers' => true,
-					'enrich_parent_groups' => true
-				]
-			]
-		]))->setWidth(ZBX_TEXTAREA_FILTER_STANDARD_WIDTH)
-	)
-	->addRow((new CLabel(_('Hosts'), 'filter_hostids__ms')),
-		(new CMultiSelect([
-			'name' => 'filter_hostids[]',
-			'object_name' => 'hosts',
-			'data' => $data['filter']['hosts'],
-			'popup' => [
-				'filter_preselect_fields' => [
-					'hostgroups' => 'filter_groupids_'
-				],
-				'parameters' => [
-					'srctbl' => 'hosts',
-					'srcfld1' => 'hostid',
-					'dstfrm' => 'zbx_filter',
-					'dstfld1' => 'filter_hostids_',
-					'monitored_hosts' => true,
-					'with_monitored_triggers' => true
-				]
-			]
-		]))->setWidth(ZBX_TEXTAREA_FILTER_STANDARD_WIDTH)
-	);
-
-
-$statusChangeDays = (new CNumericBox('status_change_days', $data['filter']['statusChangeDays'], 3, false, false, false))
-	->setWidth(ZBX_TEXTAREA_NUMERIC_STANDARD_WIDTH);
-
-if (!$data['filter']['statusChange']) {
-	$statusChangeDays->setAttribute('disabled', 'disabled');
-}
-
-$column1
-	->addRow(_('Name'),
-		(new CTextBox('txt_select', $data['filter']['txtSelect']))->setWidth(ZBX_TEXTAREA_FILTER_STANDARD_WIDTH)
-	)
-	->addRow(new CLabel(_('Minimum severity'), 'label-show-severity'),
-		(new CSelect('show_severity'))
-			->setFocusableElementId('label-show-severity')
-			->setValue($data['filter']['showSeverity'])
-			->addOptions(CSelect::createOptionsFromArray($severityNames))
-	)
-	->addRow(_('Age less than'), [
-		(new CCheckBox('status_change'))
-			->setChecked($data['filter']['statusChange'] == 1)
-			->onClick('javascript: jQuery("#status_change_days").prop("disabled", !this.checked)'),
-		(new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN),
-		$statusChangeDays,
-		(new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN),
-		_('days')
-	]);
-
-// inventory filter
-$inventoryFilters = $data['filter']['inventory'];
-if (!$inventoryFilters) {
-	$inventoryFilters = [
-		['field' => '', 'value' => '']
-	];
-}
-
-$inventoryFilterTable = new CTable();
-$inventoryFilterTable->setId('inventory-filter');
-$i = 0;
-foreach ($inventoryFilters as $field) {
-	$inventoryFilterTable->addRow([
-		(new CSelect('inventory['.$i.'][field]'))
-			->setValue($field['field'])
-			->addOptions(CSelect::createOptionsFromArray($inventory_fields)),
-		(new CTextBox('inventory['.$i.'][value]', $field['value']))->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH),
-		(new CCol(
-			(new CButton('inventory['.$i.'][remove]', _('Remove')))
-				->addClass(ZBX_STYLE_BTN_LINK)
-				->addClass('element-table-remove')
-		))->addClass(ZBX_STYLE_NOWRAP)
-	], 'form_row');
-
-	$i++;
-}
-$inventoryFilterTable->addRow(
-	(new CCol(
-		(new CButton('inventory_add', _('Add')))
-			->addClass(ZBX_STYLE_BTN_LINK)
-			->addClass('element-table-add')
-	))->setColSpan(2)
-);
-
-$column2 = (new CFormList())
-	->addRow(_('Host inventory'), $inventoryFilterTable)
-	->addRow(_('Tags'),
-		CTagFilterFieldHelper::getTagFilterField([
-			'evaltype' => $data['filter']['evaltype'],
-			'tags' => $data['filter']['tags']
-		])
-	)
-	->addRow(_('Show unacknowledged only'),
-		(new CCheckBox('ack_status'))
-			->setChecked($data['filter']['ackStatus'] == 1)
-			->setUncheckedValue(0)
-	)
-	->addRow(_('Show suppressed problems'),
-		(new CCheckBox('show_suppressed'))
-			->setChecked($data['filter']['show_suppressed'] == ZBX_PROBLEM_SUPPRESSED_TRUE)
-	);
-
-$filterForm->addFilterTab(_('Filter'), [$column1, $column2]);
-
-$filterForm->show();
diff --git a/ui/app/partials/js/common.filter.trigger.js.php b/ui/app/partials/js/common.filter.trigger.js.php
deleted file mode 100644
index faeb1af6265..00000000000
--- a/ui/app/partials/js/common.filter.trigger.js.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/*
-** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**/
-
-
-/**
- * @var CPartial $this
- */
-?>
-
-<script type="text/x-jquery-tmpl" id="inventory-filter-row">
-	<?=
-		(new CRow([
-			(new CSelect('inventory[#{rowNum}][field]'))
-				->addOptions(CSelect::createOptionsFromArray($data['inventory_fields'])),
-			(new CTextBox('inventory[#{rowNum}][value]', ''))->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH),
-			(new CCol(
-				(new CButton('inventory[#{rowNum}][remove]', _('Remove')))
-					->addClass(ZBX_STYLE_BTN_LINK)
-					->addClass('element-table-remove')
-			))->addClass(ZBX_STYLE_NOWRAP)
-		]))
-	?>
-</script>
-
-<script type="text/x-jquery-tmpl" id="filter-tag-row-tmpl">
-	<?= CTagFilterFieldHelper::getTemplate(); ?>
-</script>
-
-<script type="text/javascript">
-	(function($) {
-		$(function() {
-			$('#inventory-filter').dynamicRows({ template: '#inventory-filter-row' });
-
-			$('#filter-tags')
-				.dynamicRows({ template: '#filter-tag-row-tmpl' })
-				.on('afteradd.dynamicRows', function() {
-					var rows = this.querySelectorAll('.form_row');
-					new CTagFilterItem(rows[rows.length - 1]);
-			});
-
-			// Init existing fields once loaded.
-			document.querySelectorAll('#filter-tags .form_row').forEach(row => {
-				new CTagFilterItem(row);
-			});
-		});
-	})(jQuery);
-</script>
diff --git a/ui/app/partials/monitoring.problem.filter.php b/ui/app/partials/monitoring.problem.filter.php
index b47002b831c..afc13cd925b 100644
--- a/ui/app/partials/monitoring.problem.filter.php
+++ b/ui/app/partials/monitoring.problem.filter.php
@@ -451,7 +451,7 @@ if (array_key_exists('render_html', $data)) {
 			}
 		});
 
-		// Show timeline default value is checked and it will be rendered in template therefore initalize if unchecked.
+		// Show timeline default value is checked and it will be rendered in template therefore initialize if unchecked.
 		$('[name="show_timeline"][unchecked-value="' + data['show_timeline'] + '"]', container).removeAttr('checked');
 
 		// Severities checkboxes.
diff --git a/ui/app/partials/monitoring.service.list.edit.php b/ui/app/partials/monitoring.service.list.edit.php
index 0737f26c956..949eee9801b 100644
--- a/ui/app/partials/monitoring.service.list.edit.php
+++ b/ui/app/partials/monitoring.service.list.edit.php
@@ -81,19 +81,19 @@ foreach ($data['services'] as $serviceid => $service) {
 
 	$root_cause = [];
 
-	foreach ($data['events'][$serviceid] as $event) {
+	foreach (array_slice($service['problem_events'], 0, $data['max_in_table']) as $problem_event) {
 		if ($root_cause) {
 			$root_cause[] = ', ';
 		}
 
-		$root_cause[] = $data['can_monitor_problems']
-			? new CLink($event['name'],
+		$root_cause[] = $data['can_monitor_problems'] && $problem_event['triggerid'] !== null
+			? new CLink($problem_event['name'],
 				(new CUrl('zabbix.php'))
 					->setArgument('action', 'problem.view')
 					->setArgument('filter_name', '')
-					->setArgument('triggerids', [$event['objectid']])
+					->setArgument('triggerids', [$problem_event['triggerid']])
 			)
-			: $event['name'];
+			: $problem_event['name'];
 	}
 
 	$table->addRow(new CRow(array_merge($row, [
diff --git a/ui/app/partials/monitoring.service.list.php b/ui/app/partials/monitoring.service.list.php
index 9d3ffd5cb88..6c22fbbc977 100644
--- a/ui/app/partials/monitoring.service.list.php
+++ b/ui/app/partials/monitoring.service.list.php
@@ -77,19 +77,19 @@ foreach ($data['services'] as $serviceid => $service) {
 
 	$root_cause = [];
 
-	foreach ($data['events'][$serviceid] as $event) {
+	foreach (array_slice($service['problem_events'], 0, $data['max_in_table']) as $problem_event) {
 		if ($root_cause) {
 			$root_cause[] = ', ';
 		}
 
-		$root_cause[] = $data['can_monitor_problems']
-			? new CLink($event['name'],
+		$root_cause[] = $data['can_monitor_problems'] && $problem_event['triggerid'] !== null
+			? new CLink($problem_event['name'],
 				(new CUrl('zabbix.php'))
 					->setArgument('action', 'problem.view')
 					->setArgument('filter_name', '')
-					->setArgument('triggerids', [$event['objectid']])
+					->setArgument('triggerids', [$problem_event['triggerid']])
 			)
-			: $event['name'];
+			: $problem_event['name'];
 	}
 
 	$table->addRow(new CRow(array_merge($row, [
diff --git a/ui/app/partials/scheduledreport.subscription.php b/ui/app/partials/scheduledreport.subscription.php
index 26c60aa6de9..f385bf9f605 100644
--- a/ui/app/partials/scheduledreport.subscription.php
+++ b/ui/app/partials/scheduledreport.subscription.php
@@ -30,8 +30,8 @@ $table = (new CTable())
 	->addStyle('width: 100%;')
 	->setAriaRequired()
 	->setHeader([
-		(new CColHeader(_('Recipient')))->setWidth('40%'),
-		(new CColHeader(_('Generate report by')))->setWidth('35%'),
+		(new CColHeader(_('Recipient')))->setWidth('38%'),
+		(new CColHeader(_('Generate report by')))->setWidth('30%'),
 		_('Status'),
 		_('Action')
 	])
diff --git a/ui/app/partials/service.statusrule.row.php b/ui/app/partials/service.statusrule.row.php
deleted file mode 100644
index d1e74721526..00000000000
--- a/ui/app/partials/service.statusrule.row.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php declare(strict_types = 1);
-/*
-** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**/
-
-
-/**
- * @var CPartial $this
- */
-
-(new CRow([
-	[
-		CServiceHelper::formatStatusRuleType((int) $data['type'], (int) $data['new_status'], (int) $data['limit_value'],
-			(int) $data['limit_status']
-		),
-		new CVar('status_rules['.$data['row_index'].'][new_status]', $data['new_status']),
-		new CVar('status_rules['.$data['row_index'].'][type]', $data['type']),
-		// (int) required to preprocess user input like "000123" to 123.
-		new CVar('status_rules['.$data['row_index'].'][limit_value]', (int) $data['limit_value']),
-		new CVar('status_rules['.$data['row_index'].'][limit_status]', $data['limit_status'])
-	],
-	new CHorList([
-		(new CSimpleButton(_('Edit')))
-			->addClass(ZBX_STYLE_BTN_LINK)
-			->addClass('js-edit'),
-		(new CSimpleButton(_('Remove')))
-			->addClass(ZBX_STYLE_BTN_LINK)
-			->addClass('js-remove')
-	])
-]))
-	->setAttribute('data-row_index', $data['row_index'])
-	->show();
diff --git a/ui/app/partials/service.time.row.php b/ui/app/partials/service.time.row.php
deleted file mode 100644
index 37f41b6b8cc..00000000000
--- a/ui/app/partials/service.time.row.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php declare(strict_types = 1);
-/*
-** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**/
-
-
-/**
- * @var CPartial $this
- */
-
-switch ($data['type']) {
-	case SERVICE_TIME_TYPE_UPTIME:
-		$type = (new CSpan(_('Uptime')))->addClass('enabled');
-		$from = dowHrMinToStr($data['ts_from']);
-		$till = dowHrMinToStr($data['ts_to'], true);
-		break;
-
-	case SERVICE_TIME_TYPE_DOWNTIME:
-		$type = (new CSpan(_('Downtime')))->addClass('disabled');
-		$from = dowHrMinToStr($data['ts_from']);
-		$till = dowHrMinToStr($data['ts_to'], true);
-		break;
-
-	case SERVICE_TIME_TYPE_ONETIME_DOWNTIME:
-		$type = (new CSpan(_('One-time downtime')))->addClass('disabled');
-		$from = zbx_date2str(DATE_TIME_FORMAT, $data['ts_from']);
-		$till = zbx_date2str(DATE_TIME_FORMAT, $data['ts_to']);
-		break;
-}
-
-(new CRow([
-	[
-		$type,
-		new CVar('times['.$data['row_index'].'][type]', $data['type']),
-		new CVar('times['.$data['row_index'].'][ts_from]', $data['ts_from']),
-		new CVar('times['.$data['row_index'].'][ts_to]', $data['ts_to']),
-		new CVar('times['.$data['row_index'].'][note]', $data['note'])
-	],
-	$from.' - '.$till,
-	(new CCol($data['note']))
-		->addClass(ZBX_STYLE_WORDWRAP)
-		->addStyle('max-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;'),
-	new CHorList([
-		(new CSimpleButton(_('Edit')))
-			->addClass(ZBX_STYLE_BTN_LINK)
-			->addClass('js-edit'),
-		(new CSimpleButton(_('Remove')))
-			->addClass(ZBX_STYLE_BTN_LINK)
-			->addClass('js-remove')
-	])
-]))
-	->setAttribute('data-row_index', $data['row_index'])
-	->show();
diff --git a/ui/app/views/administration.image.edit.php b/ui/app/views/administration.image.edit.php
index bd1e68b3859..418f323921e 100644
--- a/ui/app/views/administration.image.edit.php
+++ b/ui/app/views/administration.image.edit.php
@@ -49,7 +49,7 @@ $form_list = (new CFormList('imageFormList'))
 			->setAriaRequired()
 	)
 	->addRow(
-		(new CLabel(_('Upload'), 'image'))->setAsteriskMark(),
+		(new CLabel(_('Upload'), 'image'))->setAsteriskMark($data['imageid'] == 0),
 		(new CFile('image'))
 			->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
 			->setAriaRequired()
diff --git a/ui/app/views/administration.image.list.php b/ui/app/views/administration.image.list.php
index 3cd68886e3c..b2c161e2390 100644
--- a/ui/app/views/administration.image.list.php
+++ b/ui/app/views/administration.image.list.php
@@ -85,16 +85,20 @@ else {
 	foreach ($data['images'] as $image) {
 		$img = ($image['imagetype'] == IMAGE_TYPE_BACKGROUND)
 			? new CLink(
-				new CImg('imgstore.php?width=200&height=200&iconid='.$image['imageid'], 'no image'),
+				(new CImg('#', 'no image'))
+					->setAttribute('data-src', 'imgstore.php?width=200&height=200&iconid='.$image['imageid'])
+					->addStyle('display: none;'),
 				'image.php?imageid='.$image['imageid']
 			)
-			: new CImg('imgstore.php?iconid='.$image['imageid'], 'no image');
+			: (new CImg('#', 'no image'))->setAttribute('data-src', 'imgstore.php?iconid='.$image['imageid'])
+				->addStyle('display: none;');
 
 		$edit_url->setArgument('imageid', $image['imageid']);
 
 		$image_row->addItem(
 			(new CDiv())
 				->addClass(ZBX_STYLE_CELL)
+				->addClass('lazyload-image')
 				->addItem([$img, BR(), new CLink($image['name'], $edit_url->getUrl())])
 		);
 
@@ -116,3 +120,11 @@ else {
 }
 
 $widget->show();
+
+(new CScriptTag('
+	view.init('.json_encode([
+		'load_images' => count($data['images'])
+	]).');
+'))
+	->setOnDocumentReady()
+	->show();
diff --git a/ui/app/views/administration.mediatype.edit.php b/ui/app/views/administration.mediatype.edit.php
index 60cff32167a..d6d94b09f2e 100644
--- a/ui/app/views/administration.mediatype.edit.php
+++ b/ui/app/views/administration.mediatype.edit.php
@@ -228,7 +228,7 @@ $mediatype_formlist
 			->setAriaRequired(),
 		'row_webhook_script'
 	)
-	->addRow(new CLabel(_('Timeout'), 'timeout'),
+	->addRow((new CLabel(_('Timeout'), 'timeout'))->setAsteriskMark(),
 		(new CTextBox('timeout', $data['timeout']))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH),
 		'row_webhook_timeout'
 	)
diff --git a/ui/app/views/configuration.correlation.edit.php b/ui/app/views/configuration.correlation.edit.php
index 47a2cff833e..b1d16035cb6 100644
--- a/ui/app/views/configuration.correlation.edit.php
+++ b/ui/app/views/configuration.correlation.edit.php
@@ -71,7 +71,7 @@ if ($data['conditions']) {
 			continue;
 		}
 
-		$label = isset($condition['formulaid']) ? $condition['formulaid'] : num2letter($i);
+		$label = ($data['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) ? $condition['formulaid'] : num2letter($i);
 
 		$labelSpan = (new CSpan($label))
 			->addClass('label')
@@ -80,7 +80,7 @@ if ($data['conditions']) {
 
 		$condition_table->addRow([
 				$labelSpan,
-				(new CCol(getCorrConditionDescription($condition, $data['group_names'])))
+				(new CCol(CCorrelationHelper::getConditionDescription($condition, $data['group_names'])))
 					->addClass(ZBX_STYLE_TABLE_FORMS_OVERFLOW_BREAK),
 				(new CCol([
 					(new CButton('remove', _('Remove')))
@@ -134,7 +134,9 @@ $form_list
 
 $form_list
 	->addRow(_('Description'),
-		(new CTextArea('description', $data['description']))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
+		(new CTextArea('description', $data['description']))
+			->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
+			->setMaxlength(DB::getFieldLength('hosts', 'description'))
 	)
 	->addRow(
 		_('Operations'),
diff --git a/ui/app/views/configuration.correlation.list.php b/ui/app/views/configuration.correlation.list.php
index 11546b618da..bdf2e1db8a2 100644
--- a/ui/app/views/configuration.correlation.list.php
+++ b/ui/app/views/configuration.correlation.list.php
@@ -93,14 +93,14 @@ if ($data['correlations']) {
 				$condition['operator'] = CONDITION_OPERATOR_EQUAL;
 			}
 
-			$conditions[] = getCorrConditionDescription($condition, $data['group_names']);
+			$conditions[] = CCorrelationHelper::getConditionDescription($condition, $data['group_names']);
 			$conditions[] = BR();
 		}
 
 		CArrayHelper::sort($correlation['operations'], ['type']);
 
 		foreach ($correlation['operations'] as $operation) {
-			$operations[] = getCorrOperationDescription($operation);
+			$operations[] = CCorrelationHelper::getOperationTypes()[$operation['type']];
 			$operations[] = BR();
 		}
 
diff --git a/ui/app/views/js/administration.image.list.js.php b/ui/app/views/js/administration.image.list.js.php
index 9decd592c47..228594a2fc3 100644
--- a/ui/app/views/js/administration.image.list.js.php
+++ b/ui/app/views/js/administration.image.list.js.php
@@ -25,7 +25,34 @@
 ?>
 
 <script>
-	$(() => {
-		$('#imagetype').on('change', (e) => redirect(e.target.value));
-	});
+	const view = {
+
+		async init({load_images}) {
+			document.getElementById('imagetype').addEventListener('change', (e) => {
+				redirect(e.target.value);
+			});
+
+			if (load_images) {
+				window.addEventListener('unhandledrejection', (e) => {
+					e.preventDefault();
+				});
+
+				for (const image of document.querySelectorAll('.adm-img img[data-src]')) {
+					await this.loadImage(image);
+				}
+			}
+		},
+
+		loadImage(image) {
+			return new Promise((resolve, reject) => {
+				image.onload = () => {
+					image.removeAttribute('data-src');
+					resolve(image);
+				};
+				image.onerror = reject;
+				image.src = image.dataset.src;
+				image.style = '';
+			});
+		}
+	};
 </script>
diff --git a/ui/app/views/js/administration.userrole.edit.js.php b/ui/app/views/js/administration.userrole.edit.js.php
index 3082d313aa4..0d04c88e2b3 100644
--- a/ui/app/views/js/administration.userrole.edit.js.php
+++ b/ui/app/views/js/administration.userrole.edit.js.php
@@ -81,7 +81,6 @@
 				CRoleHelper::UI_MONITORING_DASHBOARD => USER_TYPE_ZABBIX_USER,
 				CRoleHelper::UI_MONITORING_PROBLEMS => USER_TYPE_ZABBIX_USER,
 				CRoleHelper::UI_MONITORING_HOSTS => USER_TYPE_ZABBIX_USER,
-				CRoleHelper::UI_MONITORING_OVERVIEW => USER_TYPE_ZABBIX_USER,
 				CRoleHelper::UI_MONITORING_LATEST_DATA => USER_TYPE_ZABBIX_USER,
 				CRoleHelper::UI_MONITORING_MAPS => USER_TYPE_ZABBIX_USER,
 				CRoleHelper::UI_MONITORING_DISCOVERY => USER_TYPE_ZABBIX_ADMIN,
diff --git a/ui/app/views/js/configuration.correlation.edit.js.php b/ui/app/views/js/configuration.correlation.edit.js.php
index cdc43f1458f..865a1f3f904 100644
--- a/ui/app/views/js/configuration.correlation.edit.js.php
+++ b/ui/app/views/js/configuration.correlation.edit.js.php
@@ -47,7 +47,9 @@
 
 		jQuery('#evaltype').closest('li').toggle(labels.length > 1);
 		jQuery('#condition_label').toggle(!show_formula);
-		jQuery('#formula').toggle(show_formula);
+		jQuery('#formula')
+			.toggle(show_formula)
+			.prop('disabled', !show_formula);
 
 		if (labels.length > 1) {
 			var conditions = [];
diff --git a/ui/app/views/js/configuration.dashboard.edit.js.php b/ui/app/views/js/configuration.dashboard.edit.js.php
index 72732b6bd40..2a297ec1568 100644
--- a/ui/app/views/js/configuration.dashboard.edit.js.php
+++ b/ui/app/views/js/configuration.dashboard.edit.js.php
@@ -130,8 +130,8 @@
 
 			fetch(curl.getUrl(), {
 				method: 'POST',
-				headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-				body: urlEncodeData(request_data)
+				headers: {'Content-Type': 'application/json'},
+				body: JSON.stringify(request_data)
 			})
 				.then((response) => response.json())
 				.then((response) => {
diff --git a/ui/app/views/js/monitoring.dashboard.view.js.php b/ui/app/views/js/monitoring.dashboard.view.js.php
index 66a97af4fe7..4e8c00e35a3 100644
--- a/ui/app/views/js/monitoring.dashboard.view.js.php
+++ b/ui/app/views/js/monitoring.dashboard.view.js.php
@@ -191,8 +191,8 @@
 
 			fetch(curl.getUrl(), {
 				method: 'POST',
-				headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-				body: urlEncodeData(request_data)
+				headers: {'Content-Type': 'application/json'},
+				body: JSON.stringify(request_data)
 			})
 				.then((response) => response.json())
 				.then((response) => {
@@ -256,7 +256,7 @@
 		},
 
 		events: {
-			addClick: (e) => {
+			addClick(e) {
 				const menu = [
 					{
 						items: [
@@ -300,7 +300,7 @@
 				});
 			},
 
-			beforeUnload: (e) => {
+			beforeUnload(e) {
 				if (ZABBIX.Dashboard.isUnsaved()) {
 					// Display confirmation message.
 					e.preventDefault();
@@ -308,7 +308,7 @@
 				}
 			},
 
-			popState: (e) => {
+			popState(e) {
 				const host = (e.state !== null && 'host' in e.state) ? e.state.host : null;
 
 				jQuery('#dynamic_hostid').multiSelect('addData', host ? [host] : [], false);
@@ -316,7 +316,7 @@
 				ZABBIX.Dashboard.setDynamicHost(host ? host.id : null);
 			},
 
-			dynamicHostChange: () => {
+			dynamicHostChange() {
 				const hosts = jQuery('#dynamic_hostid').multiSelect('getData');
 				const host = hosts.length ? hosts[0] : null;
 				const curl = new Curl('zabbix.php', false);
@@ -343,7 +343,7 @@
 				updateUserProfile('web.dashboard.hostid', host ? host.id : 1);
 			},
 
-			applyProperties: () => {
+			applyProperties() {
 				const dashboard_data = ZABBIX.Dashboard.getData();
 
 				document.getElementById('<?= ZBX_STYLE_PAGE_TITLE ?>').textContent = dashboard_data.name;
diff --git a/ui/app/views/js/monitoring.host.view.js.php b/ui/app/views/js/monitoring.host.view.js.php
index bf0948d707b..f86a730fd2d 100644
--- a/ui/app/views/js/monitoring.host.view.js.php
+++ b/ui/app/views/js/monitoring.host.view.js.php
@@ -29,28 +29,29 @@
 		function hostPage() {
 			let filter_options = <?= json_encode($data['filter_options']) ?>;
 
-			this.refresh_url = '<?= $data['refresh_url'] ?>';
+			this.refresh_url = new Curl('<?= $data['refresh_url'] ?>', false);
 			this.refresh_interval = <?= $data['refresh_interval'] ?>;
 			this.running = false;
 			this.timeout = null;
 			this.deferred = null;
 
+			const url = new Curl('zabbix.php', false);
+			url.setArgument('action', 'host.view.refresh');
+			this.refresh_simple_url = url.getUrl();
+
 			if (filter_options) {
 				this.refresh_counters = this.createCountersRefresh(1);
 				this.filter = new CTabFilter($('#monitoring_hosts_filter')[0], filter_options);
 				this.filter.on(TABFILTER_EVENT_URLSET, (ev) => {
-					let url = new Curl('', false);
+					this.refresh_url = new Curl('', false);
 
-					url.setArgument('action', 'host.view.refresh');
-					this.refresh_url = url.getUrl();
 					this.unscheduleRefresh();
 					this.refresh();
 
 					var filter_item = this.filter._active_item;
 
 					if (this.filter._active_item.hasCounter()) {
-						$.post('zabbix.php', {
-							action: 'host.view.refresh',
+						$.post(this.refresh_simple_url, {
 							filter_counters: 1,
 							counter_index: filter_item._index
 						}).done((json) => {
@@ -73,8 +74,7 @@
 				return setTimeout(() => this.getFiltersCounters(), timeout);
 			},
 			getFiltersCounters: function() {
-				return $.post('zabbix.php', {
-						action: 'host.view.refresh',
+				return $.post(this.refresh_simple_url, {
 						filter_counters: 1
 					}).done((json) => {
 						if (json.filter_counters) {
@@ -98,7 +98,23 @@
 			refresh: function() {
 				this.setLoading();
 
-				this.deferred = $.getJSON(this.refresh_url);
+				const params = this.refresh_url.getArgumentsObject();
+				const exclude = ['action', 'filter_src', 'filter_show_counter', 'filter_custom_time', 'filter_name'];
+				const post_data = Object.keys(params)
+					.filter(key => !exclude.includes(key))
+					.reduce((post_data, key) => {
+						post_data[key] = (typeof params[key] === 'object')
+							? [...params[key]].filter(i => i)
+							: params[key];
+						return post_data;
+					}, {});
+
+				this.deferred = $.ajax({
+					url: this.refresh_simple_url,
+					data: post_data,
+					type: 'post',
+					dataType: 'json'
+				});
 
 				return this.bindDataEvents(this.deferred);
 			},
diff --git a/ui/app/views/js/monitoring.latest.view.js.php b/ui/app/views/js/monitoring.latest.view.js.php
index 8ec934b8827..c173de83b2d 100644
--- a/ui/app/views/js/monitoring.latest.view.js.php
+++ b/ui/app/views/js/monitoring.latest.view.js.php
@@ -31,6 +31,7 @@
 <script type="text/javascript">
 	function latestPage() {
 		this.refresh_url = '<?= $data['refresh_url'] ?>';
+		this.refresh_data = <?= json_encode($data['refresh_data']) ?>;
 		this.refresh_interval = <?= $data['refresh_interval'] ?>;
 		this.running = false;
 		this.timeout = null;
@@ -51,7 +52,12 @@
 	latestPage.prototype.refresh = function() {
 		this.setLoading();
 
-		var deferred = $.getJSON(this.refresh_url);
+		var deferred = $.ajax({
+			url: this.refresh_url,
+			data: this.refresh_data,
+			type: 'post',
+			dataType: 'json'
+		});
 
 		return this.bindDataEvents(deferred);
 	};
diff --git a/ui/app/views/js/monitoring.problem.view.js.php b/ui/app/views/js/monitoring.problem.view.js.php
index c5255761fa3..87ebf5d022a 100644
--- a/ui/app/views/js/monitoring.problem.view.js.php
+++ b/ui/app/views/js/monitoring.problem.view.js.php
@@ -29,7 +29,6 @@ if (array_key_exists('filter_options', $data)) { ?>
 		var options = <?= json_encode($data['filter_options']) ?>,
 			filter = new CTabFilter($('#monitoring_problem_filter')[0], options),
 			refresh_interval = <?= $data['refresh_interval'] ?>,
-			refresh_url = '<?= $data['refresh_url'] ?>',
 			refresh_timer,
 			filter_item,
 			filter_counter_fetch,
@@ -39,6 +38,10 @@ if (array_key_exists('filter_options', $data)) { ?>
 				to: options.timeselector.to
 			};
 
+		const url = new Curl('zabbix.php', false);
+		url.setArgument('action', 'problem.view.refresh');
+		const refresh_url = url.getUrl();
+
 		/**
 		 * Update on filter changes.
 		 */
@@ -205,11 +208,7 @@ if (array_key_exists('filter_options', $data)) { ?>
 		$(document).on('submit', '#problem_form', function(e) {
 			e.preventDefault();
 
-			var eventids = $('[id^="eventids_"]:checked', $(this)).map(function() {
-					return $(this).val();
-				}).get();
-
-			acknowledgePopUp({eventids: eventids}, this);
+			acknowledgePopUp({eventids: chkbxRange.selectedIds}, this);
 		});
 	});
 </script>
diff --git a/ui/app/views/js/popup.dashboard.share.edit.js.php b/ui/app/views/js/popup.dashboard.share.edit.js.php
index 3831a99741b..c69d956c67e 100644
--- a/ui/app/views/js/popup.dashboard.share.edit.js.php
+++ b/ui/app/views/js/popup.dashboard.share.edit.js.php
@@ -58,8 +58,8 @@ window.dashboard_share_edit_popup = {
 
 		fetch(curl.getUrl(), {
 			method: 'POST',
-			headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-			body: urlEncodeData(getFormFields(form))
+			headers: {'Content-Type': 'application/json'},
+			body: JSON.stringify(getFormFields(form))
 		})
 			.then((response) => response.json())
 			.then((response) => {
@@ -129,7 +129,7 @@ window.dashboard_share_edit_popup = {
 					break;
 
 				case 'usrgrpid':
-					if (document.getElementById(`user-group-shares_${value.usrgrpid}`) !== null) {
+					if (document.getElementById(`user-group-shares-${value.usrgrpid}`) !== null) {
 						continue;
 					}
 
diff --git a/ui/app/views/js/popup.service.edit.js.php b/ui/app/views/js/popup.service.edit.js.php
index 37923d331cc..1e02ce48fb4 100644
--- a/ui/app/views/js/popup.service.edit.js.php
+++ b/ui/app/views/js/popup.service.edit.js.php
@@ -25,54 +25,46 @@
 ?>
 
 window.service_edit_popup = {
-	algorithm_names: <?= json_encode(CServiceHelper::getAlgorithmNames(), JSON_FORCE_OBJECT) ?>,
-
+	status_rule_template: null,
+	time_template: null,
+	uptime_template: null,
+	downtime_template: null,
+	onetime_downtime_template: null,
 	child_template: null,
+
 	serviceid: null,
+	children: new Map(),
+
+	algorithm_names: null,
+	search_limit: null,
+
 	overlay: null,
 	dialogue: null,
 	form: null,
 
-	init({serviceid, children, children_problem_tags_html, problem_tags}) {
-		this.child_template = new Template(`
-			<tr>
-				<td class="<?= ZBX_STYLE_WORDWRAP ?>" style="max-width: <?= ZBX_TEXTAREA_BIG_WIDTH ?>px;">
-					#{name}
-					<input name="child_serviceids[#{serviceid}]" type="hidden" value="#{serviceid}">
-				</td>
-				<td>#{algorithm}</td>
-				<td class="<?= ZBX_STYLE_WORDWRAP ?>">#{*problem_tags_html}</td>
-				<td>
-					<button type="button" class="<?= ZBX_STYLE_BTN_LINK ?> js-remove"><?= _('Remove') ?></button>
-				</td>
-			</tr>
-		`);
+	init({serviceid, children, children_problem_tags_html, problem_tags, status_rules, service_times, algorithm_names,
+			search_limit}) {
+		this.initTemplates();
 
 		this.serviceid = serviceid;
+
+		this.algorithm_names = algorithm_names;
+		this.search_limit = search_limit;
+
 		this.overlay = overlays_stack.getById('service_edit');
 		this.dialogue = this.overlay.$dialogue[0];
 		this.form = this.overlay.$dialogue.$body[0].querySelector('form');
 
-		// Setup Tabs.
-
-		const $tabs = $('#tabs');
-
-		$tabs.tabs();
-		$tabs.on('tabsactivate', () => {
-			$tabs.resize();
-		});
-
-		// Add custom Select button for Parent services.
+		for (const status_rule of status_rules) {
+			this.addStatusRule(status_rule);
+		}
 
-		jQuery('#parent_serviceids_')
-			.multiSelect('getSelectButton')
-			.addEventListener('click', () => {
-				this.selectParents();
-			});
+		for (const service_time of service_times) {
+			this.addTime(service_time);
+		}
 
-		// Fill-in current Child services.
 		for (const service of children) {
-			this.addChild({
+			this.children.set(service.serviceid, {
 				serviceid: service.serviceid,
 				name: service.name,
 				algorithm: service.algorithm,
@@ -80,7 +72,13 @@ window.service_edit_popup = {
 			});
 		}
 
-		// Setup Tags.
+		this.filterChildren();
+
+		jQuery('#parent_serviceids_')
+			.multiSelect('getSelectButton')
+			.addEventListener('click', () => {
+				this.selectParents();
+			});
 
 		const $tags = jQuery(document.getElementById('tags-table'));
 
@@ -99,14 +97,18 @@ window.service_edit_popup = {
 				.addEventListener('change', () => this.update());
 		}
 
-		this.update();
-
 		// Setup Problem tags.
-		jQuery(document.getElementById('problem_tags')).dynamicRows({
+		const $problem_tags = jQuery(document.getElementById('problem_tags'));
+
+		$problem_tags.dynamicRows({
 			template: '#problem-tag-row-tmpl',
 			rows: problem_tags
 		});
 
+		$problem_tags.on('tableupdate.dynamicRows', () => this.update());
+
+		document.getElementById('problem_tags').addEventListener('change', () => this.update());
+
 		// Setup Service rules.
 		document
 			.getElementById('status_rules')
@@ -139,15 +141,103 @@ window.service_edit_popup = {
 
 		// Setup Child services.
 		document
+			.getElementById('children-filter')
+			.addEventListener('click', (e) => {
+				if (e.target.classList.contains('js-filter')) {
+					this.filterChildren();
+				}
+				else if (e.target.classList.contains('js-reset')) {
+					document.getElementById('children-filter-name').value = '';
+					this.filterChildren();
+				}
+			});
+
+		document
+			.getElementById('children-filter-name')
+			.addEventListener('keypress', (e) => {
+				if (e.key === 'Enter') {
+					this.filterChildren();
+					e.preventDefault();
+				}
+			}, {passive: false});
+
+		document
 			.getElementById('children')
 			.addEventListener('click', (e) => {
 				if (e.target.classList.contains('js-add')) {
 					this.selectChildren();
 				}
 				else if (e.target.classList.contains('js-remove')) {
-					e.target.closest('tr').remove();
+					this.removeChild(e.target.closest('tr').dataset.serviceid);
 				}
 			});
+
+		this.update();
+	},
+
+	initTemplates() {
+		this.status_rule_template = new Template(`
+			<tr data-row_index="#{row_index}">
+				<td>
+					#{*name}
+					<input type="hidden" id="status_rules_#{row_index}_new_status" name="status_rules[#{row_index}][new_status]" value="#{new_status}">
+					<input type="hidden" id="status_rules_#{row_index}_type" name="status_rules[#{row_index}][type]" value="#{type}">
+					<input type="hidden" id="status_rules_#{row_index}_limit_value" name="status_rules[#{row_index}][limit_value]" value="#{limit_value}">
+					<input type="hidden" id="status_rules_#{row_index}_limit_status" name="status_rules[#{row_index}][limit_status]" value="#{limit_status}">
+				</td>
+				<td>
+					<ul class="<?= ZBX_STYLE_HOR_LIST ?>">
+						<li>
+							<button type="button" class="<?= ZBX_STYLE_BTN_LINK ?> js-edit"><?= _('Edit') ?></button>
+						</li>
+						<li>
+							<button type="button" class="<?= ZBX_STYLE_BTN_LINK ?> js-remove"><?= _('Remove') ?></button>
+						</li>
+					</ul>
+				</td>
+			</tr>
+		`);
+
+		this.time_template = new Template(`
+			<tr data-row_index="#{row_index}">
+				<td>
+					#{*time_type}
+					<input type="hidden" id="times_#{row_index}_type" name="times[#{row_index}][type]" value="#{type}">
+					<input type="hidden" id="times_#{row_index}_ts_from" name="times[#{row_index}][ts_from]" value="#{ts_from}">
+					<input type="hidden" id="times_#{row_index}_ts_to" name="times[#{row_index}][ts_to]" value="#{ts_to}">
+					<input type="hidden" id="times_#{row_index}_note" name="times[#{row_index}][note]" value="#{note}">
+				</td>
+				<td>#{from} - #{till}</td>
+				<td class="wordwrap" style="max-width: 540px;"></td>
+				<td>
+					<ul class="<?= ZBX_STYLE_HOR_LIST ?>">
+						<li>
+							<button type="button" class="<?= ZBX_STYLE_BTN_LINK ?> js-edit"><?= _('Edit') ?></button>
+						</li>
+						<li>
+							<button type="button" class="<?= ZBX_STYLE_BTN_LINK ?> js-remove"><?= _('Remove') ?></button>
+						</li>
+					</ul>
+				</td>
+			</tr>
+		`);
+
+		this.uptime_template = `<span class="enabled"><?= _('Uptime') ?></span>`;
+
+		this.downtime_template = `<span class="disabled"><?= _('Downtime') ?></span>`;
+
+		this.onetime_downtime_template = `<span class="disabled"><?= _('One-time downtime') ?></span>`;
+
+		this.child_template = new Template(`
+			<tr data-serviceid="#{serviceid}">
+				<td class="<?= ZBX_STYLE_WORDWRAP ?>" style="max-width: <?= ZBX_TEXTAREA_BIG_WIDTH ?>px;">#{name}</td>
+				<td>#{algorithm}</td>
+				<td class="<?= ZBX_STYLE_WORDWRAP ?>">#{*problem_tags_html}</td>
+				<td>
+					<button type="button" class="<?= ZBX_STYLE_BTN_LINK ?> js-remove"><?= _('Remove') ?></button>
+				</td>
+			</tr>
+		`);
 	},
 
 	update() {
@@ -156,6 +246,26 @@ window.service_edit_popup = {
 		const status_enabled = document.getElementById('algorithm').value != <?= ZBX_SERVICE_STATUS_CALC_SET_OK ?>;
 		const showsla = document.getElementById('showsla').checked;
 
+		let has_problem_tags = false;
+
+		for (const problem_tag of document.querySelectorAll('#problem_tags .js-problem-tag-tag')) {
+			if (problem_tag.value !== '') {
+				has_problem_tags = true;
+
+				break;
+			}
+		}
+
+		document
+			.getElementById('problem_tags')
+			.querySelectorAll('.js-problem-tag-input, .element-table-remove, .element-table-add')
+			.forEach((element) => {
+				element.disabled = this.children.size > 0;
+			});
+
+		document.getElementById('algorithm-not-applicable-warning').style.display =
+			this.children.size > 0 ? 'none' : '';
+
 		document.getElementById('additional_rules_label').style.display = advanced_configuration ? '' : 'none';
 		document.getElementById('additional_rules_field').style.display = advanced_configuration ? '' : 'none';
 		document.getElementById('status_propagation_rules_label').style.display = advanced_configuration ? '' : 'none';
@@ -184,6 +294,8 @@ window.service_edit_popup = {
 
 		document.getElementById('showsla').disabled = !status_enabled;
 		document.getElementById('goodsla').disabled = !status_enabled || !showsla;
+
+		document.querySelector('#children .js-add').disabled = has_problem_tags;
 	},
 
 	editStatusRule(row = null) {
@@ -216,16 +328,11 @@ window.service_edit_popup = {
 		);
 
 		overlay.$dialogue[0].addEventListener('dialogue.submit', (e) => {
-			const new_row = e.detail;
-
 			if (row !== null) {
-				row.insertAdjacentHTML('afterend', new_row);
-				row.remove();
+				this.updateStatusRule(row, e.detail)
 			}
 			else {
-				document
-					.querySelector('#status_rules tbody')
-					.insertAdjacentHTML('beforeend', new_row);
+				this.addStatusRule(e.detail);
 			}
 		});
 	},
@@ -258,25 +365,55 @@ window.service_edit_popup = {
 		const overlay = PopUp('popup.service.time.edit', popup_params, 'service_time_edit', document.activeElement);
 
 		overlay.$dialogue[0].addEventListener('dialogue.submit', (e) => {
-			const new_row = e.detail;
-
 			if (row !== null) {
-				row.insertAdjacentHTML('afterend', new_row);
-				row.remove();
+				this.updateTime(row, e.detail)
 			}
 			else {
-				document
-					.querySelector('#times tbody')
-					.insertAdjacentHTML('beforeend', new_row);
+				this.addTime(e.detail);
 			}
 		});
 	},
 
-	addChild(service) {
-		if (document.querySelector(`#children tbody input[name="child_serviceids[${service.serviceid}]"]`) !== null) {
-			return;
+	addStatusRule(status_rule) {
+		document
+			.querySelector('#status_rules tbody')
+			.insertAdjacentHTML('beforeend', this.status_rule_template.evaluate(status_rule));
+	},
+
+	updateStatusRule(row, status_rule) {
+		row.insertAdjacentHTML('afterend', this.status_rule_template.evaluate(status_rule));
+		row.remove();
+	},
+
+	addTime(time) {
+		document
+			.querySelector('#times tbody')
+			.insertAdjacentHTML('beforeend', this.time_template.evaluate({
+				...time,
+				time_type: this.makeServiceTimeType(parseInt(time.type))
+			}));
+	},
+
+	updateTime(row, time) {
+		row.insertAdjacentHTML('afterend', this.time_template.evaluate({
+			...time,
+			time_type: this.makeServiceTimeType(parseInt(time.type))
+		}));
+		row.remove();
+	},
+
+	makeServiceTimeType(type) {
+		switch (type) {
+			case <?= SERVICE_TIME_TYPE_UPTIME ?>:
+				return this.uptime_template;
+			case <?= SERVICE_TIME_TYPE_DOWNTIME ?>:
+				return this.downtime_template;
+			case <?= SERVICE_TIME_TYPE_ONETIME_DOWNTIME ?>:
+				return this.onetime_downtime_template;
 		}
+	},
 
+	renderChild(service) {
 		document
 			.querySelector('#children tbody')
 			.insertAdjacentHTML('beforeend', this.child_template.evaluate({
@@ -287,6 +424,60 @@ window.service_edit_popup = {
 			}));
 	},
 
+	removeChild(serviceid) {
+		const child = this.form.querySelector(`#children tbody tr[data-serviceid="${serviceid}"]`);
+
+		if (child !== null) {
+			child.remove();
+		}
+
+		this.children.delete(serviceid);
+		this.updateChildrenFilterStats();
+		this.updateTabIndicator();
+		this.update();
+	},
+
+	filterChildren() {
+		const container = document.querySelector('#children tbody');
+
+		container.innerHTML = '';
+
+		const filter_name = document.getElementById('children-filter-name').value.toLowerCase();
+
+		let count = 0;
+
+		for (const service of this.children.values()) {
+			if (!service.name.toLowerCase().includes(filter_name)) {
+				continue;
+			}
+
+			this.renderChild(service);
+
+			if (++count == this.search_limit) {
+				break;
+			}
+		}
+
+		this.updateChildrenFilterStats();
+		this.updateTabIndicator();
+	},
+
+	updateChildrenFilterStats() {
+		const container = document.querySelector('#children tbody');
+
+		const stats_template = <?= json_encode(_('Displaying %1$s of %2$s found')) ?>;
+
+		document.querySelector('#children tfoot .inline-filter-stats').textContent = this.children.size > 0
+			? sprintf(stats_template, container.childElementCount, this.children.size)
+			: '';
+	},
+
+	updateTabIndicator() {
+		document
+			.querySelector('#children')
+			.setAttribute('data-tab-indicator', this.children.size);
+	},
+
 	selectChildren() {
 		const exclude_serviceids = [];
 
@@ -305,8 +496,15 @@ window.service_edit_popup = {
 
 		overlay.$dialogue[0].addEventListener('dialogue.submit', (e) => {
 			for (const service of e.detail) {
-				this.addChild(service);
+				if (!this.children.has(service.serviceid)) {
+					this.children.set(service.serviceid, service);
+					this.renderChild(service);
+				}
 			}
+
+			this.updateChildrenFilterStats();
+			this.updateTabIndicator();
+			this.update();
 		});
 	},
 
@@ -341,6 +539,7 @@ window.service_edit_popup = {
 		const fields = getFormFields(this.form);
 
 		fields.name = fields.name.trim();
+		fields.child_serviceids = [...this.children.keys()];
 
 		for (const el of this.form.parentNode.children) {
 			if (el.matches('.msg-good, .msg-bad, .msg-warning')) {
@@ -354,8 +553,8 @@ window.service_edit_popup = {
 
 		fetch(curl.getUrl(), {
 			method: 'POST',
-			headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-			body: urlEncodeData(fields)
+			headers: {'Content-Type': 'application/json'},
+			body: JSON.stringify(fields)
 		})
 			.then((response) => response.json())
 			.then((response) => {
diff --git a/ui/app/views/js/popup.service.statusrule.edit.js.php b/ui/app/views/js/popup.service.statusrule.edit.js.php
index 0286492a5cc..63c7caceec4 100644
--- a/ui/app/views/js/popup.service.statusrule.edit.js.php
+++ b/ui/app/views/js/popup.service.statusrule.edit.js.php
@@ -80,8 +80,8 @@ window.service_status_rule_edit_popup = {
 
 		fetch(curl.getUrl(), {
 			method: 'POST',
-			headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-			body: urlEncodeData(getFormFields(this.form))
+			headers: {'Content-Type': 'application/json'},
+			body: JSON.stringify(getFormFields(this.form))
 		})
 			.then((response) => response.json())
 			.then((response) => {
diff --git a/ui/app/views/js/popup.service.time.edit.js.php b/ui/app/views/js/popup.service.time.edit.js.php
index b9e26572412..af362c53d11 100644
--- a/ui/app/views/js/popup.service.time.edit.js.php
+++ b/ui/app/views/js/popup.service.time.edit.js.php
@@ -58,8 +58,8 @@ window.service_time_edit_popup = {
 
 		fetch(curl.getUrl(), {
 			method: 'POST',
-			headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-			body: urlEncodeData(getFormFields(this.form))
+			headers: {'Content-Type': 'application/json'},
+			body: JSON.stringify(getFormFields(this.form))
 		})
 			.then((response) => response.json())
 			.then((response) => {
diff --git a/ui/app/views/js/reports.auditlog.list.js.php b/ui/app/views/js/reports.auditlog.list.js.php
index 3aea1eff38e..997bd3dfcbb 100644
--- a/ui/app/views/js/reports.auditlog.list.js.php
+++ b/ui/app/views/js/reports.auditlog.list.js.php
@@ -73,16 +73,46 @@
 			const resources = <?php echo json_encode([
 					CAudit::ACTION_ADD => [
 						CAudit::RESOURCE_ACTION, CAudit::RESOURCE_AUTH_TOKEN, CAudit::RESOURCE_AUTOREGISTRATION,
-						CAudit::RESOURCE_DASHBOARD, CAudit::RESOURCE_DISCOVERY_RULE, CAudit::RESOURCE_GRAPH,
-						CAudit::RESOURCE_GRAPH_PROTOTYPE, CAudit::RESOURCE_HA_NODE, CAudit::RESOURCE_HOST,
+						CAudit::RESOURCE_CORRELATION, CAudit::RESOURCE_DASHBOARD, CAudit::RESOURCE_DISCOVERY_RULE,
+						CAudit::RESOURCE_GRAPH, CAudit::RESOURCE_GRAPH_PROTOTYPE, CAudit::RESOURCE_HOST,
 						CAudit::RESOURCE_HOST_GROUP, CAudit::RESOURCE_HOST_PROTOTYPE, CAudit::RESOURCE_ICON_MAP,
+						CAudit::RESOURCE_IMAGE, CAudit::RESOURCE_ITEM, CAudit::RESOURCE_ITEM_PROTOTYPE,
+						CAudit::RESOURCE_IT_SERVICE, CAudit::RESOURCE_MACRO, CAudit::RESOURCE_MAINTENANCE,
+						CAudit::RESOURCE_MAP, CAudit::RESOURCE_MEDIA_TYPE, CAudit::RESOURCE_MODULE,
+						CAudit::RESOURCE_PROXY, CAudit::RESOURCE_REGEXP, CAudit::RESOURCE_SCENARIO,
+						CAudit::RESOURCE_SCHEDULED_REPORT, CAudit::RESOURCE_SCRIPT, CAudit::RESOURCE_TEMPLATE,
+						CAudit::RESOURCE_TEMPLATE_DASHBOARD, CAudit::RESOURCE_TRIGGER,
+						CAudit::RESOURCE_TRIGGER_PROTOTYPE, CAudit::RESOURCE_USER, CAudit::RESOURCE_USER_GROUP,
+						CAudit::RESOURCE_USER_ROLE, CAudit::RESOURCE_VALUE_MAP
+					],
+					CAudit::ACTION_UPDATE => [
+						CAudit::RESOURCE_ACTION, CAudit::RESOURCE_AUTHENTICATION, CAudit::RESOURCE_AUTH_TOKEN,
+						CAudit::RESOURCE_AUTOREGISTRATION, CAudit::RESOURCE_CORRELATION, CAudit::RESOURCE_DASHBOARD,
+						CAudit::RESOURCE_DISCOVERY_RULE, CAudit::RESOURCE_GRAPH, CAudit::RESOURCE_GRAPH_PROTOTYPE,
+						CAudit::RESOURCE_HOST, CAudit::RESOURCE_HOST_GROUP, CAudit::RESOURCE_HOST_PROTOTYPE,
+						CAudit::RESOURCE_HOUSEKEEPING, CAudit::RESOURCE_ICON_MAP, CAudit::RESOURCE_IMAGE,
 						CAudit::RESOURCE_ITEM, CAudit::RESOURCE_ITEM_PROTOTYPE, CAudit::RESOURCE_IT_SERVICE,
 						CAudit::RESOURCE_MACRO, CAudit::RESOURCE_MAINTENANCE, CAudit::RESOURCE_MAP,
 						CAudit::RESOURCE_MEDIA_TYPE, CAudit::RESOURCE_MODULE, CAudit::RESOURCE_PROXY,
 						CAudit::RESOURCE_REGEXP, CAudit::RESOURCE_SCENARIO, CAudit::RESOURCE_SCHEDULED_REPORT,
-						CAudit::RESOURCE_SCRIPT, CAudit::RESOURCE_TEMPLATE, CAudit::RESOURCE_TEMPLATE_DASHBOARD,
-						CAudit::RESOURCE_TRIGGER, CAudit::RESOURCE_TRIGGER_PROTOTYPE, CAudit::RESOURCE_USER,
-						CAudit::RESOURCE_USER_GROUP, CAudit::RESOURCE_USER_ROLE, CAudit::RESOURCE_VALUE_MAP
+						CAudit::RESOURCE_SCRIPT, CAudit::RESOURCE_SETTINGS, CAudit::RESOURCE_TEMPLATE,
+						CAudit::RESOURCE_TEMPLATE_DASHBOARD, CAudit::RESOURCE_TRIGGER,
+						CAudit::RESOURCE_TRIGGER_PROTOTYPE, CAudit::RESOURCE_USER, CAudit::RESOURCE_USER_GROUP,
+						CAudit::RESOURCE_USER_ROLE, CAudit::RESOURCE_VALUE_MAP
+					],
+					CAudit::ACTION_DELETE => [
+						CAudit::RESOURCE_ACTION, CAudit::RESOURCE_AUTH_TOKEN, CAudit::RESOURCE_AUTOREGISTRATION,
+						CAudit::RESOURCE_CORRELATION, CAudit::RESOURCE_DASHBOARD, CAudit::RESOURCE_DISCOVERY_RULE,
+						CAudit::RESOURCE_GRAPH, CAudit::RESOURCE_GRAPH_PROTOTYPE, CAudit::RESOURCE_HOST,
+						CAudit::RESOURCE_HOST_GROUP, CAudit::RESOURCE_HOST_PROTOTYPE, CAudit::RESOURCE_ICON_MAP,
+						CAudit::RESOURCE_IMAGE, CAudit::RESOURCE_ITEM, CAudit::RESOURCE_ITEM_PROTOTYPE,
+						CAudit::RESOURCE_IT_SERVICE, CAudit::RESOURCE_MACRO, CAudit::RESOURCE_MAINTENANCE,
+						CAudit::RESOURCE_MAP, CAudit::RESOURCE_MEDIA_TYPE, CAudit::RESOURCE_MODULE,
+						CAudit::RESOURCE_PROXY, CAudit::RESOURCE_REGEXP, CAudit::RESOURCE_SCENARIO,
+						CAudit::RESOURCE_SCHEDULED_REPORT, CAudit::RESOURCE_SCRIPT, CAudit::RESOURCE_TEMPLATE,
+						CAudit::RESOURCE_TEMPLATE_DASHBOARD, CAudit::RESOURCE_TRIGGER,
+						CAudit::RESOURCE_TRIGGER_PROTOTYPE, CAudit::RESOURCE_USER, CAudit::RESOURCE_USER_GROUP,
+						CAudit::RESOURCE_USER_ROLE, CAudit::RESOURCE_VALUE_MAP
 					],
 					CAudit::ACTION_UPDATE => [
 						CAudit::RESOURCE_ACTION, CAudit::RESOURCE_AUTHENTICATION, CAudit::RESOURCE_AUTH_TOKEN,
@@ -116,7 +146,8 @@
 					CAudit::ACTION_LOGOUT => [CAudit::RESOURCE_USER],
 					CAudit::ACTION_EXECUTE => [CAudit::RESOURCE_SCRIPT],
 					CAudit::ACTION_LOGIN_SUCCESS => [CAudit::RESOURCE_USER],
-					CAudit::ACTION_LOGIN_FAILED => [CAudit::RESOURCE_USER]
+					CAudit::ACTION_LOGIN_FAILED => [CAudit::RESOURCE_USER],
+					CAudit::ACTION_HISTORY_CLEAR => [CAudit::RESOURCE_ITEM]
 				]); ?>
 			// Add action "All" to every resource.
 			const arr = [OPTION_ALL];
diff --git a/ui/app/views/monitoring.service.list.php b/ui/app/views/monitoring.service.list.php
index 32ebd0069d1..b8a4db1458d 100644
--- a/ui/app/views/monitoring.service.list.php
+++ b/ui/app/views/monitoring.service.list.php
@@ -93,7 +93,7 @@ if ($web_layout_mode == ZBX_LAYOUT_NORMAL) {
 					CTagFilterFieldHelper::getTagFilterField([
 						'evaltype' => $data['filter']['evaltype'],
 						'tags' => $data['filter']['tags'] ?: [
-							['tag' => '', 'value' => '', 'operator' => SERVICE_TAG_OPERATOR_LIKE]
+							['tag' => '', 'value' => '', 'operator' => TAG_OPERATOR_LIKE]
 						]
 					])
 				)
diff --git a/ui/app/views/popup.condition.common.php b/ui/app/views/popup.condition.common.php
index 5181b5cca82..8d19ad834d1 100644
--- a/ui/app/views/popup.condition.common.php
+++ b/ui/app/views/popup.condition.common.php
@@ -37,20 +37,18 @@ if (array_key_exists('source', $data)) {
 	$form->addVar('source', $data['source']);
 }
 
-$condition_type = $data['last_type'];
+$condition_type = (int) $data['last_type'];
 
 $form_list = (new CFormList())->cleanItems();
 
 switch ($data['type']) {
 	case ZBX_POPUP_CONDITION_TYPE_EVENT_CORR:
-		require_once dirname(__FILE__).'/../../include/correlation.inc.php';
-
 		// Type select.
 		$form_list->addRow(new CLabel(_('Type'), 'label-condition-type'), (new CSelect('condition_type'))
 			->setFocusableElementId('label-condition-type')
 			->setValue($condition_type)
 			->setId('condition-type')
-			->addOptions(CSelect::createOptionsFromArray(corrConditionTypes()))
+			->addOptions(CSelect::createOptionsFromArray(CCorrelationHelper::getConditionTypes()))
 		);
 
 		$inline_js .= '$(() => $("#condition-type").on("change",'
@@ -62,9 +60,9 @@ switch ($data['type']) {
 			case ZBX_CORR_CONDITION_NEW_EVENT_TAG:
 				$operator = (new CRadioButtonList('', CONDITION_OPERATOR_EQUAL))
 					->setModern(true)
-					->addValue(corrConditionOperatorToString(
-						getOperatorsByCorrConditionType(ZBX_CORR_CONDITION_OLD_EVENT_TAG)[0]
-					), getOperatorsByCorrConditionType(ZBX_CORR_CONDITION_OLD_EVENT_TAG)[0]);
+					->addValue(CCorrelationHelper::getLabelByOperator(
+						CCorrelationHelper::getOperatorsByConditionType(ZBX_CORR_CONDITION_OLD_EVENT_TAG)[0]
+					), CCorrelationHelper::getOperatorsByConditionType(ZBX_CORR_CONDITION_OLD_EVENT_TAG)[0]);
 				$new_condition_tag = (new CTextAreaFlexible('tag'))->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH);
 
 				$inline_js .= $new_condition_tag->getPostJS();
@@ -77,8 +75,9 @@ switch ($data['type']) {
 			// New event host group form elements.
 			case ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP:
 				$operator = (new CRadioButtonList('operator', CONDITION_OPERATOR_EQUAL))->setModern(true);
-				foreach (getOperatorsByCorrConditionType(ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP) as $value) {
-					$operator->addValue(corrConditionOperatorToString($value), $value);
+				foreach (CCorrelationHelper::getOperatorsByConditionType(ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP)
+						as $value) {
+					$operator->addValue(CCorrelationHelper::getLabelByOperator($value), $value);
 				}
 
 				$hostgroup_multiselect = (new CMultiSelect([
@@ -106,9 +105,9 @@ switch ($data['type']) {
 			case ZBX_CORR_CONDITION_EVENT_TAG_PAIR:
 				$operator = (new CRadioButtonList('', CONDITION_OPERATOR_EQUAL))
 					->setModern(true)
-					->addValue(corrConditionOperatorToString(
-						getOperatorsByCorrConditionType(ZBX_CORR_CONDITION_EVENT_TAG_PAIR)[0]
-					), getOperatorsByCorrConditionType(ZBX_CORR_CONDITION_EVENT_TAG_PAIR)[0]);
+					->addValue(CCorrelationHelper::getLabelByOperator(
+						CCorrelationHelper::getOperatorsByConditionType(ZBX_CORR_CONDITION_EVENT_TAG_PAIR)[0]
+					), CCorrelationHelper::getOperatorsByConditionType(ZBX_CORR_CONDITION_EVENT_TAG_PAIR)[0]);
 				$new_condition_oldtag = (new CTextAreaFlexible('oldtag'))->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH);
 				$new_condition_newtag = (new CTextAreaFlexible('newtag'))->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH);
 
@@ -125,8 +124,8 @@ switch ($data['type']) {
 			case ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE:
 			case ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE:
 				$operator = (new CRadioButtonList('operator', CONDITION_OPERATOR_EQUAL))->setModern(true);
-				foreach (getOperatorsByCorrConditionType($condition_type) as $value) {
-					$operator->addValue(corrConditionOperatorToString($value), $value);
+				foreach (CCorrelationHelper::getOperatorsByConditionType($condition_type) as $value) {
+					$operator->addValue(CCorrelationHelper::getLabelByOperator($value), $value);
 				}
 
 				$new_condition_tag = (new CTextAreaFlexible('tag'))->setWidth(ZBX_TEXTAREA_MEDIUM_WIDTH);
diff --git a/ui/app/views/popup.service.edit.php b/ui/app/views/popup.service.edit.php
index ce773a9e645..1e7511ec798 100644
--- a/ui/app/views/popup.service.edit.php
+++ b/ui/app/views/popup.service.edit.php
@@ -23,10 +23,13 @@
  * @var CView $this
  */
 
-$form = (new CForm())
+$form_action_url = (new CUrl('zabbix.php'))
+	->setArgument('action', $data['form_action'])
+	->getUrl();
+
+$form = (new CForm('post', $form_action_url))
 	->setId('service-form')
 	->setName('service_form')
-	->addVar('action', $data['form_action'])
 	->addVar('serviceid', $data['serviceid'])
 	->addItem(getMessages());
 
@@ -81,9 +84,12 @@ $service_tab = (new CFormGrid())
 							(new CTextBox('problem_tags[#{rowNum}][tag]', '#{tag}', false,
 								DB::getFieldLength('service_problem_tag', 'tag')
 							))
+								->addClass('js-problem-tag-input')
+								->addClass('js-problem-tag-tag')
 								->setAttribute('placeholder', _('tag'))
 								->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH),
 							(new CSelect('problem_tags[#{rowNum}][operator]'))
+								->addClass('js-problem-tag-input')
 								->addOptions(CSelect::createOptionsFromArray([
 									SERVICE_TAG_OPERATOR_EQUAL => _('Equals'),
 									SERVICE_TAG_OPERATOR_LIKE => _('Contains')
@@ -92,6 +98,7 @@ $service_tab = (new CFormGrid())
 							(new CTextBox('problem_tags[#{rowNum}][value]', '#{value}', false,
 								DB::getFieldLength('service_problem_tag', 'value')
 							))
+								->addClass('js-problem-tag-input')
 								->setAttribute('placeholder', _('value'))
 								->setWidth(ZBX_TEXTAREA_FILTER_SMALL_WIDTH),
 							(new CSimpleButton(_('Remove')))
@@ -111,7 +118,17 @@ $service_tab = (new CFormGrid())
 		)
 	])
 	->addItem([
-		new CLabel(_('Status calculation rule'), 'algorithm_focusable'),
+		new CLabel([
+			_('Status calculation rule'),
+			(new CSpan([
+				' ',
+				makeWarningIcon(
+					_('Status calculation rule and additional rules are only applicable if child services exist.')
+				)
+			]))
+				->setId('algorithm-not-applicable-warning')
+				->addStyle($data['form']['children'] ? 'display: none' : '')
+		], 'algorithm_focusable'),
 		new CFormField(
 			(new CSelect('algorithm'))
 				->setId('algorithm')
@@ -134,10 +151,6 @@ $additional_rules = (new CTable())
 		(new CRowHeader([_('Name'), _('Action')]))->addClass(ZBX_STYLE_GREY)
 	);
 
-foreach ($data['form']['status_rules'] as $row_index => $rule) {
-	$additional_rules->addItem(new CPartial('service.statusrule.row', ['row_index' => $row_index] + $rule));
-}
-
 $additional_rules->addItem(
 	(new CTag('tfoot', true))
 		->addItem(
@@ -219,10 +232,6 @@ $times = (new CTable())
 		(new CRowHeader([_('Type'), _('Interval'), _('Note'), _('Action')]))->addClass(ZBX_STYLE_GREY)
 	);
 
-foreach ($data['form']['times'] as $row_index => $time) {
-	$times->addItem(new CPartial('service.time.row', ['row_index' => $row_index] + $time));
-}
-
 $times->addItem(
 	(new CTag('tfoot', true))
 		->addItem(
@@ -279,6 +288,7 @@ $tags_tab = (new CFormGrid())
 
 $child_services = (new CTable())
 	->setId('children')
+	->setAttribute('data-tab-indicator', count($data['form']['children']))
 	->setHeader(
 		(new CRowHeader([
 			_('Service'),
@@ -291,23 +301,52 @@ $child_services = (new CTable())
 		(new CTag('tfoot', true))
 			->addItem(
 				(new CCol(
-					(new CSimpleButton(_('Add')))
-						->addClass(ZBX_STYLE_BTN_LINK)
-						->addClass('js-add')
+					(new CList())
+						->addClass(ZBX_STYLE_INLINE_FILTER_FOOTER)
+						->addItem(
+							(new CSimpleButton(_('Add')))
+								->addClass(ZBX_STYLE_BTN_LINK)
+								->addClass('js-add')
+						)
+						->addItem(
+							(new CListItem(null))
+								->addClass(ZBX_STYLE_INLINE_FILTER_STATS)
+						)
 				))->setColSpan(4)
 			)
 	);
 
-$child_services_tab = (new CFormGrid())
-	->addClass(CFormGrid::ZBX_STYLE_FORM_GRID_LABEL_WIDTH_FIXED)
-	->addItem([
-		new CLabel(_('Child services')),
-		new CFormField([
-			(new CDiv($child_services))
-				->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR)
-				->addStyle('min-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;')
+$child_services_filter = (new CList())
+	->setId('children-filter')
+	->addClass(ZBX_STYLE_INLINE_FILTER)
+	->addItem(new CLabel(_('Name'), 'children-filter-name'), ZBX_STYLE_INLINE_FILTER_LABEL)
+	->addItem(
+		(new CTextBox(null))
+			->setId('children-filter-name')
+			->setWidth(ZBX_TEXTAREA_FILTER_STANDARD_WIDTH))
+	->addItem(
+		(new CSimpleButton(_('Filter')))
+			->addClass('js-filter')
+	)
+	->addItem(
+		(new CSimpleButton(_('Reset')))
+			->addClass('js-reset')
+			->addClass(ZBX_STYLE_BTN_ALT)
+	);
+
+$child_services_tab = [
+	(new CFormGrid())
+		->addClass(CFormGrid::ZBX_STYLE_FORM_GRID_LABEL_WIDTH_FIXED)
+		->addItem(new CFormField($child_services_filter))
+		->addItem([
+			new CLabel(_('Child services')),
+			new CFormField(
+				(new CDiv($child_services))
+					->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR)
+					->addStyle('min-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;')
+			)
 		])
-	]);
+];
 
 $tabs = (new CTabView())
 	->setSelected(0)
@@ -322,12 +361,19 @@ $form
 	->addItem($tabs)
 	->addItem(
 		(new CScriptTag('
-			service_edit_popup.init('.json_encode([
+			const params = '.json_encode([
 				'serviceid' => $data['serviceid'],
 				'children' => $data['form']['children'],
 				'children_problem_tags_html' => $data['form']['children_problem_tags_html'],
-				'problem_tags' => $data['form']['problem_tags']
-			]).');
+				'problem_tags' => $data['form']['problem_tags'],
+				'status_rules' => $data['form']['status_rules'],
+				'service_times' => $data['form']['times'],
+				'search_limit' => CSettingsHelper::get(CSettingsHelper::SEARCH_LIMIT)
+			]).'
+
+			params.algorithm_names = '.json_encode(CServiceHelper::getAlgorithmNames(), JSON_FORCE_OBJECT).';
+
+			service_edit_popup.init(params);
 		'))->setOnDocumentReady()
 	);
 
diff --git a/ui/app/views/popup.service.statusrule.edit.php b/ui/app/views/popup.service.statusrule.edit.php
index c76c5b592a4..c959804919d 100644
--- a/ui/app/views/popup.service.statusrule.edit.php
+++ b/ui/app/views/popup.service.statusrule.edit.php
@@ -31,7 +31,7 @@ $form = (new CForm())
 	->addItem(getMessages());
 
 // Enable form submitting on Enter.
-$form->addItem((new CInput('submit'))->addStyle('display: none;'));
+$form->addItem((new CInput('submit', null))->addStyle('display: none;'));
 
 $form_grid = (new CFormGrid())
 	->addClass(CFormGrid::ZBX_STYLE_FORM_GRID_LABEL_WIDTH_FIXED)
diff --git a/ui/app/views/popup.service.time.edit.php b/ui/app/views/popup.service.time.edit.php
index 897cbf206b3..a6158567955 100644
--- a/ui/app/views/popup.service.time.edit.php
+++ b/ui/app/views/popup.service.time.edit.php
@@ -31,7 +31,7 @@ $form = (new CForm())
 	->addItem(getMessages());
 
 // Enable form submitting on Enter.
-$form->addItem((new CInput('submit'))->addStyle('display: none;'));
+$form->addItem((new CInput('submit', null))->addStyle('display: none;'));
 
 $form_grid = (new CFormGrid())
 	->addClass(CFormGrid::ZBX_STYLE_FORM_GRID_LABEL_WIDTH_FIXED)
diff --git a/ui/app/views/popup.services.php b/ui/app/views/popup.services.php
index 63f25500126..0b354f3b804 100644
--- a/ui/app/views/popup.services.php
+++ b/ui/app/views/popup.services.php
@@ -28,7 +28,7 @@ $form = (new CForm())
 	->setName('services_form');
 
 // Enable form submitting on Enter.
-$form->addItem((new CInput('submit'))->addStyle('display: none;'));
+$form->addItem((new CInput('submit', null))->addStyle('display: none;'));
 
 $controls = (new CForm())
 	->cleanItems()
@@ -37,14 +37,15 @@ $controls = (new CForm())
 	->addVar('exclude_serviceids', $data['exclude_serviceids'])
 	->addItem(
 		(new CList())
-			->addItem(new CLabel(_('Name'), 'services-filter-name'))
+			->addClass(ZBX_STYLE_INLINE_FILTER)
+			->addItem(new CLabel(_('Name'), 'services-filter-name'), ZBX_STYLE_INLINE_FILTER_LABEL)
 			->addItem(
 				(new CTextBox('filter_name', $data['filter']['name']))
 					->setId('services-filter-name')
 					->setAttribute('autofocus', 'autofocus')
 					->setWidth(ZBX_TEXTAREA_FILTER_STANDARD_WIDTH)
 			)
-			->addItem(new CSubmitButton(_('Apply')))
+			->addItem(new CSubmitButton(_('Filter')))
 			->addItem(
 				(new CSimpleButton(_('Reset')))
 					->setAttribute('type', 'reset')
diff --git a/ui/app/views/popup.triggerexpr.php b/ui/app/views/popup.triggerexpr.php
index 84ce023c69b..06703b4db10 100644
--- a/ui/app/views/popup.triggerexpr.php
+++ b/ui/app/views/popup.triggerexpr.php
@@ -139,7 +139,8 @@ if (array_key_exists('params', $data['functions'][$data['selectedFunction']])) {
 		'acos', 'ascii', 'asin', 'atan', 'atan2', 'between', 'bitand', 'bitlength', 'bitlshift', 'bitnot', 'bitor',
 		'bitrshift', 'bitxor', 'bytelength', 'cbrt', 'ceil', 'char', 'concat', 'cos', 'cosh', 'cot', 'degrees', 'exp',
 		'expm1', 'floor', 'in', 'insert', 'last', 'left', 'log', 'log10', 'ltrim', 'mid', 'mod', 'power', 'radians',
-		'repeat', 'replace', 'right', 'round', 'rtrim', 'signum', 'sin', 'sinh', 'sqrt', 'tan', 'trim', 'truncate'
+		'rate', 'repeat', 'replace', 'right', 'round', 'rtrim', 'signum', 'sin', 'sinh', 'sqrt', 'tan', 'trim',
+		'truncate'
 	];
 
 	foreach ($data['functions'][$data['selectedFunction']]['params'] as $param_name => $param_function) {
diff --git a/ui/assets/styles/blue-theme.css b/ui/assets/styles/blue-theme.css
index fbabc507d90..fcbf3787b50 100644
--- a/ui/assets/styles/blue-theme.css
+++ b/ui/assets/styles/blue-theme.css
@@ -1458,6 +1458,22 @@ footer {
     .search-suggest li.suggest-hover {
       background-color: #e8f5ff; }
 
+.inline-filter {
+  text-align: right; }
+  .inline-filter > li {
+    display: inline-block; }
+    .inline-filter > li:not(:last-child) {
+      margin-right: 3px; }
+    .inline-filter > li.inline-filter-label {
+      margin-right: 10px; }
+
+.inline-filter-footer {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between; }
+  .inline-filter-footer > li.inline-filter-stats {
+    color: #768d99; }
+
 .icon-dashboard::before, .icon-problems::before, .icon-monitoring::before, .icon-inventory::before, .icon-reports::before, .icon-configuration::before, .icon-administration::before {
   content: '';
   width: 24px;
@@ -4216,6 +4232,8 @@ button[disabled], button[disabled]:hover, button[disabled]:active {
       .overlay-dialogue.modal .overlay-dialogue-controls z-select li {
         display: block;
         padding-left: 5px; }
+      .overlay-dialogue.modal .overlay-dialogue-controls .inline-filter li {
+        padding-left: 0; }
     .overlay-dialogue.modal > .overlay-close-btn {
       position: relative;
       float: right;
@@ -4546,15 +4564,6 @@ button[disabled], button[disabled]:hover, button[disabled]:active {
     margin-top: 20px;
     background: url("../img/icon-sprite.svg?20200407") no-repeat -11px -587px; }
 
-.notif-indic-container {
-  border-top: 1px solid #ebeef0;
-  margin: 0 0 0 -19px;
-  padding: 14px 0 0; }
-  .notif-indic-container .notif-indic {
-    float: none;
-    display: inline-block;
-    margin: 0 2px 0 0; }
-
 .dashed-border td {
   border: 1px dashed #ebeef0; }
 
@@ -5853,14 +5862,14 @@ svg {
     background-image: url("../img/icon-sprite.svg?20200407");
     background-repeat: no-repeat; }
 
-button.icon-action-command, button.icon-action-close, button.icon-action-msg, button.icon-action-msgs, button.icon-action-severity-up, button.icon-action-severity-down, button.icon-action-severity-changed, button.icon-action-message, button.icon-action-ack, button.icon-invisible, button.icon-problem-generated, button.icon-problem-recovery, button.icon-actions-number-gray, button.icon-actions-number-yellow, button.icon-actions-number-red {
+button.icon-action-command, button.icon-action-close, button.icon-action-msg, button.icon-action-msgs, button.icon-action-severity-up, button.icon-action-severity-down, button.icon-action-severity-changed, button.icon-action-message, button.icon-action-ack, button.icon-problem-generated, button.icon-problem-recovery, button.icon-actions-number-gray, button.icon-actions-number-yellow, button.icon-actions-number-red {
   background: none;
   border: none;
   padding: 0px;
   margin: 0px;
   margin-right: 5px;
   min-height: 0px; }
-  button.icon-action-command::after, button.icon-action-close::after, button.icon-action-msg::after, button.icon-action-msgs::after, button.icon-action-severity-up::after, button.icon-action-severity-down::after, button.icon-action-severity-changed::after, button.icon-action-message::after, button.icon-action-ack::after, button.icon-invisible::after, button.icon-problem-generated::after, button.icon-problem-recovery::after, button.icon-actions-number-gray::after, button.icon-actions-number-yellow::after, button.icon-actions-number-red::after {
+  button.icon-action-command::after, button.icon-action-close::after, button.icon-action-msg::after, button.icon-action-msgs::after, button.icon-action-severity-up::after, button.icon-action-severity-down::after, button.icon-action-severity-changed::after, button.icon-action-message::after, button.icon-action-ack::after, button.icon-problem-generated::after, button.icon-problem-recovery::after, button.icon-actions-number-gray::after, button.icon-actions-number-yellow::after, button.icon-actions-number-red::after {
     left: 0px;
     top: 4px; }
 
diff --git a/ui/assets/styles/dark-theme.css b/ui/assets/styles/dark-theme.css
index 157820bc715..33ca768fb5d 100644
--- a/ui/assets/styles/dark-theme.css
+++ b/ui/assets/styles/dark-theme.css
@@ -1471,6 +1471,22 @@ footer {
     .search-suggest li.suggest-hover {
       background-color: #454545; }
 
+.inline-filter {
+  text-align: right; }
+  .inline-filter > li {
+    display: inline-block; }
+    .inline-filter > li:not(:last-child) {
+      margin-right: 3px; }
+    .inline-filter > li.inline-filter-label {
+      margin-right: 10px; }
+
+.inline-filter-footer {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between; }
+  .inline-filter-footer > li.inline-filter-stats {
+    color: #737373; }
+
 .icon-dashboard::before, .icon-problems::before, .icon-monitoring::before, .icon-inventory::before, .icon-reports::before, .icon-configuration::before, .icon-administration::before {
   content: '';
   width: 24px;
@@ -4227,6 +4243,8 @@ button[disabled], button[disabled]:hover, button[disabled]:active {
       .overlay-dialogue.modal .overlay-dialogue-controls z-select li {
         display: block;
         padding-left: 5px; }
+      .overlay-dialogue.modal .overlay-dialogue-controls .inline-filter li {
+        padding-left: 0; }
     .overlay-dialogue.modal > .overlay-close-btn {
       position: relative;
       float: right;
@@ -4557,15 +4575,6 @@ button[disabled], button[disabled]:hover, button[disabled]:active {
     margin-top: 20px;
     background: url("../img/icon-sprite.svg?20200407") no-repeat -11px -587px; }
 
-.notif-indic-container {
-  border-top: 1px solid #383838;
-  margin: 0 0 0 -19px;
-  padding: 14px 0 0; }
-  .notif-indic-container .notif-indic {
-    float: none;
-    display: inline-block;
-    margin: 0 2px 0 0; }
-
 .dashed-border td {
   border: 1px dashed #383838; }
 
@@ -5864,14 +5873,14 @@ svg {
     background-image: url("../img/icon-sprite.svg?20200407");
     background-repeat: no-repeat; }
 
-button.icon-action-command, button.icon-action-close, button.icon-action-msg, button.icon-action-msgs, button.icon-action-severity-up, button.icon-action-severity-down, button.icon-action-severity-changed, button.icon-action-message, button.icon-action-ack, button.icon-invisible, button.icon-problem-generated, button.icon-problem-recovery, button.icon-actions-number-gray, button.icon-actions-number-yellow, button.icon-actions-number-red {
+button.icon-action-command, button.icon-action-close, button.icon-action-msg, button.icon-action-msgs, button.icon-action-severity-up, button.icon-action-severity-down, button.icon-action-severity-changed, button.icon-action-message, button.icon-action-ack, button.icon-problem-generated, button.icon-problem-recovery, button.icon-actions-number-gray, button.icon-actions-number-yellow, button.icon-actions-number-red {
   background: none;
   border: none;
   padding: 0px;
   margin: 0px;
   margin-right: 5px;
   min-height: 0px; }
-  button.icon-action-command::after, button.icon-action-close::after, button.icon-action-msg::after, button.icon-action-msgs::after, button.icon-action-severity-up::after, button.icon-action-severity-down::after, button.icon-action-severity-changed::after, button.icon-action-message::after, button.icon-action-ack::after, button.icon-invisible::after, button.icon-problem-generated::after, button.icon-problem-recovery::after, button.icon-actions-number-gray::after, button.icon-actions-number-yellow::after, button.icon-actions-number-red::after {
+  button.icon-action-command::after, button.icon-action-close::after, button.icon-action-msg::after, button.icon-action-msgs::after, button.icon-action-severity-up::after, button.icon-action-severity-down::after, button.icon-action-severity-changed::after, button.icon-action-message::after, button.icon-action-ack::after, button.icon-problem-generated::after, button.icon-problem-recovery::after, button.icon-actions-number-gray::after, button.icon-actions-number-yellow::after, button.icon-actions-number-red::after {
     left: 0px;
     top: 4px; }
 
diff --git a/ui/assets/styles/hc-dark.css b/ui/assets/styles/hc-dark.css
index 4f6167a9dbc..9ff57e4f45a 100644
--- a/ui/assets/styles/hc-dark.css
+++ b/ui/assets/styles/hc-dark.css
@@ -1458,6 +1458,22 @@ footer {
     .search-suggest li.suggest-hover {
       background-color: #454545; }
 
+.inline-filter {
+  text-align: right; }
+  .inline-filter > li {
+    display: inline-block; }
+    .inline-filter > li:not(:last-child) {
+      margin-right: 3px; }
+    .inline-filter > li.inline-filter-label {
+      margin-right: 10px; }
+
+.inline-filter-footer {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between; }
+  .inline-filter-footer > li.inline-filter-stats {
+    color: #cacaca; }
+
 .icon-dashboard::before, .icon-problems::before, .icon-monitoring::before, .icon-inventory::before, .icon-reports::before, .icon-configuration::before, .icon-administration::before {
   content: '';
   width: 24px;
@@ -4180,6 +4196,8 @@ button[disabled], button[disabled]:hover, button[disabled]:active {
       .overlay-dialogue.modal .overlay-dialogue-controls z-select li {
         display: block;
         padding-left: 5px; }
+      .overlay-dialogue.modal .overlay-dialogue-controls .inline-filter li {
+        padding-left: 0; }
     .overlay-dialogue.modal > .overlay-close-btn {
       position: relative;
       float: right;
@@ -4510,15 +4528,6 @@ button[disabled], button[disabled]:hover, button[disabled]:active {
     margin-top: 20px;
     background: url("../img/icon-sprite.svg?20200407") no-repeat -11px -587px; }
 
-.notif-indic-container {
-  border-top: 1px solid #333333;
-  margin: 0 0 0 -19px;
-  padding: 14px 0 0; }
-  .notif-indic-container .notif-indic {
-    float: none;
-    display: inline-block;
-    margin: 0 2px 0 0; }
-
 .dashed-border td {
   border: 1px dashed #333333; }
 
@@ -5808,14 +5817,14 @@ svg {
     background-image: url("../img/icon-sprite.svg?20200407");
     background-repeat: no-repeat; }
 
-button.icon-action-command, button.icon-action-close, button.icon-action-msg, button.icon-action-msgs, button.icon-action-severity-up, button.icon-action-severity-down, button.icon-action-severity-changed, button.icon-action-message, button.icon-action-ack, button.icon-invisible, button.icon-problem-generated, button.icon-problem-recovery, button.icon-actions-number-gray, button.icon-actions-number-yellow, button.icon-actions-number-red {
+button.icon-action-command, button.icon-action-close, button.icon-action-msg, button.icon-action-msgs, button.icon-action-severity-up, button.icon-action-severity-down, button.icon-action-severity-changed, button.icon-action-message, button.icon-action-ack, button.icon-problem-generated, button.icon-problem-recovery, button.icon-actions-number-gray, button.icon-actions-number-yellow, button.icon-actions-number-red {
   background: none;
   border: none;
   padding: 0px;
   margin: 0px;
   margin-right: 5px;
   min-height: 0px; }
-  button.icon-action-command::after, button.icon-action-close::after, button.icon-action-msg::after, button.icon-action-msgs::after, button.icon-action-severity-up::after, button.icon-action-severity-down::after, button.icon-action-severity-changed::after, button.icon-action-message::after, button.icon-action-ack::after, button.icon-invisible::after, button.icon-problem-generated::after, button.icon-problem-recovery::after, button.icon-actions-number-gray::after, button.icon-actions-number-yellow::after, button.icon-actions-number-red::after {
+  button.icon-action-command::after, button.icon-action-close::after, button.icon-action-msg::after, button.icon-action-msgs::after, button.icon-action-severity-up::after, button.icon-action-severity-down::after, button.icon-action-severity-changed::after, button.icon-action-message::after, button.icon-action-ack::after, button.icon-problem-generated::after, button.icon-problem-recovery::after, button.icon-actions-number-gray::after, button.icon-actions-number-yellow::after, button.icon-actions-number-red::after {
     left: 0px;
     top: 4px; }
 
@@ -7014,9 +7023,6 @@ td.log-disaster-bg {
   position: relative;
   margin: 0 0 0 -42px; }
 
-.notif-indic-container {
-  margin: 0 0 0 -42px; }
-
 td.inactive-bg {
   padding-left: 42px !important;
   color: #ffffff; }
diff --git a/ui/assets/styles/hc-light.css b/ui/assets/styles/hc-light.css
index c4bc7608d65..6a5a0ca50d4 100644
--- a/ui/assets/styles/hc-light.css
+++ b/ui/assets/styles/hc-light.css
@@ -1458,6 +1458,22 @@ footer {
     .search-suggest li.suggest-hover {
       background-color: #f4f4f4; }
 
+.inline-filter {
+  text-align: right; }
+  .inline-filter > li {
+    display: inline-block; }
+    .inline-filter > li:not(:last-child) {
+      margin-right: 3px; }
+    .inline-filter > li.inline-filter-label {
+      margin-right: 10px; }
+
+.inline-filter-footer {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between; }
+  .inline-filter-footer > li.inline-filter-stats {
+    color: #333333; }
+
 .icon-dashboard::before, .icon-problems::before, .icon-monitoring::before, .icon-inventory::before, .icon-reports::before, .icon-configuration::before, .icon-administration::before {
   content: '';
   width: 24px;
@@ -4180,6 +4196,8 @@ button[disabled], button[disabled]:hover, button[disabled]:active {
       .overlay-dialogue.modal .overlay-dialogue-controls z-select li {
         display: block;
         padding-left: 5px; }
+      .overlay-dialogue.modal .overlay-dialogue-controls .inline-filter li {
+        padding-left: 0; }
     .overlay-dialogue.modal > .overlay-close-btn {
       position: relative;
       float: right;
@@ -4510,15 +4528,6 @@ button[disabled], button[disabled]:hover, button[disabled]:active {
     margin-top: 20px;
     background: url("../img/icon-sprite.svg?20200407") no-repeat -11px -587px; }
 
-.notif-indic-container {
-  border-top: 1px solid #888888;
-  margin: 0 0 0 -19px;
-  padding: 14px 0 0; }
-  .notif-indic-container .notif-indic {
-    float: none;
-    display: inline-block;
-    margin: 0 2px 0 0; }
-
 .dashed-border td {
   border: 1px dashed #888888; }
 
@@ -5808,14 +5817,14 @@ svg {
     background-image: url("../img/icon-sprite.svg?20200407");
     background-repeat: no-repeat; }
 
-button.icon-action-command, button.icon-action-close, button.icon-action-msg, button.icon-action-msgs, button.icon-action-severity-up, button.icon-action-severity-down, button.icon-action-severity-changed, button.icon-action-message, button.icon-action-ack, button.icon-invisible, button.icon-problem-generated, button.icon-problem-recovery, button.icon-actions-number-gray, button.icon-actions-number-yellow, button.icon-actions-number-red {
+button.icon-action-command, button.icon-action-close, button.icon-action-msg, button.icon-action-msgs, button.icon-action-severity-up, button.icon-action-severity-down, button.icon-action-severity-changed, button.icon-action-message, button.icon-action-ack, button.icon-problem-generated, button.icon-problem-recovery, button.icon-actions-number-gray, button.icon-actions-number-yellow, button.icon-actions-number-red {
   background: none;
   border: none;
   padding: 0px;
   margin: 0px;
   margin-right: 5px;
   min-height: 0px; }
-  button.icon-action-command::after, button.icon-action-close::after, button.icon-action-msg::after, button.icon-action-msgs::after, button.icon-action-severity-up::after, button.icon-action-severity-down::after, button.icon-action-severity-changed::after, button.icon-action-message::after, button.icon-action-ack::after, button.icon-invisible::after, button.icon-problem-generated::after, button.icon-problem-recovery::after, button.icon-actions-number-gray::after, button.icon-actions-number-yellow::after, button.icon-actions-number-red::after {
+  button.icon-action-command::after, button.icon-action-close::after, button.icon-action-msg::after, button.icon-action-msgs::after, button.icon-action-severity-up::after, button.icon-action-severity-down::after, button.icon-action-severity-changed::after, button.icon-action-message::after, button.icon-action-ack::after, button.icon-problem-generated::after, button.icon-problem-recovery::after, button.icon-actions-number-gray::after, button.icon-actions-number-yellow::after, button.icon-actions-number-red::after {
     left: 0px;
     top: 4px; }
 
@@ -6948,9 +6957,6 @@ td.log-disaster-bg {
   position: relative;
   margin: 0 0 0 -42px; }
 
-.notif-indic-container {
-  margin: 0 0 0 -42px; }
-
 td.inactive-bg {
   padding-left: 42px !important;
   color: #000000; }
diff --git a/ui/host_prototypes.php b/ui/host_prototypes.php
index 013477cdbca..9e09efd60a8 100644
--- a/ui/host_prototypes.php
+++ b/ui/host_prototypes.php
@@ -216,7 +216,7 @@ elseif (hasRequest('add') || hasRequest('update')) {
 		$interfaces = getRequest('interfaces', []);
 
 		foreach ($interfaces as $key => $interface) {
-			// Proccess SNMP interface fields.
+			// Process SNMP interface fields.
 			if ($interface['type'] == INTERFACE_TYPE_SNMP) {
 				if (!array_key_exists('details', $interface)) {
 					$interface['details'] = [];
diff --git a/ui/hostgroups.php b/ui/hostgroups.php
index f99c88187af..2d85688c306 100644
--- a/ui/hostgroups.php
+++ b/ui/hostgroups.php
@@ -237,8 +237,6 @@ if (hasRequest('form')) {
 		if (!hasRequest('form_refresh')) {
 			$data['name'] = $data['group']['name'];
 		}
-
-		$data['deletable_host_groups'] = getDeletableHostGroupIds([$data['groupid']]);
 	}
 
 	// render view
diff --git a/ui/httpconf.php b/ui/httpconf.php
index 997be732df6..f4eda4dc56b 100644
--- a/ui/httpconf.php
+++ b/ui/httpconf.php
@@ -186,35 +186,7 @@ elseif (isset($_REQUEST['clone']) && isset($_REQUEST['httptestid'])) {
 	$_REQUEST['form'] = 'clone';
 }
 elseif (hasRequest('del_history') && hasRequest('httptestid')) {
-	$result = true;
-
-	$httpTestId = getRequest('httptestid');
-
-	$httpTests = API::HttpTest()->get([
-		'output' => ['name'],
-		'httptestids' => [$httpTestId],
-		'selectHosts' => ['name'],
-		'editable' => true
-	]);
-
-	if ($httpTests) {
-		DBstart();
-
-		$result = deleteHistoryByHttpTestIds([$httpTestId]);
-		$result = ($result && DBexecute('UPDATE httptest SET nextcheck=0 WHERE httptestid='.zbx_dbstr($httpTestId)));
-
-		// if ($result) {
-		// 	$httpTest = reset($httpTests);
-		// 	$host = reset($httpTest['hosts']);
-
-		// 	add_audit(AUDIT_ACTION_UPDATE, AUDIT_RESOURCE_SCENARIO,
-		// 		_('Web scenario').' ['.$httpTest['name'].'] ['.$httpTestId.'] '.
-		// 			_('Host').' ['.$host['name'].'] '._('History cleared')
-		// 	);
-		// }
-
-		$result = DBend($result);
-	}
+	$result = deleteHistoryByHttpTestIds([getRequest('httptestid')]);
 
 	show_messages($result, _('History cleared'), _('Cannot clear history'));
 }
@@ -452,42 +424,12 @@ elseif (hasRequest('action') && str_in_array(getRequest('action'), ['httptest.ma
 	show_messages($result, $messageSuccess, $messageFailed);
 }
 elseif (hasRequest('action') && getRequest('action') === 'httptest.massclearhistory'
-		&& hasRequest('group_httptestid') && is_array(getRequest('group_httptestid'))) {
-	$result = false;
+		&& hasRequest('group_httptestid') && is_array(getRequest('group_httptestid'))
+		&& getRequest('group_httptestid')) {
+	$result = deleteHistoryByHttpTestIds(getRequest('group_httptestid'));
 
-	$httpTestIds = getRequest('group_httptestid');
-
-	$httpTests = API::HttpTest()->get([
-		'output' => ['httptestid', 'name'],
-		'httptestids' => $httpTestIds,
-		'selectHosts' => ['name'],
-		'editable' => true
-	]);
-
-	if ($httpTests) {
-		DBstart();
-
-		$result = deleteHistoryByHttpTestIds($httpTestIds);
-		$result = ($result && DBexecute(
-			'UPDATE httptest SET nextcheck=0 WHERE '.dbConditionInt('httptestid', $httpTestIds)
-		));
-
-		// if ($result) {
-		// 	foreach ($httpTests as $httpTest) {
-		// 		$host = reset($httpTest['hosts']);
-
-		// 		add_audit(AUDIT_ACTION_UPDATE, AUDIT_RESOURCE_SCENARIO,
-		// 			_('Web scenario').' ['.$httpTest['name'].'] ['.$httpTest['httptestid'].'] '.
-		// 				_('Host').' ['.$host['name'].'] '._('History cleared')
-		// 		);
-		// 	}
-		// }
-
-		$result = DBend($result);
-
-		if ($result) {
-			uncheckTableRows(getRequest('hostid'));
-		}
+	if ($result) {
+		uncheckTableRows(getRequest('hostid'));
 	}
 
 	show_messages($result, _('History cleared'), _('Cannot clear history'));
diff --git a/ui/include/classes/api/CAudit.php b/ui/include/classes/api/CAudit.php
index ccca56d2f33..37718e7f4da 100644
--- a/ui/include/classes/api/CAudit.php
+++ b/ui/include/classes/api/CAudit.php
@@ -36,6 +36,7 @@ class CAudit {
 	public const ACTION_EXECUTE = 7;
 	public const ACTION_LOGIN_SUCCESS = 8;
 	public const ACTION_LOGIN_FAILED = 9;
+	public const ACTION_HISTORY_CLEAR = 10;
 
 	/**
 	 * Audit resources.
@@ -107,12 +108,22 @@ class CAudit {
 		self::RESOURCE_AUTHENTICATION => 'config',
 		self::RESOURCE_AUTH_TOKEN => 'token',
 		self::RESOURCE_AUTOREGISTRATION => 'config',
+		self::RESOURCE_CORRELATION => 'correlation',
+		self::RESOURCE_DASHBOARD => 'dashboard',
+		self::RESOURCE_HOST_GROUP => 'hstgrp',
 		self::RESOURCE_HOUSEKEEPING => 'config',
+		self::RESOURCE_ICON_MAP => 'icon_map',
+		self::RESOURCE_IMAGE => 'images',
+		self::RESOURCE_ITEM => 'items',
+		self::RESOURCE_MACRO => 'globalmacro',
+		self::RESOURCE_MEDIA_TYPE => 'media_type',
 		self::RESOURCE_MODULE => 'module',
 		self::RESOURCE_PROXY => 'hosts',
 		self::RESOURCE_REGEXP => 'regexps',
 		self::RESOURCE_SCHEDULED_REPORT => 'report',
+		self::RESOURCE_SCRIPT => 'scripts',
 		self::RESOURCE_SETTINGS => 'config',
+		self::RESOURCE_TEMPLATE_DASHBOARD => 'dashboard',
 		self::RESOURCE_USER => 'users',
 		self::RESOURCE_USER_GROUP => 'usrgrp'
 	];
@@ -137,12 +148,22 @@ class CAudit {
 		self::RESOURCE_AUTHENTICATION => null,
 		self::RESOURCE_AUTH_TOKEN => 'name',
 		self::RESOURCE_AUTOREGISTRATION => null,
+		self::RESOURCE_CORRELATION => 'name',
+		self::RESOURCE_DASHBOARD => 'name',
+		self::RESOURCE_HOST_GROUP => 'name',
 		self::RESOURCE_HOUSEKEEPING => null,
+		self::RESOURCE_ICON_MAP => 'name',
+		self::RESOURCE_IMAGE => 'name',
+		self::RESOURCE_ITEM => 'name',
+		self::RESOURCE_MACRO => 'macro',
+		self::RESOURCE_MEDIA_TYPE => 'name',
 		self::RESOURCE_MODULE => 'id',
 		self::RESOURCE_PROXY => 'host',
 		self::RESOURCE_REGEXP => 'name',
 		self::RESOURCE_SCHEDULED_REPORT => 'name',
+		self::RESOURCE_SCRIPT => 'name',
 		self::RESOURCE_SETTINGS => null,
+		self::RESOURCE_TEMPLATE_DASHBOARD => 'name',
 		self::RESOURCE_USER => 'username',
 		self::RESOURCE_USER_GROUP => 'name'
 	];
@@ -157,12 +178,22 @@ class CAudit {
 		self::RESOURCE_AUTHENTICATION => 'authentication',
 		self::RESOURCE_AUTH_TOKEN => 'token',
 		self::RESOURCE_AUTOREGISTRATION => 'autoregistration',
+		self::RESOURCE_CORRELATION => 'correlation',
+		self::RESOURCE_DASHBOARD => 'dashboard',
+		self::RESOURCE_HOST_GROUP => 'hostgroup',
 		self::RESOURCE_HOUSEKEEPING => 'housekeeping',
+		self::RESOURCE_ICON_MAP => 'iconmap',
+		self::RESOURCE_IMAGE => 'image',
+		self::RESOURCE_ITEM => 'item',
+		self::RESOURCE_MACRO => 'usermacro',
+		self::RESOURCE_MEDIA_TYPE => 'mediatype',
 		self::RESOURCE_MODULE => 'module',
 		self::RESOURCE_PROXY => 'proxy',
 		self::RESOURCE_REGEXP => 'regexp',
-		self::RESOURCE_SETTINGS => 'settings',
 		self::RESOURCE_SCHEDULED_REPORT => 'report',
+		self::RESOURCE_SCRIPT => 'script',
+		self::RESOURCE_SETTINGS => 'settings',
+		self::RESOURCE_TEMPLATE_DASHBOARD => 'templatedashboard',
 		self::RESOURCE_USER => 'user',
 		self::RESOURCE_USER_GROUP => 'usergroup'
 	];
@@ -175,12 +206,16 @@ class CAudit {
 	private const MASKED_PATHS = [
 		self::RESOURCE_AUTHENTICATION => ['paths' => ['authentication.ldap_bind_password']],
 		self::RESOURCE_AUTH_TOKEN => ['paths' => ['token.token']],
-		self::RESOURCE_AUTOREGISTRATION => ['paths' => ['autoregistration.tls_psk_identity', 'autoregistration.tls_psk']],
-		// self::RESOURCE_MACRO => [
-		// 	'paths' => ['usermacro.value'],
-		// 	'conditions' => ['usermacro.type' => ZBX_MACRO_TYPE_SECRET]
-		// ],
+		self::RESOURCE_AUTOREGISTRATION => [
+			'paths' => ['autoregistration.tls_psk_identity', 'autoregistration.tls_psk']
+		],
+		self::RESOURCE_MACRO => [
+			'paths' => ['usermacro.value'],
+			'conditions' => ['usermacro.type' => ZBX_MACRO_TYPE_SECRET]
+		],
+		self::RESOURCE_MEDIA_TYPE => ['paths' => ['mediatype.passwd']],
 		self::RESOURCE_PROXY => ['paths' => ['proxy.tls_psk_identity', 'proxy.tls_psk']],
+		self::RESOURCE_SCRIPT => ['paths' => ['script.password']],
 		self::RESOURCE_USER => ['paths' => ['user.passwd']]
 	];
 
@@ -191,11 +226,28 @@ class CAudit {
 	 * @var array
 	 */
 	private const NESTED_OBJECTS_TABLE_NAMES = [
+		'correlation.filter' => 'correlation',
+		'correlation.filter.conditions' => 'corr_condition',
+		'correlation.operations' => 'corr_operation',
+		'dashboard.users' => 'dashboard_user',
+		'dashboard.userGroups' => 'dashboard_usrgrp',
+		'dashboard.pages' => 'dashboard_page',
+		'dashboard.pages.widgets' => 'widget',
+		'dashboard.pages.widgets.fields' => 'widget_field',
+		'hostgroup.hosts' => 'hosts_groups',
+		'hostgroup.templates' => 'hosts_groups',
+		'iconmap.mappings' => 'icon_mapping',
+		'mediatype.message_templates' => 'media_type_message',
+		'mediatype.parameters' => 'media_type_param',
 		'proxy.hosts' => 'hosts',
 		'proxy.interface' => 'interface',
 		'regexp.expressions' => 'expressions',
 		'report.users' => 'report_user',
 		'report.user_groups' => 'report_usrgrp',
+		'script.parameters' => 'script_param',
+		'templatedashboard.pages' => 'dashboard_page',
+		'templatedashboard.pages.widgets' => 'widget',
+		'templatedashboard.pages.widgets.fields' => 'widget_field',
 		'user.medias' => 'media',
 		'user.usrgrps' => 'users_groups',
 		'usergroup.rights' => 'rights',
@@ -210,10 +262,26 @@ class CAudit {
 	 * @var array
 	 */
 	private const NESTED_OBJECTS_IDS = [
+		'correlation.filter.conditions' => 'corr_conditionid',
+		'correlation.operations' => 'corr_operationid',
+		'dashboard.users' => 'dashboard_userid',
+		'dashboard.userGroups' => 'dashboard_usrgrpid',
+		'dashboard.pages' => 'dashboard_pageid',
+		'dashboard.pages.widgets' => 'widgetid',
+		'dashboard.pages.widgets.fields' => 'widget_fieldid',
+		'hostgroup.hosts' => 'hostgroupid',
+		'hostgroup.templates' => 'hostgroupid',
+		'iconmap.mappings' => 'iconmappingid',
+		'mediatype.message_templates' => 'mediatype_messageid',
+		'mediatype.parameters' => 'mediatype_paramid',
 		'proxy.hosts' => 'hostid',
 		'regexp.expressions' => 'expressionid',
 		'report.users' => 'reportuserid',
 		'report.user_groups' => 'reportusrgrpid',
+		'script.parameters' => 'script_paramid',
+		'templatedashboard.pages' => 'dashboard_pageid',
+		'templatedashboard.pages.widgets' => 'widgetid',
+		'templatedashboard.pages.widgets.fields' => 'widget_fieldid',
 		'user.medias' => 'mediaid',
 		'user.usrgrps' => 'id',
 		'usergroup.rights' => 'rightid',
@@ -239,6 +307,13 @@ class CAudit {
 	private const SKIP_FIELDS = ['token.creator_userid', 'token.created_at'];
 
 	/**
+	 * Array of paths that contain blob fields.
+	 *
+	 * @var array
+	 */
+	private const BLOB_FIELDS = ['image.image'];
+
+	/**
 	 * Add audit records.
 	 *
 	 * @param string|null $userid
@@ -408,24 +483,24 @@ class CAudit {
 			$path = preg_replace('/\[[0-9]+\]/', '', $path);
 		}
 
+		if (!in_array($path, self::MASKED_PATHS[$resource]['paths'])) {
+			return false;
+		}
+
 		if (!array_key_exists('conditions', self::MASKED_PATHS[$resource])) {
-			return in_array($path, self::MASKED_PATHS[$resource]['paths']);
+			return true;
 		}
 
-		if (in_array($path, self::MASKED_PATHS[$resource])) {
-			$all_counditions = count(self::MASKED_PATHS[$resource]['conditions']);
-			$true_conditions = 0;
+		$all_counditions = count(self::MASKED_PATHS[$resource]['conditions']);
+		$true_conditions = 0;
 
-			foreach (self::MASKED_PATHS[$resource]['conditions'] as $condition_path => $value) {
-				if (array_key_exists($condition_path, $object) && $object[$condition_path] == $value) {
-					$true_conditions++;
-				}
+		foreach (self::MASKED_PATHS[$resource]['conditions'] as $condition_path => $value) {
+			if (array_key_exists($condition_path, $object) && $object[$condition_path] == $value) {
+				$true_conditions++;
 			}
-
-			return ($true_conditions == $all_counditions);
 		}
 
-		return false;
+		return ($true_conditions == $all_counditions);
 	}
 
 	/**
@@ -439,13 +514,26 @@ class CAudit {
 	private static function convertKeysToPaths(string $prefix, array $object): array {
 		$result = [];
 
+		$is_nested_single_object = array_key_exists($prefix, self::NESTED_SINGLE_OBJECTS_IDS);
+		$is_nested_object = false;
+
+		if ($is_nested_single_object) {
+			$pk = self::NESTED_SINGLE_OBJECTS_IDS[$prefix];
+		}
+		elseif (!preg_match('/\[[0-9]+\]$/', $prefix)) {
+			$object_prefix = preg_replace('/\[[0-9]+\]/', '', $prefix);
+			$is_nested_object = array_key_exists($object_prefix, self::NESTED_OBJECTS_IDS);
+
+			if ($is_nested_object) {
+				$pk = self::NESTED_OBJECTS_IDS[$object_prefix];
+			}
+		}
+
 		foreach ($object as $key => $value) {
-			if (array_key_exists($prefix, self::NESTED_SINGLE_OBJECTS_IDS)) {
-				$pk = self::NESTED_SINGLE_OBJECTS_IDS[$prefix];
+			if ($is_nested_single_object) {
 				$index = '['.$object[$pk].'].'.$key;
 			}
-			elseif (array_key_exists($prefix, self::NESTED_OBJECTS_IDS)) {
-				$pk = self::NESTED_OBJECTS_IDS[$prefix];
+			elseif ($is_nested_object) {
 				$index = '['.$value[$pk].']';
 			}
 			else {
@@ -574,6 +662,9 @@ class CAudit {
 			if (self::isValueToMask($resource, $path, $object)) {
 				$result[$path] = [self::DETAILS_ACTION_ADD, ZBX_SECRET_MASK];
 			}
+			elseif (in_array($path, self::BLOB_FIELDS)) {
+				$result[$path] = [self::DETAILS_ACTION_ADD];
+			}
 			else {
 				$result[$path] = [self::DETAILS_ACTION_ADD, $value];
 			}
@@ -609,8 +700,7 @@ class CAudit {
 			}
 		}
 
-		foreach ($object as $path => $foo) {
-			$value = array_key_exists($path, $object) ? $object[$path] : null;
+		foreach ($object as $path => $value) {
 			$db_value = array_key_exists($path, $db_object) ? $db_object[$path] : null;
 
 			if ($db_value === null) {
@@ -618,11 +708,14 @@ class CAudit {
 					continue;
 				}
 
-				if (self::isValueToMask($resource, $path, $object)) {
-					$result[$path] = [self::DETAILS_ACTION_ADD, ZBX_SECRET_MASK];
+				if (in_array($path, self::BLOB_FIELDS)) {
+					$result[$path] = [self::DETAILS_ACTION_ADD];
 				}
 				else {
-					$result[$path] = [self::DETAILS_ACTION_ADD, $value];
+					$result[$path] = [
+						self::DETAILS_ACTION_ADD,
+						self::isValueToMask($resource, $path, $object) ? ZBX_SECRET_MASK : $value
+					];
 				}
 			}
 			elseif ($value != $db_value) {
@@ -630,11 +723,15 @@ class CAudit {
 					$result[self::getLastObjectPath($path)] = [self::DETAILS_ACTION_UPDATE];
 				}
 
-				if (self::isValueToMask($resource, $path, $full_object)) {
-					$result[$path] = [self::DETAILS_ACTION_UPDATE, ZBX_SECRET_MASK, ZBX_SECRET_MASK];
+				if (in_array($path, self::BLOB_FIELDS)) {
+					$result[$path] = [self::DETAILS_ACTION_UPDATE];
 				}
 				else {
-					$result[$path] = [self::DETAILS_ACTION_UPDATE, $value, $db_value];
+					$result[$path] = [
+						self::DETAILS_ACTION_UPDATE,
+						self::isValueToMask($resource, $path, $full_object) ? ZBX_SECRET_MASK : $value,
+						self::isValueToMask($resource, $path, $db_object) ? ZBX_SECRET_MASK : $db_value
+					];
 				}
 			}
 		}
diff --git a/ui/include/classes/api/services/CAuditLog.php b/ui/include/classes/api/services/CAuditLog.php
index 521e3aa3211..cc0df939541 100644
--- a/ui/include/classes/api/services/CAuditLog.php
+++ b/ui/include/classes/api/services/CAuditLog.php
@@ -77,7 +77,8 @@ class CAuditLog extends CApiService {
 		$fields = array_keys($this->getTableSchema($this->tableName())['fields']);
 		$actions = [
 			CAudit::ACTION_ADD, CAudit::ACTION_UPDATE, CAudit::ACTION_DELETE, CAudit::ACTION_LOGOUT,
-			CAudit::ACTION_EXECUTE, CAudit::ACTION_LOGIN_SUCCESS, CAudit::ACTION_LOGIN_FAILED
+			CAudit::ACTION_EXECUTE, CAudit::ACTION_LOGIN_SUCCESS, CAudit::ACTION_LOGIN_FAILED,
+			CAudit::ACTION_HISTORY_CLEAR
 		];
 		$resourcetype = [
 			CAudit::RESOURCE_ACTION, CAudit::RESOURCE_AUTHENTICATION, CAudit::RESOURCE_AUTH_TOKEN,
diff --git a/ui/include/classes/api/services/CAuthentication.php b/ui/include/classes/api/services/CAuthentication.php
index fff61a4714e..cb630883c23 100644
--- a/ui/include/classes/api/services/CAuthentication.php
+++ b/ui/include/classes/api/services/CAuthentication.php
@@ -83,6 +83,12 @@ class CAuthentication extends CApiService {
 	 * @return array
 	 */
 	public function update(array $auth): array {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'authentication', __FUNCTION__)
+			);
+		}
+
 		$db_auth = $this->validateUpdate($auth);
 
 		$upd_config = DB::getUpdatedValues('config', $auth, $db_auth);
diff --git a/ui/include/classes/api/services/CAutoregistration.php b/ui/include/classes/api/services/CAutoregistration.php
index e51520594bf..97b3fe8661c 100644
--- a/ui/include/classes/api/services/CAutoregistration.php
+++ b/ui/include/classes/api/services/CAutoregistration.php
@@ -48,6 +48,10 @@ class CAutoregistration extends CApiService {
 			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
 
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			return [];
+		}
+
 		if ($options['output'] === API_OUTPUT_EXTEND) {
 			$options['output'] = ['tls_accept'];
 		}
@@ -78,6 +82,12 @@ class CAutoregistration extends CApiService {
 	 * @return bool
 	 */
 	public function update(array $autoreg) {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'autoregistration', __FUNCTION__)
+			);
+		}
+
 		$this->validateUpdate($autoreg, $db_autoreg);
 
 		$upd_config = [];
diff --git a/ui/include/classes/api/services/CCorrelation.php b/ui/include/classes/api/services/CCorrelation.php
index bac832a83b9..ff6f1cf6aee 100644
--- a/ui/include/classes/api/services/CCorrelation.php
+++ b/ui/include/classes/api/services/CCorrelation.php
@@ -123,1276 +123,623 @@ class CCorrelation extends CApiService {
 	}
 
 	/**
-	 * Add correlations.
-	 *
-	 * @param array  $correlations											An array of correlations.
-	 * @param string $correlations[]['name']								Correlation name.
-	 * @param string $correlations[]['description']							Correlation description (optional).
-	 * @param int    $correlations[]['status']								Correlation status (optional).
-	 *																		Possible values are:
-	 *																			0 - ZBX_CORRELATION_ENABLED;
-	 *																			1 - ZBX_CORRELATION_DISABLED.
-	 * @param array	 $correlations[]['filter']								Correlation filter that contains evaluation
-	 *																		method, formula and conditions.
-	 * @param int    $correlations[]['filter']['evaltype']					Correlation condition evaluation method.
-	 *																		Possible values are:
-	 *																			0 - CONDITION_EVAL_TYPE_AND_OR;
-	 *																			1 - CONDITION_EVAL_TYPE_AND;
-	 *																			2 - CONDITION_EVAL_TYPE_OR;
-	 *																			3 - CONDITION_EVAL_TYPE_EXPRESSION.
-	 * @param string $correlations[]['filter']['formula']					User-defined expression to be used for
-	 *																		evaluating conditions of filters with a
-	 *																		custom expression. Optional, but required
-	 *																		when evaluation method is:
-	 *																			3 - CONDITION_EVAL_TYPE_EXPRESSION.
-	 * @param array  $correlations[]['filter']['conditions']					An array of correlation conditions.
-	 * @param int    $correlations[]['filter']['conditions'][]['type']		Condition type.
-	 *																		Possible values are:
-	 *																			0 - ZBX_CORR_CONDITION_OLD_EVENT_TAG;
-	 *																			1 - ZBX_CORR_CONDITION_NEW_EVENT_TAG;
-	 *																			2 - ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP;
-	 *																			3 - ZBX_CORR_CONDITION_EVENT_TAG_PAIR;
-	 *																			4 - ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE;
-	 *																			5 - ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE.
-	 * @param string $correlations[]['filter']['conditions'][]['formulaid']	Condition formula ID. Optional, but required
-	 *																		when evaluation method is:
-	 *																			3 - CONDITION_EVAL_TYPE_EXPRESSION.
-	 * @param string $correlations[]['filter']['conditions'][]['tag']		Correlation condition tag.
-	 * @param int	 $correlations[]['filter']['conditions'][]['operator']	Correlation condition operator. Optional,
-	 *																		but required when "type" is one of the following:
-	 *																			2 - ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP;
-	 *																			4 - ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE;
-	 *																			5 - ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE.
-	 *																		Possible values depend on type:
-	 *																		for type ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP:
-	 *																			0 - CONDITION_OPERATOR_EQUAL
-	 *																			1 - CONDITION_OPERATOR_NOT_EQUAL
-	 *																		for types ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE
-	 *																		or ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE:
-	 *																			0 - CONDITION_OPERATOR_EQUAL;
-	 *																			1 - CONDITION_OPERATOR_NOT_EQUAL;
-	 *																			2 - CONDITION_OPERATOR_LIKE;
-	 *																			3 - CONDITION_OPERATOR_NOT_LIKE.
-	 * @param string $correlations[]['filter']['conditions'][]['groupid']	Correlation host group ID. Optional, but
-	 *																		required when "type" is:
-	 *																			2 - ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP.
-	 * @param string $correlations[]['filter']['conditions'][]['newtag']	Correlation condition new (current) tag.
-	 * @param string $correlations[]['filter']['conditions'][]['oldtag']	Correlation condition old (target/matching)
-	 *																		tag.
-	 * @param string $correlations[]['filter']['conditions'][]['value']		Correlation condition tag value (optional).
-	 * @param array	 $correlations[]['operations']							An array of correlation operations.
-	 * @param int	 $correlations[]['operations'][]['type']				Correlation operation type.
-	 *																		Possible values are:
-	 *																			0 - ZBX_CORR_OPERATION_CLOSE_OLD;
-	 *																			1 - ZBX_CORR_OPERATION_CLOSE_NEW.
+	 * @param array $correlations
 	 *
 	 * @return array
 	 */
 	public function create($correlations) {
-		$correlations = zbx_toArray($correlations);
-
-		$this->validateCreate($correlations);
-
-		foreach ($correlations as &$correlation) {
-			$correlation['evaltype'] = $correlation['filter']['evaltype'];
-			unset($correlation['formula']);
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'correlation', __FUNCTION__)
+			);
 		}
-		unset($correlation);
 
-		// Insert correlations into DB, get back array with new correlation IDs.
-		$correlations = DB::save('correlation', $correlations);
-		$correlations = zbx_toHash($correlations, 'correlationid');
+		self::validateCreate($correlations);
 
-		$conditions_to_create = [];
-		$operations_to_create = [];
+		$ins_correlations = [];
 
-		// Collect conditions and operations to be created and set appropriate correlation ID.
-		foreach ($correlations as $correlationid => &$correlation) {
-			foreach ($correlation['filter']['conditions'] as $condition) {
-				$condition['correlationid'] = $correlationid;
-				$conditions_to_create[] = $condition;
-			}
-
-			foreach ($correlation['operations'] as $operation) {
-				$operation['correlationid'] = $correlationid;
-				$operations_to_create[] = $operation;
-			}
+		foreach ($correlations as $correlation) {
+			$ins_correlations[] = $correlation + ['evaltype' => $correlation['filter']['evaltype']];
 		}
-		unset($correlation);
 
-		$conditions = $this->addConditions($conditions_to_create);
+		// Insert correlations into DB, get back array with new correlation IDs.
+		$correlationids = DB::insert('correlation', $ins_correlations);
 
-		// Group back created correlation conditions by correlation ID to be used for updating correlation formula.
-		$conditions_for_correlations = [];
-		foreach ($conditions as $condition) {
-			$conditions_for_correlations[$condition['correlationid']][$condition['corr_conditionid']] = $condition;
+		foreach ($correlations as $index => &$correlation) {
+			$correlation['correlationid'] = $correlationids[$index];
 		}
+		unset($correlation);
 
-		// Update "formula" field if evaluation method is a custom expression.
-		foreach ($correlations as $correlationid => $correlation) {
-			if ($correlation['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
-				$this->updateFormula($correlationid, $correlation['filter']['formula'],
-					$conditions_for_correlations[$correlationid]
-				);
-			}
-		}
+		self::updateConditions($correlations, __FUNCTION__);
+		self::updateOperations($correlations, __FUNCTION__);
 
-		DB::save('corr_operation', $operations_to_create);
+		self::addAuditLog(CAudit::ACTION_ADD, CAudit::RESOURCE_CORRELATION, $correlations);
 
-		return ['correlationids' => array_keys($correlations)];
+		return ['correlationids' => $correlationids];
 	}
 
 	/**
-	 * Update correlations.
+	 * @static
 	 *
-	 * @param array  $correlations											An array of correlations.
-	 * @param string $correlations[]['name']								Correlation name (optional).
-	 * @param string $correlations[]['description']							Correlation description (optional).
-	 * @param int	 $correlations[]['status']								Correlation status (optional).
-	 *																		Possible values are:
-	 *																			0 - ZBX_CORRELATION_ENABLED;
-	 *																			1 - ZBX_CORRELATION_DISABLED.
-	 * @param array	 $correlations[]['filter']								Correlation filter that contains evaluation
-	 *																		method, formula and conditions.
-	 * @param int	 $correlations[]['filter']['evaltype']					Correlation condition evaluation
-	 *																		method (optional).
-	 *																		Possible values are:
-	 *																			0 - CONDITION_EVAL_TYPE_AND_OR;
-	 *																			1 - CONDITION_EVAL_TYPE_AND;
-	 *																			2 - CONDITION_EVAL_TYPE_OR;
-	 *																			3 - CONDITION_EVAL_TYPE_EXPRESSION.
-	 * @param string $correlations[]['filter']['formula']					User-defined expression to be used for
-	 *																		evaluating conditions of filters with a
-	 *																		custom expression. Optional, but required
-	 *																		when evaluation method is changed to
-	 *																		CONDITION_EVAL_TYPE_EXPRESSION (or remains the same)
-	 *																		and new conditions are set.
-	 * @param array  $correlations[]['filter']['conditions']				An array of correlation conditions (optional).
-	 * @param int	 $correlations[]['filter']['conditions'][]['type']		Condition type. Optional, but required when
-	 *																		new conditions are set.
-	 *																		Possible values are:
-	 *																			0 - ZBX_CORR_CONDITION_OLD_EVENT_TAG;
-	 *																			1 - ZBX_CORR_CONDITION_NEW_EVENT_TAG;
-	 *																			2 - ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP;
-	 *																			3 - ZBX_CORR_CONDITION_EVENT_TAG_PAIR;
-	 *																			4 - ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE;
-	 *																			5 - ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE.
-	 * @param string $correlations[]['filter']['conditions'][]['formulaid']	Condition formula ID. Optional, but required
-	 *																		when evaluation method is changed to
-	 *																		CONDITION_EVAL_TYPE_EXPRESSION (or remains the same)
-	 *																		and new conditions are set.
-	 * @param string $correlations[]['filter']['conditions'][]['tag']		Correlation condition tag.
-	 * @param int	 $correlations[]['filter']['conditions'][]['operator']	Correlation condition operator. Optional,
-	 *																		but required when "type" is changed to one
-	 *																		of the following:
-	 *																			2 - ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP;
-	 *																			4 - ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE;
-	 *																			5 - ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE.
-	 *																		Possible values depend on type:
-	 *																		for type ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP:
-	 *																			0 - CONDITION_OPERATOR_EQUAL
-	 *																			1 - CONDITION_OPERATOR_NOT_EQUAL
-	 *																		for types ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE
-	 *																		or ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE:
-	 *																			0 - CONDITION_OPERATOR_EQUAL;
-	 *																			1 - CONDITION_OPERATOR_NOT_EQUAL;
-	 *																			2 - CONDITION_OPERATOR_LIKE;
-	 *																			3 - CONDITION_OPERATOR_NOT_LIKE.
-	 * @param string $correlations[]['filter']['conditions'][]['groupid']	Correlation host group ID. Optional, but
-	 *																		required when "type" is changed to:
-	 *																			2 - ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP.
-	 * @param string $correlations[]['filter']['conditions'][]['newtag']	Correlation condition new (current) tag.
-	 * @param string $correlations[]['filter']['conditions'][]['oldtag']	Correlation condition old (target/matching)
-	 *																		tag.
-	 * @param string $correlations[]['filter']['conditions'][]['value']		Correlation condition tag value (optional).
-	 * @param array  $correlations[]['operations']							An array of correlation operations (optional).
-	 * @param int	 $correlations[]['operations'][]['type']				Correlation operation type (optional).
-	 *																		Possible values are:
-	 *																			0 - ZBX_CORR_OPERATION_CLOSE_OLD;
-	 *																			1 - ZBX_CORR_OPERATION_CLOSE_NEW.
+	 * @param array $db_conditions
+	 * @param array $condition
 	 *
-	 * @return array
+	 * @return array|null
 	 */
-	public function update($correlations) {
-		$correlations = zbx_toArray($correlations);
-		$db_correlations = [];
-
-		$this->validateUpdate($correlations, $db_correlations);
-
-		$correlations_to_update = [];
-		$conditions_to_create = [];
-		$conditions_to_delete = [];
-		$operations_to_create = [];
-		$operations_to_delete = [];
-
-		foreach ($correlations as $correlation) {
-			$correlationid = $correlation['correlationid'];
+	private static function getDbCondition(array $db_conditions, array $condition): ?array {
+		foreach ($db_conditions as $db_condition) {
+			if ($condition['type'] != $db_condition['type']) {
+				continue;
+			}
 
-			unset($correlation['evaltype'], $correlation['formula'], $correlation['correlationid']);
+			switch ($condition['type']) {
+				case ZBX_CORR_CONDITION_OLD_EVENT_TAG:
+				case ZBX_CORR_CONDITION_NEW_EVENT_TAG:
+					if ($condition['tag'] === $db_condition['tag']) {
+						return $db_condition;
+					}
+					break;
 
-			$db_correlation = $db_correlations[$correlationid];
+				case ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP:
+					if ($condition['operator'] == $db_condition['operator']
+							&& bccomp($condition['groupid'], $db_condition['groupid']) == 0) {
+						return $db_condition;
+					}
+					break;
 
-			// Remove fields that have not been changed for correlations.
-			if (array_key_exists('name', $correlation) && $correlation['name'] === $db_correlation['name']) {
-				unset($correlation['name']);
-			}
+				case ZBX_CORR_CONDITION_EVENT_TAG_PAIR:
+					if ($condition['oldtag'] === $db_condition['oldtag']
+							&& $condition['newtag'] === $db_condition['newtag']) {
+						return $db_condition;
+					}
+					break;
 
-			if (array_key_exists('description', $correlation)
-					&& $correlation['description'] === $db_correlation['description']) {
-				unset($correlation['description']);
+				case ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE:
+				case ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE:
+					if ($condition['operator'] == $db_condition['operator']
+							&& $condition['tag'] === $db_condition['tag']
+							&& $condition['value'] === $db_condition['value']) {
+						return $db_condition;
+					}
+					break;
 			}
+		}
 
-			if (array_key_exists('status', $correlation) && $correlation['status'] == $db_correlation['status']) {
-				unset($correlation['status']);
-			}
+		return null;
+	}
 
-			$evaltype_changed = false;
+	/**
+	 * @static
+	 *
+	 * @param array      $correlations
+	 * @param string     $method
+	 * @param array|null $db_correlations
+	 */
+	private static function updateConditions(array &$correlations, string $method,
+			array $db_correlations = null): void {
+		$ins_conditions = [];
+		$del_corr_conditionids = [];
 
-			// If the filter is set, something might have changed.
-			if (array_key_exists('filter', $correlation)) {
-				// Delete old correlation conditions and create new conditions.
-				if (array_key_exists('conditions', $correlation['filter'])) {
-					$conditions_to_delete[$correlationid] = true;
+		foreach ($correlations as &$correlation) {
+			if (!array_key_exists('filter', $correlation)) {
+				continue;
+			}
 
-					foreach ($correlation['filter']['conditions'] as $condition) {
-						$condition['correlationid'] = $correlationid;
-						$conditions_to_create[] = $condition;
-					}
-				}
+			$db_conditions = ($method === 'update')
+				? $db_correlations[$correlation['correlationid']]['filter']['conditions']
+				: [];
 
-				// Check if evaltype has changed.
-				if (array_key_exists('evaltype', $correlation['filter'])) {
-					if ($correlation['filter']['evaltype'] != $db_correlation['filter']['evaltype']) {
-						// Clear formula field evaluation method if evaltype has changed.
-						$correlation['evaltype'] = $correlation['filter']['evaltype'];
+			foreach ($correlation['filter']['conditions'] as &$condition) {
+				$db_condition = self::getDbCondition($db_conditions, $condition);
 
-						if ($correlation['evaltype'] != CONDITION_EVAL_TYPE_EXPRESSION) {
-							$correlation['formula'] = '';
-						}
-					}
+				if ($db_condition !== null) {
+					$condition['corr_conditionid'] = $db_condition['corr_conditionid'];
+					unset($db_conditions[$db_condition['corr_conditionid']]);
 				}
-			}
-
-			// Delete old correlation operations and create new operations.
-			if (array_key_exists('operations', $correlation)) {
-				$operations_to_delete[$correlationid] = true;
-
-				foreach ($correlation['operations'] as $operation) {
-					$operation['correlationid'] = $correlationid;
-					$operations_to_create[] = $operation;
+				else {
+					$ins_conditions[] = ['correlationid' => $correlation['correlationid']] + $condition;
 				}
 			}
+			unset($condition);
 
-			// Add values only if something is set for update.
-			if (array_key_exists('name', $correlation)
-					|| array_key_exists('description', $correlation)
-					|| array_key_exists('status', $correlation)
-					|| array_key_exists('evaltype', $correlation)) {
-				$correlations_to_update[] = [
-					'values' => $correlation,
-					'where' => ['correlationid' => $correlationid]
-				];
-			}
+			$del_corr_conditionids = array_merge($del_corr_conditionids, array_keys($db_conditions));
 		}
+		unset($correlation);
 
-		// Update correlations.
-		if ($correlations_to_update) {
-			DB::update('correlation', $correlations_to_update);
+		if ($ins_conditions) {
+			$conditionids = DB::insert('corr_condition', $ins_conditions);
 		}
 
-		// Update conditions. Delete the old ones and create new ones.
-		if ($conditions_to_delete) {
-			DB::delete('corr_condition', ['correlationid' => array_keys($conditions_to_delete)]);
+		if ($del_corr_conditionids) {
+			DB::delete('corr_condition_tag', ['corr_conditionid' => $del_corr_conditionids]);
+			DB::delete('corr_condition_group', ['corr_conditionid' => $del_corr_conditionids]);
+			DB::delete('corr_condition_tagpair', ['corr_conditionid' => $del_corr_conditionids]);
+			DB::delete('corr_condition_tagvalue', ['corr_conditionid' => $del_corr_conditionids]);
+			DB::delete('corr_condition', ['corr_conditionid' => $del_corr_conditionids]);
 		}
 
-		if ($conditions_to_create) {
-			$conditions = $this->addConditions($conditions_to_create);
+		$ins_condition_tags = [];
+		$ins_condition_groups = [];
+		$ins_condition_tagpairs = [];
+		$ins_condition_tagvalues = [];
+		$upd_correlations = [];
 
-			// Group back created correlation conditions by correlation ID to be used for updating correlation formula.
-			$conditions_for_correlations = [];
-			foreach ($conditions as $condition) {
-				$conditions_for_correlations[$condition['correlationid']][$condition['corr_conditionid']] = $condition;
+		foreach ($correlations as &$correlation) {
+			if (!array_key_exists('filter', $correlation)) {
+				continue;
 			}
 
-			// Update "formula" field if evaluation method is a custom expression.
-			foreach ($correlations as $correlation) {
-				if (array_key_exists('filter', $correlation)) {
-					$db_correlation = $db_correlations[$correlation['correlationid']];
-
-					// Check if evaluation method has changed.
-					if (array_key_exists('evaltype', $correlation['filter'])) {
-						if ($correlation['filter']['evaltype'] != $db_correlation['filter']['evaltype']) {
-							// The new evaluation method will be saved to DB.
-							$correlation['evaltype'] = $correlation['filter']['evaltype'];
-
-							if ($correlation['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
-								// When evaluation method has changed, update the custom formula.
-								$this->updateFormula($correlation['correlationid'], $correlation['filter']['formula'],
-									$conditions_for_correlations[$correlation['correlationid']]
-								);
-							}
-						}
-						else {
-							/*
-							 * The evaluation method has not been changed, but it has been set and it's a custom
-							 * expression. The formula needs to be updated in this case.
-							 */
-							if ($correlation['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
-								$this->updateFormula($correlation['correlationid'], $correlation['filter']['formula'],
-									$conditions_for_correlations[$correlation['correlationid']]
-								);
-							}
-						}
-					}
-					elseif ($db_correlation['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
-						/*
-						 * The evaluation method has not been changed and was not set. It's read from DB, but it's still
-						 * a custom expression and there are new conditions, so the formula needs to be updated.
-						 */
-						$this->updateFormula($correlation['correlationid'], $correlation['filter']['formula'],
-							$conditions_for_correlations[$correlation['correlationid']]
-						);
+			foreach ($correlation['filter']['conditions'] as &$condition) {
+				if (!array_key_exists('corr_conditionid', $condition)) {
+					$condition['corr_conditionid'] = array_shift($conditionids);
+
+					switch ($condition['type']) {
+						case ZBX_CORR_CONDITION_OLD_EVENT_TAG:
+						case ZBX_CORR_CONDITION_NEW_EVENT_TAG:
+							$ins_condition_tags[] = $condition;
+							break;
+
+						case ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP:
+							$ins_condition_groups[] = $condition;
+							break;
+
+						case ZBX_CORR_CONDITION_EVENT_TAG_PAIR:
+							$ins_condition_tagpairs[] = $condition;
+							break;
+
+						case ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE:
+						case ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE:
+							$ins_condition_tagvalues[] = $condition;
+							break;
 					}
 				}
 			}
-		}
-
-		// Update operations. Delete the old ones and create new ones.
-		if ($operations_to_delete) {
-			DB::delete('corr_operation', ['correlationid' => array_keys($operations_to_delete)]);
-		}
+			unset($condition);
 
-		if ($operations_to_create) {
-			DB::save('corr_operation', $operations_to_create);
-		}
+			if ($method === 'create' || array_key_exists('filter', $correlation)) {
+				if ($correlation['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
+					$correlation['filter']['formula'] = CConditionHelper::replaceLetterIds(
+						$correlation['filter']['formula'],
+						array_column($correlation['filter']['conditions'], 'corr_conditionid', 'formulaid')
+					);
+				}
+				else {
+					$correlation['filter']['formula'] = '';
+				}
 
-		return ['correlationids' => zbx_objectValues($correlations, 'correlationid')];
-	}
+				$db_formula = ($method === 'update')
+					? $db_correlations[$correlation['correlationid']]['filter']['formula']
+					: '';
 
-	/**
-	 * Delete correlations.
-	 *
-	 * @param array $correlationids					An array of correlation IDs.
-	 *
-	 * @return array
-	 */
-	public function delete(array $correlationids) {
-		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('You do not have permission to perform this operation.'));
+				if ($correlation['filter']['formula'] !== $db_formula) {
+					$upd_correlations[] = [
+						'values' => ['formula' => $correlation['filter']['formula']],
+						'where' => ['correlationid' => $correlation['correlationid']]
+					];
+				}
+			}
 		}
+		unset($correlation);
 
-		$api_input_rules = ['type' => API_IDS, 'flags' => API_NOT_EMPTY, 'uniq' => true];
-		if (!CApiInputValidator::validate($api_input_rules, $correlationids, '/', $error)) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
+		if ($ins_condition_tags) {
+			DB::insert('corr_condition_tag', $ins_condition_tags, false);
 		}
 
-		$db_correlations = $this->get([
-			'output' => ['correlationid', 'name'],
-			'correlationids' => $correlationids,
-			'preservekeys' => true
-		]);
-
-		foreach ($correlationids as $correlationid) {
-			if (!array_key_exists($correlationid, $db_correlations)) {
-				self::exception(ZBX_API_ERROR_PERMISSIONS,
-					_('No permissions to referred object or it does not exist!')
-				);
-			}
+		if ($ins_condition_groups) {
+			DB::insert('corr_condition_group', $ins_condition_groups, false);
 		}
 
-		DB::delete('correlation', ['correlationid' => $correlationids]);
+		if ($ins_condition_tagpairs) {
+			DB::insert('corr_condition_tagpair', $ins_condition_tagpairs, false);
+		}
 
-		$this->addAuditBulk(CAudit::ACTION_DELETE, CAudit::RESOURCE_CORRELATION, $db_correlations);
+		if ($ins_condition_tagvalues) {
+			DB::insert('corr_condition_tagvalue', $ins_condition_tagvalues, false);
+		}
 
-		return ['correlationids' => $correlationids];
+		if ($upd_correlations) {
+			DB::update('correlation', $upd_correlations);
+		}
 	}
 
 	/**
-	 * Validates the input parameters for the create() method.
-	 *
-	 * @param array $correlations
+	 * @static
 	 *
-	 * @throws APIException if the input is invalid.
+	 * @param array      $correlations
+	 * @param string     $method
+	 * @param array|null $db_correlations
 	 */
-	protected function validateCreate(array $correlations) {
-		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('Only super admins can create correlations.'));
-		}
+	private static function updateOperations(array &$correlations, string $method,
+			array $db_correlations = null): void {
+		$ins_operations = [];
+		$del_corr_operationids = [];
 
-		if (!$correlations) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _('Empty input parameter.'));
-		}
-
-		$required_fields = ['name', 'filter', 'operations'];
-
-		// Validate required fields and check if "name" is not empty.
-		foreach ($correlations as $correlation) {
-			if (!is_array($correlation)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect arguments passed to function.'));
+		foreach ($correlations as &$correlation) {
+			if (!array_key_exists('operations', $correlation)) {
+				continue;
 			}
 
-			// Check required parameters.
-			$missing_keys = array_diff($required_fields, array_keys($correlation));
-
-			if ($missing_keys) {
-				self::exception(ZBX_API_ERROR_PARAMETERS,
-					_s('Correlation is missing parameters: %1$s', implode(', ', $missing_keys))
-				);
-			}
+			$db_operations = ($method === 'update')
+				? array_column($db_correlations[$correlation['correlationid']]['operations'], null, 'type')
+				: [];
 
-			// Validate "name" field.
-			if (is_array($correlation['name'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect arguments passed to function.'));
-			}
-			elseif ($correlation['name'] === '' || $correlation['name'] === null || $correlation['name'] === false) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Correlation name cannot be empty.'));
+			foreach ($correlation['operations'] as &$operation) {
+				if (array_key_exists($operation['type'], $db_operations)) {
+					$operation['corr_operationid'] = $db_operations[$operation['type']]['corr_operationid'];
+					unset($db_operations[$operation['type']]);
+				}
+				else {
+					$ins_operations[] = ['correlationid' => $correlation['correlationid']] + $operation;
+				}
 			}
-		}
+			unset($operation);
 
-		// Check for duplicate names.
-		$duplicate = CArrayHelper::findDuplicate($correlations, 'name');
-		if ($duplicate) {
-			self::exception(ZBX_API_ERROR_PARAMETERS,
-				_s('Duplicate "%1$s" value "%2$s" for correlation.', 'name', $duplicate['name'])
+			$del_corr_operationids = array_merge($del_corr_operationids,
+				array_column($db_operations, 'corr_operationid')
 			);
 		}
+		unset($correlation);
 
-		// Check if correlation already exists.
-		$db_correlations = API::getApiService()->select('correlation', [
-			'output' => ['name'],
-			'filter' => ['name' => zbx_objectValues($correlations, 'name')],
-			'limit' => 1
-		]);
-
-		if ($db_correlations) {
-			self::exception(ZBX_API_ERROR_PARAMETERS,
-				_s('Correlation "%1$s" already exists.', $correlations[0]['name'])
-			);
+		if ($ins_operations) {
+			$corr_operationids = DB::insert('corr_operation', $ins_operations);
 		}
 
-		// Set all necessary validators and parser before cycling each correlation.
-		$status_validator = new CLimitedSetValidator([
-			'values' => [ZBX_CORRELATION_ENABLED, ZBX_CORRELATION_DISABLED]
-		]);
-
-		$filter_evaltype_validator = new CLimitedSetValidator([
-			'values' => [CONDITION_EVAL_TYPE_OR, CONDITION_EVAL_TYPE_AND, CONDITION_EVAL_TYPE_AND_OR,
-				CONDITION_EVAL_TYPE_EXPRESSION
-			]
-		]);
-
-		$filter_condition_type_validator = new CLimitedSetValidator([
-			'values' => [ZBX_CORR_CONDITION_OLD_EVENT_TAG, ZBX_CORR_CONDITION_NEW_EVENT_TAG,
-				ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP,	ZBX_CORR_CONDITION_EVENT_TAG_PAIR,
-				ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE,	ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE
-			]
-		]);
-
-		$filter_condition_hg_operator_validator = new CLimitedSetValidator([
-			'values' => [CONDITION_OPERATOR_EQUAL, CONDITION_OPERATOR_NOT_EQUAL]
-		]);
-
-		$filter_condition_tagval_operator_validator = new CLimitedSetValidator([
-			'values' => [CONDITION_OPERATOR_EQUAL, CONDITION_OPERATOR_NOT_EQUAL, CONDITION_OPERATOR_LIKE,
-				CONDITION_OPERATOR_NOT_LIKE
-			]
-		]);
-
-		$filter_operations_validator = new CLimitedSetValidator([
-			'values' => [ZBX_CORR_OPERATION_CLOSE_OLD, ZBX_CORR_OPERATION_CLOSE_NEW]
-		]);
-
-		$parser = new CConditionFormula();
-
-		$groupids = [];
-
-		foreach ($correlations as $correlation) {
-			// Validate "status" field (optional).
-			if (array_key_exists('status', $correlation) && !$status_validator->validate($correlation['status'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-					'Incorrect value "%1$s" in field "%2$s" for correlation "%3$s".',
-					$correlation['status'],
-					'status',
-					$correlation['name']
-				));
-			}
-
-			// Validate "filter" field.
-			if (!is_array($correlation['filter'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect arguments passed to function.'));
-			}
-
-			// Validate "evaltype" field.
-			if (!array_key_exists('evaltype', $correlation['filter'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS,
-					_s('Incorrect type of calculation for correlation "%1$s".', $correlation['name'])
-				);
-			}
-			elseif (!$filter_evaltype_validator->validate($correlation['filter']['evaltype'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-					'Incorrect value "%1$s" in field "%2$s" for correlation "%3$s".',
-					$correlation['filter']['evaltype'],
-					'evaltype',
-					$correlation['name']
-				));
-			}
+		if ($del_corr_operationids) {
+			DB::delete('corr_operation', ['corr_operationid' => $del_corr_operationids]);
+		}
 
-			// Check if conditions exist and that array is not empty.
-			if (!array_key_exists('conditions', $correlation['filter'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS,
-					_s('No "%1$s" given for correlation "%2$s".', 'conditions', $correlation['name'])
-				);
+		foreach ($correlations as &$correlation) {
+			if (!array_key_exists('operations', $correlation)) {
+				continue;
 			}
 
-			// Validate condition operators and other parameters depending on type.
-			$groupids = $this->validateConditions($correlation, $filter_condition_type_validator,
-				$filter_condition_hg_operator_validator, $filter_condition_tagval_operator_validator
-			);
-
-			// Validate custom expressions and formula.
-			if ($correlation['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
-				// Check formula.
-				if (!array_key_exists('formula', $correlation['filter'])) {
-					self::exception(ZBX_API_ERROR_PARAMETERS,
-						_s('No "%1$s" given for correlation "%2$s".', 'formula', $correlation['name'])
-					);
+			foreach ($correlation['operations'] as &$operation) {
+				if (!array_key_exists('corr_operationid', $operation)) {
+					$operation['corr_operationid'] = array_shift($corr_operationids);
 				}
-
-				$this->validateFormula($correlation, $parser);
-
-				// Check condition formula IDs.
-				$this->validateConditionFormulaIDs($correlation, $parser);
-			}
-
-			// Validate operations.
-			$this->validateOperations($correlation, $filter_operations_validator);
-		}
-
-		// Validate collected group IDs if at least one of correlation conditions was "New event host group".
-		if ($groupids) {
-			$groups_count = API::HostGroup()->get([
-				'countOutput' => true,
-				'groupids' => array_keys($groupids)
-			]);
-
-			if ($groups_count != count($groupids)) {
-				self::exception(ZBX_API_ERROR_PERMISSIONS,
-					_('No permissions to referred object or it does not exist!')
-				);
 			}
+			unset($operation);
 		}
+		unset($correlation);
 	}
 
 	/**
-	 * Validates the input parameters for the update() method.
-	 *
 	 * @param array $correlations
-	 * @param array $db_correlations
 	 *
-	 * @throws APIException if the input is invalid.
+	 * @return array
 	 */
-	protected function validateUpdate(array $correlations, array &$db_correlations) {
+	public function update(array $correlations): array {
 		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('Only super admins can update correlations.'));
-		}
-
-		if (!$correlations) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _('Empty input parameter.'));
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'correlation', __FUNCTION__)
+			);
 		}
 
-		// Validate given IDs.
-		$this->checkObjectIds($correlations, 'correlationid',
-			_('No "%1$s" given for correlation.'),
-			_('Empty correlation ID.'),
-			_('Incorrect correlation ID.')
-		);
-
-		$db_correlations = $this->get([
-			'output' => ['correlationid', 'name', 'description', 'status'],
-			'selectFilter' => ['formula', 'eval_formula', 'evaltype', 'conditions'],
-			'selectOperations' => ['type'],
-			'correlationids' => zbx_objectValues($correlations, 'correlationid'),
-			'preservekeys' => true
-		]);
+		self::validateUpdate($correlations, $db_correlations);
 
-		$check_names = [];
+		$upd_correlations = [];
 
 		foreach ($correlations as $correlation) {
-			// Check if this correlation exists.
-			if (!array_key_exists($correlation['correlationid'], $db_correlations)) {
-				self::exception(ZBX_API_ERROR_PERMISSIONS,
-					_('No permissions to referred object or it does not exist!')
-				);
-			}
-
-			// Validate "name" field (optional).
-			if (array_key_exists('name', $correlation)) {
-				if (is_array($correlation['name'])) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect arguments passed to function.'));
-				}
-				elseif ($correlation['name'] === '' || $correlation['name'] === null || $correlation['name'] === false) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _('Correlation name cannot be empty.'));
-				}
-
-				if ($db_correlations[$correlation['correlationid']]['name'] !== $correlation['name']) {
-					$check_names[] = $correlation;
-				}
-			}
-		}
+			$db_correlation = $db_correlations[$correlation['correlationid']];
 
-		// Check only if names have changed.
-		if ($check_names) {
-			// Check for duplicate names.
-			$duplicate = CArrayHelper::findDuplicate($check_names, 'name');
-			if ($duplicate) {
-				self::exception(ZBX_API_ERROR_PARAMETERS,
-					_s('Duplicate "%1$s" value "%2$s" for correlation.', 'name', $duplicate['name'])
-				);
+			if (array_key_exists('filter', $correlation)) {
+				$correlation['evaltype'] = $correlation['filter']['evaltype'];
+				$db_correlation['evaltype'] = $db_correlation['filter']['evaltype'];
 			}
 
-			// Check if correlation already exists.
-			$db_correlation_names = API::getApiService()->select('correlation', [
-				'output' => ['correlationid', 'name'],
-				'filter' => ['name' => zbx_objectValues($check_names, 'name')]
-			]);
-			$db_correlation_names = zbx_toHash($db_correlation_names, 'name');
+			$upd_correlation = DB::getUpdatedValues('correlation', $correlation, $db_correlation);
 
-			foreach ($check_names as $correlation) {
-				if (array_key_exists($correlation['name'], $db_correlation_names)
-						&& bccomp($db_correlation_names[$correlation['name']]['correlationid'],
-							$correlation['correlationid']) != 0) {
-					self::exception(ZBX_API_ERROR_PARAMETERS,
-						_s('Correlation "%1$s" already exists.', $correlation['name'])
-					);
-				}
+			if ($upd_correlation) {
+				$upd_correlations[] = [
+					'values' => $upd_correlation,
+					'where' => ['correlationid' => $correlation['correlationid']]
+				];
 			}
 		}
 
-		// Set all necessary validators and parser before cycling each correlation.
-		$status_validator = new CLimitedSetValidator([
-			'values' => [ZBX_CORRELATION_ENABLED, ZBX_CORRELATION_DISABLED]
-		]);
-
-		$filter_evaltype_validator = new CLimitedSetValidator([
-			'values' => [CONDITION_EVAL_TYPE_OR, CONDITION_EVAL_TYPE_AND, CONDITION_EVAL_TYPE_AND_OR,
-				CONDITION_EVAL_TYPE_EXPRESSION
-			]
-		]);
-
-		$filter_condition_type_validator = new CLimitedSetValidator([
-			'values' => [ZBX_CORR_CONDITION_OLD_EVENT_TAG, ZBX_CORR_CONDITION_NEW_EVENT_TAG,
-				ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP,	ZBX_CORR_CONDITION_EVENT_TAG_PAIR,
-				ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE,	ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE
-			]
-		]);
-
-		$filter_condition_hg_operator_validator = new CLimitedSetValidator([
-			'values' => [CONDITION_OPERATOR_EQUAL, CONDITION_OPERATOR_NOT_EQUAL]
-		]);
-
-		$filter_condition_tagval_operator_validator = new CLimitedSetValidator([
-			'values' => [CONDITION_OPERATOR_EQUAL, CONDITION_OPERATOR_NOT_EQUAL, CONDITION_OPERATOR_LIKE,
-				CONDITION_OPERATOR_NOT_LIKE
-			]
-		]);
-
-		$filter_operations_validator = new CLimitedSetValidator([
-			'values' => [ZBX_CORR_OPERATION_CLOSE_OLD, ZBX_CORR_OPERATION_CLOSE_NEW]
-		]);
-
-		$parser = new CConditionFormula();
-
-		$groupids = [];
-
-		// Populate "name" field, if not set.
-		$correlations = $this->extendFromObjects(zbx_toHash($correlations, 'correlationid'), $db_correlations,
-			['name']
-		);
-
-		foreach ($correlations as $correlation) {
-			$db_correlation = $db_correlations[$correlation['correlationid']];
-
-			// Validate "status" field (optional).
-			if (array_key_exists('status', $correlation) && !$status_validator->validate($correlation['status'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-					'Incorrect value "%1$s" in field "%2$s" for correlation "%3$s".',
-					$correlation['status'],
-					'status',
-					$correlation['name']
-				));
-			}
-
-			// Validate "filter" field. If filter is set, then something else must exist.
-			if (array_key_exists('filter', $correlation)) {
-				if (!is_array($correlation['filter']) || !$correlation['filter']) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect arguments passed to function.'));
-				}
-
-				$evaltype_changed = false;
-
-				// Validate "evaltype" field.
-				if (array_key_exists('evaltype', $correlation['filter'])) {
-					// Check if evaltype has changed.
-					if ($correlation['filter']['evaltype'] != $db_correlation['filter']['evaltype']) {
-						if (!$filter_evaltype_validator->validate($correlation['filter']['evaltype'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-								'Incorrect value "%1$s" in field "%2$s" for correlation "%3$s".',
-								$correlation['filter']['evaltype'],
-								'evaltype',
-								$correlation['name']
-							));
-						}
-
-						$evaltype_changed = true;
-					}
-				}
-				else {
-					// Populate "evaltype" field if not set, so we can later check for custom expressions.
-					$correlation['filter']['evaltype'] = $db_correlation['filter']['evaltype'];
-				}
-
-				if ($evaltype_changed) {
-					if ($correlation['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
-						if (!array_key_exists('formula', $correlation['filter'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS,
-								_s('No "%1$s" given for correlation "%2$s".', 'formula', $correlation['name'])
-							);
-						}
-
-						$this->validateFormula($correlation, $parser);
-
-						if (!array_key_exists('conditions', $correlation['filter'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS,
-								_s('No "%1$s" given for correlation "%2$s".', 'conditions', $correlation['name'])
-							);
-						}
+		if ($upd_correlations) {
+			DB::update('correlation', $upd_correlations);
+		}
 
-						$groupids = $this->validateConditions($correlation, $filter_condition_type_validator,
-							$filter_condition_hg_operator_validator, $filter_condition_tagval_operator_validator
-						);
+		self::updateConditions($correlations, __FUNCTION__, $db_correlations);
+		self::updateOperations($correlations, __FUNCTION__, $db_correlations);
 
-						$this->validateConditionFormulaIDs($correlation, $parser);
-					}
-					else {
-						if (!array_key_exists('conditions', $correlation['filter'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS,
-								_s('No "%1$s" given for correlation "%2$s".', 'conditions', $correlation['name'])
-							);
-						}
+		self::addAuditLog(CAudit::ACTION_UPDATE, CAudit::RESOURCE_CORRELATION, $correlations, $db_correlations);
 
-						$groupids = $this->validateConditions($correlation, $filter_condition_type_validator,
-							$filter_condition_hg_operator_validator, $filter_condition_tagval_operator_validator
-						);
-					}
-				}
-				else {
-					if ($correlation['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
-						if (array_key_exists('formula', $correlation['filter'])) {
-							$this->validateFormula($correlation, $parser);
-
-							if (!array_key_exists('conditions', $correlation['filter'])) {
-								self::exception(ZBX_API_ERROR_PARAMETERS,
-									_s('No "%1$s" given for correlation "%2$s".', 'conditions', $correlation['name'])
-								);
-							}
+		return ['correlationids' => array_column($correlations, 'correlationid')];
+	}
 
-							$groupids = $this->validateConditions($correlation, $filter_condition_type_validator,
-								$filter_condition_hg_operator_validator, $filter_condition_tagval_operator_validator
-							);
+	/**
+	 * @param array $correlationids
+	 *
+	 * @return array
+	 */
+	public function delete(array $correlationids): array {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'correlation', __FUNCTION__)
+			);
+		}
 
-							$this->validateConditionFormulaIDs($correlation, $parser);
-						}
-						elseif (array_key_exists('conditions', $correlation['filter'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS,
-								_s('No "%1$s" given for correlation "%2$s".', 'formula', $correlation['name'])
-							);
-						}
-					}
-					elseif (array_key_exists('conditions', $correlation['filter'])) {
-						$groupids = $this->validateConditions($correlation, $filter_condition_type_validator,
-							$filter_condition_hg_operator_validator, $filter_condition_tagval_operator_validator
-						);
-					}
-				}
-			}
+		self::validateDelete($correlationids, $db_correlations);
 
-			// Validate operations (optional).
-			if (array_key_exists('operations', $correlation)) {
-				$this->validateOperations($correlation, $filter_operations_validator);
-			}
-		}
+		DB::delete('correlation', ['correlationid' => $correlationids]);
 
-		// Validate collected group IDs if at least one of correlation conditions was "New event host group".
-		if ($groupids) {
-			$groups_count = API::HostGroup()->get([
-				'countOutput' => true,
-				'groupids' => array_keys($groupids)
-			]);
+		self::addAuditLog(CAudit::ACTION_DELETE, CAudit::RESOURCE_CORRELATION, $db_correlations);
 
-			if ($groups_count != count($groupids)) {
-				self::exception(ZBX_API_ERROR_PERMISSIONS,
-					_('No permissions to referred object or it does not exist!')
-				);
-			}
-		}
+		return ['correlationids' => $correlationids];
 	}
 
 	/**
-	 * Converts a formula with letters to a formula with IDs and updates it.
+	 * Validates the input parameters for the delete() method.
+	 *
+	 * @static
+	 *
+	 * @param array      $correlationids
+	 * @param array|null $db_correlations
 	 *
-	 * @param string 	$correlationid
-	 * @param string 	$formula_with_letters		Formula with letters.
-	 * @param array 	$conditions
+	 * @throws APIException if the input is invalid.
 	 */
-	protected function updateFormula($correlationid, $formula_with_letters, array $conditions) {
-		$formulaid_to_conditionid = [];
+	private static function validateDelete(array &$correlationids, array &$db_correlations = null): void {
+		$api_input_rules = ['type' => API_IDS, 'flags' => API_NOT_EMPTY, 'uniq' => true];
 
-		foreach ($conditions as $condition) {
-			$formulaid_to_conditionid[$condition['formulaid']] = $condition['corr_conditionid'];
+		if (!CApiInputValidator::validate($api_input_rules, $correlationids, '/', $error)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
-		$formula = CConditionHelper::replaceLetterIds($formula_with_letters, $formulaid_to_conditionid);
 
-		DB::updateByPk('correlation', $correlationid, ['formula' => $formula]);
+		$db_correlations = DB::select('correlation', [
+			'output' => ['correlationid', 'name'],
+			'correlationids' => $correlationids,
+			'preservekeys' => true
+		]);
+
+		if (count($db_correlations) != count($correlationids)) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
+		}
 	}
 
 	/**
-	 * Validate correlation conditions. Check the "conditions" array, check the "type" field and other fields that
-	 * depend on it. As a result return host group IDs that need to be validated afterwards. Otherwise don't return
-	 * anything, just throw an error.
+	 * Check for unique event correlation names.
 	 *
-	 * @param array					$correlation											One correlation containing the conditions.
-	 * @param string				$correlation['name']									Correlation name for error messages.
-	 * @param array					$correlation['filter']									Correlation filter array containing	the conditions.
-	 * @param array					$correlation['filter']['conditions']					An array of correlation conditions.
-	 * @param int					$correlation['filter']['conditions'][]['type']			Condition type.
-	 *																						Possible values are:
-	 *																							0 - ZBX_CORR_CONDITION_OLD_EVENT_TAG;
-	 *																							1 - ZBX_CORR_CONDITION_NEW_EVENT_TAG;
-	 *																							2 - ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP;
-	 *																							3 - ZBX_CORR_CONDITION_EVENT_TAG_PAIR;
-	 *																							4 - ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE;
-	 *																							5 - ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE.
-	 * @param int					$correlation['filter']['conditions'][]['operator']		Correlation condition operator.
-	 *																						Possible values when "type"
-	 *																						is one of the following:
-	 *																							2 - ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP;
-	 *																							4 - ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE;
-	 *																							5 - ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE.
-	 *																						Possible values depend on type:
-	 *																							for type ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP:
-	 *																								0 - CONDITION_OPERATOR_EQUAL
-	 *																								1 - CONDITION_OPERATOR_NOT_EQUAL
-	 *																							for types ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE
-	 *																							or ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE:
-	 *																								0 - CONDITION_OPERATOR_EQUAL;
-	 *																								1 - CONDITION_OPERATOR_NOT_EQUAL;
-	 *																								2 - CONDITION_OPERATOR_LIKE;
-	 *																								3 - CONDITION_OPERATOR_NOT_LIKE.
-	 * @param string				$correlations['filter']['conditions'][]['groupid']		Correlation host group ID.
-	 *																						Required when "type" is:
-	 *																							2 - ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP.
-	 * @param CLimitedSetValidator	$filter_condition_type_validator						Validator for conditype type.
-	 * @param CLimitedSetValidator	$filter_condition_hg_operator_validator					Validator for host group operator.
-	 * @param CLimitedSetValidator	$filter_condition_tagval_operator_validator				Validator for tag value operator.
+	 * @static
 	 *
-	 * @throws APIException if the input is invalid.
+	 * @param array      $correlations
+	 * @param array|null $db_correlations
 	 *
-	 * @return array
+	 * @throws APIException if event correlation  names are not unique.
 	 */
-	protected function validateConditions(array $correlation, CLimitedSetValidator $filter_condition_type_validator,
-			CLimitedSetValidator $filter_condition_hg_operator_validator,
-			CLimitedSetValidator $filter_condition_tagval_operator_validator) {
-		if (!$correlation['filter']['conditions']) {
-			self::exception(ZBX_API_ERROR_PARAMETERS,
-				_s('No "%1$s" given for correlation "%2$s".', 'conditions', $correlation['name'])
-			);
-		}
+	protected static function checkDuplicates(array $correlations, array $db_correlations = null): void {
+		$names = [];
 
-		if (!is_array($correlation['filter']['conditions'])) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect arguments passed to function.'));
-		}
-
-		$groupids = [];
-		$formulaIds = [];
-		$conditions = [];
-
-		foreach ($correlation['filter']['conditions'] as $condition) {
-			if (!array_key_exists('type', $condition)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS,
-					_s('No condition type given for correlation "%1$s".', $correlation['name'])
-				);
-			}
-			elseif (is_array($condition['type'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect arguments passed to function.'));
-			}
-			elseif (!$filter_condition_type_validator->validate($condition['type'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-					'Incorrect value "%1$s" in field "%2$s" for correlation "%3$s".',
-					$condition['type'],
-					'type',
-					$correlation['name']
-				));
-			}
-
-			switch ($condition['type']) {
-				case ZBX_CORR_CONDITION_OLD_EVENT_TAG:
-				case ZBX_CORR_CONDITION_NEW_EVENT_TAG:
-					if (!array_key_exists('tag', $condition)) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_s('No "%1$s" given for correlation "%2$s".', 'tag', $correlation['name'])
-						);
-					}
-					elseif (is_array($condition['tag'])) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_('Incorrect arguments passed to function.')
-						);
-					}
-					elseif ($condition['tag'] === '' || $condition['tag'] === null || $condition['tag'] === false) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_s('Incorrect value for field "%1$s": %2$s.', 'tag', _('cannot be empty'))
-						);
-					}
-					break;
-
-				case ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP:
-					if (array_key_exists('operator', $condition)) {
-						if (is_array($condition['operator'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS,
-								_('Incorrect arguments passed to function.')
-							);
-						}
-						elseif (!$filter_condition_hg_operator_validator->validate($condition['operator'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-								'Incorrect value "%1$s" in field "%2$s" for correlation "%3$s".',
-								$condition['operator'],
-								'operator',
-								$correlation['name']
-							));
-						}
-					}
-
-					if (!array_key_exists('groupid', $condition)) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_s('No "%1$s" given for correlation "%2$s".', 'groupid', $correlation['name'])
-						);
-					}
-					elseif (is_array($condition['groupid'])) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_('Incorrect arguments passed to function.')
-						);
-					}
-					elseif ($condition['groupid'] === '' || $condition['groupid'] === null
-							|| $condition['groupid'] === false) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_s('Incorrect value for field "%1$s": %2$s.', 'groupid', _('cannot be empty'))
-						);
-					}
-
-					$groupids[$condition['groupid']] = true;
-					break;
-
-				case ZBX_CORR_CONDITION_EVENT_TAG_PAIR:
-					if (!array_key_exists('oldtag', $condition)) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_s('No "%1$s" given for correlation "%2$s".', 'oldtag', $correlation['name'])
-						);
-					}
-					elseif (is_array($condition['oldtag'])) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_('Incorrect arguments passed to function.')
-						);
-					}
-					elseif ($condition['oldtag'] === '' || $condition['oldtag'] === null
-							|| $condition['oldtag'] === false) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_s('Incorrect value for field "%1$s": %2$s.', 'oldtag', _('cannot be empty'))
-						);
-					}
-
-					if (!array_key_exists('newtag', $condition)) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_s('No "%1$s" given for correlation "%2$s".', 'newtag', $correlation['name'])
-						);
-					}
-					elseif (is_array($condition['newtag'])) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_('Incorrect arguments passed to function.')
-						);
-					}
-					elseif ($condition['newtag'] === '' || $condition['newtag'] === null
-							|| $condition['newtag'] === false) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_s('Incorrect value for field "%1$s": %2$s.', 'newtag', _('cannot be empty'))
-						);
-					}
-					break;
-
-				case ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE:
-				case ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE:
-					if (!array_key_exists('tag', $condition)) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_s('No "%1$s" given for correlation "%2$s".', 'tag', $correlation['name'])
-						);
-					}
-					elseif (is_array($condition['tag'])) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_('Incorrect arguments passed to function.')
-						);
-					}
-					elseif ($condition['tag'] === '' || $condition['tag'] === null || $condition['tag'] === false) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_s('Incorrect value for field "%1$s": %2$s.', 'tag', _('cannot be empty'))
-						);
-					}
-
-					if (array_key_exists('operator', $condition)) {
-						if (is_array($condition['operator'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS,
-								_('Incorrect arguments passed to function.')
-							);
-						}
-						elseif (($condition['operator'] == CONDITION_OPERATOR_LIKE
-									|| $condition['operator'] == CONDITION_OPERATOR_NOT_LIKE)
-								&& (!array_key_exists('value', $condition) || $condition['value'] === '')) {
-							self::exception(ZBX_API_ERROR_PARAMETERS,
-								_s('Incorrect value for field "%1$s": %2$s.', 'value', _('cannot be empty'))
-							);
-						}
-						elseif (!$filter_condition_tagval_operator_validator->validate($condition['operator'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-								'Incorrect value "%1$s" in field "%2$s" for correlation "%3$s".',
-								$condition['operator'],
-								'operator',
-								$correlation['name']
-							));
-						}
-					}
-					break;
+		foreach ($correlations as $correlation) {
+			if (!array_key_exists('name', $correlation)) {
+				continue;
 			}
 
-			if ($correlation['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
-				if (array_key_exists($condition['formulaid'], $formulaIds)) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-						'Duplicate "%1$s" value "%2$s" for correlation "%3$s".', 'formulaid', $condition['formulaid'],
-							$correlation['name']
-					));
-				}
-				else {
-					$formulaIds[$condition['formulaid']] = true;
-				}
+			if ($db_correlations === null
+					|| $correlation['name'] !== $db_correlations[$correlation['correlationid']]['name']) {
+				$names[] = $correlation['name'];
 			}
+		}
 
-			unset($condition['formulaid']);
-			$conditions[] = $condition;
+		if (!$names) {
+			return;
 		}
 
-		if (count($conditions) != count(array_unique($conditions, SORT_REGULAR))) {
-			self::exception(ZBX_API_ERROR_PARAMETERS,
-				_s('Duplicate conditions for correlation "%1$s".', $correlation['name'])
-			);
+		$duplicates = DB::select('correlation', [
+			'output' => ['name'],
+			'filter' => ['name' => $names],
+			'limit' => 1
+		]);
+
+		if ($duplicates) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Correlation "%1$s" already exists.', $duplicates[0]['name']));
 		}
+	}
 
-		return $groupids;
+	/**
+	 * Returns validation rules for the filter object.
+	 *
+	 * @static
+	 *
+	 * @return array
+	 */
+	private static function getFilterValidationRules(): array {
+		$condition_fields = [
+			'type' =>		['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => implode(',', [ZBX_CORR_CONDITION_OLD_EVENT_TAG, ZBX_CORR_CONDITION_NEW_EVENT_TAG, ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP, ZBX_CORR_CONDITION_EVENT_TAG_PAIR, ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE, ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE])],
+			'operator' =>	['type' => API_MULTIPLE, 'rules' => [
+								['if' => ['field' => 'type', 'in' => ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP], 'type' => API_INT32, 'in' => implode(',', [CONDITION_OPERATOR_EQUAL, CONDITION_OPERATOR_NOT_EQUAL])],
+								['if' => ['field' => 'type', 'in' => implode(',', [ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE, ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE])], 'type' => API_INT32, 'in' => implode(',', [CONDITION_OPERATOR_EQUAL, CONDITION_OPERATOR_NOT_EQUAL, CONDITION_OPERATOR_LIKE, CONDITION_OPERATOR_NOT_LIKE])],
+								['else' => true, 'type' => API_INT32, 'in' => CONDITION_OPERATOR_EQUAL]
+			]],
+			'tag' =>		['type' => API_MULTIPLE, 'rules' => [
+								['if' => ['field' => 'type', 'in' => implode(',', [ZBX_CORR_CONDITION_OLD_EVENT_TAG, ZBX_CORR_CONDITION_NEW_EVENT_TAG, ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE, ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE])], 'type' => API_STRING_UTF8, 'flags' => API_REQUIRED | API_NOT_EMPTY, 'length' => DB::getFieldLength('corr_condition_tag', 'tag')],
+								['else' => true, 'type' => API_UNEXPECTED]
+			]],
+			'groupid' =>	['type' => API_MULTIPLE, 'rules' => [
+								['if' => ['field' => 'type', 'in' => ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP], 'type' => API_ID, 'flags' => API_REQUIRED],
+								['else' => true, 'type' => API_UNEXPECTED]
+			]],
+			'oldtag' =>		['type' => API_MULTIPLE, 'rules' => [
+								['if' => ['field' => 'type', 'in' => ZBX_CORR_CONDITION_EVENT_TAG_PAIR], 'type' => API_STRING_UTF8, 'flags' => API_REQUIRED | API_NOT_EMPTY, 'length' => DB::getFieldLength('corr_condition_tagpair', 'oldtag')],
+								['else' => true, 'type' => API_UNEXPECTED]
+			]],
+			'newtag' =>		['type' => API_MULTIPLE, 'rules' => [
+								['if' => ['field' => 'type', 'in' => ZBX_CORR_CONDITION_EVENT_TAG_PAIR], 'type' => API_STRING_UTF8, 'flags' => API_REQUIRED | API_NOT_EMPTY, 'length' => DB::getFieldLength('corr_condition_tagpair', 'newtag')],
+								['else' => true, 'type' => API_UNEXPECTED]
+			]],
+			'value' =>		['type' => API_MULTIPLE, 'rules' => [
+								['if' => ['field' => 'type', 'in' => implode(',', [ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE, ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE])], 'type' => API_STRING_UTF8, 'flags' => API_REQUIRED, 'length' => DB::getFieldLength('corr_condition_tagvalue', 'value')],
+								['else' => true, 'type' => API_UNEXPECTED]
+			]]
+		];
+
+		return ['type' => API_OBJECT, 'fields' => [
+			'evaltype' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => implode(',', [CONDITION_EVAL_TYPE_AND_OR, CONDITION_EVAL_TYPE_AND, CONDITION_EVAL_TYPE_OR, CONDITION_EVAL_TYPE_EXPRESSION])],
+			'formula' =>	['type' => API_MULTIPLE, 'rules' => [
+								['if' => ['field' => 'evaltype', 'in' => CONDITION_EVAL_TYPE_EXPRESSION], 'type' => API_COND_FORMULA, 'flags' => API_REQUIRED, 'length' => DB::getFieldLength('correlation', 'formula')],
+								['else' => true, 'type' => API_UNEXPECTED]
+			]],
+			'conditions' =>	['type' => API_MULTIPLE, 'flags' => API_REQUIRED, 'rules' => [
+								['if' => ['field' => 'evaltype', 'in' => CONDITION_EVAL_TYPE_EXPRESSION], 'type' => API_OBJECTS, 'flags' => API_NOT_EMPTY, 'uniq' => [['formulaid']], 'fields' => [
+									'formulaid' =>	['type' => API_COND_FORMULAID, 'flags' => API_REQUIRED]
+								] + $condition_fields],
+								['else' => true, 'type' => API_OBJECTS, 'flags' => API_NOT_EMPTY, 'fields' => $condition_fields]
+			]]
+		]];
 	}
 
 	/**
-	 * Validate correlation filter "formula" field.
+	 * Validates the input parameters for the create() method.
 	 *
-	 * @param array				$correlation						One correlation containing the filter, formula and name.
-	 * @param string			$correlation['name']				Correlation name for error messages.
-	 * @param array				$correlation['filter']				Correlation filter array containing the formula.
-	 * @param string			$correlation['filter']['formula']	User-defined expression to be used for evaluating
-	 *																conditions of filters with a custom expression.
-	 * @param CConditionFormula $parser								Condition formula parser.
+	 * @static
+	 *
+	 * @param array $correlations
 	 *
 	 * @throws APIException if the input is invalid.
 	 */
-	protected function validateFormula(array $correlation, CConditionFormula $parser) {
-		if (is_array($correlation['filter']['formula'])) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect arguments passed to function.'));
+	private static function validateCreate(array &$correlations): void {
+		$api_input_rules = ['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['name']], 'fields' => [
+			'name' =>			['type' => API_STRING_UTF8, 'flags' => API_REQUIRED | API_NOT_EMPTY, 'length' => DB::getFieldLength('correlation', 'name')],
+			'description' =>	['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('correlation', 'description')],
+			'status' =>			['type' => API_INT32, 'in' => implode(',', [ZBX_CORRELATION_ENABLED, ZBX_CORRELATION_DISABLED])],
+			'filter' =>			self::getFilterValidationRules() + ['flags' => API_REQUIRED],
+			'operations' =>		['type' => API_OBJECTS, 'flags' => API_REQUIRED | API_NOT_EMPTY, 'uniq' => [['type']], 'fields' => [
+				'type' =>			['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => implode(',', [ZBX_CORR_OPERATION_CLOSE_OLD, ZBX_CORR_OPERATION_CLOSE_NEW])]
+			]]
+		]];
+
+		if (!CApiInputValidator::validate($api_input_rules, $correlations, '/', $error)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
 
-		if (!$parser->parse($correlation['filter']['formula'])) {
-			self::exception(ZBX_API_ERROR_PARAMETERS,
-				_s('Incorrect custom expression "%2$s" for correlation "%1$s": %3$s.',
-					$correlation['name'], $correlation['filter']['formula'], $parser->error
-				)
-			);
-		}
+		self::checkDuplicates($correlations);
+		self::validateFormula($correlations);
+		self::checkHostGroups($correlations);
 	}
 
 	/**
-	 * Validate correlation condition formula IDs. Check the "formulaid" field and that formula matches the conditions.
+	 * Check host group permissions.
 	 *
-	 * @param array				$correlation										One correlation containing array of
-	 *																				conditions and name.
-	 * @param string			$correlation['name']								Correlation name for error messages.
-	 * @param array				$correlation['filter']								Correlation filter array containing
-	 *																				the conditions.
-	 * @param array				$correlation['filter']['conditions']				An array of correlation conditions.
-	 * @param string			$correlation['filter']['conditions'][]['formulaid']	Condition formula ID.
-	 * @param CConditionFormula $parser												Condition formula parser.
+	 * @static
 	 *
-	 * @throws APIException if the input is invalid.
+	 * @param array $correlations
 	 */
-	protected function validateConditionFormulaIDs(array $correlation, CConditionFormula $parser) {
-		foreach ($correlation['filter']['conditions'] as $condition) {
-			if (!array_key_exists('formulaid', $condition)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS,
-					_s('No "%1$s" given for correlation "%2$s".', 'formulaid', $correlation['name'])
-				);
-			}
-			elseif (is_array($condition['formulaid'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect arguments passed to function.'));
-			}
-			elseif (!preg_match('/[A-Z]+/', $condition['formulaid'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS,
-					_s('Incorrect filter condition formula ID given for correlation "%1$s".', $correlation['name'])
-				);
-			}
-		}
+	private static function checkHostGroups(array $correlations): void {
+		$groupids = [];
 
-		$conditions = zbx_toHash($correlation['filter']['conditions'], 'formulaid');
-		$constants = array_unique(zbx_objectValues($parser->constants, 'value'));
+		foreach ($correlations as $correlation) {
+			if (!array_key_exists('filter', $correlation) || !array_key_exists('conditions', $correlation['filter'])) {
+				continue;
+			}
 
-		foreach ($constants as $constant) {
-			if (!array_key_exists($constant, $conditions)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-					'Condition "%2$s" used in formula "%3$s" for correlation "%1$s" is not defined.',
-					$correlation['name'], $constant, $correlation['filter']['formula']
-				));
+			foreach ($correlation['filter']['conditions'] as $condition) {
+				if ($condition['type'] == ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP) {
+					$groupids[$condition['groupid']] = true;
+				}
 			}
+		}
 
-			unset($conditions[$constant]);
+		if (!$groupids) {
+			return;
 		}
 
-		// Check that the "conditions" array has no unused conditions.
-		if ($conditions) {
-			$condition = reset($conditions);
-			self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-				'Condition "%2$s" is not used in formula "%3$s" for correlation "%1$s".', $correlation['name'],
-				$condition['formulaid'], $correlation['filter']['formula']
-			));
+		$groups_count = API::HostGroup()->get([
+			'countOutput' => true,
+			'groupids' => array_keys($groupids)
+		]);
+
+		if ($groups_count != count($groupids)) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
 		}
 	}
 
 	/**
-	 * Validate correlation operations. Check if "operations" is valid, if "type" is valid and there are no duplicate
-	 * operations in correlation.
+	 * @static
 	 *
-	 * @param array					$correlation						One correlation containing array of operations and name.
-	 * @param string				$correlation['name']				Correlation name for error messages.
-	 * @param array					$correlation['operations']			An array of correlation operations.
-	 * @param int					$correlation['operations']['type']	Correlation operation type.
-	 *																	Possible values are:
-	 *																		0 - ZBX_CORR_OPERATION_CLOSE_OLD;
-	 *																		1 - ZBX_CORR_OPERATION_CLOSE_NEW.
-	 * @param CLimitedSetValidator	$filter_operations_validator		Operations validator.
+	 * @param array      $correlations
+	 * @param array|null $db_correlations
 	 *
 	 * @throws APIException if the input is invalid.
 	 */
-	protected function validateOperations(array $correlation, CLimitedSetValidator $filter_operations_validator) {
-		if (!is_array($correlation['operations'])) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect arguments passed to function.'));
-		}
-		elseif (!$correlation['operations']) {
-			self::exception(ZBX_API_ERROR_PARAMETERS,
-				_s('No "%1$s" given for correlation "%2$s".', 'operations', $correlation['name'])
-			);
+	private static function validateUpdate(array &$correlations, array &$db_correlations = null): void {
+		$api_input_rules = ['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['correlationid'], ['name']], 'fields' => [
+			'correlationid' =>	['type' => API_ID, 'flags' => API_REQUIRED],
+			'name' =>			['type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY, 'length' => DB::getFieldLength('correlation', 'name')],
+			'description' =>	['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('correlation', 'description')],
+			'status' =>			['type' => API_INT32, 'in' => implode(',', [ZBX_CORRELATION_ENABLED, ZBX_CORRELATION_DISABLED])],
+			'filter' =>			self::getFilterValidationRules(),
+			'operations' =>		['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY, 'uniq' => [['type']], 'fields' => [
+				'type' =>			['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => implode(',', [ZBX_CORR_OPERATION_CLOSE_OLD, ZBX_CORR_OPERATION_CLOSE_NEW])]
+			]]
+		]];
+
+		if (!CApiInputValidator::validate($api_input_rules, $correlations, '/', $error)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
 
-		foreach ($correlation['operations'] as $operation) {
-			if (!array_key_exists('type', $operation)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS,
-					_s('No operation type given for correlation "%1$s".', $correlation['name'])
-				);
-			}
-			elseif (is_array($operation['type'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect arguments passed to function.'));
-			}
+		$db_correlations = DB::select('correlation', [
+			'output' => ['correlationid', 'name', 'description', 'status'],
+			'correlationids' => array_column($correlations, 'correlationid'),
+			'preservekeys' => true
+		]);
 
-			if (!$filter_operations_validator->validate($operation['type'])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-					'Incorrect value "%1$s" in field "%2$s" for correlation "%3$s".',
-					$operation['type'],
-					'type',
-					$correlation['name']
-				));
-			}
+		if (count($correlations) != count($db_correlations)) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
 		}
 
-		// Check that same operation types do not repeat.
-		$duplicate = CArrayHelper::findDuplicate($correlation['operations'], 'type');
-		if ($duplicate) {
-			self::exception(ZBX_API_ERROR_PARAMETERS,
-				_s('Duplicate "%1$s" value "%2$s" for correlation "%3$s".', 'type', $duplicate['type'],
-					$correlation['name']
-				)
-			);
-		}
+		self::checkDuplicates($correlations, $db_correlations);
+
+		self::addAffectedObjects($correlations, $db_correlations);
+		self::validateFormula($correlations);
+		self::checkHostGroups($correlations);
 	}
 
 	/**
-	 * Insert correlation condition values to their corresponding DB tables.
+	 * Validate correlation condition formula IDs. Check the "formulaid" field and that formula matches the conditions.
 	 *
-	 * @param array $conditions		An array of conditions to create.
+	 * @static
 	 *
-	 * @return array
+	 * @param array $correlations
+	 *
+	 * @throws APIException if the input is invalid.
 	 */
-	protected function addConditions(array $conditions) {
-		$conditions = DB::save('corr_condition', $conditions);
+	protected static function validateFormula(array $correlations): void {
+		$condition_formula_parser = new CConditionFormula();
 
-		$corr_condition_tags_to_create = [];
-		$corr_condition_hostgroups_to_create = [];
-		$corr_condition_tag_pairs_to_create = [];
-		$corr_condition_tag_values_to_create = [];
-
-		foreach ($conditions as $condition) {
-			switch ($condition['type']) {
-				case ZBX_CORR_CONDITION_OLD_EVENT_TAG:
-				case ZBX_CORR_CONDITION_NEW_EVENT_TAG:
-					$corr_condition_tags_to_create[] = $condition;
-					break;
-
-				case ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP:
-					$corr_condition_hostgroups_to_create[] = $condition;
-					break;
-
-				case ZBX_CORR_CONDITION_EVENT_TAG_PAIR:
-					$corr_condition_tag_pairs_to_create[] = $condition;
-					break;
-
-				case ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE:
-				case ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE:
-					$corr_condition_tag_values_to_create[] = $condition;
-					break;
+		foreach ($correlations as $i => $correlation) {
+			if (!array_key_exists('filter', $correlation)) {
+				continue;
 			}
-		}
 
-		if ($corr_condition_tags_to_create) {
-			DB::insert('corr_condition_tag', $corr_condition_tags_to_create, false);
-		}
+			if ($correlation['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
+				$condition_formula_parser->parse($correlation['filter']['formula']);
 
-		if ($corr_condition_hostgroups_to_create) {
-			DB::insert('corr_condition_group', $corr_condition_hostgroups_to_create, false);
-		}
+				$constants = array_column($condition_formula_parser->constants, 'value', 'value');
+				$path = '/'.($i + 1).'/filter';
 
-		if ($corr_condition_tag_pairs_to_create) {
-			DB::insert('corr_condition_tagpair', $corr_condition_tag_pairs_to_create, false);
-		}
+				if (count($correlation['filter']['conditions']) != count($constants)) {
+					self::exception(ZBX_API_ERROR_PARAMETERS,
+						_s('Invalid parameter "%1$s": %2$s.', $path.'/conditions', _('incorrect number of conditions'))
+					);
+				}
 
-		if ($corr_condition_tag_values_to_create) {
-			DB::insert('corr_condition_tagvalue', $corr_condition_tag_values_to_create, false);
+				foreach ($correlation['filter']['conditions'] as $j => $condition) {
+					if (!array_key_exists($condition['formulaid'], $constants)) {
+						self::exception(ZBX_API_ERROR_PARAMETERS, _s('Invalid parameter "%1$s": %2$s.',
+							$path.'/conditions/'.($j + 1).'/formulaid', _('an identifier is not defined in the formula')
+						));
+					}
+				}
+			}
 		}
-
-		return $conditions;
 	}
 
 	/**
 	 * Apply query output options.
 	 *
-	 * @param type $table_name
-	 * @param type $table_alias
+	 * @param string $table_name
+	 * @param string $table_alias
 	 * @param array $options
 	 * @param array $sql_parts
 	 *
@@ -1427,7 +774,7 @@ class CCorrelation extends CApiService {
 	 *
 	 * @return array
 	 */
-	protected function addRelatedObjects(array $options, array $result) {
+	protected function addRelatedObjects(array $options, array $result): array {
 		$result = parent::addRelatedObjects($options, $result);
 
 		$correlationids = array_keys($result);
@@ -1569,4 +916,113 @@ class CCorrelation extends CApiService {
 
 		return $result;
 	}
+
+	/**
+	 * @static
+	 *
+	 * @param array $correlations
+	 * @param array $db_correlations
+	 */
+	private static function addAffectedObjects(array $correlations, array &$db_correlations): void {
+		$correlationids = ['filter' => [], 'operations' => []];
+
+		foreach ($correlations as $correlation) {
+			if (array_key_exists('filter', $correlation)) {
+				$correlationids['filter'][] = $correlation['correlationid'];
+				$db_correlations[$correlation['correlationid']]['filter']['conditions'] = [];
+			}
+
+			if (array_key_exists('operations', $correlation)) {
+				$correlationids['operations'][] = $correlation['correlationid'];
+				$db_correlations[$correlation['correlationid']]['operations'] = [];
+			}
+		}
+
+		if ($correlationids['filter']) {
+			$options = [
+				'output' => ['correlationid', 'evaltype', 'formula'],
+				'filter' => ['correlationid' => $correlationids['filter']]
+			];
+			$db_filters = DBselect(DB::makeSql('correlation', $options));
+
+			while ($db_filter = DBfetch($db_filters)) {
+				$db_correlations[$db_filter['correlationid']]['filter'] =
+					array_diff_key($db_filter, array_flip(['correlationid']));
+			}
+
+			$sql = 'SELECT c.correlationid,c.corr_conditionid,c.type,ct.tag AS ct_tag,'.
+					'cg.operator AS cg_operator,cg.groupid,ctp.oldtag,ctp.newtag,ctv.tag AS ctv_tag,'.
+					'ctv.operator AS ctv_operator,ctv.value'.
+				' FROM corr_condition c'.
+				' LEFT JOIN corr_condition_tag ct ON ct.corr_conditionid=c.corr_conditionid'.
+				' LEFT JOIN corr_condition_group cg ON cg.corr_conditionid=c.corr_conditionid'.
+				' LEFT JOIN corr_condition_tagpair ctp ON ctp.corr_conditionid=c.corr_conditionid'.
+				' LEFT JOIN corr_condition_tagvalue ctv ON ctv.corr_conditionid=c.corr_conditionid'.
+				' WHERE '.dbConditionId('c.correlationid', $correlationids['filter']);
+			$db_conditions = DBselect($sql);
+
+			while ($db_condition = DBfetch($db_conditions)) {
+				$condition = [
+					'corr_conditionid' => $db_condition['corr_conditionid'],
+					'type' => $db_condition['type']
+				];
+
+				switch ($db_condition['type']) {
+					case ZBX_CORR_CONDITION_OLD_EVENT_TAG:
+					case ZBX_CORR_CONDITION_NEW_EVENT_TAG:
+						$condition['tag'] = $db_condition['ct_tag'];
+						$condition['operator'] = CONDITION_OPERATOR_EQUAL;
+						break;
+
+					case ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP:
+						$condition['groupid'] = $db_condition['groupid'];
+						$condition['operator'] = $db_condition['cg_operator'];
+						break;
+
+					case ZBX_CORR_CONDITION_EVENT_TAG_PAIR:
+						$condition['oldtag'] = $db_condition['oldtag'];
+						$condition['newtag'] = $db_condition['newtag'];
+						$condition['operator'] = CONDITION_OPERATOR_EQUAL;
+						break;
+
+					case ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE:
+					case ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE:
+						$condition['tag'] = $db_condition['ctv_tag'];
+						$condition['value'] = $db_condition['value'];
+						$condition['operator'] = $db_condition['ctv_operator'];
+						break;
+				}
+
+				$db_correlations[$db_condition['correlationid']]['filter']['conditions']
+					[$db_condition['corr_conditionid']] = $condition;
+			}
+
+			foreach ($db_correlations as $correlationid => &$db_correlation) {
+				if ($db_correlation['filter']['evaltype'] == CONDITION_EVAL_TYPE_EXPRESSION) {
+					$formula = $db_correlation['filter']['formula'];
+
+					$formulaids = CConditionHelper::getFormulaIds($formula);
+
+					foreach ($db_correlation['filter']['conditions'] as &$db_condition) {
+						$db_condition['formulaid'] = $formulaids[$db_condition['corr_conditionid']];
+					}
+					unset($db_condition);
+				}
+			}
+			unset($db_correlation);
+		}
+
+		if ($correlationids['operations']) {
+			$options = [
+				'output' => ['corr_operationid', 'correlationid', 'type'],
+				'filter' => ['correlationid' => $correlationids['operations']]
+			];
+			$db_operations = DBselect(DB::makeSql('corr_operation', $options));
+
+			while ($db_operation = DBfetch($db_operations)) {
+				$db_correlations[$db_operation['correlationid']]['operations'][$db_operation['corr_operationid']] =
+					array_diff_key($db_operation, array_flip(['correlationid']));
+			}
+		}
+	}
 }
diff --git a/ui/include/classes/api/services/CDashboard.php b/ui/include/classes/api/services/CDashboard.php
index afcbf3996b6..add323220da 100644
--- a/ui/include/classes/api/services/CDashboard.php
+++ b/ui/include/classes/api/services/CDashboard.php
@@ -186,7 +186,7 @@ class CDashboard extends CDashboardGeneral {
 		$this->updateDashboardUsrgrp($dashboards, __FUNCTION__);
 		$this->updatePages($dashboards);
 
-		$this->addAuditBulk(CAudit::ACTION_ADD, CAudit::RESOURCE_DASHBOARD, $dashboards);
+		self::addAuditLog(CAudit::ACTION_ADD, CAudit::RESOURCE_DASHBOARD, $dashboards);
 
 		return ['dashboardids' => $dashboardids];
 	}
@@ -216,11 +216,11 @@ class CDashboard extends CDashboardGeneral {
 			DB::update('dashboard', $upd_dashboards);
 		}
 
-		$this->updateDashboardUser($dashboards, __FUNCTION__);
-		$this->updateDashboardUsrgrp($dashboards, __FUNCTION__);
+		$this->updateDashboardUser($dashboards, __FUNCTION__, $db_dashboards);
+		$this->updateDashboardUsrgrp($dashboards, __FUNCTION__, $db_dashboards);
 		$this->updatePages($dashboards, $db_dashboards);
 
-		$this->addAuditBulk(CAudit::ACTION_UPDATE, CAudit::RESOURCE_DASHBOARD, $dashboards, $db_dashboards);
+		self::addAuditLog(CAudit::ACTION_UPDATE, CAudit::RESOURCE_DASHBOARD, $dashboards, $db_dashboards);
 
 		return ['dashboardids' => array_column($dashboards, 'dashboardid')];
 	}
@@ -235,11 +235,11 @@ class CDashboard extends CDashboardGeneral {
 			'name' =>			['type' => API_STRING_UTF8, 'flags' => API_REQUIRED | API_NOT_EMPTY, 'length' => DB::getFieldLength('dashboard', 'name')],
 			'userid' =>			['type' => API_ID, 'default' => self::$userData['userid']],
 			'private' =>		['type' => API_INT32, 'in' => implode(',', [PUBLIC_SHARING, PRIVATE_SHARING])],
-			'users' =>			['type' => API_OBJECTS, 'fields' => [
+			'users' =>			['type' => API_OBJECTS, 'uniq' => [['userid']], 'fields' => [
 				'userid' =>			['type' => API_ID, 'flags' => API_REQUIRED],
 				'permission' =>		['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => implode(',', [PERM_READ, PERM_READ_WRITE])]
 			]],
-			'userGroups' =>		['type' => API_OBJECTS, 'fields' => [
+			'userGroups' =>		['type' => API_OBJECTS, 'uniq' => [['usrgrpid']], 'fields' => [
 				'usrgrpid' =>		['type' => API_ID, 'flags' => API_REQUIRED],
 				'permission' =>		['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => implode(',', [PERM_READ, PERM_READ_WRITE])]
 			]],
@@ -292,11 +292,11 @@ class CDashboard extends CDashboardGeneral {
 			'name' =>				['type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY, 'length' => DB::getFieldLength('dashboard', 'name')],
 			'userid' =>				['type' => API_ID],
 			'private' =>			['type' => API_INT32, 'in' => implode(',', [PUBLIC_SHARING, PRIVATE_SHARING])],
-			'users' =>				['type' => API_OBJECTS, 'fields' => [
+			'users' =>				['type' => API_OBJECTS, 'uniq' => [['userid']], 'fields' => [
 				'userid' =>				['type' => API_ID, 'flags' => API_REQUIRED],
 				'permission' =>			['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => implode(',', [PERM_READ, PERM_READ_WRITE])]
 			]],
-			'userGroups' =>			['type' => API_OBJECTS, 'fields' => [
+			'userGroups' =>			['type' => API_OBJECTS, 'uniq' => [['usrgrpid']], 'fields' => [
 				'usrgrpid' =>			['type' => API_ID, 'flags' => API_REQUIRED],
 				'permission' =>			['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => implode(',', [PERM_READ, PERM_READ_WRITE])]
 			]],
@@ -487,84 +487,55 @@ class CDashboard extends CDashboardGeneral {
 	/**
 	 * Update table "dashboard_user".
 	 *
-	 * @param array  $dashboards
-	 * @param string $method
+	 * @param array      $dashboards
+	 * @param string     $method
+	 * @param array|null $db_dashboards
 	 */
-	protected function updateDashboardUser(array $dashboards, string $method): void {
-		$dashboards_users = [];
-
-		foreach ($dashboards as $dashboard) {
-			if (array_key_exists('users', $dashboard)) {
-				$dashboards_users[$dashboard['dashboardid']] = [];
+	protected function updateDashboardUser(array &$dashboards, string $method, array $db_dashboards = null): void {
+		$ins_dashboard_users = [];
+		$upd_dashboard_users = [];
+		$del_dashboard_userids = [];
 
-				foreach ($dashboard['users'] as $user) {
-					$dashboards_users[$dashboard['dashboardid']][$user['userid']] = [
-						'permission' => $user['permission']
-					];
-				}
+		foreach ($dashboards as &$dashboard) {
+			if (!array_key_exists('users', $dashboard)) {
+				continue;
 			}
-		}
-
-		if (!$dashboards_users) {
-			return;
-		}
-
-		$db_dashboard_users = ($method === 'update')
-			? DB::select('dashboard_user', [
-				'output' => ['dashboard_userid', 'dashboardid', 'userid', 'permission'],
-				'filter' => ['dashboardid' => array_keys($dashboards_users)]
-			])
-			: [];
 
-		$userids = [];
+			$dashboardid = $dashboard['dashboardid'];
 
-		foreach ($db_dashboard_users as $db_dashboard_user) {
-			$userids[$db_dashboard_user['userid']] = true;
-		}
+			$db_dashboard_users = ($method === 'update')
+				? array_column($db_dashboards[$dashboardid]['users'], null, 'userid')
+				: [];
 
-		// get list of accessible users
-		$db_users = $userids
-			? API::User()->get([
-				'output' => [],
-				'preservekeys' => true
-			])
-			: [];
+			foreach ($dashboard['users'] as &$dashboard_user) {
+				$userid = $dashboard_user['userid'];
 
-		$ins_dashboard_users = [];
-		$upd_dashboard_users = [];
-		$del_dashboard_userids = [];
+				if (array_key_exists($userid, $db_dashboard_users)) {
+					$dashboard_user['dashboard_userid'] = $db_dashboard_users[$userid]['dashboard_userid'];
 
-		foreach ($db_dashboard_users as $db_dashboard_user) {
-			$dashboardid = $db_dashboard_user['dashboardid'];
-			$userid = $db_dashboard_user['userid'];
+					if ($dashboard_user['permission'] != $db_dashboard_users[$userid]['permission']) {
+						$upd_dashboard_users[] = [
+							'values' => ['permission' => $dashboard_user['permission']],
+							'where' => ['dashboard_userid' => $db_dashboard_users[$userid]['dashboard_userid']]
+						];
+					}
 
-			if (array_key_exists($userid, $dashboards_users[$dashboardid])) {
-				if ($dashboards_users[$dashboardid][$userid]['permission'] != $db_dashboard_user['permission']) {
-					$upd_dashboard_users[] = [
-						'values' => ['permission' => $dashboards_users[$dashboardid][$userid]['permission']],
-						'where' => ['dashboard_userid' => $db_dashboard_user['dashboard_userid']]
-					];
+					unset($db_dashboard_users[$userid]);
+				}
+				else {
+					$ins_dashboard_users[] = ['dashboardid' => $dashboardid] + $dashboard_user;
 				}
-
-				unset($dashboards_users[$dashboardid][$userid]);
-			}
-			elseif (array_key_exists($userid, $db_users)) {
-				$del_dashboard_userids[] = $db_dashboard_user['dashboard_userid'];
 			}
-		}
+			unset($dashboard_user);
 
-		foreach ($dashboards_users as $dashboardid => $users) {
-			foreach ($users as $userid => $user) {
-				$ins_dashboard_users[] = [
-					'dashboardid' => $dashboardid,
-					'userid' => $userid,
-					'permission' => $user['permission']
-				];
-			}
+			$del_dashboard_userids = array_merge($del_dashboard_userids,
+				array_column($db_dashboard_users, 'dashboard_userid')
+			);
 		}
+		unset($dashboard);
 
 		if ($ins_dashboard_users) {
-			DB::insertBatch('dashboard_user', $ins_dashboard_users);
+			$dashboard_userids = DB::insert('dashboard_user', $ins_dashboard_users);
 		}
 
 		if ($upd_dashboard_users) {
@@ -574,89 +545,74 @@ class CDashboard extends CDashboardGeneral {
 		if ($del_dashboard_userids) {
 			DB::delete('dashboard_user', ['dashboard_userid' => $del_dashboard_userids]);
 		}
+
+		foreach ($dashboards as &$dashboard) {
+			if (!array_key_exists('users', $dashboard)) {
+				continue;
+			}
+
+			foreach ($dashboard['users'] as &$user) {
+				if (!array_key_exists('dashboard_userid', $user)) {
+					$user['dashboard_userid'] = array_shift($dashboard_userids);
+				}
+			}
+			unset($user);
+		}
+		unset($dashboard);
 	}
 
 	/**
 	 * Update table "dashboard_usrgrp".
 	 *
-	 * @param array  $dashboards
-	 * @param string $method
+	 * @param array      $dashboards
+	 * @param string     $method
+	 * @param array|null $db_dashboards
 	 */
-	protected function updateDashboardUsrgrp(array $dashboards, string $method): void {
-		$dashboards_usrgrps = [];
-
-		foreach ($dashboards as $dashboard) {
-			if (array_key_exists('userGroups', $dashboard)) {
-				$dashboards_usrgrps[$dashboard['dashboardid']] = [];
+	protected function updateDashboardUsrgrp(array &$dashboards, string $method, array $db_dashboards = null): void {
+		$ins_dashboard_usrgrps = [];
+		$upd_dashboard_usrgrps = [];
+		$del_dashboard_usrgrpids = [];
 
-				foreach ($dashboard['userGroups'] as $usrgrp) {
-					$dashboards_usrgrps[$dashboard['dashboardid']][$usrgrp['usrgrpid']] = [
-						'permission' => $usrgrp['permission']
-					];
-				}
+		foreach ($dashboards as &$dashboard) {
+			if (!array_key_exists('userGroups', $dashboard)) {
+				continue;
 			}
-		}
 
-		if (!$dashboards_usrgrps) {
-			return;
-		}
-
-		$db_dashboard_usrgrps = ($method === 'update')
-			? DB::select('dashboard_usrgrp', [
-				'output' => ['dashboard_usrgrpid', 'dashboardid', 'usrgrpid', 'permission'],
-				'filter' => ['dashboardid' => array_keys($dashboards_usrgrps)]
-			])
-			: [];
-
-		$usrgrpids = [];
+			$dashboardid = $dashboard['dashboardid'];
 
-		foreach ($db_dashboard_usrgrps as $db_dashboard_usrgrp) {
-			$usrgrpids[$db_dashboard_usrgrp['usrgrpid']] = true;
-		}
+			$db_dashboard_groups = ($method === 'update')
+				? array_column($db_dashboards[$dashboardid]['userGroups'], null, 'usrgrpid')
+				: [];
 
-		// get list of accessible user groups
-		$db_usrgrps = $usrgrpids
-			? API::UserGroup()->get([
-				'output' => [],
-				'preservekeys' => true
-			])
-			: [];
+			foreach ($dashboard['userGroups'] as &$dashboard_group) {
+				$usrgrpid = $dashboard_group['usrgrpid'];
 
-		$ins_dashboard_usrgrps = [];
-		$upd_dashboard_usrgrps = [];
-		$del_dashboard_usrgrpids = [];
+				if (array_key_exists($usrgrpid, $db_dashboard_groups)) {
+					$dashboard_group['dashboard_usrgrpid'] = $db_dashboard_groups[$usrgrpid]['dashboard_usrgrpid'];
 
-		foreach ($db_dashboard_usrgrps as $db_dashboard_usrgrp) {
-			$dashboardid = $db_dashboard_usrgrp['dashboardid'];
-			$usrgrpid = $db_dashboard_usrgrp['usrgrpid'];
+					if ($dashboard_group['permission'] != $db_dashboard_groups[$usrgrpid]['permission']) {
+						$upd_dashboard_usrgrps[] = [
+							'values' => ['permission' => $dashboard_group['permission']],
+							'where' => ['dashboard_usrgrpid' => $db_dashboard_groups[$usrgrpid]['dashboard_usrgrpid']]
+						];
+					}
 
-			if (array_key_exists($usrgrpid, $dashboards_usrgrps[$dashboardid])) {
-				if ($dashboards_usrgrps[$dashboardid][$usrgrpid]['permission'] != $db_dashboard_usrgrp['permission']) {
-					$upd_dashboard_usrgrps[] = [
-						'values' => ['permission' => $dashboards_usrgrps[$dashboardid][$usrgrpid]['permission']],
-						'where' => ['dashboard_usrgrpid' => $db_dashboard_usrgrp['dashboard_usrgrpid']]
-					];
+					unset($db_dashboard_groups[$usrgrpid]);
+				}
+				else {
+					$ins_dashboard_usrgrps[] = ['dashboardid' => $dashboardid] + $dashboard_group;
 				}
-
-				unset($dashboards_usrgrps[$dashboardid][$usrgrpid]);
-			}
-			elseif (array_key_exists($usrgrpid, $db_usrgrps)) {
-				$del_dashboard_usrgrpids[] = $db_dashboard_usrgrp['dashboard_usrgrpid'];
 			}
-		}
+			unset($dashboard_group);
 
-		foreach ($dashboards_usrgrps as $dashboardid => $usrgrps) {
-			foreach ($usrgrps as $usrgrpid => $usrgrp) {
-				$ins_dashboard_usrgrps[] = [
-					'dashboardid' => $dashboardid,
-					'usrgrpid' => $usrgrpid,
-					'permission' => $usrgrp['permission']
-				];
-			}
+			$del_dashboard_usrgrpids = array_merge($del_dashboard_usrgrpids,
+				array_column($db_dashboard_groups, 'dashboard_usrgrpid')
+			);
 		}
+		unset($dashboard);
 
 		if ($ins_dashboard_usrgrps) {
-			DB::insertBatch('dashboard_usrgrp', $ins_dashboard_usrgrps);
+			$dashboard_usrgrpids = DB::insert('dashboard_usrgrp', $ins_dashboard_usrgrps);
 		}
 
 		if ($upd_dashboard_usrgrps) {
@@ -666,6 +622,20 @@ class CDashboard extends CDashboardGeneral {
 		if ($del_dashboard_usrgrpids) {
 			DB::delete('dashboard_usrgrp', ['dashboard_usrgrpid' => $del_dashboard_usrgrpids]);
 		}
+
+		foreach ($dashboards as &$dashboard) {
+			if (!array_key_exists('userGroups', $dashboard)) {
+				continue;
+			}
+
+			foreach ($dashboard['userGroups'] as &$usrgrp) {
+				if (!array_key_exists('dashboard_usrgrpid', $usrgrp)) {
+					$usrgrp['dashboard_usrgrpid'] = array_shift($dashboard_usrgrpids);
+				}
+			}
+			unset($usrgrp);
+		}
+		unset($dashboard);
 	}
 
 	protected function addRelatedObjects(array $options, array $result) {
diff --git a/ui/include/classes/api/services/CDashboardGeneral.php b/ui/include/classes/api/services/CDashboardGeneral.php
index e259815ece9..30d41069f60 100644
--- a/ui/include/classes/api/services/CDashboardGeneral.php
+++ b/ui/include/classes/api/services/CDashboardGeneral.php
@@ -115,20 +115,21 @@ abstract class CDashboardGeneral extends CApiService {
 		DB::delete('dashboard', ['dashboardid' => $dashboardids]);
 
 		$resource = ($this instanceof CDashboard) ? CAudit::RESOURCE_DASHBOARD : CAudit::RESOURCE_TEMPLATE_DASHBOARD;
-		$this->addAuditBulk(CAudit::ACTION_DELETE, $resource, $db_dashboards);
+		self::addAuditLog(CAudit::ACTION_DELETE, $resource, $db_dashboards);
 
 		return ['dashboardids' => $dashboardids];
 	}
 
 	/**
-	 * Add the existing pages, widgets and widget fields to $db_dashboards whether these are affected by the update.
+	 * Add the existing users, user groups, pages, widgets and widget fields to $db_dashboards whether
+	 * these are affected by the update.
 	 *
 	 * @param array $dashboards
 	 * @param array $db_dashboards
 	 */
 	protected function addAffectedObjects(array $dashboards, array &$db_dashboards): void {
-		// Select pages of these dashboards.
-		$dashboardids = [];
+		// Select pages, users and user groups of these dashboards.
+		$dashboardids = ['pages' => [], 'users' => [], 'userGroups' => []];
 
 		// Select widgets of these pages.
 		$dashboard_pageids = [];
@@ -137,20 +138,28 @@ abstract class CDashboardGeneral extends CApiService {
 		$widgetids = [];
 
 		foreach ($dashboards as $dashboard) {
+			if (array_key_exists('users', $dashboard)) {
+				$dashboardids['users'][] = $dashboard['dashboardid'];
+				$db_dashboards[$dashboard['dashboardid']]['users'] = [];
+			}
+
+			if (array_key_exists('userGroups', $dashboard)) {
+				$dashboardids['userGroups'][] = $dashboard['dashboardid'];
+				$db_dashboards[$dashboard['dashboardid']]['userGroups'] = [];
+			}
+
 			if (array_key_exists('pages', $dashboard)) {
-				$dashboardids[$dashboard['dashboardid']] = true;
+				$dashboardids['pages'][] = $dashboard['dashboardid'];
+				$db_dashboards[$dashboard['dashboardid']]['pages'] = [];
 
 				foreach ($dashboard['pages'] as $dashboard_page) {
-					if (array_key_exists('dashboard_pageid', $dashboard_page)) {
-						if (array_key_exists('widgets', $dashboard_page)) {
-							$dashboard_pageids[$dashboard_page['dashboard_pageid']] = true;
-
-							foreach ($dashboard_page['widgets'] as $widget) {
-								if (array_key_exists('widgetid', $widget)) {
-									if (array_key_exists('fields', $widget)) {
-										$widgetids[$widget['widgetid']] = true;
-									}
-								}
+					if (array_key_exists('dashboard_pageid', $dashboard_page)
+							&& array_key_exists('widgets', $dashboard_page)) {
+						$dashboard_pageids[] = $dashboard_page['dashboard_pageid'];
+
+						foreach ($dashboard_page['widgets'] as $widget) {
+							if (array_key_exists('widgetid', $widget) && array_key_exists('fields', $widget)) {
+								$widgetids[] = $widget['widgetid'];
 							}
 						}
 					}
@@ -158,15 +167,36 @@ abstract class CDashboardGeneral extends CApiService {
 			}
 		}
 
-		foreach ($db_dashboards as &$db_dashboard) {
-			$db_dashboard['pages'] = [];
+		if ($dashboardids['users']) {
+			$options = [
+				'output' => ['dashboard_userid', 'dashboardid', 'userid', 'permission'],
+				'filter' => ['dashboardid' => $dashboardids['users']]
+			];
+			$db_users = DBselect(DB::makeSql('dashboard_user', $options));
+
+			while ($db_user = DBfetch($db_users)) {
+				$db_dashboards[$db_user['dashboardid']]['users'][$db_user['dashboard_userid']] =
+					array_diff_key($db_user, array_flip(['dashboardid']));
+			}
+		}
+
+		if ($dashboardids['userGroups']) {
+			$options = [
+				'output' => ['dashboard_usrgrpid', 'dashboardid', 'usrgrpid', 'permission'],
+				'filter' => ['dashboardid' => $dashboardids['userGroups']]
+			];
+			$db_groups = DBselect(DB::makeSql('dashboard_usrgrp', $options));
+
+			while ($db_group = DBfetch($db_groups)) {
+				$db_dashboards[$db_group['dashboardid']]['userGroups'][$db_group['dashboard_usrgrpid']] =
+					array_diff_key($db_group, array_flip(['dashboardid']));
+			}
 		}
-		unset($db_dashboard);
 
-		if ($dashboardids) {
+		if ($dashboardids['pages']) {
 			$db_dashboard_pages = DB::select('dashboard_page', [
-				'output' => array_keys(DB::getSchema('dashboard_page')['fields']),
-				'filter' => ['dashboardid' => array_keys($dashboardids)],
+				'output' => ['dashboard_pageid', 'dashboardid', 'name', 'display_period', 'sortorder'],
+				'filter' => ['dashboardid' => $dashboardids['pages']],
 				'preservekeys' => true
 			]);
 
@@ -177,8 +207,10 @@ abstract class CDashboardGeneral extends CApiService {
 
 			if ($dashboard_pageids) {
 				$db_widgets = DB::select('widget', [
-					'output' => array_keys(DB::getSchema('widget')['fields']),
-					'filter' => ['dashboard_pageid' => array_keys($dashboard_pageids)],
+					'output' => ['widgetid', 'dashboard_pageid', 'type', 'name', 'x', 'y', 'width', 'height',
+						'view_mode'
+					],
+					'filter' => ['dashboard_pageid' => $dashboard_pageids],
 					'preservekeys' => true
 				]);
 
@@ -188,24 +220,33 @@ abstract class CDashboardGeneral extends CApiService {
 				unset($db_widget);
 
 				if ($widgetids) {
-					$db_widget_fields = DB::select('widget_field', [
-						'output' => array_keys(DB::getSchema('widget_field')['fields']),
-						'filter' => ['widgetid' => array_keys($widgetids)],
-						'preservekeys' => true
-					]);
-
-					foreach ($db_widget_fields as $widget_fieldid => $db_widget_field) {
-						$db_widgets[$db_widget_field['widgetid']]['fields'][$widget_fieldid] = $db_widget_field;
+					$options = [
+						'output' => ['widget_fieldid', 'widgetid', 'type', 'name', 'value_int', 'value_str',
+							'value_groupid', 'value_hostid', 'value_itemid', 'value_graphid', 'value_sysmapid'
+						],
+						'filter' => ['widgetid' => $widgetids]
+					];
+					$db_widget_fields = DBselect(DB::makeSql('widget_field', $options));
+
+					while ($db_widget_field = DBfetch($db_widget_fields)) {
+						$db_widgets[$db_widget_field['widgetid']]['fields'][$db_widget_field['widget_fieldid']] = [
+							'widget_fieldid' => $db_widget_field['widget_fieldid'],
+							'type' => $db_widget_field['type'],
+							'name' => $db_widget_field['name'],
+							'value' => $db_widget_field[self::WIDGET_FIELD_TYPE_COLUMNS[$db_widget_field['type']]]
+						];
 					}
 				}
 
 				foreach ($db_widgets as $widgetid => $db_widget) {
-					$db_dashboard_pages[$db_widget['dashboard_pageid']]['widgets'][$widgetid] = $db_widget;
+					$db_dashboard_pages[$db_widget['dashboard_pageid']]['widgets'][$widgetid] =
+						array_diff_key($db_widget, array_flip(['dashboard_pageid']));
 				}
 			}
 
 			foreach ($db_dashboard_pages as $dashboard_pageid => $db_dashboard_page) {
-				$db_dashboards[$db_dashboard_page['dashboardid']]['pages'][$dashboard_pageid] = $db_dashboard_page;
+				$db_dashboards[$db_dashboard_page['dashboardid']]['pages'][$dashboard_pageid] =
+					array_diff_key($db_dashboard_page, array_flip(['dashboardid']));
 			}
 		}
 	}
@@ -360,8 +401,7 @@ abstract class CDashboardGeneral extends CApiService {
 
 						foreach ($db_widget['fields'] as $db_widget_field) {
 							if (array_key_exists($db_widget_field['type'], $ids)) {
-								$value = $db_widget_field[self::WIDGET_FIELD_TYPE_COLUMNS[$db_widget_field['type']]];
-								$stored_widget_fields[$db_widget_field['type']][$value] = true;
+								$stored_widget_fields[$db_widget_field['type']][$db_widget_field['value']] = true;
 							}
 						}
 					}
@@ -561,7 +601,7 @@ abstract class CDashboardGeneral extends CApiService {
 	 * @param array      $dashboards
 	 * @param array|null $db_dashboards
 	 */
-	protected function updatePages(array $dashboards, array $db_dashboards = null): void {
+	protected function updatePages(array &$dashboards, array $db_dashboards = null): void {
 		$db_dashboard_pages = [];
 
 		if ($db_dashboards !== null) {
@@ -606,24 +646,26 @@ abstract class CDashboardGeneral extends CApiService {
 
 		if ($ins_dashboard_pages) {
 			$dashboard_pageids = DB::insert('dashboard_page', $ins_dashboard_pages);
-
-			foreach ($dashboards as &$dashboard) {
-				if (array_key_exists('pages', $dashboard)) {
-					foreach ($dashboard['pages'] as &$dashboard_page) {
-						if (!array_key_exists('dashboard_pageid', $dashboard_page)) {
-							$dashboard_page['dashboard_pageid'] = array_shift($dashboard_pageids);
-						}
-					}
-					unset($dashboard_page);
-				}
-			}
-			unset($dashboard);
 		}
 
 		if ($upd_dashboard_pages) {
 			DB::update('dashboard_page', $upd_dashboard_pages);
 		}
 
+		foreach ($dashboards as &$dashboard) {
+			if (!array_key_exists('pages', $dashboard)) {
+				continue;
+			}
+
+			foreach ($dashboard['pages'] as &$dashboard_page) {
+				if (!array_key_exists('dashboard_pageid', $dashboard_page)) {
+					$dashboard_page['dashboard_pageid'] = array_shift($dashboard_pageids);
+				}
+			}
+			unset($dashboard_page);
+		}
+		unset($dashboard);
+
 		$this->updateWidgets($dashboards, $db_dashboards);
 
 		if ($db_dashboard_pages) {
@@ -639,7 +681,7 @@ abstract class CDashboardGeneral extends CApiService {
 	 * @param array      $dashboards
 	 * @param array|null $db_dashboards
 	 */
-	protected function updateWidgets(array $dashboards, array $db_dashboards = null): void {
+	protected function updateWidgets(array &$dashboards, array $db_dashboards = null): void {
 		$db_widgets = [];
 
 		if ($db_dashboards !== null) {
@@ -689,6 +731,7 @@ abstract class CDashboardGeneral extends CApiService {
 						unset($db_widgets[$widget['widgetid']]);
 					}
 					else {
+						unset($widget['fields']);
 						$ins_widgets[] = ['dashboard_pageid' => $dashboard_page['dashboard_pageid']] + $widget;
 					}
 				}
@@ -697,34 +740,38 @@ abstract class CDashboardGeneral extends CApiService {
 
 		if ($ins_widgets) {
 			$widgetids = DB::insert('widget', $ins_widgets);
+		}
 
-			foreach ($dashboards as &$dashboard) {
-				if (array_key_exists('pages', $dashboard)) {
-					foreach ($dashboard['pages'] as &$dashboard_page) {
-						if (array_key_exists('widgets', $dashboard_page)) {
-							foreach ($dashboard_page['widgets'] as &$widget) {
-								if (!array_key_exists('widgetid', $widget)) {
-									$widget['widgetid'] = array_shift($widgetids);
-								}
-							}
-							unset($widget);
-						}
+		if ($upd_widgets) {
+			DB::update('widget', $upd_widgets);
+		}
+
+		foreach ($dashboards as &$dashboard) {
+			if (!array_key_exists('pages', $dashboard)) {
+				continue;
+			}
+
+			foreach ($dashboard['pages'] as &$dashboard_page) {
+				if (!array_key_exists('widgets', $dashboard_page)) {
+					continue;
+				}
+
+				foreach ($dashboard_page['widgets'] as &$widget) {
+					if (!array_key_exists('widgetid', $widget)) {
+						$widget['widgetid'] = array_shift($widgetids);
 					}
-					unset($dashboard_page);
 				}
+				unset($widget);
 			}
-			unset($dashboard);
+			unset($dashboard_page);
 		}
+		unset($dashboard);
 
-		if ($upd_widgets) {
-			DB::update('widget', $upd_widgets);
-		}
+		$this->updateWidgetFields($dashboards, $db_dashboards);
 
 		if ($db_widgets) {
 			self::deleteWidgets(array_keys($db_widgets));
 		}
-
-		$this->updateWidgetFields($dashboards, $db_dashboards);
 	}
 
 	/**
@@ -735,19 +782,19 @@ abstract class CDashboardGeneral extends CApiService {
 	 * @param array      $dashboards
 	 * @param array|null $db_dashboards
 	 */
-	protected function updateWidgetFields(array $dashboards, array $db_dashboards = null): void {
+	protected function updateWidgetFields(array &$dashboards, array $db_dashboards = null): void {
 		$ins_widget_fields = [];
 		$upd_widget_fields = [];
 		$del_widget_fieldids = [];
 
-		foreach ($dashboards as $dashboard) {
+		foreach ($dashboards as &$dashboard) {
 			if (!array_key_exists('pages', $dashboard)) {
 				continue;
 			}
 
 			$db_dashboard_pages = ($db_dashboards !== null) ? $db_dashboards[$dashboard['dashboardid']]['pages'] : [];
 
-			foreach ($dashboard['pages'] as $dashboard_page) {
+			foreach ($dashboard['pages'] as &$dashboard_page) {
 				if (!array_key_exists('widgets', $dashboard_page)) {
 					continue;
 				}
@@ -756,7 +803,7 @@ abstract class CDashboardGeneral extends CApiService {
 					? $db_dashboard_pages[$dashboard_page['dashboard_pageid']]['widgets']
 					: [];
 
-				foreach ($dashboard_page['widgets'] as $widget) {
+				foreach ($dashboard_page['widgets'] as &$widget) {
 					if (!array_key_exists('fields', $widget)) {
 						continue;
 					}
@@ -765,48 +812,56 @@ abstract class CDashboardGeneral extends CApiService {
 						? $db_widgets[$widget['widgetid']]['fields']
 						: [];
 
-					$widget_fields = [];
+					foreach ($widget['fields'] as &$widget_field) {
+						$db_widget_field = current(
+							array_filter($db_widget_fields,
+								static function (array $db_widget_field) use ($widget_field): bool {
+									return ($widget_field['type'] == $db_widget_field['type']
+										&& $widget_field['name'] === $db_widget_field['name']);
+								}
+							)
+						);
 
-					foreach ($widget['fields'] as $widget_field) {
-						$widget_field[self::WIDGET_FIELD_TYPE_COLUMNS[$widget_field['type']]] = $widget_field['value'];
-						$widget_fields[$widget_field['type']][$widget_field['name']][] = $widget_field;
-					}
+						if ($db_widget_field) {
+							$widget_field['widget_fieldid'] = $db_widget_field['widget_fieldid'];
 
-					foreach ($db_widget_fields as $db_widget_field) {
-						if (array_key_exists($db_widget_field['type'], $widget_fields)
-								&& array_key_exists($db_widget_field['name'], $widget_fields[$db_widget_field['type']])
-								&& $widget_fields[$db_widget_field['type']][$db_widget_field['name']]) {
-							$widget_field = array_shift(
-								$widget_fields[$db_widget_field['type']][$db_widget_field['name']]
+							$upd_widget_field = DB::getUpdatedValues('widget_field',
+								CArrayHelper::renameKeys($widget_field, [
+									'value' => self::WIDGET_FIELD_TYPE_COLUMNS[$widget_field['type']]
+								]),
+								CArrayHelper::renameKeys($db_widget_field, [
+									'value' => self::WIDGET_FIELD_TYPE_COLUMNS[$db_widget_field['type']]
+								])
 							);
 
-							$upd_widget_field = DB::getUpdatedValues('widget_field', $widget_field, $db_widget_field);
-
 							if ($upd_widget_field) {
 								$upd_widget_fields[] = [
 									'values' => $upd_widget_field,
 									'where' => ['widget_fieldid' => $db_widget_field['widget_fieldid']]
 								];
 							}
+
+							unset($db_widget_fields[$db_widget_field['widget_fieldid']]);
 						}
 						else {
-							$del_widget_fieldids[] = $db_widget_field['widget_fieldid'];
+							$ins_widget_fields[] = ['widgetid' => $widget['widgetid']] +
+								CArrayHelper::renameKeys($widget_field, [
+									'value' => self::WIDGET_FIELD_TYPE_COLUMNS[$widget_field['type']]
+								]);
 						}
 					}
+					unset($widget_field);
 
-					foreach ($widget_fields as $widget_fields) {
-						foreach ($widget_fields as $widget_fields) {
-							foreach ($widget_fields as $widget_field) {
-								$ins_widget_fields[] = ['widgetid' => $widget['widgetid']] + $widget_field;
-							}
-						}
-					}
+					$del_widget_fieldids += $db_widget_fields;
 				}
+				unset($widget);
 			}
+			unset($dashboard_page);
 		}
+		unset($dashboard);
 
 		if ($ins_widget_fields) {
-			DB::insert('widget_field', $ins_widget_fields);
+			$widget_fieldids = DB::insert('widget_field', $ins_widget_fields);
 		}
 
 		if ($upd_widget_fields) {
@@ -814,8 +869,36 @@ abstract class CDashboardGeneral extends CApiService {
 		}
 
 		if ($del_widget_fieldids) {
-			DB::delete('widget_field', ['widget_fieldid' => $del_widget_fieldids]);
+			DB::delete('widget_field', ['widget_fieldid' => array_keys($del_widget_fieldids)]);
+		}
+
+		foreach ($dashboards as &$dashboard) {
+			if (!array_key_exists('pages', $dashboard)) {
+				continue;
+			}
+
+			foreach ($dashboard['pages'] as &$dashboard_page) {
+				if (!array_key_exists('widgets', $dashboard_page)) {
+					continue;
+				}
+
+				foreach ($dashboard_page['widgets'] as &$widget) {
+					if (!array_key_exists('fields', $widget)) {
+						continue;
+					}
+
+					foreach ($widget['fields'] as &$widget_field) {
+						if (!array_key_exists('widget_fieldid', $widget_field)) {
+							$widget_field['widget_fieldid'] = array_shift($widget_fieldids);
+						}
+					}
+					unset($widget_field);
+				}
+				unset($widget);
+			}
+			unset($dashboard_page);
 		}
+		unset($dashboard);
 	}
 
 	/**
diff --git a/ui/include/classes/api/services/CDiscoveryRule.php b/ui/include/classes/api/services/CDiscoveryRule.php
index 5656df343ba..cb465b10f07 100644
--- a/ui/include/classes/api/services/CDiscoveryRule.php
+++ b/ui/include/classes/api/services/CDiscoveryRule.php
@@ -24,11 +24,7 @@
  */
 class CDiscoveryRule extends CItemGeneral {
 
-	public const ACCESS_RULES = [
-		'get' => ['min_user_type' => USER_TYPE_ZABBIX_USER],
-		'create' => ['min_user_type' => USER_TYPE_ZABBIX_ADMIN],
-		'update' => ['min_user_type' => USER_TYPE_ZABBIX_ADMIN],
-		'delete' => ['min_user_type' => USER_TYPE_ZABBIX_ADMIN],
+	public const ACCESS_RULES = parent::ACCESS_RULES + [
 		'copy' => ['min_user_type' => USER_TYPE_ZABBIX_ADMIN]
 	];
 
diff --git a/ui/include/classes/api/services/CHistory.php b/ui/include/classes/api/services/CHistory.php
index b9d429b1638..8b92c12b5b6 100644
--- a/ui/include/classes/api/services/CHistory.php
+++ b/ui/include/classes/api/services/CHistory.php
@@ -25,7 +25,8 @@
 class CHistory extends CApiService {
 
 	public const ACCESS_RULES = [
-		'get' => ['min_user_type' => USER_TYPE_ZABBIX_USER]
+		'get' => ['min_user_type' => USER_TYPE_ZABBIX_USER],
+		'clear' => ['min_user_type' => USER_TYPE_ZABBIX_ADMIN]
 	];
 
 	protected $tableName;
@@ -312,4 +313,56 @@ class CHistory extends CApiService {
 
 		return null;
 	}
+
+	/**
+	 * Clear item history. Support web scenario history cleanup.
+	 *
+	 * @param array $itemids
+	 *
+	 * @return array
+	 */
+	public function clear(array $itemids): array {
+		self::validateClear($itemids, $db_items);
+
+		Manager::History()->deleteHistory(array_column($db_items, 'value_type', 'itemid'));
+
+		self::addAuditLog(CAudit::ACTION_HISTORY_CLEAR, CAudit::RESOURCE_ITEM, $db_items);
+
+		return ['itemids' => $itemids];
+	}
+
+	/**
+	 * Validates the input parameters for the clear() method.
+	 *
+	 * @static
+	 *
+	 * @param array      $itemids
+	 * @param array|null $db_items
+	 *
+	 * @throws APIException if the input is invalid
+	 * @throws APIException if comperesion is enabled
+	 */
+	private static function validateClear(array $itemids, array &$db_items = null): void {
+		$api_input_rules = ['type' => API_IDS, 'flags' => API_NOT_EMPTY, 'uniq' => true];
+
+		if (!CApiInputValidator::validate($api_input_rules, $itemids, '/', $error)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
+		}
+
+		if (CHousekeepingHelper::get(CHousekeepingHelper::COMPRESSION_STATUS)) {
+			self::exception(ZBX_API_ERROR_INTERNAL, _('History cleanup is not supported if compression is enabled'));
+		}
+
+		$db_items = API::Item()->get([
+			'output' => ['itemid', 'value_type', 'name'],
+			'itemids' => $itemids,
+			'templated' => false,
+			'webitems' => true,
+			'editable' => true
+		]);
+
+		if (count($db_items) != count($itemids)) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
+		}
+	}
 }
diff --git a/ui/include/classes/api/services/CHostGeneral.php b/ui/include/classes/api/services/CHostGeneral.php
index ea88a89932a..7fb4847e1bf 100644
--- a/ui/include/classes/api/services/CHostGeneral.php
+++ b/ui/include/classes/api/services/CHostGeneral.php
@@ -93,12 +93,32 @@ abstract class CHostGeneral extends CHostBase {
 		$allHostIds = array_merge($hostIds, $templateIds);
 
 		// add groups
-		if (!empty($data['groups'])) {
-			API::HostGroup()->massAdd([
-				'hosts' => $data['hosts'],
-				'templates' => $data['templates'],
-				'groups' => $data['groups']
-			]);
+		if (array_key_exists('groups', $data) && $data['groups']) {
+			$options = ['groups' => $data['groups']];
+
+			if ($data['hosts']) {
+				$options += [
+					'hosts' => array_map(
+						static function($host) {
+							return array_intersect_key($host, array_flip(['hostid']));
+						},
+						$data['hosts']
+					)
+				];
+			}
+
+			if ($data['templates']) {
+				$options += [
+					'templates' => array_map(
+						static function($template) {
+							return array_intersect_key($template, array_flip(['templateid']));
+						},
+						$data['templates']
+					)
+				];
+			}
+
+			API::HostGroup()->massAdd($options);
 		}
 
 		// link templates
@@ -178,7 +198,17 @@ abstract class CHostGeneral extends CHostBase {
 		}
 
 		if (isset($data['groupids'])) {
-			API::HostGroup()->massRemove($data);
+			$options = ['groupids' => $data['groupids']];
+
+			if ($data['hostids']) {
+				$options['hostids'] = $data['hostids'];
+			}
+
+			if ($data['templateids']) {
+				$options['templateids'] = $data['templateids'];
+			}
+
+			API::HostGroup()->massRemove($options);
 		}
 
 		return [$this->pkOption() => $data[$this->pkOption()]];
diff --git a/ui/include/classes/api/services/CHostGroup.php b/ui/include/classes/api/services/CHostGroup.php
index a554fa889d7..1eb11fd09cb 100644
--- a/ui/include/classes/api/services/CHostGroup.php
+++ b/ui/include/classes/api/services/CHostGroup.php
@@ -390,165 +390,29 @@ class CHostGroup extends CApiService {
 	}
 
 	/**
-	 * Inherit rights from parent host groups.
-	 *
 	 * @param array  $groups
-	 * @param string $groups[]['groupid']
-	 * @param string $groups[]['name']
-	 */
-	private function inheritRights(array $groups) {
-		$parent_names = [];
-
-		foreach ($groups as $group) {
-			$name = $group['name'];
-
-			while (($pos = strrpos($name, '/')) !== false) {
-				$name = substr($name, 0, $pos);
-				$parent_names[$name][] = $group['groupid'];
-			}
-		}
-
-		if ($parent_names) {
-			$options = [
-				'output' => ['groupid', 'name'],
-				'filter' => ['name' => array_keys($parent_names)]
-			];
-			$result = DBselect(DB::makeSql('hstgrp', $options));
-
-			$db_parent_groups = [];
-
-			while ($row = DBfetch($result)) {
-				$db_parent_groups[$row['name']] = $row['groupid'];
-			}
-
-			$parent_groupids = [];
-
-			foreach ($groups as $group) {
-				$name = $group['name'];
-
-				while (($pos = strrpos($name, '/')) !== false) {
-					$name = substr($name, 0, $pos);
-
-					if (array_key_exists($name, $db_parent_groups)) {
-						$parent_groupids[$db_parent_groups[$name]][] = $group['groupid'];
-						break;
-					}
-				}
-			}
-
-			if ($parent_groupids) {
-				$db_rights = DB::select('rights', [
-					'output' => ['groupid', 'id', 'permission'],
-					'filter' => ['id' => array_keys($parent_groupids)]
-				]);
-
-				$rights = [];
-
-				foreach ($db_rights as $db_right) {
-					foreach ($parent_groupids[$db_right['id']] as $groupid) {
-						$rights[] = [
-							'groupid' => $db_right['groupid'],
-							'permission' => $db_right['permission'],
-							'id' => $groupid
-						];
-					}
-				}
-
-				DB::insertBatch('rights', $rights);
-			}
-		}
-	}
-
-	/**
-	 * Inherit tag filters from parent host groups.
 	 *
-	 * @param array  $groups
-	 * @param string $groups[]['groupid']
-	 * @param string $groups[]['name']
+	 * @return array
 	 */
-	private function inheritTagFilters(array $groups) {
-		$parent_names = [];
-
-		foreach ($groups as $group) {
-			$name = $group['name'];
-
-			while (($pos = strrpos($name, '/')) !== false) {
-				$name = substr($name, 0, $pos);
-				$parent_names[$name][] = $group['groupid'];
-			}
-		}
-
-		if ($parent_names) {
-			$options = [
-				'output' => ['groupid', 'name'],
-				'filter' => ['name' => array_keys($parent_names)]
-			];
-			$result = DBselect(DB::makeSql('hstgrp', $options));
-
-			$db_parent_groups = [];
-
-			while ($row = DBfetch($result)) {
-				$db_parent_groups[$row['name']] = $row['groupid'];
-			}
-
-			$parent_groupids = [];
-
-			foreach ($groups as $group) {
-				$name = $group['name'];
-
-				while (($pos = strrpos($name, '/')) !== false) {
-					$name = substr($name, 0, $pos);
-
-					if (array_key_exists($name, $db_parent_groups)) {
-						$parent_groupids[$db_parent_groups[$name]][] = $group['groupid'];
-						break;
-					}
-				}
-			}
-
-			if ($parent_groupids) {
-				$db_tag_filters = DB::select('tag_filter', [
-					'output' => ['usrgrpid', 'groupid', 'tag', 'value'],
-					'filter' => ['groupid' => array_keys($parent_groupids)]
-				]);
-
-				$tag_filters = [];
-
-				foreach ($db_tag_filters as $db_tag_filter) {
-					foreach ($parent_groupids[$db_tag_filter['groupid']] as $groupid) {
-						$tag_filters[] = [
-							'usrgrpid' => $db_tag_filter['usrgrpid'],
-							'groupid' => $groupid,
-							'tag' => $db_tag_filter['tag'],
-							'value' => $db_tag_filter['value']
-						];
-					}
-				}
-
-				DB::insertBatch('tag_filter', $tag_filters);
-			}
+	public function create(array $groups): array {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'hostgroup', __FUNCTION__)
+			);
 		}
-	}
 
-	/**
-	 * @param array  $groups
-	 *
-	 * @return array
-	 */
-	public function create(array $groups) {
-		$this->validateCreate($groups);
+		self::validateCreate($groups);
 
-		$groupids = DB::insertBatch('hstgrp', $groups);
+		$groupids = DB::insert('hstgrp', $groups);
 
 		foreach ($groups as $index => &$group) {
 			$group['groupid'] = $groupids[$index];
 		}
 		unset($group);
 
-		$this->inheritRights($groups);
-		$this->inheritTagFilters($groups);
+		self::inheritUserGroupsData($groups);
 
-		$this->addAuditBulk(CAudit::ACTION_ADD, CAudit::RESOURCE_HOST_GROUP, $groups);
+		self::addAuditLog(CAudit::ACTION_ADD, CAudit::RESOURCE_HOST_GROUP, $groups);
 
 		return ['groupids' => $groupids];
 	}
@@ -558,44 +422,42 @@ class CHostGroup extends CApiService {
 	 *
 	 * @return array
 	 */
-	public function update(array $groups) {
+	public function update(array $groups): array {
 		$this->validateUpdate($groups, $db_groups);
 
 		$upd_groups = [];
 
 		foreach ($groups as $group) {
-			$db_group = $db_groups[$group['groupid']];
+			$upd_group = DB::getUpdatedValues('hstgrp', $group, $db_groups[$group['groupid']]);
 
-			if (array_key_exists('name', $group) && $group['name'] !== $db_group['name']) {
+			if ($upd_group) {
 				$upd_groups[] = [
-					'values' => ['name' => $group['name']],
+					'values' => $upd_group,
 					'where' => ['groupid' => $group['groupid']]
 				];
 			}
 		}
 
-		DB::update('hstgrp', $upd_groups);
+		if ($upd_groups) {
+			DB::update('hstgrp', $upd_groups);
+		}
 
-		$this->addAuditBulk(CAudit::ACTION_UPDATE, CAudit::RESOURCE_HOST_GROUP, $groups, $db_groups);
+		self::addAuditLog(CAudit::ACTION_UPDATE, CAudit::RESOURCE_HOST_GROUP, $groups, $db_groups);
 
-		return ['groupids' => zbx_objectValues($groups, 'groupid')];
+		return ['groupids' => array_column($groups, 'groupid')];
 	}
 
 	/**
 	 * @param array $groupids
 	 * @param bool 	$nopermissions
 	 *
-	 * @throws APIException if the input is invalid.
-	 *
 	 * @return array
 	 */
-	public function delete(array $groupids, $nopermissions = false) {
+	public function delete(array $groupids, bool $nopermissions = false): array {
 		$this->validateDelete($groupids, $db_groups, $nopermissions);
 
 		// delete sysmap element
-		if (!empty($groupids)) {
-			DB::delete('sysmaps_elements', ['elementtype' => SYSMAP_ELEMENT_TYPE_HOST_GROUP, 'elementid' => $groupids]);
-		}
+		DB::delete('sysmaps_elements', ['elementtype' => SYSMAP_ELEMENT_TYPE_HOST_GROUP, 'elementid' => $groupids]);
 
 		// disable actions
 		// actions from conditions
@@ -683,93 +545,75 @@ class CHostGroup extends CApiService {
 
 		DB::delete('hstgrp', ['groupid' => $groupids]);
 
-		$this->addAuditBulk(CAudit::ACTION_DELETE, CAudit::RESOURCE_HOST_GROUP, $db_groups);
+		self::addAuditLog(CAudit::ACTION_DELETE, CAudit::RESOURCE_HOST_GROUP, $db_groups);
 
 		return ['groupids' => $groupids];
 	}
 
 	/**
-	 * Check for duplicated host groups.
-	 *
-	 * @param array  $names
-	 *
-	 * @throws APIException  if host group already exists.
-	 */
-	private function checkDuplicates(array $names) {
-		$db_groups = DB::select('hstgrp', [
-			'output' => ['name'],
-			'filter' => ['name' => $names],
-			'limit' => 1
-		]);
-
-		if ($db_groups) {
-			self::exception(ZBX_API_ERROR_PARAMETERS,
-				_s('Host group "%1$s" already exists.', $db_groups[0]['name'])
-			);
-		}
-	}
-
-	/**
 	 * @param array $groups
 	 *
+	 * @static
+	 *
 	 * @throws APIException if the input is invalid.
 	 */
-	protected function validateCreate(array &$groups) {
-		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('Only Super Admins can create host groups.'));
-		}
-
+	private static function validateCreate(array &$groups): void {
 		$api_input_rules = ['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['uuid'], ['name']], 'fields' => [
 			'uuid' =>	['type' => API_UUID],
 			'name' =>	['type' => API_HG_NAME, 'flags' => API_REQUIRED, 'length' => DB::getFieldLength('hstgrp', 'name')]
 		]];
+
 		if (!CApiInputValidator::validate($api_input_rules, $groups, '/', $error)) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
 
-		$this->checkDuplicates(zbx_objectValues($groups, 'name'));
-		$this->checkAndAddUuid($groups);
+		self::checkDuplicates($groups);
+		self::checkAndAddUuid($groups);
 	}
 
 	/**
-	 * Check that new UUIDs are not already used and generate UUIDs where missing.
-	 *
-	 * @param array $groups_to_create
+	 * @param array $groups
+	 * @param array $db_groups
 	 *
-	 * @throws APIException
+	 * @throws APIException if the input is invalid.
 	 */
-	protected function checkAndAddUuid(array &$groups_to_create): void {
-		foreach ($groups_to_create as &$group) {
-			if (!array_key_exists('uuid', $group)) {
-				$group['uuid'] = generateUuidV4();
-			}
+	protected function validateUpdate(array &$groups, array &$db_groups = null): void {
+		$api_input_rules = ['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['groupid'], ['name']], 'fields' => [
+			'groupid' =>	['type' => API_ID, 'flags' => API_REQUIRED],
+			'name' =>		['type' => API_HG_NAME, 'length' => DB::getFieldLength('hstgrp', 'name')]
+		]];
+
+		if (!CApiInputValidator::validate($api_input_rules, $groups, '/', $error)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
-		unset($group);
 
-		$db_uuid = DB::select('hstgrp', [
-			'output' => ['uuid'],
-			'filter' => ['uuid' => array_column($groups_to_create, 'uuid')],
-			'limit' => 1
+		$db_groups = $this->get([
+			'output' => ['groupid', 'name', 'flags'],
+			'groupids' => array_column($groups, 'groupid'),
+			'editable' => true,
+			'preservekeys' => true
 		]);
 
-		if ($db_uuid) {
-			self::exception(ZBX_API_ERROR_PARAMETERS,
-				_s('Entry with UUID "%1$s" already exists.', $db_uuid[0]['uuid'])
-			);
+		if (count($db_groups) != count($groups)) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
 		}
+
+		self::checkGroupsNotDiscovered($db_groups);
+		self::checkDuplicates($groups, $db_groups);
 	}
 
 	/**
 	 * Validates if groups can be deleted.
 	 *
-	 * @param array $groupids
-	 * @param array $db_groups
-	 * @param bool $nopermissions
+	 * @param array      $groupids
+	 * @param array|null $db_groups
+	 * @param bool       $nopermissions
 	 *
 	 * @throws APIException if the input is invalid.
 	 */
-	private function validateDelete(array $groupids, array &$db_groups = null, $nopermissions) {
+	private function validateDelete(array $groupids, array &$db_groups = null, bool $nopermissions): void {
 		$api_input_rules = ['type' => API_IDS, 'flags' => API_NOT_EMPTY, 'uniq' => true];
+
 		if (!CApiInputValidator::validate($api_input_rules, $groupids, '/', $error)) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
@@ -778,18 +622,15 @@ class CHostGroup extends CApiService {
 			'output' => ['groupid', 'name', 'internal'],
 			'groupids' => $groupids,
 			'editable' => true,
-			'selectHosts' => ['hostid', 'host'],
-			'selectTemplates' => ['templateid', 'host'],
 			'preservekeys' => true,
 			'nopermissions' => $nopermissions
 		]);
 
+		if (count($db_groups) != count($groupids)) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
+		}
+
 		foreach ($groupids as $groupid) {
-			if (!array_key_exists($groupid, $db_groups)) {
-				self::exception(ZBX_API_ERROR_PERMISSIONS,
-					_('No permissions to referred object or it does not exist!')
-				);
-			}
 			if ($db_groups[$groupid]['internal'] == ZBX_INTERNAL_GROUP) {
 				self::exception(ZBX_API_ERROR_PARAMETERS,
 					_s('Host group "%1$s" is internal and cannot be deleted.', $db_groups[$groupid]['name'])
@@ -797,35 +638,42 @@ class CHostGroup extends CApiService {
 			}
 		}
 
-		// check if a group is used in a group prototype
-		$group_prototype = DBFetch(DBselect(
-			'SELECT groupid'.
-			' FROM group_prototype gp'.
-			' WHERE '.dbConditionInt('groupid', $groupids),
-			1
-		));
-		if ($group_prototype) {
+		// Check if a group is used by a host prototype.
+		$group_prototypes = DB::select('group_prototype', [
+			'output' => ['groupid'],
+			'filter' => ['groupid' => $groupids],
+			'limit' => 1
+		]);
+
+		if ($group_prototypes) {
 			self::exception(ZBX_API_ERROR_PARAMETERS,
 				_s('Group "%1$s" cannot be deleted, because it is used by a host prototype.',
-					$db_groups[$group_prototype['groupid']]['name']
+					$db_groups[$group_prototypes[0]['groupid']]['name']
 				)
 			);
 		}
 
-		$hosts_to_unlink = [];
-		$templates_to_unlink = [];
-
-		foreach ($db_groups as $db_group) {
-			foreach ($db_group['hosts'] as $host) {
-				$hosts_to_unlink[] = $host;
-			}
+		$db_hosts = API::Host()->get([
+			'output' => ['host'],
+			'groupids' => $groupids,
+			'nopermissions' => true,
+			'preservekeys' => true
+		]);
 
-			foreach ($db_group['templates'] as $template) {
-				$templates_to_unlink[] = $template;
-			}
+		if ($db_hosts) {
+			self::checkObjectsWithoutGroups('hosts', $db_hosts, $groupids);
 		}
 
-		$this->verifyHostsAndTemplatesAreUnlinkable($hosts_to_unlink, $templates_to_unlink, $groupids);
+		$db_templates = API::Template()->get([
+			'output' => ['host'],
+			'groupids' => $groupids,
+			'nopermissions' => true,
+			'preservekeys' => true
+		]);
+
+		if ($db_templates) {
+			self::checkObjectsWithoutGroups('templates', $db_templates, $groupids);
+		}
 
 		$db_scripts = DB::select('scripts', [
 			'output' => ['groupid'],
@@ -841,573 +689,926 @@ class CHostGroup extends CApiService {
 			);
 		}
 
-		$corr_condition_group = DBFetch(DBselect(
-			'SELECT cg.groupid'.
-			' FROM corr_condition_group cg'.
-			' WHERE '.dbConditionInt('cg.groupid', $groupids),
-			1
-		));
+		$corr_condition_groups = DB::select('corr_condition_group', [
+			'output' => ['groupid'],
+			'filter' => ['groupid' => $groupids],
+			'limit' => 1
+		]);
 
-		if ($corr_condition_group) {
+		if ($corr_condition_groups) {
 			self::exception(ZBX_API_ERROR_PARAMETERS,
 				_s('Group "%1$s" cannot be deleted, because it is used in a correlation condition.',
-					$db_groups[$corr_condition_group['groupid']]['name']
+					$db_groups[$corr_condition_groups[0]['groupid']]['name']
 				)
 			);
 		}
 
-		$this->validateDeleteCheckMaintenances($groupids);
+		self::validateDeleteCheckMaintenances($groupids);
 	}
 
 	/**
-	 * @param array $groups
-	 * @param array $db_groups
+	 * Check for unique host group names.
 	 *
-	 * @throws APIException if the input is invalid.
+	 * @static
+	 *
+	 * @param array      $groups
+	 * @param array|null $db_groups
+	 *
+	 * @throws APIException if host group names are not unique.
 	 */
-	protected function validateUpdate(array &$groups, array &$db_groups = null) {
-		$api_input_rules = ['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['groupid'], ['name']], 'fields' => [
-			'groupid' =>	['type' => API_ID, 'flags' => API_REQUIRED],
-			'name' =>		['type' => API_HG_NAME, 'length' => DB::getFieldLength('hstgrp', 'name')]
-		]];
-		if (!CApiInputValidator::validate($api_input_rules, $groups, '/', $error)) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
+	private static function checkDuplicates(array $groups, array $db_groups = null): void {
+		$names = [];
+
+		foreach ($groups as $group) {
+			if (!array_key_exists('name', $group)) {
+				continue;
+			}
+
+			if ($db_groups === null || $group['name'] !== $db_groups[$group['groupid']]['name']) {
+				$names[] = $group['name'];
+			}
 		}
 
-		// permissions
-		$db_groups = $this->get([
-			'output' => ['groupid', 'name', 'flags'],
-			'groupids' => zbx_objectValues($groups, 'groupid'),
-			'editable' => true,
-			'preservekeys' => true
-		]);
+		if (!$names) {
+			return;
+		}
 
-		$update_discovered_validator = new CUpdateDiscoveredValidator([
-			'messageAllowed' => _('Cannot update a discovered host group.')
+		$duplicates = DB::select('hstgrp', [
+			'output' => ['name'],
+			'filter' => ['name' => $names],
+			'limit' => 1
 		]);
 
-		$names = [];
+		if ($duplicates) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Host group "%1$s" already exists.', $duplicates[0]['name']));
+		}
+	}
 
-		foreach ($groups as $group) {
-			if (!array_key_exists($group['groupid'], $db_groups)) {
-				self::exception(ZBX_API_ERROR_PERMISSIONS,
-					_('No permissions to referred object or it does not exist!')
-				);
+	/**
+	 * Check that new UUIDs are not already used and generate UUIDs where missing.
+	 *
+	 * @static
+	 *
+	 * @param array $groups_to_create
+	 *
+	 * @throws APIException
+	 */
+	private static function checkAndAddUuid(array &$groups_to_create): void {
+		foreach ($groups_to_create as &$group) {
+			if (!array_key_exists('uuid', $group)) {
+				$group['uuid'] = generateUuidV4();
 			}
+		}
+		unset($group);
 
-			$db_group = $db_groups[$group['groupid']];
+		$db_uuid = DB::select('hstgrp', [
+			'output' => ['uuid'],
+			'filter' => ['uuid' => array_column($groups_to_create, 'uuid')],
+			'limit' => 1
+		]);
 
-			$this->checkPartialValidator($group, $update_discovered_validator, $db_group);
+		if ($db_uuid) {
+			self::exception(ZBX_API_ERROR_PARAMETERS,
+				_s('Entry with UUID "%1$s" already exists.', $db_uuid[0]['uuid'])
+			);
+		}
+	}
 
-			if (array_key_exists('name', $group) && $group['name'] !== $db_group['name']) {
-				$names[] = $group['name'];
+	/**
+	 * Check whether no one of passed groups are discovered host.
+	 *
+	 * @static
+	 *
+	 * @param array  $db_groups
+	 * @param string $db_groups[][name]
+	 * @param int    $db_groups[][flags]
+	 *
+	 * @throws APIException
+	 */
+	private static function checkGroupsNotDiscovered(array $db_groups): void {
+		foreach ($db_groups as $db_group) {
+			if ($db_group['flags'] == ZBX_FLAG_DISCOVERY_CREATED) {
+				self::exception(ZBX_API_ERROR_PARAMETERS,
+					_s('Cannot update a discovered host group "%1$s".', $db_group['name'])
+				);
 			}
 		}
+	}
 
-		if ($names) {
-			$this->checkDuplicates($names);
+	/**
+	 * Validates if host groups may be deleted, due to maintenance constrain.
+	 *
+	 * @static
+	 *
+	 * @param array $groupids
+	 *
+	 * @throws APIException if a constrain failed
+	 */
+	private static function validateDeleteCheckMaintenances(array $groupids): void {
+		$maintenance = DBfetch(DBselect(
+			'SELECT m.name'.
+			' FROM maintenances m'.
+			' WHERE NOT EXISTS ('.
+				'SELECT NULL'.
+				' FROM maintenances_groups mg'.
+				' WHERE m.maintenanceid=mg.maintenanceid'.
+					' AND '.dbConditionInt('mg.groupid', $groupids, true).
+			')'.
+				' AND NOT EXISTS ('.
+					'SELECT NULL'.
+					' FROM maintenances_hosts mh'.
+					' WHERE m.maintenanceid=mh.maintenanceid'.
+				')'
+		));
+
+		if ($maintenance) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _n(
+				'Cannot delete host group because maintenance "%1$s" must contain at least one host or host group.',
+				'Cannot delete selected host groups because maintenance "%1$s" must contain at least one host or host group.',
+				$maintenance['name'], count($groupids)
+			));
 		}
 	}
 
 	/**
-	 * Add hosts and templates to host groups. All given hosts and templates are added to all given host groups.
+	 * Inherit user groups data of parent host groups.
 	 *
-	 * @param array $data
-	 * @param array $data['groups']
-	 * @param array $data['hosts']
-	 * @param array $data['templates']
+	 * @param array $groups
+	 */
+	private static function inheritUserGroupsData(array $groups): void {
+		$group_links = self::getGroupLinks($groups);
+
+		if ($group_links) {
+			$usrgrps = [];
+			$db_usrgrps = [];
+
+			self::prepareInheritedRights($group_links, $usrgrps, $db_usrgrps);
+			self::prepareInheritedTagFilters($group_links, $usrgrps, $db_usrgrps);
+
+			if ($usrgrps) {
+				CUserGroup::updateForce(array_values($usrgrps), $db_usrgrps);
+			}
+		}
+	}
+
+	/**
+	 * Get links of parent groups to given groups.
 	 *
-	 * @return array					returns array of group IDs that hosts and templates have been added to
+	 * @param array $groups
+	 *
+	 * @return array Array where keys are parent group IDs and values are the array of child group IDs.
 	 */
-	public function massAdd(array $data) {
-		$data['groups'] = zbx_toArray($data['groups']);
-		$data['hosts'] = isset($data['hosts']) ? zbx_toArray($data['hosts']) : [];
-		$data['templates'] = isset($data['templates']) ? zbx_toArray($data['templates']) : [];
+	private static function getGroupLinks(array $groups): array {
+		$parent_names = [];
+
+		foreach ($groups as $group) {
+			$name = $group['name'];
+
+			while (($pos = strrpos($name, '/')) !== false) {
+				$name = substr($name, 0, $pos);
+				$parent_names[$name] = true;
+			}
+		}
+
+		if (!$parent_names) {
+			return [];
+		}
 
-		$this->validateMassAdd($data);
+		$options = [
+			'output' => ['groupid', 'name'],
+			'filter' => ['name' => array_keys($parent_names)]
+		];
+		$result = DBselect(DB::makeSql('hstgrp', $options));
 
-		$groupIds = zbx_objectValues($data['groups'], 'groupid');
-		$hostIds = zbx_objectValues($data['hosts'], 'hostid');
-		$templateIds = zbx_objectValues($data['templates'], 'templateid');
+		$parents_groupids = [];
 
-		$objectIds = array_merge($hostIds, $templateIds);
-		$objectIds = array_keys(array_flip($objectIds));
+		while ($row = DBfetch($result)) {
+			$parents_groupids[$row['name']] = $row['groupid'];
+		}
 
-		$linked = [];
-		$linkedDb = DBselect(
-			'SELECT hg.hostid,hg.groupid'.
-			' FROM hosts_groups hg'.
-			' WHERE '.dbConditionInt('hg.hostid', $objectIds).
-				' AND '.dbConditionInt('hg.groupid', $groupIds)
-		);
-		while ($pair = DBfetch($linkedDb)) {
-			$linked[$pair['groupid']][$pair['hostid']] = 1;
+		if (!$parents_groupids) {
+			return [];
 		}
 
-		$insert = [];
-		foreach ($groupIds as $groupId) {
-			foreach ($objectIds as $objectId) {
-				if (isset($linked[$groupId][$objectId])) {
-					continue;
+		$group_links = [];
+
+		foreach ($groups as $group) {
+			$name = $group['name'];
+
+			while (($pos = strrpos($name, '/')) !== false) {
+				$name = substr($name, 0, $pos);
+
+				if (array_key_exists($name, $parents_groupids)) {
+					$group_links[$parents_groupids[$name]][] = $group['groupid'];
+					break;
 				}
-				$insert[] = ['hostid' => $objectId, 'groupid' => $groupId];
 			}
 		}
 
-		DB::insert('hosts_groups', $insert);
-
-		return ['groupids' => $groupIds];
+		return $group_links;
 	}
 
 	/**
-	 * Remove hosts and templates from host groups. All given hosts and templates are removed from all given host groups.
+	 * Prepare rights to inherit from parent host groups.
 	 *
-	 * @param array $data
-	 * @param array $data['groupids']
-	 * @param array $data['hostids']
-	 * @param array $data['templateids']
+	 * @static
 	 *
-	 * @return array				returns array of group IDs that hosts and templates have been removed from
+	 * @param array  $group_links
+	 * @param array  $usrgrps
+	 * @param array  $db_usrgrps
 	 */
-	public function massRemove(array $data) {
-		$data['groupids'] = zbx_toArray($data['groupids'], 'groupid');
-		$data['hostids'] = isset($data['hostids']) ? zbx_toArray($data['hostids']) : [];
-		$data['templateids'] = isset($data['templateids']) ? zbx_toArray($data['templateids']) : [];
+	private static function prepareInheritedRights(array $group_links, array &$usrgrps, array &$db_usrgrps): void {
+		$db_rights = DBselect(
+			'SELECT r.groupid,r.permission,r.id,g.name'.
+			' FROM rights r,usrgrp g'.
+			' WHERE r.groupid=g.usrgrpid'.
+				' AND '.dbConditionInt('r.id', array_keys($group_links))
+		);
 
-		$this->validateMassRemove($data);
+		while ($db_right = DBfetch($db_rights)) {
+			if (!array_key_exists($db_right['groupid'], $usrgrps)) {
+				$usrgrps[$db_right['groupid']] = ['usrgrpid' => $db_right['groupid']];
+				$db_usrgrps[$db_right['groupid']] = [
+					'usrgrpid' => $db_right['groupid'],
+					'name' => $db_right['name']
+				];
+			}
 
-		$objectIds = array_merge($data['hostids'], $data['templateids']);
-		$objectIds = array_keys(array_flip($objectIds));
+			if (!array_key_exists('rights', $db_usrgrps[$db_right['groupid']])) {
+				$db_usrgrps[$db_right['groupid']]['rights'] = [];
+			}
 
-		DB::delete('hosts_groups', [
-			'hostid' => $objectIds,
-			'groupid' => $data['groupids']
-		]);
+			foreach ($group_links[$db_right['id']] as $hstgrpid) {
+				$usrgrps[$db_right['groupid']]['rights'][] = [
+					'permission' => $db_right['permission'],
+					'id' => $hstgrpid
+				];
+			}
+		}
+	}
 
-		return ['groupids' => $data['groupids']];
+	/**
+	 * Prepare tag filters to inherit from parent host groups.
+	 *
+	 * @static
+	 *
+	 * @param array  $group_links
+	 * @param array  $usrgrps
+	 * @param array  $db_usrgrps
+	 */
+	private static function prepareInheritedTagFilters(array $group_links, array &$usrgrps,
+			array &$db_usrgrps): void {
+		$db_tag_filters = DBselect(
+			'SELECT t.usrgrpid,t.groupid,t.tag,t.value,g.name'.
+			' FROM tag_filter t,usrgrp g'.
+			' WHERE t.usrgrpid=g.usrgrpid'.
+				' AND '.dbConditionInt('t.groupid', array_keys($group_links))
+		);
+
+		while ($db_tag_filter = DBfetch($db_tag_filters)) {
+			if (!array_key_exists($db_tag_filter['usrgrpid'], $usrgrps)) {
+				$usrgrps[$db_tag_filter['usrgrpid']] = ['usrgrpid' => $db_tag_filter['usrgrpid']];
+				$db_usrgrps[$db_tag_filter['usrgrpid']] = [
+					'usrgrpid' => $db_tag_filter['usrgrpid'],
+					'name' => $db_tag_filter['name']
+				];
+			}
+
+			if (!array_key_exists('tag_filters', $db_usrgrps[$db_tag_filter['usrgrpid']])) {
+				$db_usrgrps[$db_tag_filter['usrgrpid']]['tag_filters'] = [];
+			}
+
+			foreach ($group_links[$db_tag_filter['groupid']] as $hstgrpid) {
+				$usrgrps[$db_tag_filter['usrgrpid']]['tag_filters'][] = [
+					'groupid' => $hstgrpid,
+					'tag' => $db_tag_filter['tag'],
+					'value' => $db_tag_filter['value']
+				];
+			}
+		}
 	}
 
 	/**
-	 * Update host groups with new hosts and templates.
+	 * Add given hosts and templates to given host groups.
 	 *
 	 * @param array $data
-	 * @param array $data['groups']
-	 * @param array $data['hosts']
-	 * @param array $data['templates']
 	 *
-	 * @return array				returns array of group IDs that hosts and templates have been added to and
-	 *								removed from
+	 * @return array
 	 */
-	public function massUpdate(array $data) {
-		if (!array_key_exists('groups', $data) || !is_array($data['groups'])) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Field "%1$s" is mandatory.', 'groups'));
+	public function massAdd(array $data): array {
+		$this->validateMassAdd($data, $db_groups);
+
+		$groups = self::getGroupsByData($data, $db_groups);
+		$ins_hosts_groups = self::getInsHostsGroups($groups, __FUNCTION__);
+
+		if ($ins_hosts_groups) {
+			$ids = DB::insertBatch('hosts_groups', $ins_hosts_groups);
+			self::addHostgroupids($groups, $ids);
 		}
 
-		$data['groups'] = zbx_toArray($data['groups']);
-		$data['hosts'] = isset($data['hosts']) ? zbx_toArray($data['hosts']) : [];
-		$data['templates'] = isset($data['templates']) ? zbx_toArray($data['templates']) : [];
+		self::addAuditLog(CAudit::ACTION_UPDATE, CAudit::RESOURCE_HOST_GROUP, $groups, $db_groups);
 
-		$this->validateMassUpdate($data);
+		return ['groupids' => array_column($data['groups'], 'groupid')];
+	}
 
-		$groupIds = zbx_objectValues($data['groups'], 'groupid');
-		$hostIds = zbx_objectValues($data['hosts'], 'hostid');
-		$templateIds = zbx_objectValues($data['templates'], 'templateid');
+	/**
+	 * Replace hosts and templates on the given host groups.
+	 *
+	 * @param array $data
+	 *
+	 * @return array
+	 */
+	public function massUpdate(array $data) {
+		$this->validateMassUpdate($data, $db_groups);
 
-		$objectIds = zbx_toHash(array_merge($hostIds, $templateIds));
+		$groups = self::getGroupsByData($data, $db_groups);
+		$ins_hosts_groups = self::getInsHostsGroups($groups, __FUNCTION__, $db_hostgroupids);
+		$del_hostgroupids = self::getDelHostgroupids($db_groups, $db_hostgroupids);
 
-		// get old records and skip discovered hosts
-		$oldRecords = DBfetchArray(DBselect(
-			'SELECT hg.hostid,hg.groupid,hg.hostgroupid'.
-			' FROM hosts_groups hg,hosts h'.
-			' WHERE '.dbConditionInt('hg.groupid', $groupIds).
-				' AND hg.hostid=h.hostid'.
-				' AND h.flags='.ZBX_FLAG_DISCOVERY_NORMAL
-		));
+		if ($ins_hosts_groups) {
+			$ids = DB::insertBatch('hosts_groups', $ins_hosts_groups);
+			self::addHostgroupids($groups, $ids);
+		}
 
-		// calculate new records
-		$replaceRecords = [];
-		$newRecords = [];
+		if ($del_hostgroupids) {
+			DB::delete('hosts_groups', ['hostgroupid' => $del_hostgroupids]);
+		}
 
-		foreach ($groupIds as $groupId) {
-			$groupRecords = [];
-			foreach ($oldRecords as $oldRecord) {
-				if ($oldRecord['groupid'] == $groupId) {
-					$groupRecords[] = $oldRecord;
-				}
-			}
+		self::addAuditLog(CAudit::ACTION_UPDATE, CAudit::RESOURCE_HOST_GROUP, $groups, $db_groups);
 
-			// find records for replace
-			foreach ($groupRecords as $groupRecord) {
-				if (isset($objectIds[$groupRecord['hostid']])) {
-					$replaceRecords[] = $groupRecord;
-				}
-			}
+		return ['groupids' => array_column($data['groups'], 'groupid')];
+	}
 
-			// find records for create
-			$groupHostIds = zbx_toHash(zbx_objectValues($groupRecords, 'hostid'));
+	/**
+	 * Remove given hosts and templates from given host groups.
+	 *
+	 * @param array $data
+	 *
+	 * @return array
+	 */
+	public function massRemove(array $data): array {
+		$this->validateMassRemove($data, $db_groups);
 
-			$newHostIds = array_diff($objectIds, $groupHostIds);
-			foreach ($newHostIds as $newHostId) {
-				$newRecords[] = [
-					'groupid' => $groupId,
-					'hostid' => $newHostId
-				];
-			}
+		$groups = self::getGroupsByData([], $db_groups);
+		$del_hostgroupids = self::getDelHostgroupids($db_groups);
+
+		if ($del_hostgroupids) {
+			DB::delete('hosts_groups', ['hostgroupid' => $del_hostgroupids]);
 		}
 
-		DB::replace('hosts_groups', $oldRecords, array_merge($replaceRecords, $newRecords));
+		self::addAuditLog(CAudit::ACTION_UPDATE, CAudit::RESOURCE_HOST_GROUP, $groups, $db_groups);
 
-		return ['groupids' => $groupIds];
+		return ['groupids' => $data['groupids']];
 	}
 
 	/**
-	 * Validate write permissions to host groups that are added to given hosts and templates.
-	 *
-	 * @param array $data
-	 * @param array $data['groups']
-	 * @param array $data['hosts']
-	 * @param array $data['templates']
+	 * @param array      $data
+	 * @param array|null $db_groups
 	 *
-	 * @throws APIException		if user has no write permissions to any of the given host groups
+	 * @throws APIException if the input is invalid.
 	 */
-	protected function validateMassAdd(array $data) {
-		$groupIds = zbx_objectValues($data['groups'], 'groupid');
-		$hostIds = zbx_objectValues($data['hosts'], 'hostid');
-		$templateIds = zbx_objectValues($data['templates'], 'templateid');
-
-		$groupIdsToAdd = [];
-
-		if ($hostIds) {
-			$dbHosts = API::Host()->get([
-				'output' => ['hostid'],
-				'selectGroups' => ['groupid'],
-				'hostids' => $hostIds,
-				'editable' => true,
-				'preservekeys' => true
-			]);
+	private function validateMassAdd(array $data, ?array &$db_groups): void {
+		$api_input_rules = ['type' => API_OBJECT, 'flags' => API_NOT_EMPTY, 'fields' => [
+			'groups' =>		['type' => API_OBJECTS, 'flags' => API_REQUIRED | API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['groupid']], 'fields' => [
+				'groupid' =>	['type' => API_ID, 'flags' => API_REQUIRED]
+			]],
+			'hosts' =>		['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['hostid']], 'fields' => [
+				'hostid'=>		['type' => API_ID, 'flags' => API_REQUIRED]
+			]],
+			'templates' =>	['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['templateid']], 'fields' => [
+				'templateid'=>	['type' => API_ID, 'flags' => API_REQUIRED]
+			]]
+		]];
 
-			$this->validateHostsPermissions($hostIds, $dbHosts);
+		if (!CApiInputValidator::validate($api_input_rules, $data, '/', $error)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
+		}
 
-			$this->checkValidator($hostIds, new CHostNormalValidator([
-				'message' => _('Cannot update groups for discovered host "%1$s".')
-			]));
+		if (!array_key_exists('hosts', $data) && !array_key_exists('templates', $data)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _('At least one host or template must be specified.'));
+		}
 
-			foreach ($dbHosts as $dbHost) {
-				$oldGroupIds = zbx_objectValues($dbHost['groups'], 'groupid');
+		$db_groups = $this->get([
+			'output' => ['groupid','name'],
+			'groupids' => array_column($data['groups'], 'groupid'),
+			'editable' => true,
+			'preservekeys' => true
+		]);
 
-				foreach (array_diff($groupIds, $oldGroupIds) as $groupId) {
-					$groupIdsToAdd[$groupId] = $groupId;
-				}
-			}
+		if (count($db_groups) != count($data['groups'])) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
 		}
 
-		if ($templateIds) {
-			$dbTemplates = API::Template()->get([
-				'output' => ['templateid'],
-				'selectGroups' => ['groupid'],
-				'templateids' => $templateIds,
-				'editable' => true,
-				'preservekeys' => true
+		if (array_key_exists('hosts', $data)) {
+			$hostids = array_column($data['hosts'], 'hostid');
+
+			$db_hosts = API::Host()->get([
+				'output' => ['host', 'flags'],
+				'hostids' => $hostids,
+				'editable' => true
 			]);
 
-			$this->validateHostsPermissions($templateIds, $dbTemplates);
+			if (count($db_hosts) != count($hostids)) {
+				self::exception(ZBX_API_ERROR_PERMISSIONS,
+					_('No permissions to referred object or it does not exist!')
+				);
+			}
 
-			foreach ($dbTemplates as $dbTemplate) {
-				$oldGroupIds = zbx_objectValues($dbTemplate['groups'], 'groupid');
+			self::checkHostsNotDiscovered($db_hosts);
 
-				foreach (array_diff($groupIds, $oldGroupIds) as $groupId) {
-					$groupIdsToAdd[$groupId] = $groupId;
-				}
-			}
+			self::addAffectedObjects('hosts', $hostids, $db_groups);
 		}
 
-		if ($groupIdsToAdd) {
-			$count = $this->get([
+		if (array_key_exists('templates', $data)) {
+			$templateids = array_column($data['templates'], 'templateid');
+
+			$count = API::Template()->get([
 				'countOutput' => true,
-				'groupids' => $groupIdsToAdd,
+				'templateids' => $templateids,
 				'editable' => true
 			]);
 
-			if ($count != count($groupIdsToAdd)) {
+			if ($count != count($templateids)) {
 				self::exception(ZBX_API_ERROR_PERMISSIONS,
 					_('No permissions to referred object or it does not exist!')
 				);
 			}
+
+			self::addAffectedObjects('templates', $templateids, $db_groups);
 		}
 	}
 
 	/**
-	 * Validate write permissions to host groups that are added and removed from given hosts and templates. Also check
-	 * if host and template has at least one host group left when removing host groups.
+	 * @param array      $data
+	 * @param array|null $db_groups
 	 *
-	 * @param array $data
-	 * @param array $data['groups']
-	 * @param array $data['hosts']
-	 * @param array $data['templates']
-	 *
-	 * @throws APIException		if user has no write permissions to any of the given host groups or one of the hosts and
-	 *							templates is left without a host group
+	 * @throws APIException if the input is invalid.
 	 */
-	protected function validateMassUpdate(array $data) {
-		$groupIds = zbx_objectValues($data['groups'], 'groupid');
-		$hostIds = zbx_objectValues($data['hosts'], 'hostid');
-		$templateIds = zbx_objectValues($data['templates'], 'templateid');
+	private function validateMassUpdate(array &$data, ?array &$db_groups): void {
+		$api_input_rules = ['type' => API_OBJECT, 'flags' => API_NOT_EMPTY, 'fields' => [
+			'groups' =>		['type' => API_OBJECTS, 'flags' => API_REQUIRED | API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['groupid']], 'fields' => [
+				'groupid' =>	['type' => API_ID, 'flags' => API_REQUIRED]
+			]],
+			'hosts' =>		['type' => API_OBJECTS, 'flags' => API_REQUIRED | API_NORMALIZE, 'uniq' => [['hostid']], 'fields' => [
+				'hostid'=>		['type' => API_ID, 'flags' => API_REQUIRED]
+			]],
+			'templates' =>	['type' => API_OBJECTS, 'flags' => API_REQUIRED | API_NORMALIZE, 'uniq' => [['templateid']], 'fields' => [
+				'templateid'=>	['type' => API_ID, 'flags' => API_REQUIRED]
+			]]
+		]];
 
-		$dbGroups = $this->get([
-			'output' => ['groupid'],
-			'groupids' => $groupIds,
-			'selectHosts' => ['hostid', 'host'],
-			'selectTemplates' => ['templateid', 'host']
+		if (!CApiInputValidator::validate($api_input_rules, $data, '/', $error)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
+		}
+
+		$groupids = array_column($data['groups'], 'groupid');
+
+		$db_groups = $this->get([
+			'output' => ['groupid', 'name'],
+			'groupids' => $groupids,
+			'editable' => true,
+			'preservekeys' => true
 		]);
 
-		if (!$dbGroups) {
+		if (count($db_groups) != count($groupids)) {
 			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
 		}
 
-		// Collect group IDs that will added to given hosts and templates.
-		$groupIdsToAdd = [];
-
-		// Collect group IDs that will removed from given hosts and templates.
-		$groupIdsToRemove = [];
-
-		/*
-		 * When given hosts or templates belong to other groups and those group IDs are not passed in parameters,
-		 * those groups will be removed from given hosts and templates. Collect those host and template IDs
-		 * from groups that will be removed.
-		 */
-		$objectIds = [];
-
-		/*
-		 * New or existing hosts have been passed in parameters. First check write permissions to hosts
-		 * and if hosts are not discovered. Then check if groups should be added and/or removed from given hosts.
-		 */
-		if ($hostIds) {
-			$dbHosts = API::Host()->get([
-				'output' => ['hostid'],
-				'selectGroups' => ['groupid'],
-				'hostids' => $hostIds,
-				'editable' => true,
-				'preservekeys' => true
+		$hostids = array_column($data['hosts'], 'hostid');
+		$templateids = array_column($data['templates'], 'templateid');
+
+		if ($hostids) {
+			$db_hosts = API::Host()->get([
+				'output' => ['host', 'flags'],
+				'hostids' => $hostids,
+				'editable' => true
 			]);
 
-			$this->validateHostsPermissions($hostIds, $dbHosts);
+			if (count($db_hosts) != count($hostids)) {
+				self::exception(ZBX_API_ERROR_PERMISSIONS,
+					_('No permissions to referred object or it does not exist!')
+				);
+			}
 
-			$this->checkValidator($hostIds, new CHostNormalValidator([
-				'message' => _('Cannot update groups for discovered host "%1$s".')
-			]));
+			self::checkHostsNotDiscovered($db_hosts);
+		}
 
-			foreach ($dbHosts as $dbHost) {
-				$oldGroupIds = zbx_objectValues($dbHost['groups'], 'groupid');
+		self::addAffectedObjects('hosts', [], $db_groups, $db_hostids);
 
-				// Validate groups that are added for current host.
-				foreach (array_diff($groupIds, $oldGroupIds) as $groupId) {
-					$groupIdsToAdd[$groupId] = $groupId;
-				}
+		$del_hostids = array_diff($db_hostids, $hostids);
 
-				// Validate groups that are removed from current host.
-				foreach (array_diff($oldGroupIds, $groupIds) as $groupId) {
-					$groupIdsToRemove[$groupId] = $groupId;
-				}
+		if ($del_hostids) {
+			self::checkDeletedObjects('hosts', $del_hostids, $groupids);
+		}
 
-				if ($groupIdsToRemove) {
-					$objectIds[] = $dbHost['hostid'];
-				}
+		if ($templateids) {
+			$count = API::Template()->get([
+				'countOutput' => true,
+				'templateids' => $templateids,
+				'editable' => true
+			]);
+
+			if ($count != count($templateids)) {
+				self::exception(ZBX_API_ERROR_PERMISSIONS,
+					_('No permissions to referred object or it does not exist!')
+				);
 			}
 		}
 
-		/*
-		 * New or existing templates have been passed in parameters. First check write permissions to templates.
-		 * Then check if groups should be added and/or removed from given templates.
-		 */
-		if ($templateIds) {
-			$dbTemplates = API::Template()->get([
-				'output' => ['templateid'],
-				'selectGroups' => ['groupid'],
-				'templateids' => $templateIds,
-				'editable' => true,
-				'preservekeys' => true
-			]);
+		self::addAffectedObjects('templates', [], $db_groups, $db_templateids);
 
-			$this->validateHostsPermissions($templateIds, $dbTemplates);
+		$del_templateids = array_diff($db_templateids, $templateids);
 
-			foreach ($dbTemplates as $dbTemplate) {
-				$oldGroupIds = zbx_objectValues($dbTemplate['groups'], 'groupid');
+		if ($del_templateids) {
+			self::checkDeletedObjects('templates', $del_templateids, $groupids);
+		}
+	}
 
-				// Validate groups that are added for current template.
-				foreach (array_diff($groupIds, $oldGroupIds) as $groupId) {
-					$groupIdsToAdd[$groupId] = $groupId;
-				}
+	/**
+	 * @param array      $data
+	 * @param array|null $db_groups
+	 *
+	 * @throws APIException if the input is invalid.
+	 */
+	private function validateMassRemove(array &$data, ?array &$db_groups): void {
+		$api_input_rules = ['type' => API_OBJECT, 'flags' => API_NOT_EMPTY, 'fields' => [
+			'groupids' =>		['type' => API_IDS, 'flags' => API_REQUIRED | API_NOT_EMPTY | API_NORMALIZE, 'uniq' => true],
+			'hostids' =>		['type' => API_IDS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => true],
+			'templateids' =>	['type' => API_IDS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => true]
+		]];
 
-				// Validate groups that are removed from current template.
-				foreach (array_diff($oldGroupIds, $groupIds) as $groupId) {
-					$groupIdsToRemove[$groupId] = $groupId;
-				}
+		if (!CApiInputValidator::validate($api_input_rules, $data, '/', $error)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
+		}
 
-				if ($groupIdsToRemove) {
-					$objectIds[] = $dbTemplate['templateid'];
-				}
-			}
+		if (!array_key_exists('hostids', $data) && !array_key_exists('templateids', $data)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _('At least one host or template must be specified.'));
 		}
 
-		// Continue to check new, existing or removable groups for given hosts and templates.
-		$groupIdsToUpdate = $groupIdsToAdd + $groupIdsToRemove;
+		$db_groups = $this->get([
+			'output' => ['groupid', 'name'],
+			'groupids' => $data['groupids'],
+			'editable' => true,
+			'preservekeys' => true
+		]);
 
-		// Validate write permissions only to changed (added/removed) groups for given hosts and templates.
-		if ($groupIdsToUpdate) {
-			$count = $this->get([
-				'countOutput' => true,
-				'groupids' => $groupIdsToUpdate,
-				'editable' => true
+		if (count($db_groups) != count($data['groupids'])) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
+		}
+
+		if (array_key_exists('hostids', $data)) {
+			$db_hosts = API::Host()->get([
+				'output' => ['host', 'flags'],
+				'hostids' => $data['hostids'],
+				'editable' => true,
+				'preservekeys' => true
 			]);
 
-			if ($count != count($groupIdsToUpdate)) {
+			if (count($db_hosts) != count($data['hostids'])) {
 				self::exception(ZBX_API_ERROR_PERMISSIONS,
 					_('No permissions to referred object or it does not exist!')
 				);
 			}
+
+			self::checkHostsNotDiscovered($db_hosts);
+			self::checkObjectsWithoutGroups('hosts', $db_hosts, $data['groupids']);
+
+			self::addAffectedObjects('hosts', $data['hostids'], $db_groups);
 		}
 
-		// Check if groups can be removed from given hosts and templates. Only check if no groups are added.
-		if (!$groupIdsToAdd && $groupIdsToRemove) {
-			$unlinkableObjectIds = getUnlinkableHostIds($groupIdsToRemove, $objectIds);
+		if (array_key_exists('templateids', $data)) {
+			$db_templates = API::Template()->get([
+				'output' => ['host'],
+				'templateids' => $data['templateids'],
+				'editable' => true,
+				'preservekeys' => true
+			]);
 
-			if (count($objectIds) != count($unlinkableObjectIds)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('One of the objects is left without a host group.'));
+			if (count($db_templates) != count($data['templateids'])) {
+				self::exception(ZBX_API_ERROR_PERMISSIONS,
+					_('No permissions to referred object or it does not exist!')
+				);
 			}
-		}
 
-		$hosts_to_unlink = [];
-		$templates_to_unlink = [];
-		$hostIds = array_flip($hostIds);
-		$templateIds = array_flip($templateIds);
+			self::checkObjectsWithoutGroups('templates', $db_templates, $data['groupids']);
 
-		foreach ($dbGroups as $group) {
-			foreach ($group['hosts'] as $host) {
-				if (!array_key_exists($host['hostid'], $hostIds)) {
-					$hosts_to_unlink[] = $host;
-				}
+			self::addAffectedObjects('templates', $data['templateids'], $db_groups);
+		}
+	}
+
+	/**
+	 * Check whether no one of given hosts are discovered host.
+	 *
+	 * @static
+	 *
+	 * @param array  $db_hosts
+	 * @param string $db_hosts[][host]
+	 * @param int    $db_hosts[][flags]
+	 *
+	 * @throws APIException
+	 */
+	private static function checkHostsNotDiscovered(array $db_hosts): void {
+		foreach ($db_hosts as $db_host) {
+			if ($db_host['flags'] == ZBX_FLAG_DISCOVERY_CREATED) {
+				self::exception(ZBX_API_ERROR_PARAMETERS,
+					_s('Cannot update groups for discovered host "%1$s".', $db_host['host'])
+				);
 			}
+		}
+	}
 
-			foreach ($group['templates'] as $template) {
-				if (!array_key_exists($template['templateid'], $templateIds)) {
-					$templates_to_unlink[] = $template;
-				}
+	/**
+	 * Check to exclude an opportunity to leave host or template without groups.
+	 *
+	 * @static
+	 *
+	 * @param string $objects
+	 * @param array  $db_objects
+	 * @param string $db_objects[<objectid>]['host']
+	 * @param array  $groupids
+	 *
+	 * @throws APIException
+	 */
+	private static function checkObjectsWithoutGroups(string $objects, array $db_objects, array $groupids): void {
+		$hostids = array_keys($db_objects);
+
+		$objectids_with_groups = DBfetchColumn(DBselect(
+			'SELECT DISTINCT hg.hostid'.
+			' FROM hosts_groups hg'.
+			' WHERE '.dbConditionInt('hg.groupid', $groupids, true).
+				' AND '.dbConditionInt('hg.hostid', $hostids)
+		), 'hostid');
+
+		$objectids_without_groups = array_diff($hostids, $objectids_with_groups);
+
+		if ($objectids_without_groups) {
+			$objectid = reset($objectids_without_groups);
+			$error = ($objects === 'hosts')
+				? _s('Host "%1$s" cannot be without host group.', $db_objects[$objectid]['host'])
+				: _s('Template "%1$s" cannot be without host group.', $db_objects[$objectid]['host']);
+
+			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
+		}
+	}
+
+	/**
+	 * Add the existing hosts or templates whether these are affected by the mass methods.
+	 * If object IDs passed as empty array, all object links of given groups will be collected from database and all
+	 * existing object IDs will be collected in $db_objectids.
+	 *
+	 * @static
+	 *
+	 * @param string     $objects
+	 * @param array      $objectids
+	 * @param array      $db_groups
+	 * @param array|null $db_objectids
+	 */
+	private static function addAffectedObjects(string $objects, array $objectids, array &$db_groups,
+			array &$db_objectids = null): void {
+		$id_field_name = ($objects === 'templates') ? 'templateid' : 'hostid';
+
+		if (!$objectids) {
+			$db_objectids = [];
+		}
+
+		foreach ($db_groups as &$db_group) {
+			$db_group[$objects] = [];
+		}
+		unset($db_group);
+
+		if ($objectids) {
+			$options = [
+				'output' => ['hostgroupid', 'hostid', 'groupid'],
+				'filter' => [
+					'hostid' => $objectids,
+					'groupid' => array_keys($db_groups)
+				]
+			];
+			$db_hosts_groups = DBselect(DB::makeSql('hosts_groups', $options));
+		}
+		else {
+			$db_hosts_groups = DBselect(
+				'SELECT hg.hostgroupid,hg.hostid,hg.groupid'.
+				' FROM hosts_groups hg,hosts h'.
+				' WHERE hg.hostid=h.hostid'.
+					' AND '.dbConditionInt('hg.groupid', array_keys($db_groups)).
+					' AND '.dbConditionInt('h.status', [HOST_STATUS_TEMPLATE], $objects === 'hosts').
+					' AND h.flags='.ZBX_FLAG_DISCOVERY_NORMAL
+			);
+		}
+
+		while ($link = DBfetch($db_hosts_groups)) {
+			$db_groups[$link['groupid']][$objects][$link['hostgroupid']] = [
+				'hostgroupid' => $link['hostgroupid'],
+				$id_field_name => $link['hostid']
+			];
+
+			if (!$objectids) {
+				$db_objectids[$link['hostid']] = true;
 			}
 		}
 
-		$this->verifyHostsAndTemplatesAreUnlinkable($hosts_to_unlink, $templates_to_unlink, $groupIds);
+		if (!$objectids) {
+			$db_objectids = array_keys($db_objectids);
+		}
 	}
 
 	/**
-	 * Validate write permissions to host groups that are removed from given hosts and templates. Also check
-	 * if host and template has at least one host group left.
+	 * Check to delete given hosts or templates from the given host groups.
 	 *
-	 * @param array $data
-	 * @param array $data['groupids']
-	 * @param array $data['hostids']
-	 * @param array $data['templateids']
+	 * @static
+	 *
+	 * @param string $objects
+	 * @param array  $del_objectids
+	 * @param array  $groupids
 	 *
-	 * @throws APIException		if user has no write permissions to any of the given host groups or one of the hosts and
-	 *							templates is left without a host group
+	 * @throws APIException
 	 */
-	protected function validateMassRemove(array $data) {
-		$groupIdsToRemove = [];
-		$hostIds = isset($data['hostids']) ? $data['hostids'] : [];
-		$templateIds = isset($data['templateids']) ? $data['templateids'] : [];
-		$hosts_to_unlink = [];
-		$templates_to_unlink = [];
-
-		if ($hostIds) {
-			$dbHosts = API::Host()->get([
-				'output' => ['hostid', 'host'],
-				'selectGroups' => ['groupid'],
-				'hostids' => $hostIds,
+	private static function checkDeletedObjects(string $objects, array $del_objectids, array $groupids): void {
+		if ($objects === 'templates') {
+			$db_objects = API::Template()->get([
+				'output' => ['host'],
+				'templateids' => $del_objectids,
 				'editable' => true,
 				'preservekeys' => true
 			]);
+		}
+		else {
+			$db_objects = API::Host()->get([
+				'output' => ['host'],
+				'hostids' => $del_objectids,
+				'editable' => true,
+				'preservekeys' => true
+			]);
+		}
 
-			$this->validateHostsPermissions($hostIds, $dbHosts);
-
-			$this->checkValidator($hostIds, new CHostNormalValidator([
-				'message' => _('Cannot update groups for discovered host "%1$s".')
-			]));
+		if (count($db_objects) != count($del_objectids)) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
+		}
 
-			foreach ($dbHosts as $dbHost) {
-				$oldGroupIds = zbx_objectValues($dbHost['groups'], 'groupid');
+		self::checkObjectsWithoutGroups($objects, $db_objects, $groupids);
+	}
 
-				// check if host belongs to the removable host group
-				$hostGroupIdsToRemove = array_intersect($data['groupids'], $oldGroupIds);
+	/**
+	 * Get host groups input array based on requested data and database data.
+	 *
+	 * @static
+	 *
+	 * @param array $data
+	 * @param array $db_groups
+	 *
+	 * @return array
+	 */
+	private static function getGroupsByData(array $data, array $db_groups): array {
+		$groups = [];
 
-				if ($hostGroupIdsToRemove) {
-					$hosts_to_unlink[] = $dbHost;
+		foreach ($db_groups as $db_group) {
+			$group = ['groupid' => $db_group['groupid']];
+
+			if (array_key_exists('hosts', $db_group)) {
+				$group['hosts'] = [];
+				$db_hosts = array_column($db_group['hosts'], null, 'hostid');
+
+				if (array_key_exists('hosts', $data)) {
+					foreach ($data['hosts'] as $host) {
+						if (array_key_exists($host['hostid'], $db_hosts)) {
+							$group['hosts'][] = $db_hosts[$host['hostid']];
+						}
+						else {
+							$group['hosts'][] = ['hostid' => $host['hostid']];
+						}
+					}
+				}
+			}
 
-					foreach ($hostGroupIdsToRemove as $groupId) {
-						$groupIdsToRemove[$groupId] = $groupId;
+			if (array_key_exists('templates', $db_group)) {
+				$group['templates'] = [];
+				$db_templates = array_column($db_group['templates'], null, 'templateid');
+
+				if (array_key_exists('templates', $data)) {
+					foreach ($data['templates'] as $template) {
+						if (array_key_exists($template['templateid'], $db_templates)) {
+							$group['templates'][] = $db_templates[$template['templateid']];
+						}
+						else {
+							$group['templates'][] = ['templateid' => $template['templateid']];
+						}
 					}
 				}
 			}
-		}
 
-		if ($templateIds) {
-			$dbTemplates = API::Template()->get([
-				'output' => ['templateid', 'host'],
-				'selectGroups' => ['groupid'],
-				'templateids' => $templateIds,
-				'editable' => true,
-				'preservekeys' => true
-			]);
+			$groups[] = $group;
+		}
 
-			$this->validateHostsPermissions($templateIds, $dbTemplates);
+		return $groups;
+	}
 
-			foreach ($dbTemplates as $dbTemplate) {
-				$oldGroupIds = zbx_objectValues($dbTemplate['groups'], 'groupid');
+	/**
+	 * Get rows to insert hosts and templates on the given host groups.
+	 *
+	 * @static
+	 *
+	 * @param array      $groups
+	 * @param string     $method
+	 * @param array|null $db_hostgroupids
+	 *
+	 * @return array
+	 */
+	private static function getInsHostsGroups(array $groups, string $method, array &$db_hostgroupids = null): array {
+		$ins_hosts_groups = [];
 
-				// check if template belongs to the removable host group
-				$templateGroupIdsToRemove = array_intersect($data['groupids'], $oldGroupIds);
+		if ($method === 'massUpdate') {
+			$db_hostgroupids = [];
+		}
 
-				if ($templateGroupIdsToRemove) {
-					$templates_to_unlink[] = $dbTemplate;
+		foreach ($groups as $group) {
+			if (array_key_exists('hosts', $group)) {
+				foreach ($group['hosts'] as $host) {
+					if (!array_key_exists('hostgroupid', $host)) {
+						$ins_hosts_groups[] = [
+							'hostid' => $host['hostid'],
+							'groupid' => $group['groupid']
+						];
+					}
+					elseif ($method === 'massUpdate') {
+						$db_hostgroupids[$host['hostgroupid']] = true;
+					}
+				}
+			}
 
-					foreach ($templateGroupIdsToRemove as $groupId) {
-						$groupIdsToRemove[$groupId] = $groupId;
+			if (array_key_exists('templates', $group)) {
+				foreach ($group['templates'] as $template) {
+					if (!array_key_exists('hostgroupid', $template)) {
+						$ins_hosts_groups[] = [
+							'hostid' => $template['templateid'],
+							'groupid' => $group['groupid']
+						];
+					}
+					elseif ($method === 'massUpdate') {
+						$db_hostgroupids[$template['hostgroupid']] = true;
 					}
 				}
 			}
 		}
 
-		if ($groupIdsToRemove) {
-			$count = $this->get([
-				'countOutput' => true,
-				'groupids' => $groupIdsToRemove,
-				'editable' => true
-			]);
+		return $ins_hosts_groups;
+	}
 
-			if ($count != count($groupIdsToRemove)) {
-				self::exception(ZBX_API_ERROR_PERMISSIONS,
-					_('No permissions to referred object or it does not exist!')
-				);
+	/**
+	 * Add IDs of inserted hosts and templates on the given host groups.
+	 *
+	 * @param array $groups
+	 * @param array $ids
+	 */
+	private static function addHostgroupids(array &$groups, array $ids): void {
+		foreach ($groups as &$group) {
+			if (array_key_exists('hosts', $group)) {
+				foreach ($group['hosts'] as &$host) {
+					if (!array_key_exists('hostgroupid', $host)) {
+						$host['hostgroupid'] = array_shift($ids);
+					}
+				}
+				unset($host);
 			}
-		}
 
-		$this->verifyHostsAndTemplatesAreUnlinkable($hosts_to_unlink, $templates_to_unlink, $groupIdsToRemove);
+			if (array_key_exists('templates', $group)) {
+				foreach ($group['templates'] as &$template) {
+					if (!array_key_exists('hostgroupid', $template)) {
+						$template['hostgroupid'] = array_shift($ids);
+					}
+				}
+				unset($template);
+			}
+		}
+		unset($group);
 	}
 
 	/**
-	 * Validate write permissions to hosts or templates by given host or template IDs.
+	 * Get IDs to delete hosts and templates from the given host groups.
 	 *
-	 * @param array $hostIds		array of host IDs or template IDs
-	 * @param array $dbHosts		array of allowed hosts or templates
+	 * @static
 	 *
-	 * @throws APIException			if user has no write permissions to one of the hosts or templates
+	 * @param array $db_groups
+	 * @param array $db_hostgroupids
+	 *
+	 * @return array
 	 */
-	protected function validateHostsPermissions(array $hostIds, array $dbHosts) {
-		foreach ($hostIds as $hostId) {
-			if (!isset($dbHosts[$hostId])) {
-				self::exception(ZBX_API_ERROR_PERMISSIONS,
-					_('No permissions to referred object or it does not exist!')
-				);
+	private static function getDelHostgroupids(array $db_groups, array $db_hostgroupids = []): array {
+		$del_hostgroupids = [];
+
+		foreach ($db_groups as $db_group) {
+			if (array_key_exists('hosts', $db_group)) {
+				$del_hostgroupids += array_diff_key($db_group['hosts'], $db_hostgroupids);
+			}
+
+			if (array_key_exists('templates', $db_group)) {
+				$del_hostgroupids += array_diff_key($db_group['templates'], $db_hostgroupids);
 			}
 		}
+
+		$del_hostgroupids = array_keys($del_hostgroupids);
+
+		return $del_hostgroupids;
 	}
 
 	protected function addRelatedObjects(array $options, array $result) {
@@ -1523,83 +1724,4 @@ class CHostGroup extends CApiService {
 
 		return $result;
 	}
-
-	/**
-	 * Verify that hosts and templates are unlinkable from groups.
-	 *
-	 * @param array     $hosts
-	 * @param integer   $hosts[]['hostid']
-	 * @param string    $hosts[]['host']
-	 * @param array     $templates
-	 * @param integer   $templates[]['templateid']
-	 * @param string    $templates[]['host']
-	 * @param array     $groupids
-	 */
-	protected function verifyHostsAndTemplatesAreUnlinkable(array $hosts, array $templates, array $groupids) {
-		$objectids = [];
-		$host_names = [];
-		$template_names = [];
-
-		foreach ($hosts as $host) {
-			$objectids[] = $host['hostid'];
-			$host_names[$host['hostid']] = $host['host'];
-		}
-
-		foreach ($templates as $template) {
-			$objectids[] = $template['templateid'];
-			$template_names[$template['templateid']] = $template['host'];
-		}
-
-		if ($objectids && $groupids) {
-			$not_unlinkable_objectids = array_diff($objectids, getUnlinkableHostIds($groupids, $objectids));
-
-			if ($not_unlinkable_objectids) {
-				$objectid = reset($not_unlinkable_objectids);
-
-				if (array_key_exists($objectid, $host_names)) {
-					self::exception(ZBX_API_ERROR_PARAMETERS,
-						_s('Host "%1$s" cannot be without host group.', $host_names[$objectid])
-					);
-				}
-
-				self::exception(ZBX_API_ERROR_PARAMETERS,
-					_s('Template "%1$s" cannot be without host group.', $template_names[$objectid])
-				);
-			}
-		}
-	}
-
-	/**
-	 * Validates if host groups may be deleted, due to maintenance constrain.
-	 *
-	 * @throws APIException if a constrain failed
-	 *
-	 * @param array $groupids
-	 */
-	protected function validateDeleteCheckMaintenances(array $groupids) {
-		$maintenance = DBfetch(DBselect(
-			'SELECT m.name'.
-			' FROM maintenances m'.
-			' WHERE NOT EXISTS ('.
-				'SELECT NULL'.
-				' FROM maintenances_groups mg'.
-				' WHERE m.maintenanceid=mg.maintenanceid'.
-					' AND '.dbConditionInt('mg.groupid', $groupids, true).
-			')'.
-				' AND NOT EXISTS ('.
-					'SELECT NULL'.
-					' FROM maintenances_hosts mh'.
-					' WHERE m.maintenanceid=mh.maintenanceid'.
-				')'
-		));
-
-		if ($maintenance) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _n(
-				'Cannot delete host group because maintenance "%1$s" must contain at least one host or host group.',
-				'Cannot delete selected host groups because maintenance "%1$s" must contain at least one host or host group.',
-				$maintenance['name'],
-				count($groupids)
-			));
-		}
-	}
 }
diff --git a/ui/include/classes/api/services/CHostInterface.php b/ui/include/classes/api/services/CHostInterface.php
index 5d993ddb985..154ca7e4b7c 100644
--- a/ui/include/classes/api/services/CHostInterface.php
+++ b/ui/include/classes/api/services/CHostInterface.php
@@ -164,7 +164,7 @@ class CHostInterface extends CApiService {
 			$sqlParts['limit'] = $options['limit'];
 		}
 
-		if ($this->outputIsRequested('details', $options['output'])) {
+		if (!$options['countOutput'] && $this->outputIsRequested('details', $options['output'])) {
 			$sqlParts['left_join'][] = ['alias' => 'his', 'table' => 'interface_snmp', 'using' => 'interfaceid'];
 			$sqlParts['left_table'] = ['alias' => $this->tableAlias, 'table' => $this->tableName];
 		}
@@ -1150,7 +1150,7 @@ class CHostInterface extends CApiService {
 	protected function applyQueryOutputOptions($tableName, $tableAlias, array $options, array $sqlParts) {
 		$sqlParts = parent::applyQueryOutputOptions($tableName, $tableAlias, $options, $sqlParts);
 
-		if ($this->outputIsRequested('details', $options['output'])) {
+		if (!$options['countOutput'] && $this->outputIsRequested('details', $options['output'])) {
 			// Select interface type to check show details array or not.
 			$sqlParts = $this->addQuerySelect('hi.type', $sqlParts);
 
diff --git a/ui/include/classes/api/services/CHostPrototype.php b/ui/include/classes/api/services/CHostPrototype.php
index 81bf301a7df..d51bfa8fd49 100644
--- a/ui/include/classes/api/services/CHostPrototype.php
+++ b/ui/include/classes/api/services/CHostPrototype.php
@@ -1867,7 +1867,7 @@ class CHostPrototype extends CHostBase {
 	}
 
 	/**
-	 * Compare two interface. Retun true if they are same, return false otherwise.
+	 * Compare two interface. Return true if they are same, return false otherwise.
 	 *
 	 * @param array $host_interface
 	 * @param array $db_interface
diff --git a/ui/include/classes/api/services/CHousekeeping.php b/ui/include/classes/api/services/CHousekeeping.php
index 6f591da4c59..c3e8415551d 100644
--- a/ui/include/classes/api/services/CHousekeeping.php
+++ b/ui/include/classes/api/services/CHousekeeping.php
@@ -80,6 +80,12 @@ class CHousekeeping extends CApiService {
 	 * @return array
 	 */
 	public function update(array $hk): array {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'housekeeping', __FUNCTION__)
+			);
+		}
+
 		$db_hk = $this->validateUpdate($hk);
 
 		$upd_config = DB::getUpdatedValues('config', $hk, $db_hk);
diff --git a/ui/include/classes/api/services/CIconMap.php b/ui/include/classes/api/services/CIconMap.php
index 4c4d1fb35b0..8b6e7b9daf3 100644
--- a/ui/include/classes/api/services/CIconMap.php
+++ b/ui/include/classes/api/services/CIconMap.php
@@ -152,7 +152,13 @@ class CIconMap extends CApiService {
 	 * @return array
 	 */
 	public function create(array $iconmaps) {
-		$this->validateCreate($iconmaps);
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'iconmap', __FUNCTION__)
+			);
+		}
+
+		self::validateCreate($iconmaps);
 
 		$ins_iconmaps = [];
 
@@ -161,47 +167,45 @@ class CIconMap extends CApiService {
 			$ins_iconmaps[] = $iconmap;
 		}
 
-		$iconmapids = DB::insertBatch('icon_map', $ins_iconmaps);
+		$iconmapids = DB::insert('icon_map', $ins_iconmaps);
 
 		foreach ($iconmaps as $index => &$iconmap) {
 			$iconmap['iconmapid'] = $iconmapids[$index];
 		}
 		unset($iconmap);
 
-		$this->updateMappings($iconmaps, __FUNCTION__);
+		self::updateMappings($iconmaps, __FUNCTION__);
 
-		$this->addAuditBulk(CAudit::ACTION_ADD, CAudit::RESOURCE_ICON_MAP, $iconmaps);
+		self::addAuditLog(CAudit::ACTION_ADD, CAudit::RESOURCE_ICON_MAP, $iconmaps);
 
 		return ['iconmapids' => $iconmapids];
 	}
 
 	/**
+	 * @static
+	 *
 	 * @param array $iconmaps
 	 *
 	 * @throws APIException if the input is invalid.
 	 */
-	private function validateCreate(array &$iconmaps) {
-		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('You do not have permission to perform this operation.'));
-		}
-
+	private static function validateCreate(array &$iconmaps) {
 		$api_input_rules = ['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['name']], 'fields' => [
-			'name' =>			['type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY | API_REQUIRED, 'length' => DB::getFieldLength('icon_map', 'name')],
+			'name' =>			['type' => API_STRING_UTF8, 'flags' => API_REQUIRED | API_NOT_EMPTY, 'length' => DB::getFieldLength('icon_map', 'name')],
 			'default_iconid' =>	['type' => API_ID, 'flags' => API_REQUIRED],
-			'mappings' =>		['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_REQUIRED, 'uniq' => [['inventory_link', 'expression']], 'fields' => [
+			'mappings' =>		['type' => API_OBJECTS, 'flags' => API_REQUIRED | API_NOT_EMPTY, 'uniq' => [['inventory_link', 'expression']], 'fields' => [
 				'iconid' =>			['type' => API_ID, 'flags' => API_REQUIRED],
-				'expression' =>		['type' => API_REGEX, 'flags' => API_NOT_EMPTY | API_REQUIRED | API_ALLOW_GLOBAL_REGEX, 'length' => DB::getFieldLength('icon_mapping', 'expression')],
-				'inventory_link' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:70'],
-				'sortorder' =>		['type' => API_INT32, 'flags' => API_DEPRECATED]
+				'expression' =>		['type' => API_REGEX, 'flags' => API_REQUIRED | API_NOT_EMPTY | API_ALLOW_GLOBAL_REGEX, 'length' => DB::getFieldLength('icon_mapping', 'expression')],
+				'inventory_link' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:70']
 			]]
 		]];
+
 		if (!CApiInputValidator::validate($api_input_rules, $iconmaps, '/', $error)) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
 
-		$this->checkDuplicates(zbx_objectValues($iconmaps, 'name'));
-		$this->checkMappings($iconmaps);
-		$this->checkIcons($iconmaps);
+		self::checkDuplicates($iconmaps);
+		self::checkMappings($iconmaps);
+		self::checkIcons($iconmaps);
 	}
 
 	/**
@@ -210,22 +214,18 @@ class CIconMap extends CApiService {
 	 * @return array
 	 */
 	public function update(array $iconmaps) {
-		$this->validateUpdate($iconmaps, $db_iconmaps);
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'iconmap', __FUNCTION__)
+			);
+		}
+
+		self::validateUpdate($iconmaps, $db_iconmaps);
 
 		$upd_iconmaps = [];
 
 		foreach ($iconmaps as $iconmap) {
-			$db_iconmap = $db_iconmaps[$iconmap['iconmapid']];
-
-			$upd_iconmap = [];
-
-			if (array_key_exists('name', $iconmap) && $iconmap['name'] !== $db_iconmap['name']) {
-				$upd_iconmap['name'] = $iconmap['name'];
-			}
-			if (array_key_exists('default_iconid', $iconmap)
-					&& bccomp($iconmap['default_iconid'], $db_iconmap['default_iconid']) != 0) {
-				$upd_iconmap['default_iconid'] = $iconmap['default_iconid'];
-			}
+			$upd_iconmap = DB::getUpdatedValues('icon_map', $iconmap, $db_iconmaps[$iconmap['iconmapid']]);
 
 			if ($upd_iconmap) {
 				$upd_iconmaps[] = [
@@ -239,94 +239,101 @@ class CIconMap extends CApiService {
 			DB::update('icon_map', $upd_iconmaps);
 		}
 
-		$this->updateMappings($iconmaps, __FUNCTION__);
+		self::updateMappings($iconmaps, __FUNCTION__, $db_iconmaps);
 
-		$this->addAuditBulk(CAudit::ACTION_UPDATE, CAudit::RESOURCE_ICON_MAP, $iconmaps, $db_iconmaps);
+		self::addAuditLog(CAudit::ACTION_UPDATE, CAudit::RESOURCE_ICON_MAP, $iconmaps, $db_iconmaps);
 
-		return ['iconmapids' => zbx_objectValues($iconmaps, 'iconmapid')];
+		return ['iconmapids' => array_column($iconmaps, 'iconmapid')];
 	}
 
 	/**
+	 * @static
+	 *
 	 * @param array $iconmaps
 	 *
 	 * @throws APIException if the input is invalid.
 	 */
-	private function validateUpdate(array &$iconmaps, array &$db_iconmaps = null) {
-		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('You do not have permission to perform this operation.'));
-		}
-
+	private static function validateUpdate(array &$iconmaps, array &$db_iconmaps = null) {
 		$api_input_rules = ['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['iconmapid'], ['name']], 'fields' => [
 			'iconmapid' =>		['type' => API_ID, 'flags' => API_REQUIRED],
 			'name' =>			['type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY, 'length' => DB::getFieldLength('icon_map', 'name')],
 			'default_iconid' =>	['type' => API_ID],
 			'mappings' =>		['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY, 'uniq' => [['inventory_link', 'expression']], 'fields' => [
 				'iconid' =>			['type' => API_ID, 'flags' => API_REQUIRED],
-				'expression' =>		['type' => API_REGEX, 'flags' => API_NOT_EMPTY | API_REQUIRED | API_ALLOW_GLOBAL_REGEX, 'length' => DB::getFieldLength('icon_mapping', 'expression')],
-				'inventory_link' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:70'],
-				'sortorder' =>		['type' => API_INT32, 'flags' => API_DEPRECATED]
+				'expression' =>		['type' => API_REGEX, 'flags' => API_REQUIRED | API_NOT_EMPTY | API_ALLOW_GLOBAL_REGEX, 'length' => DB::getFieldLength('icon_mapping', 'expression')],
+				'inventory_link' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:70']
 			]]
 		]];
+
 		if (!CApiInputValidator::validate($api_input_rules, $iconmaps, '/', $error)) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
 
 		$db_iconmaps = DB::select('icon_map', [
 			'output' => ['iconmapid', 'name', 'default_iconid'],
-			'iconmapids' => zbx_objectValues($iconmaps, 'iconmapid'),
+			'iconmapids' => array_column($iconmaps, 'iconmapid'),
 			'preservekeys' => true
 		]);
 
+		if (count($db_iconmaps) != count($iconmaps)) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
+		}
+
+		self::addAffectedObjects($iconmaps, $db_iconmaps);
+
+		self::checkDuplicates($iconmaps, $db_iconmaps);
+		self::checkMappings($iconmaps);
+		self::checkIcons($iconmaps);
+	}
+
+	/**
+	 * Check for duplicated icon maps.
+	 *
+	 * @static
+	 *
+	 * @param array      $iconmaps
+	 * @param array|null $db_iconmaps
+	 *
+	 * @throws APIException  if user already exists.
+	 */
+	private static function checkDuplicates(array $iconmaps, array $db_iconmaps = null) {
 		$names = [];
 
 		foreach ($iconmaps as $iconmap) {
-			if (!array_key_exists($iconmap['iconmapid'], $db_iconmaps)) {
-				self::exception(ZBX_API_ERROR_PERMISSIONS,
-					_('No permissions to referred object or it does not exist!')
-				);
+			if (!array_key_exists('name', $iconmap)) {
+				continue;
 			}
 
-			$db_iconmap = $db_iconmaps[$iconmap['iconmapid']];
-
-			if (array_key_exists('name', $iconmap) && $iconmap['name'] !== $db_iconmap['name']) {
+			if ($db_iconmaps === null || $iconmap['name'] !== $db_iconmaps[$iconmap['iconmapid']]['name']) {
 				$names[] = $iconmap['name'];
 			}
 		}
 
-		if ($names) {
-			$this->checkDuplicates($names);
+		if (!$names) {
+			return;
 		}
-		$this->checkMappings($iconmaps);
-		$this->checkIcons($iconmaps);
-	}
 
-	/**
-	 * Check for duplicated icon maps.
-	 *
-	 * @param array $names
-	 *
-	 * @throws APIException  if user already exists.
-	 */
-	private function checkDuplicates(array $names) {
-		$db_iconmaps = DB::select('icon_map', [
+		$duplicates = DB::select('icon_map', [
 			'output' => ['name'],
 			'filter' => ['name' => $names],
 			'limit' => 1
 		]);
 
-		if ($db_iconmaps) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Icon map "%1$s" already exists.', $db_iconmaps[0]['name']));
+		if ($duplicates) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Icon map "%1$s" already exists.', $duplicates[0]['name']));
 		}
 	}
 
 	/**
 	 * Check icon mappings.
 	 *
-	 * @param $iconmaps
+	 * @static
+	 *
+	 * @param array $iconmaps
 	 *
 	 * @throws APIException
 	 */
-	private function checkMappings($iconmaps) {
+	private static function checkMappings(array $iconmaps): void {
 		$names = [];
 
 		foreach ($iconmaps as $iconmap) {
@@ -351,7 +358,7 @@ class CIconMap extends CApiService {
 				'filter' => ['name' => $names]
 			]);
 
-			$db_regexps = zbx_toHash($db_regexps, 'name');
+			$db_regexps = array_column($db_regexps, null, 'name');
 
 			foreach ($names as $name) {
 				if (!array_key_exists($name, $db_regexps)) {
@@ -366,11 +373,13 @@ class CIconMap extends CApiService {
 	/**
 	 * Check icons.
 	 *
-	 * @param $iconmaps
+	 * @static
+	 *
+	 * @param array $iconmaps
 	 *
 	 * @throws APIException
 	 */
-	private function checkIcons($iconmaps) {
+	private static function checkIcons(array $iconmaps): void {
 		$iconids = [];
 
 		foreach ($iconmaps as $iconmap) {
@@ -406,76 +415,60 @@ class CIconMap extends CApiService {
 	/**
 	 * Update table "icon_mapping".
 	 *
-	 * @param array  $iconmaps
-	 * @param string $method
+	 * @static
+	 *
+	 * @param array      $iconmaps
+	 * @param string     $method
+	 * @param array|null $db_iconmaps
 	 */
-	private function updateMappings(array $iconmaps, $method) {
-		$mappings = [];
-
-		foreach ($iconmaps as $iconmap) {
-			if (array_key_exists('mappings', $iconmap)) {
-				foreach ($iconmap['mappings'] as $index => $mapping) {
-					$mapping['iconmapid'] = $iconmap['iconmapid'];
-					$mapping['sortorder'] = $index;
+	private static function updateMappings(array &$iconmaps, string $method, array $db_iconmaps = null): void {
+		$ins_mappings = [];
+		$upd_mappings = [];
+		$del_mappingids = [];
 
-					$mappings[$iconmap['iconmapid']][] = $mapping;
-				}
+		foreach ($iconmaps as &$iconmap) {
+			if (!array_key_exists('mappings', $iconmap)) {
+				continue;
 			}
-		}
 
-		if (!$mappings) {
-			return;
-		}
+			$db_mappings = ($method === 'update') ? $db_iconmaps[$iconmap['iconmapid']]['mappings'] : [];
 
-		$db_mappings = ($method === 'update')
-			? DB::select('icon_mapping', [
-				'output' => ['iconmappingid', 'iconmapid', 'iconid', 'expression', 'inventory_link', 'sortorder'],
-				'filter' => ['iconmapid' => array_keys($mappings)],
-				'sortfield' => ['iconmapid', 'sortorder']
-			])
-			: [];
+			foreach ($iconmap['mappings'] as $index => &$mapping) {
+				$mapping['sortorder'] = $index;
 
-		$ins_mappings = [];
-		$upd_mappings = [];
-		$del_mappingids = [];
+				$db_mapping = current(array_filter($db_mappings,
+					static function (array $db_mapping) use ($mapping): bool {
+						return ($mapping['inventory_link'] == $db_mapping['inventory_link']
+								&& $mapping['expression'] === $db_mapping['expression']);
+					}
+				));
 
-		foreach ($db_mappings as $db_mapping) {
-			if ($mappings[$db_mapping['iconmapid']]) {
-				$mapping = array_shift($mappings[$db_mapping['iconmapid']]);
+				if ($db_mapping) {
+					$mapping['iconmappingid'] = $db_mapping['iconmappingid'];
 
-				$upd_mapping = [];
+					$upd_mapping = DB::getUpdatedValues('icon_mapping', $mapping, $db_mapping);
 
-				if (bccomp($mapping['iconid'], $db_mapping['iconid']) != 0) {
-					$upd_mapping['iconid'] = $mapping['iconid'];
-				}
-				if ($mapping['expression'] !== $db_mapping['expression']) {
-					$upd_mapping['expression'] = $mapping['expression'];
-				}
-				if ($mapping['inventory_link'] != $db_mapping['inventory_link']) {
-					$upd_mapping['inventory_link'] = $mapping['inventory_link'];
-				}
-				if ($mapping['sortorder'] != $db_mapping['sortorder']) {
-					$upd_mapping['sortorder'] = $mapping['sortorder'];
-				}
+					if ($upd_mapping) {
+						$upd_mappings[] = [
+							'values' => $upd_mapping,
+							'where' => ['iconmappingid' => $db_mapping['iconmappingid']]
+						];
+					}
 
-				if ($upd_mapping) {
-					$upd_mappings[] = [
-						'values' => $upd_mapping,
-						'where' => ['iconmappingid' => $db_mapping['iconmappingid']]
-					];
+					unset($db_mappings[$db_mapping['iconmappingid']]);
+				}
+				else {
+					$ins_mappings[] = ['iconmapid' => $iconmap['iconmapid']] + $mapping;
 				}
 			}
-			else {
-				$del_mappingids[] = $db_mapping['iconmappingid'];
-			}
-		}
+			unset($mapping);
 
-		foreach ($iconmaps as $iconmap) {
-			$ins_mappings = array_merge($ins_mappings, $mappings[$iconmap['iconmapid']]);
+			$del_mappingids = array_merge($del_mappingids, array_keys($db_mappings));
 		}
+		unset($iconmap);
 
 		if ($ins_mappings) {
-			DB::insertBatch('icon_mapping', $ins_mappings);
+			$iconmappingids = DB::insert('icon_mapping', $ins_mappings);
 		}
 
 		if ($upd_mappings) {
@@ -485,6 +478,20 @@ class CIconMap extends CApiService {
 		if ($del_mappingids) {
 			DB::delete('icon_mapping', ['iconmappingid' => $del_mappingids]);
 		}
+
+		foreach ($iconmaps as &$iconmap) {
+			if (!array_key_exists('mappings', $iconmap)) {
+				continue;
+			}
+
+			foreach ($iconmap['mappings'] as &$mapping) {
+				if (!array_key_exists('iconmappingid', $mapping)) {
+					$mapping['iconmappingid'] = array_shift($iconmappingids);
+				}
+			}
+			unset($mapping);
+		}
+		unset($iconmap);
 	}
 
 	/**
@@ -493,43 +500,59 @@ class CIconMap extends CApiService {
 	 * @return array
 	 */
 	public function delete(array $iconmapids) {
-		$this->validateDelete($iconmapids, $db_iconmaps);
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'iconmap', __FUNCTION__)
+			);
+		}
+
+		self::validateDelete($iconmapids, $db_iconmaps);
 
 		DB::delete('icon_mapping', ['iconmapid' => $iconmapids]);
 		DB::delete('icon_map', ['iconmapid' => $iconmapids]);
 
-		$this->addAuditBulk(CAudit::ACTION_DELETE, CAudit::RESOURCE_ICON_MAP, $db_iconmaps);
+		self::addAuditLog(CAudit::ACTION_DELETE, CAudit::RESOURCE_ICON_MAP, $db_iconmaps);
 
 		return ['iconmapids' => $iconmapids];
 	}
 
 	/**
-	 * @param array $iconmapids
-	 * @param array $db_iconmaps
+	 * @static
+	 *
+	 * @param array      $iconmapids
+	 * @param array|null $db_iconmaps
 	 *
 	 * @throws APIException if the input is invalid.
 	 */
-	private function validateDelete(array &$iconmapids, array &$db_iconmaps = null) {
+	private static function validateDelete(array &$iconmapids, array &$db_iconmaps = null) {
 		$api_input_rules = ['type' => API_IDS, 'flags' => API_NOT_EMPTY, 'uniq' => true];
+
 		if (!CApiInputValidator::validate($api_input_rules, $iconmapids, '/', $error)) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
 
-		$db_iconmaps = $this->get([
+		$db_iconmaps = DB::select('icon_map', [
 			'output' => ['iconmapid', 'name'],
 			'iconmapids' => $iconmapids,
-			'editable' => true,
 			'preservekeys' => true
 		]);
 
-		foreach ($iconmapids as $iconmapid) {
-			if (!array_key_exists($iconmapid, $db_iconmaps)) {
-				self::exception(ZBX_API_ERROR_PERMISSIONS,
-					_('No permissions to referred object or it does not exist!')
-				);
-			}
+		if (count($db_iconmaps) != count($iconmapids)) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
 		}
 
+		self::checkUsedSysMaps($iconmapids, $db_iconmaps);
+	}
+
+	/**
+	 * @static
+	 *
+	 * @param array      $iconmapids
+	 * @param array|null $db_iconmaps
+	 *
+	 * @throws APIException if the input is invalid.
+	 */
+	private static function checkUsedSysMaps(array $iconmapids, array $db_iconmaps): void {
 		$db_sysmaps = DB::select('sysmaps', [
 			'output' => ['name', 'iconmapid'],
 			'filter' => ['iconmapid' => $iconmapids],
@@ -562,4 +585,36 @@ class CIconMap extends CApiService {
 
 		return $result;
 	}
+
+	/**
+	 * Add the existing mappings to $db_iconmaps whether these are affected by the update.
+	 *
+	 * @static
+	 *
+	 * @param array $iconmaps
+	 * @param array $db_iconmaps
+	 */
+	private static function addAffectedObjects(array $iconmaps, array &$db_iconmaps): void {
+		$iconmapids = [];
+
+		foreach ($iconmaps as $iconmap) {
+			if (array_key_exists('mappings', $iconmap)) {
+				$iconmapids[] = $iconmap['iconmapid'];
+				$db_iconmaps[$iconmap['iconmapid']]['mappings'] = [];
+			}
+		}
+
+		if ($iconmapids) {
+			$options = [
+				'output' => ['iconmappingid', 'iconmapid', 'iconid', 'inventory_link', 'expression', 'sortorder'],
+				'filter' => ['iconmapid' => $iconmapids]
+			];
+			$db_mappings = DBselect(DB::makeSql('icon_mapping', $options));
+
+			while ($db_mapping = DBfetch($db_mappings)) {
+				$db_iconmaps[$db_mapping['iconmapid']]['mappings'][$db_mapping['iconmappingid']] =
+					array_diff_key($db_mapping, array_flip(['iconmapid']));
+			}
+		}
+	}
 }
diff --git a/ui/include/classes/api/services/CImage.php b/ui/include/classes/api/services/CImage.php
index 5183b4ddd24..39e20dfe1d5 100644
--- a/ui/include/classes/api/services/CImage.php
+++ b/ui/include/classes/api/services/CImage.php
@@ -157,8 +157,6 @@ class CImage extends CApiService {
 		if (!is_null($options['select_image'])) {
 			$dbImg = DBselect('SELECT i.imageid,i.image FROM images i WHERE '.dbConditionInt('i.imageid', $imageids));
 			while ($img = DBfetch($dbImg)) {
-				// PostgreSQL images are stored escaped in the DB
-				$img['image'] = zbx_unescape_image($img['image']);
 				$result[$img['imageid']]['image'] = base64_encode($img['image']);
 			}
 		}
@@ -179,83 +177,61 @@ class CImage extends CApiService {
 	public function create($images) {
 		global $DB;
 
-		$images = zbx_toArray($images);
+		self::validateCreate($images);
 
-		$this->validateCreate($images);
+		if ($DB['TYPE'] === ZBX_DB_ORACLE) {
+			$upd_images_data = [];
 
-		foreach ($images as &$image) {
-			// decode BASE64
-			$image['image'] = base64_decode($image['image']);
-
-			// validate image (size and format)
-			$this->checkImage($image['image']);
-
-			list(,, $img_type) = getimagesizefromstring($image['image']);
-
-			if (!in_array($img_type, [IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG])) {
-				// Converting to PNG all images except PNG, JPEG and GIF
-				$image['image'] = $this->convertToPng($image['image']);
+			foreach ($images as $index => &$image) {
+				$upd_images_data[$index]['image'] = $image['image'];
+				unset($image['image']);
 			}
+			unset($image);
+		}
 
-			$imageid = get_dbid('images', 'imageid');
-			$values = [
-				'imageid' => $imageid,
-				'name' => zbx_dbstr($image['name']),
-				'imagetype' => zbx_dbstr($image['imagetype'])
-			];
-
-			switch ($DB['TYPE']) {
-				case ZBX_DB_ORACLE:
-					$values['image'] = 'EMPTY_BLOB()';
-
-					$lob = oci_new_descriptor($DB['DB'], OCI_D_LOB);
-
-					$sql = 'INSERT INTO images ('.implode(' ,', array_keys($values)).') VALUES ('.implode(',', $values).')'.
-						' returning image into :imgdata';
-					$stmt = oci_parse($DB['DB'], $sql);
-					if (!$stmt) {
-						$e = oci_error($DB['DB']);
-						self::exception(ZBX_API_ERROR_PARAMETERS, _s('Parse SQL error [%1$s] in [%2$s].', $e['message'], $e['sqltext']));
-					}
+		$imageids = DB::insert('images', $images);
 
-					oci_bind_by_name($stmt, ':imgdata', $lob, -1, OCI_B_BLOB);
-					if (!oci_execute($stmt, OCI_DEFAULT)) {
-						$e = oci_error($stmt);
-						self::exception(ZBX_API_ERROR_PARAMETERS, _s('Execute SQL error [%1$s] in [%2$s].', $e['message'], $e['sqltext']));
-					}
-					if (!$lob->save($image['image'])) {
-						$e = oci_error($stmt);
-						self::exception(ZBX_API_ERROR_PARAMETERS, _s('Image load error [%1$s] in [%2$s].', $e['message'], $e['sqltext']));
-					}
-					$lob->free();
-					oci_free_statement($stmt);
-				break;
-				case ZBX_DB_MYSQL:
-						$values['image'] = zbx_dbstr($image['image']);
-						$sql = 'INSERT INTO images ('.implode(', ', array_keys($values)).') VALUES ('.implode(', ', $values).')';
-						if (!DBexecute($sql)) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, 'DBerror');
-						}
-				break;
-				case ZBX_DB_POSTGRESQL:
-					$values['image'] = "'".pg_escape_bytea($image['image'])."'";
-					$sql = 'INSERT INTO images ('.implode(', ', array_keys($values)).') VALUES ('.implode(', ', $values).')';
-					if (!DBexecute($sql)) {
-						self::exception(ZBX_API_ERROR_PARAMETERS, 'DBerror');
-					}
-				break;
+		foreach ($images as $index => &$image) {
+			if ($DB['TYPE'] === ZBX_DB_ORACLE) {
+				$upd_images_data[$index]['imageid'] = $imageids[$index];
+				$image['image'] = $upd_images_data[$index]['image'];
 			}
-
-			$image['imageid'] = $imageid;
+			$image['imageid'] = $imageids[$index];
 		}
 		unset($image);
 
-		$this->addAuditBulk(CAudit::ACTION_ADD, CAudit::RESOURCE_IMAGE, $images);
+		if ($DB['TYPE'] === ZBX_DB_ORACLE) {
+			self::updateOracleImagesData($upd_images_data);
+		}
+
+		self::addAuditLog(CAudit::ACTION_ADD, CAudit::RESOURCE_IMAGE, $images);
 
 		return ['imageids' => array_column($images, 'imageid')];
 	}
 
 	/**
+	 * @static
+	 *
+	 * @param array $images
+	 *
+	 * @throws APIException if the input is invalid
+	 */
+	private static function validateCreate(array &$images): void {
+		$api_input_rules = ['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['name']], 'fields' => [
+			'imagetype' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => IMAGE_TYPE_ICON.','.IMAGE_TYPE_BACKGROUND],
+			'name' =>		['type' => API_STRING_UTF8, 'flags' => API_REQUIRED | API_NOT_EMPTY, 'length' => DB::getFieldLength('images', 'name')],
+			'image' =>		['type' => API_IMAGE, 'flags' => API_REQUIRED | API_NOT_EMPTY]
+		]];
+
+		if (!CApiInputValidator::validate($api_input_rules, $images, '/', $error)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
+		}
+
+		self::checkDuplicates($images);
+		self::prepareImages($images);
+	}
+
+	/**
 	 * Update images.
 	 *
 	 * @param array $images
@@ -265,310 +241,179 @@ class CImage extends CApiService {
 	public function update($images) {
 		global $DB;
 
-		$images = zbx_toArray($images);
-
-		$db_images = $this->get([
-			'output' => ['name', 'imagetype'],
-			'imageids' => array_column($images, 'imageid'),
-			'preservekeys' => true
-		]);
-
-		$this->validateUpdate($images, $db_images);
-
-		foreach ($images as $image) {
-			$values = [];
-
-			if (isset($image['name'])) {
-				$values['name'] = zbx_dbstr($image['name']);
-			}
-
-			if (isset($image['image'])) {
-				// decode BASE64
-				$image['image'] = base64_decode($image['image']);
-
-				// validate image
-				$this->checkImage($image['image']);
+		self::validateUpdate($images, $db_images);
 
-				list(,, $img_type) = getimagesizefromstring($image['image']);
+		if ($DB['TYPE'] === ZBX_DB_ORACLE) {
+			$upd_images_data = [];
 
-				if (!in_array($img_type, [IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG])) {
-					// Converting to PNG all images except PNG, JPEG and GIF
-					$image['image'] = $this->convertToPng($image['image']);
+			foreach ($images as $index => &$image) {
+				if (array_key_exists('image', $image)) {
+					$upd_images_data[$index] = array_intersect_key($image, array_flip(['imageid', 'image']));
+					unset($image['image']);
 				}
+			}
+			unset($image);
+		}
 
-				switch ($DB['TYPE']) {
-					case ZBX_DB_POSTGRESQL:
-						$values['image'] = "'".pg_escape_bytea($image['image'])."'";
-						break;
-
-					case ZBX_DB_MYSQL:
-						$values['image'] = zbx_dbstr($image['image']);
-						break;
-
-					case ZBX_DB_ORACLE:
-						$sql = 'SELECT i.image FROM images i WHERE i.imageid='.zbx_dbstr($image['imageid']).' FOR UPDATE';
+		$upd_images = [];
 
-						if (!$stmt = oci_parse($DB['DB'], $sql)) {
-							$e = oci_error($DB['DB']);
-							self::exception(ZBX_API_ERROR_PARAMETERS, 'SQL error ['.$e['message'].'] in ['.$e['sqltext'].']');
-						}
+		foreach ($images as $image) {
+			$upd_image = DB::getUpdatedValues('images', $image, $db_images[$image['imageid']]);
 
-						if (!oci_execute($stmt, OCI_DEFAULT)) {
-							$e = oci_error($stmt);
-							self::exception(ZBX_API_ERROR_PARAMETERS, 'SQL error ['.$e['message'].'] in ['.$e['sqltext'].']');
-						}
+			if ($upd_image) {
+				$upd_images[] = [
+					'values' => $upd_image,
+					'where' => ['imageid' => $image['imageid']]
+				];
+			}
+		}
 
-						if (false === ($row = oci_fetch_assoc($stmt))) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, 'DBerror');
-						}
+		if ($upd_images) {
+			DB::update('images', $upd_images);
+		}
 
-						$row['IMAGE']->truncate();
-						$row['IMAGE']->save($image['image']);
-						$row['IMAGE']->free();
-						break;
+		if ($DB['TYPE'] === ZBX_DB_ORACLE) {
+			foreach ($images as $index => &$image) {
+				if (array_key_exists($index, $upd_images_data)) {
+					$image['image'] = $upd_images_data[$index]['image'];
 				}
 			}
+			unset($image);
 
-			if ($values) {
-				$sqlUpd = [];
-				foreach ($values as $field => $value) {
-					$sqlUpd[] = $field.'='.$value;
-				}
-				$sql = 'UPDATE images SET '.implode(', ', $sqlUpd).' WHERE imageid='.zbx_dbstr($image['imageid']);
-				$result = DBexecute($sql);
-
-				if (!$result) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _('Could not save image!'));
-				}
+			if ($upd_images_data) {
+				self::updateOracleImagesData($upd_images_data, $db_images);
 			}
 		}
 
-		$this->addAuditBulk(CAudit::ACTION_UPDATE, CAudit::RESOURCE_IMAGE, $images, $db_images);
+		self::addAuditLog(CAudit::ACTION_UPDATE, CAudit::RESOURCE_IMAGE, $images, $db_images);
 
-		return ['imageids' => zbx_objectValues($images, 'imageid')];
+		return ['imageids' => array_column($images, 'imageid')];
 	}
 
 	/**
-	 * Delete images.
+	 * Saving image data to ORACLE database.
 	 *
-	 * @param array $imageids
+	 * @static
 	 *
-	 * @return array
+	 * @param array      $images
+	 * @param string     $images[]['image']
+	 * @param array|null $db_images
 	 */
-	public function delete(array $imageids) {
-		if (empty($imageids)) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _('Empty parameters'));
-		}
-
-		if (self::$userData['type'] < USER_TYPE_ZABBIX_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
-		}
+	private static function updateOracleImagesData(array $images, array $db_images = null): void {
+		global $DB;
 
-		// check if icon is used in icon maps
-		$dbIconmaps = DBselect(
-			'SELECT DISTINCT im.name'.
-			' FROM icon_map im,icon_mapping imp'.
-			' WHERE im.iconmapid=imp.iconmapid'.
-				' AND ('.dbConditionInt('im.default_iconid', $imageids).
-					' OR '.dbConditionInt('imp.iconid', $imageids).')'
-		);
+		foreach ($images as $image) {
+			if ($db_images !== null && $image['image'] === $db_images[$image['imageid']]['image']) {
+				continue;
+			}
 
-		$usedInIconmaps = [];
-		while ($iconmap = DBfetch($dbIconmaps)) {
-			$usedInIconmaps[] = $iconmap['name'];
-		}
+			$options = [
+				'output' => ['image'],
+				'imageids' => $image['imageid']
+			];
 
-		if (!empty($usedInIconmaps)) {
-			self::exception(ZBX_API_ERROR_PARAMETERS,
-				_n('The image is used in icon map %1$s.', 'The image is used in icon maps %1$s.',
-					'"'.implode('", "', $usedInIconmaps).'"', count($usedInIconmaps))
-			);
-		}
+			if (!$stmt = oci_parse($DB['DB'], DB::makeSql('images', $options).' FOR UPDATE')) {
+				$e = oci_error($DB['DB']);
+				self::exception(ZBX_API_ERROR_PARAMETERS, 'SQL error ['.$e['message'].'] in ['.$e['sqltext'].']');
+			}
 
-		// check if icon is used in maps
-		$dbSysmaps = DBselect(
-			'SELECT DISTINCT sm.sysmapid,sm.name'.
-			' FROM sysmaps_elements se,sysmaps sm'.
-			' WHERE sm.sysmapid=se.sysmapid'.
-				' AND (sm.iconmapid IS NULL'.
-					' OR se.use_iconmap='.SYSMAP_ELEMENT_USE_ICONMAP_OFF.')'.
-				' AND ('.dbConditionInt('se.iconid_off', $imageids).
-					' OR '.dbConditionInt('se.iconid_on', $imageids).
-					' OR '.dbConditionInt('se.iconid_disabled', $imageids).
-					' OR '.dbConditionInt('se.iconid_maintenance', $imageids).')'.
-				' OR '.dbConditionInt('sm.backgroundid', $imageids)
-		);
+			if (!oci_execute($stmt, OCI_DEFAULT)) {
+				$e = oci_error($stmt);
+				self::exception(ZBX_API_ERROR_PARAMETERS, 'SQL error ['.$e['message'].'] in ['.$e['sqltext'].']');
+			}
 
-		$usedInMaps = [];
-		while ($sysmap = DBfetch($dbSysmaps)) {
-			$usedInMaps[] = $sysmap['name'];
-		}
+			if (false === ($row = oci_fetch_assoc($stmt))) {
+				self::exception(ZBX_API_ERROR_PARAMETERS, 'DBerror');
+			}
 
-		if (!empty($usedInMaps)) {
-			self::exception(ZBX_API_ERROR_PARAMETERS,
-				_n('The image is used in map %1$s.', 'The image is used in maps %1$s.',
-				'"'.implode('", "', $usedInMaps).'"', count($usedInMaps))
-			);
+			$row['IMAGE']->truncate();
+			$row['IMAGE']->save($image['image']);
+			$row['IMAGE']->free();
 		}
-
-		$db_images = $this->get([
-			'output' => ['imageid', 'name'],
-			'imageids' => $imageids,
-			'preservekeys' => true
-		]);
-
-		DB::update('sysmaps_elements', ['values' => ['iconid_off' => 0], 'where' => ['iconid_off' => $imageids]]);
-		DB::update('sysmaps_elements', ['values' => ['iconid_on' => 0], 'where' => ['iconid_on' => $imageids]]);
-		DB::update('sysmaps_elements', ['values' => ['iconid_disabled' => 0], 'where' => ['iconid_disabled' => $imageids]]);
-		DB::update('sysmaps_elements', ['values' => ['iconid_maintenance' => 0], 'where' => ['iconid_maintenance' => $imageids]]);
-
-		DB::delete('images', ['imageid' => $imageids]);
-
-		$this->addAuditBulk(CAudit::ACTION_DELETE, CAudit::RESOURCE_IMAGE, $db_images);
-
-		return ['imageids' => $imageids];
 	}
 
 	/**
-	 * Validate create.
+	 * @static
 	 *
-	 * @param array $images
+	 * @param array      $images
+	 * @param array|null $db_images
 	 *
-	 * @throws APIException if user has no permissions.
-	 * @throws APIException if wrong fields are passed.
-	 * @throws APIException if image with same name already exists.
+	 * @throws APIException if the input is invalid
 	 */
-	protected function validateCreate(array &$images) {
-		// validate permissions
-		if (self::$userData['type'] < USER_TYPE_ZABBIX_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
+	private static function validateUpdate(array &$images, array &$db_images = null): void {
+		$api_input_rules = ['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['imageid'], ['name']], 'fields' => [
+			'imageid' =>	['type' => API_ID, 'flags' => API_REQUIRED],
+			'name' =>		['type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY, 'length' => DB::getFieldLength('images', 'name')],
+			'image' =>		['type' => API_IMAGE, 'flags' => API_NOT_EMPTY]
+		]];
+
+		if (!CApiInputValidator::validate($api_input_rules, $images, '/', $error)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
 
-		if (!$images) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _('Empty input parameter.'));
-		}
-
-		// check fields
-		foreach ($images as &$image) {
-			$imageDbFields = [
-				'name' => null,
-				'image' => null,
-				'imagetype' => 1
-			];
-
-			if (!check_db_fields($imageDbFields, $image)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect input parameters.'));
-			}
-		}
-		unset($image);
-
-		// check host name duplicates
-		$collectionValidator = new CCollectionValidator([
-			'uniqueField' => 'name',
-			'messageDuplicate' => _('Image "%1$s" already exists.')
-		]);
-		$this->checkValidator($images, $collectionValidator);
-
-		// check existing names
-		$dbImages = API::getApiService()->select($this->tableName(), [
-			'output' => ['name'],
-			'filter' => ['name' => zbx_objectValues($images, 'name')],
-			'limit' => 1
+		$db_images = DB::select('images', [
+			'output' => ['imageid', 'name', 'image'],
+			'imageids' => array_column($images, 'imageid'),
+			'preservekeys' => true
 		]);
 
-		if ($dbImages) {
-			$dbImage = reset($dbImages);
-			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Image "%1$s" already exists.', $dbImage['name']));
+		if (count($db_images) != count($images)) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
 		}
+
+		self::checkDuplicates($images, $db_images);
+		self::prepareImages($images);
 	}
 
 	/**
-	 * Validate update.
+	 * Delete images.
 	 *
-	 * @param array $images
-	 * @param array $db_images
+	 * @param array $imageids
 	 *
-	 * @throws APIException if user has no permissions.
-	 * @throws APIException if wrong fields are passed.
-	 * @throws APIException if image with same name already exists.
+	 * @return array
 	 */
-	protected function validateUpdate(array $images, array $db_images) {
-		if (self::$userData['type'] < USER_TYPE_ZABBIX_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
-		}
-
-		if (!$images) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _('Empty input parameter.'));
-		}
-
-		foreach ($images as $image) {
-			if (!check_db_fields(['imageid'], $image)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect input parameters.'));
-			}
-		}
+	public function delete(array $imageids) {
+		self::validateDelete($imageids, $db_images);
 
-		$changedImageNames = [];
-		foreach ($images as $image) {
-			if (!isset($db_images[$image['imageid']])) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('No permissions to referred object or it does not exist!'));
-			}
+		DB::update('sysmaps_elements', ['values' => ['iconid_off' => 0], 'where' => ['iconid_off' => $imageids]]);
+		DB::update('sysmaps_elements', ['values' => ['iconid_on' => 0], 'where' => ['iconid_on' => $imageids]]);
+		DB::update('sysmaps_elements', ['values' => ['iconid_disabled' => 0], 'where' => ['iconid_disabled' => $imageids]]);
+		DB::update('sysmaps_elements', ['values' => ['iconid_maintenance' => 0], 'where' => ['iconid_maintenance' => $imageids]]);
 
-			if (array_key_exists('imagetype', $image)) {
-				self::exception(
-					ZBX_API_ERROR_PARAMETERS,
-					_s('Cannot update "imagetype" for image "%1$s".', $db_images[$image['imageid']]['name'])
-				);
-			}
+		DB::delete('images', ['imageid' => $imageids]);
 
-			if (isset($image['name']) && !zbx_empty($image['name'])
-					&& $db_images[$image['imageid']]['name'] !== $image['name']) {
-				if (isset($changedImageNames[$image['name']])) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Image "%1$s" already exists.', $image['name']));
-				}
-				else {
-					$changedImageNames[$image['name']] = true;
-				}
-			}
-		}
+		self::addAuditLog(CAudit::ACTION_DELETE, CAudit::RESOURCE_IMAGE, $db_images);
 
-		// check for existing image names
-		if ($changedImageNames) {
-			$dbImages = API::getApiService()->select($this->tableName(), [
-				'output' => ['name'],
-				'filter' => ['name' => array_keys($changedImageNames)],
-				'limit' => 1
-			]);
-
-			if ($dbImages) {
-				$dbImage = reset($dbImages);
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Image "%1$s" already exists.', $dbImage['name']));
-			}
-		}
+		return ['imageids' => $imageids];
 	}
 
 	/**
-	 * Validate image.
+	 * @static
 	 *
-	 * @param string $image string representing image, for example, result of base64_decode()
+	 * @param array      $imageids
+	 * @param array|null $db_images
 	 *
-	 * @throws APIException if image size is 1MB or greater.
-	 * @throws APIException if file format is unsupported, GD can not create image from given string
+	 * @throws APIException if the input is invalid
 	 */
-	protected function checkImage($image) {
-		// check size
-		if (bccomp(strlen($image), ZBX_MAX_IMAGE_SIZE) == 1) {
-			self::exception(ZBX_API_ERROR_PARAMETERS,
-				_s('Image size must be less than %1$s.', convertUnits([
-					'value' => ZBX_MAX_IMAGE_SIZE,
-					'units' => 'B'
-				]))
-			);
+	private static function validateDelete(array &$imageids, array &$db_images = null): void {
+		$api_input_rules = ['type' => API_IDS, 'flags' => API_NOT_EMPTY, 'uniq' => true];
+
+		if (!CApiInputValidator::validate($api_input_rules, $imageids, '/', $error)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
 
-		// check file format
-		if (@imageCreateFromString($image) === false) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _('File format is unsupported.'));
+		$db_images = DB::select('images', [
+			'output' => ['imageid', 'name'],
+			'imageids' => $imageids,
+			'preservekeys' => true
+		]);
+
+		if (count($db_images) != count($imageids)) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
 		}
+
+		self::checkUsedIconMaps($imageids);
+		self::checkUsedSysMaps($imageids);
 	}
 
 	/**
@@ -601,10 +446,13 @@ class CImage extends CApiService {
 	/**
 	 * Convert image body to PNG.
 	 *
+	 * @static
+	 *
 	 * @param string $image  Base64 encoded body of image.
+	 *
 	 * @return string
 	 */
-	protected function convertToPng($image) {
+	protected static function convertToPng($image): string {
 		$image = imagecreatefromstring($image);
 
 		ob_start();
@@ -615,4 +463,134 @@ class CImage extends CApiService {
 
 		return ob_get_clean();
 	}
+
+	/**
+	 * Check for unique image names.
+	 *
+	 * @static
+	 *
+	 * @param array      $images
+	 * @param array|null $db_images
+	 *
+	 * @throws APIException if image names are not unique.
+	 */
+	private static function checkDuplicates(array $images, array $db_images = null): void {
+		$names = [];
+
+		foreach ($images as $image) {
+			if (!array_key_exists('name', $image)) {
+				continue;
+			}
+
+			if ($db_images === null || $image['name'] !== $db_images[$image['imageid']]['name']) {
+				$names[] = $image['name'];
+			}
+		}
+
+		if (!$names) {
+			return;
+		}
+
+		$duplicates = DB::select('images', [
+			'output' => ['name'],
+			'filter' => ['name' => $names],
+			'limit' => 1
+		]);
+
+		if ($duplicates) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Image "%1$s" already exists.', $duplicates[0]['name']));
+		}
+	}
+
+	/**
+	 * Preparing images before saving to the DB.
+	 *
+	 * @static
+	 *
+	 * @param array  $images
+	 * @param string $images[]['image']  (optional)
+	 *
+	 * @return string
+	 */
+	private static function prepareImages(array &$images): void {
+		foreach ($images as &$image) {
+			if (!array_key_exists('image', $image)) {
+				continue;
+			}
+
+			list(,, $img_type) = getimagesizefromstring($image['image']);
+
+			// Converting to PNG all images except PNG, JPEG and GIF
+			if (!in_array($img_type, [IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG])) {
+				$image['image'] = self::convertToPng($image['image']);
+			}
+		}
+	}
+
+	/**
+	 * Validate image used in icon mapping.
+	 *
+	 * @static
+	 *
+	 * @param array $imageids
+	 *
+	 * @throws APIException if image used in icon mapping.
+	 */
+	private static function checkUsedIconMaps(array $imageids): void {
+		$used = [];
+
+		$db_iconmaps = DBselect(
+			'SELECT DISTINCT im.name'.
+			' FROM icon_map im,icon_mapping imp'.
+			' WHERE im.iconmapid=imp.iconmapid'.
+				' AND ('.dbConditionInt('im.default_iconid', $imageids).
+					' OR '.dbConditionInt('imp.iconid', $imageids).')'
+		);
+
+		while ($db_iconmap = DBfetch($db_iconmaps)) {
+			$used[] = $db_iconmap['name'];
+		}
+
+		if ($used) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _n('The image is used in icon map %1$s.',
+				'The image is used in icon maps %1$s.', '"'.implode('", "', $used).'"', count($used)
+			));
+		}
+	}
+
+	/**
+	 * Validate image used in maps.
+	 *
+	 * @static
+	 *
+	 * @param array $imageids
+	 *
+	 * @throws APIException if image used in map.
+	 */
+	private static function checkUsedSysMaps(array $imageids): void {
+		$used = [];
+
+		$db_sysmaps = DBselect(
+			'SELECT DISTINCT sm.sysmapid,sm.name'.
+			' FROM sysmaps_elements se,sysmaps sm'.
+			' WHERE sm.sysmapid=se.sysmapid'.
+				' AND (sm.iconmapid IS NULL'.
+					' OR se.use_iconmap='.SYSMAP_ELEMENT_USE_ICONMAP_OFF.')'.
+				' AND ('.dbConditionInt('se.iconid_off', $imageids).
+					' OR '.dbConditionInt('se.iconid_on', $imageids).
+					' OR '.dbConditionInt('se.iconid_disabled', $imageids).
+					' OR '.dbConditionInt('se.iconid_maintenance', $imageids).')'.
+				' OR '.dbConditionInt('sm.backgroundid', $imageids)
+		);
+
+		while ($db_sysmap = DBfetch($db_sysmaps)) {
+			$used[] = $db_sysmap['name'];
+		}
+
+		if ($used) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _n('The image is used in map %1$s.',
+				'The image is used in maps %1$s.', '"'.implode('", "', $used).'"', count($used)
+			));
+		}
+	}
 }
diff --git a/ui/include/classes/api/services/CMediatype.php b/ui/include/classes/api/services/CMediatype.php
index 6e3b7401794..4cd59591c27 100644
--- a/ui/include/classes/api/services/CMediatype.php
+++ b/ui/include/classes/api/services/CMediatype.php
@@ -167,1048 +167,674 @@ class CMediatype extends CApiService {
 	}
 
 	/**
-	 * Validates the input parameters for the create() method.
-	 *
 	 * @param array $mediatypes
 	 *
 	 * @throws APIException if the input is invalid.
+	 *
+	 * @return array
 	 */
-	protected function validateCreate(array $mediatypes) {
+	public function create(array $mediatypes): array {
 		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('Only Super Admins can create media types.'));
-		}
-
-		if (!$mediatypes) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _('Empty input parameter.'));
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'mediatype', __FUNCTION__)
+			);
 		}
 
-		$required_fields = ['type', 'name'];
+		self::validateCreate($mediatypes);
 
-		foreach ($mediatypes as $mediatype) {
-			if (!is_array($mediatype)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect arguments passed to function.'));
-			}
-
-			// Check required parameters.
-			$missing_keys = array_diff($required_fields, array_keys($mediatype));
-
-			if ($missing_keys) {
-				self::exception(ZBX_API_ERROR_PARAMETERS,
-					_s('Media type is missing parameters: %1$s', implode(', ', $missing_keys))
-				);
-			}
-			else {
-				foreach ($required_fields as $field) {
-					if ($mediatype[$field] === '' || $mediatype[$field] === null) {
-						self::exception(ZBX_API_ERROR_PARAMETERS,
-							_s('Field "%1$s" is missing a value for media type "%2$s".', $field, $mediatype['name'])
-						);
-					}
-				}
-			}
-		}
+		$mediatypeids = DB::insert('media_type', $mediatypes);
 
-		// Check for duplicate names.
-		$duplicate_name = CArrayHelper::findDuplicate($mediatypes, 'name');
-		if ($duplicate_name) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Media type "%1$s" already exists.', $duplicate_name['name']));
+		foreach ($mediatypes as $index => &$mediatype) {
+			$mediatype['mediatypeid'] = $mediatypeids[$index];
 		}
+		unset($mediatype);
 
-		$simple_interval_parser = new CSimpleIntervalParser();
-
-		$i = 0;
-		foreach ($mediatypes as $mediatype) {
-			$i++;
-			// Check if media type already exists.
-			$db_mediatype = API::getApiService()->select('media_type', [
-				'output' => ['name'],
-				'filter' => ['name' => $mediatype['name']],
-				'limit' => 1
-			]);
-
-			if ($db_mediatype) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Media type "%1$s" already exists.', $mediatype['name']));
-			}
-
-			// Check additional fields and values depending on media type.
-			$this->checkRequiredFieldsByType($mediatype);
-
-			switch ($mediatype['type']) {
-				case MEDIA_TYPE_EMAIL:
-					if (array_key_exists('smtp_authentication', $mediatype)) {
-						$smtp_authentication_validator = new CLimitedSetValidator([
-							'values' => [SMTP_AUTHENTICATION_NONE, SMTP_AUTHENTICATION_NORMAL]
-						]);
-
-						if (!$smtp_authentication_validator->validate($mediatype['smtp_authentication'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-								'Incorrect value "%1$s" in field "%2$s" for media type "%3$s".',
-								$mediatype['smtp_authentication'],
-								'smtp_authentication',
-								$mediatype['name']
-							));
-						}
-					}
-
-					// Validate optional 'smtp_port' field.
-					if (array_key_exists('smtp_port', $mediatype) && !validatePortNumber($mediatype['smtp_port'])) {
-						self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-							'Incorrect value "%1$s" in field "%2$s" for media type "%3$s".',
-							$mediatype['smtp_port'],
-							'smtp_port',
-							$mediatype['name']
-						));
-					}
+		self::updateParameters($mediatypes, __FUNCTION__);
+		self::updateMessageTemplates($mediatypes, __FUNCTION__);
 
-					// Validate optional field 'smtp_security'.
-					if (array_key_exists('smtp_security', $mediatype)) {
-						$smtp_security_validator = new CLimitedSetValidator([
-							'values' => [
-								SMTP_CONNECTION_SECURITY_NONE,
-								SMTP_CONNECTION_SECURITY_STARTTLS,
-								SMTP_CONNECTION_SECURITY_SSL_TLS
-							]
-						]);
-
-						if (!$smtp_security_validator->validate($mediatype['smtp_security'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-								'Incorrect value "%1$s" in field "%2$s" for media type "%3$s".',
-								$mediatype['smtp_security'],
-								'smtp_security',
-								$mediatype['name']
-							));
-						}
-					}
-
-					// Validate optional field 'smtp_verify_peer'.
-					if (array_key_exists('smtp_verify_peer', $mediatype)) {
-						$smtp_verify_peer_validator = new CLimitedSetValidator([
-							'values' => [0, 1]
-						]);
-
-						if (!$smtp_verify_peer_validator->validate($mediatype['smtp_verify_peer'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-								'Incorrect value "%1$s" in field "%2$s" for media type "%3$s".',
-								$mediatype['smtp_verify_peer'],
-								'smtp_verify_peer',
-								$mediatype['name']
-							));
-						}
-					}
+		self::addAuditLog(CAudit::ACTION_ADD, CAudit::RESOURCE_MEDIA_TYPE, $mediatypes);
 
-					// Validate optional field 'smtp_verify_host'.
-					if (array_key_exists('smtp_verify_host', $mediatype)) {
-						$smtp_verify_host_validator = new CLimitedSetValidator([
-							'values' => [0, 1]
-						]);
-
-						if (!$smtp_verify_host_validator->validate($mediatype['smtp_verify_host'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-								'Incorrect value "%1$s" in field "%2$s" for media type "%3$s".',
-								$mediatype['smtp_verify_host'],
-								'smtp_verify_host',
-								$mediatype['name']
-							));
-						}
-					}
+		return ['mediatypeids' => $mediatypeids];
+	}
 
-					// Validate optional field 'content_type'.
-					if (array_key_exists('content_type', $mediatype)) {
-						$content_type_validator = new CLimitedSetValidator([
-							'values' => [
-								SMTP_MESSAGE_FORMAT_PLAIN_TEXT,
-								SMTP_MESSAGE_FORMAT_HTML
-							]
-						]);
-
-						if (!$content_type_validator->validate($mediatype['content_type'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-								'Incorrect value "%1$s" in field "%2$s" for media type "%3$s".',
-								$mediatype['content_type'],
-								'content_type',
-								$mediatype['name']
-							));
-						}
-					}
-					break;
-
-				case MEDIA_TYPE_EXEC:
-					if (array_key_exists('exec_params', $mediatype) && $mediatype['exec_params'] !== '') {
-						$pos = strrpos($mediatype['exec_params'], "\n");
-
-						if ($pos === false || strlen($mediatype['exec_params']) != $pos + 1) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-								'Script parameters "%1$s" are missing the last new line feed for media type "%2$s".',
-								$mediatype['exec_params'],
-								$mediatype['name']
-							));
-						}
-					}
-					break;
-			}
+	/**
+	 * @static
+	 *
+	 * @param array $mediatypes
+	 *
+	 * @throws APIException if the input is invalid.
+	 */
+	private static function validateCreate(array &$mediatypes): void {
+		$api_input_rules = ['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['name']], 'fields' => [
+			'type' =>					['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => implode(',', [MEDIA_TYPE_EMAIL, MEDIA_TYPE_EXEC, MEDIA_TYPE_SMS, MEDIA_TYPE_WEBHOOK])],
+			'name' =>					['type' => API_STRING_UTF8, 'flags' => API_REQUIRED | API_NOT_EMPTY, 'length' => DB::getFieldLength('media_type', 'name')],
+			'smtp_server' =>			['type' => API_STRING_UTF8],
+			'smtp_helo' =>				['type' => API_STRING_UTF8],
+			'smtp_email' =>				['type' => API_STRING_UTF8],
+			'exec_path' =>				['type' => API_STRING_UTF8],
+			'gsm_modem' =>				['type' => API_STRING_UTF8],
+			'username' =>				['type' => API_STRING_UTF8],
+			'passwd' =>					['type' => API_STRING_UTF8],
+			'status' =>					['type' => API_INT32, 'in' => implode(',', [MEDIA_TYPE_STATUS_ACTIVE, MEDIA_TYPE_STATUS_DISABLED])],
+			'smtp_port' =>				['type' => API_INT32],
+			'smtp_security' =>			['type' => API_INT32],
+			'smtp_verify_peer' =>		['type' => API_INT32],
+			'smtp_verify_host' =>		['type' => API_INT32],
+			'smtp_authentication' =>	['type' => API_INT32],
+			'exec_params' =>			['type' => API_STRING_UTF8],
+			'maxsessions' =>			['type' => API_INT32],
+			'maxattempts' =>			['type' => API_INT32, 'in' => '1:100'],
+			'attempt_interval' =>		['type' => API_TIME_UNIT, 'flags' => API_NOT_EMPTY, 'length' => DB::getFieldLength('media_type', 'attempt_interval'), 'in' => '0:'.SEC_PER_HOUR],
+			'content_type' =>			['type' => API_INT32],
+			'script' =>					['type' => API_STRING_UTF8],
+			'timeout' =>				['type' => API_TIME_UNIT],
+			'process_tags' =>			['type' => API_INT32],
+			'show_event_menu' =>		['type' => API_INT32],
+			'event_menu_url' =>			['type' => API_STRING_UTF8],
+			'event_menu_name' =>		['type' => API_STRING_UTF8],
+			'description' =>			['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('media_type', 'description')],
+			'parameters' =>				['type' => API_OBJECT, 'flags' => API_ALLOW_UNEXPECTED, 'fields' => []],
+			'message_templates' =>		['type' => API_OBJECTS, 'uniq' => [['eventsource', 'recovery']], 'fields' => [
+				'eventsource' =>			['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => implode(',', [EVENT_SOURCE_TRIGGERS, EVENT_SOURCE_DISCOVERY, EVENT_SOURCE_AUTOREGISTRATION, EVENT_SOURCE_INTERNAL, EVENT_SOURCE_SERVICE])],
+				'recovery' =>				['type' => API_MULTIPLE, 'flags' => API_REQUIRED, 'rules' => [
+												['if' => ['field' => 'eventsource', 'in' => implode(',', [EVENT_SOURCE_TRIGGERS, EVENT_SOURCE_SERVICE])], 'type' => API_INT32, 'in' => implode(',', [ACTION_OPERATION, ACTION_RECOVERY_OPERATION, ACTION_UPDATE_OPERATION])],
+												['if' => ['field' => 'eventsource', 'in' => implode(',', [EVENT_SOURCE_DISCOVERY, EVENT_SOURCE_AUTOREGISTRATION])], 'type' => API_INT32, 'in' => ACTION_OPERATION],
+												['if' => ['field' => 'eventsource', 'in' => EVENT_SOURCE_INTERNAL], 'type' => API_INT32, 'in' => implode(',', [ACTION_OPERATION, ACTION_RECOVERY_OPERATION])]
+				]],
+				'subject' =>			['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('media_type_message', 'subject')],
+				'message' =>			['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('media_type_message', 'message')]
+			]]
+		]];
 
-			$api_input_rules = $this->getValidationRules($mediatype['type'], 'create');
-			$validated_data = array_intersect_key($mediatype, $api_input_rules['fields']);
+		if (!CApiInputValidator::validate($api_input_rules, $mediatypes, '/', $error)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
+		}
 
-			if (!CApiInputValidator::validate($api_input_rules, $validated_data, '/'.($i + 1), $error)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, $error);
-			}
-			$mediatype = $validated_data + $mediatype;
+		self::checkDuplicates($mediatypes);
+		self::validateByType($mediatypes);
+	}
 
-			// Validate optional 'status' field.
-			if (array_key_exists('status', $mediatype)) {
-				$status_validator = new CLimitedSetValidator([
-					'values' => [MEDIA_TYPE_STATUS_ACTIVE, MEDIA_TYPE_STATUS_DISABLED]
-				]);
+	/**
+	 * @param array $mediatypes
+	 *
+	 * @throws APIException if the input is invalid.
+	 *
+	 * @return array
+	 */
+	public function update(array $mediatypes): array {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'mediatype', __FUNCTION__)
+			);
+		}
 
-				if (!$status_validator->validate($mediatype['status'])) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-						'Incorrect value "%1$s" in field "%2$s" for media type "%3$s".',
-						$mediatype['status'],
-						'status',
-						$mediatype['name']
-					));
-				}
-			}
+		self::validateUpdate($mediatypes, $db_mediatypes);
 
-			// Validate optional 'maxsessions' field.
-			if (array_key_exists('maxsessions', $mediatype)) {
-				if ($mediatype['maxsessions'] === '') {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect value for field "%1$s": %2$s.',
-						'maxsessions', _('cannot be empty')
-					));
-				}
+		$upd_mediatypes = [];
 
-				$min = ($mediatype['type'] == MEDIA_TYPE_SMS) ? 1 : 0;
-				$max = ($mediatype['type'] == MEDIA_TYPE_SMS) ? 1 : 100;
+		foreach ($mediatypes as $mediatype) {
+			$upd_mediatype = DB::getUpdatedValues('media_type', $mediatype, $db_mediatypes[$mediatype['mediatypeid']]);
 
-				if (!ctype_digit((string) $mediatype['maxsessions']) || $mediatype['maxsessions'] > $max
-						|| $mediatype['maxsessions'] < $min) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect value for field "%1$s": %2$s.',
-						'maxsessions', _s('must be between "%1$s" and "%2$s"', $min, $max)
-					));
-				}
+			if ($upd_mediatype) {
+				$upd_mediatypes[] = [
+					'values' => $upd_mediatype,
+					'where' => ['mediatypeid' => $mediatype['mediatypeid']]
+				];
 			}
+		}
 
-			// Validate optional 'maxattempts' field.
-			if (array_key_exists('maxattempts', $mediatype)) {
-				if ($mediatype['maxattempts'] === '') {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect value for field "%1$s": %2$s.',
-						'maxattempts', _('cannot be empty')
-					));
-				}
-
-				if (!ctype_digit((string) $mediatype['maxattempts']) || $mediatype['maxattempts'] > 100
-						|| $mediatype['maxattempts'] < 1) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect value for field "%1$s": %2$s.',
-						'maxattempts', _s('must be between "%1$s" and "%2$s"', 1, 100)
-					));
-				}
-			}
+		if ($upd_mediatypes) {
+			DB::update('media_type', $upd_mediatypes);
+		}
 
-			// Validate optional 'attempt_interval' field.
-			if (array_key_exists('attempt_interval', $mediatype)) {
-				if ($mediatype['attempt_interval'] === '') {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect value for field "%1$s": %2$s.',
-						'attempt_interval', _('cannot be empty')
-					));
-				}
+		self::updateParameters($mediatypes, __FUNCTION__, $db_mediatypes);
+		self::updateMessageTemplates($mediatypes, __FUNCTION__, $db_mediatypes);
 
-				if ($simple_interval_parser->parse($mediatype['attempt_interval']) == CParser::PARSE_SUCCESS) {
-					$attempt_interval = timeUnitToSeconds($mediatype['attempt_interval']);
+		self::addAuditLog(CAudit::ACTION_UPDATE, CAudit::RESOURCE_MEDIA_TYPE, $mediatypes, $db_mediatypes);
 
-					if ($attempt_interval < 0 || $attempt_interval > 3600) {
-						self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect value for field "%1$s": %2$s.',
-							'attempt_interval', _s('must be between "%1$s" and "%2$s"', 0, 3600)
-						));
-					}
-				}
-				else {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect value for field "%1$s": %2$s.',
-						'attempt_interval', _s('must be between "%1$s" and "%2$s"', 0, 3600)
-					));
-				}
-			}
-		}
+		return ['mediatypeids' => array_column($mediatypes, 'mediatypeid')];
 	}
 
 	/**
-	 * Validates the input parameters for the update() method.
+	 * @static
 	 *
-	 * @param array $mediatypes
+	 * @param array      $mediatypes
+	 * @param array|null $db_mediatypes
 	 *
 	 * @throws APIException if the input is invalid.
 	 */
-	protected function validateUpdate(array $mediatypes) {
-		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('Only Super Admins can edit media types.'));
-		}
+	private static function validateUpdate(array &$mediatypes, ?array &$db_mediatypes): void {
+		$api_input_rules = ['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['name']], 'fields' => [
+			'mediatypeid' =>			['type' => API_ID, 'flags' => API_REQUIRED],
+			'type' =>					['type' => API_INT32, 'in' => implode(',', [MEDIA_TYPE_EMAIL, MEDIA_TYPE_EXEC, MEDIA_TYPE_SMS, MEDIA_TYPE_WEBHOOK])],
+			'name' =>					['type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY, 'length' => DB::getFieldLength('media_type', 'name')],
+			'smtp_server' =>			['type' => API_STRING_UTF8],
+			'smtp_helo' =>				['type' => API_STRING_UTF8],
+			'smtp_email' =>				['type' => API_STRING_UTF8],
+			'exec_path' =>				['type' => API_STRING_UTF8],
+			'gsm_modem' =>				['type' => API_STRING_UTF8],
+			'username' =>				['type' => API_STRING_UTF8],
+			'passwd' =>					['type' => API_STRING_UTF8],
+			'status' =>					['type' => API_INT32, 'in' => implode(',', [MEDIA_TYPE_STATUS_ACTIVE, MEDIA_TYPE_STATUS_DISABLED])],
+			'smtp_port' =>				['type' => API_INT32],
+			'smtp_security' =>			['type' => API_INT32],
+			'smtp_verify_peer' =>		['type' => API_INT32],
+			'smtp_verify_host' =>		['type' => API_INT32],
+			'smtp_authentication' =>	['type' => API_INT32],
+			'exec_params' =>			['type' => API_STRING_UTF8],
+			'maxsessions' =>			['type' => API_INT32],
+			'maxattempts' =>			['type' => API_INT32, 'in' => '1:100'],
+			'attempt_interval' =>		['type' => API_TIME_UNIT, 'flags' => API_NOT_EMPTY, 'length' => DB::getFieldLength('media_type', 'attempt_interval'), 'in' => '0:'.SEC_PER_HOUR],
+			'content_type' =>			['type' => API_INT32],
+			'script' =>					['type' => API_STRING_UTF8],
+			'timeout' =>				['type' => API_TIME_UNIT],
+			'process_tags' =>			['type' => API_INT32],
+			'show_event_menu' =>		['type' => API_INT32],
+			'event_menu_url' =>			['type' => API_STRING_UTF8],
+			'event_menu_name' =>		['type' => API_STRING_UTF8],
+			'description' =>			['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('media_type', 'description')],
+			'parameters' =>				['type' => API_OBJECT, 'flags' => API_ALLOW_UNEXPECTED, 'fields' => []],
+			'message_templates' =>		['type' => API_OBJECTS, 'uniq' => [['eventsource', 'recovery']], 'fields' => [
+				'eventsource' =>			['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => implode(',', [EVENT_SOURCE_TRIGGERS, EVENT_SOURCE_DISCOVERY, EVENT_SOURCE_AUTOREGISTRATION, EVENT_SOURCE_INTERNAL, EVENT_SOURCE_SERVICE])],
+				'recovery' =>				['type' => API_MULTIPLE, 'flags' => API_REQUIRED, 'rules' => [
+												['if' => ['field' => 'eventsource', 'in' => implode(',', [EVENT_SOURCE_TRIGGERS, EVENT_SOURCE_SERVICE])], 'type' => API_INT32, 'in' => implode(',', [ACTION_OPERATION, ACTION_RECOVERY_OPERATION, ACTION_UPDATE_OPERATION])],
+												['if' => ['field' => 'eventsource', 'in' => implode(',', [EVENT_SOURCE_DISCOVERY, EVENT_SOURCE_AUTOREGISTRATION])], 'type' => API_INT32, 'in' => ACTION_OPERATION],
+												['if' => ['field' => 'eventsource', 'in' => EVENT_SOURCE_INTERNAL], 'type' => API_INT32, 'in' => implode(',', [ACTION_OPERATION, ACTION_RECOVERY_OPERATION])]
+				]],
+				'subject' =>			['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('media_type_message', 'subject')],
+				'message' =>			['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('media_type_message', 'message')]
+			]]
+		]];
 
-		if (!$mediatypes) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _('Empty input parameter.'));
+		if (!CApiInputValidator::validate($api_input_rules, $mediatypes, '/', $error)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
 
-		// Validate given IDs.
-		$this->checkObjectIds($mediatypes, 'mediatypeid',
-			_('No "%1$s" given for media type.'),
-			_('Empty media type ID.'),
-			_('Incorrect media type ID.')
-		);
-
-		$mediatypeids = zbx_objectValues($mediatypes, 'mediatypeid');
-
-		// Check value map names.
-		$db_mediatypes = API::getApiService()->select('media_type', [
-			'output' => ['mediatypeid', 'type', 'name', 'exec_path', 'status', 'smtp_port', 'smtp_verify_peer',
-				'smtp_verify_host', 'smtp_authentication', 'maxsessions', 'maxattempts', 'attempt_interval',
-				'content_type', 'script', 'timeout', 'process_tags', 'show_event_menu', 'event_menu_url',
-				'event_menu_name'
+		$db_mediatypes = DB::select('media_type', [
+			'output' => ['mediatypeid', 'type', 'name', 'smtp_server', 'smtp_helo', 'smtp_email', 'exec_path',
+				'gsm_modem', 'username', 'passwd', 'status', 'smtp_port', 'smtp_security', 'smtp_verify_peer',
+				'smtp_verify_host', 'smtp_authentication', 'exec_params', 'maxsessions', 'maxattempts',
+				'attempt_interval', 'content_type', 'script', 'timeout', 'process_tags', 'show_event_menu',
+				'event_menu_url', 'event_menu_name', 'description'
 			],
-			'mediatypeids' => $mediatypeids,
+			'mediatypeids' => array_column($mediatypes, 'mediatypeid'),
 			'preservekeys' => true
 		]);
 
-		$check_names = [];
-		$simple_interval_parser = new CSimpleIntervalParser();
+		if (count($db_mediatypes) != count($mediatypes)) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
+		}
+
+		self::checkDuplicates($mediatypes, $db_mediatypes);
+		self::validateByType($mediatypes, $db_mediatypes);
+
+		self::addAffectedObjects($mediatypes, $db_mediatypes);
+	}
+
+	/**
+	 * Check for unique media type names.
+	 *
+	 * @static
+	 *
+	 * @param array      $mediatypes
+	 * @param array|null $db_mediatypes
+	 *
+	 * @throws APIException if a media type name is not unique.
+	 */
+	private static function checkDuplicates(array $mediatypes, array $db_mediatypes = null): void {
+		$names = [];
 
 		foreach ($mediatypes as $mediatype) {
-			// Check if this media type exists.
-			if (!array_key_exists($mediatype['mediatypeid'], $db_mediatypes)) {
-				self::exception(ZBX_API_ERROR_PERMISSIONS,
-					_('No permissions to referred object or it does not exist!')
-				);
+			if (!array_key_exists('name', $mediatype)) {
+				continue;
 			}
 
-			// Validate "name" field.
-			if (array_key_exists('name', $mediatype)) {
-				if (is_array($mediatype['name'])) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _('Incorrect arguments passed to function.'));
-				}
-				elseif ($mediatype['name'] === '' || $mediatype['name'] === null || $mediatype['name'] === false) {
-					self::exception(ZBX_API_ERROR_PARAMETERS,
-						_s('Incorrect value for field "%1$s": %2$s.', 'name', _('cannot be empty'))
-					);
-				}
-
-				$check_names[$mediatype['name']] = true;
+			if ($db_mediatypes === null || $mediatype['name'] !== $db_mediatypes[$mediatype['mediatypeid']]['name']) {
+				$names[] = $mediatype['name'];
 			}
 		}
 
-		if ($check_names) {
-			$db_mediatype_names = API::getApiService()->select('media_type', [
-				'output' => ['mediatypeid', 'name'],
-				'filter' => ['name' => array_keys($check_names)]
-			]);
-			$db_mediatype_names = zbx_toHash($db_mediatype_names, 'name');
-
-			foreach ($mediatypes as $mediatype) {
-				if (array_key_exists('name', $mediatype)
-						&& array_key_exists($mediatype['name'], $db_mediatype_names)
-						&& !idcmp($db_mediatype_names[$mediatype['name']]['mediatypeid'], $mediatype['mediatypeid'])) {
-					self::exception(ZBX_API_ERROR_PARAMETERS,
-						_s('Media type "%1$s" already exists.', $mediatype['name'])
-					);
-				}
-			}
+		if (!$names) {
+			return;
 		}
 
-		// Populate "name" field, if not set. Type field should not be populated at this point.
-		$mediatypes = $this->extendFromObjects(zbx_toHash($mediatypes, 'mediatypeid'), $db_mediatypes, ['name']);
+		$duplicates = DB::select('media_type', [
+			'output' => ['name'],
+			'filter' => ['name' => $names],
+			'limit' => 1
+		]);
 
-		$duplicate_name = CArrayHelper::findDuplicate($mediatypes, 'name');
-		if ($duplicate_name) {
-			self::exception(ZBX_API_ERROR_PARAMETERS,
-				_s('Media type "%1$s" already exists.', $duplicate_name['name'])
-			);
+		if ($duplicates) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Media type "%1$s" already exists.', $duplicates[0]['name']));
 		}
+	}
 
-		$i = 0;
-		foreach ($mediatypes as $mediatype) {
-			$i++;
-			$db_mediatype = $db_mediatypes[$mediatype['mediatypeid']];
+	/**
+	 * Validate fields by type.
+	 *
+	 * @static
+	 *
+	 * @param array      $mediatypes
+	 * @param array|null $db_mediatypes
+	 *
+	 * @throws APIException
+	 */
+	private static function validateByType(array &$mediatypes, array $db_mediatypes = null): void {
+		$method = ($db_mediatypes === null) ? 'create' : 'update';
+
+		$db_defaults = DB::getDefaults('media_type');
+		$db_defaults['parameters'] = [];
+
+		if ($method === 'update') {
+			$type_fields = [
+				MEDIA_TYPE_EMAIL => [
+					'smtp_server', 'smtp_port', 'smtp_helo', 'smtp_email', 'smtp_security', 'smtp_verify_peer',
+					'smtp_verify_host', 'smtp_authentication', 'username', 'passwd', 'content_type'
+				],
+				MEDIA_TYPE_EXEC => [
+					'exec_path', 'exec_params'
+				],
+				MEDIA_TYPE_SMS => [
+					'gsm_modem', 'maxsessions'
+				],
+				MEDIA_TYPE_WEBHOOK => [
+					'script', 'timeout', 'process_tags', 'show_event_menu', 'event_menu_url', 'event_menu_name',
+					'parameters'
+				]
+			];
+		}
 
-			// Recheck mandatory fields if type changed.
-			if (array_key_exists('type', $mediatype) && $db_mediatype['type'] != $mediatype['type']) {
-				$this->checkRequiredFieldsByType($mediatype);
+		foreach ($mediatypes as $i => &$mediatype) {
+			if ($method === 'create') {
+				$db_mediatype = $db_defaults;
+				$type = $mediatype['type'];
 			}
 			else {
-				$optional_fields_by_type = [
-					MEDIA_TYPE_EMAIL => ['smtp_server', 'smtp_helo', 'smtp_email'],
-					MEDIA_TYPE_EXEC => ['exec_path'],
-					MEDIA_TYPE_WEBHOOK => [],
-					MEDIA_TYPE_SMS => ['gsm_modem']
-				];
-
-				foreach ($optional_fields_by_type[$db_mediatype['type']] as $field) {
-					if (array_key_exists($field, $mediatype)
-							&& ($mediatype[$field] === '' || $mediatype[$field] === null)) {
-						self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-							'Field "%1$s" is missing a value for media type "%2$s".',
-							$field,
-							$mediatype['name']
-						));
-					}
-				}
-
-				// Populate "type" field from DB, since it is not set and is required for further validation.
-				$mediatype['type'] = $db_mediatype['type'];
+				$db_mediatype = $db_mediatypes[$mediatype['mediatypeid']];
+				$type = array_key_exists('type', $mediatype) ? $mediatype['type'] : $db_mediatype['type'];
 			}
 
-			switch ($mediatype['type']) {
-				case MEDIA_TYPE_EMAIL:
-					if (array_key_exists('smtp_authentication', $mediatype)) {
-						$smtp_authentication_validator = new CLimitedSetValidator([
-							'values' => [SMTP_AUTHENTICATION_NONE, SMTP_AUTHENTICATION_NORMAL]
-						]);
-
-						if (!$smtp_authentication_validator->validate($mediatype['smtp_authentication'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-								'Incorrect value "%1$s" in field "%2$s" for media type "%3$s".',
-								$mediatype['smtp_authentication'],
-								'smtp_authentication',
-								$mediatype['name']
-							));
-						}
-					}
+			$api_input_rules = self::getValidationRulesByType($mediatype, $method, $db_mediatype);
+			$type_data = array_intersect_key($mediatype, $api_input_rules['fields']);
 
-					// Validate optional 'smtp_port' field.
-					if (array_key_exists('smtp_port', $mediatype)
-							&& $db_mediatype['smtp_port'] != $mediatype['smtp_port']
-							&& !validatePortNumber($mediatype['smtp_port'])) {
-						self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-							'Incorrect value "%1$s" in field "%2$s" for media type "%3$s".',
-							$mediatype['smtp_port'],
-							'smtp_port',
-							$mediatype['name']
-						));
-					}
+			if (!CApiInputValidator::validate($api_input_rules, $type_data, '/'.($i + 1), $error)) {
+				self::exception(ZBX_API_ERROR_PARAMETERS, $error);
+			}
 
-					// Validate optional field 'smtp_security'.
-					if (array_key_exists('smtp_security', $mediatype)) {
-						$smtp_security_validator = new CLimitedSetValidator([
-							'values' => [
-								SMTP_CONNECTION_SECURITY_NONE,
-								SMTP_CONNECTION_SECURITY_STARTTLS,
-								SMTP_CONNECTION_SECURITY_SSL_TLS
-							]
-						]);
-
-						if (!$smtp_security_validator->validate($mediatype['smtp_security'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-								'Incorrect value "%1$s" in field "%2$s" for media type "%3$s".',
-								$mediatype['smtp_security'],
-								'smtp_security',
-								$mediatype['name']
-							));
+			if ($method === 'update') {
+				switch ($type) {
+					case MEDIA_TYPE_EMAIL:
+						if (array_key_exists('smtp_authentication', $mediatype)
+								&& $mediatype['smtp_security'] == SMTP_CONNECTION_SECURITY_NONE) {
+							$mediatype += [
+								'smtp_verify_peer' => $db_defaults['smtp_verify_peer'],
+								'smtp_verify_host' => $db_defaults['smtp_verify_host']
+							];
 						}
-					}
 
-					// Validate optional field 'smtp_verify_peer'.
-					if (array_key_exists('smtp_verify_peer', $mediatype)
-							&& $db_mediatype['smtp_verify_peer'] != $mediatype['smtp_verify_peer']) {
-						$smtp_verify_peer_validator = new CLimitedSetValidator([
-							'values' => [0, 1]
-						]);
-
-						if (!$smtp_verify_peer_validator->validate($mediatype['smtp_verify_peer'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-								'Incorrect value "%1$s" in field "%2$s" for media type "%3$s".',
-								$mediatype['smtp_verify_peer'],
-								'smtp_verify_peer',
-								$mediatype['name']
-							));
+						if (array_key_exists('smtp_authentication', $mediatype)
+								&& $mediatype['smtp_authentication'] == SMTP_AUTHENTICATION_NONE) {
+							$mediatype += [
+								'username' => $db_defaults['username'],
+								'passwd' => $db_defaults['passwd']
+							];
 						}
-					}
-
-					// Validate optional field 'smtp_verify_host'.
-					if (array_key_exists('smtp_verify_host', $mediatype)
-							&& $db_mediatype['smtp_verify_host'] != $mediatype['smtp_verify_host']) {
-						$smtp_verify_host_validator = new CLimitedSetValidator([
-							'values' => [0, 1]
-						]);
-
-						if (!$smtp_verify_host_validator->validate($mediatype['smtp_verify_host'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-								'Incorrect value "%1$s" in field "%2$s" for media type "%3$s".',
-								$mediatype['smtp_verify_host'],
-								'smtp_verify_host',
-								$mediatype['name']
-							));
+						break;
+
+					case MEDIA_TYPE_WEBHOOK:
+						if (array_key_exists('show_event_menu', $mediatype)
+								&& $mediatype['show_event_menu'] == ZBX_EVENT_MENU_HIDE) {
+							$mediatype += [
+								'event_menu_url' => $db_defaults['event_menu_url'],
+								'event_menu_name' => $db_defaults['event_menu_name']
+							];
 						}
-					}
+						break;
+				}
 
-					// Validate optional field 'content_type'.
-					if (array_key_exists('content_type', $mediatype)
-							&& $db_mediatype['content_type'] != $mediatype['content_type']) {
-						$content_type_validator = new CLimitedSetValidator([
-							'values' => [
-								SMTP_MESSAGE_FORMAT_PLAIN_TEXT,
-								SMTP_MESSAGE_FORMAT_HTML
-							]
-						]);
-
-						if (!$content_type_validator->validate($mediatype['content_type'])) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-								'Incorrect value "%1$s" in field "%2$s" for media type "%3$s".',
-								$mediatype['content_type'],
-								'content_type',
-								$mediatype['name']
-							));
-						}
-					}
-					break;
-
-				case MEDIA_TYPE_EXEC:
-					if (array_key_exists('exec_params', $mediatype) && $mediatype['exec_params'] !== '') {
-						$pos = strrpos($mediatype['exec_params'], "\n");
-
-						if ($pos === false || strlen($mediatype['exec_params']) != $pos + 1) {
-							self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-								'Script parameters "%1$s" are missing the last new line feed for media type "%2$s".',
-								$mediatype['exec_params'],
-								$mediatype['name']
-							));
-						}
-					}
-					break;
+				if ($type != $db_mediatype['type']) {
+					$mediatype =
+						array_intersect_key($db_defaults, array_flip($type_fields[$db_mediatype['type']])) + $mediatype;
+				}
 			}
+		}
+		unset($mediatype);
+	}
 
-			$api_input_rules = $this->getValidationRules($mediatype['type'], 'update');
-			$validated_data = array_intersect_key($mediatype, $api_input_rules['fields']);
+	/**
+	 * Get type specific validation rules.
+	 *
+	 * @static
+	 *
+	 * @param array  $mediatype
+	 * @param string $method
+	 * @param array  $db_mediatype
+	 *
+	 * @return array
+	 */
+	private static function getValidationRulesByType(array $mediatype, string $method, array $db_mediatype): array {
+		$type = array_key_exists('type', $mediatype) ? $mediatype['type'] : $db_mediatype['type'];
+		$api_input_rules = ['type' => API_OBJECT];
+
+		switch ($type) {
+			case MEDIA_TYPE_EMAIL:
+				$api_input_rules['fields'] = [
+					'smtp_server' =>			['type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY, 'length' => DB::getFieldLength('media_type', 'smtp_server')],
+					'smtp_helo' =>				['type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY, 'length' => DB::getFieldLength('media_type', 'smtp_helo')],
+					'smtp_email' =>				['type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY, 'length' => DB::getFieldLength('media_type', 'smtp_email')],
+					'smtp_port' =>				['type' => API_INT32, 'in' => ZBX_MIN_PORT_NUMBER.':'.ZBX_MAX_PORT_NUMBER],
+					'smtp_security' =>			['type' => API_INT32, 'in' => implode(',', [SMTP_CONNECTION_SECURITY_NONE, SMTP_CONNECTION_SECURITY_STARTTLS, SMTP_CONNECTION_SECURITY_SSL_TLS])],
+					'smtp_authentication' =>	['type' => API_INT32, 'in' => implode(',', [SMTP_AUTHENTICATION_NONE, SMTP_AUTHENTICATION_NORMAL])],
+					'content_type' =>			['type' => API_INT32, 'in' => implode(',', [SMTP_MESSAGE_FORMAT_PLAIN_TEXT, SMTP_MESSAGE_FORMAT_HTML])]
+				];
 
-			if (!CApiInputValidator::validate($api_input_rules, $validated_data, '/'.$i, $error)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, $error);
-			}
-			$mediatype = $validated_data + $mediatype;
+				$mediatype += array_intersect_key($db_mediatype, array_flip(['smtp_security', 'smtp_authentication']));
 
-			// Validate optional 'status' field and only when status is changed.
-			if (array_key_exists('status', $mediatype) && $db_mediatype['status'] != $mediatype['status']) {
-				$status_validator = new CLimitedSetValidator([
-					'values' => [MEDIA_TYPE_STATUS_ACTIVE, MEDIA_TYPE_STATUS_DISABLED]
-				]);
+				if ($mediatype['smtp_security'] == SMTP_CONNECTION_SECURITY_STARTTLS
+						|| $mediatype['smtp_security'] == SMTP_CONNECTION_SECURITY_SSL_TLS) {
+					$api_input_rules['fields'] += [
+						'smtp_verify_peer' =>	['type' => API_INT32, 'in' => '0,1'],
+						'smtp_verify_host' =>	['type' => API_INT32, 'in' => '0,1']
+					];
+				}
 
-				if (!$status_validator->validate($mediatype['status'])) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-						'Incorrect value "%1$s" in field "%2$s" for media type "%3$s".',
-						$mediatype['status'],
-						'status',
-						$mediatype['name']
-					));
+				if ($mediatype['smtp_authentication'] == SMTP_AUTHENTICATION_NORMAL) {
+					$api_input_rules['fields'] += [
+						'username' =>		['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('media_type', 'username')],
+						'passwd' =>			['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('media_type', 'passwd')]
+					];
 				}
-			}
 
-			// Validate optional 'maxsessions' field.
-			if (array_key_exists('maxsessions', $mediatype)
-					&& $db_mediatype['maxsessions'] != $mediatype['maxsessions']) {
-				if ($mediatype['maxsessions'] === '') {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect value for field "%1$s": %2$s.',
-						'maxsessions', _('cannot be empty')
-					));
+				if ($method === 'create' || $type != $db_mediatype['type']) {
+					foreach (['smtp_server', 'smtp_helo', 'smtp_email'] as $field) {
+						$api_input_rules['fields'][$field]['flags'] |= API_REQUIRED;
+					}
 				}
+				break;
 
-				$min = ($mediatype['type'] == MEDIA_TYPE_SMS) ? 1 : 0;
-				$max = ($mediatype['type'] == MEDIA_TYPE_SMS) ? 1 : 100;
+			case MEDIA_TYPE_EXEC:
+				$api_input_rules['fields'] = [
+					'exec_path' =>		['type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY, 'length' => DB::getFieldLength('media_type', 'exec_path')],
+					'exec_params' =>	['type' => API_EXEC_PARAMS, 'length' => DB::getFieldLength('media_type', 'exec_params')]
+				];
 
-				if (!ctype_digit((string) $mediatype['maxsessions']) || $mediatype['maxsessions'] > $max
-						|| $mediatype['maxsessions'] < $min) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect value for field "%1$s": %2$s.',
-						'maxsessions', _s('must be between "%1$s" and "%2$s"', $min, $max)
-					));
+				if ($method === 'create' || $type != $db_mediatype['type']) {
+					$api_input_rules['fields']['exec_path']['flags'] |= API_REQUIRED;
 				}
-			}
-			elseif ($mediatype['type'] == MEDIA_TYPE_SMS && $mediatype['type'] != $db_mediatype['type']
-						&& $db_mediatype['maxsessions'] != 1) {
-				self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect value for field "%1$s": %2$s.',
-					'maxsessions', _s('must be between "%1$s" and "%2$s"', 1, 1)
-				));
-			}
+				break;
 
-			// Validate optional 'maxattempts' field.
-			if (array_key_exists('maxattempts', $mediatype)
-					&& $db_mediatype['maxattempts'] != $mediatype['maxattempts']) {
-				if ($mediatype['maxattempts'] === '') {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect value for field "%1$s": %2$s.',
-						'maxattempts', _('cannot be empty')
-					));
-				}
+			case MEDIA_TYPE_SMS:
+				$api_input_rules['fields'] = [
+					'gsm_modem' =>		['type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY, 'length' => DB::getFieldLength('media_type', 'gsm_modem')],
+					'maxsessions' =>	['type' => API_INT32, 'in' => DB::getDefault('media_type', 'maxsessions')]
+				];
 
-				if (!ctype_digit((string) $mediatype['maxattempts']) || $mediatype['maxattempts'] > 100
-						|| $mediatype['maxattempts'] < 1) {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect value for field "%1$s": %2$s.',
-						'maxattempts', _s('must be between "%1$s" and "%2$s"', 1, 100)
-					));
-				}
-			}
+				if ($method === 'create' || $type != $db_mediatype['type']) {
+					$api_input_rules['fields']['gsm_modem']['flags'] |= API_REQUIRED;
+				}
+				break;
+
+			case MEDIA_TYPE_WEBHOOK:
+				$api_input_rules['fields'] = [
+					'script' =>				['type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY, 'length' => DB::getFieldLength('media_type', 'script')],
+					'timeout' =>			['type' => API_TIME_UNIT, 'flags' => API_NOT_EMPTY, 'in' => '1:'.SEC_PER_MIN, 'length' => DB::getFieldLength('media_type', 'timeout')],
+					'process_tags' =>		['type' => API_INT32, 'in' => implode(',', [ZBX_MEDIA_TYPE_TAGS_DISABLED, ZBX_MEDIA_TYPE_TAGS_ENABLED])],
+					'show_event_menu' =>	['type' => API_INT32, 'in' => implode(',', [ZBX_EVENT_MENU_HIDE, ZBX_EVENT_MENU_SHOW])],
+					'parameters' =>			['type' => API_OBJECTS, 'uniq' => [['name']], 'fields' => [
+						'name' =>				['type' => API_STRING_UTF8, 'flags' => API_REQUIRED | API_NOT_EMPTY, 'length' => DB::getFieldLength('media_type_param', 'name')],
+						'value' =>				['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('media_type_param', 'value')]
+					]]
+				];
 
-			// Validate optional 'attempt_interval' field.
-			if (array_key_exists('attempt_interval', $mediatype)
-					&& $db_mediatype['attempt_interval'] != $mediatype['attempt_interval']) {
-				if ($mediatype['attempt_interval'] === '') {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect value for field "%1$s": %2$s.',
-						'attempt_interval', _('cannot be empty')
-					));
+				$mediatype += array_intersect_key($db_mediatype, array_flip(['show_event_menu']));
+
+				if ($mediatype['show_event_menu'] == ZBX_EVENT_MENU_SHOW) {
+					$api_input_rules['fields'] += [
+						'event_menu_url' =>		['type' => API_URL, 'flags' => API_ALLOW_EVENT_TAGS_MACRO | API_NOT_EMPTY, 'length' => DB::getFieldLength('media_type', 'event_menu_url')],
+						'event_menu_name' =>	['type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY, 'length' => DB::getFieldLength('media_type', 'event_menu_name')]
+					];
 				}
 
-				if ($simple_interval_parser->parse($mediatype['attempt_interval']) == CParser::PARSE_SUCCESS) {
-					$attempt_interval = timeUnitToSeconds($mediatype['attempt_interval']);
+				if ($method === 'create' || $type != $db_mediatype['type']) {
+					$api_input_rules['fields']['script']['flags'] |= API_REQUIRED;
 
-					if ($attempt_interval < 0 || $attempt_interval > 3600) {
-						self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect value for field "%1$s": %2$s.',
-							'attempt_interval', _s('must be between "%1$s" and "%2$s"', 0, 3600)
-						));
+					if ($mediatype['show_event_menu'] == ZBX_EVENT_MENU_SHOW) {
+						$api_input_rules['fields']['event_menu_url']['flags'] |= API_REQUIRED;
+						$api_input_rules['fields']['event_menu_name']['flags'] |= API_REQUIRED;
 					}
 				}
-				else {
-					self::exception(ZBX_API_ERROR_PARAMETERS, _s('Incorrect value for field "%1$s": %2$s.',
-						'attempt_interval', _s('must be between "%1$s" and "%2$s"', 0, 3600)
-					));
-				}
-			}
-		}
+				break;
+		}
+
+		$api_input_rules['fields'] += [
+			'smtp_server' =>			['type' => API_STRING_UTF8, 'in' => DB::getDefault('media_type', 'smtp_server')],
+			'smtp_helo' =>				['type' => API_STRING_UTF8, 'in' => DB::getDefault('media_type', 'smtp_helo')],
+			'smtp_email' =>				['type' => API_STRING_UTF8, 'in' => DB::getDefault('media_type', 'smtp_email')],
+			'exec_path' =>				['type' => API_STRING_UTF8, 'in' => DB::getDefault('media_type', 'exec_path')],
+			'gsm_modem' =>				['type' => API_STRING_UTF8, 'in' => DB::getDefault('media_type', 'gsm_modem')],
+			'username' =>				['type' => API_STRING_UTF8, 'in' => DB::getDefault('media_type', 'username')],
+			'passwd' =>					['type' => API_STRING_UTF8, 'in' => DB::getDefault('media_type', 'passwd')],
+			'smtp_port' =>				['type' => API_INT32, 'in' => DB::getDefault('media_type', 'smtp_port')],
+			'smtp_security' =>			['type' => API_INT32, 'in' => DB::getDefault('media_type', 'smtp_security')],
+			'smtp_verify_peer' =>		['type' => API_INT32, 'in' => DB::getDefault('media_type', 'smtp_verify_peer')],
+			'smtp_verify_host' =>		['type' => API_INT32, 'in' => DB::getDefault('media_type', 'smtp_verify_host')],
+			'smtp_authentication' =>	['type' => API_INT32, 'in' => DB::getDefault('media_type', 'smtp_authentication')],
+			'maxsessions' =>			['type' => API_INT32, 'in' => '0:100'],
+			'exec_params' =>			['type' => API_STRING_UTF8, 'in' => DB::getDefault('media_type', 'exec_params')],
+			'content_type' =>			['type' => API_INT32, 'in' => DB::getDefault('media_type', 'content_type')],
+			'script' =>					['type' => API_STRING_UTF8, 'in' => DB::getDefault('media_type', 'script')],
+			'timeout' =>				['type' => API_TIME_UNIT, 'in' => DB::getDefault('media_type', 'timeout')],
+			'process_tags' =>			['type' => API_INT32, 'in' => DB::getDefault('media_type', 'process_tags')],
+			'show_event_menu' =>		['type' => API_INT32, 'in' => DB::getDefault('media_type', 'show_event_menu')],
+			'event_menu_url' =>			['type' => API_STRING_UTF8, 'in' => DB::getDefault('media_type', 'event_menu_url')],
+			'event_menu_name' =>		['type' => API_STRING_UTF8, 'in' => DB::getDefault('media_type', 'event_menu_name')],
+			'parameters' =>				['type' => API_OBJECT, 'fields' => []]
+		];
+
+		return $api_input_rules;
 	}
 
 	/**
-	 * Validates the event_menu_* input parameters.
+	 * Update table "media_type_param" and populate mediatype.parameters by "mediatype_paramid" property.
 	 *
-	 * @param array $mediatype
-	 * @param array $db_mediatype
+	 * @static
 	 *
-	 * @throws APIException if the input is invalid.
+	 * @param array      $mediatypes
+	 * @param string     $method
+	 * @param array|null $db_mediatypes
 	 */
-	private function validateEventMenu(array $mediatype, array $db_mediatype = null) {
-		if ($db_mediatype === null) {
-			$db_mediatype = DB::getDefaults('media_type');
-		}
+	private static function updateParameters(array &$mediatypes, string $method, array $db_mediatypes = null): void {
+		$ins_params = [];
+		$upd_params = [];
+		$del_paramids = [];
 
-		foreach (['show_event_menu', 'event_menu_url', 'event_menu_name'] as $field_name) {
-			if (!array_key_exists($field_name, $mediatype)) {
-				$mediatype[$field_name] = $db_mediatype[$field_name];
-			}
-		}
-
-		foreach (['event_menu_url', 'event_menu_name'] as $field_name) {
-			if ($mediatype['show_event_menu'] == ZBX_EVENT_MENU_HIDE) {
-				if ($mediatype[$field_name] !== '') {
-					self::exception(ZBX_API_ERROR_PARAMETERS,
-						_s('Incorrect value for field "%1$s": %2$s.', $field_name, _('should be empty'))
-					);
-				}
-			}
-			else {
-				if ($mediatype[$field_name] === '') {
-					self::exception(ZBX_API_ERROR_PARAMETERS,
-						_s('Incorrect value for field "%1$s": %2$s.', $field_name, _('cannot be empty'))
-					);
-				}
+		foreach ($mediatypes as &$mediatype) {
+			if (!array_key_exists('parameters', $mediatype)) {
+				continue;
 			}
-		}
-	}
 
-	/**
-	 * Add Media types.
-	 *
-	 * @param array  $mediatypes                           A multidimensional array with media types data.
-	 * @param int    $mediatypes[]['type']                 Transport used by the media type.
-	 * @param string $mediatypes[]['name']                 Name of the media type.
-	 * @param string $mediatypes[]['smtp_server']          SMTP server.
-	 * @param int    $mediatypes[]['smtp_port']            SMTP server port.
-	 * @param string $mediatypes[]['smtp_helo']            SMTP HELO.
-	 * @param string $mediatypes[]['smtp_email']           SMTP email.
-	 * @param int    $mediatypes[]['smtp_security']        SMTP connection security level.
-	 * @param int    $mediatypes[]['smtp_verify_peer']     SMTP verify peer.
-	 * @param int    $mediatypes[]['smtp_verify_host']     SMTP verify host.
-	 * @param int    $mediatypes[]['smtp_authentication']  SMTP authentication.
-	 * @param int    $mediatypes[]['content_type']         Message format.
-	 * @param string $mediatypes[]['exec_path']            Script name.
-	 * @param string $mediatypes[]['exec_params']          Script parameters.
-	 * @param string $mediatypes[]['gsm_modem']            Serial device name of the GSM modem.
-	 * @param string $mediatypes[]['username']             User name used for authentication.
-	 * @param string $mediatypes[]['passwd']               Password used for authentication.
-	 * @param int    $mediatypes[]['status']               Media type status.
-	 * @param int    $mediatypes[]['maxsessions']          Limit of simultaneously processed alerts.
-	 * @param int    $mediatypes[]['maxattempts']          Maximum attempts to deliver alert successfully.
-	 * @param string $mediatypes[]['attempt_interval']     Interval between alert delivery attempts.
-	 * @param string $mediatypes[]['script']               Webhook JavaScript body.
-	 * @param array  $mediatypes[]['parameters']           An array of webhook parameters:
-	 *                                                     ['name' => .., 'value' => ..]
-	 * @param string $mediatypes[]['timeout']              Webhook JavaScript HTTP request timeout.
-	 * @param string $mediatypes[]['process_tags']         Webhook HTTP response should be saved as tags.
-	 * @param string $mediatypes[]['show_event_menu']      Indicates presence of entry in event.get "urls" objects list.
-	 * @param string $mediatypes[]['event_menu_url']       Webhook additional info in frontend, supports received tags.
-	 * @param string $mediatypes[]['event_menu_name']      Webhook 'url' visual name.
-	 * @param string $mediatypes[]['description']          Media type description.
-	 * @param array  $mediatypes[]['message_templates']    An array of media type message templates.
-	 *
-	 * @return array
-	 */
-	public function create(array $mediatypes) {
-		$mediatypes = zbx_toArray($mediatypes);
+			$db_params = ($method === 'update')
+				? array_column($db_mediatypes[$mediatype['mediatypeid']]['parameters'], null, 'name')
+				: [];
 
-		$this->validateCreate($mediatypes);
-
-		$mediatypeids = DB::insert('media_type', $mediatypes);
-		$ins_media_type_param = [];
-		$ins_media_type_message = [];
+			foreach ($mediatype['parameters'] as &$param) {
+				if (array_key_exists($param['name'], $db_params)) {
+					$db_param = $db_params[$param['name']];
+					$param['mediatype_paramid'] = $db_param['mediatype_paramid'];
+					unset($db_params[$db_param['name']]);
 
-		foreach ($mediatypes as $i => $mediatype) {
-			$mediatypeid = $mediatypeids[$i];
-			$mediatypes[$i]['mediatypeid'] = $mediatypeid;
+					$upd_param = DB::getUpdatedValues('media_type_param', $param, $db_param);
 
-			if ($mediatype['type'] == MEDIA_TYPE_WEBHOOK) {
-				if (array_key_exists('parameters', $mediatype)) {
-					foreach ($mediatype['parameters'] as $parameter) {
-						$ins_media_type_param[] = ['mediatypeid' => $mediatypeid] + $parameter;
+					if ($upd_param) {
+						$upd_params[] = [
+							'values' => $upd_param,
+							'where' => ['mediatype_paramid' => $upd_param['mediatype_paramid']]
+						];
 					}
 				}
-
-				$this->validateEventMenu($mediatype);
-			}
-
-			if (array_key_exists('message_templates', $mediatype)) {
-				foreach ($mediatype['message_templates'] as $message_template) {
-					$ins_media_type_message[] = ['mediatypeid' => $mediatypeid] + $message_template;
+				else {
+					$ins_params[] = ['mediatypeid' => $mediatype['mediatypeid']] + $param;
 				}
 			}
+			unset($param);
+
+			$del_paramids = array_merge($del_paramids, array_column($db_params, 'mediatype_paramid'));
 		}
+		unset($mediatype);
 
-		if ($ins_media_type_param) {
-			DB::insertBatch('media_type_param', $ins_media_type_param);
+		if ($del_paramids) {
+			DB::delete('media_type_param', ['mediatype_paramid' => $del_paramids]);
 		}
 
-		if ($ins_media_type_message) {
-			DB::insert('media_type_message', $ins_media_type_message);
+		if ($upd_params) {
+			DB::update('media_type_param', $upd_params);
 		}
 
-		$this->addAuditBulk(CAudit::ACTION_ADD, CAudit::RESOURCE_MEDIA_TYPE, $mediatypes);
+		if ($ins_params) {
+			$paramids = DB::insert('media_type_param', $ins_params);
+		}
 
-		return ['mediatypeids' => $mediatypeids];
+		foreach ($mediatypes as &$mediatype) {
+			if (!array_key_exists('parameters', $mediatype)) {
+				continue;
+			}
+
+			foreach ($mediatype['parameters'] as &$param) {
+				if (!array_key_exists('mediatype_paramid', $param)) {
+					$param['mediatype_paramid'] = array_shift($paramids);
+				}
+			}
+			unset($param);
+		}
+		unset($mediatype);
 	}
 
 	/**
-	 * Update Media types.
+	 * Update table "media_type_message" and populate mediatype.message_templates by "mediatype_messageid" property.
 	 *
-	 * @param array  $mediatypes                           A multidimensional array with media types data.
-	 * @param int    $mediatypes[]['mediatypeid']          Media type ID.
-	 * @param int    $mediatypes[]['type']                 Transport used by the media type.
-	 * @param string $mediatypes[]['name']                 Name of the media type.
-	 * @param string $mediatypes[]['smtp_server']          SMTP server.
-	 * @param int    $mediatypes[]['smtp_port']            SMTP server port.
-	 * @param string $mediatypes[]['smtp_helo']            SMTP HELO.
-	 * @param string $mediatypes[]['smtp_email']           SMTP email.
-	 * @param int    $mediatypes[]['smtp_security']        SMTP connection security level.
-	 * @param int    $mediatypes[]['smtp_verify_peer']     SMTP verify peer.
-	 * @param int    $mediatypes[]['smtp_verify_host']     SMTP verify host.
-	 * @param int    $mediatypes[]['smtp_authentication']  SMTP authentication.
-	 * @param int    $mediatypes[]['content_type']         Message format.
-	 * @param string $mediatypes[]['exec_path']            Script name.
-	 * @param string $mediatypes[]['exec_params']          Script parameters.
-	 * @param string $mediatypes[]['gsm_modem']            Serial device name of the GSM modem.
-	 * @param string $mediatypes[]['username']             User name used for authentication.
-	 * @param string $mediatypes[]['passwd']               Password used for authentication.
-	 * @param int    $mediatypes[]['status']               Media type status.
-	 * @param int    $mediatypes[]['maxsessions']          Limit of simultaneously processed alerts.
-	 * @param int    $mediatypes[]['maxattempts']          Maximum attempts to deliver alert successfully.
-	 * @param string $mediatypes[]['attempt_interval']     Interval between alert delivery attempts.
-	 * @param string $mediatypes[]['script']               Webhook JavaScript body.
-	 * @param array  $mediatypes[]['parameters']           An array of webhook parameters:
-	 *                                                     ['name' => .., 'value' => ..]
-	 * @param string $mediatypes[]['timeout']              Webhook JavaScript HTTP request timeout.
-	 * @param string $mediatypes[]['process_tags']         Webhook HTTP response should be saved as tags.
-	 * @param string $mediatypes[]['show_event_menu']      Indicates presence of entry in event.get "urls" objects list.
-	 * @param string $mediatypes[]['event_menu_url']       Webhook additional info in frontend, supports received tags.
-	 * @param string $mediatypes[]['event_menu_name']      Webhook 'url' visual name.
-	 * @param string $mediatypes[]['description']          Media type description.
-	 * @param array  $mediatypes[]['message_templates']    An array of media type message templates.
+	 * @static
 	 *
-	 * @return array
+	 * @param array      $mediatypes
+	 * @param string     $method
+	 * @param array|null $db_mediatypes
 	 */
-	public function update(array $mediatypes) {
-		$mediatypes = zbx_toArray($mediatypes);
-
-		$this->validateUpdate($mediatypes);
-
-		$update = [];
-		$webhooks_params = [];
-		$message_templates = [];
-		$default_values = DB::getDefaults('media_type');
-		$db_mediatypes = DB::select('media_type', [
-			'output' => ['mediatypeid', 'type', 'name', 'smtp_server', 'smtp_helo', 'smtp_email', 'exec_path',
-				'gsm_modem', 'username', 'passwd', 'status', 'smtp_port', 'smtp_security', 'smtp_verify_peer',
-				'smtp_verify_host', 'smtp_authentication', 'exec_params', 'maxsessions', 'maxattempts',
-				'attempt_interval', 'content_type', 'script', 'timeout', 'process_tags', 'show_event_menu',
-				'event_menu_url', 'event_menu_name', 'description'
-			],
-			'filter' => ['mediatypeid' => zbx_objectValues($mediatypes, 'mediatypeid')],
-			'preservekeys' => true
-		]);
-
-		$type_switch_fields = [
-			MEDIA_TYPE_EMAIL => [
-				'smtp_server', 'smtp_helo', 'smtp_email', 'smtp_port', 'smtp_security', 'smtp_verify_peer',
-				'smtp_verify_host', 'smtp_authentication', 'passwd', 'username', 'content_type'
-			],
-			MEDIA_TYPE_EXEC => [
-				'exec_path', 'exec_params'
-			],
-			MEDIA_TYPE_SMS => [
-				'gsm_modem'
-			],
-			MEDIA_TYPE_WEBHOOK => [
-				'script', 'timeout', 'process_tags', 'show_event_menu', 'event_menu_url', 'event_menu_name', 'parameters'
-			]
-		];
-		$default_values['parameters'] = [];
-
-		foreach ($mediatypes as $mediatype) {
-			$mediatypeid = $mediatype['mediatypeid'];
-			$db_mediatype = $db_mediatypes[$mediatypeid];
-			$db_type = $db_mediatype['type'];
-			$type = array_key_exists('type', $mediatype) ? $mediatype['type'] : $db_type;
-			unset($mediatype['mediatypeid']);
-
-			if ($type == MEDIA_TYPE_WEBHOOK) {
-				if (array_key_exists('parameters', $mediatype)) {
-					$params = [];
-
-					foreach ($mediatype['parameters'] as $param) {
-						$params[$param['name']] = $param['value'];
-					};
-
-					$webhooks_params[$mediatypeid] = $params;
-					unset($mediatype['parameters']);
-				}
+	private static function updateMessageTemplates(array &$mediatypes, string $method, array $db_mediatypes = null): void {
+		$ins_messages = [];
+		$upd_messages = [];
+		$del_messageids = [];
 
-				if (array_key_exists('show_event_menu', $mediatype)
-						&& $mediatype['show_event_menu'] == ZBX_EVENT_MENU_HIDE) {
-					$mediatype += ['event_menu_url' => '', 'event_menu_name' => ''];
-				}
-
-				$this->validateEventMenu($mediatype, $db_mediatype);
-			}
-			else if ($db_type == MEDIA_TYPE_WEBHOOK) {
-				$webhooks_params[$mediatypeid] = [];
-			}
-
-			if (array_key_exists('message_templates', $mediatype)) {
-				$message_templates[$mediatypeid] = $mediatype['message_templates'];
-				unset($mediatype['message_templates']);
+		foreach ($mediatypes as &$mediatype) {
+			if (!array_key_exists('message_templates', $mediatype)) {
+				continue;
 			}
 
-			if ($type != $db_type) {
-				$mediatype = array_intersect_key($default_values,
-					array_fill_keys($type_switch_fields[$db_type], '')) + $mediatype;
-			}
-
-			if (!empty($mediatype)) {
-				$update[] = [
-					'values' => $mediatype,
-					'where' => ['mediatypeid' => $mediatypeid]
-				];
-			}
-		}
+			$db_messages = ($method === 'update') ? $db_mediatypes[$mediatype['mediatypeid']]['message_templates'] : [];
 
-		DB::update('media_type', $update);
-		$mediatypeids = zbx_objectValues($mediatypes, 'mediatypeid');
+			foreach ($mediatype['message_templates'] as &$message) {
+				$db_message = current(
+					array_filter($db_messages, static function(array $db_message) use ($message): bool {
+						return $message['eventsource'] == $db_message['eventsource']
+							&& $message['recovery'] == $db_message['recovery'];
+					})
+				);
 
-		if ($webhooks_params) {
-			$ins_media_type_param = [];
-			$del_media_type_param = [];
-			$upd_media_type_param = [];
-			$db_webhooks_params = DB::select('media_type_param', [
-				'output' => ['mediatype_paramid', 'mediatypeid', 'name', 'value'],
-				'filter' => ['mediatypeid' => array_keys($webhooks_params)]
-			]);
+				if ($db_message) {
+					$message['mediatype_messageid'] = $db_message['mediatype_messageid'];
+					unset($db_messages[$db_message['mediatype_messageid']]);
 
-			foreach ($db_webhooks_params as $param) {
-				$mediatypeid = $param['mediatypeid'];
+					$upd_message = DB::getUpdatedValues('media_type_message', $message, $db_message);
 
-				if (!array_key_exists($param['name'], $webhooks_params[$mediatypeid])) {
-					$del_media_type_param[] = $param['mediatype_paramid'];
-				}
-				elseif ($webhooks_params[$mediatypeid][$param['name']] !== $param['value']) {
-					$upd_media_type_param[] = [
-						'values' => ['value' => $webhooks_params[$mediatypeid][$param['name']]],
-						'where' => ['mediatype_paramid' => $param['mediatype_paramid']]
-					];
-					unset($webhooks_params[$mediatypeid][$param['name']]);
+					if ($upd_message) {
+						$upd_messages[] = [
+							'values' => $upd_message,
+							'where' => ['mediatype_messageid' => $db_message['mediatype_messageid']]
+						];
+					}
 				}
 				else {
-					unset($webhooks_params[$mediatypeid][$param['name']]);
-				}
-			}
-
-			$webhooks_params = array_filter($webhooks_params);
-
-			foreach ($webhooks_params as $mediatypeid => $params) {
-				foreach ($params as $name => $value) {
-					$ins_media_type_param[] = compact('mediatypeid', 'name', 'value');
+					$ins_messages[] = ['mediatypeid' => $mediatype['mediatypeid']] + $message;
 				}
 			}
+			unset($message);
 
-			if ($del_media_type_param) {
-				DB::delete('media_type_param', ['mediatype_paramid' => array_keys(array_flip($del_media_type_param))]);
-			}
-
-			if ($upd_media_type_param) {
-				DB::update('media_type_param', $upd_media_type_param);
-			}
-
-			if ($ins_media_type_param) {
-				DB::insert('media_type_param', $ins_media_type_param);
-			}
+			$del_messageids = array_merge($del_messageids, array_keys($db_messages));
 		}
+		unset($mediatype);
 
-		if ($message_templates) {
-			$db_media_type_messages = DB::select('media_type_message', [
-				'output' => ['mediatype_messageid', 'mediatypeid', 'eventsource', 'recovery', 'subject', 'message'],
-				'filter' => ['mediatypeid' => array_keys($message_templates)],
-				'preservekeys' => true
-			]);
-
-			$ins_media_type_message = [];
-			$del_media_type_message = zbx_toHash(array_keys($db_media_type_messages));
-			$upd_media_type_message = [];
-
-			$message_template_defaults = [
-				'subject' => DB::getDefault('media_type_message', 'subject'),
-				'message' => DB::getDefault('media_type_message', 'message')
-			];
-
-			foreach ($db_media_type_messages as $mediatype_messageid => $db_message_template) {
-				$db_mediatypeid = $db_message_template['mediatypeid'];
-
-				foreach ($message_templates[$db_mediatypeid] as $idx => $message_template) {
-					if ($db_message_template['eventsource'] == $message_template['eventsource']
-							&& $db_message_template['recovery'] == $message_template['recovery']) {
-						$values = [];
-						$message_template += $message_template_defaults;
-
-						if ($db_message_template['subject'] !== $message_template['subject']) {
-							$values['subject'] = $message_template['subject'];
-						}
+		if ($del_messageids) {
+			DB::delete('media_type_message', ['mediatype_messageid' => $del_messageids]);
+		}
 
-						if ($db_message_template['message'] !== $message_template['message']) {
-							$values['message'] = $message_template['message'];
-						}
+		if ($upd_messages) {
+			DB::update('media_type_message', $upd_messages);
+		}
 
-						if ($values) {
-							$upd_media_type_message[] = [
-								'values' => $values,
-								'where' => ['mediatype_messageid' => $mediatype_messageid]
-							];
-						}
+		if ($ins_messages) {
+			$messageids = DB::insert('media_type_message', $ins_messages);
+		}
 
-						unset($message_templates[$db_mediatypeid][$idx], $del_media_type_message[$mediatype_messageid]);
-					}
-				}
+		foreach ($mediatypes as &$mediatype) {
+			if (!array_key_exists('message_templates', $mediatype)) {
+				continue;
 			}
 
-			foreach ($message_templates as $mediatypeid => $templates) {
-				foreach ($templates as $template) {
-					$ins_media_type_message[] = ['mediatypeid' => $mediatypeid] + $template;
+			foreach ($mediatype['message_templates'] as &$message) {
+				if (!array_key_exists('mediatype_messageid', $message)) {
+					$message['mediatype_messageid'] = array_shift($messageids);
 				}
 			}
-
-			if ($del_media_type_message) {
-				DB::delete('media_type_message', ['mediatype_messageid' => $del_media_type_message]);
-			}
-
-			if ($upd_media_type_message) {
-				DB::update('media_type_message', $upd_media_type_message);
-			}
-
-			if ($ins_media_type_message) {
-				DB::insert('media_type_message', $ins_media_type_message);
-			}
+			unset($message);
 		}
-
-		$this->addAuditBulk(CAudit::ACTION_UPDATE, CAudit::RESOURCE_MEDIA_TYPE, $mediatypes, $db_mediatypes);
-
-		return ['mediatypeids' => $mediatypeids];
+		unset($mediatype);
 	}
 
 	/**
-	 * Delete Media types.
-	 *
 	 * @param array $mediatypeids
 	 *
+	 * @throws APIException if the input is invalid.
+	 *
 	 * @return array
 	 */
-	public function delete(array $mediatypeids) {
+	public function delete(array $mediatypeids): array {
 		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('Only Super Admins can delete media types.'));
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'mediatype', __FUNCTION__)
+			);
 		}
 
-		$actions = API::Action()->get([
-			'mediatypeids' => $mediatypeids,
-			'output' => API_OUTPUT_EXTEND,
-			'preservekeys' => true
-		]);
-		if (!empty($actions)) {
-			$action = reset($actions);
-			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Media types used by action "%1$s".', $action['name']));
+		$api_input_rules = ['type' => API_IDS, 'flags' => API_NOT_EMPTY, 'uniq' => true];
+
+		if (!CApiInputValidator::validate($api_input_rules, $mediatypeids, '/', $error)) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
 
 		$db_mediatypes = DB::select('media_type', [
 			'output' => ['mediatypeid', 'name'],
-			'mediatypeids' => $mediatypeids,
-			'preservekeys' => true
+			'mediatypeids' => $mediatypeids
 		]);
 
-		DB::delete('media_type', ['mediatypeid' => $mediatypeids]);
-
-		$this->addAuditBulk(CAudit::ACTION_DELETE, CAudit::RESOURCE_MEDIA_TYPE, $db_mediatypes);
-
-		return ['mediatypeids' => $mediatypeids];
-	}
+		if (count($db_mediatypes) != count($mediatypeids)) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
+		}
 
-	/**
-	 * Check required fields by type. Values for fields must not be empty.
-	 *
-	 * @param array		$mediatype							An array of media type data.
-	 * @param string	$mediatype['name']					Name of the media type.
-	 * @param string	$mediatype['type']					E-mail, Script and SMS.
-	 *
-	 * @throws APIException if the input is invalid.
-	 */
-	protected function checkRequiredFieldsByType(array $mediatype) {
-		$type_validator = new CLimitedSetValidator([
-			'values' => array_keys(media_type2str())
+		$actions = API::Action()->get([
+			'output' => ['name'],
+			'mediatypeids' => $mediatypeids,
+			'limit' => 1
 		]);
 
-		if (!$type_validator->validate($mediatype['type'])) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _s(
-				'Incorrect value "%1$s" in field "%2$s" for media type "%3$s".',
-				$mediatype['type'],
-				'type',
-				$mediatype['name']
-			));
+		if ($actions) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Media types used by action "%1$s".', $actions[0]['name']));
 		}
 
-		$required_fields_by_type = [
-			MEDIA_TYPE_EMAIL => ['smtp_server', 'smtp_helo', 'smtp_email'],
-			MEDIA_TYPE_EXEC => ['exec_path'],
-			MEDIA_TYPE_WEBHOOK => [],
-			MEDIA_TYPE_SMS => ['gsm_modem']
-		];
+		DB::delete('media_type', ['mediatypeid' => $mediatypeids]);
 
-		foreach ($required_fields_by_type[$mediatype['type']] as $field) {
-			// Check if fields set on Create method. For update method they are checked when type is changed.
-			if (!array_key_exists($field, $mediatype)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS,
-					_s('Field "%1$s" is required for media type "%2$s".', $field, $mediatype['name'])
-				);
-			}
-			elseif (array_key_exists($field, $mediatype)
-					&& ($mediatype[$field] === '' || $mediatype[$field] === null)) {
-				self::exception(ZBX_API_ERROR_PARAMETERS,
-					_s('Field "%1$s" is missing a value for media type "%2$s".', $field, $mediatype['name'])
-				);
-			}
-		}
+		self::addAuditLog(CAudit::ACTION_DELETE, CAudit::RESOURCE_MEDIA_TYPE, $db_mediatypes);
+
+		return ['mediatypeids' => $mediatypeids];
 	}
 
-	protected function addRelatedObjects(array $options, array $result) {
+	protected function addRelatedObjects(array $options, array $result): array {
 		$result = parent::addRelatedObjects($options, $result);
 
 		// adding message templates
@@ -1272,48 +898,53 @@ class CMediatype extends CApiService {
 	}
 
 	/**
-	 * Get incomplete media type validation rules.
+	 * Add existing webhook parameters and message templates to $db_mediatypes, regardless of whether they will be
+	 * affected by the update.
 	 *
-	 * @param int    $type
-	 * @param string $method
+	 * @static
 	 *
-	 * @return array
+	 * @param array $mediatypes
+	 * @param array $db_mediatypes
 	 */
-	protected function getValidationRules($type, $method) {
-		$api_input_rules = ['type' => API_OBJECT, 'fields' => [
-			'description' =>		['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('media_type', 'description')],
-			'message_templates' =>	['type' => API_OBJECTS, 'uniq' => [['eventsource', 'recovery']], 'fields' => [
-				'eventsource' =>		['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => implode(',', [EVENT_SOURCE_TRIGGERS, EVENT_SOURCE_DISCOVERY, EVENT_SOURCE_AUTOREGISTRATION, EVENT_SOURCE_INTERNAL, EVENT_SOURCE_SERVICE])],
-				'recovery' =>			['type' => API_MULTIPLE, 'flags' => API_REQUIRED, 'rules' => [
-											['if' => ['field' => 'eventsource', 'in' => EVENT_SOURCE_TRIGGERS.','.EVENT_SOURCE_SERVICE], 'type' => API_INT32, 'in' => implode(',', [ACTION_OPERATION, ACTION_RECOVERY_OPERATION, ACTION_UPDATE_OPERATION])],
-											['if' => ['field' => 'eventsource', 'in' => implode(',', [EVENT_SOURCE_DISCOVERY, EVENT_SOURCE_AUTOREGISTRATION])], 'type' => API_INT32, 'in' => ACTION_OPERATION],
-											['if' => ['field' => 'eventsource', 'in' => EVENT_SOURCE_INTERNAL], 'type' => API_INT32, 'in' => implode(',', [ACTION_OPERATION, ACTION_RECOVERY_OPERATION])]
-				]],
-				'subject' =>			['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('media_type_message', 'subject')],
-				'message' =>			['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('media_type_message', 'message')]
-			]]
-		]];
+	private static function addAffectedObjects(array $mediatypes, array &$db_mediatypes): void {
+		$mediatypeids = ['parameters' => [], 'message_templates' => []];
 
-		if ($type == MEDIA_TYPE_WEBHOOK) {
-			$api_input_rules['fields'] += [
-				'script' =>				['type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY, 'length' => DB::getFieldLength('media_type', 'script')],
-				'timeout' =>			['type' => API_TIME_UNIT, 'length' => DB::getFieldLength('media_type', 'timeout'), 'in' => '1:60'],
-				'process_tags' =>		['type' => API_INT32, 'in' => implode(',', [ZBX_MEDIA_TYPE_TAGS_DISABLED, ZBX_MEDIA_TYPE_TAGS_ENABLED])],
-				'show_event_menu' =>	['type' => API_INT32, 'in' => implode(',', [ZBX_EVENT_MENU_HIDE, ZBX_EVENT_MENU_SHOW])],
-				// Should be checked as string not as URL because it can contain macros tags.
-				'event_menu_url' =>		['type' => API_URL, 'flags' => API_ALLOW_EVENT_TAGS_MACRO, 'length' => DB::getFieldLength('media_type', 'event_menu_url')],
-				'event_menu_name' =>	['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('media_type', 'event_menu_name')],
-				'parameters' =>			['type' => API_OBJECTS, 'uniq' => [['name']], 'fields' => [
-					'name' =>				['type' => API_STRING_UTF8, 'flags' => API_REQUIRED | API_NOT_EMPTY, 'length' => DB::getFieldLength('media_type_param', 'name')],
-					'value' =>				['type' => API_STRING_UTF8, 'flags' => API_REQUIRED, 'length' => DB::getFieldLength('media_type_param', 'value')]
-				]]
+		foreach ($mediatypes as $mediatype) {
+			if (array_key_exists('parameters', $mediatype)) {
+				$mediatypeids['parameters'][] = $mediatype['mediatypeid'];
+				$db_mediatypes[$mediatype['mediatypeid']]['parameters'] = [];
+			}
+
+			if (array_key_exists('message_templates', $mediatype)) {
+				$mediatypeids['message_templates'][] = $mediatype['mediatypeid'];
+				$db_mediatypes[$mediatype['mediatypeid']]['message_templates'] = [];
+			}
+		}
+
+		if ($mediatypeids['parameters']) {
+			$options = [
+				'output' => ['mediatype_paramid', 'mediatypeid', 'name', 'value'],
+				'filter' => ['mediatypeid' => $mediatypeids['parameters']]
 			];
+			$db_params = DBselect(DB::makeSql('media_type_param', $options));
 
-			if ($method === 'create') {
-				$api_input_rules['fields']['script']['flags'] |= API_REQUIRED;
+			while ($db_param = DBfetch($db_params)) {
+				$db_mediatypes[$db_param['mediatypeid']]['parameters'][$db_param['mediatype_paramid']] =
+					array_diff_key($db_param, array_flip(['mediatypeid']));
 			}
 		}
 
-		return $api_input_rules;
+		if ($mediatypeids['message_templates']) {
+			$options = [
+				'output' => ['mediatype_messageid', 'mediatypeid', 'eventsource', 'recovery', 'subject', 'message'],
+				'filter' => ['mediatypeid' => $mediatypeids['message_templates']]
+			];
+			$db_messages = DBselect(DB::makeSql('media_type_message', $options));
+
+			while ($db_message = DBfetch($db_messages)) {
+				$db_mediatypes[$db_message['mediatypeid']]['message_templates'][$db_message['mediatype_messageid']] =
+					array_diff_key($db_message, array_flip(['mediatypeid']));
+			}
+		}
 	}
 }
diff --git a/ui/include/classes/api/services/CModule.php b/ui/include/classes/api/services/CModule.php
index 4c7708e16d2..145455839ae 100644
--- a/ui/include/classes/api/services/CModule.php
+++ b/ui/include/classes/api/services/CModule.php
@@ -114,6 +114,12 @@ class CModule extends CApiService {
 	 * @return array
 	 */
 	public function create(array $modules): array {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'module', __FUNCTION__)
+			);
+		}
+
 		self::validateCreate($modules);
 
 		$moduleids = DB::insert('module', $modules);
@@ -161,6 +167,12 @@ class CModule extends CApiService {
 	 * @return array
 	 */
 	public function update(array $modules): array {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'module', __FUNCTION__)
+			);
+		}
+
 		self::validateUpdate($modules, $db_modules);
 
 		$upd_modules = [];
@@ -230,6 +242,12 @@ class CModule extends CApiService {
 	 * @return array
 	 */
 	public function delete(array $moduleids): array {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'module', __FUNCTION__)
+			);
+		}
+
 		$api_input_rules = ['type' => API_IDS, 'flags' => API_NOT_EMPTY, 'uniq' => true];
 
 		if (!CApiInputValidator::validate($api_input_rules, $moduleids, '/', $error)) {
diff --git a/ui/include/classes/api/services/CProxy.php b/ui/include/classes/api/services/CProxy.php
index dd5276bb9b1..6054fec0755 100644
--- a/ui/include/classes/api/services/CProxy.php
+++ b/ui/include/classes/api/services/CProxy.php
@@ -182,6 +182,12 @@ class CProxy extends CApiService {
 	 * @return array
 	 */
 	public function create(array $proxies) {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'proxy', __FUNCTION__)
+			);
+		}
+
 		$this->validateCreate($proxies);
 
 		$proxyids = DB::insert('hosts', $proxies);
@@ -207,6 +213,12 @@ class CProxy extends CApiService {
 	 * @return array
 	 */
 	public function update(array $proxies) {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'proxy', __FUNCTION__)
+			);
+		}
+
 		$this->validateUpdate($proxies, $db_proxies);
 
 		$upd_proxies = [];
@@ -371,6 +383,12 @@ class CProxy extends CApiService {
 	 * @throws APIException if the input is invalid.
 	 */
 	private function validateDelete(array &$proxyids, array &$db_proxies = null) {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'proxy', __FUNCTION__)
+			);
+		}
+
 		$api_input_rules = ['type' => API_IDS, 'flags' => API_NOT_EMPTY, 'uniq' => true];
 
 		if (!CApiInputValidator::validate($api_input_rules, $proxyids, '/', $error)) {
diff --git a/ui/include/classes/api/services/CRegexp.php b/ui/include/classes/api/services/CRegexp.php
index ba4c1410513..f7550283f8e 100644
--- a/ui/include/classes/api/services/CRegexp.php
+++ b/ui/include/classes/api/services/CRegexp.php
@@ -43,6 +43,12 @@ class CRegexp extends CApiService {
 	 * @return array|int
 	 */
 	public function get(array $options = []) {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'regexp', __FUNCTION__)
+			);
+		}
+
 		$api_input_rules = ['type' => API_OBJECT, 'fields' => [
 			// filter
 			'regexpids' =>				['type' => API_IDS, 'flags' => API_ALLOW_NULL | API_NORMALIZE, 'default' => null],
@@ -104,6 +110,12 @@ class CRegexp extends CApiService {
 	 * @return array
 	 */
 	public function create(array $regexs): array {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'regexp', __FUNCTION__)
+			);
+		}
+
 		$this->validateCreate($regexs);
 
 		$regexids = DB::insert('regexps', $regexs);
@@ -273,6 +285,12 @@ class CRegexp extends CApiService {
 	 * @return array
 	 */
 	public function update(array $regexs): array {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'regexp', __FUNCTION__)
+			);
+		}
+
 		$this->validateUpdate($regexs, $db_regexs);
 
 		$upd_regexs = [];
@@ -341,7 +359,7 @@ class CRegexp extends CApiService {
 
 		self::checkDuplicates($regexs, $db_regexs);
 
-		$this->addAffectedObjects($regexs, $db_regexs);
+		self::addAffectedObjects($regexs, $db_regexs);
 	}
 
 	/**
@@ -352,6 +370,12 @@ class CRegexp extends CApiService {
 	 * @return array
 	 */
 	public function delete(array $regexpids): array {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'regexp', __FUNCTION__)
+			);
+		}
+
 		$api_input_rules = ['type' => API_IDS, 'flags' => API_NOT_EMPTY, 'uniq' => true];
 
 		if (!CApiInputValidator::validate($api_input_rules, $regexpids, '/', $error)) {
@@ -364,7 +388,6 @@ class CRegexp extends CApiService {
 			'preservekeys' => true
 		]);
 
-
 		if (count($db_regexs) != count($regexpids)) {
 			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
 		}
@@ -404,10 +427,12 @@ class CRegexp extends CApiService {
 	/**
 	 * Add the existing expressions to $db_regexs whether these are affected by the update.
 	 *
+	 * @static
+	 *
 	 * @param array $regexs
 	 * @param array $db_regexs
 	 */
-	private function addAffectedObjects(array $regexs, array &$db_regexs): void {
+	private static function addAffectedObjects(array $regexs, array &$db_regexs): void {
 		$regexids = [];
 
 		foreach ($regexs as $regex) {
@@ -427,13 +452,8 @@ class CRegexp extends CApiService {
 			$db_expressions = DBselect(DB::makeSql('expressions', $options));
 
 			while ($db_expression = DBfetch($db_expressions)) {
-				$db_regexs[$db_expression['regexpid']]['expressions'][$db_expression['expressionid']] = [
-					'expressionid' => $db_expression['expressionid'],
-					'expression' => $db_expression['expression'],
-					'expression_type' => $db_expression['expression_type'],
-					'exp_delimiter' => $db_expression['exp_delimiter'],
-					'case_sensitive' => $db_expression['case_sensitive']
-				];
+				$db_regexs[$db_expression['regexpid']]['expressions'][$db_expression['expressionid']] =
+					array_diff_key($db_expression, array_flip(['regexpid']));
 			}
 		}
 	}
diff --git a/ui/include/classes/api/services/CReport.php b/ui/include/classes/api/services/CReport.php
index 7b215be1af1..ad3197a9125 100644
--- a/ui/include/classes/api/services/CReport.php
+++ b/ui/include/classes/api/services/CReport.php
@@ -558,7 +558,7 @@ class CReport extends CApiService {
 
 		while ($db_report_active_fields = DBfetch($db_reports_active_fields)) {
 			$db_reports[$db_report_active_fields['reportid']] +=
-				array_diff_key($db_report_active_fields, ['reportid' => true]);
+				array_diff_key($db_report_active_fields, array_flip(['reportid']));
 		}
 
 		$names = [];
@@ -647,7 +647,7 @@ class CReport extends CApiService {
 			$this->checkDashboards(array_keys($dashboardids));
 		}
 
-		$this->addAffectedObjects($reports, $db_reports);
+		self::addAffectedObjects($reports, $db_reports);
 
 		$this->checkUsers($reports, $db_reports);
 		$this->checkUserGroups($reports, $db_reports);
@@ -1040,10 +1040,12 @@ class CReport extends CApiService {
 	/**
 	 * Add existing users and user groups to $db_reports, regardless of whether they will be affected by the update.
 	 *
+	 * @static
+	 *
 	 * @param array $reports
 	 * @param array $db_reports
 	 */
-	private function addAffectedObjects(array $reports, array &$db_reports): void {
+	private static function addAffectedObjects(array $reports, array &$db_reports): void {
 		$reportids = [];
 
 		foreach ($reports as $report) {
@@ -1061,12 +1063,8 @@ class CReport extends CApiService {
 		$db_report_users = DBselect(DB::makeSql('report_user', $options));
 
 		while ($db_report_user = DBfetch($db_report_users)) {
-			$db_reports[$db_report_user['reportid']]['users'][$db_report_user['reportuserid']] = [
-				'reportuserid' => $db_report_user['reportuserid'],
-				'userid' => $db_report_user['userid'],
-				'exclude' => $db_report_user['exclude'],
-				'access_userid' => $db_report_user['access_userid']
-			];
+			$db_reports[$db_report_user['reportid']]['users'][$db_report_user['reportuserid']] =
+				array_diff_key($db_report_user, array_flip(['reportid']));
 		}
 
 		$options = [
@@ -1076,11 +1074,8 @@ class CReport extends CApiService {
 		$db_report_usrgrps = DBselect(DB::makeSql('report_usrgrp', $options));
 
 		while ($db_report_usrgrp = DBfetch($db_report_usrgrps)) {
-			$db_reports[$db_report_usrgrp['reportid']]['user_groups'][$db_report_usrgrp['reportusrgrpid']] = [
-				'reportusrgrpid' => $db_report_usrgrp['reportusrgrpid'],
-				'usrgrpid' => $db_report_usrgrp['usrgrpid'],
-				'access_userid' => $db_report_usrgrp['access_userid']
-			];
+			$db_reports[$db_report_usrgrp['reportid']]['user_groups'][$db_report_usrgrp['reportusrgrpid']] =
+				array_diff_key($db_report_usrgrp, array_flip(['reportid']));
 		}
 	}
 }
diff --git a/ui/include/classes/api/services/CRole.php b/ui/include/classes/api/services/CRole.php
index 8a84801f422..6fe14d782ee 100644
--- a/ui/include/classes/api/services/CRole.php
+++ b/ui/include/classes/api/services/CRole.php
@@ -132,6 +132,12 @@ class CRole extends CApiService {
 	 * @throws APIException
 	 */
 	public function create(array $roles): array {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'role', __FUNCTION__)
+			);
+		}
+
 		$this->validateCreate($roles);
 
 		$ins_roles = [];
@@ -219,6 +225,12 @@ class CRole extends CApiService {
 	 * @throws APIException
 	 */
 	public function update(array $roles): array {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'role', __FUNCTION__)
+			);
+		}
+
 		$this->validateUpdate($roles, $db_roles);
 
 		$upd_roles = [];
@@ -328,6 +340,12 @@ class CRole extends CApiService {
 	 * @throws APIException
 	 */
 	public function delete(array $roleids): array {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'role', __FUNCTION__)
+			);
+		}
+
 		$api_input_rules = ['type' => API_IDS, 'flags' => API_NOT_EMPTY, 'uniq' => true];
 
 		if (!CApiInputValidator::validate($api_input_rules, $roleids, '/', $error)) {
@@ -433,7 +451,7 @@ class CRole extends CApiService {
 	 * @throws APIException
 	 */
 	private function checkUiRules(string $name, int $type, array $rules, array $db_rules = null): void {
-		if (!array_key_exists('ui.default_access', $rules) && !array_key_exists('ui', $rules)) {
+		if (!array_key_exists('ui', $rules)) {
 			return;
 		}
 
@@ -454,16 +472,14 @@ class CRole extends CApiService {
 			$ui_rules[$ui_rule_name] = $default_access == ZBX_ROLE_RULE_ENABLED;
 		}
 
-		if (array_key_exists('ui', $rules)) {
-			foreach ($rules['ui'] as $ui_rule) {
-				if (!array_key_exists($ui_rule['name'], $ui_rules)) {
-					self::exception(ZBX_API_ERROR_PARAMETERS,
-						_s('UI element "%2$s" is not available for user role "%1$s".', $name, $ui_rule['name'])
-					);
-				}
-
-				$ui_rules[$ui_rule['name']] = $ui_rule['status'] == ZBX_ROLE_RULE_ENABLED;
+		foreach ($rules['ui'] as $ui_rule) {
+			if (!array_key_exists($ui_rule['name'], $ui_rules)) {
+				self::exception(ZBX_API_ERROR_PARAMETERS,
+					_s('UI element "%2$s" is not available for user role "%1$s".', $name, $ui_rule['name'])
+				);
 			}
+
+			$ui_rules[$ui_rule['name']] = $ui_rule['status'] == ZBX_ROLE_RULE_ENABLED;
 		}
 
 		if (!in_array(true, $ui_rules)) {
@@ -615,6 +631,9 @@ class CRole extends CApiService {
 		elseif ($db_rules !== null) {
 			$mode = $db_rules['services.write.mode'];
 		}
+		elseif (self::$userData['type'] == USER_TYPE_SUPER_ADMIN || self::$userData['type'] == USER_TYPE_ZABBIX_ADMIN) {
+			$mode = ZBX_ROLE_RULE_SERVICES_ACCESS_ALL;
+		}
 		else {
 			$mode = ZBX_ROLE_RULE_SERVICES_ACCESS_CUSTOM;
 		}
diff --git a/ui/include/classes/api/services/CScript.php b/ui/include/classes/api/services/CScript.php
index 4df3da2d23b..6dc9e6621b2 100644
--- a/ui/include/classes/api/services/CScript.php
+++ b/ui/include/classes/api/services/CScript.php
@@ -114,15 +114,16 @@ class CScript extends CApiService {
 			'editable' =>				['type' => API_BOOLEAN, 'default' => false],
 			'preservekeys' =>			['type' => API_BOOLEAN, 'default' => false]
 		]];
+
 		if (!CApiInputValidator::validate($api_input_rules, $options, '/', $error)) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
 
 		$sql_parts = [
-			'select'	=> ['scripts' => 's.scriptid'],
-			'from'		=> ['scripts' => 'scripts s'],
-			'where'		=> [],
-			'order'		=> []
+			'select' =>	['scripts' => 's.scriptid'],
+			'from' =>	['scripts' => 'scripts s'],
+			'where' =>	[],
+			'order' =>	[]
 		];
 
 		// editable + permission check
@@ -234,27 +235,24 @@ class CScript extends CApiService {
 	 * @return array
 	 */
 	public function create(array $scripts) {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'script', __FUNCTION__)
+			);
+		}
+
 		$this->validateCreate($scripts);
 
 		$scriptids = DB::insert('scripts', $scripts);
-		$scripts_params = [];
 
 		foreach ($scripts as $index => &$script) {
 			$script['scriptid'] = $scriptids[$index];
-
-			if ($script['type'] == ZBX_SCRIPT_TYPE_WEBHOOK && array_key_exists('parameters', $script)) {
-				foreach ($script['parameters'] as $param) {
-					$scripts_params[] = ['scriptid' => $script['scriptid']] + $param;
-				}
-			}
 		}
 		unset($script);
 
-		if ($scripts_params) {
-			DB::insertBatch('script_param', $scripts_params);
-		}
+		self::updateParams($scripts, __FUNCTION__);
 
-		$this->addAuditBulk(CAudit::ACTION_ADD, CAudit::RESOURCE_SCRIPT, $scripts);
+		self::addAuditLog(CAudit::ACTION_ADD, CAudit::RESOURCE_SCRIPT, $scripts);
 
 		return ['scriptids' => $scriptids];
 	}
@@ -265,13 +263,9 @@ class CScript extends CApiService {
 	 * @throws APIException if the input is invalid
 	 */
 	protected function validateCreate(array &$scripts) {
-		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('You do not have permission to perform this operation.'));
-		}
-
 		/*
 		 * Get general validation rules and firstly validate name uniqueness and all the possible fields, so that there
-		 * are no invalid fields for any of the script types. Unfortunaly there is also a drawback, since field types
+		 * are no invalid fields for any of the script types. Unfortunately there is also a drawback, since field types
 		 * validated before we know what rules belong to each script type.
 		 */
 		$api_input_rules = $this->getValidationRules('create', $common_fields);
@@ -284,18 +278,13 @@ class CScript extends CApiService {
 		 * Then validate each script separately. Depending on script type, each script may have different set of allowed
 		 * fields. Then in case the type is SSH and authtype is set, validate parameters again.
 		 */
-		$i = 0;
-		$check_names = [];
-
-		foreach ($scripts as $script) {
-			$path = '/'.++$i;
-
+		foreach ($scripts as $index => $script) {
 			$type_rules = $this->getTypeValidationRules($script['type'], 'create', $type_fields);
 			$this->getScopeValidationRules($script['scope'], $scope_fields);
 
 			$type_rules['fields'] += $common_fields + $scope_fields;
 
-			if (!CApiInputValidator::validate($type_rules, $script, $path, $error)) {
+			if (!CApiInputValidator::validate($type_rules, $script, '/'.($index + 1), $error)) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 			}
 
@@ -303,22 +292,13 @@ class CScript extends CApiService {
 				$ssh_rules = $this->getAuthTypeValidationRules($script['authtype'], 'create');
 				$ssh_rules['fields'] += $common_fields + $type_fields + $scope_fields;
 
-				if (!CApiInputValidator::validate($ssh_rules, $script, $path, $error)) {
+				if (!CApiInputValidator::validate($ssh_rules, $script, '/'.($index + 1), $error)) {
 					self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 				}
 			}
-
-			$check_names[$script['name']] = true;
 		}
 
-		$db_script_names = API::getApiService()->select('scripts', [
-			'output' => ['scriptid'],
-			'filter' => ['name' => array_keys($check_names)]
-		]);
-
-		if ($db_script_names) {
-			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Script "%1$s" already exists.', $script['name']));
-		}
+		self::checkDuplicates($scripts);
 
 		// Finally check User and Host IDs.
 		$this->checkUserGroups($scripts);
@@ -331,115 +311,23 @@ class CScript extends CApiService {
 	 * @return array
 	 */
 	public function update(array $scripts) {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'script', __FUNCTION__)
+			);
+		}
+
 		$this->validateUpdate($scripts, $db_scripts);
 
 		$upd_scripts = [];
-		$scripts_params = [];
 
 		foreach ($scripts as $script) {
-			$scriptid = $script['scriptid'];
-			$db_script = $db_scripts[$scriptid];
-			$db_type = $db_script['type'];
-			$db_authtype = $db_script['authtype'];
-			$db_scope = $db_script['scope'];
-			$type = array_key_exists('type', $script) ? $script['type'] : $db_type;
-			$authtype = array_key_exists('authtype', $script) ? $script['authtype'] : $db_authtype;
-			$scope = array_key_exists('scope', $script) ? $script['scope'] : $db_scope;
-
-			$upd_script = [];
-
-			// strings
-			foreach (['name', 'command', 'description', 'confirmation', 'timeout', 'menu_path', 'username', 'publickey',
-					'privatekey', 'password'] as $field_name) {
-				if (array_key_exists($field_name, $script) && $script[$field_name] !== $db_script[$field_name]) {
-					$upd_script[$field_name] = $script[$field_name];
-				}
-			}
-
-			// integers
-			foreach (['type', 'execute_on', 'usrgrpid', 'groupid', 'host_access', 'scope', 'port', 'authtype']
-					as $field_name) {
-				if (array_key_exists($field_name, $script) && $script[$field_name] != $db_script[$field_name]) {
-					$upd_script[$field_name] = $script[$field_name];
-				}
-			}
-
-			// No mattter what the old type was, clear and reset all unnecessary fields from any other types.
-			if ($type != $db_type) {
-				switch ($type) {
-					case ZBX_SCRIPT_TYPE_CUSTOM_SCRIPT:
-						$upd_script['port'] = '';
-						$upd_script['authtype'] = DB::getDefault('scripts', 'authtype');
-						$upd_script['username'] = '';
-						$upd_script['password'] = '';
-						$upd_script['publickey'] = '';
-						$upd_script['privatekey'] = '';
-						break;
-
-					case ZBX_SCRIPT_TYPE_IPMI:
-						$upd_script['port'] = '';
-						$upd_script['authtype'] = DB::getDefault('scripts', 'authtype');
-						$upd_script['username'] = '';
-						$upd_script['password'] = '';
-						$upd_script['publickey'] = '';
-						$upd_script['privatekey'] = '';
-						$upd_script['execute_on'] = DB::getDefault('scripts', 'execute_on');
-						break;
-
-					case ZBX_SCRIPT_TYPE_SSH:
-						$upd_script['execute_on'] = DB::getDefault('scripts', 'execute_on');
-						break;
-
-					case ZBX_SCRIPT_TYPE_TELNET:
-						$upd_script['authtype'] = DB::getDefault('scripts', 'authtype');
-						$upd_script['publickey'] = '';
-						$upd_script['privatekey'] = '';
-						$upd_script['execute_on'] = DB::getDefault('scripts', 'execute_on');
-						break;
-
-					case ZBX_SCRIPT_TYPE_WEBHOOK:
-						$upd_script['port'] = '';
-						$upd_script['authtype'] = DB::getDefault('scripts', 'authtype');
-						$upd_script['username'] = '';
-						$upd_script['password'] = '';
-						$upd_script['publickey'] = '';
-						$upd_script['privatekey'] = '';
-						$upd_script['execute_on'] = DB::getDefault('scripts', 'execute_on');
-						break;
-				}
-			}
-			elseif ($type == ZBX_SCRIPT_TYPE_SSH && $authtype != $db_authtype && $authtype == ITEM_AUTHTYPE_PASSWORD) {
-				$upd_script['publickey'] = '';
-				$upd_script['privatekey'] = '';
-			}
-
-			if ($scope != $db_scope && $scope == ZBX_SCRIPT_SCOPE_ACTION) {
-				$upd_script['menu_path'] = '';
-				$upd_script['usrgrpid'] = 0;
-				$upd_script['host_access'] = DB::getDefault('scripts', 'host_access');;
-				$upd_script['confirmation'] = '';
-			}
-
-			if ($type == ZBX_SCRIPT_TYPE_WEBHOOK && array_key_exists('parameters', $script)) {
-				$params = [];
-
-				foreach ($script['parameters'] as $param) {
-					$params[$param['name']] = $param['value'];
-				}
-
-				$scripts_params[$scriptid] = $params;
-				unset($script['parameters']);
-			}
-
-			if ($type != $db_type && $db_type == ZBX_SCRIPT_TYPE_WEBHOOK) {
-				$upd_script['timeout'] = DB::getDefault('scripts', 'timeout');
-				$scripts_params[$scriptid] = [];
-			}
+			$upd_script = DB::getUpdatedValues('scripts', $script, $db_scripts[$script['scriptid']]);
 
 			if ($upd_script) {
 				$upd_scripts[] = [
 					'values' => $upd_script,
-					'where' => ['scriptid' => $scriptid]
+					'where' => ['scriptid' => $script['scriptid']]
 				];
 			}
 		}
@@ -448,57 +336,11 @@ class CScript extends CApiService {
 			DB::update('scripts', $upd_scripts);
 		}
 
-		if ($scripts_params) {
-			$insert_script_param = [];
-			$delete_script_param = [];
-			$update_script_param = [];
-			$db_scripts_params = DB::select('script_param', [
-				'output' => ['script_paramid', 'scriptid', 'name', 'value'],
-				'filter' => ['scriptid' => array_keys($scripts_params)]
-			]);
-
-			foreach ($db_scripts_params as $param) {
-				$scriptid = $param['scriptid'];
-
-				if (!array_key_exists($param['name'], $scripts_params[$scriptid])) {
-					$delete_script_param[] = $param['script_paramid'];
-				}
-				elseif ($scripts_params[$scriptid][$param['name']] !== $param['value']) {
-					$update_script_param[] = [
-						'values' => ['value' => $scripts_params[$scriptid][$param['name']]],
-						'where' => ['script_paramid' => $param['script_paramid']]
-					];
-					unset($scripts_params[$scriptid][$param['name']]);
-				}
-				else {
-					unset($scripts_params[$scriptid][$param['name']]);
-				}
-			}
-
-			$scripts_params = array_filter($scripts_params);
+		self::updateParams($scripts, __FUNCTION__, $db_scripts);
 
-			foreach ($scripts_params as $scriptid => $params) {
-				foreach ($params as $name => $value) {
-					$insert_script_param[] = compact('scriptid', 'name', 'value');
-				}
-			}
+		self::addAuditLog(CAudit::ACTION_UPDATE, CAudit::RESOURCE_SCRIPT, $scripts, $db_scripts);
 
-			if ($delete_script_param) {
-				DB::delete('script_param', ['script_paramid' => array_keys(array_flip($delete_script_param))]);
-			}
-
-			if ($update_script_param) {
-				DB::update('script_param', $update_script_param);
-			}
-
-			if ($insert_script_param) {
-				DB::insert('script_param', $insert_script_param);
-			}
-		}
-
-		$this->addAuditBulk(CAudit::ACTION_UPDATE, CAudit::RESOURCE_SCRIPT, $scripts, $db_scripts);
-
-		return ['scriptids' => zbx_objectValues($scripts, 'scriptid')];
+		return ['scriptids' => array_column($scripts, 'scriptid')];
 	}
 
 	/**
@@ -508,13 +350,9 @@ class CScript extends CApiService {
 	 * @throws APIException if the input is invalid
 	 */
 	protected function validateUpdate(array &$scripts, array &$db_scripts = null) {
-		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('You do not have permission to perform this operation.'));
-		}
-
 		/*
 		 * Get general validation rules and firstly validate name uniqueness and all the possible fields, so that there
-		 * are no invalid fields for any of the script types. Unfortunaly there is also a drawback, since field types
+		 * are no invalid fields for any of the script types. Unfortunately there is also a drawback, since field types
 		 * validated before we know what rules belong to each script type.
 		 */
 		$api_input_rules = $this->getValidationRules('update', $common_fields);
@@ -529,40 +367,17 @@ class CScript extends CApiService {
 				'confirmation', 'type', 'execute_on', 'timeout', 'scope', 'port', 'authtype', 'username', 'password',
 				'publickey', 'privatekey', 'menu_path'
 			],
-			'scriptids' => zbx_objectValues($scripts, 'scriptid'),
+			'scriptids' => array_column($scripts, 'scriptid'),
 			'preservekeys' => true
 		]);
 
-		$check_names = [];
-		foreach ($scripts as $script) {
-			if (!array_key_exists($script['scriptid'], $db_scripts)) {
-				self::exception(ZBX_API_ERROR_PERMISSIONS,
-					_('No permissions to referred object or it does not exist!')
-				);
-			}
-
-			if (array_key_exists('name', $script)) {
-				$check_names[$script['name']] = true;
-			}
+		if (count($db_scripts) != count($scripts)) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
 		}
 
-		if ($check_names) {
-			$db_script_names = API::getApiService()->select('scripts', [
-				'output' => ['scriptid', 'name'],
-				'filter' => ['name' => array_keys($check_names)]
-			]);
-			$db_script_names = zbx_toHash($db_script_names, 'name');
-
-			foreach ($scripts as $script) {
-				if (array_key_exists('name', $script)
-						&& array_key_exists($script['name'], $db_script_names)
-						&& !idcmp($db_script_names[$script['name']]['scriptid'], $script['scriptid'])) {
-					self::exception(ZBX_API_ERROR_PARAMETERS,
-						_s('Script "%1$s" already exists.', $script['name'])
-					);
-				}
-			}
-		}
+		self::checkDuplicates($scripts, $db_scripts);
+
+		self::addAffectedObjects($scripts, $db_scripts);
 
 		// Validate if scripts belong to actions and scope can be changed.
 		$action_scriptids = [];
@@ -639,12 +454,9 @@ class CScript extends CApiService {
 		}
 
 		// Populate common and mandatory fields.
-		$scripts = zbx_toHash($scripts, 'scriptid');
-		$scripts = $this->extendFromObjects($scripts, $db_scripts, ['name', 'type', 'command', 'scope']);
+		$scripts = $this->extendObjectsByKey($scripts, $db_scripts, 'scriptid', ['name', 'type', 'command', 'scope']);
 
-		$i = 0;
-		foreach ($scripts as &$script) {
-			$path = '/'.++$i;
+		foreach ($scripts as $index => &$script) {
 			$db_script = $db_scripts[$script['scriptid']];
 			$method = 'update';
 
@@ -666,7 +478,7 @@ class CScript extends CApiService {
 
 			$type_rules['fields'] += $common_fields + $scope_fields;
 
-			if (!CApiInputValidator::validate($type_rules, $script, $path, $error)) {
+			if (!CApiInputValidator::validate($type_rules, $script, '/'.($index + 1), $error)) {
 				self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 			}
 
@@ -677,18 +489,81 @@ class CScript extends CApiService {
 					$method = 'create';
 				}
 
-				$script = $this->extendFromObjects([$script], [$db_script], ['authtype'])[0];
+				$script += ['authtype' => $db_script['authtype']];
 
 				$ssh_rules = $this->getAuthTypeValidationRules($script['authtype'], $method);
 				$ssh_rules['fields'] += $common_fields + $type_fields + $scope_fields;
 
-				if (!CApiInputValidator::validate($ssh_rules, $script, $path, $error)) {
+				if (!CApiInputValidator::validate($ssh_rules, $script, '/'.($index + 1), $error)) {
 					self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 				}
 			}
 		}
 		unset($script);
 
+		// Clear and reset all unnecessary fields.
+		foreach ($scripts as &$script) {
+			$db_script = $db_scripts[$script['scriptid']];
+
+			if ($script['type'] != $db_script['type']) {
+				switch ($script['type']) {
+					case ZBX_SCRIPT_TYPE_IPMI:
+						$script['execute_on'] = DB::getDefault('scripts', 'execute_on');
+						// break; is not missing here
+
+					case ZBX_SCRIPT_TYPE_CUSTOM_SCRIPT:
+						$script['port'] = '';
+						$script['authtype'] = DB::getDefault('scripts', 'authtype');
+						$script['username'] = '';
+						$script['password'] = '';
+						$script['publickey'] = '';
+						$script['privatekey'] = '';
+						$script['parameters'] = [];
+						$script['timeout'] = DB::getDefault('scripts', 'timeout');
+						break;
+
+					case ZBX_SCRIPT_TYPE_SSH:
+						$script['execute_on'] = DB::getDefault('scripts', 'execute_on');
+						$script['parameters'] = [];
+						$script['timeout'] = DB::getDefault('scripts', 'timeout');
+						break;
+
+					case ZBX_SCRIPT_TYPE_TELNET:
+						$script['authtype'] = DB::getDefault('scripts', 'authtype');
+						$script['publickey'] = '';
+						$script['privatekey'] = '';
+						$script['execute_on'] = DB::getDefault('scripts', 'execute_on');
+						$script['parameters'] = [];
+						$script['timeout'] = DB::getDefault('scripts', 'timeout');
+						break;
+
+					case ZBX_SCRIPT_TYPE_WEBHOOK:
+						$script['port'] = '';
+						$script['authtype'] = DB::getDefault('scripts', 'authtype');
+						$script['username'] = '';
+						$script['password'] = '';
+						$script['publickey'] = '';
+						$script['privatekey'] = '';
+						$script['execute_on'] = DB::getDefault('scripts', 'execute_on');
+						break;
+				}
+			}
+			elseif ($script['type'] == ZBX_SCRIPT_TYPE_SSH && $script['authtype'] != $db_script['authtype']
+					&& $script['authtype'] == ITEM_AUTHTYPE_PASSWORD) {
+				$script['publickey'] = '';
+				$script['privatekey'] = '';
+			}
+
+			if ($script['scope'] != $db_script['scope'] && $script['scope'] == ZBX_SCRIPT_SCOPE_ACTION) {
+				$script['menu_path'] = '';
+				$script['usrgrpid'] = 0;
+				$script['host_access'] = DB::getDefault('scripts', 'host_access');;
+				$script['confirmation'] = '';
+			}
+
+		}
+		unset($script);
+
 		$this->checkUserGroups($scripts);
 		$this->checkHostGroups($scripts);
 	}
@@ -721,7 +596,7 @@ class CScript extends CApiService {
 			$common_fields['command']['flags'] |= API_REQUIRED;
 		}
 		else {
-			$api_input_rules['uniq'] =  [['scriptid'], ['name']];
+			$api_input_rules['uniq'] = [['scriptid'], ['name']];
 			$common_fields += ['scriptid' => ['type' => API_ID, 'flags' => API_REQUIRED]];
 		}
 
@@ -945,27 +820,32 @@ class CScript extends CApiService {
 	 * @return array
 	 */
 	public function delete(array $scriptids) {
-		$this->validateDelete($scriptids, $db_scripts);
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'script', __FUNCTION__)
+			);
+		}
+
+		self::validateDelete($scriptids, $db_scripts);
 
 		DB::delete('scripts', ['scriptid' => $scriptids]);
 
-		$this->addAuditBulk(CAudit::ACTION_DELETE, CAudit::RESOURCE_SCRIPT, $db_scripts);
+		self::addAuditLog(CAudit::ACTION_DELETE, CAudit::RESOURCE_SCRIPT, $db_scripts);
 
 		return ['scriptids' => $scriptids];
 	}
 
 	/**
-	 * @param array $scriptids
-	 * @param array $db_scripts
+	 * @static
+	 *
+	 * @param array      $scriptids
+	 * @param array|null $db_scripts
 	 *
 	 * @throws APIException if the input is invalid
 	 */
-	protected function validateDelete(array &$scriptids, array &$db_scripts = null) {
-		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('You do not have permission to perform this operation.'));
-		}
-
+	private static function validateDelete(array &$scriptids, array &$db_scripts = null) {
 		$api_input_rules = ['type' => API_IDS, 'flags' => API_NOT_EMPTY, 'uniq' => true];
+
 		if (!CApiInputValidator::validate($api_input_rules, $scriptids, '/', $error)) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
@@ -976,12 +856,8 @@ class CScript extends CApiService {
 			'preservekeys' => true
 		]);
 
-		foreach ($scriptids as $scriptid) {
-			if (!array_key_exists($scriptid, $db_scripts)) {
-				self::exception(ZBX_API_ERROR_PERMISSIONS,
-					_('No permissions to referred object or it does not exist!')
-				);
-			}
+		if (count($db_scripts) != count($scriptids)) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
 		}
 
 		// Check if deleted scripts used in actions.
@@ -1016,6 +892,7 @@ class CScript extends CApiService {
 			'hostid' =>		['type' => API_ID],
 			'eventid' =>	['type' => API_ID]
 		]];
+
 		if (!CApiInputValidator::validate($api_input_rules, $data, '/', $error)) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, $error);
 		}
@@ -1067,6 +944,7 @@ class CScript extends CApiService {
 			'hostids' => $hostids,
 			'scriptids' => $data['scriptid']
 		]);
+
 		if (!$db_scripts) {
 			self::exception(ZBX_API_ERROR_PERMISSIONS, _('No permissions to referred object or it does not exist!'));
 		}
@@ -1267,15 +1145,16 @@ class CScript extends CApiService {
 				$result[$scriptid]['parameters'] = [];
 			}
 
-			$parameters = DB::select('script_param', [
-				'output' => ['scriptid', 'name', 'value'],
+			$param_options = [
+				'output' => ['script_paramid', 'scriptid', 'name', 'value'],
 				'filter' => ['scriptid' => array_keys($result)]
-			]);
+			];
+			$db_parameters = DBselect(DB::makeSql('script_param', $param_options));
 
-			foreach ($parameters as $parameter) {
-				$result[$parameter['scriptid']]['parameters'][] = [
-					'name' => $parameter['name'],
-					'value' => $parameter['value']
+			while ($db_param = DBfetch($db_parameters)) {
+				$result[$db_param['scriptid']]['parameters'][] = [
+					'name' => $db_param['name'],
+					'value' => $db_param['value']
 				];
 			}
 		}
@@ -1429,4 +1308,149 @@ class CScript extends CApiService {
 
 		return $result;
 	}
+
+	/**
+	 * Check for unique script names.
+	 *
+	 * @static
+	 *
+	 * @param array      $scripts
+	 * @param array|null $db_scripts
+	 *
+	 * @throws APIException if script names are not unique.
+	 */
+	private static function checkDuplicates(array $scripts, array $db_scripts = null): void {
+		$names = [];
+
+		foreach ($scripts as $script) {
+			if (!array_key_exists('name', $script)) {
+				continue;
+			}
+
+			if ($db_scripts === null || $script['name'] !== $db_scripts[$script['scriptid']]['name']) {
+				$names[] = $script['name'];
+			}
+		}
+
+		if (!$names) {
+			return;
+		}
+
+		$duplicates = DB::select('scripts', [
+			'output' => ['name'],
+			'filter' => ['name' => $names],
+			'limit' => 1
+		]);
+
+		if ($duplicates) {
+			self::exception(ZBX_API_ERROR_PARAMETERS, _s('Script "%1$s" already exists.', $duplicates[0]['name']));
+		}
+	}
+
+	/**
+	 * Update "script_param" table and populate script.parameters by "script_paramid" property.
+	 *
+	 * @static
+	 *
+	 * @param array      $scripts
+	 * @param string     $method
+	 * @param array|null $db_scripts
+	 */
+	private static function updateParams(array &$scripts, string $method, array $db_scripts = null): void {
+		$ins_params = [];
+		$upd_params = [];
+		$del_paramids = [];
+
+		foreach ($scripts as &$script) {
+			if (!array_key_exists('parameters', $script)) {
+				continue;
+			}
+
+			$db_params = ($method === 'update')
+				? array_column($db_scripts[$script['scriptid']]['parameters'], null, 'name')
+				: [];
+
+			foreach ($script['parameters'] as &$param) {
+				if (array_key_exists($param['name'], $db_params)) {
+					$db_param = $db_params[$param['name']];
+					$param['script_paramid'] = $db_param['script_paramid'];
+					unset($db_params[$param['name']]);
+
+					$upd_param = DB::getUpdatedValues('script_param', $param, $db_param);
+
+					if ($upd_param) {
+						$upd_params[] = [
+							'values' => $upd_param,
+							'where' => ['script_paramid' => $db_param['script_paramid']]
+						];
+					}
+				}
+				else {
+					$ins_params[] = ['scriptid' => $script['scriptid']] + $param;
+				}
+			}
+			unset($param);
+
+			$del_paramids = array_merge($del_paramids, array_column($db_params, 'script_paramid'));
+		}
+		unset($script);
+
+		if ($ins_params) {
+			$script_paramids = DB::insertBatch('script_param', $ins_params);
+		}
+
+		if ($upd_params) {
+			DB::update('script_param', $upd_params);
+		}
+
+		if ($del_paramids) {
+			DB::delete('script_param', ['script_paramid' => $del_paramids]);
+		}
+
+		foreach ($scripts as &$script) {
+			if (!array_key_exists('parameters', $script)) {
+				continue;
+			}
+
+			foreach ($script['parameters'] as &$param) {
+				if (!array_key_exists('script_paramid', $param)) {
+					$param['script_paramid'] = array_shift($script_paramids);
+				}
+			}
+			unset($param);
+		}
+		unset($script);
+	}
+
+	/**
+	 * Add the existing parameters to $db_scripts whether these are affected by the update.
+	 *
+	 * @static
+	 *
+	 * @param array $scripts
+	 * @param array $db_scripts
+	 */
+	private static function addAffectedObjects(array $scripts, array &$db_scripts): void {
+		$scriptids = [];
+
+		foreach ($scripts as $script) {
+			$scriptids[] = $script['scriptid'];
+			$db_scripts[$script['scriptid']]['parameters'] = [];
+		}
+
+		if (!$scriptids) {
+			return;
+		}
+
+		$options = [
+			'output' => ['script_paramid', 'scriptid', 'name', 'value'],
+			'filter' => ['scriptid' => $scriptids]
+		];
+		$db_parameters = DBselect(DB::makeSql('script_param', $options));
+
+		while ($db_parameter = DBfetch($db_parameters)) {
+			$db_scripts[$db_parameter['scriptid']]['parameters'][$db_parameter['script_paramid']] =
+				array_diff_key($db_parameter, array_flip(['scriptid']));
+		}
+	}
 }
diff --git a/ui/include/classes/api/services/CService.php b/ui/include/classes/api/services/CService.php
index 215a43c2928..e6fd1a493f0 100644
--- a/ui/include/classes/api/services/CService.php
+++ b/ui/include/classes/api/services/CService.php
@@ -60,6 +60,7 @@ class CService extends CApiService {
 			// filter
 			'serviceids' =>				['type' => API_IDS, 'flags' => API_ALLOW_NULL | API_NORMALIZE, 'default' => null],
 			'parentids' =>				['type' => API_IDS, 'flags' => API_ALLOW_NULL | API_NORMALIZE, 'default' => null],
+			'deep_parentids' =>			['type' => API_BOOLEAN, 'default' => false],
 			'childids' =>				['type' => API_IDS, 'flags' => API_ALLOW_NULL | API_NORMALIZE, 'default' => null],
 			'evaltype' =>				['type' => API_INT32, 'in' => implode(',', [TAG_EVAL_TYPE_AND_OR, TAG_EVAL_TYPE_OR]), 'default' => TAG_EVAL_TYPE_AND_OR],
 			'tags' =>					['type' => API_OBJECTS, 'default' => [], 'fields' => [
@@ -84,16 +85,17 @@ class CService extends CApiService {
 				'name' =>					['type' => API_STRINGS_UTF8, 'flags' => API_ALLOW_NULL | API_NORMALIZE]
 			]],
 			'searchByAny' =>			['type' => API_BOOLEAN, 'default' => false],
-			'startSearch' =>			['type' => API_BOOLEAN, 'default' => false],
-			'excludeSearch' =>			['type' => API_BOOLEAN, 'default' => false],
+			'startSearch' =>			['type' => API_FLAG, 'default' => false],
+			'excludeSearch' =>			['type' => API_FLAG, 'default' => false],
 			'searchWildcardsEnabled' =>	['type' => API_BOOLEAN, 'default' => false],
 			// output
 			'output' =>					['type' => API_OUTPUT, 'in' => implode(',', ['serviceid', 'name', 'status', 'algorithm', 'showsla', 'goodsla', 'sortorder', 'weight', 'propagation_rule', 'propagation_value', 'readonly']), 'default' => API_OUTPUT_EXTEND],
-			'countOutput' =>			['type' => API_BOOLEAN, 'default' => false],
+			'countOutput' =>			['type' => API_FLAG, 'default' => false],
 			'selectParents' =>			['type' => API_OUTPUT, 'flags' => API_ALLOW_NULL | API_ALLOW_COUNT, 'in' => implode(',', ['serviceid', 'name', 'status', 'algorithm', 'showsla', 'goodsla', 'sortorder', 'weight', 'propagation_rule', 'propagation_value', 'readonly']), 'default' => null],
 			'selectChildren' =>			['type' => API_OUTPUT, 'flags' => API_ALLOW_NULL | API_ALLOW_COUNT, 'in' => implode(',', ['serviceid', 'name', 'status', 'algorithm', 'showsla', 'goodsla', 'sortorder', 'weight', 'propagation_rule', 'propagation_value', 'readonly']), 'default' => null],
 			'selectTags' =>				['type' => API_OUTPUT, 'flags' => API_ALLOW_NULL | API_ALLOW_COUNT, 'in' => implode(',', ['tag', 'value']), 'default' => null],
 			'selectProblemTags' =>		['type' => API_OUTPUT, 'flags' => API_ALLOW_NULL | API_ALLOW_COUNT, 'in' => implode(',', ['tag', 'operator', 'value']), 'default' => null],
+			'selectProblemEvents' =>	['type' => API_OUTPUT, 'flags' => API_ALLOW_NULL | API_ALLOW_COUNT, 'in' => implode(',', ['eventid', 'severity', 'name']), 'default' => null],
 			'selectTimes' =>			['type' => API_OUTPUT, 'flags' => API_ALLOW_NULL | API_ALLOW_COUNT, 'in' => implode(',', ['type', 'ts_from', 'ts_to', 'note']), 'default' => null],
 			'selectStatusRules' =>		['type' => API_OUTPUT, 'flags' => API_ALLOW_NULL | API_ALLOW_COUNT, 'in' => implode(',', ['type', 'limit_value', 'limit_status', 'new_status']), 'default' => null],
 			'selectAlarms' =>			['type' => API_OUTPUT, 'flags' => API_ALLOW_NULL | API_ALLOW_COUNT, 'in' => implode(',', ['clock', 'value']), 'default' => null],
@@ -123,10 +125,25 @@ class CService extends CApiService {
 			$accessible_services = $permissions['r_services'] + $permissions['rw_services'];
 		}
 
-		if ($accessible_services !== null) {
-			$options['serviceids'] = array_key_exists('serviceids', $options) && $options['serviceids'] !== null
-				? array_keys(array_intersect_key($accessible_services, array_flip($options['serviceids'])))
-				: array_keys($accessible_services);
+		if ($options['parentids'] !== null && $accessible_services !== null) {
+			$options['parentids'] = array_intersect($options['parentids'],
+				array_keys([0 => true] + $accessible_services)
+			);
+		}
+
+		if ($options['parentids'] !== null && $options['deep_parentids']) {
+			$limit_services = self::getServicesByDeepParents($options['parentids']);
+
+			if ($accessible_services !== null) {
+				$limit_services = $limit_services !== null
+					? array_intersect_key($limit_services, $accessible_services)
+					: $accessible_services;
+			}
+
+			$options['parentids'] = null;
+		}
+		else {
+			$limit_services = $accessible_services;
 		}
 
 		$options['root_services'] = $permissions !== null ? $permissions['root_services'] : null;
@@ -134,13 +151,17 @@ class CService extends CApiService {
 		$db_services = [];
 
 		$sql = $this->createSelectQuery('services', $options);
-		$resource = DBselect($sql, $options['limit']);
+		$resource = DBselect($sql);
 
-		while ($row = DBfetch($resource)) {
+		while (($options['limit'] === null || count($db_services) < $options['limit']) && $row = DBfetch($resource)) {
 			if ($options['countOutput']) {
 				return $row['rowscount'];
 			}
 
+			if ($limit_services !== null && !array_key_exists($row['serviceid'], $limit_services)) {
+				continue;
+			}
+
 			if ($this->outputIsRequested('readonly', $options['output'])) {
 				$row['readonly'] = $permissions !== null && $permissions['rw_services'] !== null
 					&& !array_key_exists($row['serviceid'], $permissions['rw_services']);
@@ -486,6 +507,47 @@ class CService extends CApiService {
 	}
 
 	/**
+	 * @static
+	 *
+	 * @param array $parentids
+	 *
+	 * @return array|null
+	 */
+	private static function getServicesByDeepParents(array $parentids): ?array {
+		if (in_array(0, $parentids)) {
+			return null;
+		}
+
+		$parents = array_fill_keys($parentids, true);
+
+		$_options = [
+			'output' => ['serviceupid', 'servicedownid']
+		];
+		$db_links = DBselect(DB::makeSql('services_links', $_options));
+
+		$relations = [];
+
+		while ($db_link = DBfetch($db_links)) {
+			$relations[$db_link['serviceupid']][$db_link['servicedownid']] = true;
+		}
+
+		$limit_services = [];
+
+		while ($parents) {
+			$next_parents = [];
+
+			foreach (array_intersect_key($relations, $parents) as $children) {
+				$next_parents += $children;
+			}
+
+			$parents = $next_parents;
+			$limit_services += $next_parents;
+		}
+
+		return $limit_services;
+	}
+
+	/**
 	 * @param string $table_name
 	 * @param string $table_alias
 	 * @param array  $options
@@ -574,195 +636,642 @@ class CService extends CApiService {
 	protected function addRelatedObjects(array $options, array $result, array $permissions = null): array {
 		$result = parent::addRelatedObjects($options, $result);
 
-		$serviceids = array_keys($result);
+		$this->addRelatedParents($options, $result, $permissions);
+		$this->addRelatedChildren($options, $result, $permissions);
+		$this->addRelatedTags($options, $result);
+		$this->addRelatedProblemTags($options, $result);
+		$this->addRelatedProblemEvents($options, $result);
+		$this->addRelatedTimes($options, $result);
+		$this->addRelatedStatusRules($options, $result);
+		$this->addRelatedAlarms($options, $result);
 
-		if ($options['selectParents'] !== null) {
-			$relation_map = $this->createRelationMap($result, 'servicedownid', 'serviceupid', 'services_links');
+		return $result;
+	}
 
-			$parents = $this->doGet([
-				'output' => ($options['selectParents'] === API_OUTPUT_COUNT) ? [] : $options['selectParents'],
-				'serviceids' => $relation_map->getRelatedIds(),
-				'sortfield' => $options['sortfield'],
-				'sortorder' => $options['sortorder'],
-				'preservekeys' => true
-			], $permissions);
+	/**
+	 * @param array      $options
+	 * @param array      $result
+	 * @param array|null $permissions
+	 *
+	 * @throws APIException
+	 */
+	private function addRelatedParents(array $options, array &$result, ?array $permissions): void {
+		if ($options['selectParents'] === null) {
+			return;
+		}
 
-			$result = $relation_map->mapMany($result, $parents, 'parents');
+		/*
+		 * Performance optimized:
+		 * - Not filtering the output by the related service IDs.
+		 */
+		$parents = $this->doGet([
+			'output' => ($options['selectParents'] === API_OUTPUT_COUNT) ? [] : $options['selectParents'],
+			'sortfield' => $options['sortfield'],
+			'sortorder' => $options['sortorder'],
+			'preservekeys' => true
+		], $permissions);
 
-			if ($options['selectParents'] === API_OUTPUT_COUNT) {
-				foreach ($result as &$row) {
-					$row['parents'] = (string) count($row['parents']);
-				}
-				unset($row);
+		$relation_map = $this->createRelationMap($result, 'servicedownid', 'serviceupid', 'services_links');
+
+		$result = $relation_map->mapMany($result, $parents, 'parents');
+
+		if ($options['selectParents'] === API_OUTPUT_COUNT) {
+			foreach ($result as &$row) {
+				$row['parents'] = (string) count($row['parents']);
 			}
+			unset($row);
 		}
+	}
 
-		if ($options['selectChildren'] !== null) {
-			$relation_map = $this->createRelationMap($result, 'serviceupid', 'servicedownid', 'services_links');
+	/**
+	 * @param array      $options
+	 * @param array      $result
+	 * @param array|null $permissions
+	 *
+	 * @throws APIException
+	 */
+	private function addRelatedChildren(array $options, array &$result, ?array $permissions): void {
+		if ($options['selectChildren'] === null) {
+			return;
+		}
 
-			$children = $this->doGet([
-				'output' => ($options['selectChildren'] === API_OUTPUT_COUNT) ? [] : $options['selectChildren'],
-				'serviceids' => $relation_map->getRelatedIds(),
-				'sortfield' => $options['sortfield'],
-				'sortorder' => $options['sortorder'],
-				'preservekeys' => true
-			], $permissions);
+		/*
+		 * Performance optimized:
+		 * - Not filtering the output by the related service IDs.
+		 */
+		$children = $this->doGet([
+			'output' => ($options['selectChildren'] === API_OUTPUT_COUNT) ? [] : $options['selectChildren'],
+			'sortfield' => $options['sortfield'],
+			'sortorder' => $options['sortorder'],
+			'preservekeys' => true
+		], $permissions);
 
-			$result = $relation_map->mapMany($result, $children, 'children');
+		$relation_map = $this->createRelationMap($result, 'serviceupid', 'servicedownid', 'services_links');
 
-			if ($options['selectChildren'] === API_OUTPUT_COUNT) {
-				foreach ($result as &$row) {
-					$row['children'] = (string) count($row['children']);
-				}
-				unset($row);
+		$result = $relation_map->mapMany($result, $children, 'children');
+
+		if ($options['selectChildren'] === API_OUTPUT_COUNT) {
+			foreach ($result as &$row) {
+				$row['children'] = (string) count($row['children']);
 			}
+			unset($row);
 		}
+	}
 
-		if ($options['selectTags'] !== null) {
-			if ($options['selectTags'] === API_OUTPUT_COUNT) {
-				$output = ['servicetagid', 'serviceid'];
-			}
-			elseif ($options['selectTags'] === API_OUTPUT_EXTEND) {
-				$output = ['servicetagid', 'serviceid', 'tag', 'value'];
+	/**
+	 * @param array $options
+	 * @param array $result
+	 */
+	private function addRelatedTags(array $options, array &$result): void {
+		if ($options['selectTags'] === null) {
+			return;
+		}
+
+		if ($options['selectTags'] === API_OUTPUT_COUNT) {
+			$output = ['servicetagid', 'serviceid'];
+		}
+		elseif ($options['selectTags'] === API_OUTPUT_EXTEND) {
+			$output = ['servicetagid', 'serviceid', 'tag', 'value'];
+		}
+		else {
+			$output = array_unique(array_merge(['servicetagid', 'serviceid'], $options['selectTags']));
+		}
+
+		$tags = DB::select('service_tag', [
+			'output' => $output,
+			'filter' => ['serviceid' => array_keys($result)],
+			'preservekeys' => true
+		]);
+		$relation_map = $this->createRelationMap($tags, 'serviceid', 'servicetagid');
+		$tags = $this->unsetExtraFields($tags, ['servicetagid', 'serviceid']);
+		$result = $relation_map->mapMany($result, $tags, 'tags');
+
+		if ($options['selectTags'] === API_OUTPUT_COUNT) {
+			foreach ($result as &$row) {
+				$row['tags'] = (string)count($row['tags']);
 			}
-			else {
-				$output = array_unique(array_merge(['servicetagid', 'serviceid'], $options['selectTags']));
+			unset($row);
+		}
+	}
+
+	/**
+	 * @param array $options
+	 * @param array $result
+	 */
+	private function addRelatedProblemTags(array $options, array &$result): void {
+		if ($options['selectProblemTags'] === null) {
+			return;
+		}
+
+		if ($options['selectProblemTags'] === API_OUTPUT_COUNT) {
+			$output = ['service_problem_tagid', 'serviceid'];
+		}
+		elseif ($options['selectProblemTags'] === API_OUTPUT_EXTEND) {
+			$output = ['service_problem_tagid', 'serviceid', 'tag', 'operator', 'value'];
+		}
+		else {
+			$output = array_unique(array_merge(['service_problem_tagid', 'serviceid'], $options['selectProblemTags']));
+		}
+
+		$problem_tags = DB::select('service_problem_tag', [
+			'output' => $output,
+			'filter' => ['serviceid' => array_keys($result)],
+			'preservekeys' => true
+		]);
+		$relation_map = $this->createRelationMap($problem_tags, 'serviceid', 'service_problem_tagid');
+		$problem_tags = $this->unsetExtraFields($problem_tags, ['service_problem_tagid', 'serviceid']);
+		$result = $relation_map->mapMany($result, $problem_tags, 'problem_tags');
+
+		if ($options['selectProblemTags'] === API_OUTPUT_COUNT) {
+			foreach ($result as &$row) {
+				$row['problem_tags'] = (string) count($row['problem_tags']);
 			}
+			unset($row);
+		}
+	}
 
-			$tags = DB::select('service_tag', [
-				'output' => $output,
-				'filter' => ['serviceid' => $serviceids],
-				'preservekeys' => true
-			]);
-			$relation_map = $this->createRelationMap($tags, 'serviceid', 'servicetagid');
-			$tags = $this->unsetExtraFields($tags, ['servicetagid', 'serviceid']);
-			$result = $relation_map->mapMany($result, $tags, 'tags');
+	/**
+	 * @param array $options
+	 * @param array $result
+	 *
+	 * @throws APIException
+	 */
+	private function addRelatedProblemEvents(array $options, array &$result): void {
+		if ($options['selectProblemEvents'] === null) {
+			return;
+		}
+
+		$_options = [
+			'output' => ['serviceupid', 'servicedownid']
+		];
+		$db_links = DBselect(DB::makeSql('services_links', $_options));
+
+		$relations = [];
 
-			if ($options['selectTags'] === API_OUTPUT_COUNT) {
-				foreach ($result as &$row) {
-					$row['tags'] = (string) count($row['tags']);
+		while ($db_link = DBfetch($db_links)) {
+			$relations[$db_link['serviceupid']][$db_link['servicedownid']] = true;
+		}
+
+		$services_without_children = [];
+
+		$parents = $result;
+
+		while ($parents) {
+			$next_parents = [];
+
+			foreach (array_keys($parents) as $serviceid) {
+				if (array_key_exists($serviceid, $relations)) {
+					$next_parents += $relations[$serviceid];
+				}
+				else {
+					$services_without_children[$serviceid] = true;
 				}
-				unset($row);
 			}
+
+			$parents = $next_parents;
 		}
 
-		if ($options['selectProblemTags'] !== null) {
-			if ($options['selectProblemTags'] === API_OUTPUT_COUNT) {
-				$output = ['service_problem_tagid', 'serviceid'];
-			}
-			elseif ($options['selectProblemTags'] === API_OUTPUT_EXTEND) {
-				$output = ['service_problem_tagid', 'serviceid', 'tag', 'operator', 'value'];
-			}
-			else {
-				$output = array_unique(array_merge(['service_problem_tagid', 'serviceid'],
-					$options['selectProblemTags']
-				));
-			}
+		/*
+		 * Performance optimized:
+		 * - Not filtering the output by the related service IDs.
+		 */
+		$services = $this->doGet([
+			'output' => ['status', 'algorithm', 'weight', 'propagation_rule', 'propagation_value'],
+			'selectStatusRules' => ['type', 'limit_value', 'limit_status', 'new_status'],
+			'preservekeys' => true
+		]);
+
+		if ($options['selectProblemEvents'] === API_OUTPUT_COUNT) {
+			$output = ['serviceid'];
+		}
+		elseif ($options['selectProblemEvents'] === API_OUTPUT_EXTEND) {
+			$output = ['serviceid', 'eventid', 'severity', 'name'];
+		}
+		else {
+			$output = array_unique(array_merge(['serviceid', 'eventid'], $options['selectProblemEvents']));
+		}
+
+		$do_output_name = in_array('name', $output);
+
+		if ($do_output_name) {
+			$output = array_diff($output, ['name']);
+		}
+
+		$_options = [
+			'output' => $output
+		];
+		$db_service_problems = DBselect(DB::makeSql('service_problem', $_options));
+
+		$service_problems = array_fill_keys(array_keys($services_without_children), []);
+
+		while ($db_service_problem = DBfetch($db_service_problems)) {
+			$service_problems[$db_service_problem['serviceid']][] = $db_service_problem;
+		}
+
+		$problem_events = [];
+		$problem_events_ungrouped = [];
+
+		foreach (array_keys($result) as $serviceid) {
+			$problem_events[$serviceid] = $services[$serviceid]['status'] != ZBX_SEVERITY_OK
+				? self::getProblemEvents((string) $serviceid, $services, $relations, $service_problems)
+				: [];
 
-			$problem_tags = DB::select('service_problem_tag', [
-				'output' => $output,
-				'filter' => ['serviceid' => $serviceids],
+			$problem_events_ungrouped += $problem_events[$serviceid];
+		}
+
+		if ($do_output_name && $problem_events_ungrouped) {
+			$events = API::Event()->get([
+				'output' => ['name'],
+				'eventids' => array_keys($problem_events_ungrouped),
+				'source' => EVENT_SOURCE_TRIGGERS,
+				'object' => EVENT_OBJECT_TRIGGER,
+				'value' => TRIGGER_VALUE_TRUE,
+				'nopermissions' => true,
 				'preservekeys' => true
 			]);
-			$relation_map = $this->createRelationMap($problem_tags, 'serviceid', 'service_problem_tagid');
-			$problem_tags = $this->unsetExtraFields($problem_tags, ['service_problem_tagid', 'serviceid']);
-			$result = $relation_map->mapMany($result, $problem_tags, 'problem_tags');
 
-			if ($options['selectProblemTags'] === API_OUTPUT_COUNT) {
-				foreach ($result as &$row) {
-					$row['problem_tags'] = (string) count($row['problem_tags']);
-				}
-				unset($row);
+			if (count($events) != count($problem_events_ungrouped)) {
+				self::exception(ZBX_API_ERROR_PERMISSIONS,
+					_('No permissions to referred object or it does not exist!')
+				);
 			}
 		}
 
-		if ($options['selectTimes'] !== null) {
-			if ($options['selectTimes'] === API_OUTPUT_COUNT) {
-				$output = ['timeid', 'serviceid'];
-			}
-			elseif ($options['selectTimes'] === API_OUTPUT_EXTEND) {
-				$output = ['timeid', 'serviceid', 'type', 'ts_from', 'ts_to', 'note'];
+		foreach ($result as $serviceid => &$service) {
+			if ($options['selectProblemEvents'] === API_OUTPUT_COUNT) {
+				$service['problem_events'] = count($problem_events[$serviceid]);
 			}
 			else {
-				$output = array_unique(array_merge(['timeid', 'serviceid'], $options['selectTimes']));
+				$service_problem_events = $problem_events[$serviceid];
+				$service_problem_events = $this->unsetExtraFields($service_problem_events, ['serviceid']);
+				$service_problem_events = $this->unsetExtraFields($service_problem_events, ['eventid'],
+					$options['selectProblemEvents']
+				);
+
+				if ($do_output_name) {
+					foreach ($service_problem_events as $eventid => &$problem_event) {
+						$problem_event['name'] = $events[$eventid]['name'];
+					}
+					unset($problem_event);
+				}
+
+				$service['problem_events'] = array_values($service_problem_events);
 			}
+		}
+		unset($service);
+	}
 
-			$times = DB::select('services_times', [
-				'output' => $output,
-				'filter' => ['serviceid' => $serviceids],
-				'preservekeys' => true
-			]);
-			$relation_map = $this->createRelationMap($times, 'serviceid', 'timeid');
-			$times = $this->unsetExtraFields($times, ['timeid', 'serviceid']);
-			$result = $relation_map->mapMany($result, $times, 'times');
+	/**
+	 * @param array $options
+	 * @param array $result
+	 */
+	private function addRelatedTimes(array $options, array &$result): void {
+		if ($options['selectTimes'] === null) {
+			return;
+		}
 
-			if ($options['selectTimes'] === API_OUTPUT_COUNT) {
-				foreach ($result as &$row) {
-					$row['times'] = (string) count($row['times']);
-				}
-				unset($row);
+		if ($options['selectTimes'] === API_OUTPUT_COUNT) {
+			$output = ['timeid', 'serviceid'];
+		}
+		elseif ($options['selectTimes'] === API_OUTPUT_EXTEND) {
+			$output = ['timeid', 'serviceid', 'type', 'ts_from', 'ts_to', 'note'];
+		}
+		else {
+			$output = array_unique(array_merge(['timeid', 'serviceid'], $options['selectTimes']));
+		}
+
+		$times = DB::select('services_times', [
+			'output' => $output,
+			'filter' => ['serviceid' => array_keys($result)],
+			'preservekeys' => true
+		]);
+		$relation_map = $this->createRelationMap($times, 'serviceid', 'timeid');
+		$times = $this->unsetExtraFields($times, ['timeid', 'serviceid']);
+		$result = $relation_map->mapMany($result, $times, 'times');
+
+		if ($options['selectTimes'] === API_OUTPUT_COUNT) {
+			foreach ($result as &$row) {
+				$row['times'] = (string) count($row['times']);
 			}
+			unset($row);
+		}
+	}
+
+	private function addRelatedStatusRules(array $options, array &$result): void {
+		if ($options['selectStatusRules'] === null) {
+			return;
+		}
+
+		if ($options['selectStatusRules'] === API_OUTPUT_COUNT) {
+			$output = ['service_status_ruleid', 'serviceid'];
+		}
+		elseif ($options['selectStatusRules'] === API_OUTPUT_EXTEND) {
+			$output = ['service_status_ruleid', 'serviceid', 'type', 'limit_value', 'limit_status', 'new_status'];
+		}
+		else {
+			$output = array_unique(array_merge(['service_status_ruleid', 'serviceid'], $options['selectStatusRules']));
 		}
 
-		if ($options['selectStatusRules'] !== null) {
-			if ($options['selectStatusRules'] === API_OUTPUT_COUNT) {
-				$output = ['service_status_ruleid', 'serviceid'];
+		$status_rules = DB::select('service_status_rule', [
+			'output' => $output,
+			'filter' => ['serviceid' => array_keys($result)],
+			'preservekeys' => true
+		]);
+		$relation_map = $this->createRelationMap($status_rules, 'serviceid', 'service_status_ruleid');
+		$status_rules = $this->unsetExtraFields($status_rules, ['service_status_ruleid', 'serviceid']);
+		$result = $relation_map->mapMany($result, $status_rules, 'status_rules');
+
+		if ($options['selectStatusRules'] === API_OUTPUT_COUNT) {
+			foreach ($result as &$row) {
+				$row['status_rules'] = (string) count($row['status_rules']);
 			}
-			elseif ($options['selectStatusRules'] === API_OUTPUT_EXTEND) {
-				$output = ['service_status_ruleid', 'serviceid', 'type', 'limit_value', 'limit_status', 'new_status'];
+			unset($row);
+		}
+	}
+
+	/**
+	 * @param array $options
+	 * @param array $result
+	 */
+	private function addRelatedAlarms(array $options, array &$result): void {
+		if ($options['selectAlarms'] === null) {
+			return;
+		}
+
+		if ($options['selectAlarms'] === API_OUTPUT_COUNT) {
+			$output = ['servicealarmid', 'serviceid'];
+		}
+		elseif ($options['selectAlarms'] === API_OUTPUT_EXTEND) {
+			$output = ['servicealarmid', 'serviceid', 'clock', 'value'];
+		}
+		else {
+			$output = array_unique(array_merge(['servicealarmid', 'serviceid'], $options['selectAlarms']));
+		}
+
+		$alarms = DB::select('service_alarms', [
+			'output' => $output,
+			'filter' => ['serviceid' => array_keys($result)],
+			'preservekeys' => true
+		]);
+		$relation_map = $this->createRelationMap($alarms, 'serviceid', 'servicealarmid');
+		$alarms = $this->unsetExtraFields($alarms, ['servicealarmid', 'serviceid']);
+		$result = $relation_map->mapMany($result, $alarms, 'alarms');
+
+		if ($options['selectAlarms'] === API_OUTPUT_COUNT) {
+			foreach ($result as &$row) {
+				$row['alarms'] = (string) count($row['alarms']);
+			}
+			unset($row);
+		}
+	}
+
+	/**
+	 * @static
+	 *
+	 * @param string   $parent_serviceid
+	 * @param array    $services
+	 * @param array    $relations
+	 * @param array    $service_problems
+	 * @param int|null $min_status
+	 *
+	 * @return array
+	 */
+	private static function getProblemEvents(string $parent_serviceid, array $services, array $relations,
+			array $service_problems, int $min_status = null): array {
+		$parent = $services[$parent_serviceid];
+
+		if (!array_key_exists($parent_serviceid, $relations)) {
+			if ($min_status !== null) {
+				$problem_events = array_filter($service_problems[$parent_serviceid],
+					static function (array $problem) use ($min_status): bool {
+						return $problem['severity'] >= $min_status;
+					}
+				);
 			}
 			else {
-				$output = array_unique(array_merge(['service_status_ruleid', 'serviceid'],
-					$options['selectStatusRules']
-				));
+				$problem_events = $service_problems[$parent_serviceid];
 			}
 
-			$status_rules = DB::select('service_status_rule', [
-				'output' => $output,
-				'filter' => ['serviceid' => $serviceids],
-				'preservekeys' => true
-			]);
-			$relation_map = $this->createRelationMap($status_rules, 'serviceid', 'service_status_ruleid');
-			$status_rules = $this->unsetExtraFields($status_rules, ['service_status_ruleid', 'serviceid']);
-			$result = $relation_map->mapMany($result, $status_rules, 'status_rules');
-
-			if ($options['selectStatusRules'] === API_OUTPUT_COUNT) {
-				foreach ($result as &$row) {
-					$row['status_rules'] = (string) count($row['status_rules']);
-				}
-				unset($row);
-			}
+			return array_column($problem_events, null, 'eventid');
 		}
 
-		if ($options['selectAlarms'] !== null) {
-			if ($options['selectAlarms'] === API_OUTPUT_COUNT) {
-				$output = ['servicealarmid', 'serviceid'];
+		$children = array_filter(array_intersect_key($services, $relations[$parent_serviceid]),
+			static function (array $service): bool {
+				return $service['propagation_rule'] != ZBX_SERVICE_STATUS_PROPAGATION_IGNORE;
 			}
-			elseif ($options['selectAlarms'] === API_OUTPUT_EXTEND) {
-				$output = ['servicealarmid', 'serviceid', 'clock', 'value'];
+		);
+
+		$children_upstream_status = [];
+
+		foreach ($children as $child_serviceid => $child) {
+			if ($child['status'] == ZBX_SEVERITY_OK) {
+				$status = ZBX_SEVERITY_OK;
 			}
 			else {
-				$output = array_unique(array_merge(['servicealarmid', 'serviceid'], $options['selectAlarms']));
+				switch ($child['propagation_rule']) {
+					case ZBX_SERVICE_STATUS_PROPAGATION_INCREASE:
+						$status = min(TRIGGER_SEVERITY_COUNT - 1, $child['status'] + $child['propagation_value']);
+						break;
+
+					case ZBX_SERVICE_STATUS_PROPAGATION_DECREASE:
+						$status = max(TRIGGER_SEVERITY_NOT_CLASSIFIED, $child['status'] - $child['propagation_value']);
+						break;
+
+					case ZBX_SERVICE_STATUS_PROPAGATION_FIXED:
+						$status = $child['propagation_value'];
+						break;
+
+					default:
+						$status = $child['status'];
+						break;
+				}
 			}
 
-			$alarms = DB::select('service_alarms', [
-				'output' => $output,
-				'filter' => ['serviceid' => $serviceids],
-				'preservekeys' => true
-			]);
-			$relation_map = $this->createRelationMap($alarms, 'serviceid', 'servicealarmid');
-			$alarms = $this->unsetExtraFields($alarms, ['servicealarmid', 'serviceid']);
-			$result = $relation_map->mapMany($result, $alarms, 'alarms');
+			$children_upstream_status[$child_serviceid] = $status;
+		}
+
+		$not_ok_children = array_intersect_key($children, array_filter($children_upstream_status,
+			static function (int $status): bool {
+				return $status != ZBX_SEVERITY_OK;
+			}
+		));
+
+		switch ($parent['algorithm']) {
+			case ZBX_SERVICE_STATUS_CALC_MOST_CRITICAL_ALL:
+				if (count($not_ok_children) == count($children)) {
+					$evaluate_children = array_fill_keys(array_keys($not_ok_children), null);
+					$evaluate_additional_rules = false;
+				}
+				else {
+					$evaluate_children = [];
+					$evaluate_additional_rules = true;
+				}
+
+				break;
+
+			case ZBX_SERVICE_STATUS_CALC_MOST_CRITICAL_ONE:
+				if ($min_status !== null) {
+					$evaluate_children = [];
+
+					foreach ($not_ok_children as $child_serviceid => $child) {
+						if ($child['status'] < $min_status) {
+							continue;
+						}
+
+						switch ($child['propagation_rule']) {
+							case ZBX_SERVICE_STATUS_PROPAGATION_INCREASE:
+								$reverse_min_status = max(TRIGGER_SEVERITY_NOT_CLASSIFIED,
+									$min_status - $child['propagation_value']
+								);
+								break;
+
+							case ZBX_SERVICE_STATUS_PROPAGATION_DECREASE:
+								$reverse_min_status = min(TRIGGER_SEVERITY_COUNT - 1,
+									$min_status + $child['propagation_value']
+								);
+								break;
+
+							case ZBX_SERVICE_STATUS_PROPAGATION_FIXED:
+								$reverse_min_status = null;
+								break;
+
+							default:
+								$reverse_min_status = $min_status;
+								break;
+						}
+
+						$evaluate_children[$child_serviceid] = $reverse_min_status;
+					}
+
+					$evaluate_additional_rules = true;
+				}
+				else {
+					$evaluate_children = array_fill_keys(array_keys($not_ok_children), null);
+					$evaluate_additional_rules = false;
+				}
+
+				break;
+
+			default:
+				$evaluate_children = [];
+				$evaluate_additional_rules = true;
+		}
+
+		if ($evaluate_additional_rules) {
+			foreach ($parent['status_rules'] as $status_rule) {
+				if ($min_status !== null && $status_rule['new_status'] < $min_status) {
+					continue;
+				}
 
-			if ($options['selectAlarms'] === API_OUTPUT_COUNT) {
-				foreach ($result as &$row) {
-					$row['alarms'] = (string) count($row['alarms']);
+				$is_less_than = in_array($status_rule['type'], [
+					ZBX_SERVICE_STATUS_RULE_TYPE_N_L,
+					ZBX_SERVICE_STATUS_RULE_TYPE_NP_L,
+					ZBX_SERVICE_STATUS_RULE_TYPE_W_L,
+					ZBX_SERVICE_STATUS_RULE_TYPE_WP_L
+				]);
+
+				$is_weight = in_array($status_rule['type'], [
+					ZBX_SERVICE_STATUS_RULE_TYPE_W_GE,
+					ZBX_SERVICE_STATUS_RULE_TYPE_WP_GE,
+					ZBX_SERVICE_STATUS_RULE_TYPE_W_L,
+					ZBX_SERVICE_STATUS_RULE_TYPE_WP_L
+				]);
+
+				$is_percentage = in_array($status_rule['type'], [
+					ZBX_SERVICE_STATUS_RULE_TYPE_NP_GE,
+					ZBX_SERVICE_STATUS_RULE_TYPE_NP_L,
+					ZBX_SERVICE_STATUS_RULE_TYPE_WP_GE,
+					ZBX_SERVICE_STATUS_RULE_TYPE_WP_L
+				]);
+
+				$rule_children = [];
+
+				foreach ($children as $child_serviceid => $child) {
+					$status_matched = $is_less_than
+						? $children_upstream_status[$child_serviceid] > $status_rule['limit_status']
+						: $children_upstream_status[$child_serviceid] >= $status_rule['limit_status'];
+
+					$weight_matched = !$is_weight || $child['weight'] > 0;
+
+					if ($status_matched && $weight_matched) {
+						$rule_children[$child_serviceid] = $child;
+					}
+				}
+
+				if ($is_weight) {
+					$value = 0;
+
+					foreach ($rule_children as $child) {
+						$value += $child['weight'];
+					}
+
+					$value_total = 0;
+
+					foreach ($children as $child) {
+						$value_total += $child['weight'];
+					}
+				}
+				else {
+					$value = count($rule_children);
+					$value_total = count($children);
+				}
+
+				$limit_value = $is_percentage
+					? $status_rule['limit_value'] * $value_total / 100
+					: $status_rule['limit_value'];
+
+				$rule_qualifies = $is_less_than ? $value_total - $value < $limit_value : $value >= $limit_value;
+
+				if ($rule_qualifies) {
+					$rule_min_status = $is_less_than ? $status_rule['limit_status'] + 1 : $status_rule['limit_status'];
+
+					foreach ($rule_children as $child_serviceid => $child) {
+						switch ($child['propagation_rule']) {
+							case ZBX_SERVICE_STATUS_PROPAGATION_INCREASE:
+								$reverse_rule_min_status = max(TRIGGER_SEVERITY_NOT_CLASSIFIED,
+									$rule_min_status - $child['propagation_value']
+								);
+								break;
+
+							case ZBX_SERVICE_STATUS_PROPAGATION_DECREASE:
+								$reverse_rule_min_status = min(TRIGGER_SEVERITY_COUNT - 1,
+									$rule_min_status + $child['propagation_value']
+								);
+								break;
+
+							case ZBX_SERVICE_STATUS_PROPAGATION_FIXED:
+								$reverse_rule_min_status = null;
+								break;
+
+							default:
+								$reverse_rule_min_status = $rule_min_status;
+								break;
+						}
+
+						if (array_key_exists($child_serviceid, $evaluate_children)) {
+							if ($evaluate_children[$child_serviceid] !== null) {
+								$evaluate_children[$child_serviceid] = min($evaluate_children[$child_serviceid],
+									$reverse_rule_min_status
+								);
+							}
+						}
+						else {
+							$evaluate_children[$child_serviceid] = $reverse_rule_min_status;
+						}
+					}
 				}
-				unset($row);
 			}
 		}
 
-		return $result;
+		$problem_events = [];
+
+		foreach ($evaluate_children as $child_serviceid => $child_min_status) {
+			$problem_events += self::getProblemEvents((string) $child_serviceid, $services, $relations,
+				$service_problems, (int) $child_min_status
+			);
+		}
+
+		return $problem_events;
 	}
 
 	/**
@@ -1006,6 +1515,15 @@ class CService extends CApiService {
 			}
 		}
 
+		foreach (array_keys(array_intersect_key($add_references, $del_references)) as $parent_serviceid) {
+			$common_references = array_intersect_key($add_references[$parent_serviceid],
+				$del_references[$parent_serviceid]
+			);
+
+			$add_references[$parent_serviceid] = array_diff_key($add_references[$parent_serviceid], $common_references);
+			$del_references[$parent_serviceid] = array_diff_key($del_references[$parent_serviceid], $common_references);
+		}
+
 		if ($this->hasCircularReferences($add_references, $del_references)) {
 			self::exception(ZBX_API_ERROR_PARAMETERS, _('Services form a circular dependency.'));
 		}
@@ -1020,9 +1538,9 @@ class CService extends CApiService {
 	private function hasCircularReferences(array $add_references, array $del_references): bool {
 		$reverse_references = [];
 
-		foreach ($add_references as $child_serviceid => $parents) {
-			foreach (array_keys($parents) as $parent_serviceid) {
-				$reverse_references[$parent_serviceid][$child_serviceid] = true;
+		foreach ($add_references as $parent_serviceid => $children) {
+			foreach (array_keys($children) as $child_serviceid) {
+				$reverse_references[$child_serviceid][$parent_serviceid] = true;
 			}
 		}
 
@@ -1035,29 +1553,29 @@ class CService extends CApiService {
 			$db_parents = [];
 
 			foreach ($db_links as $db_link) {
-				if (!array_key_exists($db_link['servicedownid'], $del_references)
-						|| !array_key_exists($db_link['serviceupid'], $del_references[$db_link['servicedownid']])) {
+				if (!array_key_exists($db_link['serviceupid'], $del_references)
+						|| !array_key_exists($db_link['servicedownid'], $del_references[$db_link['serviceupid']])) {
 					$db_parents[$db_link['servicedownid']][$db_link['serviceupid']] = true;
 				}
 			}
 
 			$next_references = [];
 
-			foreach ($add_references as $child_serviceid => $parents) {
-				foreach (array_keys($parents) as $parent_serviceid) {
+			foreach ($add_references as $parent_serviceid => $children) {
+				foreach (array_keys($children) as $child_serviceid) {
 					if ((string) $child_serviceid === (string) $parent_serviceid) {
 						return true;
 					}
 
-					if (array_key_exists($child_serviceid, $reverse_references)) {
-						foreach (array_keys($reverse_references[$child_serviceid]) as $serviceid) {
-							$next_references[$serviceid][$parent_serviceid] = true;
+					if (array_key_exists($parent_serviceid, $reverse_references)) {
+						foreach (array_keys($reverse_references[$parent_serviceid]) as $serviceid) {
+							$next_references[$serviceid][$child_serviceid] = true;
 						}
 					}
 
-					if (array_key_exists($child_serviceid, $db_parents)) {
-						foreach (array_keys($db_parents[$child_serviceid]) as $serviceid) {
-							$next_references[$serviceid][$parent_serviceid] = true;
+					if (array_key_exists($parent_serviceid, $db_parents)) {
+						foreach (array_keys($db_parents[$parent_serviceid]) as $serviceid) {
+							$next_references[$serviceid][$child_serviceid] = true;
 						}
 					}
 				}
@@ -1539,11 +2057,13 @@ class CService extends CApiService {
 	}
 
 	/**
+	 * @static
+	 *
 	 * @return array
 	 *
 	 * @throws APIException
 	 */
-	private function getPermissions(): array {
+	private static function getPermissions(): array {
 		$role = API::Role()->get([
 			'output' => [],
 			'selectRules' => ['services.read.mode', 'services.read.list', 'services.read.tag', 'services.write.mode',
@@ -1603,13 +2123,14 @@ class CService extends CApiService {
 			$rw_services += array_fill_keys(array_column($tags, 'serviceid'), 0);
 		}
 
-		$relations = [];
-
-		$db_links = DB::select('services_links', [
+		$_options = [
 			'output' => ['serviceupid', 'servicedownid']
-		]);
+		];
+		$db_links = DBselect(DB::makeSql('services_links', $_options));
+
+		$relations = [];
 
-		foreach ($db_links as $db_link) {
+		while ($db_link = DBfetch($db_links)) {
 			$relations[$db_link['serviceupid']][$db_link['servicedownid']] = true;
 		}
 
@@ -1877,16 +2398,12 @@ class CService extends CApiService {
 	 *      - from          - the beginning of the interval, timestamp;
 	 *      - to            - the end of the interval, timestamp.
 	 *
-	 * Returns the following availability information for each service:
-	 *  - status            - the current status of the service;
-	 *  - problems          - an array of triggers that are currently in problem state and belong to the given service
-	 *                        or it's descendants;
-	 *  - sla               - an array of requested intervals with SLA information:
-	 *      - from              - the beginning of the interval;
-	 *      - to                - the end of the interval;
-	 *      - okTime            - the time the service was in OK state, in seconds;
-	 *      - problemTime       - the time the service was in problem state, in seconds;
-	 *      - downtimeTime      - the time the service was down, in seconds.
+	 * Returns an array of requested intervals with SLA information:
+	 *  - from              - the beginning of the interval;
+	 *  - to                - the end of the interval;
+	 *  - okTime            - the time the service was in OK state, in seconds;
+	 *  - problemTime       - the time the service was in problem state, in seconds;
+	 *  - downtimeTime      - the time the service was down, in seconds.
 	 *
 	 * If the service calculation algorithm is set to SERVICE_ALGORITHM_NONE, the method will return an empty 'problems'
 	 * array and null for all of the calculated values.
@@ -1928,11 +2445,7 @@ class CService extends CApiService {
 
 			// initial data
 			foreach ($services as $service) {
-				$rs[$service['serviceid']] = [
-					'status' => $service['algorithm'] != ZBX_SERVICE_STATUS_CALC_SET_OK ? $service['status'] : null,
-					'problems' => [],
-					'sla' => []
-				];
+				$rs[$service['serviceid']] = [];
 			}
 
 			if ($usedSeviceIds) {
@@ -1954,46 +2467,6 @@ class CService extends CApiService {
 					}
 				}
 
-				// add problem events
-				$deep_problem_serviceids = $problemServiceIds;
-				$deep_services = $services;
-
-				while ($problemServiceIds) {
-					$child_services = $this->get([
-						'output' => ['serviceid', 'name', 'status', 'algorithm'],
-						'selectParents' => ['serviceid'],
-						'parentids' => $problemServiceIds,
-						'preservekeys' => true
-					]);
-
-					$child_services = array_filter($child_services,
-						static function (array $service): bool {
-							return $service['algorithm'] != ZBX_SERVICE_STATUS_CALC_SET_OK && $service['status'] > 0;
-						}
-					);
-
-					$deep_services += $child_services;
-
-					$problemServiceIds = array_keys($child_services);
-					$deep_problem_serviceids = array_merge($deep_problem_serviceids, $problemServiceIds);
-				}
-
-				if ($deep_problem_serviceids) {
-					$deep_problem_events = [];
-
-					$query = DBSelect(
-						'SELECT sp.eventid, sp.serviceid, sp.severity'.
-						' FROM service_problem sp'.
-						' WHERE '.dbConditionId('sp.serviceid', $deep_problem_serviceids)
-					);
-
-					while ($row = DBfetch($query)) {
-						$deep_problem_events[$row['serviceid']][$row['eventid']] = ['eventid' => $row['eventid']];
-					}
-
-					$rs = $this->escalateProblems($deep_services, $deep_problem_events, $rs);
-				}
-
 				$slaCalculator = new CServicesSlaCalculator();
 
 				// calculate SLAs
@@ -2019,7 +2492,7 @@ class CService extends CApiService {
 							];
 						}
 
-						$rs[$service['serviceid']]['sla'][] = [
+						$rs[$service['serviceid']][] = [
 							'from' => $interval['from'],
 							'to' => $interval['to'],
 							'sla' => $intervalSla['ok'],
@@ -2036,56 +2509,6 @@ class CService extends CApiService {
 	}
 
 	/**
-	 * Escalate problem events from the child services to their parents and adds them to $slaData.
-	 * The escalation will stop if a service has status calculation disabled or is in OK state.
-	 *
-	 * @param array $services
-	 * @param array $problem_events  An array of service problems.
-	 * @param array $slaData
-	 *
-	 * @return array
-	 */
-	protected function escalateProblems(array $services, array $problem_events, array $slaData) {
-		$parentProblems = [];
-		foreach ($problem_events as $serviceId => $service_problem_events) {
-			$service = $services[$serviceId];
-
-			// add the problem events of the current service to the data
-			if (array_key_exists($serviceId, $slaData)) {
-				$slaData[$serviceId]['problems'] = zbx_array_merge($slaData[$serviceId]['problems'],
-					$service_problem_events
-				);
-			}
-
-			// add the same problem events to the parent services
-			foreach ($service['parents'] as $parent) {
-				$parentServiceId = $parent['serviceid'];
-
-				if (isset($services[$parentServiceId])) {
-					$parentService = $services[$parentServiceId];
-
-					// escalate only if status calculation is enabled for the parent service and it's in problem state
-					if ($parentService['algorithm'] != ZBX_SERVICE_STATUS_CALC_SET_OK && $parentService['status'] > 0) {
-						if (!isset($parentProblems[$parentServiceId])) {
-							$parentProblems[$parentServiceId] = [];
-						}
-						$parentProblems[$parentServiceId] = zbx_array_merge($parentProblems[$parentServiceId],
-							$service_problem_events
-						);
-					}
-				}
-			}
-		}
-
-		// propagate the problems to the parents
-		if ($parentProblems) {
-			$slaData = $this->escalateProblems($services, $parentProblems, $slaData);
-		}
-
-		return $slaData;
-	}
-
-	/**
 	 * Returns the value of the latest service alarm before the given time.
 	 *
 	 * @param array $serviceIds
diff --git a/ui/include/classes/api/services/CSettings.php b/ui/include/classes/api/services/CSettings.php
index de3a4dd6f68..b3a58413ffb 100644
--- a/ui/include/classes/api/services/CSettings.php
+++ b/ui/include/classes/api/services/CSettings.php
@@ -130,6 +130,12 @@ class CSettings extends CApiService {
 	 * @return array
 	 */
 	public function update(array $settings): array {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'settings', __FUNCTION__)
+			);
+		}
+
 		$db_settings = $this->validateUpdate($settings);
 
 		$upd_config = DB::getUpdatedValues('config', $settings, $db_settings);
diff --git a/ui/include/classes/api/services/CTemplateDashboard.php b/ui/include/classes/api/services/CTemplateDashboard.php
index 3f5e3c35df9..c2912504d87 100644
--- a/ui/include/classes/api/services/CTemplateDashboard.php
+++ b/ui/include/classes/api/services/CTemplateDashboard.php
@@ -201,7 +201,7 @@ class CTemplateDashboard extends CDashboardGeneral {
 
 		$this->updatePages($dashboards);
 
-		$this->addAuditBulk(CAudit::ACTION_ADD, CAudit::RESOURCE_TEMPLATE_DASHBOARD, $dashboards);
+		self::addAuditLog(CAudit::ACTION_ADD, CAudit::RESOURCE_TEMPLATE_DASHBOARD, $dashboards);
 
 		return ['dashboardids' => $dashboardids];
 	}
@@ -233,7 +233,7 @@ class CTemplateDashboard extends CDashboardGeneral {
 
 		$this->updatePages($dashboards, $db_dashboards);
 
-		$this->addAuditBulk(CAudit::ACTION_UPDATE, CAudit::RESOURCE_TEMPLATE_DASHBOARD, $dashboards, $db_dashboards);
+		self::addAuditLog(CAudit::ACTION_UPDATE, CAudit::RESOURCE_TEMPLATE_DASHBOARD, $dashboards, $db_dashboards);
 
 		return ['dashboardids' => array_column($dashboards, 'dashboardid')];
 	}
diff --git a/ui/include/classes/api/services/CUser.php b/ui/include/classes/api/services/CUser.php
index 2a0790da030..cd967b60cf9 100644
--- a/ui/include/classes/api/services/CUser.php
+++ b/ui/include/classes/api/services/CUser.php
@@ -253,6 +253,12 @@ class CUser extends CApiService {
 	 * @return array
 	 */
 	public function create(array $users) {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'user', __FUNCTION__)
+			);
+		}
+
 		$this->validateCreate($users);
 
 		$ins_users = [];
@@ -610,7 +616,7 @@ class CUser extends CApiService {
 			}
 		}
 
-		$this->addAffectedObjects($users, $db_users);
+		self::addAffectedObjects($users, $db_users);
 
 		if ($usernames) {
 			$this->checkDuplicates($usernames);
@@ -628,10 +634,12 @@ class CUser extends CApiService {
 	/**
 	 * Add the existing medias and user groups to $db_users whether these are affected by the update.
 	 *
+	 * @static
+	 *
 	 * @param array $users
 	 * @param array $db_users
 	 */
-	private function addAffectedObjects(array $users, array &$db_users): void {
+	private static function addAffectedObjects(array $users, array &$db_users): void {
 		$userids = ['usrgrps' => [], 'medias' => []];
 
 		foreach ($users as $user) {
@@ -654,10 +662,8 @@ class CUser extends CApiService {
 			$db_usrgrps = DBselect(DB::makeSql('users_groups', $options));
 
 			while ($db_usrgrp = DBfetch($db_usrgrps)) {
-				$db_users[$db_usrgrp['userid']]['usrgrps'][$db_usrgrp['id']] = [
-					'id' => $db_usrgrp['id'],
-					'usrgrpid' => $db_usrgrp['usrgrpid']
-				];
+				$db_users[$db_usrgrp['userid']]['usrgrps'][$db_usrgrp['id']] =
+					array_diff_key($db_usrgrp, array_flip(['userid']));
 			}
 		}
 
@@ -669,14 +675,8 @@ class CUser extends CApiService {
 			$db_medias = DBselect(DB::makeSql('media', $options));
 
 			while ($db_media = DBfetch($db_medias)) {
-				$db_users[$db_media['userid']]['medias'][$db_media['mediaid']] = [
-					'mediaid' => $db_media['mediaid'],
-					'mediatypeid' => $db_media['mediatypeid'],
-					'sendto' => $db_media['sendto'],
-					'active' => $db_media['active'],
-					'severity' => $db_media['severity'],
-					'period' => $db_media['period']
-				];
+				$db_users[$db_media['userid']]['medias'][$db_media['mediaid']] =
+					array_diff_key($db_media, array_flip(['userid']));
 			}
 		}
 	}
diff --git a/ui/include/classes/api/services/CUserGroup.php b/ui/include/classes/api/services/CUserGroup.php
index d9f9d6548e8..8595b066f1a 100644
--- a/ui/include/classes/api/services/CUserGroup.php
+++ b/ui/include/classes/api/services/CUserGroup.php
@@ -171,6 +171,12 @@ class CUserGroup extends CApiService {
 	 * @return array
 	 */
 	public function create(array $usrgrps) {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'usergroup', __FUNCTION__)
+			);
+		}
+
 		$this->validateCreate($usrgrps);
 
 		$ins_usrgrps = [];
@@ -249,32 +255,15 @@ class CUserGroup extends CApiService {
 	 * @return array
 	 */
 	public function update($usrgrps) {
-		$this->validateUpdate($usrgrps, $db_usrgrps);
-
-		$upd_usrgrps = [];
-
-		foreach ($usrgrps as $usrgrp) {
-			$db_usrgrp = $db_usrgrps[$usrgrp['usrgrpid']];
-
-			$upd_usrgrp = DB::getUpdatedValues('usrgrp', $usrgrp, $db_usrgrp);
-
-			if ($upd_usrgrp) {
-				$upd_usrgrps[] = [
-					'values' => $upd_usrgrp,
-					'where' => ['usrgrpid' => $usrgrp['usrgrpid']]
-				];
-			}
-		}
-
-		if ($upd_usrgrps) {
-			DB::update('usrgrp', $upd_usrgrps);
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'usergroup', __FUNCTION__)
+			);
 		}
 
-		self::updateRights($usrgrps, __FUNCTION__, $db_usrgrps);
-		self::updateTagFilters($usrgrps, __FUNCTION__, $db_usrgrps);
-		self::updateUsersGroups($usrgrps, __FUNCTION__, $db_usrgrps);
+		$this->validateUpdate($usrgrps, $db_usrgrps);
 
-		self::addAuditLog(CAudit::ACTION_UPDATE, CAudit::RESOURCE_USER_GROUP, $usrgrps, $db_usrgrps);
+		self::updateForce($usrgrps, $db_usrgrps);
 
 		return ['usrgrpids'=> array_column($usrgrps, 'usrgrpid')];
 	}
@@ -344,7 +333,7 @@ class CUserGroup extends CApiService {
 		}
 		unset($usrgrp);
 
-		$this->addAffectedObjects($usrgrps, $db_usrgrps);
+		self::addAffectedObjects($usrgrps, $db_usrgrps);
 
 		if ($names) {
 			$this->checkDuplicates($names);
@@ -627,6 +616,39 @@ class CUserGroup extends CApiService {
 	}
 
 	/**
+	 * @static
+	 *
+	 * @param array $usrgrps
+	 * @param array $db_usrgrps
+	 */
+	public static function updateForce($usrgrps, $db_usrgrps): void {
+		$upd_usrgrps = [];
+
+		foreach ($usrgrps as $usrgrp) {
+			$db_usrgrp = $db_usrgrps[$usrgrp['usrgrpid']];
+
+			$upd_usrgrp = DB::getUpdatedValues('usrgrp', $usrgrp, $db_usrgrp);
+
+			if ($upd_usrgrp) {
+				$upd_usrgrps[] = [
+					'values' => $upd_usrgrp,
+					'where' => ['usrgrpid' => $usrgrp['usrgrpid']]
+				];
+			}
+		}
+
+		if ($upd_usrgrps) {
+			DB::update('usrgrp', $upd_usrgrps);
+		}
+
+		self::updateRights($usrgrps, 'update', $db_usrgrps);
+		self::updateTagFilters($usrgrps, 'update', $db_usrgrps);
+		self::updateUsersGroups($usrgrps, 'update', $db_usrgrps);
+
+		self::addAuditLog(CAudit::ACTION_UPDATE, CAudit::RESOURCE_USER_GROUP, $usrgrps, $db_usrgrps);
+	}
+
+	/**
 	 * Update table "rights".
 	 *
 	 * @static
@@ -855,6 +877,12 @@ class CUserGroup extends CApiService {
 	 * @return array
 	 */
 	public function delete(array $usrgrpids) {
+		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
+			self::exception(ZBX_API_ERROR_PERMISSIONS,
+				_s('No permissions to call "%1$s.%2$s".', 'usergroup', __FUNCTION__)
+			);
+		}
+
 		$this->validateDelete($usrgrpids, $db_usrgrps);
 
 		DB::delete('rights', ['groupid' => $usrgrpids]);
@@ -1064,10 +1092,12 @@ class CUserGroup extends CApiService {
 	/**
 	 * Add the existing rights, tag_filters and userids to $db_usrgrps whether these are affected by the update.
 	 *
+	 * @static
+	 *
 	 * @param array $usrgrps
 	 * @param array $db_usrgrps
 	 */
-	private function addAffectedObjects(array $usrgrps, array &$db_usrgrps): void {
+	private static function addAffectedObjects(array $usrgrps, array &$db_usrgrps): void {
 		$usrgrpids = ['rights' => [], 'tag_filters' => [], 'users' => []];
 
 		foreach ($usrgrps as $usrgrp) {
@@ -1095,11 +1125,8 @@ class CUserGroup extends CApiService {
 			$db_rights = DBselect(DB::makeSql('rights', $options));
 
 			while ($db_right = DBfetch($db_rights)) {
-				$db_usrgrps[$db_right['groupid']]['rights'][$db_right['rightid']] = [
-					'rightid' => $db_right['rightid'],
-					'id' => $db_right['id'],
-					'permission' => $db_right['permission']
-				];
+				$db_usrgrps[$db_right['groupid']]['rights'][$db_right['rightid']] =
+					array_diff_key($db_right, array_flip(['groupid']));
 			}
 		}
 
@@ -1111,12 +1138,8 @@ class CUserGroup extends CApiService {
 			$db_tags = DBselect(DB::makeSql('tag_filter', $options));
 
 			while ($db_tag = DBfetch($db_tags)) {
-				$db_usrgrps[$db_tag['usrgrpid']]['tag_filters'][$db_tag['tag_filterid']] = [
-					'tag_filterid' => $db_tag['tag_filterid'],
-					'groupid' => $db_tag['groupid'],
-					'tag' => $db_tag['tag'],
-					'value' => $db_tag['value']
-				];
+				$db_usrgrps[$db_tag['usrgrpid']]['tag_filters'][$db_tag['tag_filterid']] =
+					array_diff_key($db_tag, array_flip(['usrgrpid']));
 			}
 		}
 
@@ -1128,10 +1151,8 @@ class CUserGroup extends CApiService {
 			$db_users = DBselect(DB::makeSql('users_groups', $options));
 
 			while ($db_user = DBfetch($db_users)) {
-				$db_usrgrps[$db_user['usrgrpid']]['users'][$db_user['id']] = [
-					'id' => $db_user['id'],
-					'userid' => $db_user['userid']
-				];
+				$db_usrgrps[$db_user['usrgrpid']]['users'][$db_user['id']] =
+					array_diff_key($db_user, array_flip(['usrgrpid']));
 			}
 		}
 	}
diff --git a/ui/include/classes/api/services/CUserMacro.php b/ui/include/classes/api/services/CUserMacro.php
index 3462f44436f..c7ab92b7e26 100644
--- a/ui/include/classes/api/services/CUserMacro.php
+++ b/ui/include/classes/api/services/CUserMacro.php
@@ -249,14 +249,14 @@ class CUserMacro extends CApiService {
 	public function createGlobal(array $globalmacros) {
 		$this->validateCreateGlobal($globalmacros);
 
-		$globalmacroids = DB::insertBatch('globalmacro', $globalmacros);
+		$globalmacroids = DB::insert('globalmacro', $globalmacros);
 
 		foreach ($globalmacros as $index => &$globalmacro) {
 			$globalmacro['globalmacroid'] = $globalmacroids[$index];
 		}
 		unset($globalmacro);
 
-		$this->addAuditBulk(CAudit::ACTION_ADD, CAudit::RESOURCE_MACRO, $globalmacros);
+		self::addAuditLog(CAudit::ACTION_ADD, CAudit::RESOURCE_MACRO, $globalmacros);
 
 		return ['globalmacroids' => $globalmacroids];
 	}
@@ -267,16 +267,12 @@ class CUserMacro extends CApiService {
 	 * @throws APIException if the input is invalid.
 	 */
 	private function validateCreateGlobal(array &$globalmacros) {
-		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('You do not have permission to perform this operation.'));
-		}
-
 		$api_input_rules = ['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['macro']], 'fields' => [
 			'macro' =>			['type' => API_USER_MACRO, 'flags' => API_REQUIRED, 'length' => DB::getFieldLength('globalmacro', 'macro')],
 			'type' =>			['type' => API_INT32, 'in' => implode(',', [ZBX_MACRO_TYPE_TEXT, ZBX_MACRO_TYPE_SECRET, ZBX_MACRO_TYPE_VAULT]), 'default' => ZBX_MACRO_TYPE_TEXT],
 			'value' =>			['type' => API_MULTIPLE, 'flags' => API_REQUIRED, 'rules' => [
 									['if' => ['field' => 'type', 'in' => implode(',', [ZBX_MACRO_TYPE_TEXT, ZBX_MACRO_TYPE_SECRET])], 'type' => API_STRING_UTF8, 'length' => DB::getFieldLength('globalmacro', 'value')],
-									['if' => ['field' => 'type', 'in' => implode(',', [ZBX_MACRO_TYPE_VAULT])], 'type' => API_VAULT_SECRET, 'length' => DB::getFieldLength('globalmacro', 'value')]
+									['if' => ['field' => 'type', 'in' => ZBX_MACRO_TYPE_VAULT], 'type' => API_VAULT_SECRET, 'length' => DB::getFieldLength('globalmacro', 'value')]
 			]],
 			'description' =>	['type' => API_STRING_UTF8, 'length' => DB::getFieldLength('globalmacro', 'description')]
 		]];
@@ -315,7 +311,7 @@ class CUserMacro extends CApiService {
 			DB::update('globalmacro', $upd_globalmacros);
 		}
 
-		$this->addAuditBulk(CAudit::ACTION_UPDATE, CAudit::RESOURCE_MACRO, $globalmacros, $db_globalmacros);
+		self::addAuditLog(CAudit::ACTION_UPDATE, CAudit::RESOURCE_MACRO, $globalmacros, $db_globalmacros);
 
 		return ['globalmacroids' => array_column($globalmacros, 'globalmacroid')];
 	}
@@ -327,10 +323,6 @@ class CUserMacro extends CApiService {
 	 * @throws APIException if the input is invalid
 	 */
 	private function validateUpdateGlobal(array &$globalmacros, array &$db_globalmacros = null) {
-		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('You do not have permission to perform this operation.'));
-		}
-
 		$api_input_rules = ['type' => API_OBJECTS, 'flags' => API_NOT_EMPTY | API_NORMALIZE, 'uniq' => [['globalmacroid'], ['macro']], 'fields' => [
 			'globalmacroid' =>	['type' => API_ID, 'flags' => API_REQUIRED],
 			'macro' =>			['type' => API_USER_MACRO, 'length' => DB::getFieldLength('globalmacro', 'macro')],
@@ -405,13 +397,12 @@ class CUserMacro extends CApiService {
 			return;
 		}
 
-		$db_globalmacros = DB::select('globalmacro', [
-			'output' => ['macro']
-		]);
-
 		$db_macros = [];
 
-		foreach ($db_globalmacros as $db_globalmacro) {
+		$options = ['output' => ['macro']];
+		$db_globalmacros = DBselect(DB::makeSql('globalmacro', $options));
+
+		while ($db_globalmacro = DBfetch($db_globalmacros)) {
 			$db_macros[CApiInputValidator::trimMacro($db_globalmacro['macro'])] = true;
 		}
 
@@ -432,7 +423,7 @@ class CUserMacro extends CApiService {
 
 		DB::delete('globalmacro', ['globalmacroid' => $globalmacroids]);
 
-		$this->addAuditBulk(CAudit::ACTION_DELETE, CAudit::RESOURCE_MACRO, $db_globalmacros);
+		self::addAuditLog(CAudit::ACTION_DELETE, CAudit::RESOURCE_MACRO, $db_globalmacros);
 
 		return ['globalmacroids' => $globalmacroids];
 	}
@@ -443,10 +434,6 @@ class CUserMacro extends CApiService {
 	 * @throws APIException if the input is invalid.
 	 */
 	private function validateDeleteGlobal(array &$globalmacroids, array &$db_globalmacros = null) {
-		if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) {
-			self::exception(ZBX_API_ERROR_PERMISSIONS, _('You do not have permission to perform this operation.'));
-		}
-
 		$api_input_rules = ['type' => API_IDS, 'flags' => API_NOT_EMPTY, 'uniq' => true];
 
 		if (!CApiInputValidator::validate($api_input_rules, $globalmacroids, '/', $error)) {
diff --git a/ui/include/classes/core/CComponentRegistry.php b/ui/include/classes/core/CComponentRegistry.php
index d005e7d0e00..f30ab9ed923 100644
--- a/ui/include/classes/core/CComponentRegistry.php
+++ b/ui/include/classes/core/CComponentRegistry.php
@@ -57,7 +57,7 @@ final class CComponentRegistry {
 	}
 
 	/**
-	 * Check if а component has been registered.
+	 * Check if a component has been registered.
 	 *
 	 * @param string $name  Component name.
 	 *
diff --git a/ui/include/classes/core/CCookieSession.php b/ui/include/classes/core/CCookieSession.php
index f94f47554ef..b71aa62218e 100644
--- a/ui/include/classes/core/CCookieSession.php
+++ b/ui/include/classes/core/CCookieSession.php
@@ -30,7 +30,7 @@ class CCookieSession implements SessionHandlerInterface {
 	public const COOKIE_NAME = ZBX_SESSION_NAME;
 
 	/**
-	 * Class consturctor. Set session handlers and start session.
+	 * Class constructor. Set session handlers and start session.
 	 */
 	public function __construct() {
 		// Set use standard cookie PHPSESSID to false.
diff --git a/ui/include/classes/core/ZBase.php b/ui/include/classes/core/ZBase.php
index 08cda05787d..d689f965874 100644
--- a/ui/include/classes/core/ZBase.php
+++ b/ui/include/classes/core/ZBase.php
@@ -184,13 +184,8 @@ class ZBase {
 				$this->loadConfigFile();
 				$this->initDB();
 				$this->setServerAddress();
-				$this->initLocales(CSettingsHelper::getGlobal(CSettingsHelper::DEFAULT_LANG));
 				$this->authenticateUser();
 
-				if (CWebUser::$data['lang'] !== CSettingsHelper::get(CSettingsHelper::DEFAULT_LANG)) {
-					$this->initLocales(CWebUser::$data['lang']);
-				}
-
 				$this->initMessages();
 				$this->setLayoutModeByUrl();
 				$this->initComponents();
@@ -228,7 +223,6 @@ class ZBase {
 					$this->loadConfigFile();
 					$this->initDB();
 					$this->authenticateUser();
-					$this->initLocales(CWebUser::$data['lang']);
 					$this->initComponents();
 				}
 				catch (ConfigFileException $e) {
@@ -419,47 +413,16 @@ class ZBase {
 	}
 
 	/**
-	 * Initialize translations.
+	 * Initialize translations, set up translated date and time constants.
 	 *
-	 * @param string $lang  Language.
+	 * @param string $lang  Locale variant prefix like en_US, ru_RU etc.
 	 */
-	public function initLocales(string $lang): void {
-		init_mbstrings();
-
-		$default_locales = ['C', 'POSIX', 'en', 'en_US', 'en_US.UTF-8', 'English_United States.1252'];
-
-		if (function_exists('bindtextdomain')) {
-			// initializing gettext translations depending on language selected by user
-			$locales = zbx_locale_variants($lang);
-			$locale_found = false;
-			foreach ($locales as $locale) {
-				// since LC_MESSAGES may be unavailable on some systems, try to set all of the locales
-				// and then revert some of them back
-				putenv('LC_ALL='.$locale);
-				putenv('LANG='.$locale);
-				putenv('LANGUAGE='.$locale);
-				setlocale(LC_TIME, $locale);
-
-				if (setlocale(LC_ALL, $locale)) {
-					$locale_found = true;
-					break;
-				}
-			}
-
-			if (!$locale_found && strtolower($lang) !== strtolower(ZBX_DEFAULT_LANG)) {
-				setlocale(LC_ALL, $default_locales);
-				error('Locale for language "'.$lang.'" is not found on the web server. Tried to set: '.implode(', ', $locales).'. Unable to translate Zabbix interface.');
-			}
-			bindtextdomain('frontend', 'locale');
-			bind_textdomain_codeset('frontend', 'UTF-8');
-			textdomain('frontend');
+	public function initLocales(string $language): void {
+		if (!setupLocale($language, $error) && $error !== '') {
+			error($error);
 		}
 
-		// reset the LC_NUMERIC locale so that PHP would always use a point instead of a comma for decimal numbers
-		setlocale(LC_NUMERIC, $default_locales);
-
-		// should be after locale initialization
-		require_once 'include/translateDefines.inc.php';
+		require_once $this->getRootDir().'/include/translateDefines.inc.php';
 	}
 
 	/**
@@ -491,7 +454,7 @@ class ZBase {
 	}
 
 	/**
-	 * Authenticate user.
+	 * Authenticate user, apply some user-specific settings.
 	 *
 	 * @throws Exception
 	 */
@@ -502,6 +465,8 @@ class ZBase {
 			CWebUser::setDefault();
 		}
 
+		$this->initLocales(CWebUser::$data['lang']);
+
 		if (!$session->session_start(CWebUser::$data['sessionid'])) {
 			throw new Exception(_('Session initialization error.'));
 		}
diff --git a/ui/include/classes/data/CHistFunctionData.php b/ui/include/classes/data/CHistFunctionData.php
index 0f2a0355eea..bb420e7667e 100644
--- a/ui/include/classes/data/CHistFunctionData.php
+++ b/ui/include/classes/data/CHistFunctionData.php
@@ -44,6 +44,22 @@ final class CHistFunctionData {
 			['rules' => [['type' => 'query']]],
 			['rules' => [['type' => 'period', 'mode' => self::PERIOD_MODE_SEC_ONLY]]]
 		],
+		'bucket_percentile' => [
+			['rules' => [['type' => 'query']]],
+			['rules' => [['type' => 'period', 'mode' => self::PERIOD_MODE_SEC_ONLY]]],
+			['rules' => [
+				['type' => 'regexp', 'pattern' => '/^((\d+(\.\d{0,4})?)|(\.\d{1,4}))$/'],
+				['type' => 'number', 'min' => 0, 'max' => 100]
+			]]
+		],
+		'bucket_rate_foreach' => [
+			['rules' => [['type' => 'query']]],
+			['rules' => [['type' => 'period', 'mode' => self::PERIOD_MODE_SEC_ONLY]]],
+			['rules' => [
+				['type' => 'regexp', 'pattern' => '/^\d+$/'],
+				['type' => 'number', 'min' => 1]
+			], 'required' => false]
+		],
 		'change' => [
 			['rules' => [['type' => 'query']]]
 		],
@@ -167,6 +183,10 @@ final class CHistFunctionData {
 				['type' => 'number', 'min' => 0, 'max' => 100]
 			]]
 		],
+		'rate' => [
+			['rules' => [['type' => 'query']]],
+			['rules' => [['type' => 'period', 'mode' => self::PERIOD_MODE_SEC]]]
+		],
 		'skewness' => [
 			['rules' => [['type' => 'query']]],
 			['rules' => [['type' => 'period', 'mode' => self::PERIOD_MODE_DEFAULT]]]
@@ -230,12 +250,70 @@ final class CHistFunctionData {
 	];
 
 	/**
-	 * A subset of history functions for use in calculated item formulas only.
+	 * Additional requirements for history function usage in expressions.
+	 *
+	 * @var array
+	 */
+	private const EXPRESSION_RULES = [
+		'avg_foreach' => [[
+			'type' => 'require_math_parent',
+			'in' => ['avg', 'count', 'max', 'min', 'sum'],
+			'parameters' => ['count' => 1],
+			'position' => 0
+		]],
+		'bucket_rate_foreach' => [[
+			'type' => 'require_math_parent',
+			'in' => ['histogram_quantile'],
+			'parameters' => ['count' => 2],
+			'position' => 1
+		]],
+		'count_foreach' => [[
+			'type' => 'require_math_parent',
+			'in' => ['avg', 'count', 'max', 'min', 'sum'],
+			'parameters' => ['count' => 1],
+			'position' => 0
+		]],
+		'exists_foreach' => [[
+			'type' => 'require_math_parent',
+			'in' => ['avg', 'count', 'max', 'min', 'sum'],
+			'parameters' => ['count' => 1],
+			'position' => 0
+		]],
+		'last_foreach' => [[
+			'type' => 'require_math_parent',
+			'in' => ['avg', 'count', 'max', 'min', 'sum'],
+			'parameters' => ['count' => 1],
+			'position' => 0
+		]],
+		'max_foreach' => [[
+			'type' => 'require_math_parent',
+			'in' => ['avg', 'count', 'max', 'min', 'sum'],
+			'parameters' => ['count' => 1],
+			'position' => 0
+		]],
+		'min_foreach' => [[
+			'type' => 'require_math_parent',
+			'in' => ['avg', 'count', 'max', 'min', 'sum'],
+			'parameters' => ['count' => 1],
+			'position' => 0
+		]],
+		'sum_foreach' => [[
+			'type' => 'require_math_parent',
+			'in' => ['avg', 'count', 'max', 'min', 'sum'],
+			'parameters' => ['count' => 1],
+			'position' => 0
+		]]
+	];
+
+	/**
+	 * A subset of aggregating history functions for use in calculated item formulas.
 	 *
 	 * @var array
 	 */
-	private const CALCULATED_ONLY = [
+	private const AGGREGATING = [
 		'avg_foreach',
+		'bucket_percentile',
+		'bucket_rate_foreach',
 		'count_foreach',
 		'exists_foreach',
 		'item_count',
@@ -259,6 +337,8 @@ final class CHistFunctionData {
 	private const VALUE_TYPES = [
 		'avg' => self::ITEM_VALUE_TYPES_NUM,
 		'avg_foreach' => self::ITEM_VALUE_TYPES_NUM,
+		'bucket_percentile' => self::ITEM_VALUE_TYPES_NUM,
+		'bucket_rate_foreach' => self::ITEM_VALUE_TYPES_NUM,
 		'change' => self::ITEM_VALUE_TYPES_ALL,
 		'count' => self::ITEM_VALUE_TYPES_ALL,
 		'count_foreach' => self::ITEM_VALUE_TYPES_ALL,
@@ -284,6 +364,7 @@ final class CHistFunctionData {
 		'monoinc' =>  self::ITEM_VALUE_TYPES_NUM,
 		'nodata' => self::ITEM_VALUE_TYPES_ALL,
 		'percentile' => self::ITEM_VALUE_TYPES_NUM,
+		'rate' => self::ITEM_VALUE_TYPES_NUM,
 		'skewness' => self::ITEM_VALUE_TYPES_NUM,
 		'stddevpop' => self::ITEM_VALUE_TYPES_NUM,
 		'stddevsamp' => self::ITEM_VALUE_TYPES_NUM,
@@ -331,7 +412,7 @@ final class CHistFunctionData {
 			return false;
 		}
 
-		if (!$this->options['calculated'] && in_array($function, self::CALCULATED_ONLY, true)) {
+		if (!$this->options['calculated'] && in_array($function, self::AGGREGATING, true)) {
 			return false;
 		}
 
@@ -348,20 +429,20 @@ final class CHistFunctionData {
 			return self::PARAMETERS;
 		}
 
-		return array_diff_key(self::PARAMETERS, array_flip(self::CALCULATED_ONLY));
+		return array_diff_key(self::PARAMETERS, array_flip(self::AGGREGATING));
 	}
 
 	/**
-	 * Get known history functions along with supported item value types.
+	 * Get additional requirements for history function usage in expressions.
 	 *
 	 * @return array
 	 */
-	public function getValueTypes(): array {
+	public function getExpressionRules(): array {
 		if ($this->options['calculated']) {
-			return self::VALUE_TYPES;
+			return self::EXPRESSION_RULES;
 		}
 
-		return array_diff_key(self::VALUE_TYPES, array_flip(self::CALCULATED_ONLY));
+		return array_diff_key(self::EXPRESSION_RULES, array_flip(self::AGGREGATING));
 	}
 
 	/**
@@ -373,45 +454,20 @@ final class CHistFunctionData {
 	 *
 	 * @return bool
 	 */
-	public static function isAggregating(string $function): bool {
-		switch ($function) {
-			case 'avg_foreach':
-			case 'count_foreach':
-			case 'exists_foreach':
-			case 'item_count':
-			case 'last_foreach':
-			case 'max_foreach':
-			case 'min_foreach':
-			case 'sum_foreach':
-				return true;
-
-			default:
-				return false;
-		}
+	public function isAggregating(string $function): bool {
+		return in_array($function, self::AGGREGATING);
 	}
 
 	/**
-	 * Check if the result of aggregating function is further aggregatable.
-	 *
-	 * @static
-	 *
-	 * @param string $function
+	 * Get known history functions along with supported item value types.
 	 *
-	 * @return bool
+	 * @return array
 	 */
-	public static function isAggregatable(string $function): bool {
-		switch ($function) {
-			case 'avg_foreach':
-			case 'count_foreach':
-			case 'exists_foreach':
-			case 'last_foreach':
-			case 'max_foreach':
-			case 'min_foreach':
-			case 'sum_foreach':
-				return true;
-
-			default:
-				return false;
+	public function getValueTypes(): array {
+		if ($this->options['calculated']) {
+			return self::VALUE_TYPES;
 		}
+
+		return array_diff_key(self::VALUE_TYPES, array_flip(self::AGGREGATING));
 	}
 }
diff --git a/ui/include/classes/data/CMathFunctionData.php b/ui/include/classes/data/CMathFunctionData.php
index 22b1989cd91..d186927822e 100644
--- a/ui/include/classes/data/CMathFunctionData.php
+++ b/ui/include/classes/data/CMathFunctionData.php
@@ -30,77 +30,109 @@ final class CMathFunctionData {
 	 * @var array
 	 */
 	private const PARAMETERS = [
-		'abs' => 1,
-		'acos' => 1,
-		'ascii' => 1,
-		'asin' => 1,
-		'atan' => 1,
-		'atan2' => 2,
-		'avg' => [1, null],
-		'between' => 3,
-		'bitand' => 2,
-		'bitlength' => 1,
-		'bitlshift' => 2,
-		'bitnot' => 1,
-		'bitor' => 2,
-		'bitrshift' => 2,
-		'bitxor' => 2,
-		'bytelength' => 1,
-		'cbrt' => 1,
-		'ceil' => 1,
-		'char' => 1,
-		'concat' => 2,
-		'cos' => 1,
-		'cosh' => 1,
-		'cot' => 1,
-		'count' => 1,
-		'date' => 0,
-		'dayofmonth' => 0,
-		'dayofweek' => 0,
-		'degrees' => 1,
-		'e' => 0,
-		'exp' => 1,
-		'expm1' => 1,
-		'floor' => 1,
-		'in' => [2, null],
-		'insert' => 4,
-		'left' => 2,
-		'length' => 1,
-		'log' => 1,
-		'log10' => 1,
-		'ltrim' => [1, 2],
-		'max' => [1, null],
-		'mid' => 3,
-		'min' => [1, null],
-		'mod' => 2,
-		'now' => 0,
-		'pi' => 0,
-		'power' => 2,
-		'radians' => 1,
-		'rand' => 0,
-		'repeat' => 2,
-		'replace' => 3,
-		'right' => 2,
-		'round' => 2,
-		'rtrim' => [1, 2],
-		'signum' => 1,
-		'sin' => 1,
-		'sinh' => 1,
-		'sqrt' => 1,
-		'sum' => [1, null],
-		'tan' => 1,
-		'time' => 0,
-		'trim' => [1, 2],
-		'truncate' => 2
+		'abs' =>				[['count' => 1]],
+		'acos' =>				[['count' => 1]],
+		'ascii' =>				[['count' => 1]],
+		'asin' =>				[['count' => 1]],
+		'atan' =>				[['count' => 1]],
+		'atan2' =>				[['count' => 2]],
+		'avg' => 				[['min' => 1]],
+		'between' =>			[['count' => 3]],
+		'bitand' =>				[['count' => 2]],
+		'bitlength' =>			[['count' => 1]],
+		'bitlshift' =>			[['count' => 2]],
+		'bitnot' =>				[['count' => 1]],
+		'bitor' =>				[['count' => 2]],
+		'bitrshift' =>			[['count' => 2]],
+		'bitxor' =>				[['count' => 2]],
+		'bytelength' =>			[['count' => 1]],
+		'cbrt' =>				[['count' => 1]],
+		'ceil' =>				[['count' => 1]],
+		'char' =>				[['count' => 1]],
+		'concat' =>				[['count' => 2]],
+		'cos' =>				[['count' => 1]],
+		'cosh' =>				[['count' => 1]],
+		'cot' =>				[['count' => 1]],
+		'count' =>				[['count' => 1]],
+		'date' =>				[['count' => 0]],
+		'dayofmonth' =>			[['count' => 0]],
+		'dayofweek' =>			[['count' => 0]],
+		'degrees' =>			[['count' => 1]],
+		'e' =>					[['count' => 0]],
+		'exp' =>				[['count' => 1]],
+		'expm1' =>				[['count' => 1]],
+		'floor' =>				[['count' => 1]],
+		'histogram_quantile' =>	[['min' => 5, 'step' => 2], ['count' => 2]],
+		'in' =>					[['min' => 2]],
+		'insert' =>				[['count' => 4]],
+		'left' =>				[['count' => 2]],
+		'length' =>				[['count' => 1]],
+		'log' =>				[['count' => 1]],
+		'log10' =>				[['count' => 1]],
+		'ltrim' =>				[['min' => 1, 'max' => 2]],
+		'max' =>				[['min' => 1]],
+		'mid' =>				[['count' => 3]],
+		'min' =>				[['min' => 1]],
+		'mod' =>				[['count' => 2]],
+		'now' =>				[['count' => 0]],
+		'pi' =>					[['count' => 0]],
+		'power' =>				[['count' => 2]],
+		'radians' =>			[['count' => 1]],
+		'rand' =>				[['count' => 0]],
+		'repeat' =>				[['count' => 2]],
+		'replace' =>			[['count' => 3]],
+		'right' =>				[['count' => 2]],
+		'round' =>				[['count' => 2]],
+		'rtrim' =>				[['min' => 1, 'max' => 2]],
+		'signum' =>				[['count' => 1]],
+		'sin' =>				[['count' => 1]],
+		'sinh' =>				[['count' => 1]],
+		'sqrt' =>				[['count' => 1]],
+		'sum' =>				[['min' => 1]],
+		'tan' =>				[['count' => 1]],
+		'time' =>				[['count' => 0]],
+		'trim' =>				[['min' => 1, 'max' => 2]],
+		'truncate' =>			[['count' => 2]]
 	];
 
 	/**
-	 * A subset of math functions for use in calculated item formulas only.
+	 * Additional requirements for math function usage in expressions.
+	 *
+	 * @var array
+	 */
+	private const EXPRESSION_RULES = [
+		'count' => [[
+			'if' => [
+				'parameters' => ['count' => 1]
+			],
+			'rules' => [[
+				'type' => 'require_history_child',
+				'in' => ['avg_foreach', 'bucket_rate_foreach', 'count_foreach', 'exists_foreach', 'last_foreach',
+					'max_foreach', 'min_foreach', 'sum_foreach'
+				],
+				'position' => 0
+			]]
+		]],
+		'histogram_quantile' => [[
+			'if' => [
+				'parameters' => ['count' => 2]
+			],
+			'rules' => [[
+				'type' => 'require_history_child',
+				'in' => ['bucket_rate_foreach'],
+				'position' => 1
+			]]
+		]]
+	];
+
+	/**
+	 * A subset of aggregating math functions for use in calculated item formulas.
 	 *
 	 * @var array
 	 */
 	private const CALCULATED_ONLY = [
-		'count'
+		'count',
+		'histogram_quantile'
 	];
 
 	/**
@@ -147,48 +179,23 @@ final class CMathFunctionData {
 	 * @return array
 	 */
 	public function getParameters(): array {
-		return self::PARAMETERS;
-	}
-
-	/**
-	 * Check if function is aggregating it's parameters.
-	 *
-	 * @static
-	 *
-	 * @param string $function
-	 *
-	 * @return bool
-	 */
-	public static function isAggregating(string $function): bool {
-		switch ($function) {
-			case 'avg':
-			case 'count':
-			case 'max':
-			case 'min':
-			case 'sum':
-				return true;
-
-			default:
-				return false;
+		if ($this->options['calculated']) {
+			return self::PARAMETERS;
 		}
+
+		return array_diff_key(self::PARAMETERS, array_flip(self::CALCULATED_ONLY));
 	}
 
 	/**
-	 * Check if function is only aggregating the result of aggregating history functions.
-	 *
-	 * @static
+	 * Get additional requirements for math function usage in expressions.
 	 *
-	 * @param string $function
-	 *
-	 * @return bool
+	 * @return array
 	 */
-	public static function isAggregatingHistOnly(string $function): bool {
-		switch ($function) {
-			case 'count':
-				return true;
-
-			default:
-				return false;
+	public function getExpressionRules(): array {
+		if ($this->options['calculated']) {
+			return self::EXPRESSION_RULES;
 		}
+
+		return array_diff_key(self::EXPRESSION_RULES, array_flip(self::CALCULATED_ONLY));
 	}
 }
diff --git a/ui/include/classes/db/DB.php b/ui/include/classes/db/DB.php
index 7d01da998ac..7d1f955a56b 100644
--- a/ui/include/classes/db/DB.php
+++ b/ui/include/classes/db/DB.php
@@ -392,6 +392,7 @@ class DB {
 						}
 						$values[$field] = zbx_dbstr($values[$field]);
 						break;
+
 					case self::FIELD_TYPE_ID:
 					case self::FIELD_TYPE_UINT:
 						if (!zbx_ctype_digit($values[$field])) {
@@ -399,18 +400,21 @@ class DB {
 						}
 						$values[$field] = zbx_dbstr($values[$field]);
 						break;
+
 					case self::FIELD_TYPE_INT:
 						if (!zbx_is_int($values[$field])) {
 							self::exception(self::DBEXECUTE_ERROR, _s('Incorrect value "%1$s" for int field "%2$s".', $values[$field], $field));
 						}
 						$values[$field] = zbx_dbstr($values[$field]);
 						break;
+
 					case self::FIELD_TYPE_FLOAT:
 						if (!is_numeric($values[$field])) {
 							self::exception(self::DBEXECUTE_ERROR, _s('Incorrect value "%1$s" for float field "%2$s".', $values[$field], $field));
 						}
 						$values[$field] = zbx_dbstr($values[$field]);
 						break;
+
 					case self::FIELD_TYPE_TEXT:
 						if ($DB['TYPE'] == ZBX_DB_ORACLE) {
 							$length = mb_strlen($values[$field]);
@@ -422,6 +426,7 @@ class DB {
 						}
 						$values[$field] = zbx_dbstr($values[$field]);
 						break;
+
 					case self::FIELD_TYPE_NCLOB:
 						// Using strlen because 4000 bytes is largest possible string literal in oracle query.
 						if ($DB['TYPE'] == ZBX_DB_ORACLE && strlen($values[$field]) > ORACLE_MAX_STRING_SIZE) {
@@ -432,6 +437,21 @@ class DB {
 							$values[$field] = zbx_dbstr($values[$field]);
 						}
 						break;
+
+					case self::FIELD_TYPE_BLOB:
+						switch ($DB['TYPE']) {
+							case ZBX_DB_MYSQL:
+								$values[$field] = zbx_dbstr($values[$field]);
+								break;
+
+							case ZBX_DB_POSTGRESQL:
+								$values[$field] = "'".pg_escape_bytea($values[$field])."'";
+								break;
+
+							case ZBX_DB_ORACLE:
+								// Do nothing; Check CImage.php to see how to update BLOB data with ORACLE DB.
+								break;
+						}
 				}
 			}
 		}
@@ -532,12 +552,21 @@ class DB {
 
 		$mandatory_fields = [];
 
-		if ($DB['TYPE'] == ZBX_DB_MYSQL) {
-			foreach ($table_schema['fields'] as $name => $field) {
-				if ($field['type'] == self::FIELD_TYPE_TEXT || $field['type'] == self::FIELD_TYPE_NCLOB) {
-					$mandatory_fields += [$name => $field['default']];
+		switch ($DB['TYPE']) {
+			case ZBX_DB_MYSQL:
+				foreach ($table_schema['fields'] as $name => $field) {
+					if ($field['type'] == self::FIELD_TYPE_TEXT || $field['type'] == self::FIELD_TYPE_NCLOB) {
+						$mandatory_fields += [$name => $field['default']];
+					}
+				}
+				break;
+
+			case ZBX_DB_ORACLE:
+				foreach ($table_schema['fields'] as $name => $field) {
+					if ($field['type'] == self::FIELD_TYPE_BLOB) {
+						$mandatory_fields += [$name => 'EMPTY_BLOB()'];
+					}
 				}
-			}
 		}
 
 		return $mandatory_fields;
@@ -563,14 +592,14 @@ class DB {
 			switch ($table_schema['fields'][$table_schema['key']]['type']) {
 				case DB::FIELD_TYPE_ID:
 					$resultids[$key] = $id;
-					$row[$table_schema['key']] = $id;
+					$row = [$table_schema['key'] => $id] + $row;
 					$id = bcadd($id, 1, 0);
 					break;
 
 				case DB::FIELD_TYPE_CUID:
 					$id = CCuid::generate();
 					$resultids[$key] = $id;
-					$row[$table_schema['key']] = $id;
+					$row = [$table_schema['key'] => $id] + $row;
 					break;
 			}
 		}
diff --git a/ui/include/classes/export/CConfigurationExport.php b/ui/include/classes/export/CConfigurationExport.php
index d14f2aa8608..5ad51b3e049 100644
--- a/ui/include/classes/export/CConfigurationExport.php
+++ b/ui/include/classes/export/CConfigurationExport.php
@@ -1124,13 +1124,6 @@ class CConfigurationExport {
 			'mediatypeids' => $mediatypeids,
 			'preservekeys' => true
 		]);
-
-		foreach ($this->data['mediaTypes'] as &$media_type) {
-			if ($media_type['type'] == MEDIA_TYPE_WEBHOOK) {
-				CArrayHelper::sort($media_type['parameters'], ['name']);
-			}
-		}
-		unset($media_type);
 	}
 
 	/**
diff --git a/ui/include/classes/export/CConfigurationExportBuilder.php b/ui/include/classes/export/CConfigurationExportBuilder.php
index cf00a382a02..c226beed252 100644
--- a/ui/include/classes/export/CConfigurationExportBuilder.php
+++ b/ui/include/classes/export/CConfigurationExportBuilder.php
@@ -387,17 +387,6 @@ class CConfigurationExportBuilder {
 		CArrayHelper::sort($media_types, ['name']);
 
 		foreach ($media_types as $media_type) {
-			$message_templates = [];
-
-			foreach ($media_type['message_templates'] as $message_template) {
-				$message_templates[] = [
-					'event_source' => $message_template['eventsource'],
-					'operation_mode' => $message_template['recovery'],
-					'subject' => $message_template['subject'],
-					'message' => $message_template['message']
-				];
-			}
-
 			$result[] = [
 				'name' => $media_type['name'],
 				'type' => $media_type['type'],
@@ -413,9 +402,7 @@ class CConfigurationExportBuilder {
 				'password' => $media_type['passwd'],
 				'content_type' => $media_type['content_type'],
 				'script_name' => $media_type['exec_path'],
-				'parameters' => ($media_type['type'] == MEDIA_TYPE_WEBHOOK)
-					? $media_type['parameters']
-					: $media_type['exec_params'],
+				'parameters' => self::formatMediaTypeParameters($media_type),
 				'gsm_modem' => $media_type['gsm_modem'],
 				'status' => $media_type['status'],
 				'max_sessions' => $media_type['maxsessions'],
@@ -428,7 +415,56 @@ class CConfigurationExportBuilder {
 				'event_menu_url' => $media_type['event_menu_url'],
 				'event_menu_name' => $media_type['event_menu_name'],
 				'description' => $media_type['description'],
-				'message_templates' => $message_templates
+				'message_templates' => self::formatMediaTypeMessageTemplates($media_type['message_templates'])
+			];
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Format media type parameters.
+	 *
+	 * @static
+	 *
+	 * @param array $media_type
+	 *
+	 * @return array|string
+	 */
+	private static function formatMediaTypeParameters(array $media_type) {
+		if ($media_type['type'] == MEDIA_TYPE_EXEC) {
+			return $media_type['exec_params'];
+		}
+
+		if ($media_type['type'] == MEDIA_TYPE_WEBHOOK) {
+			CArrayHelper::sort($media_type['parameters'], ['name']);
+
+			return array_values($media_type['parameters']);
+		}
+
+		return [];
+	}
+
+	/**
+	 * Format media type message templates.
+	 *
+	 * @static
+	 *
+	 * @param array $message_templates
+	 *
+	 * @return array
+	 */
+	private static function formatMediaTypeMessageTemplates(array $message_templates): array {
+		$result = [];
+
+		CArrayHelper::sort($message_templates, ['eventsource', 'recovery']);
+
+		foreach ($message_templates as $message_template) {
+			$result[] = [
+				'event_source' => $message_template['eventsource'],
+				'operation_mode' => $message_template['recovery'],
+				'subject' => $message_template['subject'],
+				'message' => $message_template['message']
 			];
 		}
 
diff --git a/ui/include/classes/graph/CSvgGraph.php b/ui/include/classes/graph/CSvgGraph.php
index d2b491b71c0..cea94fe3c44 100644
--- a/ui/include/classes/graph/CSvgGraph.php
+++ b/ui/include/classes/graph/CSvgGraph.php
@@ -390,13 +390,19 @@ class CSvgGraph extends CSvg {
 		 */
 		if ($step == 0) {
 			return [
-				0 => date('H:i:s', $this->time_from),
-				$this->canvas_width => date('H:i:s', $this->time_till)
+				0 => zbx_date2str(TIME_FORMAT_SECONDS, $this->time_from),
+				$this->canvas_width => zbx_date2str(TIME_FORMAT_SECONDS, $this->time_till)
 			];
 		}
 
 		$start = $this->time_from + $step - $this->time_from % $step;
-		$time_formats = ['Y-n-d', 'n-d', 'n-d H:i','H:i', 'H:i:s'];
+		$time_formats = [
+			SVG_GRAPH_DATE_FORMAT,
+			SVG_GRAPH_DATE_FORMAT_SHORT,
+			SVG_GRAPH_DATE_TIME_FORMAT_SHORT,
+			TIME_FORMAT,
+			TIME_FORMAT_SECONDS
+		];
 
 		// Search for most appropriate time format.
 		foreach ($time_formats as $fmt) {
@@ -404,7 +410,7 @@ class CSvgGraph extends CSvg {
 
 			for ($clock = $start; $this->time_till >= $clock; $clock += $step) {
 				$relative_pos = round($this->canvas_width - $this->canvas_width * ($this->time_till - $clock) / $period);
-				$grid_values[$relative_pos] = date($fmt, $clock);
+				$grid_values[$relative_pos] = zbx_date2str($fmt, $clock);
 			}
 
 			/**
@@ -1084,16 +1090,23 @@ class CSvgGraph extends CSvg {
 				}
 			}
 
+			$clock_fmt = ($problem['clock'] >= $today)
+				? zbx_date2str(TIME_FORMAT_SECONDS, $problem['clock'])
+				: zbx_date2str(DATE_TIME_FORMAT_SECONDS, $problem['clock']);
+
+			if ($problem['r_clock'] != 0) {
+				$r_clock_fmt = ($problem['r_clock'] >= $today)
+					? zbx_date2str(TIME_FORMAT_SECONDS, $problem['r_clock'])
+					: zbx_date2str(DATE_TIME_FORMAT_SECONDS, $problem['r_clock']);
+			}
+			else {
+				$r_clock_fmt = '';
+			}
+
 			$info = [
 				'name' => $problem['name'],
-				'clock' => ($problem['clock'] >= $today)
-					? zbx_date2str(TIME_FORMAT_SECONDS, $problem['clock'])
-					: zbx_date2str(DATE_TIME_FORMAT_SECONDS, $problem['clock']),
-				'r_clock' => ($problem['r_clock'] != 0)
-					? ($problem['r_clock'] >= $today)
-						? zbx_date2str(TIME_FORMAT_SECONDS, $problem['r_clock'])
-						: zbx_date2str(DATE_TIME_FORMAT_SECONDS, $problem['r_clock'])
-					: '',
+				'clock' => $clock_fmt,
+				'r_clock' => $r_clock_fmt,
 				'url' => (new CUrl('tr_events.php'))
 					->setArgument('triggerid', $problem['objectid'])
 					->setArgument('eventid', $problem['eventid'])
diff --git a/ui/include/classes/helpers/CCorrelationHelper.php b/ui/include/classes/helpers/CCorrelationHelper.php
new file mode 100644
index 00000000000..22b3b13ca90
--- /dev/null
+++ b/ui/include/classes/helpers/CCorrelationHelper.php
@@ -0,0 +1,162 @@
+<?php declare(strict_types = 1);
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+
+class CCorrelationHelper {
+	/**
+	 * Convert a correlation condition operator to string.
+	 *
+	 * @static
+	 *
+	 * @param int $operator
+	 *
+	 * @return string
+	 */
+	public static function getLabelByOperator(int $operator): string {
+		$operators = [
+			CONDITION_OPERATOR_EQUAL => _('equals'),
+			CONDITION_OPERATOR_NOT_EQUAL => _('does not equal'),
+			CONDITION_OPERATOR_LIKE => _('contains'),
+			CONDITION_OPERATOR_NOT_LIKE => _('does not contain')
+		];
+
+		return $operators[$operator];
+	}
+
+	/**
+	 * Returns correlation condition types or one type depending on input.
+	 *
+	 * @static
+	 *
+	 * @return array  Returns condition type and it's string translation as array key => value pair.
+	 */
+	public static function getConditionTypes(): array {
+		return [
+			ZBX_CORR_CONDITION_OLD_EVENT_TAG => _('Old event tag name'),
+			ZBX_CORR_CONDITION_NEW_EVENT_TAG => _('New event tag name'),
+			ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP => _('New event host group'),
+			ZBX_CORR_CONDITION_EVENT_TAG_PAIR => _('Event tag pair'),
+			ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE => _('Old event tag value'),
+			ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE => _('New event tag value')
+		];
+	}
+
+	/**
+	 * Returns correlation operation types or one type depending on input.
+	 *
+	 * @static
+	 *
+	 * @return array  Returns operation type and it's string translation as array key => value pair.
+	 */
+	public static function getOperationTypes(): array {
+		return [
+			ZBX_CORR_OPERATION_CLOSE_OLD => _('Close old events'),
+			ZBX_CORR_OPERATION_CLOSE_NEW => _('Close new event')
+		];
+	}
+
+	/**
+	 * Return an array of operators supported by the given correlation condition.
+	 *
+	 * @static
+	 *
+	 * @param int $type  Correlation condition type.
+	 *
+	 * @return array     Returns array of supported operators.
+	 */
+	public static function getOperatorsByConditionType(int $type): array {
+		switch ($type) {
+			case ZBX_CORR_CONDITION_OLD_EVENT_TAG:
+			case ZBX_CORR_CONDITION_NEW_EVENT_TAG:
+			case ZBX_CORR_CONDITION_EVENT_TAG_PAIR:
+				return [CONDITION_OPERATOR_EQUAL];
+
+			case ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE:
+			case ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE:
+				return [CONDITION_OPERATOR_EQUAL, CONDITION_OPERATOR_NOT_EQUAL, CONDITION_OPERATOR_LIKE,
+					CONDITION_OPERATOR_NOT_LIKE
+				];
+
+			case ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP:
+				return [CONDITION_OPERATOR_EQUAL, CONDITION_OPERATOR_NOT_EQUAL];
+		}
+	}
+
+	/**
+	 * Returns the HTML representation of a correlation condition.
+	 *
+	 * @static
+	 *
+	 * @param array $condition    Array of correlation condition data.
+	 * @param array $group_names  Host group names keyed by host group ID.
+	 *
+	 * @return array
+	 */
+	public static function getConditionDescription(array $condition, array $group_names): array {
+		$description = [];
+
+		switch ($condition['type']) {
+			case ZBX_CORR_CONDITION_OLD_EVENT_TAG:
+				$description[] = _('Old event tag name');
+				$description[] = ' '.self::getLabelByOperator((int) $condition['operator']).' ';
+				$description[] = italic(CHtml::encode($condition['tag']));
+				break;
+
+			case ZBX_CORR_CONDITION_NEW_EVENT_TAG:
+				$description[] = _('New event tag name');
+				$description[] = ' '.self::getLabelByOperator((int) $condition['operator']).' ';
+				$description[] = italic(CHtml::encode($condition['tag']));
+				break;
+
+			case ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP:
+				$description[] = _('New event host group');
+				$description[] = ' '.self::getLabelByOperator((int) $condition['operator']).' ';
+				$description[] = italic(CHtml::encode(array_key_exists($condition['groupid'], $group_names)
+					? $group_names[$condition['groupid']]
+					: _('Unknown')
+				));
+				break;
+
+			case ZBX_CORR_CONDITION_EVENT_TAG_PAIR:
+				$description[] = _('Value of old event tag').' ';
+				$description[] = italic(CHtml::encode($condition['oldtag']));
+				$description[] = ' '.self::getLabelByOperator((int) $condition['operator']).' '.
+					_('value of new event tag').' ';
+				$description[] = italic(CHtml::encode($condition['newtag']));
+				break;
+
+			case ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE:
+				$description[] = _('Value of old event tag').' ';
+				$description[] = italic(CHtml::encode($condition['tag']));
+				$description[] = ' '.self::getLabelByOperator((int) $condition['operator']).' ';
+				$description[] = italic(CHtml::encode($condition['value']));
+				break;
+
+			case ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE:
+				$description[] = _('Value of new event tag').' ';
+				$description[] = italic(CHtml::encode($condition['tag']));
+				$description[] = ' '.self::getLabelByOperator((int) $condition['operator']).' ';
+				$description[] = italic(CHtml::encode($condition['value']));
+				break;
+		}
+
+		return $description;
+	}
+}
diff --git a/ui/include/classes/helpers/CMenuHelper.php b/ui/include/classes/helpers/CMenuHelper.php
index 1b640abf5f0..6f03243ccdd 100644
--- a/ui/include/classes/helpers/CMenuHelper.php
+++ b/ui/include/classes/helpers/CMenuHelper.php
@@ -48,15 +48,6 @@ class CMenuHelper {
 						'httpdetails.php', 'host.dashboard.view'
 					])
 				: null,
-			CWebUser::checkAccess(CRoleHelper::UI_MONITORING_OVERVIEW)
-				? (new CMenuItem(_('Overview')))
-					->setSubMenu(new CMenu([
-						(new CMenuItem(_('Trigger overview')))
-							->setUrl((new CUrl('overview.php'))->setArgument('type', 0), 'overview.php?type=0'),
-						(new CMenuItem(_('Data overview')))
-							->setUrl((new CUrl('overview.php'))->setArgument('type', 1), 'overview.php?type=1')
-					]))
-				: null,
 			CWebUser::checkAccess(CRoleHelper::UI_MONITORING_LATEST_DATA)
 				? (new CMenuItem(_('Latest data')))
 					->setAction('latest.view')
diff --git a/ui/include/classes/helpers/CPagerHelper.php b/ui/include/classes/helpers/CPagerHelper.php
index b79e6ee3d88..830ab1dbf46 100644
--- a/ui/include/classes/helpers/CPagerHelper.php
+++ b/ui/include/classes/helpers/CPagerHelper.php
@@ -102,7 +102,7 @@ class CPagerHelper {
 	 * @return array
 	 */
 	protected static function prepareData($page, $num_rows) {
-		$rows_per_page = (int) CWebUser::$data['rows_per_page'];
+		$rows_per_page = CWebUser::$data['rows_per_page'];
 
 		$offset_down = 0;
 		$limit_exceeded = ($num_rows > CSettingsHelper::get(CSettingsHelper::SEARCH_LIMIT));
diff --git a/ui/include/classes/helpers/CRoleHelper.php b/ui/include/classes/helpers/CRoleHelper.php
index 3d0d7b57f80..edab2ec2825 100644
--- a/ui/include/classes/helpers/CRoleHelper.php
+++ b/ui/include/classes/helpers/CRoleHelper.php
@@ -27,7 +27,6 @@ class CRoleHelper {
 	public const UI_MONITORING_DASHBOARD = 'ui.monitoring.dashboard';
 	public const UI_MONITORING_PROBLEMS = 'ui.monitoring.problems';
 	public const UI_MONITORING_HOSTS = 'ui.monitoring.hosts';
-	public const UI_MONITORING_OVERVIEW = 'ui.monitoring.overview';
 	public const UI_MONITORING_LATEST_DATA = 'ui.monitoring.latest_data';
 	public const UI_MONITORING_MAPS = 'ui.monitoring.maps';
 	public const UI_MONITORING_DISCOVERY = 'ui.monitoring.discovery';
@@ -213,9 +212,9 @@ class CRoleHelper {
 	public static function getUiElementsByUserType(int $user_type): array {
 		$rules = [
 			self::UI_MONITORING_DASHBOARD, self::UI_MONITORING_PROBLEMS, self::UI_MONITORING_HOSTS,
-			self::UI_MONITORING_OVERVIEW, self::UI_MONITORING_LATEST_DATA, self::UI_MONITORING_MAPS,
-			self::UI_MONITORING_SERVICES, self::UI_INVENTORY_OVERVIEW, self::UI_INVENTORY_HOSTS,
-			self::UI_REPORTS_AVAILABILITY_REPORT, self::UI_REPORTS_TOP_TRIGGERS
+			self::UI_MONITORING_LATEST_DATA, self::UI_MONITORING_MAPS, self::UI_MONITORING_SERVICES,
+			self::UI_INVENTORY_OVERVIEW, self::UI_INVENTORY_HOSTS, self::UI_REPORTS_AVAILABILITY_REPORT,
+			self::UI_REPORTS_TOP_TRIGGERS
 		];
 
 		if ($user_type === USER_TYPE_ZABBIX_ADMIN || $user_type === USER_TYPE_SUPER_ADMIN) {
@@ -307,7 +306,6 @@ class CRoleHelper {
 					self::UI_MONITORING_DASHBOARD => _('Dashboard'),
 					self::UI_MONITORING_PROBLEMS => _('Problems'),
 					self::UI_MONITORING_HOSTS => _('Hosts'),
-					self::UI_MONITORING_OVERVIEW => _('Overview'),
 					self::UI_MONITORING_LATEST_DATA => _('Latest data'),
 					self::UI_MONITORING_MAPS => _('Maps')
 				];
diff --git a/ui/include/classes/helpers/CServiceHelper.php b/ui/include/classes/helpers/CServiceHelper.php
index 112a0b4cdd4..a1b702336fc 100644
--- a/ui/include/classes/helpers/CServiceHelper.php
+++ b/ui/include/classes/helpers/CServiceHelper.php
@@ -74,7 +74,7 @@ class CServiceHelper {
 		];
 	}
 
-	public static function formatStatusRuleType(int $type, int $new_status, int $number, int $status): ?CObject {
+	public static function formatStatusRuleType(int $type, int $new_status, int $number, int $status): string {
 		$status = self::getStatusNames()[$status];
 
 		switch ($type) {
@@ -123,8 +123,10 @@ class CServiceHelper {
 		}
 
 		return $rule !== null
-			? new CObject([new CTag('em', true, self::getProblemStatusNames()[$new_status]), ' - ', $rule])
-			: null;
+			? (new CObject(
+				[new CTag('em', true, self::getProblemStatusNames()[$new_status]), ' - ', $rule]
+			))->toString()
+			: '';
 	}
 
 	public static function getStatusNames(): array {
diff --git a/ui/include/classes/import/CImportDataAdapter.php b/ui/include/classes/import/CImportDataAdapter.php
index bd17583fd07..feb02f2676c 100644
--- a/ui/include/classes/import/CImportDataAdapter.php
+++ b/ui/include/classes/import/CImportDataAdapter.php
@@ -385,9 +385,14 @@ class CImportDataAdapter {
 					unset($message_template);
 				}
 
-				$media_types[] = CArrayHelper::renameKeys($media_type,
-					$keys + (($media_type['type'] == MEDIA_TYPE_EXEC) ? ['parameters' => 'exec_params'] : [])
-				);
+				if ($media_type['type'] == MEDIA_TYPE_EXEC && array_key_exists('parameters', $media_type)) {
+					$media_type['exec_params'] = $media_type['parameters']
+						? implode("\n", $media_type['parameters'])."\n"
+						: '';
+					unset($media_type['parameters']);
+				}
+
+				$media_types[] = CArrayHelper::renameKeys($media_type, $keys);
 			}
 		}
 
@@ -451,7 +456,7 @@ class CImportDataAdapter {
 	}
 
 	/**
-	 * Format low-level disovery rule overrides.
+	 * Format low-level discovery rule overrides.
 	 *
 	 * @param array $discovery_rule  Data of single low-level discovery rule.
 	 *
diff --git a/ui/include/classes/import/converters/CTemplateScreenConverter.php b/ui/include/classes/import/converters/CTemplateScreenConverter.php
index 6b4b164a911..e261fa3fb9d 100644
--- a/ui/include/classes/import/converters/CTemplateScreenConverter.php
+++ b/ui/include/classes/import/converters/CTemplateScreenConverter.php
@@ -331,7 +331,7 @@ class CTemplateScreenConverter extends CConverter {
 	 *
 	 * @static
 	 *
-	 * @param array $dimensions      Prefered axis dimensions.
+	 * @param array $dimensions      Preferred axis dimensions.
 	 * @param array $dimensions_min  Minimal axis dimensions.
 	 * @param int   $target          Target summary size.
 	 *
diff --git a/ui/include/classes/import/validators/C44XmlValidator.php b/ui/include/classes/import/validators/C44XmlValidator.php
index d3aff909a88..ba4a2be4f7e 100644
--- a/ui/include/classes/import/validators/C44XmlValidator.php
+++ b/ui/include/classes/import/validators/C44XmlValidator.php
@@ -1661,7 +1661,7 @@ class C44XmlValidator extends CXmlValidatorGeneral {
 					'password' =>				['type' => XML_STRING, 'default' => ''],
 					'content_type' =>			['type' => XML_STRING, 'default' => CXmlConstantValue::CONTENT_TYPE_HTML, 'in' => [CXmlConstantValue::CONTENT_TYPE_TEXT => CXmlConstantName::CONTENT_TYPE_TEXT, CXmlConstantValue::CONTENT_TYPE_HTML => CXmlConstantName::CONTENT_TYPE_HTML]],
 					'script_name' =>			['type' => XML_STRING, 'default' => ''],
-					'parameters' =>				['type' => 0, 'default' => '', 'ex_validate' => [$this, 'validateMediaTypeParameters'], 'ex_rules' => [$this, 'getMediaTypeParametersExtendedRules'], 'export' => [$this, 'mediaTypeParametersExport']],
+					'parameters' =>				['type' => 0, 'ex_validate' => [$this, 'validateMediaTypeParameters'], 'ex_rules' => [$this, 'getMediaTypeParametersExtendedRules'], 'export' => [$this, 'mediaTypeParametersExport']],
 					'gsm_modem' =>				['type' => XML_STRING, 'default' => ''],
 					'status' =>					['type' => XML_STRING, 'default' => CXmlConstantValue::ENABLED, 'in' => [CXmlConstantValue::ENABLED => CXmlConstantName::ENABLED, CXmlConstantValue::DISABLED => CXmlConstantName::DISABLED]],
 					'max_sessions' =>			['type' => XML_STRING, 'default' => '1'],
@@ -2060,7 +2060,9 @@ class C44XmlValidator extends CXmlValidatorGeneral {
 		switch ($data['type']) {
 			case CXmlConstantName::SCRIPT:
 			case CXmlConstantValue::MEDIA_TYPE_SCRIPT:
-				return ['type' => XML_STRING, 'default' => '', 'preprocessor' => [$this, 'scriptParameterPreprocessor'], 'export' => [$this, 'scriptParameterExport']];
+				return ['type' => XML_INDEXED_ARRAY, 'prefix' => 'parameter', 'rules' => [
+					'parameter' => ['type' => XML_STRING]
+				]];
 
 			case CXmlConstantName::WEBHOOK:
 			case CXmlConstantValue::MEDIA_TYPE_WEBHOOK:
@@ -2072,7 +2074,7 @@ class C44XmlValidator extends CXmlValidatorGeneral {
 				]];
 
 			default:
-				return ['type' => XML_STRING, 'default' => ''];
+				return ['type' => XML_ARRAY, 'rules' => []];
 		}
 	}
 
@@ -2227,23 +2229,6 @@ class C44XmlValidator extends CXmlValidatorGeneral {
 	}
 
 	/**
-	 * Converts script parameters to a string.
-	 *
-	 * @param array|string $data  Import data.
-	 *
-	 * @throws Exception if input is invalid.
-	 *
-	 * @return string
-	 */
-	public function scriptParameterPreprocessor($data) {
-		if (is_string($data) && $data !== '') {
-			throw new Exception(_s('Invalid tag "%1$s": %2$s.', 'parameters', _('an array is expected')));
-		}
-
-		return is_array($data) ? implode("\n", $data)."\n" : '';
-	}
-
-	/**
 	 * Converts script parameters to an array.
 	 *
 	 * @param array  $data               Export data.
diff --git a/ui/include/classes/import/validators/C50XmlValidator.php b/ui/include/classes/import/validators/C50XmlValidator.php
index db3a92e62d2..04ac8f2d1ff 100644
--- a/ui/include/classes/import/validators/C50XmlValidator.php
+++ b/ui/include/classes/import/validators/C50XmlValidator.php
@@ -1796,7 +1796,7 @@ class C50XmlValidator extends CXmlValidatorGeneral {
 					'password' =>				['type' => XML_STRING, 'default' => ''],
 					'content_type' =>			['type' => XML_STRING, 'default' => CXmlConstantValue::CONTENT_TYPE_HTML, 'in' => [CXmlConstantValue::CONTENT_TYPE_TEXT => CXmlConstantName::CONTENT_TYPE_TEXT, CXmlConstantValue::CONTENT_TYPE_HTML => CXmlConstantName::CONTENT_TYPE_HTML]],
 					'script_name' =>			['type' => XML_STRING, 'default' => ''],
-					'parameters' =>				['type' => 0, 'default' => '', 'ex_validate' => [$this, 'validateMediaTypeParameters'], 'ex_rules' => [$this, 'getMediaTypeParametersExtendedRules'], 'export' => [$this, 'mediaTypeParametersExport']],
+					'parameters' =>				['type' => 0, 'ex_validate' => [$this, 'validateMediaTypeParameters'], 'ex_rules' => [$this, 'getMediaTypeParametersExtendedRules'], 'export' => [$this, 'mediaTypeParametersExport']],
 					'gsm_modem' =>				['type' => XML_STRING, 'default' => ''],
 					'status' =>					['type' => XML_STRING, 'default' => CXmlConstantValue::ENABLED, 'in' => [CXmlConstantValue::ENABLED => CXmlConstantName::ENABLED, CXmlConstantValue::DISABLED => CXmlConstantName::DISABLED]],
 					'max_sessions' =>			['type' => XML_STRING, 'default' => '1'],
@@ -2203,7 +2203,9 @@ class C50XmlValidator extends CXmlValidatorGeneral {
 		switch ($data['type']) {
 			case CXmlConstantName::SCRIPT:
 			case CXmlConstantValue::MEDIA_TYPE_SCRIPT:
-				return ['type' => XML_STRING, 'default' => '', 'preprocessor' => [$this, 'scriptParameterPreprocessor'], 'export' => [$this, 'scriptParameterExport']];
+				return ['type' => XML_INDEXED_ARRAY, 'prefix' => 'parameter', 'rules' => [
+					'parameter' => ['type' => XML_STRING]
+				]];
 
 			case CXmlConstantName::WEBHOOK:
 			case CXmlConstantValue::MEDIA_TYPE_WEBHOOK:
@@ -2215,7 +2217,7 @@ class C50XmlValidator extends CXmlValidatorGeneral {
 				]];
 
 			default:
-				return ['type' => XML_STRING, 'default' => ''];
+				return ['type' => XML_ARRAY, 'rules' => []];
 		}
 	}
 
@@ -2370,23 +2372,6 @@ class C50XmlValidator extends CXmlValidatorGeneral {
 	}
 
 	/**
-	 * Converts script parameters to a string.
-	 *
-	 * @param array|string $data  Import data.
-	 *
-	 * @throws Exception if input is invalid.
-	 *
-	 * @return string
-	 */
-	public function scriptParameterPreprocessor($data) {
-		if (is_string($data) && $data !== '') {
-			throw new Exception(_s('Invalid tag "%1$s": %2$s.', 'parameters', _('an array is expected')));
-		}
-
-		return is_array($data) ? implode("\n", $data)."\n" : '';
-	}
-
-	/**
 	 * Converts script parameters to an array.
 	 *
 	 * @param array  $data               Export data.
diff --git a/ui/include/classes/import/validators/C52XmlValidator.php b/ui/include/classes/import/validators/C52XmlValidator.php
index a2160190124..1a6ad6032fb 100644
--- a/ui/include/classes/import/validators/C52XmlValidator.php
+++ b/ui/include/classes/import/validators/C52XmlValidator.php
@@ -1918,7 +1918,7 @@ class C52XmlValidator extends CXmlValidatorGeneral {
 					'password' =>				['type' => XML_STRING, 'default' => ''],
 					'content_type' =>			['type' => XML_STRING, 'default' => CXmlConstantValue::CONTENT_TYPE_HTML, 'in' => [CXmlConstantValue::CONTENT_TYPE_TEXT => CXmlConstantName::CONTENT_TYPE_TEXT, CXmlConstantValue::CONTENT_TYPE_HTML => CXmlConstantName::CONTENT_TYPE_HTML]],
 					'script_name' =>			['type' => XML_STRING, 'default' => ''],
-					'parameters' =>				['type' => 0, 'default' => '', 'ex_validate' => [$this, 'validateMediaTypeParameters'], 'ex_rules' => [$this, 'getMediaTypeParametersExtendedRules'], 'export' => [$this, 'mediaTypeParametersExport']],
+					'parameters' =>				['type' => 0, 'ex_validate' => [$this, 'validateMediaTypeParameters'], 'ex_rules' => [$this, 'getMediaTypeParametersExtendedRules'], 'export' => [$this, 'mediaTypeParametersExport']],
 					'gsm_modem' =>				['type' => XML_STRING, 'default' => ''],
 					'status' =>					['type' => XML_STRING, 'default' => CXmlConstantValue::ENABLED, 'in' => [CXmlConstantValue::ENABLED => CXmlConstantName::ENABLED, CXmlConstantValue::DISABLED => CXmlConstantName::DISABLED]],
 					'max_sessions' =>			['type' => XML_STRING, 'default' => '1'],
@@ -2333,7 +2333,9 @@ class C52XmlValidator extends CXmlValidatorGeneral {
 		switch ($data['type']) {
 			case CXmlConstantName::SCRIPT:
 			case CXmlConstantValue::MEDIA_TYPE_SCRIPT:
-				return ['type' => XML_STRING, 'flags' => CImportDataNormalizer::EOL_LF, 'default' => '', 'preprocessor' => [$this, 'scriptParameterPreprocessor'], 'export' => [$this, 'scriptParameterExport']];
+				return ['type' => XML_INDEXED_ARRAY, 'prefix' => 'parameter', 'rules' => [
+					'parameter' => ['type' => XML_STRING]
+				]];
 
 			case CXmlConstantName::WEBHOOK:
 			case CXmlConstantValue::MEDIA_TYPE_WEBHOOK:
@@ -2345,7 +2347,7 @@ class C52XmlValidator extends CXmlValidatorGeneral {
 				]];
 
 			default:
-				return ['type' => XML_STRING, 'default' => ''];
+				return ['type' => XML_ARRAY, 'rules' => []];
 		}
 	}
 
@@ -2535,23 +2537,6 @@ class C52XmlValidator extends CXmlValidatorGeneral {
 	}
 
 	/**
-	 * Converts script parameters to a string.
-	 *
-	 * @param array|string $data  Import data.
-	 *
-	 * @throws Exception if input is invalid.
-	 *
-	 * @return string
-	 */
-	public function scriptParameterPreprocessor($data) {
-		if (is_string($data) && $data !== '') {
-			throw new Exception(_s('Invalid tag "%1$s": %2$s.', 'parameters', _('an array is expected')));
-		}
-
-		return is_array($data) ? implode("\n", $data)."\n" : '';
-	}
-
-	/**
 	 * Converts script parameters to an array.
 	 *
 	 * @param array  $data               Export data.
diff --git a/ui/include/classes/import/validators/C54XmlValidator.php b/ui/include/classes/import/validators/C54XmlValidator.php
index eae51018168..3310c14d007 100644
--- a/ui/include/classes/import/validators/C54XmlValidator.php
+++ b/ui/include/classes/import/validators/C54XmlValidator.php
@@ -1984,7 +1984,7 @@ class C54XmlValidator extends CXmlValidatorGeneral {
 					'password' =>				['type' => XML_STRING, 'default' => ''],
 					'content_type' =>			['type' => XML_STRING, 'default' => CXmlConstantValue::CONTENT_TYPE_HTML, 'in' => [CXmlConstantValue::CONTENT_TYPE_TEXT => CXmlConstantName::CONTENT_TYPE_TEXT, CXmlConstantValue::CONTENT_TYPE_HTML => CXmlConstantName::CONTENT_TYPE_HTML]],
 					'script_name' =>			['type' => XML_STRING, 'default' => ''],
-					'parameters' =>				['type' => 0, 'default' => '', 'ex_validate' => [$this, 'validateMediaTypeParameters'], 'ex_rules' => [$this, 'getMediaTypeParametersExtendedRules'], 'export' => [$this, 'mediaTypeParametersExport']],
+					'parameters' =>				['type' => 0, 'ex_validate' => [$this, 'validateMediaTypeParameters'], 'ex_rules' => [$this, 'getMediaTypeParametersExtendedRules'], 'export' => [$this, 'mediaTypeParametersExport']],
 					'gsm_modem' =>				['type' => XML_STRING, 'default' => ''],
 					'status' =>					['type' => XML_STRING, 'default' => CXmlConstantValue::ENABLED, 'in' => [CXmlConstantValue::ENABLED => CXmlConstantName::ENABLED, CXmlConstantValue::DISABLED => CXmlConstantName::DISABLED]],
 					'max_sessions' =>			['type' => XML_STRING, 'default' => '1'],
@@ -2388,7 +2388,9 @@ class C54XmlValidator extends CXmlValidatorGeneral {
 		switch ($data['type']) {
 			case CXmlConstantName::SCRIPT:
 			case CXmlConstantValue::MEDIA_TYPE_SCRIPT:
-				return ['type' => XML_STRING, 'flags' => CImportDataNormalizer::EOL_LF, 'default' => '', 'preprocessor' => [$this, 'scriptParameterPreprocessor'], 'export' => [$this, 'scriptParameterExport']];
+				return ['type' => XML_INDEXED_ARRAY, 'prefix' => 'parameter', 'rules' => [
+					'parameter' => ['type' => XML_STRING]
+				]];
 
 			case CXmlConstantName::WEBHOOK:
 			case CXmlConstantValue::MEDIA_TYPE_WEBHOOK:
@@ -2400,7 +2402,7 @@ class C54XmlValidator extends CXmlValidatorGeneral {
 				]];
 
 			default:
-				return ['type' => XML_STRING, 'default' => ''];
+				return ['type' => XML_ARRAY, 'rules' => []];
 		}
 	}
 
@@ -2548,23 +2550,6 @@ class C54XmlValidator extends CXmlValidatorGeneral {
 	}
 
 	/**
-	 * Converts script parameters to a string.
-	 *
-	 * @param array|string $data  Import data.
-	 *
-	 * @throws Exception if input is invalid.
-	 *
-	 * @return string
-	 */
-	public function scriptParameterPreprocessor($data) {
-		if (is_string($data) && $data !== '') {
-			throw new Exception(_s('Invalid tag "%1$s": %2$s.', 'parameters', _('an array is expected')));
-		}
-
-		return is_array($data) ? implode("\n", $data)."\n" : '';
-	}
-
-	/**
 	 * Converts script parameters to an array.
 	 *
 	 * @param array  $data               Export data.
diff --git a/ui/include/classes/import/validators/C60XmlValidator.php b/ui/include/classes/import/validators/C60XmlValidator.php
index 67909a3069f..15eb7961da1 100644
--- a/ui/include/classes/import/validators/C60XmlValidator.php
+++ b/ui/include/classes/import/validators/C60XmlValidator.php
@@ -1985,7 +1985,7 @@ class C60XmlValidator extends CXmlValidatorGeneral {
 					'password' =>				['type' => XML_STRING, 'default' => ''],
 					'content_type' =>			['type' => XML_STRING, 'default' => CXmlConstantValue::CONTENT_TYPE_HTML, 'in' => [CXmlConstantValue::CONTENT_TYPE_TEXT => CXmlConstantName::CONTENT_TYPE_TEXT, CXmlConstantValue::CONTENT_TYPE_HTML => CXmlConstantName::CONTENT_TYPE_HTML]],
 					'script_name' =>			['type' => XML_STRING, 'default' => ''],
-					'parameters' =>				['type' => 0, 'default' => '', 'ex_validate' => [$this, 'validateMediaTypeParameters'], 'ex_rules' => [$this, 'getMediaTypeParametersExtendedRules'], 'export' => [$this, 'mediaTypeParametersExport']],
+					'parameters' =>				['type' => 0, 'ex_validate' => [$this, 'validateMediaTypeParameters'], 'ex_rules' => [$this, 'getMediaTypeParametersExtendedRules'], 'export' => [$this, 'mediaTypeParametersExport']],
 					'gsm_modem' =>				['type' => XML_STRING, 'default' => ''],
 					'status' =>					['type' => XML_STRING, 'default' => CXmlConstantValue::ENABLED, 'in' => [CXmlConstantValue::ENABLED => CXmlConstantName::ENABLED, CXmlConstantValue::DISABLED => CXmlConstantName::DISABLED]],
 					'max_sessions' =>			['type' => XML_STRING, 'default' => '1'],
@@ -2389,7 +2389,9 @@ class C60XmlValidator extends CXmlValidatorGeneral {
 		switch ($data['type']) {
 			case CXmlConstantName::SCRIPT:
 			case CXmlConstantValue::MEDIA_TYPE_SCRIPT:
-				return ['type' => XML_STRING, 'flags' => CImportDataNormalizer::EOL_LF, 'default' => '', 'preprocessor' => [$this, 'scriptParameterPreprocessor'], 'export' => [$this, 'scriptParameterExport']];
+				return ['type' => XML_INDEXED_ARRAY, 'prefix' => 'parameter', 'rules' => [
+					'parameter' => ['type' => XML_STRING]
+				]];
 
 			case CXmlConstantName::WEBHOOK:
 			case CXmlConstantValue::MEDIA_TYPE_WEBHOOK:
@@ -2401,7 +2403,7 @@ class C60XmlValidator extends CXmlValidatorGeneral {
 				]];
 
 			default:
-				return ['type' => XML_STRING, 'default' => ''];
+				return ['type' => XML_ARRAY, 'rules' => []];
 		}
 	}
 
@@ -2549,23 +2551,6 @@ class C60XmlValidator extends CXmlValidatorGeneral {
 	}
 
 	/**
-	 * Converts script parameters to a string.
-	 *
-	 * @param array|string $data  Import data.
-	 *
-	 * @throws Exception if input is invalid.
-	 *
-	 * @return string
-	 */
-	public function scriptParameterPreprocessor($data) {
-		if (is_string($data) && $data !== '') {
-			throw new Exception(_s('Invalid tag "%1$s": %2$s.', 'parameters', _('an array is expected')));
-		}
-
-		return is_array($data) ? implode("\n", $data)."\n" : '';
-	}
-
-	/**
 	 * Converts script parameters to an array.
 	 *
 	 * @param array  $data               Export data.
diff --git a/ui/include/classes/mvc/CController.php b/ui/include/classes/mvc/CController.php
index 4db9ea65090..e141d182ad7 100644
--- a/ui/include/classes/mvc/CController.php
+++ b/ui/include/classes/mvc/CController.php
@@ -21,9 +21,19 @@
 
 abstract class CController {
 
-	const VALIDATION_OK = 0;
-	const VALIDATION_ERROR = 1;
-	const VALIDATION_FATAL_ERROR = 2;
+	protected const POST_CONTENT_TYPE_FORM = 0;
+	protected const POST_CONTENT_TYPE_JSON = 1;
+
+	protected const VALIDATION_OK = 0;
+	protected const VALIDATION_ERROR = 1;
+	protected const VALIDATION_FATAL_ERROR = 2;
+
+	/**
+	 * Content type of the POST request.
+	 *
+	 * @var int
+	 */
+	private $post_content_type = self::POST_CONTENT_TYPE_FORM;
 
 	/**
 	 * Action name, so that controller knows what action he is executing.
@@ -44,21 +54,28 @@ abstract class CController {
 	 *
 	 * @var int
 	 */
-	private $validationResult;
+	private $validation_result;
 
 	/**
-	 * Input parameters retrieved from global $_REQUEST after validation.
+	 * Non-validated input parameters.
+	 *
+	 * @var array|null
+	 */
+	private $raw_input;
+
+	/**
+	 * Validated input parameters.
 	 *
 	 * @var array
 	 */
-	public $input = [];
+	protected $input = [];
 
 	/**
 	 * SID validation flag, if true SID must be validated.
 	 *
 	 * @var bool
 	 */
-	private $validateSID = true;
+	private $validate_sid = true;
 
 	public function __construct() {
 		$this->init();
@@ -71,6 +88,24 @@ abstract class CController {
 	}
 
 	/**
+	 * Get content type of the POST request.
+	 *
+	 * @return int
+	 */
+	protected function getPostContentType(): int {
+		return $this->post_content_type;
+	}
+
+	/**
+	 * Set content type of the POST request.
+	 *
+	 * @param int $post_content_type
+	 */
+	protected function setPostContentType(int $post_content_type): void {
+		$this->post_content_type = $post_content_type;
+	}
+
+	/**
 	 * Return controller action name.
 	 *
 	 * @return string
@@ -102,7 +137,7 @@ abstract class CController {
 	 *
 	 * @param CControllerResponse $response
 	 */
-	public function setResponse($response) {
+	protected function setResponse($response) {
 		$this->response = $response;
 	}
 
@@ -111,7 +146,7 @@ abstract class CController {
 	 *
 	 * @return bool
 	 */
-	public function getDebugMode() {
+	protected function getDebugMode() {
 		return CWebUser::getDebugMode();
 	}
 
@@ -120,7 +155,7 @@ abstract class CController {
 	 *
 	 * @return int
 	 */
-	public function getUserType() {
+	protected function getUserType() {
 		return CWebUser::getType();
 	}
 
@@ -131,7 +166,7 @@ abstract class CController {
 	 *
 	 * @return bool  Returns true if user has access to rule, false - otherwise.
 	 */
-	public function checkAccess(string $rule_name): bool {
+	protected function checkAccess(string $rule_name): bool {
 		return CWebUser::checkAccess($rule_name);
 	}
 
@@ -140,7 +175,7 @@ abstract class CController {
 	 *
 	 * @return string
 	 */
-	public function getUserSID() {
+	protected function getUserSID() {
 		$sessionid = CSessionHelper::getId();
 
 		if ($sessionid === null || strlen($sessionid) < 16) {
@@ -151,65 +186,83 @@ abstract class CController {
 	}
 
 	/**
-	 * Parse form data.
-	 *
-	 * @return boolean
+	 * @return array
 	 */
-	protected function parseFormData(): bool {
-		$data = base64_decode(getRequest('data'));
-		$sign = base64_decode(getRequest('sign'));
-		$request_sign = CEncryptHelper::sign($data);
+	private function getFormInput(): array {
+		$input = $_REQUEST;
 
-		if (!CEncryptHelper::checkSign($sign, $request_sign)) {
-			info(_('Operation cannot be performed due to unauthorized request.'));
-			return false;
+		if (hasRequest('formdata')) {
+			$data = base64_decode(getRequest('data'));
+			$sign = base64_decode(getRequest('sign'));
+			$request_sign = CEncryptHelper::sign($data);
+
+			if (CEncryptHelper::checkSign($sign, $request_sign)) {
+				$data = json_decode($data, true);
+
+				if ($data['messages']) {
+					CMessageHelper::setScheduleMessages($data['messages']);
+				}
+
+				$input = array_replace($input, $data['form']);
+			}
+			else {
+				info(_('Operation cannot be performed due to unauthorized request.'));
+			}
+
+			// Replace window.history to avoid resubmission warning dialog.
+			zbx_add_post_js("history.replaceState({}, '');");
 		}
 
-		$data = json_decode($data, true);
+		return $input;
+	}
+
+	/**
+	 * @return array
+	 */
+	private function getJsonInput(): array {
+		$input = $_REQUEST;
 
-		$_REQUEST = array_merge($_REQUEST, $data['form']);
+		$json_input = json_decode(file_get_contents('php://input'), true);
 
-		if ($data['messages']) {
-			CMessageHelper::setScheduleMessages($data['messages']);
+		if (is_array($json_input)) {
+			$input += $json_input;
+		}
+		else {
+			info(_('JSON array input is expected.'));
 		}
 
-		return true;
+		return $input;
 	}
 
 	/**
 	 * Validate input parameters.
 	 *
-	 * @param array $validationRules
+	 * @param array $validation_rules
 	 *
 	 * @return bool
 	 */
-	public function validateInput($validationRules) {
-		if (hasRequest('formdata')) {
-			$this->parseFormData();
+	protected function validateInput(array $validation_rules): bool {
+		if ($this->raw_input === null) {
+			$this->validation_result = self::VALIDATION_FATAL_ERROR;
 
-			// Replace window.history to avoid resubmission warning dialog.
-			zbx_add_post_js("history.replaceState({}, '');");
+			return false;
 		}
 
-		$validator = new CNewValidator($_REQUEST, $validationRules);
+		$validator = new CNewValidator($this->raw_input, $validation_rules);
 
 		foreach ($validator->getAllErrors() as $error) {
 			info($error);
 		}
 
 		if ($validator->isErrorFatal()) {
-			$this->validationResult = self::VALIDATION_FATAL_ERROR;
-		}
-		else if ($validator->isError()) {
-			$this->input = $validator->getValidInput();
-			$this->validationResult = self::VALIDATION_ERROR;
+			$this->validation_result = self::VALIDATION_FATAL_ERROR;
 		}
 		else {
 			$this->input = $validator->getValidInput();
-			$this->validationResult = self::VALIDATION_OK;
+			$this->validation_result = $validator->isError() ? self::VALIDATION_ERROR : self::VALIDATION_OK;
 		}
 
-		return ($this->validationResult == self::VALIDATION_OK);
+		return $this->validation_result == self::VALIDATION_OK;
 	}
 
 	/**
@@ -217,7 +270,7 @@ abstract class CController {
 	 *
 	 * @return bool
 	 */
-	public function validateTimeSelectorPeriod() {
+	protected function validateTimeSelectorPeriod() {
 		if (!$this->hasInput('from') || !$this->hasInput('to')) {
 			return true;
 		}
@@ -271,8 +324,8 @@ abstract class CController {
 	 *
 	 * @return int
 	 */
-	public function getValidationError() {
-		return $this->validationResult;
+	protected function getValidationError() {
+		return $this->validation_result;
 	}
 
 	/**
@@ -282,7 +335,7 @@ abstract class CController {
 	 *
 	 * @return bool
 	 */
-	public function hasInput($var) {
+	protected function hasInput($var) {
 		return array_key_exists($var, $this->input);
 	}
 
@@ -294,7 +347,7 @@ abstract class CController {
 	 *
 	 * @return mixed
 	 */
-	public function getInput($var, $default = null) {
+	protected function getInput($var, $default = null) {
 		if ($default === null) {
 			return $this->input[$var];
 		}
@@ -309,7 +362,7 @@ abstract class CController {
 	 * @param array $var
 	 * @param array $names
 	 */
-	public function getInputs(&$var, $names) {
+	protected function getInputs(&$var, $names) {
 		foreach ($names as $name) {
 			if ($this->hasInput($name)) {
 				$var[$name] = $this->getInput($name);
@@ -322,7 +375,7 @@ abstract class CController {
 	 *
 	 * @return array
 	 */
-	public function getInputAll() {
+	protected function getInputAll() {
 		return $this->input;
 	}
 
@@ -347,8 +400,8 @@ abstract class CController {
 	/**
 	 * Validate session ID (SID).
 	 */
-	public function disableSIDvalidation() {
-		$this->validateSID = false;
+	protected function disableSIDvalidation() {
+		$this->validate_sid = false;
 	}
 
 	/**
@@ -356,14 +409,18 @@ abstract class CController {
 	 *
 	 * @return bool
 	 */
-	protected function checkSID() {
-		$sessionid = CSessionHelper::getId();
+	private function checkSID(): bool {
+		$sessionid = $this->getUserSID();
+
+		if ($sessionid === null) {
+			return false;
+		}
 
-		if ($sessionid === null || !isset($_REQUEST['sid'])) {
+		if (!is_array($this->raw_input) || !array_key_exists('sid', $this->raw_input)) {
 			return false;
 		}
 
-		return ($_REQUEST['sid'] === substr($sessionid, 16, 16));
+		return $this->raw_input['sid'] === $sessionid;
 	}
 
 	/**
@@ -373,13 +430,31 @@ abstract class CController {
 	 */
 	abstract protected function doAction();
 
+	private function populateRawInput(): void {
+		switch ($this->getPostContentType()) {
+			case self::POST_CONTENT_TYPE_FORM:
+				$this->raw_input = $this->getFormInput();
+				break;
+
+			case self::POST_CONTENT_TYPE_JSON:
+				$this->raw_input = $this->getJsonInput();
+				break;
+
+			default:
+				$this->raw_input = null;
+				break;
+		}
+	}
+
 	/**
 	 * Main controller processing routine. Returns response object: data, redirect or fatal redirect.
 	 *
 	 * @return CControllerResponse
 	 */
 	final public function run() {
-		if ($this->validateSID && !$this->checkSID()) {
+		$this->populateRawInput();
+
+		if ($this->validate_sid && !$this->checkSID()) {
 			access_deny(ACCESS_DENY_PAGE);
 		}
 
diff --git a/ui/include/classes/mvc/CLegacyAction.php b/ui/include/classes/mvc/CLegacyAction.php
index b28d2383544..83f6cf16660 100644
--- a/ui/include/classes/mvc/CLegacyAction.php
+++ b/ui/include/classes/mvc/CLegacyAction.php
@@ -65,8 +65,7 @@ class CLegacyAction extends CAction {
 		if ($user_type < USER_TYPE_ZABBIX_USER) {
 			$denied = ['chart.php', 'chart2.php', 'chart3.php', 'chart4.php', 'chart6.php', 'chart7.php', 'history.php',
 				'hostinventories.php', 'hostinventoriesoverview.php', 'httpdetails.php', 'image.php', 'imgstore.php',
-				'jsrpc.php', 'map.php', 'overview.php', 'toptriggers.php', 'tr_events.php', 'sysmap.php', 'sysmaps.php',
-				'report2.php'
+				'jsrpc.php', 'map.php', 'toptriggers.php', 'tr_events.php', 'sysmap.php', 'sysmaps.php', 'report2.php'
 			];
 		}
 
@@ -92,7 +91,6 @@ class CLegacyAction extends CAction {
 			$rule_actions = [
 				CRoleHelper::UI_MONITORING_PROBLEMS => ['tr_events.php'],
 				CRoleHelper::UI_MONITORING_HOSTS => ['httpdetails.php'],
-				CRoleHelper::UI_MONITORING_OVERVIEW => ['overview.php'],
 				CRoleHelper::UI_MONITORING_LATEST_DATA => ['history.php'],
 				CRoleHelper::UI_MONITORING_MAPS => ['image.php', 'map.php', 'sysmap.php', 'sysmaps.php'],
 				CRoleHelper::UI_INVENTORY_OVERVIEW => ['hostinventoriesoverview.php'],
diff --git a/ui/include/classes/mvc/CRouter.php b/ui/include/classes/mvc/CRouter.php
index db6e896ad7a..9e68f94450c 100644
--- a/ui/include/classes/mvc/CRouter.php
+++ b/ui/include/classes/mvc/CRouter.php
@@ -235,8 +235,8 @@ class CRouter {
 		'service.list.refresh'						=> ['CControllerServiceListRefresh',					'layout.json',			'monitoring.service.list.refresh'],
 		'service.list.edit'							=> ['CControllerServiceListEdit',						'layout.htmlpage',		'monitoring.service.list.edit'],
 		'service.list.edit.refresh'					=> ['CControllerServiceListEditRefresh',				'layout.json',			'monitoring.service.list.edit.refresh'],
-		'service.statusrule.validate'				=> ['CControllerServiceStatusRuleValidate',				'layout.json',			'service.statusrule.validate'],
-		'service.time.validate'						=> ['CControllerServiceTimeValidate',					'layout.json',			'service.time.validate'],
+		'service.statusrule.validate'				=> ['CControllerServiceStatusRuleValidate',				'layout.json',			null],
+		'service.time.validate'						=> ['CControllerServiceTimeValidate',					'layout.json',			null],
 		'service.update'							=> ['CControllerServiceUpdate',							'layout.json',			null],
 		'system.warning'							=> ['CControllerSystemWarning',							'layout.warning',		'system.warning'],
 		'tabfilter.profile.update'					=> ['CControllerTabFilterProfileUpdate',				'layout.json',			null],
@@ -305,16 +305,6 @@ class CRouter {
 
 		// legacy actions
 		'actionconf.php'				=> ['CLegacyAction', null, null],
-		'adm.housekeeper.php'			=> ['CLegacyAction', null, null],
-		'adm.iconmapping.php'			=> ['CLegacyAction', null, null],
-		'adm.images.php'				=> ['CLegacyAction', null, null],
-		'adm.macros.php'				=> ['CLegacyAction', null, null],
-		'adm.other.php'					=> ['CLegacyAction', null, null],
-		'adm.regexps.php'				=> ['CLegacyAction', null, null],
-		'adm.triggerdisplayoptions.php'	=> ['CLegacyAction', null, null],
-		'adm.triggerseverities.php'		=> ['CLegacyAction', null, null],
-		'adm.valuemapping.php'			=> ['CLegacyAction', null, null],
-		'adm.workingtime.php'			=> ['CLegacyAction', null, null],
 		'auditacts.php'					=> ['CLegacyAction', null, null],
 		'browserwarning.php'			=> ['CLegacyAction', null, null],
 		'chart.php'						=> ['CLegacyAction', null, null],
@@ -341,10 +331,8 @@ class CRouter {
 		'index_sso.php'					=> ['CLegacyAction', null, null],
 		'items.php'						=> ['CLegacyAction', null, null],
 		'jsrpc.php'						=> ['CLegacyAction', null, null],
-		'latest.php'					=> ['CLegacyAction', null, null],
 		'maintenance.php'				=> ['CLegacyAction', null, null],
 		'map.php'						=> ['CLegacyAction', null, null],
-		'overview.php'					=> ['CLegacyAction', null, null],
 		'report2.php'					=> ['CLegacyAction', null, null],
 		'report4.php'					=> ['CLegacyAction', null, null],
 		'sysmap.php'					=> ['CLegacyAction', null, null],
@@ -353,8 +341,7 @@ class CRouter {
 		'toptriggers.php'				=> ['CLegacyAction', null, null],
 		'tr_events.php'					=> ['CLegacyAction', null, null],
 		'trigger_prototypes.php'		=> ['CLegacyAction', null, null],
-		'triggers.php'					=> ['CLegacyAction', null, null],
-		'usergrps.php'					=> ['CLegacyAction', null, null]
+		'triggers.php'					=> ['CLegacyAction', null, null]
 	];
 
 	/**
diff --git a/ui/include/classes/parsers/CExpressionParser.php b/ui/include/classes/parsers/CExpressionParser.php
index 00cc351dd5f..faf4585d4af 100644
--- a/ui/include/classes/parsers/CExpressionParser.php
+++ b/ui/include/classes/parsers/CExpressionParser.php
@@ -655,7 +655,7 @@ class CExpressionParser extends CParser {
 			int $depth): bool {
 		$p = $pos;
 
-		if (!preg_match('/^([a-z0-9]+)\(/', substr($source, $p), $matches)) {
+		if (!preg_match('/^([a-z0-9_]+)\(/', substr($source, $p), $matches)) {
 			return false;
 		}
 
diff --git a/ui/include/classes/validators/CApiInputValidator.php b/ui/include/classes/validators/CApiInputValidator.php
index d9a2f1de19e..4b6277f5fc9 100644
--- a/ui/include/classes/validators/CApiInputValidator.php
+++ b/ui/include/classes/validators/CApiInputValidator.php
@@ -76,11 +76,11 @@ class CApiInputValidator {
 			case API_COLOR:
 				return self::validateColor($rule, $data, $path, $error);
 
-			case API_MULTIPLE:
-				if ($parent_data !== null) {
-					return self::validateMultiple($rule, $data, $path, $error, $parent_data);
-				}
-				break;
+			case API_COND_FORMULA:
+				return self::validateCondFormula($rule, $data, $path, $error);
+
+			case API_COND_FORMULAID:
+				return self::validateCondFormulaId($rule, $data, $path, $error);
 
 			case API_STRING_UTF8:
 				return self::validateStringUtf8($rule, $data, $path, $error);
@@ -213,6 +213,12 @@ class CApiInputValidator {
 
 			case API_VAULT_SECRET:
 				return self::validateVaultSecret($rule, $data, $path, $error);
+
+			case API_IMAGE:
+				return self::validateImage($rule, $data, $path, $error);
+
+			case API_EXEC_PARAMS:
+				return self::validateExecParams($rule, $data, $path, $error);
 		}
 
 		// This message can be untranslated because warn about incorrect validation rules at a development stage.
@@ -235,7 +241,8 @@ class CApiInputValidator {
 		switch ($rule['type']) {
 			case API_CALC_FORMULA:
 			case API_COLOR:
-			case API_MULTIPLE:
+			case API_COND_FORMULA:
+			case API_COND_FORMULAID:
 			case API_STRING_UTF8:
 			case API_INT32:
 			case API_UINT64:
@@ -274,11 +281,24 @@ class CApiInputValidator {
 			case API_UUID:
 			case API_CUID:
 			case API_VAULT_SECRET:
+			case API_IMAGE:
+			case API_EXEC_PARAMS:
+			case API_UNEXPECTED:
 				return true;
 
 			case API_OBJECT:
 				foreach ($rule['fields'] as $field_name => $field_rule) {
 					if ($data !== null && array_key_exists($field_name, $data)) {
+						if ($field_rule['type'] === API_MULTIPLE) {
+							foreach ($field_rule['rules'] as $multiple_rule) {
+								if (array_key_exists('else', $multiple_rule)
+										|| self::isInRange($data[$multiple_rule['if']['field']], $multiple_rule['if']['in'])) {
+									$field_rule = $multiple_rule;
+									break;
+								}
+							}
+						}
+
 						$subpath = ($path === '/' ? $path : $path.'/').$field_name;
 						if (!self::validateDataUniqueness($field_rule, $data[$field_name], $subpath, $error)) {
 							return false;
@@ -416,30 +436,63 @@ class CApiInputValidator {
 	}
 
 	/**
-	 * Multiple data types validator.
+	 * Calculated condition formula validator.
 	 *
 	 * @param array  $rule
-	 * @param array  $rule['rules']
+	 * @param int    $rule['length']  (optional)
 	 * @param mixed  $data
 	 * @param string $path
 	 * @param string $error
-	 * @param array  $parent_data
 	 *
 	 * @return bool
 	 */
-	private static function validateMultiple($rule, &$data, $path, &$error, array $parent_data) {
-		foreach ($rule['rules'] as $field_rule) {
-			if (self::isInRange($parent_data[$field_rule['if']['field']], $field_rule['if']['in'])) {
-				unset($field_rule['if']);
+	private static function validateCondFormula(array $rule, &$data, string $path, string &$error): bool {
+		if (self::checkStringUtf8(API_NOT_EMPTY, $data, $path, $error) === false) {
+			return false;
+		}
 
-				return self::validateData($field_rule, $data, $path, $error);
-			}
+		if (array_key_exists('length', $rule) && mb_strlen($data) > $rule['length']) {
+			$error = _s('Invalid parameter "%1$s": %2$s.', $path, _('value is too long'));
+			return false;
 		}
 
-		// This message can be untranslated because warn about incorrect validation rules at a development stage.
-		$error = 'Incorrect validation rules.';
+		$condition_formula_parser = new CConditionFormula();
 
-		return false;
+		if (!$condition_formula_parser->parse($data)) {
+			$error = _s('Invalid parameter "%1$s": %2$s.', $path, $condition_formula_parser->error);
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Calculated condition formula ID validator.
+	 *
+	 * @param array  $rule
+	 * @param int    $rule['length']  (optional)
+	 * @param mixed  $data
+	 * @param string $path
+	 * @param string $error
+	 *
+	 * @return bool
+	 */
+	private static function validateCondFormulaId(array $rule, &$data, string $path, string &$error): bool {
+		if (self::checkStringUtf8(API_NOT_EMPTY, $data, $path, $error) === false) {
+			return false;
+		}
+
+		if (array_key_exists('length', $rule) && mb_strlen($data) > $rule['length']) {
+			$error = _s('Invalid parameter "%1$s": %2$s.', $path, _('value is too long'));
+			return false;
+		}
+
+		if (preg_match('/^[A-Z]+$/', $data) !== 1) {
+			$error = _s('Invalid parameter "%1$s": %2$s.', $path, _('uppercase identifier expected'));
+			return false;
+		}
+
+		return true;
 	}
 
 	/**
@@ -505,10 +558,14 @@ class CApiInputValidator {
 				}
 
 				if ($i === false) {
-					$error = _s('value must be one of %1$s', implode(', ', $in));
+					$error = _n('value must be %1$s', 'value must be one of %1$s', '"'.implode('", "', $in).'"',
+						count($in)
+					);
 				}
 				elseif ($in) {
-					$error = _s('value must be empty or one of %1$s', implode(', ', $in));
+					$error = _n('value must be empty or %1$s', 'value must be empty or one of %1$s',
+						'"'.implode('", "', $in).'"', count($in)
+					);
 				}
 				else {
 					$error = _s('value must be empty');
@@ -843,9 +900,9 @@ class CApiInputValidator {
 		$valid = self::isInRange($data, $rule['in']);
 
 		if (!$valid) {
-			$error = _s('Invalid parameter "%1$s": %2$s.', $path,
-				_s('value must be one of %1$s', str_replace([',', ':'], [', ', '-'], $rule['in']))
-			);
+			$error = _s('Invalid parameter "%1$s": %2$s.', $path, _n('value must be %1$s', 'value must be one of %1$s',
+				strtr($rule['in'], [',' => ', ', ':' => '-']), (strpbrk($rule['in'], ',:') === false) ? 1 : 2
+			));
 		}
 
 		return $valid;
@@ -1056,6 +1113,11 @@ class CApiInputValidator {
 		// unexpected parameter validation
 		if (!($flags & API_ALLOW_UNEXPECTED)) {
 			foreach ($data as $field_name => $value) {
+				if (!$rule['fields']) {
+					$error = _s('Invalid parameter "%1$s": %2$s.', $path, _('should be empty'));
+					return false;
+				}
+
 				if (!array_key_exists($field_name, $rule['fields'])) {
 					$error = _s('Invalid parameter "%1$s": %2$s.', $path,
 						_s('unexpected parameter "%1$s"', $field_name)
@@ -1067,6 +1129,32 @@ class CApiInputValidator {
 
 		// validation of the values type
 		foreach ($rule['fields'] as $field_name => $field_rule) {
+			if ($field_rule['type'] === API_MULTIPLE) {
+				foreach ($field_rule['rules'] as $multiple_rule) {
+					if (array_key_exists('else', $multiple_rule)
+							|| self::isInRange($data[$multiple_rule['if']['field']], $multiple_rule['if']['in'])) {
+						if ($multiple_rule['type'] == API_UNEXPECTED && array_key_exists($field_name, $data)) {
+							$error = _s('Invalid parameter "%1$s": %2$s.', $path,
+								_s('unexpected parameter "%1$s"', $field_name)
+							);
+							return false;
+						}
+
+						$field_rule += ['flags' => 0x00];
+						$multiple_rule += ['flags' => 0x00];
+						$multiple_rule['flags'] = ($field_rule['flags'] & API_REQUIRED) | $multiple_rule['flags'];
+						$field_rule = $multiple_rule +
+							array_intersect_key($field_rule, array_flip(['default', 'default_source']));
+						break;
+					}
+				}
+
+				if ($field_rule['type'] === API_MULTIPLE) {
+					$error = 'Incorrect validation rules.';
+					return false;
+				}
+			}
+
 			$flags = array_key_exists('flags', $field_rule) ? $field_rule['flags'] : 0x00;
 
 			if (array_key_exists('default', $field_rule) && !array_key_exists($field_name, $data)) {
@@ -1907,6 +1995,16 @@ class CApiInputValidator {
 		foreach ($data as $index => $object) {
 			foreach ($rule['fields'] as $field_name => $field_rule) {
 				if (array_key_exists($field_name, $object)) {
+					if ($field_rule['type'] === API_MULTIPLE) {
+						foreach ($field_rule['rules'] as $multiple_rule) {
+							if (array_key_exists('else', $multiple_rule)
+									|| self::isInRange($object[$multiple_rule['if']['field']], $multiple_rule['if']['in'])) {
+								$field_rule = $multiple_rule;
+								break;
+							}
+						}
+					}
+
 					$subpath = ($path === '/' ? $path : $path.'/').($index + 1).'/'.$field_name;
 					if (!self::validateDataUniqueness($field_rule, $object[$field_name], $subpath, $error)) {
 						return false;
@@ -2548,4 +2646,69 @@ class CApiInputValidator {
 
 		return true;
 	}
+
+	/**
+	 * Validate image.
+	 *
+	 * @param array  $rule
+	 * @param mixed  $data
+	 * @param string $path
+	 * @param string $error
+	 *
+	 * @return bool
+	 */
+	private static function validateImage($rule, &$data, $path, &$error) {
+		if (self::checkStringUtf8(0, $data, $path, $error) === false) {
+			return false;
+		}
+
+		$data = base64_decode($data);
+
+		if (bccomp(strlen($data), ZBX_MAX_IMAGE_SIZE) == 1) {
+			$error = _s('Invalid parameter "%1$s": %2$s.', $path,
+				_s('image size must be less than %1$s', convertUnits(['value' => ZBX_MAX_IMAGE_SIZE, 'units' => 'B']))
+			);
+			return false;
+		}
+
+		if (@imageCreateFromString($data) === false) {
+			$error = _s('Invalid parameter "%1$s": %2$s.', $path, _('file format is unsupported'));
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param array  $rule
+	 * @param int    $rule['flags']   (optional) API_NOT_EMPTY
+	 * @param int    $rule['length']  (optional)
+	 * @param string $path
+	 * @param string $error
+	 *
+	 * @return bool
+	 */
+	private static function validateExecParams(array $rule, &$data, string $path, string &$error): bool {
+		$flags = array_key_exists('flags', $rule) ? $rule['flags'] : 0x00;
+
+		if (self::checkStringUtf8($flags & API_NOT_EMPTY, $data, $path, $error) === false) {
+			return false;
+		}
+
+		if (($flags & API_NOT_EMPTY) == 0 && $data === '') {
+			return true;
+		}
+
+		if (array_key_exists('length', $rule) && mb_strlen($data) > $rule['length']) {
+			$error = _s('Invalid parameter "%1$s": %2$s.', $path, _('value is too long'));
+			return false;
+		}
+
+		if ($data !== '' && mb_substr($data, -1) !== "\n") {
+			$error = _s('Invalid parameter "%1$s": %2$s.', $path, _('the last new line feed is missing'));
+			return false;
+		}
+
+		return true;
+	}
 }
diff --git a/ui/include/classes/validators/CEventNameValidator.php b/ui/include/classes/validators/CEventNameValidator.php
index 8b65ecd38d6..96ab77612f8 100644
--- a/ui/include/classes/validators/CEventNameValidator.php
+++ b/ui/include/classes/validators/CEventNameValidator.php
@@ -20,7 +20,7 @@
 
 
 /**
- * Validate only trigger event name field expression macroses, other macroses will be ignored.
+ * Validate only trigger event name field expression macros, other macros will be ignored.
  */
 class CEventNameValidator extends CValidator {
 
diff --git a/ui/include/classes/validators/CExpressionValidator.php b/ui/include/classes/validators/CExpressionValidator.php
index aaacd744d0b..9240ce9dbec 100644
--- a/ui/include/classes/validators/CExpressionValidator.php
+++ b/ui/include/classes/validators/CExpressionValidator.php
@@ -57,6 +57,13 @@ class CExpressionValidator extends CValidator {
 	private $math_function_parameters = [];
 
 	/**
+	 * Known math functions along with additional requirements for usage in expressions.
+	 *
+	 * @var array
+	 */
+	private $math_function_expression_rules = [];
+
+	/**
 	 * Provider of information on history functions.
 	 *
 	 * @var CHistFunctionData
@@ -71,6 +78,13 @@ class CExpressionValidator extends CValidator {
 	private $hist_function_parameters = [];
 
 	/**
+	 * Known history functions along with additional requirements for usage in expressions.
+	 *
+	 * @var array
+	 */
+	private $hist_function_expression_rules = [];
+
+	/**
 	 * @param array $options
 	 */
 	public function __construct(array $options = []) {
@@ -78,9 +92,11 @@ class CExpressionValidator extends CValidator {
 
 		$this->math_function_data = new CMathFunctionData(['calculated' => $this->options['calculated']]);
 		$this->math_function_parameters = $this->math_function_data->getParameters();
+		$this->math_function_expression_rules = $this->math_function_data->getExpressionRules();
 
 		$this->hist_function_data = new CHistFunctionData(['calculated' => $this->options['calculated']]);
 		$this->hist_function_parameters = $this->hist_function_data->getParameters();
+		$this->hist_function_expression_rules = $this->hist_function_data->getExpressionRules();
 	}
 
 	/**
@@ -91,7 +107,7 @@ class CExpressionValidator extends CValidator {
 	 * @return bool
 	 */
 	public function validate($tokens) {
-		if (!$this->validateRecursively($tokens, null)) {
+		if (!$this->validateRecursively($tokens, null, null)) {
 			return false;
 		}
 
@@ -109,12 +125,13 @@ class CExpressionValidator extends CValidator {
 	/**
 	 * Validate expression (recursive helper).
 	 *
-	 * @param array $tokens             A hierarchy of tokens.
+	 * @param array      $tokens        A hierarchy of tokens.
 	 * @param array|null $parent_token  Parent token containing the hierarchy of tokens.
+	 * @param int|null   $position      The parameter number in the math function.
 	 *
 	 * @return bool
 	 */
-	private function validateRecursively(array $tokens, ?array $parent_token): bool {
+	private function validateRecursively(array $tokens, ?array $parent_token, ?int $position): bool {
 		foreach ($tokens as $token) {
 			switch ($token['type']) {
 				case CExpressionParserResult::TOKEN_TYPE_MATH_FUNCTION:
@@ -135,23 +152,14 @@ class CExpressionValidator extends CValidator {
 						return false;
 					}
 
-					if ($this->options['calculated']
-							&& CMathFunctionData::isAggregatingHistOnly($token['data']['function'])) {
-						if (count($token['data']['parameters']) != 1
-								|| count($token['data']['parameters'][0]['data']['tokens']) != 1
-								|| $token['data']['parameters'][0]['data']['tokens'][0]['type']
-									!= CExpressionParserResult::TOKEN_TYPE_HIST_FUNCTION
-								|| !CHistFunctionData::isAggregatable(
-									$token['data']['parameters'][0]['data']['tokens'][0]['data']['function']
-								)) {
-							$this->setError(_s('incorrect usage of function "%1$s"', $token['data']['function']));
+					if (!$this->validateMathFunctionExpressionRules($token)) {
+						$this->setError(_s('incorrect usage of function "%1$s"', $token['data']['function']));
 
-							return false;
-						}
+						return false;
 					}
 
-					foreach ($token['data']['parameters'] as $parameter) {
-						if (!$this->validateRecursively($parameter['data']['tokens'], $token)) {
+					foreach ($token['data']['parameters'] as $position => $parameter) {
+						if (!$this->validateRecursively($parameter['data']['tokens'], $token, $position)) {
 							return false;
 						}
 					}
@@ -174,7 +182,7 @@ class CExpressionValidator extends CValidator {
 					];
 
 					if ($this->options['calculated']) {
-						$options['aggregating'] = CHistFunctionData::isAggregating($token['data']['function']);
+						$options['aggregating'] = $this->hist_function_data->isAggregating($token['data']['function']);
 					}
 
 					$hist_function_validator = new CHistFunctionValidator($options);
@@ -185,26 +193,123 @@ class CExpressionValidator extends CValidator {
 						return false;
 					}
 
-					if ($options['calculated'] && CHistFunctionData::isAggregatable($token['data']['function'])) {
-						if ($parent_token === null
-								|| $parent_token['type'] != CExpressionParserResult::TOKEN_TYPE_MATH_FUNCTION
-								|| !CMathFunctionData::isAggregating($parent_token['data']['function'])
-								|| count($parent_token['data']['parameters']) != 1
-								|| count($parent_token['data']['parameters'][0]['data']['tokens']) != 1) {
-							$this->setError(_s('incorrect usage of function "%1$s"', $token['data']['function']));
+					if (!$this->validateHistFunctionExpressionRules($token, $parent_token, $position)) {
+						$this->setError(_s('incorrect usage of function "%1$s"', $token['data']['function']));
+
+						return false;
+					}
+
+					break;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param array $token
+	 *
+	 * @return bool
+	 */
+	private function validateMathFunctionExpressionRules(array $token): bool {
+		if (!array_key_exists($token['data']['function'], $this->math_function_expression_rules)) {
+			return true;
+		}
+
+		foreach ($this->math_function_expression_rules[$token['data']['function']] as $rule_set) {
+			if (array_key_exists('if', $rule_set)) {
+				if (array_key_exists('parameters', $rule_set['if'])) {
+					if (array_key_exists('count', $rule_set['if']['parameters'])
+							&& count($token['data']['parameters']) != $rule_set['if']['parameters']['count']) {
+						continue;
+					}
+
+					if (array_key_exists('min', $rule_set['if']['parameters'])
+							&& count($token['data']['parameters']) < $rule_set['if']['parameters']['min']) {
+						continue;
+					}
+
+					if (array_key_exists('max', $rule_set['if']['parameters'])
+							&& count($token['data']['parameters']) > $rule_set['if']['parameters']['max']) {
+						continue;
+					}
+				}
+			}
+
+			foreach ($rule_set['rules'] as $rule) {
+				switch ($rule['type']) {
+					case 'require_history_child':
+						$tokens = $token['data']['parameters'][$rule['position']]['data']['tokens'];
+
+						if (count($tokens) != 1
+								|| $tokens[0]['type'] != CExpressionParserResult::TOKEN_TYPE_HIST_FUNCTION) {
+							return false;
+						}
 
+						if (array_key_exists('in', $rule) && !in_array($tokens[0]['data']['function'], $rule['in'])) {
 							return false;
 						}
+
+						break;
+
+					default:
+						return false;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param array      $token
+	 * @param array|null $parent_token
+	 * @param int|null   $position
+	 *
+	 * @return bool
+	 */
+	private function validateHistFunctionExpressionRules(array $token, ?array $parent_token, ?int $position): bool {
+		if (!array_key_exists($token['data']['function'], $this->hist_function_expression_rules)) {
+			return true;
+		}
+
+		foreach ($this->hist_function_expression_rules[$token['data']['function']] as $rule) {
+			switch ($rule['type']) {
+				case 'require_math_parent':
+					if ($parent_token === null
+							|| $parent_token['type'] != CExpressionParserResult::TOKEN_TYPE_MATH_FUNCTION) {
+						return false;
 					}
 
-					break;
+					if (array_key_exists('in', $rule) && !in_array($parent_token['data']['function'], $rule['in'])) {
+						return false;
+					}
 
-				case CExpressionParserResult::TOKEN_TYPE_EXPRESSION:
-					if (!$this->validateRecursively($token['data']['tokens'], null)) {
+					if (array_key_exists('parameters', $rule)) {
+						if (array_key_exists('count', $rule['parameters'])
+								&& count($parent_token['data']['parameters']) != $rule['parameters']['count']) {
+							return false;
+						}
+
+						if (array_key_exists('min', $rule['parameters'])
+								&& count($parent_token['data']['parameters']) < $rule['parameters']['min']) {
+							return false;
+						}
+
+						if (array_key_exists('max', $rule['parameters'])
+								&& count($parent_token['data']['parameters']) > $rule['parameters']['max']) {
+							return false;
+						}
+					}
+
+					if (array_key_exists('position', $rule) && $position != $rule['position']) {
 						return false;
 					}
 
 					break;
+
+				default:
+					return false;
 			}
 		}
 
diff --git a/ui/include/classes/validators/CMathFunctionValidator.php b/ui/include/classes/validators/CMathFunctionValidator.php
index f759717fada..8040b519dda 100644
--- a/ui/include/classes/validators/CMathFunctionValidator.php
+++ b/ui/include/classes/validators/CMathFunctionValidator.php
@@ -57,21 +57,34 @@ class CMathFunctionValidator extends CValidator {
 			return false;
 		}
 
-		$num_required_parameters = $this->options['parameters'][$token['data']['function']];
 		$num_parameters = count($token['data']['parameters']);
 
-		if (is_array($num_required_parameters)) {
-			$is_valid = ($num_required_parameters[0] === null || $num_parameters >= $num_required_parameters[0])
-				&& ($num_required_parameters[1] === null || $num_parameters <= $num_required_parameters[1]);
-		}
-		else {
-			$is_valid = ($num_parameters == $num_required_parameters);
-		}
+		foreach ($this->options['parameters'][$token['data']['function']] as $rule) {
+			$is_valid = true;
+
+			if (array_key_exists('count', $rule)) {
+				$is_valid = $num_parameters == $rule['count'];
+			}
+
+			if ($is_valid && array_key_exists('min', $rule)) {
+				$is_valid = $num_parameters >= $rule['min'];
 
-		if (!$is_valid) {
-			$this->setError(_s('invalid number of parameters in function "%1$s"', $token['data']['function']));
+				if ($is_valid && array_key_exists('step', $rule)) {
+					$is_valid = ($num_parameters - $rule['min']) % $rule['step'] == 0;
+				}
+			}
+
+			if ($is_valid && array_key_exists('max', $rule)) {
+				$is_valid = $num_parameters <= $rule['max'];
+			}
+
+			if ($is_valid) {
+				return true;
+			}
 		}
 
-		return $is_valid;
+		$this->setError(_s('invalid number of parameters in function "%1$s"', $token['data']['function']));
+
+		return false;
 	}
 }
diff --git a/ui/include/classes/validators/CNewValidator.php b/ui/include/classes/validators/CNewValidator.php
index 11f78afd398..6520fa3ca91 100644
--- a/ui/include/classes/validators/CNewValidator.php
+++ b/ui/include/classes/validators/CNewValidator.php
@@ -61,7 +61,7 @@ class CNewValidator {
 	 */
 	private function validate() {
 		foreach ($this->rules as $field => $rule) {
-			$result = $this->validateField($field, $rule);
+			$this->validateField($field, $rule);
 
 			if (array_key_exists($field, $this->input)) {
 				$this->output[$field] = $this->input[$field];
@@ -69,287 +69,255 @@ class CNewValidator {
 		}
 	}
 
-	private function validateField($field, $rules) {
-		if (false === ($rules = $this->validationRuleParser->parse($rules))) {
+	private function validateField($field, $rules): bool {
+		$rules = $this->validationRuleParser->parse($rules);
+
+		if ($rules === false) {
 			$this->addError(true, $this->validationRuleParser->getError());
+
 			return false;
 		}
 
 		$fatal = array_key_exists('fatal', $rules);
-
 		$flags = array_key_exists('flags', $rules) ? $rules['flags'] : 0x00;
 
+		if (!array_key_exists($field, $this->input)) {
+			if (array_key_exists('required', $rules)) {
+				$this->addError($fatal, _s('Field "%1$s" is mandatory.', $field));
+
+				return false;
+			}
+
+			return true;
+		}
+
+		unset($rules['fatal'], $rules['flags'], $rules['required']);
+
 		foreach ($rules as $rule => $params) {
-			switch ($rule) {
-				/*
-				 * 'fatal' => true
-				 */
-				case 'fatal':
-					// nothing to do
-					break;
+			$value = $this->input[$field];
 
-				/*
-				 * 'not_empty' => true
-				 */
+			switch ($rule) {
 				case 'not_empty':
-					if (array_key_exists($field, $this->input) && $this->input[$field] === '') {
+					if ($value === '') {
 						$this->addError($fatal,
 							_s('Incorrect value for field "%1$s": %2$s.', $field, _('cannot be empty'))
 						);
+
 						return false;
 					}
 					break;
 
 				case 'json':
-					if (array_key_exists($field, $this->input)) {
-						if (!is_string($this->input[$field]) || json_decode($this->input[$field]) === null) {
-							$this->addError($fatal,
-								_s('Incorrect value for field "%1$s": %2$s.', $field, _('JSON string is expected'))
-							);
-							return false;
-						}
+					if (!is_string($value) || json_decode($value) === null) {
+						$this->addError($fatal,
+							_s('Incorrect value for field "%1$s": %2$s.', $field, _('JSON string is expected'))
+						);
+
+						return false;
 					}
 					break;
 
-				/*
-				 * 'in' => array(<values>)
-				 */
 				case 'in':
-					if (array_key_exists($field, $this->input)) {
-						if (!is_string($this->input[$field]) || !in_array($this->input[$field], $params)) {
-							$this->addError($fatal,
-								is_scalar($this->input[$field])
-									? _s('Incorrect value "%1$s" for "%2$s" field.', $this->input[$field], $field)
-									: _s('Incorrect value for "%1$s" field.', $field)
-							);
-							return false;
-						}
+					if ((!is_string($value) && !is_numeric($value)) || !in_array($value, $params)) {
+						$this->addError($fatal,
+							is_scalar($value)
+								? _s('Incorrect value "%1$s" for "%2$s" field.', $value, $field)
+								: _s('Incorrect value for "%1$s" field.', $field)
+						);
+
+						return false;
 					}
 					break;
 
 				case 'int32':
-					if (array_key_exists($field, $this->input)) {
-						if (!is_string($this->input[$field]) || !self::is_int32($this->input[$field])) {
-							$this->addError($fatal,
-								is_scalar($this->input[$field])
-									? _s('Incorrect value "%1$s" for "%2$s" field.', $this->input[$field], $field)
-									: _s('Incorrect value for "%1$s" field.', $field)
-							);
-							return false;
-						}
+					if ((!is_string($value) && !is_numeric($value)) || !self::is_int32($value)) {
+						$this->addError($fatal,
+							is_scalar($value)
+								? _s('Incorrect value "%1$s" for "%2$s" field.', $value, $field)
+								: _s('Incorrect value for "%1$s" field.', $field)
+						);
+
+						return false;
 					}
 					break;
 
 				case 'id':
-					if (array_key_exists($field, $this->input)) {
-						if (!is_string($this->input[$field]) || !self::is_id($this->input[$field])) {
-							$this->addError($fatal,
-								is_scalar($this->input[$field])
-									? _s('Incorrect value "%1$s" for "%2$s" field.', $this->input[$field], $field)
-									: _s('Incorrect value for "%1$s" field.', $field)
-							);
-							return false;
-						}
+					if ((!is_string($value) && !is_numeric($value)) || !self::is_id($value)) {
+						$this->addError($fatal,
+							is_scalar($value)
+								? _s('Incorrect value "%1$s" for "%2$s" field.', $value, $field)
+								: _s('Incorrect value for "%1$s" field.', $field)
+						);
+
+						return false;
 					}
 					break;
 
-				/*
-				 * 'array_id' => true
-				 */
 				case 'array_id':
-					if (array_key_exists($field, $this->input)) {
-						if (!is_array($this->input[$field]) || !$this->is_array_id($this->input[$field])) {
-							$this->addError($fatal,
-								is_scalar($this->input[$field])
-									? _s('Incorrect value "%1$s" for "%2$s" field.', $this->input[$field], $field)
-									: _s('Incorrect value for "%1$s" field.', $field)
-							);
-							return false;
-						}
+					if (!is_array($value) || !$this->is_array_id($value)) {
+						$this->addError($fatal,
+							is_scalar($value)
+								? _s('Incorrect value "%1$s" for "%2$s" field.', $value, $field)
+								: _s('Incorrect value for "%1$s" field.', $field)
+						);
+
+						return false;
 					}
 					break;
 
-				/*
-				 * 'array' => true
-				 */
 				case 'array':
-					if (array_key_exists($field, $this->input) && !is_array($this->input[$field])) {
+					if (!is_array($value)) {
 						$this->addError($fatal,
-							_s('Incorrect value "%1$s" for "%2$s" field.', $this->input[$field], $field)
+							is_scalar($value)
+								? _s('Incorrect value "%1$s" for "%2$s" field.', $value, $field)
+								: _s('Incorrect value for "%1$s" field.', $field)
 						);
 
 						return false;
 					}
 					break;
 
-				/*
-				 * 'array_db' => array(
-				 *     'table' => <table_name>,
-				 *     'field' => <field_name>
-				 * )
-				 */
 				case 'array_db':
-					if (array_key_exists($field, $this->input)) {
-						if (!is_array($this->input[$field])
-								|| !$this->is_array_db($this->input[$field], $params['table'], $params['field'], $flags)
-						) {
-							$this->addError($fatal,
-								is_scalar($this->input[$field])
-									? _s('Incorrect value "%1$s" for "%2$s" field.', $this->input[$field], $field)
-									: _s('Incorrect value for "%1$s" field.', $field)
-							);
-							return false;
-						}
+					if (!is_array($value) || !$this->is_array_db($value, $params['table'], $params['field'], $flags)) {
+						$this->addError($fatal,
+							is_scalar($value)
+								? _s('Incorrect value "%1$s" for "%2$s" field.', $value, $field)
+								: _s('Incorrect value for "%1$s" field.', $field)
+						);
+
+						return false;
 					}
 					break;
 
-				/*
-				 * 'ge' => <value>
-				 */
 				case 'ge':
-					if (array_key_exists($field, $this->input)) {
-						if (!is_string($this->input[$field]) || !self::is_int32($this->input[$field])
-								|| $this->input[$field] < $params) {
-							$this->addError($fatal,
-								_s('Incorrect value for field "%1$s": %2$s.', $field, _s('value must be no less than "%1$s"', $params))
-							);
-
-							return false;
-						}
+					if ((!is_string($value) && !is_numeric($value)) || !self::is_int32($value) || $value < $params) {
+						$this->addError($fatal,
+							_s('Incorrect value for field "%1$s": %2$s.', $field,
+								_s('value must be no less than "%1$s"', $params)
+							)
+						);
+
+						return false;
 					}
 					break;
 
-				/*
-				 * 'le' => <value>
-				 */
 				case 'le':
-					if (array_key_exists($field, $this->input)) {
-						if (!is_string($this->input[$field]) || !self::is_int32($this->input[$field])
-								|| $this->input[$field] > $params) {
-							$this->addError($fatal,
-								_s('Incorrect value for field "%1$s": %2$s.', $field, _s('value must be no greater than "%1$s"', $params))
-							);
-
-							return false;
-						}
+					if ((!is_string($value) && !is_numeric($value)) || !self::is_int32($value) || $value > $params) {
+						$this->addError($fatal,
+							_s('Incorrect value for field "%1$s": %2$s.', $field,
+								_s('value must be no greater than "%1$s"', $params)
+							)
+						);
+
+						return false;
 					}
 					break;
 
-				/*
-				 * 'db' => array(
-				 *     'table' => <table_name>,
-				 *     'field' => <field_name>
-				 * )
-				 */
 				case 'db':
-					if (array_key_exists($field, $this->input)) {
-						if (!$this->is_db($this->input[$field], $params['table'], $params['field'], $flags)) {
-							$this->addError($fatal,
-								is_scalar($this->input[$field])
-									? _s('Incorrect value "%1$s" for "%2$s" field.', $this->input[$field], $field)
-									: _s('Incorrect value for "%1$s" field.', $field)
-							);
-							return false;
-						}
-					}
-					break;
+					$table_fields = DB::getSchema($params['table'])['fields'];
+
+					if ((!is_string($value) && !is_numeric($value))
+							|| !$this->check_db_value($table_fields[$params['field']], $value, $flags)) {
+						$this->addError($fatal,
+							is_scalar($value)
+								? _s('Incorrect value "%1$s" for "%2$s" field.', $value, $field)
+								: _s('Incorrect value for "%1$s" field.', $field)
+						);
 
-				/*
-				 * 'required' => true
-				 */
-				case 'required':
-					if (!array_key_exists($field, $this->input)) {
-						$this->addError($fatal, _s('Field "%1$s" is mandatory.', $field));
 						return false;
 					}
 					break;
 
-				/*
-				 * 'range_time' => true
-				 */
 				case 'range_time':
-					if (array_key_exists($field, $this->input) && !$this->isRangeTime($this->input[$field])) {
+					if ($this->range_time_parser === null) {
+						$this->range_time_parser = new CRangeTimeParser();
+					}
+
+					if (!is_string($value) || $this->range_time_parser->parse($value) != CParser::PARSE_SUCCESS) {
 						$this->addError($fatal,
 							_s('Incorrect value for field "%1$s": %2$s.', $field, _('a time is expected'))
 						);
+
 						return false;
 					}
 					break;
 
-				/*
-				 * 'time_periods' => true
-				 */
 				case 'time_periods':
-					if (array_key_exists($field, $this->input) && !$this->isTimePeriods($this->input[$field])) {
+					if ($this->time_periods_parser === null) {
+						$this->time_periods_parser = new CTimePeriodsParser(['usermacros' => true]);
+					}
+
+					if (!is_string($value) || $this->time_periods_parser->parse($value) != CParser::PARSE_SUCCESS) {
 						$this->addError($fatal,
 							_s('Incorrect value for field "%1$s": %2$s.', $field, _('a time period is expected'))
 						);
+
 						return false;
 					}
 					break;
 
-				/*
-				 * 'time_unit' => true
-				 */
 				case 'time_unit':
-					if (array_key_exists($field, $this->input)) {
-						$result = $this->isTimeUnit($this->input[$field], $params);
-						if (!$result['is_valid']) {
-							$this->addError($fatal,
-								_s('Incorrect value for field "%1$s": %2$s.', $field, $result['error'])
-							);
-							return false;
-						}
+					if (is_string($value) || is_numeric($value)) {
+						$result = $this->isTimeUnit($value, $params);
+						$error_message = $result['is_valid'] ? null : $result['error'];
+					}
+					else {
+						$error_message = _('a time unit is expected');
+					}
+
+					if ($error_message !== null) {
+						$this->addError($fatal, _s('Incorrect value for field "%1$s": %2$s.', $field, $error_message));
+
+						return false;
 					}
 					break;
 
-				/*
-				 * 'rgb' => true
-				 */
 				case 'rgb':
-					if (array_key_exists($field, $this->input) && !$this->isRgb($this->input[$field])) {
+					if (!is_string($value) || preg_match('/^[A-F0-9]{6}$/', $value) == 0) {
 						$this->addError($fatal,
 							_s('Incorrect value for field "%1$s": %2$s.', $field,
 								_('a hexadecimal color code (6 symbols) is expected')
 							)
 						);
+
 						return false;
 					}
 					break;
 
-				/*
-				 * 'string' => true
-				 */
 				case 'string':
-					if (array_key_exists($field, $this->input) && !is_string($this->input[$field])) {
+					if (!is_string($value) && !is_numeric($value)) {
 						$this->addError($fatal,
 							_s('Incorrect value for field "%1$s": %2$s.', $field, _('a character string is expected'))
 						);
+
 						return false;
 					}
 					break;
 
-				/*
-				 * 'string' => true
-				 */
-				case 'cuid':
-					if (array_key_exists($field, $this->input) && !self::isCuid($this->input[$field])) {
+				case 'bool':
+					if (!is_bool($value)) {
 						$this->addError($fatal,
-							_s('Incorrect value for field "%1$s": %2$s.', $field, _('CUID is expected'))
+							_s('Incorrect value for field "%1$s": %2$s.', $field, _('a boolean value is expected'))
 						);
+
 						return false;
 					}
 					break;
 
-				/*
-				 * 'flags' => <value1> | <value2> | ... | <valueN>
-				 */
-				case 'flags':
+				case 'cuid':
+					if (!self::isCuid($value)) {
+						$this->addError($fatal,
+							_s('Incorrect value for field "%1$s": %2$s.', $field, _('CUID is expected'))
+						);
+
+						return false;
+					}
 					break;
 
 				default:
-					// the message can be not translated because it is an internal error
+					// Do not translate.
 					$this->addError($fatal, 'Invalid validation rule "'.$rule.'".');
+
 					return false;
 			}
 		}
@@ -471,30 +439,6 @@ class CNewValidator {
 	}
 
 	/**
-	 * Validate a string value against DB schema.
-	 *
-	 * @param string $value  [IN/OUT] IN - input value, OUT - changed value according to flags.
-	 * @param string $table  DB table name.
-	 * @param string $field  DB field name.
-	 * @param int $flags     Validation flags.
-	 *
-	 * @return bool
-	 */
-	private function is_db(&$value, $table, $field, $flags) {
-		$table_schema = DB::getSchema($table);
-
-		return (is_string($value) && $this->check_db_value($table_schema['fields'][$field], $value, $flags));
-	}
-
-	private function isTimePeriods($value) {
-		if ($this->time_periods_parser === null) {
-			$this->time_periods_parser = new CTimePeriodsParser(['usermacros' => true]);
-		}
-
-		return is_string($value) && $this->time_periods_parser->parse($value) == CParser::PARSE_SUCCESS;
-	}
-
-	/**
 	 * Validate a configuration value. Use simple interval parser to parse the string, convert to seconds and check
 	 * if the value is in between given min and max values. In some cases it's possible to enter 0, or even 0s or 0d.
 	 * If the value is incorrect, set an error.
@@ -555,18 +499,6 @@ class CNewValidator {
 		return ['is_valid' => true];
 	}
 
-	private function isRangeTime($value) {
-		if ($this->range_time_parser === null) {
-			$this->range_time_parser = new CRangeTimeParser();
-		}
-
-		return is_string($value) && $this->range_time_parser->parse($value) == CParser::PARSE_SUCCESS;
-	}
-
-	private function isRgb($value) {
-		return is_string($value) && preg_match('/^[A-F0-9]{6}$/', $value);
-	}
-
 	/**
 	 * Add validation error.
 	 *
diff --git a/ui/include/classes/widgets/views/widget.svggraph.form.view.php b/ui/include/classes/widgets/views/widget.svggraph.form.view.php
index 74c9f57bfcc..559bcff3bf0 100644
--- a/ui/include/classes/widgets/views/widget.svggraph.form.view.php
+++ b/ui/include/classes/widgets/views/widget.svggraph.form.view.php
@@ -148,7 +148,8 @@ $scripts[] =
 		'preview_data.xhr = jQuery.ajax({'.
 			'url: url.getUrl(),'.
 			'method: "POST",'.
-			'data: data,'.
+			'contentType: "application/json",'.
+			'data: JSON.stringify(data),'.
 			'dataType: "json",'.
 			'success: function(r) {'.
 				'if (preview_data.timeoutid) {'.
diff --git a/ui/include/correlation.inc.php b/ui/include/correlation.inc.php
deleted file mode 100644
index 20629490f7c..00000000000
--- a/ui/include/correlation.inc.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/*
-** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**/
-
-
-/**
- * Convert a correlation condition operator to string.
- *
- * @param int $operator
- *
- * @return string
- */
-function corrConditionOperatorToString($operator) {
-	$operators = [
-		CONDITION_OPERATOR_EQUAL => _('equals'),
-		CONDITION_OPERATOR_NOT_EQUAL => _('does not equal'),
-		CONDITION_OPERATOR_LIKE => _('contains'),
-		CONDITION_OPERATOR_NOT_LIKE => _('does not contain')
-	];
-
-	return $operators[$operator];
-}
-
-/**
- * Returns correlation condition types or one type depending on input.
- *
- * @param int $type			Default: null. Returns all condition types.
- *
- * @return mixed			Returns condition type and it's string translation as array key => value pair.
- */
-function corrConditionTypes($type = null) {
-	$types = [
-		ZBX_CORR_CONDITION_OLD_EVENT_TAG => _('Old event tag name'),
-		ZBX_CORR_CONDITION_NEW_EVENT_TAG => _('New event tag name'),
-		ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP => _('New event host group'),
-		ZBX_CORR_CONDITION_EVENT_TAG_PAIR => _('Event tag pair'),
-		ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE => _('Old event tag value'),
-		ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE => _('New event tag value')
-	];
-
-	return ($type === null) ? $types : $types[$type];
-}
-
-/**
- * Returns correlation operation types or one type depending on input.
- *
- * @param int $type			Default: null. Returns all operation types.
- *
- * @return mixed			Returns operation type and it's string translation as array key => value pair.
- */
-function corrOperationTypes($type = null) {
-	$types = [
-		ZBX_CORR_OPERATION_CLOSE_OLD => _('Close old events'),
-		ZBX_CORR_OPERATION_CLOSE_NEW => _('Close new event')
-	];
-
-	return ($type === null) ? $types : $types[$type];
-}
-
-/**
- * Return an array of operators supported by the given correlation condition.
- *
- * @param int $type						Correlation condition type.
- *
- * @return array						Returns array of supported operators.
- */
-function getOperatorsByCorrConditionType($type) {
-	switch ($type) {
-		case ZBX_CORR_CONDITION_OLD_EVENT_TAG:
-		case ZBX_CORR_CONDITION_NEW_EVENT_TAG:
-		case ZBX_CORR_CONDITION_EVENT_TAG_PAIR:
-			return [CONDITION_OPERATOR_EQUAL];
-
-		case ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE:
-		case ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE:
-			return [CONDITION_OPERATOR_EQUAL, CONDITION_OPERATOR_NOT_EQUAL, CONDITION_OPERATOR_LIKE,
-				CONDITION_OPERATOR_NOT_LIKE
-			];
-
-		case ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP:
-			return [CONDITION_OPERATOR_EQUAL, CONDITION_OPERATOR_NOT_EQUAL];
-	}
-}
-
-/**
- * Return the HTML representation of correlation operation type.
- *
- * @param array $operation					An array of correlation operation data.
- * @param int   $operation['type']			Correlation operation type.
- *
- * @return string
- */
-function getCorrOperationDescription(array $operation) {
-	return corrOperationTypes($operation['type']);
-}
-
-/**
- * Returns the HTML representation of a correlation condition.
- *
- * @param array  $condition              Array of correlation condition data.
- * @param int    $condition['type']      Condition type.
- * @param int    $condition['operator']  Condition operator.
- * @param int    $condition['groupid']   (optional) Depends on type.
- * @param int    $condition['newtag']    (optional) Depends on type.
- * @param int    $condition['oldtag']    (optional) Depends on type.
- * @param int    $condition['tag']       (optional) Depends on type.
- * @param int    $condition['value']     (optional) Depends on type.
- * @param array  $group_names            Host group names keyed by host group ID.
- *
- * @return array
- */
-function getCorrConditionDescription(array $condition, array $group_names) {
-	$description = [];
-
-	switch ($condition['type']) {
-		case ZBX_CORR_CONDITION_OLD_EVENT_TAG:
-			$description[] = _('Old event tag name').' '.corrConditionOperatorToString($condition['operator']).' ';
-			$description[] = italic(CHtml::encode($condition['tag']));
-			break;
-
-		case ZBX_CORR_CONDITION_NEW_EVENT_TAG:
-			$description[] = _('New event tag name').' '.corrConditionOperatorToString($condition['operator']).' ';
-			$description[] = italic(CHtml::encode($condition['tag']));
-			break;
-
-		case ZBX_CORR_CONDITION_NEW_EVENT_HOSTGROUP:
-			$description[] = _('New event host group').' '.corrConditionOperatorToString($condition['operator']).' ';
-			$description[] = italic(CHtml::encode(array_key_exists($condition['groupid'], $group_names)
-				? $group_names[$condition['groupid']]
-				: _('Unknown')
-			));
-			break;
-
-		case ZBX_CORR_CONDITION_EVENT_TAG_PAIR:
-			$description[] = _('Value of old event tag').' ';
-			$description[] = italic(CHtml::encode($condition['oldtag']));
-			$description[] = ' '.corrConditionOperatorToString($condition['operator']).' '.
-				_('value of new event tag').' ';
-			$description[] = italic(CHtml::encode($condition['newtag']));
-			break;
-
-		case ZBX_CORR_CONDITION_OLD_EVENT_TAG_VALUE:
-			$description[] = _('Value of old event tag').' ';
-			$description[] = italic(CHtml::encode($condition['tag']));
-			$description[] = ' '.corrConditionOperatorToString($condition['operator']).' ';
-			$description[] = italic(CHtml::encode($condition['value']));
-			break;
-
-		case ZBX_CORR_CONDITION_NEW_EVENT_TAG_VALUE:
-			$description[] = _('Value of new event tag').' ';
-			$description[] = italic(CHtml::encode($condition['tag']));
-			$description[] = ' '.corrConditionOperatorToString($condition['operator']).' ';
-			$description[] = italic(CHtml::encode($condition['value']));
-			break;
-	}
-
-	return $description;
-}
diff --git a/ui/include/db.inc.php b/ui/include/db.inc.php
index d02f01ce82d..ba4f00c7c65 100644
--- a/ui/include/db.inc.php
+++ b/ui/include/db.inc.php
@@ -401,7 +401,16 @@ function DBfetch($cursor, $convertNulls = true) {
 			}
 			break;
 		case ZBX_DB_POSTGRESQL:
-			if (!$result = pg_fetch_assoc($cursor)) {
+			if ($result = pg_fetch_assoc($cursor)) {
+				$i = 0;
+				foreach ($result as &$value) {
+					if (pg_field_type($cursor, $i++) === 'bytea') {
+						$value = pg_unescape_bytea($value);
+					}
+				}
+				unset($value);
+			}
+			else {
 				pg_free_result($cursor);
 			}
 			break;
diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php
index cea97ed56d8..e397e0d09ab 100644
--- a/ui/include/defines.inc.php
+++ b/ui/include/defines.inc.php
@@ -18,11 +18,11 @@
 ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **/
 
-define('ZABBIX_VERSION',		'6.0.0alpha4');
+define('ZABBIX_VERSION',		'6.0.0alpha5');
 define('ZABBIX_API_VERSION',	'6.0.0');
 define('ZABBIX_EXPORT_VERSION',	'6.0');
 
-define('ZABBIX_DB_VERSION',		5050078);
+define('ZABBIX_DB_VERSION',		5050083);
 
 define('DB_VERSION_SUPPORTED',				0);
 define('DB_VERSION_LOWER_THAN_MINIMUM',		1);
@@ -1346,6 +1346,11 @@ define('API_UUID',					42);
 define('API_VAULT_SECRET',			43);
 define('API_CUID',					45);
 define('API_IP_RANGES',				46);
+define('API_IMAGE',					47);
+define('API_EXEC_PARAMS',			48);
+define('API_COND_FORMULA',			49);
+define('API_COND_FORMULAID',		50);
+define('API_UNEXPECTED',			51);
 
 // flags
 define('API_REQUIRED',					0x0001);
@@ -1442,9 +1447,6 @@ define('ZBX_TEXTAREA_STANDARD_ROWS',			7);
 // decoration borders
 define('ZBX_HOST_INTERFACE_WIDTH',				750);
 
-// overviews help
-define('ZBX_OVERVIEW_HELP_MIN_WIDTH',			125);
-
 // Helper buttons that allow selected objects to be added, replaced or removed.
 define('ZBX_ACTION_ADD',		0);
 define('ZBX_ACTION_REPLACE',	1);
@@ -1797,6 +1799,10 @@ define('ZBX_STYLE_ACTIONS_NUM_YELLOW', 'icon-actions-number-yellow');
 define('ZBX_STYLE_ACTIONS_NUM_RED', 'icon-actions-number-red');
 define('ZBX_STYLE_INACTIVE_BG', 'inactive-bg');
 define('ZBX_STYLE_INFO_BG', 'info-bg');
+define('ZBX_STYLE_INLINE_FILTER', 'inline-filter');
+define('ZBX_STYLE_INLINE_FILTER_LABEL', 'inline-filter-label');
+define('ZBX_STYLE_INLINE_FILTER_FOOTER', 'inline-filter-footer');
+define('ZBX_STYLE_INLINE_FILTER_STATS', 'inline-filter-stats');
 define('ZBX_STYLE_INPUT_COLOR_PICKER', 'input-color-picker');
 define('ZBX_STYLE_LAYOUT_KIOSKMODE', 'layout-kioskmode');
 define('ZBX_STYLE_CONTAINER', 'container');
@@ -1834,9 +1840,6 @@ define('ZBX_STYLE_MSG_DETAILS', 'msg-details');
 define('ZBX_STYLE_MSG_DETAILS_BORDER', 'msg-details-border');
 define('ZBX_STYLE_NA_BG', 'na-bg');
 define('ZBX_STYLE_NORMAL_BG', 'normal-bg');
-define('ZBX_STYLE_NOTIF_BODY', 'notif-body');
-define('ZBX_STYLE_NOTIF_INDIC', 'notif-indic');
-define('ZBX_STYLE_NOTIF_INDIC_CONTAINER', 'notif-indic-container');
 define('ZBX_STYLE_NOTHING_TO_SHOW', 'nothing-to-show');
 define('ZBX_STYLE_NOWRAP', 'nowrap');
 define('ZBX_STYLE_WORDWRAP', 'wordwrap');
diff --git a/ui/include/gettextwrapper.inc.php b/ui/include/gettextwrapper.inc.php
index 66a48d59e29..cbc56799dcb 100644
--- a/ui/include/gettextwrapper.inc.php
+++ b/ui/include/gettextwrapper.inc.php
@@ -166,8 +166,9 @@ function _xs($message, $context) {
 }
 
 /**
- * Translates the string with respect to the given context and plural forms, also replaces placeholders with supplied arguments.
- * If no translation is found, the original string will be used. Unlimited number of parameters supplied.
+ * Translates the string with respect to the given context and plural forms, also replaces placeholders with supplied
+ * arguments. If no translation is found, the original string will be used. Unlimited number of parameters supplied.
+ *
  * Parameter placeholders must be defined as %1$s, %2$s etc.
  *
  * Example: _xn('%1$s message for arg1 "%2$s"', '%1$s messages for arg1 "%2$s"', 3, 'context', 'arg1Value');
@@ -199,3 +200,59 @@ function _xn($message, $messagePlural, $num, $context) {
 function _params($format, array $arguments) {
 	return vsprintf($format, $arguments);
 }
+
+/**
+ * Initialize locale environment and gettext translations depending on language selected by user.
+ *
+ * Note: should be called before including file includes/translateDefines.inc.php.
+ *
+ * @param string $language    Locale language prefix like en_US, ru_RU etc.
+ * @param string $error       Message on failure.
+ *
+ * @return bool    Whether locale could be switched; always true for en_GB.
+ */
+function setupLocale(string $language, ?string &$error = ''): bool {
+	$numeric_locales = [
+		'C', 'POSIX', 'en', 'en_US', 'en_US.UTF-8', 'English_United States.1252', 'en_GB', 'en_GB.UTF-8'
+	];
+	$locale_variants = zbx_locale_variants($language);
+	$locale_set = false;
+	$error = '';
+
+	init_mbstrings();
+
+	// Since LC_MESSAGES may be unavailable on some systems, try to set all of the locales and then make adjustments.
+	foreach ($locale_variants as $locale) {
+		putenv('LC_ALL='.$locale);
+		putenv('LANG='.$locale);
+		putenv('LANGUAGE='.$locale);
+
+		if (setlocale(LC_ALL, $locale)) {
+			$locale_set = true;
+			break;
+		}
+	}
+
+	// Force PHP to always use a point instead of a comma for decimal numbers.
+	setlocale(LC_NUMERIC, $numeric_locales);
+
+	if (function_exists('bindtextdomain')) {
+		bindtextdomain('frontend', 'locale');
+		bind_textdomain_codeset('frontend', 'UTF-8');
+		textdomain('frontend');
+	}
+
+	if (!$locale_set && strtolower($language) !== 'en_gb') {
+		setlocale(LC_ALL, $numeric_locales);
+
+		$language = htmlspecialchars($language, ENT_QUOTES, 'UTF-8');
+		$locale_variants = array_map(function ($locale) {
+			return htmlspecialchars($locale, ENT_QUOTES, 'UTF-8');
+		}, $locale_variants);
+
+		$error = 'Locale for language "'.$language.'" is not found on the web server. Tried to set: '.
+			implode(', ', $locale_variants).'. Unable to translate Zabbix interface.';
+	}
+
+	return ($error === '');
+}
diff --git a/ui/include/hosts.inc.php b/ui/include/hosts.inc.php
index adebef0d10f..41f50ab4884 100644
--- a/ui/include/hosts.inc.php
+++ b/ui/include/hosts.inc.php
@@ -741,73 +741,6 @@ function makeHostPrototypeTemplatesHtml($host_prototypeid, array $parent_templat
 	return $list;
 }
 
-/**
- * Get host ids of hosts which $groupids can be unlinked from.
- * if $hostids is passed, function will check only these hosts.
- *
- * @param array $groupids
- * @param array $hostids
- *
- * @return array
- */
-function getUnlinkableHostIds(array $groupIds, array $hostIds) {
-	if (!$hostIds) {
-		return [];
-	}
-
-	$dbResult = DBselect(
-		'SELECT hg.hostid'.
-		' FROM hosts_groups hg'.
-		' WHERE '.dbConditionInt('hg.groupid', $groupIds, true).
-			' AND '.dbConditionInt('hg.hostid', $hostIds).
-		' GROUP BY hg.hostid'
-	);
-
-	$unlinkableHostIds = [];
-	while ($dbRow = DBfetch($dbResult)) {
-		$unlinkableHostIds[] = $dbRow['hostid'];
-	}
-
-	return $unlinkableHostIds;
-}
-
-function getDeletableHostGroupIds(array $groupIds) {
-	// selecting the list of hosts linked to the host groups
-	$dbResult = DBselect(
-		'SELECT hg.hostid'.
-		' FROM hosts_groups hg'.
-		' WHERE '.dbConditionInt('hg.groupid', $groupIds)
-	);
-
-	$linkedHostIds = [];
-	while ($dbRow = DBfetch($dbResult)) {
-		$linkedHostIds[] = $dbRow['hostid'];
-	}
-
-	// the list of hosts which can be unlinked from the host groups
-	$hostIds = getUnlinkableHostIds($groupIds, $linkedHostIds);
-
-	$dbResult = DBselect(
-		'SELECT g.groupid'.
-		' FROM hstgrp g'.
-		' WHERE g.internal='.ZBX_NOT_INTERNAL_GROUP.
-			' AND '.dbConditionInt('g.groupid', $groupIds).
-			' AND NOT EXISTS ('.
-				'SELECT NULL'.
-				' FROM hosts_groups hg'.
-				' WHERE g.groupid=hg.groupid'.
-					($hostIds ? ' AND '.dbConditionInt('hg.hostid', $hostIds, true) : '').
-			')'
-	);
-
-	$deletableGroupIds = [];
-	while ($dbRow = DBfetch($dbResult)) {
-		$deletableGroupIds[$dbRow['groupid']] = $dbRow['groupid'];
-	}
-
-	return $deletableGroupIds;
-}
-
 function isTemplate($hostId) {
 	$dbHost = DBfetch(DBselect('SELECT h.status FROM hosts h WHERE h.hostid='.zbx_dbstr($hostId)));
 
diff --git a/ui/include/html.inc.php b/ui/include/html.inc.php
index 2f745f1813b..ac1e0dc27f3 100644
--- a/ui/include/html.inc.php
+++ b/ui/include/html.inc.php
@@ -175,10 +175,6 @@ function get_icon($type, $params = []) {
 			}
 
 			return $icon;
-
-		case 'overviewhelp':
-			return (new CRedirectButton(SPACE, null))
-				->addClass(ZBX_STYLE_BTN_INFO);
 	}
 }
 
diff --git a/ui/include/httptest.inc.php b/ui/include/httptest.inc.php
index 4536c796295..0f892253d6a 100644
--- a/ui/include/httptest.inc.php
+++ b/ui/include/httptest.inc.php
@@ -76,40 +76,44 @@ function httptest_status2style($status) {
 /**
  * Delete web scenario item and web scenario step item history and trends by given web scenario IDs.
  *
- * @param array $http_testids
+ * @param array $httptestids
  *
  * @return bool
  */
-function deleteHistoryByHttpTestIds(array $http_testids) {
+function deleteHistoryByHttpTestIds(array $httptestids): bool {
+	DBstart();
+
 	$itemids = [];
 
 	$db_items = DBselect(
 		'SELECT hti.itemid'.
 		' FROM httptestitem hti'.
-		' WHERE '.dbConditionInt('httptestid', $http_testids).
+		' WHERE '.dbConditionInt('httptestid', $httptestids).
 		' UNION ALL '.
 		'SELECT hsi.itemid'.
 		' FROM httpstep hs,httpstepitem hsi'.
 		' WHERE hs.httpstepid=hsi.httpstepid'.
-			' AND '.dbConditionInt('httptestid', $http_testids)
+			' AND '.dbConditionInt('httptestid', $httptestids)
 	);
 
 	while ($db_item = DBfetch($db_items)) {
 		$itemids[] = $db_item['itemid'];
 	}
 
-	if ($itemids) {
-		$items = API::Item()->get([
-			'output' => ['itemid', 'value_type'],
-			'itemids' => $itemids,
-			'editable' => true,
-			'webitems' => true
-		]);
+	$result = true;
 
-		return Manager::History()->deleteHistory(array_column($items, 'value_type', 'itemid'));
+	if ($itemids) {
+		$result = (bool) API::History()->clear($itemids);
 	}
 
-	return true;
+	$result = ($result && DB::update('httptest', [
+		'values' => ['nextcheck' => 0],
+		'where' => ['httptestid' => $httptestids]
+	]));
+
+	$result = DBend($result);
+
+	return $result;
 }
 
 function get_httptest_by_httptestid($httptestid) {
diff --git a/ui/include/images.inc.php b/ui/include/images.inc.php
index 2a3258369ac..05e2a487237 100644
--- a/ui/include/images.inc.php
+++ b/ui/include/images.inc.php
@@ -37,22 +37,11 @@ function get_image_by_imageid($imageid) {
 
 	if (!isset($images[$imageid])) {
 		$row = DBfetch(DBselect('SELECT i.* FROM images i WHERE i.imageid='.zbx_dbstr($imageid)));
-		$row['image'] = zbx_unescape_image($row['image']);
 		$images[$imageid] = $row;
 	}
 	return $images[$imageid];
 }
 
-function zbx_unescape_image($image) {
-	global $DB;
-
-	$result = $image ? $image : 0;
-	if ($DB['TYPE'] == ZBX_DB_POSTGRESQL) {
-		$result = pg_unescape_bytea($image);
-	}
-	return $result;
-}
-
 /**
  * Resizes the given image resource to the specified size keeping the original
  * proportions of the image.
diff --git a/ui/include/page_header.php b/ui/include/page_header.php
index 3e78887c6b8..e1e865850fc 100644
--- a/ui/include/page_header.php
+++ b/ui/include/page_header.php
@@ -120,7 +120,7 @@ if ($page['type'] == PAGE_TYPE_HTML) {
 	}
 	$pageTitle .= isset($page['title']) ? $page['title'] : _('Zabbix');
 
-	if ((defined('ZBX_PAGE_DO_REFRESH') || defined('ZBX_PAGE_DO_JS_REFRESH')) && CWebUser::getRefresh() != 0) {
+	if (defined('ZBX_PAGE_DO_JS_REFRESH') && CWebUser::getRefresh() != 0) {
 		$pageTitle .= ' ['._s('refreshed every %1$s sec.', CWebUser::getRefresh()).']';
 	}
 
diff --git a/ui/include/schema.inc.php b/ui/include/schema.inc.php
index 063e75a9db0..e0996ba6938 100644
--- a/ui/include/schema.inc.php
+++ b/ui/include/schema.inc.php
@@ -1519,7 +1519,7 @@ return [
 			],
 			'message' => [
 				'null' => false,
-				'type' => DB::FIELD_TYPE_TEXT,
+				'type' => DB::FIELD_TYPE_NCLOB,
 				'default' => ''
 			]
 		]
@@ -2797,8 +2797,7 @@ return [
 			],
 			'description' => [
 				'null' => false,
-				'type' => DB::FIELD_TYPE_CHAR,
-				'length' => 255,
+				'type' => DB::FIELD_TYPE_TEXT,
 				'default' => ''
 			],
 			'url' => [
@@ -6826,7 +6825,7 @@ return [
 			],
 			'params' => [
 				'null' => false,
-				'type' => DB::FIELD_TYPE_TEXT,
+				'type' => DB::FIELD_TYPE_NCLOB,
 				'default' => ''
 			],
 			'error_handler' => [
diff --git a/ui/include/translateDefines.inc.php b/ui/include/translateDefines.inc.php
index 15feeb6488b..5f4c191eb78 100644
--- a/ui/include/translateDefines.inc.php
+++ b/ui/include/translateDefines.inc.php
@@ -33,3 +33,6 @@ define('DATE_TIME_FORMAT_SHORT', _('m-d H:i'));
 define('DATE_FORMAT', _('Y-m-d'));
 define('TIME_FORMAT_SECONDS', _('H:i:s'));
 define('TIME_FORMAT', _('H:i'));
+define('SVG_GRAPH_DATE_TIME_FORMAT_SHORT', _('n-d H:i'));
+define('SVG_GRAPH_DATE_FORMAT', _('Y-n-d'));
+define('SVG_GRAPH_DATE_FORMAT_SHORT', _('n-d'));
diff --git a/ui/include/triggers.inc.php b/ui/include/triggers.inc.php
index d7802e02449..350d3a4d52e 100644
--- a/ui/include/triggers.inc.php
+++ b/ui/include/triggers.inc.php
@@ -1659,6 +1659,7 @@ function get_item_function_info(string $expr) {
 		'min' => $rules['numeric'],
 		'nodata' => $rules['numeric_as_0or1'] + $rules['string_as_0or1'],
 		'percentile' => $rules['numeric'],
+		'rate' => $rules['numeric'],
 		'skewness' => $rules['numeric_as_float'],
 		'stddevpop' => $rules['numeric_as_float'],
 		'stddevsamp' => $rules['numeric_as_float'],
diff --git a/ui/include/views/configuration.host.edit.php b/ui/include/views/configuration.host.edit.php
index 3e77b801c2d..c71797ea7e4 100644
--- a/ui/include/views/configuration.host.edit.php
+++ b/ui/include/views/configuration.host.edit.php
@@ -354,7 +354,7 @@ $divTabs->addTab('ipmiTab', _('IPMI'),
 $divTabs->addTab('tags-tab', _('Tags'), new CPartial('configuration.tags.tab', [
 		'source' => 'host',
 		'tags' => $data['tags'],
-		'readonly' => false
+		'readonly' => $data['readonly']
 	]), TAB_INDICATOR_TAGS
 );
 
diff --git a/ui/include/views/configuration.hostgroups.edit.php b/ui/include/views/configuration.hostgroups.edit.php
index 3a1624bc85e..6ee5050d51a 100644
--- a/ui/include/views/configuration.hostgroups.edit.php
+++ b/ui/include/views/configuration.hostgroups.edit.php
@@ -60,8 +60,7 @@ else {
 	$tab->setFooter(makeFormFooter(
 		new CSubmit('update', _('Update')), [
 			(new CSubmit('clone', _('Clone')))->setEnabled(CWebUser::getType() == USER_TYPE_SUPER_ADMIN),
-			(new CButtonDelete(_('Delete selected group?'), url_param('form').url_param('groupid')))
-				->setEnabled(array_key_exists($data['groupid'], $data['deletable_host_groups'])),
+			(new CButtonDelete(_('Delete selected group?'), url_param('form').url_param('groupid'))),
 			new CButtonCancel()
 		]
 	));
diff --git a/ui/include/views/js/common.init.js.php b/ui/include/views/js/common.init.js.php
index 837e60e80c6..09b581eefb6 100644
--- a/ui/include/views/js/common.init.js.php
+++ b/ui/include/views/js/common.init.js.php
@@ -26,10 +26,6 @@
 
 <script type="text/javascript">
 	jQuery(document).ready(function() {
-		<?php if (defined('ZBX_PAGE_DO_REFRESH') && CWebUser::getRefresh() != 0): ?>
-			PageRefresh.init(<?= CWebUser::getRefresh() * 1000 ?>);
-		<?php endif ?>
-
 		<?php if (isset($page['scripts']) && in_array('flickerfreescreen.js', $page['scripts'])): ?>
 			window.flickerfreeScreen.responsiveness = <?php echo SCREEN_REFRESH_RESPONSIVENESS * 1000; ?>;
 		<?php endif ?>
diff --git a/ui/include/views/monitoring.overview.items.php b/ui/include/views/monitoring.overview.items.php
deleted file mode 100644
index f2d680e7bb3..00000000000
--- a/ui/include/views/monitoring.overview.items.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/*
-** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**/
-
-
-/**
- * @var CView $this
- */
-
-// hint table
-$help_hint = (new CList())
-	->addClass(ZBX_STYLE_NOTIF_BODY)
-	->addStyle('min-width: '.ZBX_OVERVIEW_HELP_MIN_WIDTH.'px');
-for ($severity = TRIGGER_SEVERITY_NOT_CLASSIFIED; $severity < TRIGGER_SEVERITY_COUNT; $severity++) {
-	$help_hint->addItem([
-		(new CDiv())
-			->addClass(ZBX_STYLE_NOTIF_INDIC)
-			->addClass(CSeverityHelper::getStyle($severity)),
-		new CTag('h4', true, CSeverityHelper::getName($severity)),
-		(new CTag('p', true, _('PROBLEM')))->addClass(ZBX_STYLE_GREY)
-	]);
-}
-
-// header right
-$web_layout_mode = CViewHelper::loadLayoutMode();
-
-$submenu_source = [
-	SHOW_TRIGGERS => _('Trigger overview'),
-	SHOW_DATA => _('Data overview')
-];
-
-$submenu = [];
-foreach ($submenu_source as $value => $label) {
-	$url = (new CUrl('overview.php'))
-		->setArgument('type', $value)
-		->getUrl();
-
-	$submenu[$url] = $label;
-}
-
-$widget = (new CWidget())
-	->setTitle(array_key_exists($this->data['type'], $submenu_source) ? $submenu_source[$this->data['type']] : null)
-	->setTitleSubmenu([
-		'main_section' => [
-			'items' => $submenu
-		]
-	])
-	->setWebLayoutMode($web_layout_mode)
-	->setControls(
-		(new CTag('nav', true, (new CList())
-			->addItem((new CForm('get'))
-				->cleanItems()
-				->setName('main_filter')
-				->setAttribute('aria-label', _('Main filter'))
-				->addItem(new CInput('hidden', 'type', $data['type']))
-				->addItem((new CList())
-					->addItem([
-						new CLabel(_('Hosts location'), 'label-view-style'),
-						(new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN),
-						(new CSelect('view_style'))
-							->setId('hosts-location')
-							->setValue($data['view_style'])
-							->setFocusableElementId('label-view-style')
-							->addOption(new CSelectOption(STYLE_TOP, _('Top')))
-							->addOption(new CSelectOption(STYLE_LEFT, _('Left')))
-					])
-				)
-			)
-			->addItem(get_icon('kioskmode', ['mode' => $web_layout_mode]))
-			->addItem(get_icon('overviewhelp')->setHint($help_hint))
-		))
-			->setAttribute('aria-label', _('Content controls'))
-	);
-
-if ($web_layout_mode == ZBX_LAYOUT_NORMAL) {
-	// filter
-	$widget->addItem(new CPartial('common.filter.item', [
-		'filter' => [
-			'groups' => $data['filter']['groups'],
-			'hosts' => $data['filter']['hosts'],
-			'show_suppressed' => $data['filter']['show_suppressed'],
-			'tags' => $data['filter']['tags'],
-			'evaltype' => $data['filter']['evaltype']
-		],
-		'profileIdx' => $data['profileIdx'],
-		'active_tab' => $data['active_tab']
-	]));
-}
-
-$partial = ($data['view_style'] == STYLE_TOP) ? 'dataoverview.table.top' : 'dataoverview.table.left';
-$table = new CPartial($partial, [
-	'items' => $data['items'],
-	'hosts' => $data['hosts'],
-	'has_hidden_data' => $data['has_hidden_data']
-]);
-
-$widget->addItem($table);
-
-$widget->show();
diff --git a/ui/include/views/monitoring.overview.triggers.php b/ui/include/views/monitoring.overview.triggers.php
deleted file mode 100644
index df259d30ab7..00000000000
--- a/ui/include/views/monitoring.overview.triggers.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/*
-** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**/
-
-
-/**
- * @var CView $this
- */
-
-zbx_add_post_js('jqBlink.blink();');
-
-// hint table
-$help_hint = (new CList())
-	->addClass(ZBX_STYLE_NOTIF_BODY)
-	->addStyle('min-width: '.ZBX_OVERVIEW_HELP_MIN_WIDTH.'px')
-	->addItem([
-		(new CDiv())
-			->addClass(ZBX_STYLE_NOTIF_INDIC)
-			->addClass(CSeverityHelper::getStyle(null, false)),
-		new CTag('h4', true, _('OK')),
-		(new CTag('p', true, ''))->addClass(ZBX_STYLE_GREY)
-	]);
-for ($severity = TRIGGER_SEVERITY_NOT_CLASSIFIED; $severity < TRIGGER_SEVERITY_COUNT; $severity++) {
-	$help_hint->addItem([
-		(new CDiv())
-			->addClass(ZBX_STYLE_NOTIF_INDIC)
-			->addClass(CSeverityHelper::getStyle($severity)),
-		new CTag('h4', true, CSeverityHelper::getName($severity)),
-		(new CTag('p', true, _('PROBLEM')))->addClass(ZBX_STYLE_GREY)
-	]);
-}
-
-// blinking preview in help popup (only if blinking is enabled)
-$blink_period = timeUnitToSeconds($data['config']['blink_period']);
-if ($blink_period > 0) {
-	$indic_container = (new CDiv())
-		->addClass(ZBX_STYLE_NOTIF_INDIC_CONTAINER)
-		->addItem(
-			(new CDiv())
-				->addClass(ZBX_STYLE_NOTIF_INDIC)
-				->addClass(CSeverityHelper::getStyle(null, false))
-				->addClass('blink')
-				->setAttribute('data-toggle-class', ZBX_STYLE_BLINK_HIDDEN)
-		);
-	for ($severity = TRIGGER_SEVERITY_NOT_CLASSIFIED; $severity < TRIGGER_SEVERITY_COUNT; $severity++) {
-		$indic_container->addItem(
-			(new CDiv())
-				->addClass(ZBX_STYLE_NOTIF_INDIC)
-				->addClass(CSeverityHelper::getStyle($severity))
-				->addClass('blink')
-				->setAttribute('data-toggle-class', ZBX_STYLE_BLINK_HIDDEN)
-			);
-	}
-	$indic_container->addItem(
-		(new CTag('p', true, _s('Age less than %1$s', convertUnitsS($blink_period))))->addClass(ZBX_STYLE_GREY)
-	);
-
-	$help_hint->addItem($indic_container);
-}
-
-// header right
-$web_layout_mode = CViewHelper::loadLayoutMode();
-
-$submenu_source = [
-	SHOW_TRIGGERS => _('Trigger overview'),
-	SHOW_DATA => _('Data overview')
-];
-
-$submenu = [];
-foreach ($submenu_source as $value => $label) {
-	$url = (new CUrl('overview.php'))
-		->setArgument('type', $value)
-		->getUrl();
-
-	$submenu[$url] = $label;
-}
-
-$widget = (new CWidget())
-	->setTitle(array_key_exists($this->data['type'], $submenu_source) ? $submenu_source[$this->data['type']] : null)
-	->setTitleSubmenu([
-		'main_section' => [
-			'items' => $submenu
-		]
-	])
-	->setWebLayoutMode($web_layout_mode)
-	->setControls(new CList([
-		(new CForm('get'))
-			->cleanItems()
-			->setName('main_filter')
-			->setAttribute('aria-label', _('Main filter'))
-			->addItem(new CInput('hidden', 'type', $this->data['type']))
-			->addItem((new CList())
-				->addItem([
-					new CLabel(_('Hosts location'), 'label-view-style'),
-					(new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN),
-					(new CSelect('view_style'))
-						->setId('hosts-location')
-						->setValue($data['view_style'])
-						->setFocusableElementId('label-view-style')
-						->addOption(new CSelectOption(STYLE_TOP, _('Top')))
-						->addOption(new CSelectOption(STYLE_LEFT, _('Left')))
-				])
-			),
-		(new CTag('nav', true, (new CList())
-			->addItem(get_icon('kioskmode', ['mode' => $web_layout_mode]))
-			->addItem(get_icon('overviewhelp')->setHint($help_hint))
-		))
-			->setAttribute('aria-label', _('Content controls'))
-	]));
-
-if ($web_layout_mode == ZBX_LAYOUT_NORMAL) {
-	// filter
-	$widget->addItem(new CPartial('common.filter.trigger', [
-		'filter' => [
-			'showTriggers' => $data['filter']['showTriggers'],
-			'ackStatus' => $data['filter']['ackStatus'],
-			'showSeverity' => $data['filter']['showSeverity'],
-			'statusChange' => $data['filter']['statusChange'],
-			'statusChangeDays' => $data['filter']['statusChangeDays'],
-			'txtSelect' => $data['filter']['txtSelect'],
-			'inventory' => $data['filter']['inventory'],
-			'show_suppressed' => $data['filter']['show_suppressed'],
-			'groups' => $data['filter']['groups'],
-			'hosts' => $data['filter']['hosts'],
-			'tags' => $data['filter']['tags'],
-			'evaltype' => $data['filter']['evaltype']
-		],
-		'profileIdx' => $data['profileIdx'],
-		'active_tab' => $data['active_tab']
-	]));
-}
-
-if ($data['view_style'] == STYLE_TOP) {
-	$table = new CPartial('trigoverview.table.top', $data);
-}
-else {
-	$table = new CPartial('trigoverview.table.left', $data);
-}
-
-$widget->addItem($table);
-
-$widget->addItem((new CScriptTag(
-	'$.subscribe("acknowledge.create", function(event, response, overlay) {'.
-		'postMessageOk(response.message);'.
-		'location.href = location.href;'.
-	'});'
-))->setOnDocumentReady());
-
-$widget->show();
diff --git a/ui/items.php b/ui/items.php
index 6e9763241f0..b14cd6fa06b 100644
--- a/ui/items.php
+++ b/ui/items.php
@@ -953,41 +953,9 @@ elseif (hasRequest('check_now') && hasRequest('itemid')) {
 }
 // cleaning history for one item
 elseif (hasRequest('del_history') && hasRequest('itemid')) {
-	$result = false;
-
-	if (CHousekeepingHelper::get(CHousekeepingHelper::COMPRESSION_STATUS)) {
-		$error_message = _('History cleanup is not supported if compression is enabled');
-	}
-	else {
-		$error_message = _('Cannot clear history');
-		$itemId = getRequest('itemid');
-
-		$items = API::Item()->get([
-			'output' => ['itemid', 'key_', 'value_type'],
-			'itemids' => [$itemId],
-			'selectHosts' => ['name'],
-			'editable' => true
-		]);
-
-		if ($items) {
-			DBstart();
-
-			$result = Manager::History()->deleteHistory(array_column($items, 'value_type', 'itemid'));
+	$result = (bool) API::History()->clear([getRequest('itemid')]);
 
-			// if ($result) {
-			// 	$item = reset($items);
-			// 	$host = reset($item['hosts']);
-
-			// 	add_audit(AUDIT_ACTION_UPDATE, AUDIT_RESOURCE_ITEM, _('Item').' ['.$item['key_'].'] ['.$itemId.'] '.
-			// 		_('Host').' ['.$host['name'].'] '._('History cleared')
-			// 	);
-			// }
-
-			$result = DBend($result);
-		}
-	}
-
-	show_messages($result, _('History cleared'), $error_message);
+	show_messages($result, _('History cleared'), _('Cannot clear history'));
 }
 elseif (hasRequest('action') && str_in_array(getRequest('action'), ['item.massenable', 'item.massdisable']) && hasRequest('group_itemid')) {
 	$itemids = getRequest('group_itemid');
@@ -1061,59 +1029,13 @@ elseif (hasRequest('action') && getRequest('action') === 'item.masscopyto' && ha
 // clean history for selected items
 elseif (hasRequest('action') && getRequest('action') === 'item.massclearhistory'
 		&& hasRequest('group_itemid') && is_array(getRequest('group_itemid'))) {
-	$result = false;
-
-	if (CHousekeepingHelper::get(CHousekeepingHelper::COMPRESSION_STATUS)) {
-		$error_message = _('History cleanup is not supported if compression is enabled');
-	}
-	else {
-		$error_message = _('Cannot clear history: at least one of the selected items doesn\'t belong to any monitored host');
+	$result = (bool) API::History()->clear(getRequest('group_itemid'));
 
-		$itemIds = getRequest('group_itemid');
-
-		$items = API::Item()->get([
-			'output' => ['itemid', 'key_', 'value_type'],
-			'itemids' => $itemIds,
-			'selectHosts' => ['name', 'status'],
-			'editable' => true
-		]);
-
-		if ($items) {
-			// Check items belong only to hosts.
-			$hosts_status = [];
-			foreach ($items as $item) {
-				$hosts_status[$item['hosts'][0]['status']] = true;
-			}
-
-			if (array_key_exists(HOST_STATUS_TEMPLATE, $hosts_status)) {
-				$result = false;
-			}
-			else {
-				DBstart();
-
-				$result = Manager::History()->deleteHistory(array_column($items, 'value_type', 'itemid'));
-
-				// if ($result) {
-				// 	foreach ($items as $item) {
-				// 		$host = reset($item['hosts']);
-
-				// 		add_audit(AUDIT_ACTION_UPDATE, AUDIT_RESOURCE_ITEM,
-				// 			_('Item').' ['.$item['key_'].'] ['.$item['itemid'].'] '. _('Host').' ['.$host['name'].'] '.
-				// 				_('History cleared')
-				// 		);
-				// 	}
-				// }
-
-				$result = DBend($result);
-
-				if ($result) {
-					uncheckTableRows(getRequest('checkbox_hash'));
-				}
-			}
-		}
+	if ($result) {
+		uncheckTableRows(getRequest('checkbox_hash'));
 	}
 
-	show_messages($result, _('History cleared'), $error_message);
+	show_messages($result, _('History cleared'), _('Cannot clear history'));
 }
 elseif (hasRequest('action') && getRequest('action') === 'item.massdelete' && hasRequest('group_itemid')) {
 	$group_itemid = getRequest('group_itemid');
diff --git a/ui/js/class.dashboard.js b/ui/js/class.dashboard.js
index 73f4b431a77..9eb5a9d9e1d 100644
--- a/ui/js/class.dashboard.js
+++ b/ui/js/class.dashboard.js
@@ -680,10 +680,8 @@ class CDashboard extends CBaseComponent {
 
 		return fetch(curl.getUrl(), {
 			method: 'POST',
-			headers: {
-				'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
-			},
-			body: urlEncodeData({widgets: request_widgets_data})
+			headers: {'Content-Type': 'application/json'},
+			body: JSON.stringify({widgets: request_widgets_data})
 		})
 			.then((response) => response.json())
 			.then((response) => {
@@ -977,16 +975,14 @@ class CDashboard extends CBaseComponent {
 		properties.template = this._data.templateid !== null ? 1 : undefined;
 		properties.name = properties.name.trim();
 
-		const curl = new Curl('zabbix.php', false);
+		const curl = new Curl('zabbix.php');
 
 		curl.setArgument('action', 'dashboard.properties.check');
 
 		return fetch(curl.getUrl(), {
 			method: 'POST',
-			headers: {
-				'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
-			},
-			body: urlEncodeData(properties)
+			headers: {'Content-Type': 'application/json'},
+			body: JSON.stringify(properties)
 		})
 			.then((response) => response.json())
 			.then((response) => {
@@ -1043,16 +1039,14 @@ class CDashboard extends CBaseComponent {
 	_promiseApplyDashboardPageProperties(properties, data) {
 		properties.name = properties.name.trim();
 
-		const curl = new Curl('zabbix.php', false);
+		const curl = new Curl('zabbix.php');
 
 		curl.setArgument('action', 'dashboard.page.properties.check');
 
 		return fetch(curl.getUrl(), {
 			method: 'POST',
-			headers: {
-				'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
-			},
-			body: urlEncodeData(properties)
+			headers: {'Content-Type': 'application/json'},
+			body: JSON.stringify(properties)
 		})
 			.then((response) => response.json())
 			.then((response) => {
@@ -1299,10 +1293,8 @@ class CDashboard extends CBaseComponent {
 
 		return fetch(curl.getUrl(), {
 			method: 'POST',
-			headers: {
-				'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
-			},
-			body: urlEncodeData({templateid, type, name, view_mode, fields: fields_str})
+			headers: {'Content-Type': 'application/json'},
+			body: JSON.stringify({templateid, type, name, view_mode, fields: fields_str})
 		})
 			.then((response) => response.json())
 			.then((response) => {
@@ -1321,10 +1313,8 @@ class CDashboard extends CBaseComponent {
 
 		return fetch(curl.getUrl(), {
 			method: 'POST',
-			headers: {
-				'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
-			},
-			body: urlEncodeData({templateid, type, view_mode, fields: fields_str})
+			headers: {'Content-Type': 'application/json'},
+			body: JSON.stringify({templateid, type, view_mode, fields: fields_str})
 		})
 			.then((response) => response.json())
 			.then((response) => {
diff --git a/ui/js/class.overlay.js b/ui/js/class.overlay.js
index a718c41936f..c9708da78a8 100644
--- a/ui/js/class.overlay.js
+++ b/ui/js/class.overlay.js
@@ -185,7 +185,7 @@ Overlay.prototype.containFocus = function() {
 };
 
 /**
- * Sets dialogue in loading sate.
+ * Sets dialogue in loading state.
  */
 Overlay.prototype.setLoading = function() {
 	this.$dialogue.$body.addClass('is-loading');
@@ -194,7 +194,7 @@ Overlay.prototype.setLoading = function() {
 };
 
 /**
- * Sets dialogue in idle sate.
+ * Sets dialogue in idle state.
  */
 Overlay.prototype.unsetLoading = function() {
 	this.$dialogue.$body.removeClass('is-loading');
diff --git a/ui/js/class.tab-indicators.js b/ui/js/class.tab-indicators.js
index a1b1ac16eed..43b56434bcd 100644
--- a/ui/js/class.tab-indicators.js
+++ b/ui/js/class.tab-indicators.js
@@ -981,26 +981,18 @@ class ChildServicesTabIndicatorItem extends TabIndicatorItem {
 	}
 
 	getValue() {
-		return document
-			.querySelectorAll('#children tbody tr')
-			.length;
+		return document.querySelector('#children').dataset.tabIndicator;
 	}
 
 	initObserver(element) {
-		const target_node = document.querySelector('#children tbody');
+		const target_node = document.querySelector('#children');
 		const observer_options = {
-			childList: true,
-			subtree: true
+			attributes: true,
+			attributeFilter: ['data-tab-indicator']
 		};
 
 		const observer_callback = (mutationList, _observer) => {
-			mutationList.forEach((mutation) => {
-				switch (mutation.type) {
-					case 'childList':
-						this.addAttributes(element);
-						break;
-				}
-			});
+			this.addAttributes(element);
 		};
 
 		if (target_node) {
diff --git a/ui/js/class.tabfilter.js b/ui/js/class.tabfilter.js
index 1d7b3a62b3b..76361ea3ba7 100644
--- a/ui/js/class.tabfilter.js
+++ b/ui/js/class.tabfilter.js
@@ -682,7 +682,7 @@ class CTabFilter extends CBaseComponent {
 				const $item = ui.item;
 
 				/**
-				 * Remove inline style positon, left and top that stay after sortable.
+				 * Remove inline style position, left and top that stay after sortable.
 				 * This styles broken tabs layout.
 				 */
 				if ($item.css('position') === 'relative') {
diff --git a/ui/js/common.js b/ui/js/common.js
index 46f3fbb173c..116045c84e6 100644
--- a/ui/js/common.js
+++ b/ui/js/common.js
@@ -969,7 +969,7 @@ Function.prototype.bindAsEventListener = function (context) {
 function openMassupdatePopup(elem, popup_name, data = {}) {
 	const form = elem.closest('form');
 
-	data['ids'] = [...form.querySelectorAll('tbody input:checked')].map((input) => input.value);
+	data.ids = chkbxRange.selectedIds;
 
 	switch (popup_name) {
 		case 'popup.massupdate.item':
diff --git a/ui/js/flickerfreescreen.js b/ui/js/flickerfreescreen.js
index 629e216544e..cdcbe27cca0 100644
--- a/ui/js/flickerfreescreen.js
+++ b/ui/js/flickerfreescreen.js
@@ -118,17 +118,22 @@
 						'screenitemid'
 					]
 				},
-				params_index = type_params[screen.resourcetype] ? screen.resourcetype : 'default';
-				ajax_url = new Curl('jsrpc.php'),
+				params_index = type_params[screen.resourcetype] ? screen.resourcetype : 'default',
 				self = this;
 
-			ajax_url.setArgument('type', 9); // PAGE_TYPE_TEXT
-			ajax_url.setArgument('method', 'screen.get');
-			// TODO: remove, do not use timestamp passing to server and back to ensure newest content will be shown.
-			ajax_url.setArgument('timestamp', screen.timestampActual);
+			const ajax_url = new Curl('jsrpc.php', false);
+			const post_data = {
+				type: 9, // PAGE_TYPE_TEXT
+				method: 'screen.get',
+
+				// TODO: remove, do not use timestamp passing to server and back to ensure newest content will be shown.
+				timestamp: screen.timestampActual
+			};
 
 			$.each(type_params[params_index], function (i, name) {
-				ajax_url.setArgument(name, empty(screen[name]) ? null : screen[name]);
+				if (!empty(screen[name])) {
+					post_data[name] = screen[name];
+				}
 			});
 
 			// set actual timestamp
@@ -137,8 +142,8 @@
 			// timeline params
 			// SCREEN_RESOURCE_HTTPTEST_DETAILS, SCREEN_RESOURCE_DISCOVERY, SCREEN_RESOURCE_HTTPTEST
 			if ($.inArray(screen.resourcetype, [21, 22, 23]) === -1) {
-				ajax_url.setArgument('from', screen.timeline.from);
-				ajax_url.setArgument('to', screen.timeline.to);
+				post_data.from = screen.timeline.from;
+				post_data.to = screen.timeline.to;
 			}
 
 			switch (parseInt(screen.resourcetype, 10)) {
@@ -173,12 +178,12 @@
 						if ('itemids' in screen.data) {
 							$.each(screen.data.itemids, function (i, value) {
 								if (!empty(value)) {
-									ajax_url.setArgument('itemids[' + value + ']', value);
+									post_data['itemids[' + value + ']'] = value;
 								}
 							});
 						}
 						else {
-							ajax_url.setArgument('graphid', screen.data.graphid);
+							post_data['graphid'] = screen.data.graphid;
 						}
 
 						$.each({
@@ -188,16 +193,16 @@
 							'action': screen.data.action
 						}, function (ajax_key, value) {
 							if (!empty(value)) {
-								ajax_url.setArgument(ajax_key, value);
+								post_data[ajax_key] = value;
 							}
 						});
 
-						self.refreshHtml(id, ajax_url);
+						self.refreshHtml(id, ajax_url, post_data);
 					}
 					break;
 
 				default:
-					self.refreshHtml(id, ajax_url);
+					self.refreshHtml(id, ajax_url, post_data);
 					break;
 			}
 
@@ -232,7 +237,7 @@
 			}
 		},
 
-		refreshHtml: function(id, ajaxUrl) {
+		refreshHtml: function(id, ajaxUrl, post_data = {}) {
 			var screen = this.screens[id],
 				request_start = new CDate().getTime();
 
@@ -248,7 +253,7 @@
 					url: ajaxUrl.getUrl(),
 					type: 'post',
 					cache: false,
-					data: {},
+					data: post_data,
 					dataType: 'html',
 					success: function(html) {
 						var html = $(html);
@@ -435,38 +440,6 @@
 			return null;
 		},
 
-		refreshProfile: function(id, ajaxUrl) {
-			var screen = this.screens[id];
-
-			if (screen.isRefreshing) {
-				this.calculateReRefresh(id);
-			}
-			else {
-				screen.isRefreshing = true;
-				screen.timestampResponsiveness = new CDate().getTime();
-
-				var ajaxRequest = $.ajax({
-					url: ajaxUrl.getUrl(),
-					type: 'post',
-					data: {},
-					success: function(data) {
-						screen.timestamp = new CDate().getTime();
-						screen.isRefreshing = false;
-					},
-					error: function() {
-						window.flickerfreeScreen.calculateReRefresh(id);
-					}
-				});
-
-				$.when(ajaxRequest).always(function() {
-					if (screen.isReRefreshRequire) {
-						screen.isReRefreshRequire = false;
-						window.flickerfreeScreen.refresh(id);
-					}
-				});
-			}
-		},
-
 		calculateReRefresh: function(id) {
 			var screen = this.screens[id],
 				time = new CDate().getTime();
diff --git a/ui/js/pages/items.js b/ui/js/pages/items.js
index 2565c5cecd7..140a67da02b 100644
--- a/ui/js/pages/items.js
+++ b/ui/js/pages/items.js
@@ -19,7 +19,7 @@
 
 
 /**
- * @param {object} interface_ids_by_types  Iterface ids grouped by interface type.
+ * @param {object} interface_ids_by_types  Interface ids grouped by interface type.
  * @param {object} item_interface_types    Item type to interface type map.
  * @param {number|null} item_type          Current item type.
  */
diff --git a/ui/js/pages/monitoring.overview.js b/ui/js/pages/monitoring.overview.js
deleted file mode 100644
index d0bdcbee65c..00000000000
--- a/ui/js/pages/monitoring.overview.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- ** Zabbix
- ** Copyright (C) 2001-2021 Zabbix SIA
- **
- ** This program is free software; you can redistribute it and/or modify
- ** it under the terms of the GNU General Public License as published by
- ** the Free Software Foundation; either version 2 of the License, or
- ** (at your option) any later version.
- **
- ** This program is distributed in the hope that it will be useful,
- ** but WITHOUT ANY WARRANTY; without even the implied warranty of
- ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- ** GNU General Public License for more details.
- **
- ** You should have received a copy of the GNU General Public License
- ** along with this program; if not, write to the Free Software
- ** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- **/
-
-
-$(() => {
-	$('#hosts-location').on('change', () => {
-		document.forms['main_filter'].submit();
-	});
-});
diff --git a/ui/js/widgets/class.widget.js b/ui/js/widgets/class.widget.js
index 75e9814d278..41842b78905 100644
--- a/ui/js/widgets/class.widget.js
+++ b/ui/js/widgets/class.widget.js
@@ -388,10 +388,8 @@ class CWidget extends CBaseComponent {
 
 			fetch(curl.getUrl(), {
 				method: 'POST',
-				headers: {
-					'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
-				},
-				body: urlEncodeData({widgetid: this._widgetid, rf_rate})
+				headers: {'Content-Type': 'application/json'},
+				body: JSON.stringify({widgetid: this._widgetid, rf_rate})
 			});
 		}
 	}
@@ -601,10 +599,8 @@ class CWidget extends CBaseComponent {
 
 		return fetch(curl.getUrl(), {
 			method: 'POST',
-			headers: {
-				'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
-			},
-			body: urlEncodeData(this._getUpdateRequestData()),
+			headers: {'Content-Type': 'application/json'},
+			body: JSON.stringify(this._getUpdateRequestData()),
 			signal: this._update_abort_controller.signal
 		})
 			.then((response) => response.json())
diff --git a/ui/js/widgets/class.widget.svggraph.js b/ui/js/widgets/class.widget.svggraph.js
index 013dbccc1eb..a44010f5fb8 100755
--- a/ui/js/widgets/class.widget.svggraph.js
+++ b/ui/js/widgets/class.widget.svggraph.js
@@ -64,8 +64,8 @@ class CWidgetSvgGraph extends CWidget {
 	_getUpdateRequestData() {
 		return {
 			...super._getUpdateRequestData(),
-			from_ts: this._time_period.from_ts,
-			to_ts: this._time_period.to_ts
+			from: this._time_period.from,
+			to: this._time_period.to
 		};
 	}
 
diff --git a/ui/jsLoader.php b/ui/jsLoader.php
index 96fbd9ed5b4..cc2b3a9d12e 100644
--- a/ui/jsLoader.php
+++ b/ui/jsLoader.php
@@ -20,31 +20,12 @@
 
 
 // get language translations
-require_once dirname(__FILE__).'/include/gettextwrapper.inc.php';
-require_once dirname(__FILE__).'/include/js.inc.php';
 require_once dirname(__FILE__).'/include/locales.inc.php';
-require_once dirname(__FILE__).'/include/translateDefines.inc.php';
+require_once dirname(__FILE__).'/include/gettextwrapper.inc.php';
 
-// if we must provide language constants on language different from English
-if (isset($_GET['lang'])) {
-	if (function_exists('bindtextdomain')) {
-		// initializing gettext translations depending on language selected by user
-		$locales = zbx_locale_variants($_GET['lang']);
-		foreach ($locales as $locale) {
-			putenv('LC_ALL='.$locale);
-			putenv('LANG='.$locale);
-			putenv('LANGUAGE='.$locale);
-			if (setlocale(LC_ALL, $locale)) {
-				break;
-			}
-		}
-		bindtextdomain('frontend', 'locale');
-		bind_textdomain_codeset('frontend', 'UTF-8');
-		textdomain('frontend');
-	}
-	// numeric Locale to default
-	setlocale(LC_NUMERIC, ['C', 'POSIX', 'en', 'en_US', 'en_US.UTF-8', 'English_United States.1252']);
-}
+setupLocale(array_key_exists('lang', $_GET) ? (string) $_GET['lang'] : 'en_GB');
+
+require_once dirname(__FILE__).'/include/js.inc.php';
 
 // available scripts 'scriptFileName' => 'path relative to js/'
 $availableJScripts = [
@@ -128,7 +109,6 @@ $availableJScripts = [
 	'report2.js' => 'pages/',
 	'report4.js' => 'pages/',
 	'setup.js' => 'pages/',
-	'monitoring.overview.js' => 'pages/',
 	'popup.condition.common.js' => 'pages/',
 	'popup.operation.common.js' => 'pages/'
 ];
diff --git a/ui/locale/bg/LC_MESSAGES/frontend.po b/ui/locale/bg/LC_MESSAGES/frontend.po
index cfd96b3274d..8967b406480 100644
--- a/ui/locale/bg/LC_MESSAGES/frontend.po
+++ b/ui/locale/bg/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2013-01-12 23:52+0300\n"
 "Last-Translator: Fahri <fahri_hasan@hotmail.com>\n"
 "Language-Team: \n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -226,14 +226,14 @@ msgstr[1] ""
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -389,7 +389,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -450,10 +450,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr ""
@@ -496,7 +492,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Потвърдено"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Потвърждавам"
 
@@ -504,7 +500,7 @@ msgstr "Потвърждавам"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Потвърдено"
@@ -517,7 +513,7 @@ msgstr "Потвърдени събития ПРОБЛЕМ"
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -544,9 +540,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -603,7 +599,7 @@ msgstr ""
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -612,7 +608,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Действие добавено"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -661,8 +657,8 @@ msgstr "Действие актуализирано"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Действия"
@@ -729,7 +725,7 @@ msgstr "Активно до"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -740,7 +736,7 @@ msgstr "Активно до"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -763,9 +759,9 @@ msgstr "Активно до"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -835,7 +831,7 @@ msgstr "Активно до"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Добави"
 
@@ -843,11 +839,11 @@ msgstr "Добави"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr ""
 
@@ -855,7 +851,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -872,7 +868,7 @@ msgstr "Добави хост"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr ""
 
@@ -894,7 +890,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -946,12 +942,12 @@ msgstr ""
 msgid "Add widget"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -961,7 +957,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -974,7 +970,7 @@ msgstr "Администратор"
 msgid "Administration"
 msgstr "Администрация"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -996,7 +992,7 @@ msgstr "Възраст по-малка от"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1068,7 +1064,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Всички"
 
@@ -1086,7 +1082,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Във всички връзки трябва да са уточнени \"Име\" и \"URL\""
 
@@ -1104,7 +1100,7 @@ msgstr ""
 msgid "All problems if tag values match"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1217,15 +1213,15 @@ msgstr "Грешка в приложението."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Прилагане"
 
@@ -1243,7 +1239,7 @@ msgstr "Приближаване"
 msgid "Apr"
 msgstr "Апр"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Април"
 
@@ -1271,7 +1267,7 @@ msgstr "Тип област"
 msgid "Arithmetic"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1318,7 +1314,7 @@ msgstr "В (час:минута)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1327,7 +1323,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1339,6 +1335,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1350,7 +1351,7 @@ msgstr "Трябва да бъдат създаден най-малко един
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1406,7 +1407,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Авг"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Август"
 
@@ -1419,7 +1420,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1496,7 +1497,7 @@ msgstr ""
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1512,7 +1513,7 @@ msgstr "Автоматично съответствие на икона"
 msgid "Automatic icon selection"
 msgstr "Автоматичен избор на икона"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1564,7 +1565,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1627,7 +1628,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Блокиран"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr ""
 
@@ -1681,11 +1682,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Долен"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr ""
 
@@ -1711,7 +1712,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1756,8 +1757,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1766,7 +1767,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Изчислено"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1791,7 +1792,7 @@ msgstr "Обратно повикване"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1804,8 +1805,8 @@ msgstr "Обратно повикване"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Отказ"
 
@@ -1835,7 +1836,7 @@ msgstr "Не може да се добави действие"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1845,7 +1846,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Не може да се добави зависимост от хост към шаблон."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1876,8 +1877,8 @@ msgid "Cannot add host prototype"
 msgstr ""
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Не може да се добави изображение"
 
@@ -1969,15 +1970,15 @@ msgstr "Не може да се добави потребител"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Не може да се добави уеб сценарий"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1997,33 +1998,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Не може да се изчисти историята"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Не може да се клонират графичните прототипи"
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Не може да се клонират елемент на данните прототипи"
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Не може да се клонират тригер прототипите"
 
@@ -2050,7 +2047,7 @@ msgid_plural "Cannot copy graphs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] ""
@@ -2103,8 +2100,8 @@ msgstr "Не може да се създаде съответствие на и�
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2133,7 +2130,7 @@ msgstr "Не може да се изтрие Zabbix вътрешен потре�
 msgid "Cannot delete action"
 msgstr "Не може да се изтрие действието"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2201,7 +2198,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2212,12 +2209,12 @@ msgstr[1] ""
 msgid "Cannot delete host prototypes"
 msgstr ""
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 #, fuzzy
 msgid "Cannot delete icon map"
 msgstr "Не може да се изтрие съответствие на икона"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Не може да се изтрие изображението"
 
@@ -2242,7 +2239,7 @@ msgstr ""
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Не може да се изтрият елементите от данните"
 
@@ -2273,7 +2270,7 @@ msgid_plural "Cannot delete proxies"
 msgstr[0] "Не може да се изтрие проксито"
 msgstr[1] "Не може да се изтрие проксито"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2296,7 +2293,7 @@ msgid_plural "Cannot delete scripts"
 msgstr[0] "Не може да се изтрие скрипта"
 msgstr[1] "Не може да се изтрие скрипта"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Не може да се изтрият скриптовете. Скрипт \"%1$s\" се използва в операция на действие \"%2$s\"."
@@ -2312,8 +2309,8 @@ msgid_plural "Cannot delete services"
 msgstr[0] "Не може да се изтрие услугата"
 msgstr[1] "Не може да се изтрие услугата"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2342,7 +2339,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr "Не може да се изтрие шаблонния елемент на данните."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Не може да се изтрият шаблонни елементи на данните."
 
@@ -2395,7 +2392,7 @@ msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Не може да се изтрие уеб сценарий"
 
@@ -2430,7 +2427,7 @@ msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
@@ -2462,7 +2459,7 @@ msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:446
+#: httpconf.php:418
 #, fuzzy
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
@@ -2510,7 +2507,7 @@ msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
@@ -2542,7 +2539,7 @@ msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
@@ -2556,7 +2553,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2590,8 +2587,8 @@ msgstr "Не може да се намери хоста \"%1$s\" използв�
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2689,24 +2686,20 @@ msgstr ""
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2719,7 +2712,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr ""
 
@@ -2733,7 +2726,7 @@ msgid "Cannot link template."
 msgstr ""
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2765,17 +2758,17 @@ msgstr ""
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Невъзможно е да се изпълни молбата за премахване от таблица \"%1$s\" без израз where."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Невъзможно е да се изпълни актуализирането на таблица  \"%1$s\" без стойности."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Невъзможно е да се изпълни актуализирането на таблица \"%1$s\" без израз where."
@@ -2802,7 +2795,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Не може да се преименува гост потребителя."
 
@@ -2821,7 +2814,7 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2861,12 +2854,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2885,7 +2878,7 @@ msgid_plural "Cannot unblock users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Не може да се премахнат и изчистят уеб сценариите."
 
@@ -2898,7 +2891,7 @@ msgstr "Не може да се премахне шаблона"
 msgid "Cannot unlink template."
 msgstr ""
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2951,11 +2944,6 @@ msgstr ""
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr ""
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2965,8 +2953,9 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
@@ -3026,9 +3015,7 @@ msgstr ""
 msgid "Cannot update group"
 msgstr "Не може да се актуализира групата"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
@@ -3051,14 +3038,14 @@ msgstr[1] ""
 msgid "Cannot update hosts"
 msgstr "Не може да се актуализират хостовете"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 #, fuzzy
 msgid "Cannot update icon map"
 msgstr "Не може да се актуализира съответствие на икона"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Не може да се актуализира изображението"
 
@@ -3112,12 +3099,12 @@ msgstr "Не може да се актуализира картата на мр�
 msgid "Cannot update proxy"
 msgstr "Не може да се актуализира проксито"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3137,17 +3124,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Не може да се актуализира скрипта"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3222,7 +3209,7 @@ msgstr[1] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr " Не може да се актуализира уеб сценарий"
 
@@ -3322,8 +3309,8 @@ msgid "Character string not included"
 msgstr "Не включва символен низ "
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3438,7 +3425,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr "Проверките трябва да са уникални."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3459,7 +3446,7 @@ msgstr "Циклична връзка в шаблоните: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "Връзката към цикличен шаблон не е позволена."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3480,11 +3467,11 @@ msgstr "Изчисти историята и динамиката на пром�
 msgid "Clear when unlinking"
 msgstr "Изчисти когато се прекрати връзката"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3499,7 +3486,7 @@ msgstr "Часовник"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3514,7 +3501,7 @@ msgstr "Часовник"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Клониране"
 
@@ -3525,8 +3512,8 @@ msgstr "Клониране"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Затвори"
 
@@ -3537,13 +3524,13 @@ msgstr "Затвори"
 msgid "Close expression constructor"
 msgstr "Затвори израз конструктора"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
 
@@ -3556,8 +3543,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr ""
 
@@ -3574,7 +3561,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3640,7 +3627,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3651,17 +3638,12 @@ msgstr "Условие"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3671,17 +3653,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3697,7 +3674,7 @@ msgstr "Условия"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Конфигурация"
 
@@ -3760,7 +3737,7 @@ msgstr "Конфигурация на хостове"
 msgid "Configuration of housekeeping"
 msgstr ""
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 #, fuzzy
 msgid "Configuration of icon mapping"
@@ -3868,7 +3845,7 @@ msgstr "Потвърждение текст"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr ""
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3961,7 +3938,7 @@ msgstr "Информация за контакти"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4021,7 +3998,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -4060,8 +4037,8 @@ msgstr "Координати"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Копирай"
 
@@ -4070,12 +4047,11 @@ msgstr "Копирай"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr ""
@@ -4102,16 +4078,6 @@ msgid_plural "Correlations enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr ""
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr ""
@@ -4120,14 +4086,10 @@ msgstr ""
 msgid "Correlation updated"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Не може да запази изображение!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Число"
 
@@ -4191,11 +4153,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr ""
 
@@ -4313,7 +4275,7 @@ msgstr "Създаване на карта"
 msgid "Create media type"
 msgstr "Създаване на метод на уведомление"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr ""
 
@@ -4337,7 +4299,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Създаване на шаблон"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Създаване на тригер"
 
@@ -4500,7 +4462,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "DNS име"
@@ -4512,11 +4474,11 @@ msgstr "DNS име"
 msgid "Daily"
 msgstr "Ежедневно"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4537,8 +4499,8 @@ msgstr ""
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr ""
 
@@ -4561,9 +4523,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr ""
 
@@ -4587,7 +4549,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4615,7 +4577,7 @@ msgstr "Преглед на данни"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4757,7 +4719,7 @@ msgstr "Ден от седмицата"
 msgid "Days"
 msgstr "Дни"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Отстраняване на грешки"
 
@@ -4771,26 +4733,26 @@ msgstr "Режим за отстраняване на грешки"
 msgid "Dec"
 msgstr "Дек"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Декември"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "По подразбиране"
 
@@ -4883,7 +4845,7 @@ msgstr "Закъснение с"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4907,8 +4869,8 @@ msgstr "Закъснение с"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -4933,11 +4895,11 @@ msgstr "Изтриване и изчистване на шаблона? (Вни�
 msgid "Delete current action?"
 msgstr "Изтриване на текущото действие?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4982,7 +4944,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr "Изтриване на елемент на данните?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Изтриване на връзките между избраните елементи?"
 
@@ -5038,7 +5000,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "Изтриване на избраните правила за откриване?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Изтриване на избраните елементи?"
 
@@ -5143,7 +5105,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5187,7 +5149,7 @@ msgstr "Изтриване на тригер?"
 msgid "Delete web scenario?"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5232,7 +5194,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Зависимости"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Зависим"
 
@@ -5240,7 +5202,7 @@ msgstr "Зависим"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5250,7 +5212,7 @@ msgstr "Зависи от"
 msgid "Deployment status"
 msgstr "Състояние на разгръщане"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5283,7 +5245,7 @@ msgid "Description"
 msgstr "Описание"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5449,10 +5411,10 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5535,7 +5497,7 @@ msgid "Discovery by proxy"
 msgstr "Откриване чрез прокси"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Проверка за откриване"
 
@@ -5547,7 +5509,7 @@ msgstr "Проверки за откриване"
 msgid "Discovery list"
 msgstr "Списък за откриване"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Обект за откриване"
 
@@ -5579,7 +5541,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5587,12 +5549,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Правило за откриване"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Правило за откриване \"%1$s\" вече съществува в \"%2$s\", наследен от друг шаблон."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
@@ -5605,7 +5567,7 @@ msgstr ""
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5647,7 +5609,7 @@ msgstr "Правило за откриване актуализирано"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5658,7 +5620,7 @@ msgstr "Правила за откриване"
 msgid "Discovery rules deleted"
 msgstr "Правила за откриване изтрити"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Статус на откриване"
@@ -5695,10 +5657,11 @@ msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Показване на %1$s от %2$s намерени"
@@ -5708,7 +5671,7 @@ msgstr "Показване на %1$s от %2$s намерени"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5730,7 +5693,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Желаете ли да замени условния израз?"
 
@@ -5786,7 +5749,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Недостъпен"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5794,7 +5757,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr ""
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5813,18 +5776,6 @@ msgstr ""
 msgid "Draw style"
 msgstr "Стил на рисуване"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5837,11 +5788,6 @@ msgstr ""
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5893,7 +5839,7 @@ msgstr "Динамичен елемент на данните"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Всеки URL адрес трябва да има уникално име. Моля, уверете се, че има само едно URL с това име "
 
@@ -5902,11 +5848,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5920,8 +5866,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Редактиране"
 
@@ -5937,11 +5883,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Редактиране на тригер"
 
@@ -6001,21 +5947,17 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
@@ -6031,25 +5973,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6059,14 +5995,6 @@ msgstr "Празен входен параметър."
 msgid "Empty map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Празни параметри"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6232,7 +6160,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6243,7 +6171,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6286,7 +6214,7 @@ msgid "English (en_US)"
 msgstr "Английски (US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6302,7 +6230,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6321,12 +6249,12 @@ msgstr ""
 msgid "Error"
 msgstr "Грешка"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Грешка в заявката за търсене за таблица \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6354,7 +6282,7 @@ msgstr "ID на събитие"
 msgid "Event acknowledged"
 msgstr "Потвърждаване на събитие"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6362,7 +6290,7 @@ msgid "Event correlation"
 msgstr ""
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr ""
@@ -6397,11 +6325,11 @@ msgstr ""
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6446,15 +6374,10 @@ msgstr "Изключване"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Изпълнение"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "Грешка при изпълнение на SQL [%1$s] в [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6492,7 +6415,7 @@ msgstr ""
 msgid "Executed script"
 msgstr "Изпълнение на скрипт"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Потвърждение на изпълнение"
 
@@ -6508,8 +6431,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr ""
 
@@ -6630,7 +6553,7 @@ msgstr "Изрази"
 msgid "External check"
 msgstr "Външна проверка"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "Пт"
@@ -6657,8 +6580,8 @@ msgstr "Неуспешно"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6669,26 +6592,26 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6696,7 +6619,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6720,7 +6643,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Фев"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Февруари"
 
@@ -6742,10 +6665,9 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6756,13 +6678,6 @@ msgstr ""
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6781,11 +6696,6 @@ msgstr ""
 msgid "Field \"%1$s\" is not string."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6800,10 +6710,6 @@ msgstr ""
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Формата на файла не се поддържа."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6868,7 +6774,8 @@ msgstr "Запълване"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6893,7 +6800,7 @@ msgstr "Филтър"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6945,7 +6852,7 @@ msgstr "Въведете в картата на мрежата"
 msgid "Fixed"
 msgstr "Фиксирано"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6996,12 +6903,12 @@ msgstr "Формула"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7014,7 +6921,7 @@ msgstr "Френски (fr_FR)"
 msgid "Fri"
 msgstr "Пт"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Петък"
 
@@ -7125,7 +7032,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "Като се има предвид, израза не е макро"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr ""
@@ -7139,7 +7046,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Отиди на"
 
@@ -7177,7 +7084,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7185,7 +7092,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Градиентна линия"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7245,7 +7152,7 @@ msgstr[1] ""
 msgid "Graph deleted"
 msgstr "Графика изтрита"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7282,8 +7189,8 @@ msgstr ""
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7317,8 +7224,8 @@ msgstr "Тип графика"
 msgid "Graph updated"
 msgstr "Графика актуализирана"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7349,7 +7256,7 @@ msgstr "Графика с името \"%1$s\" вече съществува в �
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Графики"
 
@@ -7370,12 +7277,12 @@ msgstr "Решетка"
 msgid "Group"
 msgstr "Група"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr ""
@@ -7550,11 +7457,11 @@ msgstr "Помощ"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Скрит"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr ""
 
@@ -7581,11 +7488,11 @@ msgstr ""
 msgid "High"
 msgstr "Висок"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7606,7 +7513,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "История"
 
@@ -7614,11 +7521,15 @@ msgstr "История"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "История изчистена"
 
@@ -7661,7 +7572,7 @@ msgstr "Хоризонтален"
 msgid "Horizontal align"
 msgstr "Хоризонтално подравняване"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7690,7 +7601,7 @@ msgstr "Хоризонтално подравняване"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7704,7 +7615,7 @@ msgstr[1] "Хост"
 msgid "Host \"%1$s\" already exists."
 msgstr "Хост \"%1$s\" вече съществува."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7712,7 +7623,7 @@ msgstr "Хост \"%1$s\" вече съществува."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7764,7 +7675,7 @@ msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7778,22 +7689,22 @@ msgstr[1] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Хост група"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Хост група \"%1$s\" вече съществува."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7806,10 +7717,10 @@ msgstr "Елементи на хост група"
 msgid "Host group label type"
 msgstr "Тип етикет на хост група"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7825,8 +7736,8 @@ msgstr ""
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7900,7 +7811,7 @@ msgstr "Име на хоста"
 msgid "Host networks"
 msgstr "Хост мрежи"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7980,7 +7891,7 @@ msgstr "Актуализацията на хоста се провали."
 msgid "Host updated"
 msgstr "Хост актуализиран"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr ""
@@ -8000,7 +7911,7 @@ msgstr ""
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8013,7 +7924,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8061,7 +7972,7 @@ msgstr "Хостове актуализирани"
 msgid "Hours"
 msgstr "Часа"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8101,7 +8012,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IP адрес"
@@ -8126,7 +8037,7 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8184,12 +8095,12 @@ msgstr "Икона изпъкване"
 msgid "Icon map"
 msgstr "Съответствие на икона"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, fuzzy, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Съответствие на икона \"%1$s\" не може да бъде изтрита. Използва се в картата на мрежата \"%2$s\"."
@@ -8204,12 +8115,12 @@ msgstr "Съответствие на икона създадена"
 msgid "Icon map deleted"
 msgstr "Съответствие на икона изтрита"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 #, fuzzy
 msgid "Icon map updated"
 msgstr "Съответствие на икона актуализирана"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
@@ -8217,7 +8128,7 @@ msgstr "Съответствие на икона актуализирана"
 msgid "Icon mapping"
 msgstr "Съответствие на икона"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
@@ -8318,23 +8229,20 @@ msgstr "Ако смятате, че това съобщение е грешно,
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Изображение"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -8343,7 +8251,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Изображение добавено"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Изображение изтрито"
 
@@ -8351,18 +8259,12 @@ msgstr "Изображение изтрито"
 msgid "Image label type"
 msgstr "Тип етикет на изображение"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "Грешка при зареждане на изображение [%1$s] в [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Изображение актуализирано"
 
@@ -8457,7 +8359,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8468,13 +8370,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr ""
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8518,7 +8420,7 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8686,24 +8588,6 @@ msgstr "Неправилно действие в операция потреби
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Неправилно действие в операция потребител. Потребителя не съществува или нямате права за достъп до него."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8758,8 +8642,6 @@ msgstr "Неправилно действие в операция потреби
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Подадени са неправилни аргументи за функцията."
 
@@ -8785,31 +8667,22 @@ msgstr ""
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8838,7 +8711,7 @@ msgstr ""
 msgid "Incorrect eventsource value."
 msgstr ""
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Неправилно име на поле \"%1$s\" или стойност в израза where за таблица \"%2$s\"."
@@ -8863,22 +8736,17 @@ msgstr "Неправилно качване на файл."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8889,7 +8757,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
@@ -8917,8 +8785,6 @@ msgstr "Неправилен индекс на изображение."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8980,10 +8846,6 @@ msgstr "Неправилен период за поддръжката (мини�
 msgid "Incorrect map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr ""
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9041,13 +8903,13 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Неправилно време за приключване на услугата."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Неправилно време за започване на услугата."
 
@@ -9100,12 +8962,7 @@ msgstr ""
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
@@ -9151,13 +9008,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9174,60 +9031,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "Неправилна стойност \"%1$s\" за поле числа с плаваща точка \"%2$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "Неправилна стойност \"%1$s\" за поле цяло число \"%2$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Неправилна стойност \"%1$s\" за поле цяло положително число \"%2$s\"."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr ""
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9282,14 +9109,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9399,25 +9220,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9428,7 +9231,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9474,16 +9277,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9492,7 +9296,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9580,12 +9384,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Вмъкване"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr ""
 
@@ -9689,7 +9493,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9697,7 +9501,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9708,7 +9512,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Интервал"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9731,7 +9535,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9763,7 +9567,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
@@ -9788,27 +9592,29 @@ msgstr ""
 msgid "Invalid method parameters."
 msgstr "Невалидни параметри на метода."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9834,17 +9640,17 @@ msgstr "Невалидни параметри на метода."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9852,8 +9658,8 @@ msgstr "Невалидни параметри на метода."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9867,106 +9673,116 @@ msgstr "Невалидни параметри на метода."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -10008,43 +9824,38 @@ msgstr "Невалиден код на отговор \"%1$s\"."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10065,7 +9876,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Инвентаризация"
 
@@ -10106,7 +9917,7 @@ msgstr "Не е възможно да се търси по парола на п�
 msgid "Italian (it_IT)"
 msgstr "Италиански (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10138,7 +9949,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "Елемент на данните \"%1$s\" не може да попълне липсващото поле номерирано \"%2$d\" инвентарни данни за потребителя. Изберете: от 0 (не попълвай) до %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10152,7 +9963,7 @@ msgstr "Елемент на данните добавен"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] ""
@@ -10166,13 +9977,13 @@ msgstr "Брой елементи на данните "
 msgid "Item deleted"
 msgstr "Елемент на данните изтрит"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -10182,7 +9993,7 @@ msgstr[1] ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr ""
 
@@ -10191,7 +10002,7 @@ msgstr ""
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10228,8 +10039,8 @@ msgid_plural "Item prototypes updated"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10255,7 +10066,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10287,8 +10098,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10339,11 +10150,11 @@ msgstr "Ключ от елемент на данните \"%1$s\" вече съ�
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Елементи на данните "
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Елементи на данните изтрити"
 
@@ -10361,7 +10172,7 @@ msgstr "Елементи на данните актуализирани"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10386,6 +10197,10 @@ msgstr "JMX интерфейс"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10398,7 +10213,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10416,7 +10231,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Яну"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Януари"
 
@@ -10438,7 +10253,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Юли"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Юли"
 
@@ -10446,7 +10261,7 @@ msgstr "Юли"
 msgid "Jun"
 msgstr "Юни"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Юни"
 
@@ -10602,22 +10417,6 @@ msgid_plural "Last %1$d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10629,11 +10428,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Последна проверка"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Графика за последния час"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Графика за последния месец"
 
@@ -10671,11 +10470,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Последна стойност"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Графика за последната седмица"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10684,11 +10483,11 @@ msgstr "Графика за последната седмица"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Последни данни"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr ""
 
@@ -10729,7 +10528,7 @@ msgstr ""
 msgid "Left trim"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -11010,7 +10809,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "Пн"
@@ -11032,7 +10831,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11043,12 +10842,12 @@ msgid "Macro"
 msgstr "Макро"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Макро \"%1$s\" вече съществува в \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Макро \"%1$s\" вече съществува."
@@ -11076,7 +10875,7 @@ msgstr "Макроси актуализирани"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -11084,7 +10883,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11167,7 +10966,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11189,13 +10988,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Карта на мрежата"
 
@@ -11264,7 +11063,7 @@ msgstr ""
 msgid "Map update failed."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11296,7 +11095,7 @@ msgstr "Карти на мрежата"
 msgid "Mar"
 msgstr "Мар"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Март"
 
@@ -11400,7 +11199,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11414,7 +11213,7 @@ msgstr[1] ""
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Май"
 
@@ -11429,15 +11228,12 @@ msgstr "Май"
 msgid "Media"
 msgstr "Уведомления"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Метод на уведомление"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr ""
@@ -11466,11 +11262,6 @@ msgid_plural "Media types enabled"
 msgstr[0] "Метод на уведомление включено"
 msgstr[1] "Метод на уведомление включено"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr ""
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11500,7 +11291,7 @@ msgstr ""
 msgid "Media types"
 msgstr "Методи на уведомление"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11589,7 +11380,7 @@ msgstr "Съобщения"
 msgid "Method not found."
 msgstr "Методът не е намерен."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11651,7 +11442,7 @@ msgid "Minimum severity"
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11710,7 +11501,7 @@ msgstr "Режим"
 msgid "Model"
 msgstr "Модел"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11748,7 +11539,7 @@ msgstr[1] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11774,7 +11565,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Пн"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Понеделник"
 
@@ -11814,11 +11605,11 @@ msgstr "Месец"
 msgid "Monthly"
 msgstr "Ежемесечно"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11842,7 +11633,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11855,7 +11646,7 @@ msgstr ""
 msgid "Multiple PROBLEM events"
 msgstr "Множество събития с ПРОБЛЕМ"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Изключване на звука"
 
@@ -11984,11 +11775,11 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12146,19 +11937,21 @@ msgstr "Ново състояние"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Нов елемент"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr ""
 
@@ -12170,7 +11963,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Нов регулярен израз"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12178,7 +11971,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Ново време за услуга"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12187,7 +11980,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12205,7 +11998,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12234,30 +12027,6 @@ msgstr ""
 msgid "No"
 msgstr "Не"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr ""
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12273,11 +12042,6 @@ msgstr ""
 msgid "No \"%1$s\" given for map."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12285,7 +12049,7 @@ msgstr ""
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -12295,7 +12059,7 @@ msgstr ""
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -12312,11 +12076,6 @@ msgstr "Не е уточнено потребителското име за ав
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr ""
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12347,7 +12106,7 @@ msgstr "Не е интерфейс по подразбиране \"%1$s\" тип
 msgid "No details"
 msgstr "Няма подробности"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "Не уточнено ID на правило за откриване."
 
@@ -12383,7 +12142,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Не е дефинирано ID на хост."
 
@@ -12413,7 +12172,7 @@ msgstr "Няма изображение"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Не е открит интерфейс"
 
@@ -12447,7 +12206,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr ""
 
@@ -12455,17 +12214,46 @@ msgstr ""
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Нямате право на достъп до системата."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12473,7 +12261,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12501,19 +12289,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12528,16 +12315,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12557,12 +12350,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12583,27 +12374,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12620,14 +12413,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12636,7 +12429,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Нямате право на достъп до посочения обект или той не съществува!"
 
@@ -12656,7 +12449,7 @@ msgstr "Не е уточнен файла с обществен ключ."
 msgid "No recipients for action operation message."
 msgstr "Няма получатели на съобщение в операция на действие."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr ""
 
@@ -12668,7 +12461,7 @@ msgstr "Не е уточнен скрипт за команда в операц�
 msgid "No target selected"
 msgstr "Не е избрана цел"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Не е избрана цел."
 
@@ -12685,7 +12478,7 @@ msgstr "Не са дефинирани тригери."
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr ""
 
@@ -12755,15 +12548,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Не е позволено да зададете парола за потребителя \"гост\"."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12795,7 +12588,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "Не се поддържа"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Бележка"
@@ -12826,7 +12619,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Ное"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "Ноември"
 
@@ -13013,8 +12806,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13074,13 +12867,13 @@ msgstr "Окт"
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Октомври"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Изкл"
 
@@ -13088,30 +12881,31 @@ msgstr "Изкл"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ок"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr ""
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "Вкл"
 
@@ -13127,35 +12921,15 @@ msgstr "Веднъж"
 msgid "One"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr ""
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Само един път"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Еднократна недостъпност"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Само Супер Администраторите могат да създават хост групи."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Само Супер Администраторите могат да създават методи на уведомление."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Само Супер Администраторите могат да изтриват методи на уведомление."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Само Супер Администраторите могат да редактират методи на уведомление."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13204,10 +12978,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr ""
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13216,15 +12986,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr ""
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Преброени са само тригерите възложени за активни хостове и зависими от активни елементи на данните"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13233,7 +12999,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13242,11 +13008,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Операцията не може да се извърши поради неоторизирано искане."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Детайли на операция"
 
@@ -13268,7 +13034,7 @@ msgstr "Операцията няма шаблон за да функциони�
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13277,33 +13043,33 @@ msgstr ""
 msgid "Operations"
 msgstr "Операции"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Оператор"
 
@@ -13412,7 +13178,7 @@ msgstr "Други конфигурационни параметри"
 msgid "Other parameters"
 msgstr "Други параметри"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Други"
@@ -13426,7 +13192,7 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13455,7 +13221,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13644,7 +13410,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13689,7 +13455,7 @@ msgstr ""
 msgid "PSK identity"
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13712,16 +13478,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Параметър"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr ""
@@ -13751,7 +13517,7 @@ msgstr "Родителски елементи на данните"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13768,7 +13534,7 @@ msgstr "Родителски тригери"
 msgid "Parent web scenarios"
 msgstr "Родител за уеб сценарии"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13780,11 +13546,6 @@ msgstr ""
 msgid "Parse"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "Грешка в анализа на SQL [%1$s] в [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Синтактична грешка"
@@ -13845,7 +13606,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr ""
 
@@ -13855,15 +13616,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13909,12 +13670,11 @@ msgstr ""
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Период"
 
@@ -14003,7 +13763,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Моля, изберете два елемента"
 
@@ -14043,7 +13803,7 @@ msgstr "Попълнете полето: данни за инвентариза�
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14132,7 +13892,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14264,7 +14024,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Проблем на"
 
@@ -14277,21 +14037,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14305,9 +14061,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Проблеми"
 
@@ -14341,7 +14097,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr ""
 
@@ -14362,13 +14118,13 @@ msgstr ""
 msgid "Proxies"
 msgstr "Проксита"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14376,7 +14132,7 @@ msgstr "Проксита"
 msgid "Proxy"
 msgstr "Прокси"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14386,12 +14142,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Прокси \"%1$s\" за хост \"%2$s\" не съществува."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Прокси \"%1$s\" се използва от правило за откриване \"%2$s\"."
@@ -14484,7 +14240,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14561,10 +14317,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Получената стойност"
@@ -14646,7 +14398,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14664,13 +14416,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Регулярен израз"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14703,7 +14455,7 @@ msgstr "Регулярни изрази"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14735,8 +14487,6 @@ msgstr "Отдалечена команда"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14757,7 +14507,9 @@ msgstr "Отдалечена команда"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14770,7 +14522,7 @@ msgstr "Отдалечена команда"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14847,8 +14599,8 @@ msgstr "Отдалечена команда"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Премахни"
 
@@ -14888,7 +14640,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14930,7 +14682,7 @@ msgid "Replace dependencies"
 msgstr "Смени зависимостите"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14985,7 +14737,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -15027,8 +14779,8 @@ msgstr "Необходими кодове за състояние"
 msgid "Required string"
 msgstr "Необходим низ"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Нулиране"
 
@@ -15061,7 +14813,7 @@ msgstr "Потвърждаване на нулиране"
 msgid "Reset defaults"
 msgstr "Възстанови по подразбиране"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Решено"
 
@@ -15127,7 +14879,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Резултат"
@@ -15314,12 +15066,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Руски (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "Сб"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Нд"
@@ -15330,8 +15082,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15368,7 +15120,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15464,12 +15216,12 @@ msgstr ""
 msgid "SQL query"
 msgstr ""
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "Грешка при изпълнение на SQL заявка \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Грешка при изпълнение на SQL заявка \"%1$s\"."
@@ -15532,7 +15284,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15544,7 +15296,7 @@ msgstr ""
 msgid "Sat"
 msgstr "Сб"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Събота"
 
@@ -15586,7 +15338,7 @@ msgstr "Планирано"
 msgid "Scheduled check"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15653,7 +15405,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15666,8 +15418,7 @@ msgstr ""
 msgid "Script"
 msgstr "Скрипт"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
@@ -15699,12 +15450,6 @@ msgstr "Име на скрипт"
 msgid "Script parameters"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr ""
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Профил на скрипт"
@@ -15717,7 +15462,7 @@ msgstr "Скрипт актуализиран"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Скриптове"
 
@@ -15787,8 +15532,8 @@ msgid "Security name"
 msgstr "Име на сигурност"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15796,7 +15541,7 @@ msgstr "Име на сигурност"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Изберете"
 
@@ -15832,19 +15577,19 @@ msgstr "Избрани елементи"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr ""
 
@@ -15869,7 +15614,7 @@ msgstr "Изпратете само до"
 msgid "Send to"
 msgstr "Изпрати до"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr ""
 
@@ -15902,7 +15647,7 @@ msgstr "Разделен"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "Септември"
 
@@ -15933,28 +15678,28 @@ msgstr ""
 msgid "Server time"
 msgstr "Време на сървъра"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Услуга"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15964,7 +15709,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr ""
 
@@ -15997,16 +15742,16 @@ msgstr "Порт на услуга"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "Времето за стартиране на услугата трябва да бъде по-малко от крайното време."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -16014,11 +15759,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Интервали от време за услуга"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Тип услуга"
 
@@ -16027,30 +15772,29 @@ msgstr "Тип услуга"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Услуга актуализирана"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Услуги"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "Услугите образуват кръгова зависимост."
 
@@ -16058,7 +15802,7 @@ msgstr "Услугите образуват кръгова зависимост.
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16088,7 +15832,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16117,7 +15861,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16126,7 +15870,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16182,7 +15926,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr ""
 
@@ -16324,7 +16068,7 @@ msgstr "Покажи предупреждение, ако Zabbix сървъра
 msgid "Show working time"
 msgstr "Покажи работното време"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Показан"
 
@@ -16433,7 +16177,7 @@ msgstr "Пропуснато копиране на графика \"%1$s\" в х
 msgid "Slovak (sk_SK)"
 msgstr "Словашки (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Заспиване"
 
@@ -16479,7 +16223,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Ред на сортиране (0->999)"
 
@@ -16553,7 +16297,7 @@ msgstr "Започни в"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16656,15 +16400,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Състояние"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Кодове за състояние"
@@ -16694,7 +16442,7 @@ msgstr "Само състояние"
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16742,7 +16490,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16807,7 +16555,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Подкарта"
 
@@ -16823,7 +16571,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Успешен одит"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16836,7 +16584,7 @@ msgstr ""
 msgid "Sun"
 msgstr "Нед"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Неделя"
 
@@ -16928,12 +16676,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Чт"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Вт"
@@ -16960,17 +16708,17 @@ msgstr "ИСТИНА"
 msgid "Table \"%1$s\" does not exist."
 msgstr "Таблица \"%1$s\" не съществува."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "Таблица \"%1$s\" няма поле с име \"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Етикет"
@@ -17026,7 +16774,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17086,7 +16834,7 @@ msgstr "Тип цел"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17107,7 +16855,7 @@ msgstr "Шаблон"
 msgid "Template \"%1$s\" already exists."
 msgstr "Шаблон \"%1$s\" вече съществува."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17131,7 +16879,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Шаблонът не може да бъде прикрепен към друг шаблон повече от веднъж, дори чрез други шаблони."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17191,7 +16939,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17363,14 +17111,14 @@ msgstr ""
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17435,7 +17183,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Този месец"
 
@@ -17443,7 +17191,7 @@ msgstr "Този месец"
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Тзе седмица"
 
@@ -17451,7 +17199,7 @@ msgstr "Тзе седмица"
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Тази година"
 
@@ -17471,7 +17219,7 @@ msgstr ""
 msgid "Thu"
 msgstr "Чет"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Четвъртък"
 
@@ -17488,7 +17236,7 @@ msgstr "До"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17521,7 +17269,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Период от време"
 
@@ -17573,12 +17321,11 @@ msgstr "Времева маркировка"
 msgid "To"
 msgstr "Към"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "За да зададете интерфейс за хост изберете един тип елемент на данните за всички елементи на данните"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Днеска"
 
@@ -17693,7 +17440,7 @@ msgstr ""
 msgid "Trends"
 msgstr "Динамика на промените"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17701,7 +17448,7 @@ msgstr "Динамика на промените"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Тригер"
 
@@ -17802,7 +17549,7 @@ msgstr "Име на тригер"
 msgid "Trigger overview"
 msgstr "Преглед на тригери"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17875,11 +17622,11 @@ msgstr ""
 msgid "Trigger severity"
 msgstr "Важност на тригер "
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17896,7 +17643,7 @@ msgstr "Тригер актуализиран"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17931,7 +17678,7 @@ msgstr ""
 msgid "Tue"
 msgstr "Вто"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Вторник"
 
@@ -17944,7 +17691,7 @@ msgstr "Турски (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Двата елемента на данните (\"%1$s\" и \"%2$s\") не могат да се попълнят в едно поле \"%3$s\" инвентарни данни за хост, това ще доведе до конфликт."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17960,19 +17707,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18024,7 +17771,7 @@ msgstr "Тип на информацията"
 msgid "Types"
 msgstr "Типове"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18045,7 +17792,7 @@ msgstr "НЕИЗВЕСТЕН"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18091,12 +17838,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URLs"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18181,12 +17928,12 @@ msgstr ""
 msgid "Unblock selected users?"
 msgstr "Деблокиране на избраните потребители?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18206,21 +17953,23 @@ msgstr "Единици за измерване"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Неизвестно"
@@ -18238,7 +17987,7 @@ msgid "Unknown error"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Неизвестен елемент на данните за хост, няма такъв елемент на данните в избрания хост"
@@ -18291,7 +18040,7 @@ msgstr "Прекратяване на връзката от шаблон"
 msgid "Unlink from templates"
 msgstr "Прекратяване на връзката от шаблони"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Включване на звука"
 
@@ -18322,7 +18071,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -18332,7 +18081,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -18377,7 +18126,7 @@ msgstr "Достъпен"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18390,7 +18139,7 @@ msgstr "Достъпен"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18443,7 +18192,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18461,7 +18210,7 @@ msgstr "Качване"
 msgid "Upper level maps"
 msgstr "Ниво на горните карти"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 #, fuzzy
@@ -18497,7 +18246,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "Използва се в действия"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18512,7 +18261,7 @@ msgstr "Използва се в действия"
 msgid "User"
 msgstr "Потребител"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
@@ -18564,7 +18313,7 @@ msgstr "Потребител добавен"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Потребителят не може да добави себе си към изключена група или група с изключен GUI достъп."
@@ -18584,7 +18333,7 @@ msgid_plural "Users deleted"
 msgstr[0] "Потребител изтрит"
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18594,27 +18343,27 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Потребителска група"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Потребителска група \"%1$s\" се използва в скрипт \"%2$s\"."
@@ -18648,8 +18397,8 @@ msgstr[1] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18693,14 +18442,14 @@ msgstr "Потребителска парола"
 msgid "User profile"
 msgstr "Потребителски профил"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18769,7 +18518,7 @@ msgstr "Потребител актуализиран"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -19085,14 +18834,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19102,7 +18851,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19144,7 +18893,7 @@ msgstr ""
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "Стойност \"%1$s\" е твърде дълъга за поле \"%2$s\" - %3$d символа. Допустимата дължина е %4$d символа."
@@ -19161,7 +18910,7 @@ msgstr ""
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Стойност на реализациите"
 
@@ -19204,11 +18953,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr ""
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19255,7 +19005,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19342,7 +19092,7 @@ msgstr "Видимото име не може да бъде празно, ако
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Ср"
@@ -19359,7 +19109,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19368,7 +19118,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Съжаляваме, достигнат е максималния възможен брой от елементи."
 
@@ -19384,7 +19134,7 @@ msgstr "Съжаляваме, достигнат е максималния въ�
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Уеб"
 
@@ -19396,7 +19146,7 @@ msgstr "Уеб"
 msgid "Web monitoring"
 msgstr "Уеб мониторинг"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr ""
 
@@ -19411,28 +19161,28 @@ msgstr "Уеб сценарий \"%1$s\" вече съществува в хос
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Уеб сценарий \"%1$s\" вече съществува."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Уеб сценарий изтрит"
 
-#: httpconf.php:443
+#: httpconf.php:415
 #, fuzzy
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Уеб сценарий изключен"
 msgstr[1] "Уеб сценарий изключен"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr ""
 
@@ -19454,7 +19204,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Сря"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Сряда"
 
@@ -19465,7 +19215,7 @@ msgstr "Сряда"
 msgid "Weekly"
 msgstr "Ежеседмично"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19481,12 +19231,12 @@ msgstr ""
 msgid "When active"
 msgstr "Когато е активен"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19681,6 +19431,10 @@ msgstr ""
 msgid "Y-m-d H:i:s"
 msgstr "m/d/Y h:i:s A"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr ""
@@ -19742,7 +19496,7 @@ msgstr "Ежегодно"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19800,18 +19554,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19823,9 +19571,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Вие нямате права за извършване на тази операция."
 
@@ -19941,24 +19686,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr ""
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19967,37 +19716,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr ""
@@ -20018,28 +19767,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr ""
@@ -20087,7 +19837,7 @@ msgstr "Всички"
 msgid "all media"
 msgstr "всички уведомления"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20095,42 +19845,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20140,7 +19885,7 @@ msgid "an empty string is expected"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr ""
 
@@ -20148,11 +19893,15 @@ msgstr ""
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20313,14 +20062,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20350,19 +20093,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20382,14 +20117,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20397,7 +20132,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr ""
@@ -20410,7 +20145,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20444,7 +20179,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20462,7 +20197,8 @@ msgid "configure"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20491,7 +20227,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "д"
@@ -20553,7 +20289,7 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20575,13 +20311,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20607,7 +20343,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20644,6 +20381,10 @@ msgstr ""
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20690,7 +20431,7 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "ч"
@@ -20731,6 +20472,11 @@ msgstr "икона"
 msgid "image"
 msgstr "изображение"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "в"
@@ -20771,15 +20517,19 @@ msgstr ""
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20807,7 +20557,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr ""
 
@@ -20836,27 +20586,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr ""
 
@@ -20884,7 +20634,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr ""
 
@@ -20970,12 +20720,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "м"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "м"
@@ -21034,7 +20784,7 @@ msgstr ""
 msgid "max"
 msgstr "макс"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21074,7 +20824,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr ""
@@ -21101,8 +20851,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "милисекунда"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21117,27 +20867,14 @@ msgstr "трябва да бъде валиден LDAP потребител"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr ""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21165,6 +20902,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21175,7 +20920,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr ""
 
@@ -21310,7 +21055,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21345,24 +21090,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21390,11 +21139,11 @@ msgstr ""
 msgid "regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21406,15 +21155,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21462,7 +21211,7 @@ msgstr ""
 msgid "short description"
 msgstr "кратко описание"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21481,15 +21230,15 @@ msgstr "кратко описание"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr ""
 
@@ -21506,31 +21255,31 @@ msgstr "покажи съответствие на икони"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21538,11 +21287,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21558,8 +21307,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21570,7 +21319,7 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21579,13 +21328,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "шаблон с ID \"%1$s\" е изпълнен  %2$s пъти"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21594,20 +21347,20 @@ msgstr "шаблон с ID \"%1$s\" е изпълнен  %2$s пъти"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr ""
@@ -21639,39 +21392,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21685,7 +21438,7 @@ msgstr "тригер"
 msgid "trigger does not allow manual closing"
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21697,26 +21450,26 @@ msgstr ""
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21724,11 +21477,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21745,10 +21498,10 @@ msgstr ""
 msgid "unexpected end of macro"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21758,11 +21511,12 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr ""
@@ -21788,8 +21542,8 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21814,6 +21568,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21829,7 +21587,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21849,11 +21607,11 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "стойност"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21871,76 +21629,85 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr ""
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr ""
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21952,18 +21719,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21972,7 +21737,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21985,11 +21750,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -22006,7 +21771,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "г"
diff --git a/ui/locale/ca/LC_MESSAGES/frontend.po b/ui/locale/ca/LC_MESSAGES/frontend.po
index 574db18f041..57ede26025f 100644
--- a/ui/locale/ca/LC_MESSAGES/frontend.po
+++ b/ui/locale/ca/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2021-03-19 18:10+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: none\n"
@@ -93,7 +93,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d dia"
 msgstr[1] "%1$d dies"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -178,7 +178,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -192,7 +192,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -225,14 +225,14 @@ msgstr[1] "Queden %1$s intents"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s segon"
 msgstr[1] "%1$s segons"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -252,13 +252,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -388,7 +388,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -449,10 +449,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr ""
@@ -495,7 +491,7 @@ msgstr ""
 msgid "Ack"
 msgstr ""
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr ""
 
@@ -503,7 +499,7 @@ msgstr ""
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr ""
@@ -516,7 +512,7 @@ msgstr ""
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -543,9 +539,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -602,7 +598,7 @@ msgstr ""
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -611,7 +607,7 @@ msgstr ""
 msgid "Action added"
 msgstr ""
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -660,8 +656,8 @@ msgstr ""
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr ""
@@ -728,7 +724,7 @@ msgstr ""
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -739,7 +735,7 @@ msgstr ""
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -762,9 +758,9 @@ msgstr ""
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -834,7 +830,7 @@ msgstr ""
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr ""
 
@@ -842,11 +838,11 @@ msgstr ""
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr ""
 
@@ -854,7 +850,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -871,7 +867,7 @@ msgstr ""
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr ""
 
@@ -893,7 +889,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -945,12 +941,12 @@ msgstr ""
 msgid "Add widget"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -960,7 +956,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -973,7 +969,7 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -995,7 +991,7 @@ msgstr ""
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1067,7 +1063,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr ""
 
@@ -1085,7 +1081,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr ""
 
@@ -1103,7 +1099,7 @@ msgstr ""
 msgid "All problems if tag values match"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1216,15 +1212,15 @@ msgstr ""
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr ""
 
@@ -1242,7 +1238,7 @@ msgstr ""
 msgid "Apr"
 msgstr ""
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr ""
 
@@ -1270,7 +1266,7 @@ msgstr ""
 msgid "Arithmetic"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1317,7 +1313,7 @@ msgstr ""
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1326,7 +1322,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1338,6 +1334,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1349,7 +1350,7 @@ msgstr ""
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1405,7 +1406,7 @@ msgstr ""
 msgid "Aug"
 msgstr ""
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr ""
 
@@ -1418,7 +1419,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1495,7 +1496,7 @@ msgstr ""
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1510,7 +1511,7 @@ msgstr ""
 msgid "Automatic icon selection"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1562,7 +1563,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1625,7 +1626,7 @@ msgstr ""
 msgid "Blocked"
 msgstr ""
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr ""
 
@@ -1679,11 +1680,11 @@ msgstr ""
 msgid "Bottom"
 msgstr ""
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr ""
 
@@ -1709,7 +1710,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1754,8 +1755,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1764,7 +1765,7 @@ msgstr ""
 msgid "Calculated"
 msgstr ""
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1789,7 +1790,7 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1802,8 +1803,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr ""
 
@@ -1833,7 +1834,7 @@ msgstr ""
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1843,7 +1844,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1874,8 +1875,8 @@ msgid "Cannot add host prototype"
 msgstr ""
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr ""
 
@@ -1967,15 +1968,15 @@ msgstr ""
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1995,33 +1996,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr ""
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr ""
 
@@ -2048,7 +2045,7 @@ msgid_plural "Cannot copy graphs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] ""
@@ -2100,8 +2097,8 @@ msgstr ""
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2130,7 +2127,7 @@ msgstr ""
 msgid "Cannot delete action"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2196,7 +2193,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2207,11 +2204,11 @@ msgstr[1] ""
 msgid "Cannot delete host prototypes"
 msgstr ""
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr ""
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr ""
 
@@ -2236,7 +2233,7 @@ msgstr ""
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr ""
 
@@ -2267,7 +2264,7 @@ msgid_plural "Cannot delete proxies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2290,7 +2287,7 @@ msgid_plural "Cannot delete scripts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr ""
@@ -2305,8 +2302,8 @@ msgid_plural "Cannot delete services"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2335,7 +2332,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr ""
 
@@ -2388,7 +2385,7 @@ msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr ""
 
@@ -2423,7 +2420,7 @@ msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
@@ -2454,7 +2451,7 @@ msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -2501,7 +2498,7 @@ msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
@@ -2532,7 +2529,7 @@ msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
@@ -2546,7 +2543,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2580,8 +2577,8 @@ msgstr ""
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2679,24 +2676,20 @@ msgstr ""
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2709,7 +2702,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr ""
 
@@ -2723,7 +2716,7 @@ msgid "Cannot link template."
 msgstr ""
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2755,17 +2748,17 @@ msgstr ""
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr ""
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr ""
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr ""
@@ -2792,7 +2785,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr ""
 
@@ -2811,7 +2804,7 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2851,12 +2844,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2875,7 +2868,7 @@ msgid_plural "Cannot unblock users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
@@ -2888,7 +2881,7 @@ msgstr ""
 msgid "Cannot unlink template."
 msgstr ""
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2941,11 +2934,6 @@ msgstr ""
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr ""
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2955,8 +2943,9 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
@@ -3016,9 +3005,7 @@ msgstr ""
 msgid "Cannot update group"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
@@ -3041,13 +3028,13 @@ msgstr[1] ""
 msgid "Cannot update hosts"
 msgstr ""
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr ""
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr ""
 
@@ -3101,12 +3088,12 @@ msgstr ""
 msgid "Cannot update proxy"
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3126,17 +3113,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr ""
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3211,7 +3198,7 @@ msgstr[1] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr ""
 
@@ -3311,8 +3298,8 @@ msgid "Character string not included"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3427,7 +3414,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr ""
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3448,7 +3435,7 @@ msgstr ""
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3469,11 +3456,11 @@ msgstr ""
 msgid "Clear when unlinking"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3488,7 +3475,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3503,7 +3490,7 @@ msgstr ""
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr ""
 
@@ -3514,8 +3501,8 @@ msgstr ""
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr ""
 
@@ -3526,13 +3513,13 @@ msgstr ""
 msgid "Close expression constructor"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
 
@@ -3545,8 +3532,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr ""
 
@@ -3563,7 +3550,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3629,7 +3616,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3640,17 +3627,12 @@ msgstr ""
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3660,17 +3642,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3686,7 +3663,7 @@ msgstr ""
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr ""
 
@@ -3749,7 +3726,7 @@ msgstr ""
 msgid "Configuration of housekeeping"
 msgstr ""
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr ""
@@ -3856,7 +3833,7 @@ msgstr ""
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr ""
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3949,7 +3926,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4009,7 +3986,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -4048,8 +4025,8 @@ msgstr ""
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr ""
 
@@ -4058,12 +4035,11 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr ""
@@ -4090,16 +4066,6 @@ msgid_plural "Correlations enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr ""
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr ""
@@ -4108,14 +4074,10 @@ msgstr ""
 msgid "Correlation updated"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr ""
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr ""
 
@@ -4179,11 +4141,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr ""
 
@@ -4300,7 +4262,7 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr ""
 
@@ -4324,7 +4286,7 @@ msgstr ""
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr ""
 
@@ -4487,7 +4449,7 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr ""
@@ -4499,11 +4461,11 @@ msgstr ""
 msgid "Daily"
 msgstr ""
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4524,8 +4486,8 @@ msgstr ""
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr ""
 
@@ -4548,9 +4510,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr ""
 
@@ -4574,7 +4536,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4602,7 +4564,7 @@ msgstr ""
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4744,7 +4706,7 @@ msgstr ""
 msgid "Days"
 msgstr ""
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr ""
 
@@ -4758,26 +4720,26 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr ""
 
@@ -4870,7 +4832,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4894,8 +4856,8 @@ msgstr ""
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr ""
 
@@ -4920,11 +4882,11 @@ msgstr ""
 msgid "Delete current action?"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4968,7 +4930,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -5024,7 +4986,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr ""
 
@@ -5129,7 +5091,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5173,7 +5135,7 @@ msgstr ""
 msgid "Delete web scenario?"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5218,7 +5180,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr ""
 
@@ -5226,7 +5188,7 @@ msgstr ""
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5236,7 +5198,7 @@ msgstr ""
 msgid "Deployment status"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5269,7 +5231,7 @@ msgid "Description"
 msgstr ""
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5435,10 +5397,10 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5521,7 +5483,7 @@ msgid "Discovery by proxy"
 msgstr ""
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr ""
 
@@ -5533,7 +5495,7 @@ msgstr ""
 msgid "Discovery list"
 msgstr ""
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr ""
 
@@ -5565,7 +5527,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5573,12 +5535,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
@@ -5591,7 +5553,7 @@ msgstr ""
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5632,7 +5594,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5643,7 +5605,7 @@ msgstr ""
 msgid "Discovery rules deleted"
 msgstr ""
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr ""
@@ -5680,10 +5642,11 @@ msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
@@ -5693,7 +5656,7 @@ msgstr ""
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5715,7 +5678,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
@@ -5771,7 +5734,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5779,7 +5742,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr ""
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5798,18 +5761,6 @@ msgstr ""
 msgid "Draw style"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5822,11 +5773,6 @@ msgstr ""
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5878,7 +5824,7 @@ msgstr ""
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
@@ -5887,11 +5833,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5905,8 +5851,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr ""
 
@@ -5922,11 +5868,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr ""
 
@@ -5986,21 +5932,17 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
@@ -6016,25 +5958,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6044,14 +5980,6 @@ msgstr ""
 msgid "Empty map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr ""
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6217,7 +6145,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6228,7 +6156,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6271,7 +6199,7 @@ msgid "English (en_US)"
 msgstr ""
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6287,7 +6215,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6306,12 +6234,12 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6338,7 +6266,7 @@ msgstr ""
 msgid "Event acknowledged"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6346,7 +6274,7 @@ msgid "Event correlation"
 msgstr ""
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr ""
@@ -6381,11 +6309,11 @@ msgstr ""
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6430,15 +6358,10 @@ msgstr ""
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6476,7 +6399,7 @@ msgstr ""
 msgid "Executed script"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr ""
 
@@ -6492,8 +6415,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr ""
 
@@ -6614,7 +6537,7 @@ msgstr ""
 msgid "External check"
 msgstr ""
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
@@ -6641,8 +6564,8 @@ msgstr ""
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6653,26 +6576,26 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6680,7 +6603,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6704,7 +6627,7 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr ""
 
@@ -6726,10 +6649,9 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6740,13 +6662,6 @@ msgstr ""
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6765,11 +6680,6 @@ msgstr ""
 msgid "Field \"%1$s\" is not string."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6784,10 +6694,6 @@ msgstr ""
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr ""
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6852,7 +6758,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6877,7 +6784,7 @@ msgstr ""
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6929,7 +6836,7 @@ msgstr ""
 msgid "Fixed"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6980,12 +6887,12 @@ msgstr ""
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -6998,7 +6905,7 @@ msgstr ""
 msgid "Fri"
 msgstr ""
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr ""
 
@@ -7109,7 +7016,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr ""
@@ -7123,7 +7030,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr ""
 
@@ -7161,7 +7068,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr ""
 
@@ -7169,7 +7076,7 @@ msgstr ""
 msgid "Gradient line"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7229,7 +7136,7 @@ msgstr[1] ""
 msgid "Graph deleted"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7266,8 +7173,8 @@ msgstr ""
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7301,8 +7208,8 @@ msgstr ""
 msgid "Graph updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7333,7 +7240,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr ""
 
@@ -7354,12 +7261,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr ""
@@ -7533,11 +7440,11 @@ msgstr ""
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr ""
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr ""
 
@@ -7564,11 +7471,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7589,7 +7496,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr ""
 
@@ -7597,11 +7504,15 @@ msgstr ""
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr ""
 
@@ -7644,7 +7555,7 @@ msgstr ""
 msgid "Horizontal align"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7673,7 +7584,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7687,7 +7598,7 @@ msgstr[1] ""
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7695,7 +7606,7 @@ msgstr ""
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7747,7 +7658,7 @@ msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7761,22 +7672,22 @@ msgstr[1] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7789,10 +7700,10 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7808,8 +7719,8 @@ msgstr ""
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7883,7 +7794,7 @@ msgstr ""
 msgid "Host networks"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7963,7 +7874,7 @@ msgstr ""
 msgid "Host updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr ""
@@ -7983,7 +7894,7 @@ msgstr ""
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -7996,7 +7907,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8044,7 +7955,7 @@ msgstr ""
 msgid "Hours"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8084,7 +7995,7 @@ msgstr ""
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr ""
@@ -8109,7 +8020,7 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8166,12 +8077,12 @@ msgstr ""
 msgid "Icon map"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
@@ -8184,18 +8095,18 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
@@ -8296,23 +8207,20 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -8321,7 +8229,7 @@ msgstr ""
 msgid "Image added"
 msgstr ""
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr ""
 
@@ -8329,18 +8237,12 @@ msgstr ""
 msgid "Image label type"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr ""
 
@@ -8435,7 +8337,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8446,13 +8348,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr ""
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8496,7 +8398,7 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8664,24 +8566,6 @@ msgstr ""
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8736,8 +8620,6 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
@@ -8763,31 +8645,22 @@ msgstr ""
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8816,7 +8689,7 @@ msgstr ""
 msgid "Incorrect eventsource value."
 msgstr ""
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
@@ -8841,22 +8714,17 @@ msgstr ""
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8867,7 +8735,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
@@ -8895,8 +8763,6 @@ msgstr ""
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8958,10 +8824,6 @@ msgstr ""
 msgid "Incorrect map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr ""
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9019,13 +8881,13 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr ""
 
@@ -9078,12 +8940,7 @@ msgstr ""
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
@@ -9129,13 +8986,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9152,60 +9009,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr ""
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr ""
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9260,14 +9087,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9377,25 +9198,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9406,7 +9209,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9452,16 +9255,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9470,7 +9274,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9558,12 +9362,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr ""
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr ""
 
@@ -9667,7 +9471,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr ""
 
@@ -9675,7 +9479,7 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9686,7 +9490,7 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9709,7 +9513,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9741,7 +9545,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
@@ -9766,27 +9570,29 @@ msgstr ""
 msgid "Invalid method parameters."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9812,17 +9618,17 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9830,8 +9636,8 @@ msgstr ""
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9845,106 +9651,116 @@ msgstr ""
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9986,43 +9802,38 @@ msgstr ""
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10043,7 +9854,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr ""
 
@@ -10084,7 +9895,7 @@ msgstr ""
 msgid "Italian (it_IT)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10116,7 +9927,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10130,7 +9941,7 @@ msgstr ""
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] ""
@@ -10144,13 +9955,13 @@ msgstr ""
 msgid "Item deleted"
 msgstr ""
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -10160,7 +9971,7 @@ msgstr[1] ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr ""
 
@@ -10169,7 +9980,7 @@ msgstr ""
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10206,8 +10017,8 @@ msgid_plural "Item prototypes updated"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10233,7 +10044,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10265,8 +10076,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10317,11 +10128,11 @@ msgstr ""
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr ""
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr ""
 
@@ -10339,7 +10150,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10364,6 +10175,10 @@ msgstr ""
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10376,7 +10191,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10394,7 +10209,7 @@ msgstr ""
 msgid "Jan"
 msgstr ""
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr ""
 
@@ -10416,7 +10231,7 @@ msgstr ""
 msgid "Jul"
 msgstr ""
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr ""
 
@@ -10424,7 +10239,7 @@ msgstr ""
 msgid "Jun"
 msgstr ""
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr ""
 
@@ -10580,22 +10395,6 @@ msgid_plural "Last %1$d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10607,11 +10406,11 @@ msgstr ""
 msgid "Last check"
 msgstr ""
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr ""
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr ""
 
@@ -10649,11 +10448,11 @@ msgstr ""
 msgid "Last value"
 msgstr ""
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr ""
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10662,11 +10461,11 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr ""
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr ""
 
@@ -10707,7 +10506,7 @@ msgstr ""
 msgid "Left trim"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -10988,7 +10787,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
@@ -11010,7 +10809,7 @@ msgstr ""
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11021,12 +10820,12 @@ msgid "Macro"
 msgstr ""
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
@@ -11054,7 +10853,7 @@ msgstr ""
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -11062,7 +10861,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11145,7 +10944,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11167,13 +10966,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr ""
 
@@ -11242,7 +11041,7 @@ msgstr ""
 msgid "Map update failed."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11274,7 +11073,7 @@ msgstr ""
 msgid "Mar"
 msgstr ""
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr ""
 
@@ -11378,7 +11177,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11392,7 +11191,7 @@ msgstr[1] ""
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr ""
 
@@ -11407,15 +11206,12 @@ msgstr ""
 msgid "Media"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr ""
@@ -11442,11 +11238,6 @@ msgid_plural "Media types enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr ""
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11476,7 +11267,7 @@ msgstr ""
 msgid "Media types"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11564,7 +11355,7 @@ msgstr ""
 msgid "Method not found."
 msgstr ""
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11626,7 +11417,7 @@ msgid "Minimum severity"
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11685,7 +11476,7 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11723,7 +11514,7 @@ msgstr[1] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11749,7 +11540,7 @@ msgstr ""
 msgid "Mon"
 msgstr ""
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr ""
 
@@ -11789,11 +11580,11 @@ msgstr ""
 msgid "Monthly"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11817,7 +11608,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr ""
 
@@ -11830,7 +11621,7 @@ msgstr ""
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr ""
 
@@ -11959,11 +11750,11 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12121,19 +11912,21 @@ msgstr ""
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr ""
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr ""
 
@@ -12145,7 +11938,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12153,7 +11946,7 @@ msgstr ""
 msgid "New service time"
 msgstr ""
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12162,7 +11955,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12180,7 +11973,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12209,30 +12002,6 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr ""
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12248,11 +12017,6 @@ msgstr ""
 msgid "No \"%1$s\" given for map."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12260,7 +12024,7 @@ msgstr ""
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -12270,7 +12034,7 @@ msgstr ""
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -12287,11 +12051,6 @@ msgstr ""
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr ""
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12322,7 +12081,7 @@ msgstr ""
 msgid "No details"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr ""
 
@@ -12358,7 +12117,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr ""
 
@@ -12388,7 +12147,7 @@ msgstr ""
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr ""
 
@@ -12422,7 +12181,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr ""
 
@@ -12430,17 +12189,46 @@ msgstr ""
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12448,7 +12236,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12476,19 +12264,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12503,16 +12290,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12532,12 +12325,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12558,27 +12349,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12595,14 +12388,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12611,7 +12404,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
@@ -12631,7 +12424,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr ""
 
@@ -12643,7 +12436,7 @@ msgstr ""
 msgid "No target selected"
 msgstr ""
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr ""
 
@@ -12660,7 +12453,7 @@ msgstr ""
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr ""
 
@@ -12730,15 +12523,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12770,7 +12563,7 @@ msgstr ""
 msgid "Not supported"
 msgstr ""
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr ""
@@ -12801,7 +12594,7 @@ msgstr ""
 msgid "Nov"
 msgstr ""
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr ""
 
@@ -12988,8 +12781,8 @@ msgstr ""
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13049,13 +12842,13 @@ msgstr ""
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr ""
 
@@ -13063,30 +12856,31 @@ msgstr ""
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr ""
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr ""
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr ""
 
@@ -13102,35 +12896,15 @@ msgstr ""
 msgid "One"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr ""
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr ""
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13179,10 +12953,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr ""
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13191,15 +12961,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr ""
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr ""
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr ""
 
@@ -13208,7 +12974,7 @@ msgstr ""
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13217,11 +12983,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr ""
 
@@ -13243,7 +13009,7 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13252,33 +13018,33 @@ msgstr ""
 msgid "Operations"
 msgstr ""
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr ""
 
@@ -13387,7 +13153,7 @@ msgstr ""
 msgid "Other parameters"
 msgstr ""
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr ""
@@ -13401,7 +13167,7 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13430,7 +13196,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13619,7 +13385,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13664,7 +13430,7 @@ msgstr ""
 msgid "PSK identity"
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13687,16 +13453,16 @@ msgstr ""
 msgid "Parameter"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr ""
@@ -13726,7 +13492,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13743,7 +13509,7 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13755,11 +13521,6 @@ msgstr ""
 msgid "Parse"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr ""
@@ -13820,7 +13581,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr ""
 
@@ -13830,15 +13591,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13884,12 +13645,11 @@ msgstr ""
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr ""
 
@@ -13978,7 +13738,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr ""
 
@@ -14018,7 +13778,7 @@ msgstr ""
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14107,7 +13867,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14238,7 +13998,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr ""
 
@@ -14251,21 +14011,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14279,9 +14035,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr ""
 
@@ -14315,7 +14071,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr ""
 
@@ -14336,13 +14092,13 @@ msgstr ""
 msgid "Proxies"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14350,7 +14106,7 @@ msgstr ""
 msgid "Proxy"
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14360,12 +14116,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
@@ -14458,7 +14214,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14535,10 +14291,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr ""
@@ -14620,7 +14372,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14638,13 +14390,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr ""
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14677,7 +14429,7 @@ msgstr ""
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14709,8 +14461,6 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14731,7 +14481,9 @@ msgstr ""
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14744,7 +14496,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14821,8 +14573,8 @@ msgstr ""
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr ""
 
@@ -14862,7 +14614,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14904,7 +14656,7 @@ msgid "Replace dependencies"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14959,7 +14711,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -15001,8 +14753,8 @@ msgstr ""
 msgid "Required string"
 msgstr ""
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr ""
 
@@ -15035,7 +14787,7 @@ msgstr ""
 msgid "Reset defaults"
 msgstr ""
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr ""
 
@@ -15101,7 +14853,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr ""
@@ -15288,12 +15040,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr ""
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15304,8 +15056,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr ""
 
@@ -15342,7 +15094,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15438,12 +15190,12 @@ msgstr ""
 msgid "SQL query"
 msgstr ""
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr ""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
@@ -15506,7 +15258,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr ""
 
@@ -15518,7 +15270,7 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr ""
 
@@ -15560,7 +15312,7 @@ msgstr ""
 msgid "Scheduled check"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15627,7 +15379,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15640,8 +15392,7 @@ msgstr ""
 msgid "Script"
 msgstr ""
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
@@ -15673,12 +15424,6 @@ msgstr ""
 msgid "Script parameters"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr ""
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr ""
@@ -15691,7 +15436,7 @@ msgstr ""
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr ""
 
@@ -15761,8 +15506,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15770,7 +15515,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr ""
 
@@ -15806,19 +15551,19 @@ msgstr ""
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr ""
 
@@ -15843,7 +15588,7 @@ msgstr ""
 msgid "Send to"
 msgstr ""
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr ""
 
@@ -15876,7 +15621,7 @@ msgstr ""
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr ""
 
@@ -15907,28 +15652,28 @@ msgstr ""
 msgid "Server time"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr ""
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15938,7 +15683,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr ""
 
@@ -15970,16 +15715,16 @@ msgstr ""
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -15987,11 +15732,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr ""
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr ""
 
@@ -16000,30 +15745,29 @@ msgstr ""
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -16031,7 +15775,7 @@ msgstr ""
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16061,7 +15805,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16090,7 +15834,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16099,7 +15843,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16155,7 +15899,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr ""
 
@@ -16297,7 +16041,7 @@ msgstr ""
 msgid "Show working time"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr ""
 
@@ -16406,7 +16150,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr ""
 
@@ -16452,7 +16196,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr ""
 
@@ -16526,7 +16270,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16629,15 +16373,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr ""
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr ""
@@ -16667,7 +16415,7 @@ msgstr ""
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16715,7 +16463,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16780,7 +16528,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr ""
 
@@ -16796,7 +16544,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr ""
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16809,7 +16557,7 @@ msgstr ""
 msgid "Sun"
 msgstr ""
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr ""
 
@@ -16901,12 +16649,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16933,17 +16681,17 @@ msgstr ""
 msgid "Table \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr ""
@@ -16999,7 +16747,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17059,7 +16807,7 @@ msgstr ""
 msgid "Telnet"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17080,7 +16828,7 @@ msgstr ""
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17104,7 +16852,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17164,7 +16912,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17336,14 +17084,14 @@ msgstr ""
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17408,7 +17156,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr ""
 
@@ -17416,7 +17164,7 @@ msgstr ""
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr ""
 
@@ -17424,7 +17172,7 @@ msgstr ""
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr ""
 
@@ -17444,7 +17192,7 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr ""
 
@@ -17461,7 +17209,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17494,7 +17242,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr ""
 
@@ -17546,12 +17294,11 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr ""
 
@@ -17666,7 +17413,7 @@ msgstr ""
 msgid "Trends"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17674,7 +17421,7 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr ""
 
@@ -17775,7 +17522,7 @@ msgstr ""
 msgid "Trigger overview"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17848,11 +17595,11 @@ msgstr ""
 msgid "Trigger severity"
 msgstr ""
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17869,7 +17616,7 @@ msgstr ""
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17904,7 +17651,7 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr ""
 
@@ -17917,7 +17664,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17933,19 +17680,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -17997,7 +17744,7 @@ msgstr ""
 msgid "Types"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18018,7 +17765,7 @@ msgstr ""
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr ""
 
@@ -18064,12 +17811,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18154,12 +17901,12 @@ msgstr ""
 msgid "Unblock selected users?"
 msgstr ""
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18179,21 +17926,23 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr ""
@@ -18211,7 +17960,7 @@ msgid "Unknown error"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
@@ -18264,7 +18013,7 @@ msgstr ""
 msgid "Unlink from templates"
 msgstr ""
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr ""
 
@@ -18295,7 +18044,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -18305,7 +18054,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -18350,7 +18099,7 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18363,7 +18112,7 @@ msgstr ""
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18416,7 +18165,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18434,7 +18183,7 @@ msgstr ""
 msgid "Upper level maps"
 msgstr ""
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18469,7 +18218,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18484,7 +18233,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
@@ -18536,7 +18285,7 @@ msgstr ""
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
@@ -18556,7 +18305,7 @@ msgid_plural "Users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18566,27 +18315,27 @@ msgstr[1] ""
 msgid "User group"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
@@ -18620,8 +18369,8 @@ msgstr[1] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18665,14 +18414,14 @@ msgstr ""
 msgid "User profile"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18741,7 +18490,7 @@ msgstr ""
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -19057,14 +18806,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19074,7 +18823,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19116,7 +18865,7 @@ msgstr ""
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr ""
@@ -19133,7 +18882,7 @@ msgstr ""
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr ""
 
@@ -19176,11 +18925,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr ""
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19227,7 +18977,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19314,7 +19064,7 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19331,7 +19081,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19340,7 +19090,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19356,7 +19106,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr ""
 
@@ -19368,7 +19118,7 @@ msgstr ""
 msgid "Web monitoring"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr ""
 
@@ -19383,27 +19133,27 @@ msgstr ""
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr ""
 
@@ -19425,7 +19175,7 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr ""
 
@@ -19436,7 +19186,7 @@ msgstr ""
 msgid "Weekly"
 msgstr ""
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19452,12 +19202,12 @@ msgstr ""
 msgid "When active"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19652,6 +19402,10 @@ msgstr ""
 msgid "Y-m-d H:i:s"
 msgstr ""
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr ""
@@ -19713,7 +19467,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19770,18 +19524,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19793,9 +19541,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
@@ -19911,24 +19656,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr ""
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19937,37 +19686,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr ""
@@ -19988,28 +19737,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr ""
@@ -20057,7 +19807,7 @@ msgstr ""
 msgid "all media"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20065,42 +19815,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20110,7 +19855,7 @@ msgid "an empty string is expected"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr ""
 
@@ -20118,11 +19863,15 @@ msgstr ""
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20283,14 +20032,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20320,19 +20063,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20352,14 +20087,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20367,7 +20102,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr ""
@@ -20380,7 +20115,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20414,7 +20149,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20432,7 +20167,8 @@ msgid "configure"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20461,7 +20197,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20523,7 +20259,7 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20545,13 +20281,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20577,7 +20313,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20614,6 +20351,10 @@ msgstr ""
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20660,7 +20401,7 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr ""
@@ -20701,6 +20442,11 @@ msgstr ""
 msgid "image"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr ""
@@ -20741,15 +20487,19 @@ msgstr ""
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20777,7 +20527,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr ""
 
@@ -20806,27 +20556,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr ""
 
@@ -20854,7 +20604,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr ""
 
@@ -20940,12 +20690,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -21004,7 +20754,7 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21044,7 +20794,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr ""
@@ -21071,8 +20821,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21087,27 +20837,14 @@ msgstr ""
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr ""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21135,6 +20872,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21145,7 +20890,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr ""
 
@@ -21280,7 +21025,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21315,24 +21060,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21360,11 +21109,11 @@ msgstr ""
 msgid "regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21376,15 +21125,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21432,7 +21181,7 @@ msgstr ""
 msgid "short description"
 msgstr ""
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21451,15 +21200,15 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr ""
 
@@ -21475,31 +21224,31 @@ msgstr ""
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21507,11 +21256,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21527,8 +21276,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21539,7 +21288,7 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21548,13 +21297,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21563,20 +21316,20 @@ msgstr ""
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr ""
@@ -21608,39 +21361,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21654,7 +21407,7 @@ msgstr ""
 msgid "trigger does not allow manual closing"
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21666,26 +21419,26 @@ msgstr ""
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21693,11 +21446,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21714,10 +21467,10 @@ msgstr ""
 msgid "unexpected end of macro"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21727,11 +21480,12 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr ""
@@ -21757,8 +21511,8 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21783,6 +21537,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21798,7 +21556,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21818,11 +21576,11 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21840,76 +21598,85 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr ""
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr ""
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21921,18 +21688,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21941,7 +21706,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21954,11 +21719,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21975,7 +21740,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr ""
diff --git a/ui/locale/cs/LC_MESSAGES/frontend.po b/ui/locale/cs/LC_MESSAGES/frontend.po
index ef187a331f7..c57f521d95a 100644
--- a/ui/locale/cs/LC_MESSAGES/frontend.po
+++ b/ui/locale/cs/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2018-09-24 07:57+0300\n"
 "Last-Translator: Lukáš <iam@lukasmaly.net>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -95,7 +95,7 @@ msgstr[0] "%1$d den"
 msgstr[1] "%1$d dní"
 msgstr[2] "%1$d dní"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -187,7 +187,7 @@ msgstr[2] "%1$s zpráv"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -203,7 +203,7 @@ msgstr[0] "%1$s z %2$s prvků v hlásí problém"
 msgstr[1] "%1$s z %2$s prvků v hlásí problém"
 msgstr[2] "%1$s z %2$s prvků v hlásí problém"
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -239,7 +239,7 @@ msgstr[2] "Zůstává %1$s pokusů"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -247,7 +247,7 @@ msgstr[0] "%1$s sekunda"
 msgstr[1] "%1$s sekundy"
 msgstr[2] "%1$s sekund"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "%1$s symbolů zůstává"
@@ -268,13 +268,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Závažnost, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, pouze ke čtení"
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -406,7 +406,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -470,10 +470,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "Přístup odmítnut"
@@ -516,7 +512,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Potvrzeno"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Přijmout"
 
@@ -524,7 +520,7 @@ msgstr "Přijmout"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Přijato"
@@ -537,7 +533,7 @@ msgstr "Přijaté PROBLÉMové události"
 msgid "Acknowledged RESOLVED events"
 msgstr "Potvrzené VYŘEŠENÉ události"
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -564,9 +560,9 @@ msgstr "Potvrzené VYŘEŠENÉ události"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -623,7 +619,7 @@ msgstr "Akce \"%1$s\" již existuje."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Pro akci \"%1$s\" není definována operace."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -632,7 +628,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Akce byla přidána"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -683,8 +679,8 @@ msgstr "Akce byla aktualizována"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Akce"
@@ -751,7 +747,7 @@ msgstr "Aktivní do"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -762,7 +758,7 @@ msgstr "Aktivní do"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -785,9 +781,9 @@ msgstr "Aktivní do"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -857,7 +853,7 @@ msgstr "Aktivní do"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Přidat"
 
@@ -865,11 +861,11 @@ msgstr "Přidat"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "Přidat nový widget"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "Přidat podřízený prvek"
 
@@ -877,7 +873,7 @@ msgstr "Přidat podřízený prvek"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -894,7 +890,7 @@ msgstr "Přidat hostitele"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "Přidat více map"
 
@@ -916,7 +912,7 @@ msgstr "Přidej nový přepis"
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -968,12 +964,12 @@ msgstr ""
 msgid "Add widget"
 msgstr "Přidat widget"
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -983,7 +979,7 @@ msgstr "Přidáno, %1$s"
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -996,7 +992,7 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administrace"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -1018,7 +1014,7 @@ msgstr "Stáří méně než"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1090,7 +1086,7 @@ msgstr "Přidej prvky mapy"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Vše"
 
@@ -1108,7 +1104,7 @@ msgstr "Všechny skupiny"
 msgid "All hosts"
 msgstr "Všechny hosty"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Veškeré odkazy by měly mít zadáno \"Jméno\" a \"URL\""
 
@@ -1126,7 +1122,7 @@ msgstr "Všechny problémy"
 msgid "All problems if tag values match"
 msgstr "Všechny problémy, pokud se jejich hodnoty rovnají tagu"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1239,15 +1235,15 @@ msgstr "Chyba aplikace."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Použít"
 
@@ -1265,7 +1261,7 @@ msgstr "Blížící se"
 msgid "Apr"
 msgstr "Dub"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Duben"
 
@@ -1293,7 +1289,7 @@ msgstr "Typ oblasti"
 msgid "Arithmetic"
 msgstr "Aritmetický"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1344,7 +1340,7 @@ msgstr "V (hodina:minuta)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1353,7 +1349,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1365,6 +1361,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr "Minimálně jedna skupina hostů musí být vybrána."
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1376,7 +1377,7 @@ msgstr "Minimálně jedna perioda údržby musí být vytvořena."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1432,7 +1433,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Srp"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Srpen"
 
@@ -1445,7 +1446,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1522,7 +1523,7 @@ msgstr "Automatické odhlášení"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1537,7 +1538,7 @@ msgstr "Automatické přiřazení ikony"
 msgid "Automatic icon selection"
 msgstr "Automatický výběr ikony"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1589,7 +1590,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr "Osy"
 
@@ -1652,7 +1653,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Blokovaný"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "Modrá"
 
@@ -1706,11 +1707,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Dole"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "Předložit"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "Přenést dopředu"
 
@@ -1736,7 +1737,7 @@ msgstr "CERT"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1781,8 +1782,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1791,7 +1792,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Vypočítaná"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr "Kalendář"
 
@@ -1816,7 +1817,7 @@ msgstr "Odvolat"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1829,8 +1830,8 @@ msgstr "Odvolat"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -1860,7 +1861,7 @@ msgstr "Nelze přidat akci"
 msgid "Cannot add correlation"
 msgstr "Nelze přidat korelaci"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1870,7 +1871,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Nemohu předat závislost z hosta na šablonu."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1901,8 +1902,8 @@ msgid "Cannot add host prototype"
 msgstr "Není možné přidat prototyp hosta"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Nelze přidat obrázek"
 
@@ -1995,15 +1996,15 @@ msgstr "Nelze přidat uživatele"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Není možné přidat webový scénář"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2023,33 +2024,29 @@ msgstr "Není možné navázat na LDAP server."
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Nelze smazat historii"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Nelze klonovat předlohy pro grafy."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "Není možné klonovat prototypy hostů."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Nelze klonovat předlohy položek."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Nelze klonovat předlohy spouštěčů."
 
@@ -2077,7 +2074,7 @@ msgstr[0] "Nelze kopírovat graf"
 msgstr[1] "Nelze kopírovat grafy"
 msgstr[2] "Nelze kopírovat grafy"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "Není možné kopírovat položku"
@@ -2131,8 +2128,8 @@ msgstr "Nelze vytvořit mapu ikon"
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2162,7 +2159,7 @@ msgstr "Není možné smazat interního Zabbix uživatele \"%1$s\", zkuste ho vy
 msgid "Cannot delete action"
 msgstr "Nelze smazat akci"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2235,7 +2232,7 @@ msgstr[0] "Nelze odstranit hosta, protože údržba \"%1$s\" musí obsahovat min
 msgstr[1] "Nelze odstranit vybrané hosty, protože údržba \"%1$s\" musí obsahovat minimálně jednoho hosta nebo skupinu hostů."
 msgstr[2] "Nelze odstranit vybrané hosty, protože údržba \"%1$s\" musí obsahovat minimálně jednoho hosta nebo skupinu hostů."
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2247,11 +2244,11 @@ msgstr[2] "Nelze odstranit vybrané skupiny hostů, protože údržba \"%1$s\" m
 msgid "Cannot delete host prototypes"
 msgstr "Není možné smazat prototypy hostů"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Není možné smazat mapu ikon"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Nelze smazat obrázek"
 
@@ -2276,7 +2273,7 @@ msgstr "Není možné smazat prototyp položky"
 msgid "Cannot delete item prototypes"
 msgstr "Není možné smazat prototypy položek"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Nelze smazat položky"
 
@@ -2310,7 +2307,7 @@ msgstr[0] "Nelze smazat proxy"
 msgstr[1] "Nelze smazat proxy"
 msgstr[2] "Nelze smazat proxy"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2336,7 +2333,7 @@ msgstr[0] "Nelze smazat skript"
 msgstr[1] "Nelze smazat skript"
 msgstr[2] "Nelze smazat skript"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Není možné smazat skripty. Skript \"%1$s\" se používá v operaci akce \"%2$s\"."
@@ -2353,8 +2350,8 @@ msgstr[0] "Nelze smazat službu"
 msgstr[1] "Nelze smazat službu"
 msgstr[2] "Nelze smazat službu"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2383,7 +2380,7 @@ msgstr "Nelze odstranit prototyp položky hosta."
 msgid "Cannot delete templated item."
 msgstr "Není možné smazat položky patřící šabloně."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Není možné smazat položky patřící šabloně."
 
@@ -2439,7 +2436,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Není možné smazat web scénář"
 
@@ -2479,7 +2476,7 @@ msgstr[0] "Není možné vypnout hosta"
 msgstr[1] "Není možné vypnout hosty"
 msgstr[2] "Není možné vypnout hosty"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Není možné vypnout položku"
@@ -2515,7 +2512,7 @@ msgstr[0] "Není možné vypnout spouštěč"
 msgstr[1] "Není možné vypnout spouštěče"
 msgstr[2] "Není možné vypnout spouštěče"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Není možné zakázat web scenář"
@@ -2568,7 +2565,7 @@ msgstr[0] "Není možné povolit hosta"
 msgstr[1] "Není možné povolit hosty"
 msgstr[2] "Není možné povolit hosty"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Není možné povolit položku"
@@ -2604,7 +2601,7 @@ msgstr[0] "Není možné povolit spouštěč"
 msgstr[1] "Není možné povolit spouštěče"
 msgstr[2] "Není možné povolit spouštěče"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Není možné povolit scenář"
@@ -2619,7 +2616,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr "Nelze rozšířit makra."
 
@@ -2653,8 +2650,8 @@ msgstr "Host \"%1$s\" použitý v mapě \"%2$s\" nebyl nalezený."
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Nelze najít skupinu \"%1$s\" pro prototyp hosta \"%2$s\" zjišťovacího pravidla \"%3$s\" na\"%4$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2752,24 +2749,20 @@ msgstr "Nelze nalézt mapu hodnot \"%1$s\" použitou pro položku \"%2$s\" na \"
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Nelze nalézt mapu hodnot \"%1$s\" použitou pro prototyp položky \"%2$s\" objevovacího pravidla \"%3$s\" na \"%4$s\"."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "Není možné mít prázdné zobrazované jméno šablony."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2783,7 +2776,7 @@ msgstr[0] "Není možné importovat šablonu \"%1$s\", připojená šablona \"%2
 msgstr[1] "Není možné importovat šablonu \"%1$s\", připojené šablony \"%2$s\" neexistují."
 msgstr[2] "Není možné importovat šablonu \"%1$s\", připojené šablony \"%2$s\" neexistují."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "Není možné vložit výraz spouštěče"
 
@@ -2797,7 +2790,7 @@ msgid "Cannot link template."
 msgstr "Není možné nalinkovat šablonu."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2830,17 +2823,17 @@ msgstr "Není možné hromadně aktualizovat zobrazované jméno šablony."
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Nelze vykonat příkaz vymazat na tabulce \"%1$s\" bez podmínky kde."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Nelze vykonat příkaz aktualizace na tabulce \"%1$s\" bez hodnot."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Není možné vykonat update příkaz nad tabulkou \"%1$s\" bez podmínky where."
@@ -2867,7 +2860,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Není možné číst odpověď, zkontrolujte spojení se Zabbix serverem \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Není možné přejmenovat uživatele guest."
 
@@ -2886,7 +2879,7 @@ msgstr "Nepodařilo se uložit widget \"%1$s\"."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Není možné poslat příkaz, zkontrolujte spojení se Zabbix serverem \"%1$s\"."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr "Nejde poslat požadavek"
 
@@ -2926,12 +2919,12 @@ msgstr "Nelze nastavit inventární pole pro zakázaný inventář."
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2951,7 +2944,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Není možné zrušit a smazat web scénář."
 
@@ -2964,7 +2957,7 @@ msgstr "Nelze odpojit šablonu"
 msgid "Cannot unlink template."
 msgstr "Není možné zrušit linkování šablony."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -3017,11 +3010,6 @@ msgstr "Není možné aktualizovat \"%2$s\" pro objevenou položku \"%1$s\"."
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "Není možné aktualizovat \"%2$s\" pro objevený spouštěč \"%1$s\"."
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "Není možné aktualizovat \"imagetype\" pro obrázek \"%1$s\"."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -3031,9 +3019,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "Není možné aktualizovat objevený graf."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "Není možné aktualizovat objevenou skupinu hostů."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3093,9 +3082,7 @@ msgstr "Není možné aktualizovat prototyp grafu"
 msgid "Cannot update group"
 msgstr "Nelze upravit skupinu"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Není možné aktualizovat skupiny pro objeveného hosta \"%1$s\"."
@@ -3119,13 +3106,13 @@ msgstr[2] "Nelze aktualizovat host prototyp"
 msgid "Cannot update hosts"
 msgstr "Nelze aktualizovat hosty"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "Nelze aktualizovat mapu ikon"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Nelze upravit obrázek"
 
@@ -3180,12 +3167,12 @@ msgstr "Nelze upravit síťovou mapu"
 msgid "Cannot update proxy"
 msgstr "Nelze upravit proxy"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Není možné aktualizovat proxy pro objeveného hosta \"%1$s\"."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3205,17 +3192,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Nelze upravit skript"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3292,7 +3279,7 @@ msgstr[2] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Nelze aktualizovat web scénář"
 
@@ -3392,8 +3379,8 @@ msgid "Character string not included"
 msgstr "Neobsahuje řetězec"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3508,7 +3495,7 @@ msgstr "Zkontroluje výkonnost služby UDP. Odpověď 0 - služba je nedostupná
 msgid "Checks should be unique."
 msgstr "Kontroly musí byt jedinečné."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3529,7 +3516,7 @@ msgstr "Kruhový odkaz v šablonách: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "Kruhové odkazování šablon není povolené."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3550,11 +3537,11 @@ msgstr "Vyčistit historii a trendy"
 msgid "Clear when unlinking"
 msgstr "Pročistit při odpojování"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr "Kliknout a roztáhnout do požadované velikosti."
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr "Kliknout pro zobrazení či úpravu"
 
@@ -3569,7 +3556,7 @@ msgstr "Hodiny"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3584,7 +3571,7 @@ msgstr "Hodiny"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Vytvořit kopii"
 
@@ -3595,8 +3582,8 @@ msgstr "Vytvořit kopii"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Zavřít"
 
@@ -3607,13 +3594,13 @@ msgstr "Zavřít"
 msgid "Close expression constructor"
 msgstr "Zavřít kunstruktéra výrazu"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Zavřít novou událost"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Zavřít starou událost"
 
@@ -3626,8 +3613,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "Zhroucení"
 
@@ -3644,7 +3631,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3710,7 +3697,7 @@ msgstr "Komprimace"
 msgid "Concurrent sessions"
 msgstr "Souběžné relace"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3721,17 +3708,12 @@ msgstr "Podmínka"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "Podmínka \"%2$s\" není použitá ve formuli \"%3$s\" pro akci \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "Podmínka \"%2$s\" se nepoužívá ve vzorci \"%3$s\" pro korelaci \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "Podmínka \"%2$s\" použitá ve formuli \"%3$s\" pro pravidlo nálezu  \"%1$s\" není definovaná."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3741,17 +3723,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "Podmínka \"%2$s\" použitá ve formuli \"%3$s\" pro akci \"%1$s\" není definovaná."
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "Podmínka \"%2$s\" použitá ve vzorci \"%3$s\" pro korelaci \"%1$s\" není definována."
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "Podmínka \"%2$s\" použitá ve formuli \"%3$s\" pro  pravidlo nálezu \"%1$s\" není definovaná."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3767,7 +3744,7 @@ msgstr "Podmínky"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Nastavení"
 
@@ -3830,7 +3807,7 @@ msgstr "Nastavení hostů"
 msgid "Configuration of housekeeping"
 msgstr "Nastavení údržby"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Nastavení mapování ikon"
@@ -3937,7 +3914,7 @@ msgstr "Potvrzující text"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "Gratulace! Právě jste úspěšně nainstalovali Zabbix frontend."
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -4030,7 +4007,7 @@ msgstr "Kontakt"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4090,7 +4067,7 @@ msgstr "Obsahuje"
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr "Nabídka ovládacích prvků"
 
@@ -4129,8 +4106,8 @@ msgstr "Poloha"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Kopírovat"
 
@@ -4139,12 +4116,11 @@ msgstr "Kopírovat"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "Korelace"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "Korelace \"%1$s\" již existuje."
@@ -4175,16 +4151,6 @@ msgstr[0] "Korelace povolena"
 msgstr[1] "Korelace povoleny"
 msgstr[2] "Korelace povoleny"
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "Korelaci chybí parametry: %1$s"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "Název korelace nemůže být prázdný."
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr "Korelační pravidlo"
@@ -4193,14 +4159,10 @@ msgstr "Korelační pravidlo"
 msgid "Correlation updated"
 msgstr "Korelace aktualizována"
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Nepodařilo se uložit obrázek!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Počet"
 
@@ -4264,11 +4226,11 @@ msgstr "Vytvořit korelaci"
 msgid "Create dashboard"
 msgstr "Vytvořit dashboard"
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr "Vytvořit závislé pravidlo nálezu"
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr "Vytvořte závislou položku"
 
@@ -4385,7 +4347,7 @@ msgstr "Vytvořit mapu"
 msgid "Create media type"
 msgstr "Vytvořit typ média"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "Vytvořit nové"
 
@@ -4409,7 +4371,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Vytvořit šablonu"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Vytvořit spouštěč"
 
@@ -4572,7 +4534,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "Jméno DNS"
@@ -4584,11 +4546,11 @@ msgstr "Jméno DNS"
 msgid "Daily"
 msgstr "Denně"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "Tmavý"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4609,8 +4571,8 @@ msgstr "Dashbord \"%1$s\" již existuje."
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr "Dashboard vytvořen"
 
@@ -4634,9 +4596,9 @@ msgstr "Vlastnosti dashboardu"
 msgid "Dashboard sharing"
 msgstr "Sdílení dashboardu"
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr "Dashboard aktualizován"
 
@@ -4660,7 +4622,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr "Dashboardy"
 
@@ -4688,7 +4650,7 @@ msgstr "Přehled dat"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr "Data set"
 
@@ -4830,7 +4792,7 @@ msgstr "Den v týdnu"
 msgid "Days"
 msgstr "Dní"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Ladící výstup"
 
@@ -4844,26 +4806,26 @@ msgstr "Ladící mód"
 msgid "Dec"
 msgstr "Pro"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Prosinec"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Výchozí"
 
@@ -4956,7 +4918,7 @@ msgstr "Zpožděno o"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4980,8 +4942,8 @@ msgstr "Zpožděno o"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Smazat"
 
@@ -5006,11 +4968,11 @@ msgstr "Smazat a vyčistit šablonu? (Pozor: všechny připojené hosty budou ta
 msgid "Delete current action?"
 msgstr "Smazat aktuální akci?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "Smazat aktuální korelaci?"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr "Smazat dashboard?"
 
@@ -5054,7 +5016,7 @@ msgstr "Smazat prototyp položky?"
 msgid "Delete item?"
 msgstr "Smazat položku?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Smazat propojení mezi označenými elementy?"
 
@@ -5110,7 +5072,7 @@ msgstr "Odstranit vybrané dashboardy?"
 msgid "Delete selected discovery rules?"
 msgstr "Smazat vybraná pravidla nálezu?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Smazat vybrané prvky?"
 
@@ -5215,7 +5177,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "Smazat vybrané tvary?"
 
@@ -5259,7 +5221,7 @@ msgstr "Smazat spouštěč?"
 msgid "Delete web scenario?"
 msgstr "Smazat web scénář?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5304,7 +5266,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Závislosti"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Závisející"
 
@@ -5312,7 +5274,7 @@ msgstr "Závisející"
 msgid "Dependent item"
 msgstr "Závislá položka"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5322,7 +5284,7 @@ msgstr "Závisí na"
 msgid "Deployment status"
 msgstr "Stav nasazení"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5355,7 +5317,7 @@ msgid "Description"
 msgstr "Popis"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5521,10 +5483,10 @@ msgstr "Zakázat označené scénáře?"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5607,7 +5569,7 @@ msgid "Discovery by proxy"
 msgstr "Průzkum podle proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Kontrola průzkumu"
 
@@ -5619,7 +5581,7 @@ msgstr "Kontroly objevování"
 msgid "Discovery list"
 msgstr "Objevovací seznam"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Objekt objevování"
 
@@ -5651,7 +5613,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5659,12 +5621,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Pravidlo pro průzkum"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Pravidlo nálezu \"%1$s\" již existuje na \"%2$s\", zděděné z jiné šablony."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr " Pravidlo nálezu \"%1$s\" již existuje na \"%2$s\"."
@@ -5677,7 +5639,7 @@ msgstr " Pravidlo nálezu \"%1$s\" již existuje na \"%2$s\"."
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr " Pravidlo nálezu \"%1$s\" už existuje."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr "Pravidlo nálezu \"%1$s\" nemůže být kopírováno bez své master položky."
@@ -5722,7 +5684,7 @@ msgstr "Pravidlo nálezu aktualizováno"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5733,7 +5695,7 @@ msgstr "Pravidla nálezu"
 msgid "Discovery rules deleted"
 msgstr "Pravidla nálezu byla smazána"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Stav nálezu"
@@ -5770,10 +5732,11 @@ msgid "Display stacked graph"
 msgstr "Zobrazit skládaný graf"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Zobrazeno %1$s z %2$s nalezených"
@@ -5783,7 +5746,7 @@ msgstr "Zobrazeno %1$s z %2$s nalezených"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "Zobrazení %1$s do %2$s od %3$s nalezeno"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr "Zobrazení možností"
 
@@ -5805,7 +5768,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Přejete si změnit podmínkový výraz?"
 
@@ -5861,7 +5824,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Nedostupné"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5869,7 +5832,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr "Stáhnout konfigurační soubor"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5888,18 +5851,6 @@ msgstr "Návrh"
 msgid "Draw style"
 msgstr "Styl vykreslení"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "Duplicita \"%1$s\" hodnoty \"%2$s\" pro korelaci \"%3$s\"."
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr "Duplicate \"%1$s\" hodnoty \"%2$s\" pro korelaci."
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5912,11 +5863,6 @@ msgstr "Duplicitní \"name\" hodnota \"%1$s\" pro mapu."
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5968,7 +5914,7 @@ msgstr "Dynamická položka"
 msgid "Dynamic items"
 msgstr "Dynamické položky"
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Každá URL by měla mít jedinečné jméno. Prosím ujistěte se, že existuje jen jedna URL s takovýmto jménem"
 
@@ -5977,11 +5923,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5995,8 +5941,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Upravit"
 
@@ -6012,11 +5958,11 @@ msgstr "Aktualizovat mapu"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr "Upravit prvek stromu"
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Editovat spouštěč"
 
@@ -6076,21 +6022,17 @@ msgstr "Prázdný soubor SSL klíče pro web scénář \"%1$s\"."
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "Prázdné ID korelace."
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "Prázdná filtrovací podmínka ID vzorce pro akci \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Prázdná filtrovací podmínka ID vzorce pro pravidlo nálezu \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "Prázdná filtrovací podmínka makra pro pravidlo nálezu \"%1$s\"."
@@ -6106,25 +6048,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr "Podmíněný typ akce pro prázdný filtr \"%1$s\"."
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6134,14 +6070,6 @@ msgstr "Prázdná vstupní parametr."
 msgid "Empty map ID."
 msgstr "Prázdné ID mapy."
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "Prázdný typ média ID."
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Prázdné parametry"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6307,7 +6235,7 @@ msgstr "Zapnout pasti"
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6318,7 +6246,7 @@ msgstr "Zapnout pasti"
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6361,7 +6289,7 @@ msgid "English (en_US)"
 msgstr "Anglicky (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6377,7 +6305,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6396,12 +6324,12 @@ msgstr "Rovná se"
 msgid "Error"
 msgstr "Chyba"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Chyba ve vyhledávacím požadavku nad tabulkou \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr "Chybná zpráva"
 
@@ -6428,7 +6356,7 @@ msgstr "ID události"
 msgid "Event acknowledged"
 msgstr "Událost potvrzena"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6436,7 +6364,7 @@ msgid "Event correlation"
 msgstr "Korelace událostí"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "Pravidla korelace události"
@@ -6471,11 +6399,11 @@ msgstr "Monitoring logu událostí. Vráti log"
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "Pár značky události"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Typ události"
 
@@ -6521,15 +6449,10 @@ msgstr "Vyjma"
 msgid "Exclude host groups"
 msgstr "Vyloučit skupiny hostů"
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Vykonat"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "SQL chyba při spuštění [%1$s] v [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6567,7 +6490,7 @@ msgstr "Provedené"
 msgid "Executed script"
 msgstr "Vykonaný skript"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Potvrzení vykonání"
 
@@ -6583,8 +6506,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "Rozbalit"
 
@@ -6705,7 +6628,7 @@ msgstr "Výrazy"
 msgid "External check"
 msgstr "Vnější kontrola"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "Pá"
@@ -6732,8 +6655,8 @@ msgstr "Selhalo"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6744,26 +6667,26 @@ msgstr "Nepodařilo se vytvořit dashboard"
 msgid "Failed to parse URL."
 msgstr "Adresa URL nebyla úspěšně analyzována."
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr "Nepodařilo se aktualizovat dashboard"
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6771,7 +6694,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Nepodařilo se aktualizovat šablony."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6795,7 +6718,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Ún"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Únor"
 
@@ -6817,10 +6740,9 @@ msgstr "Pole \"%1$s\" nemůže být nastavené na NULL."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6831,13 +6753,6 @@ msgstr "Pole \"%1$s\" je povinné."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "Pole \"%1$s\" chybí, hodnoty pro mapu \"%2$s\"."
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "Položka \"%1$s\" chybí hodnota pro typ média \"%2$s\"."
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6856,11 +6771,6 @@ msgstr "Pole \"%1$s\" není desítkové číslo."
 msgid "Field \"%1$s\" is not string."
 msgstr "Pole \"%1$s\" není řetězec."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "Položka \"%1$s\" je nutné pro typ médií \"%2$s\"."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6875,10 +6785,6 @@ msgstr "Pole \"host\" je vyžadované."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Formát souboru není podporovaný."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6943,7 +6849,8 @@ msgstr "Oblast"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6968,7 +6875,7 @@ msgstr "Filtr"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -7020,7 +6927,7 @@ msgstr "Přizpůsobit mapě"
 msgid "Fixed"
 msgstr "Pevná"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -7071,12 +6978,12 @@ msgstr "Vzorec"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7089,7 +6996,7 @@ msgstr "Francouzsky (fr_FR)"
 msgid "Fri"
 msgstr "Pá"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Pátek"
 
@@ -7200,7 +7107,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "Zadaný výraz není makro"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr "Globální regulární výraz \"%1$s\" neexistuje."
@@ -7214,7 +7121,7 @@ msgstr "Globální hodnota"
 msgid "Go back to %1$s"
 msgstr "Vrátit zpět na %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Jdi na"
 
@@ -7252,7 +7159,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7260,7 +7167,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Přechodová linka"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7321,7 +7228,7 @@ msgstr[2] "Grafy zkopírovány"
 msgid "Graph deleted"
 msgstr "Graf byl smazán"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7358,8 +7265,8 @@ msgstr "Prototyp grafu byl smazán"
 msgid "Graph prototype updated"
 msgstr "Prototyp grafu byl aktualizován"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr "Prototyp grafu s ID \"%1$s\" není k dispozici."
@@ -7393,8 +7300,8 @@ msgstr "Typ grafu"
 msgid "Graph updated"
 msgstr "Graf byl aktualizován"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr "Graf s ID \"%1$s\" není k dispozici."
@@ -7425,7 +7332,7 @@ msgstr "Graf se jménem \"%1$s\" již existuje v grafech, nebo prototypech graf�
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Grafy"
 
@@ -7446,12 +7353,12 @@ msgstr "Mřížka"
 msgid "Group"
 msgstr "Skupina"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Skupina \"%1$s\" nemůže být smazána, protože je používána prototypem hosta."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr "Skupina \"%1$s\" nemůže být odstraněna, protože je použita v korelační podmínce."
@@ -7626,11 +7533,11 @@ msgstr "Nápověda"
 msgid "Hexadecimal to decimal"
 msgstr "Z hexadecimální do desítkové"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Skryta"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "Skrýt debug"
 
@@ -7657,11 +7564,11 @@ msgstr "Hierarchie"
 msgid "High"
 msgstr "Závažný"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr "Vysoký tmavý kontrast"
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr "Vysoký světlý kontrast"
 
@@ -7682,7 +7589,7 @@ msgstr "Označ celý řádek"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Historie"
 
@@ -7690,11 +7597,15 @@ msgstr "Historie"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Historie byla pročištěna"
 
@@ -7737,7 +7648,7 @@ msgstr "Vodorovný"
 msgid "Horizontal align"
 msgstr "Vodorovné zarovnání"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7766,7 +7677,7 @@ msgstr "Vodorovné zarovnání"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7781,7 +7692,7 @@ msgstr[2] "Hostitelé"
 msgid "Host \"%1$s\" already exists."
 msgstr "Host \"%1$s\" již existuje."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7789,7 +7700,7 @@ msgstr "Host \"%1$s\" již existuje."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "Host \"%1$s\" nemůže být bez hostitelské skupiny."
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7843,7 +7754,7 @@ msgstr[0] "Host povolen"
 msgstr[1] "Hosty povoleny"
 msgstr[2] "Hosty povoleny"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7857,22 +7768,22 @@ msgstr[2] "Hosty povoleny"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Skupina hostitele"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Skupina hostů \"%1$s\" již existuje."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Skupinu hostů \"%1$s\" není možné smazat, je použitá v globálním skriptu."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7885,10 +7796,10 @@ msgstr "Prvky skupiny hostů"
 msgid "Host group label type"
 msgstr "Typ popisku skupiny"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Skupina hostů s ID \"%1$s\" není dostupná."
@@ -7904,8 +7815,8 @@ msgstr "Skupina hostů s ID \"%1$s\" není dostupná."
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7979,7 +7890,7 @@ msgstr "Název hosta"
 msgid "Host networks"
 msgstr "Sítě hosta"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -8060,7 +7971,7 @@ msgstr "Aktualizace hosta selhala."
 msgid "Host updated"
 msgstr "Host byl aktualizován"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr "Host s ID \"%1$s\" není dostupný."
@@ -8080,7 +7991,7 @@ msgstr "Host se stejným jménem \"%1$s\" již existuje."
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Host se stejným viditelným jménem \"%1$s\" již existuje."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8093,7 +8004,7 @@ msgstr "Host se stejným viditelným jménem \"%1$s\" již existuje."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8141,7 +8052,7 @@ msgstr "Hosty byly aktualizovány"
 msgid "Hours"
 msgstr "Hodin"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8181,7 +8092,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IP adresa"
@@ -8206,7 +8117,7 @@ msgstr "IP rozsah \"%1$s\" přesahuje \"%2$s\" limit adresy"
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8263,12 +8174,12 @@ msgstr "Zvýraznění ikony"
 msgid "Icon map"
 msgstr "Mapová ikona"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Mapová ikona \"%1$s\" nemůže byt smazaná. Je použita v mapě \"%2$s\"."
@@ -8281,18 +8192,18 @@ msgstr "Mapová ikona byla vytvořena"
 msgid "Icon map deleted"
 msgstr "Mapová ikona byla odstraněna"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Mapová ikona byla aktualizována"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "Mapování ikon"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "Ikona s ID \"%1$s\" není dostupná."
@@ -8395,23 +8306,20 @@ msgstr "Pokud si myslíte, že tato zpráva je špatně, prosím kontaktuje vaš
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Obrázek"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "Obrázek \"%1$s\" již existuje."
@@ -8420,7 +8328,7 @@ msgstr "Obrázek \"%1$s\" již existuje."
 msgid "Image added"
 msgstr "Obrázek byl přidán"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Obrázek byl smazán"
 
@@ -8428,18 +8336,12 @@ msgstr "Obrázek byl smazán"
 msgid "Image label type"
 msgstr "Typ popisky obrázku"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "Chyba načtení obrázku [%1$s] v [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Obrázek byl aktualizován"
 
@@ -8534,7 +8436,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8545,13 +8447,13 @@ msgstr "Nedostupná údržba"
 msgid "Inaccessible map"
 msgstr "Nepřístupná mapa"
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr "Nedostupná šablona"
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr "Nedostupný spouštěč"
 
@@ -8595,7 +8497,7 @@ msgstr "Zahrnují podskupiny"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Statistika příchozího provozu na síťovém rozhraní. Vráti celé číslo"
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8763,24 +8665,6 @@ msgstr "Neplatná operace skupiny. Skupina neexistuje nebo k ní nemáte příst
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Neplatná operace uživatele. Uživatel neexistuje nebo k němu nemáte přístup."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8835,8 +8719,6 @@ msgstr "Neplatná operace uživatele. Uživatel neexistuje nebo k němu nemáte
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Funkci byly předané neplatné argumenty."
 
@@ -8862,31 +8744,22 @@ msgstr "Nesprávné znaky použité pro jméno šablony \"%1$s\"."
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "Nesprávné podmínky pro akci \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "Nesprávné podmínky pro pravidlo nálezu \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "Nesprávná korelace ID."
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "Nesprávně nastavený výraz \"%2$s\" pro akci \"%1$s\": %3$s."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "Nesprávně nastavený výraz \"%2$s\" pro korelaci \"%1$s\": %3$s."
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "Nesprávně nastavený výraz \"%2$s\" pro pravidlo nálezu \"%1$s\": %3$s."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8915,7 +8788,7 @@ msgstr "Neplatná hodnota objektu události."
 msgid "Incorrect eventsource value."
 msgstr "Neplatná hodnota zdroje události."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Neplatné jméno pole \"%1$s\" nebo hodnota údaje pro tabulku \"%2$s\"."
@@ -8940,22 +8813,17 @@ msgstr "Nahraný neplatný soubor."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "Nesprávná podmínka filtru ID pro akci \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Nesprávná podmínka filtru ID pro pravidlo nálezu \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "Nesprávný filtr korelace ID je uveden pro korelaci \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "Nesprávné nastavení filtru makra pravidlo nálezu \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8966,7 +8834,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "Nesprávné nastavení filtru operátora pro akci \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "Nesprávné nastavení filtru operátora pro pravidlo nálezu \"%1$s\"."
@@ -8994,8 +8862,6 @@ msgstr "Neplatný obrázkový index."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -9057,10 +8923,6 @@ msgstr "Neplatná perioda údržby (minimálně 5 minut)"
 msgid "Incorrect map ID."
 msgstr "Neplatné ID mapy."
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "Neplatné ID typu média."
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9118,13 +8980,13 @@ msgstr "Neplatný regulární výraz \"%1$s\": \"%2$s\""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Neplatná odpověď přijatá od Zabbix serveru \"%1$s\"."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Neplatný čas ukončení služby."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Neplatný čas začátku služby."
 
@@ -9177,12 +9039,7 @@ msgstr "Neplatný výraz prototypu spouštěče. Elementy výrazu prototypu spou
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "Neplatný typ kalkulace pro akci \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "Neplatný typ výpočtu pro korelaci \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "Neplatný typ výpočtu pro pravidlo nálezu \"%1$s\"."
@@ -9228,13 +9085,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9251,60 +9108,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Neplatná hodnota \"%1$s\" pro \"%2$s\" pole: musí byt mezi %3$s a %4$s."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "Neplatná hodnota \"%1$s\" pro float field \"%2$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "Neplatná hodnota \"%1$s\" pro integer field \"%2$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Neplatná hodnota \"%1$s\" pro unsigned integer field \"%2$s\"."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "Neplatná hodnota \"%1$s\" v poli \"%2$s\" pro korelaci \"%3$s\"."
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "Neplatná hodnota \"%1$s\" v poli \"%2$s\" pro typ média \"%3$s\"."
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9359,14 +9186,8 @@ msgstr "Nesprávná hodnota pro pole \"%1$s\"."
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9476,25 +9297,7 @@ msgstr "Nesprávná hodnota pro pole \"%1$s\"."
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9505,7 +9308,7 @@ msgstr "Nesprávná hodnota pro pole \"%1$s\"."
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9551,16 +9354,17 @@ msgstr "Nesprávná hodnota pro pole \"%1$s\"."
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9569,7 +9373,7 @@ msgstr "Nesprávná hodnota pro pole \"%1$s\"."
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "Neplatná hodnota pro pole \"%1$s\": %2$s."
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9657,12 +9461,12 @@ msgstr "Zděděné a spuštěné značky"
 msgid "Inherited items"
 msgstr "Zděděné položky"
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Vložit"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "Vložit výraz"
 
@@ -9766,7 +9570,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9774,7 +9578,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9785,7 +9589,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Interval"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9808,7 +9612,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr "Neplatná akce: %1$s."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9840,7 +9644,7 @@ msgstr "Neplatná emailová adresa pro typ médií s ID \"%1$s\"."
 msgid "Invalid interval \"%1$s\"."
 msgstr "Neplatný interval \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Neplatný klíč \"%1$s\" pro pravidlo nálezu \"%2$s\" na \"%3$s\": %4$s."
@@ -9865,27 +9669,29 @@ msgstr "Neplatný klíč \"%1$s\": %2$s."
 msgid "Invalid method parameters."
 msgstr "Neplatné parametry metody."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9911,17 +9717,17 @@ msgstr "Neplatné parametry metody."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9929,8 +9735,8 @@ msgstr "Neplatné parametry metody."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9944,106 +9750,116 @@ msgstr "Neplatné parametry metody."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -10085,43 +9901,38 @@ msgstr "Neplatný návratový kód \"%1$s\"."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10142,7 +9953,7 @@ msgstr "Neplatná časová perioda."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Inventář"
 
@@ -10183,7 +9994,7 @@ msgstr "Není možné najít uživatelské heslo."
 msgid "Italian (it_IT)"
 msgstr "Italsky (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10215,7 +10026,7 @@ msgstr "Položka \"%1$s\" nemůže být zkopírována bez své master položky."
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "Položka \"%1$s\" nemůže být naplněná chybějícím inventárním polem číslo \"%2$d\". Možnosti: od 0 (nenaplňuje) do %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10229,7 +10040,7 @@ msgstr "Položka byla přidána"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "Položka zkopírována"
@@ -10244,14 +10055,14 @@ msgstr "Počet položek"
 msgid "Item deleted"
 msgstr "Položka byla smazána"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Položka vypnutá"
 msgstr[1] "Položky vypnuté"
 msgstr[2] "Položky vypnuté"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Položka povolená"
@@ -10262,7 +10073,7 @@ msgstr[2] "Položky povolené"
 msgid "Item in \"not supported\" state"
 msgstr "Položka je v \"not supported\" stavu"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "Položka nevybraná"
 
@@ -10271,7 +10082,7 @@ msgstr "Položka nevybraná"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr "Při uvádění položky do procesu chybí parametry: %1$s"
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10309,8 +10120,8 @@ msgstr[0] "Prototyp položky aktualizován"
 msgstr[1] "Prototypy položek aktualizovány"
 msgstr[2] "Prototypy položek aktualizovány"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr "Prototyp položky s ID\"%1$s\" není dostupný."
@@ -10336,7 +10147,7 @@ msgstr "Položka prototypu aktualizována"
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10368,8 +10179,8 @@ msgstr "Položka nebude obnovena. Specifikace intervalu aktualizace vyžaduje mi
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr "Položka nebude obnovena. Specifikace intervalu by měla být mezi 1s a 1d. Dále mohou být použity flexibilní či plánované intervaly."
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr "Položka s ID \"%1$s\" není dostupná."
@@ -10420,11 +10231,11 @@ msgstr "Položka s klíčem \"%1$s\" již existuje na \"%2$s\"."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Položky"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Položky byly smazány"
 
@@ -10442,7 +10253,7 @@ msgstr "Položky byly aktualizovány"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10467,6 +10278,10 @@ msgstr "JMX rozhraní"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10479,7 +10294,7 @@ msgstr "JSON data"
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr "JSON řetězec je očekáván"
 
@@ -10497,7 +10312,7 @@ msgstr "JSONPath"
 msgid "Jan"
 msgstr "Led"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Leden"
 
@@ -10519,7 +10334,7 @@ msgstr "JavaScript"
 msgid "Jul"
 msgstr "Čvc"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Červenec"
 
@@ -10527,7 +10342,7 @@ msgstr "Červenec"
 msgid "Jun"
 msgstr "Čer"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Červen"
 
@@ -10689,22 +10504,6 @@ msgstr[0] "Poslední %1$d rok"
 msgstr[1] "Posledních %1$d let"
 msgstr[2] "Posledních %1$d let"
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10716,11 +10515,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Poslední kontrola"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Graf za poslední hodinu"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Graf za poslední měsíc"
 
@@ -10758,11 +10557,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Poslední hodnota"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Graf za poslední týden"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10771,11 +10570,11 @@ msgstr "Graf za poslední týden"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Poslední hodnoty"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "Poslední hodnoty"
 
@@ -10816,7 +10615,7 @@ msgstr "Y Vlevo"
 msgid "Left trim"
 msgstr "Levý ořez"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr "Legenda"
 
@@ -11097,7 +10896,7 @@ msgstr "Nízko úrovňové pravidlo nálezu v \"not supported\" stavu"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "Po"
@@ -11119,7 +10918,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "MD5 kontrolní součet souboru. Vráti řetězec (MD5 hash souboru)"
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11130,12 +10929,12 @@ msgid "Macro"
 msgstr "Makro"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Makro \"%1$s\" již existuje na \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Makro \"%1$s\" již existuje."
@@ -11163,7 +10962,7 @@ msgstr "Makra byla aktualizována"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr "Hlavní filtr"
 
@@ -11171,7 +10970,7 @@ msgstr "Hlavní filtr"
 msgid "Main navigation"
 msgstr "Hlavní navigace"
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11254,7 +11053,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11276,13 +11075,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr "Manuál zavřen"
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Mapa"
 
@@ -11351,7 +11150,7 @@ msgstr "Tvar mapy"
 msgid "Map update failed."
 msgstr "Aktualizace mapy selhala."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr "Mapa s ID \"%1$s\" není dostupná."
@@ -11383,7 +11182,7 @@ msgstr "Mapy"
 msgid "Mar"
 msgstr "Bře"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Březen"
 
@@ -11487,7 +11286,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11502,7 +11301,7 @@ msgstr[2] "Maximální časová perioda na zobrazení je %1$s dní."
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "Překročena maximální celková délka emailové adresy pro typ médií s ID \"%1$s\"."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Kvě"
 
@@ -11517,15 +11316,12 @@ msgstr "Květen"
 msgid "Media"
 msgstr "Média"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Typ média"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr "Media type \"%1$s\" již existuje."
@@ -11555,11 +11351,6 @@ msgstr[0] "Typ média povolený"
 msgstr[1] "Typ média povolený"
 msgstr[2] "Typ média povolený"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr "Typ média je chybějící parametr: %1$s"
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11589,7 +11380,7 @@ msgstr "Typ media s ID \"%1$s\" není dostupný."
 msgid "Media types"
 msgstr "Typy médií"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11677,7 +11468,7 @@ msgstr "Zprávy"
 msgid "Method not found."
 msgstr "Metoda nenalezena."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11739,7 +11530,7 @@ msgid "Minimum severity"
 msgstr "Minimální závažnost"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11799,7 +11590,7 @@ msgstr "Mód"
 msgid "Model"
 msgstr "Model"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11841,7 +11632,7 @@ msgstr[2] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11867,7 +11658,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Po"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Pondělí"
 
@@ -11907,11 +11698,11 @@ msgstr "Měsíc"
 msgid "Monthly"
 msgstr "Měsíčně"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "Více výběrů bylo nalezeno..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11935,7 +11726,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11948,7 +11739,7 @@ msgstr "Násobek"
 msgid "Multiple PROBLEM events"
 msgstr "Multiple PROBLEM události"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Ztlumit"
 
@@ -12077,11 +11868,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12239,19 +12030,21 @@ msgstr "Nová podmínka"
 msgid "New dashboard"
 msgstr "Nový dashboard"
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Nový prvek"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr "Nová událost host skupiny"
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr "Nová značka hodnoty události"
 
@@ -12263,7 +12056,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nový regulární výraz"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12271,7 +12064,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Nový servisní čas"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12280,7 +12073,7 @@ msgid "New triggers"
 msgstr "Nové spouštěče"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12298,7 +12091,7 @@ msgstr "Další krok"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12327,30 +12120,6 @@ msgstr "Další krok"
 msgid "No"
 msgstr "Ne"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "Ne \"%1$s\" vzhledem ke korelaci \"%2$s\"."
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "Ne \"%1$s\" vzhledem ke korelaci."
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12366,11 +12135,6 @@ msgstr "Žádné \"%1$s\" dané pro graf."
 msgid "No \"%1$s\" given for map."
 msgstr "Žádné \"%1$s\" dané pro mapu."
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "Ne \"%1$s\" vzhledem k tomu, typu média."
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12378,7 +12142,7 @@ msgstr "Ne \"%1$s\" vzhledem k tomu, typu média."
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "Žádné \"%2$s\" dané pro filtrovací podmínku akcie \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "Žádné \"%2$s\" dané pro filtrovací podmínku pravidlo nálezu \"%1$s\"."
@@ -12388,7 +12152,7 @@ msgstr "Žádné \"%2$s\" dané pro filtrovací podmínku pravidlo nálezu \"%1$
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "Žádné \"%2$s\" dané pro filtr akcie \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "Žádné \"%2$s\" dané pro filtr pravidlo nálezu \"%1$s\"."
@@ -12405,11 +12169,6 @@ msgstr "Není specifikované uživatelské jméno autentizace."
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "Žádný typ podmínky vzhledem ke korelaci \"%1$s\"."
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12440,7 +12199,7 @@ msgstr "Žádné standardní rozhraní pro \"%1$s\" typu na \"%2$s\"."
 msgid "No details"
 msgstr "Bez podrobností"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "Žádné stanovené ID pravidla nálezu"
 
@@ -12476,7 +12235,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "Žádné grafy nebyly přidané."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Žádné neposkytnuté ID hostů."
 
@@ -12506,7 +12265,7 @@ msgstr "Žádný obrázek"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Nenalezené žádné rozhraní"
 
@@ -12540,7 +12299,7 @@ msgstr "Nenalezena žádná makra."
 msgid "No maps added."
 msgstr "Žádné mapy nebyly přidané."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "Žádné výběry nenalezené"
 
@@ -12548,17 +12307,46 @@ msgstr "Žádné výběry nenalezené"
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr "Žádný typ operace vzhledem ke korelaci \"%1$s\"."
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Žádné oprávnění pro přístup do systému."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12566,7 +12354,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12594,19 +12382,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12621,16 +12408,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12650,12 +12443,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12676,27 +12467,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12713,14 +12506,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12729,7 +12522,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Žádné oprávnění k odkazovanému objektu nebo objekt neexistuje!"
 
@@ -12749,7 +12542,7 @@ msgstr "Žádný specifikovaný soubor s veřejným klíčem."
 msgid "No recipients for action operation message."
 msgstr "Žádný příjemce pro operaci odeslání zprávy."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr "Žádná obnova"
 
@@ -12761,7 +12554,7 @@ msgstr "Není specifikovaný skript pro akci příkazu."
 msgid "No target selected"
 msgstr "Není vybrán cíl"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Není vybraný cíl."
 
@@ -12778,7 +12571,7 @@ msgstr "Žádné definované spouštěče."
 msgid "No value"
 msgstr "Žádná hodnota"
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr "Non-boolean flags jsou zastaralé."
 
@@ -12848,15 +12641,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Není povolené nastavení hesla pro uživatele \"guest\"."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12888,7 +12681,7 @@ msgstr "Žádné zděděné položky"
 msgid "Not supported"
 msgstr "Nepodporováno"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Poznámka"
@@ -12919,7 +12712,7 @@ msgstr "Upozorni všechny zapojené"
 msgid "Nov"
 msgstr "Lis"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "Listopad"
 
@@ -13106,8 +12899,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13167,13 +12960,13 @@ msgstr "Říj"
 msgid "Octal to decimal"
 msgstr "Z osmičková na desítkovou"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Říjen"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Vypnuté"
 
@@ -13181,30 +12974,31 @@ msgstr "Vypnuté"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr "Stará hodnota značky události"
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "Na"
 
@@ -13220,35 +13014,15 @@ msgstr "Jednou"
 msgid "One"
 msgstr "Jedna"
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "Jeden z objektů je bez skupiny hostů."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Pouze jednou"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Jednorázový downtime"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Jen super administrátoři mohou vytvořit skupiny."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Jen super administrátoři mohou vytvořit typy médií."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Jen super administrátoři mohou mazat typy médií."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Jen super administrátoři mohou upravovat typy médií."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Jen kontroly typu Zabbix agent, SNMPv1, SNMPv2 nebo SNMPv3 mohou být unikátní."
@@ -13298,10 +13072,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "Pouze super administrátoři mohou vytvářet korelace."
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr "Pouze super administrátoři mohou ustanovit vlastníka dashboardu."
@@ -13310,15 +13080,11 @@ msgstr "Pouze super administrátoři mohou ustanovit vlastníka dashboardu."
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr "Pouze super administrátoři mohou aktualizovat korelace."
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Počítány jsou pouze spouštěče přiřazené k povoleným hostitelům a závisející na povolených položkách"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13327,7 +13093,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Informace operačního systému. Návratová hodnota řetězec"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13336,11 +13102,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Operace nemůže být vykonaná vzhledem k neoprávněnému požadavku."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Podrobnosti operace"
 
@@ -13362,7 +13128,7 @@ msgstr "Operace nemá šablonu na vykonání."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13371,33 +13137,33 @@ msgstr ""
 msgid "Operations"
 msgstr "Operace"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operátor"
 
@@ -13506,7 +13272,7 @@ msgstr "Další konfigurační parametry"
 msgid "Other parameters"
 msgstr "Další parametry"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Další"
@@ -13520,7 +13286,7 @@ msgstr "Odchozí statistiky provozu na síťovém rozhraní. Návratová hodnota
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13549,7 +13315,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13738,7 +13504,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13783,7 +13549,7 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "PSK identita"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13806,16 +13572,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parametr"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "Parametr \"%1$s\" je zastaralý."
@@ -13845,7 +13611,7 @@ msgstr "Nadřazená položka"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13862,7 +13628,7 @@ msgstr "Nadřazené spouštěče"
 msgid "Parent web scenarios"
 msgstr "Nadřazené web scénáře"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13874,11 +13640,6 @@ msgstr ""
 msgid "Parse"
 msgstr "Analyzovat"
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "Parsovací SQL chyba [%1$s] v [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Parsovací chyba"
@@ -13939,7 +13700,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr "Vložit"
 
@@ -13949,15 +13710,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr "Vlož bez externích odkazů"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -14003,12 +13764,11 @@ msgstr "Vykonat DNS dotaz. Vrátí řetězec s požadovaným typem informace"
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Období"
 
@@ -14097,7 +13857,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Prosím, zadej název hostitele nebo host IP addresu a číslo portu Zabbix serveru, stejně jako jméno instalace (volitelné)."
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Vyberte, prosím, dva prvky"
 
@@ -14137,7 +13897,7 @@ msgstr "Vyplň pole host inventáře"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14226,7 +13986,7 @@ msgid "Previous month"
 msgstr "Předchozí měsíc"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14357,7 +14117,7 @@ msgstr "Problém není potlačen"
 msgid "Problem is suppressed"
 msgstr "Problém je potlačen"
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Problém na"
 
@@ -14370,21 +14130,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr "Problém vyřešen"
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14398,9 +14154,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Problémy"
 
@@ -14434,7 +14190,7 @@ msgid "Prometheus to JSON"
 msgstr "Prometheus na JSON"
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "Vlastnosti"
 
@@ -14455,13 +14211,13 @@ msgstr "Poskytnuté URL \"%1$s\" je neplatné."
 msgid "Proxies"
 msgstr "Proxy"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14469,7 +14225,7 @@ msgstr "Proxy"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14479,12 +14235,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Proxy \"%1$s\" pro host \"%2$s\" neexistuje."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr "Proxy \"%1$s\" je používána akcí \"%2$s\"."
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Proxy \"%1$s\" je použitá pravidlem nálezu \"%2$s\"."
@@ -14578,7 +14334,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14655,10 +14411,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Přijatá hodnota"
@@ -14740,7 +14492,7 @@ msgstr "Obdélník"
 msgid "Refresh"
 msgstr "Obnov"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr "Interval obnovy"
 
@@ -14758,13 +14510,13 @@ msgstr ""
 msgid "Regular"
 msgstr "Normální"
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Regulární výraz"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14798,7 +14550,7 @@ msgstr "Regulární výrazy"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14830,8 +14582,6 @@ msgstr "Vzdálený příkaz"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14852,7 +14602,9 @@ msgstr "Vzdálený příkaz"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14865,7 +14617,7 @@ msgstr "Vzdálený příkaz"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14942,8 +14694,8 @@ msgstr "Vzdálený příkaz"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Odstranit"
 
@@ -14983,7 +14735,7 @@ msgstr "Odstraň, %1$s"
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -15025,7 +14777,7 @@ msgid "Replace dependencies"
 msgstr "Nahradit závislosti"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -15080,7 +14832,7 @@ msgstr "Obsah dotazu"
 msgid "Request body type"
 msgstr "Typ obsahu dotazu"
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr "Požadavek byl úspěšně poslán"
 
@@ -15122,8 +14874,8 @@ msgstr "Požadovaný stavový kód"
 msgid "Required string"
 msgstr "Požadovaný řetězec"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Reset"
 
@@ -15156,7 +14908,7 @@ msgstr "Potvrzení obnovení"
 msgid "Reset defaults"
 msgstr "Obnovit původní hodnoty"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Vyřešené"
 
@@ -15222,7 +14974,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Výsledek"
@@ -15409,12 +15161,12 @@ msgstr "Spustí specifikovaný příkaz na hostovi. Vráti text jako výsledek s
 msgid "Russian (ru_RU)"
 msgstr "Rusky (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "So"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Ne"
@@ -15425,8 +15177,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15463,7 +15215,7 @@ msgstr "SMTP port serveru"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15559,12 +15311,12 @@ msgstr "SQL počet: %1$s (selecty: %2$s | vykonání: %3$s)"
 msgid "SQL query"
 msgstr "SQL dotaz"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "Vykonání SQL dotazu selhalo \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Vykonání SQL dotazu selhalo \"%1$s\"."
@@ -15627,7 +15379,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15639,7 +15391,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "So"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -15681,7 +15433,7 @@ msgstr "Termín"
 msgid "Scheduled check"
 msgstr "Naplánovaná kontrola"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15751,7 +15503,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr "Rozsah"
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15764,8 +15516,7 @@ msgstr "Rozsah"
 msgid "Script"
 msgstr "Skript"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Skript \"%1$s\" již existuje."
@@ -15798,12 +15549,6 @@ msgstr "Název skriptu"
 msgid "Script parameters"
 msgstr "Script parametry"
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "Script parametr \"%1$s\" chybí poslední nová řádka dat pro typ média \"%2$s\"."
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Profiler skriptů"
@@ -15816,7 +15561,7 @@ msgstr "Skript byl aktualizován"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Skripty"
 
@@ -15886,8 +15631,8 @@ msgid "Security name"
 msgstr "Bezpečnostní jméno"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15895,7 +15640,7 @@ msgstr "Bezpečnostní jméno"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Vybrat"
 
@@ -15931,19 +15676,19 @@ msgstr "Označené elementy"
 msgid "Selected items only"
 msgstr "Pouze vybrané položky"
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "Vybrané, %1$s v pozici %2$d z %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "Vybrané, %1$s, pouze ke čtení, v pozici %2$d of %3$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr "Pošli zpět"
 
@@ -15968,7 +15713,7 @@ msgstr "Poslat pouze na"
 msgid "Send to"
 msgstr "Poslat na"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr "Odeslat nazpátek"
 
@@ -16001,7 +15746,7 @@ msgstr "Odděleně"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "Září"
 
@@ -16032,28 +15777,28 @@ msgstr "Server (proxy)"
 msgid "Server time"
 msgstr "Čas na serveru"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Služba"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -16063,7 +15808,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "Služba vytvořená"
 
@@ -16097,16 +15842,16 @@ msgstr "Port služby"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "Čas startu služby musí být menší než její konec."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -16114,11 +15859,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Servisní časy"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Typ služby"
 
@@ -16127,30 +15872,29 @@ msgstr "Typ služby"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Služba byla aktualizována"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Služby"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "Služby tvoří kruhovou závislost."
 
@@ -16158,7 +15902,7 @@ msgstr "Služby tvoří kruhovou závislost."
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16188,7 +15932,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Nastavení hostitelského inventáře"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16217,7 +15961,7 @@ msgstr "Nastavení LDAP protokolu selhalo."
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr "Nastavení LDAP doporučení na \"Off\" selhalo."
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16226,7 +15970,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16282,7 +16026,7 @@ msgstr "Tvar"
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "Sdílení"
 
@@ -16424,7 +16168,7 @@ msgstr "Zobrazit varování když je Zabbix server vypnutý"
 msgid "Show working time"
 msgstr "Zobrazit praconí dobu"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Sobraz"
 
@@ -16533,7 +16277,7 @@ msgstr "Přeskočení kopírování grafu \"%1$s\" na host \"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "Slovensky (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Odložit"
 
@@ -16579,7 +16323,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Seřadit spouštěče podle"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Řazení (0->999)"
 
@@ -16653,7 +16397,7 @@ msgstr "Začátek v"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16756,15 +16500,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Stav"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Návratové hodnoty"
@@ -16794,7 +16542,7 @@ msgstr "Pouze stav"
 msgid "Status problem"
 msgstr "Problém stavu"
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16842,7 +16590,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16907,7 +16655,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Subjekt"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Podmapa"
 
@@ -16923,7 +16671,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Úspěšný audit"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr "Zpráva úspěšná"
 
@@ -16936,7 +16684,7 @@ msgstr "Součet příchozích a odchozích statistik provozu na síťové rozhra
 msgid "Sun"
 msgstr "Ne"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Neděle"
 
@@ -17028,12 +16776,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Systém uptime v sekundách. Vráti celé číslo"
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Čt"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -17060,17 +16808,17 @@ msgstr "PRAVDA"
 msgid "Table \"%1$s\" does not exist."
 msgstr "Tabulka \"%1$s\" neexistuje."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "Tabulka \"%1$s\" neobsahuje pole se jménem \"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Označení"
@@ -17126,7 +16874,7 @@ msgstr "Hodnota značky"
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17186,7 +16934,7 @@ msgstr "Typ cíle"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17207,7 +16955,7 @@ msgstr "Šablona"
 msgid "Template \"%1$s\" already exists."
 msgstr "Šablona \"%1$s\" již existuje."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17231,7 +16979,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Šablona nemůže být připojená k jiné šabloně víc jak jednou, včetně propojení přes jiné šablony."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17291,7 +17039,7 @@ msgstr "Šablona se stejným viditelným jménem \"%1$s\" již existuje."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17463,7 +17211,7 @@ msgstr "Host již není objevovaný a bude zmazaný %1$s (na %2$s v %3$s)."
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "Host již není objevovaný a bude smazaný při dalším objevování."
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
@@ -17471,7 +17219,7 @@ msgstr[0] "Obrázek je použitý v mapě ikon %1$s."
 msgstr[1] "Obrázek je použitý v mapách ikon %1$s."
 msgstr[2] "Obrázek je použitý v mapách ikon %1$s."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17537,7 +17285,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr "Toto je nová testovací zpráva ze Zabbixu"
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Tento měsíc"
 
@@ -17545,7 +17293,7 @@ msgstr "Tento měsíc"
 msgid "This month so far"
 msgstr "Prozatím tento měsíc"
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Tento týden"
 
@@ -17553,7 +17301,7 @@ msgstr "Tento týden"
 msgid "This week so far"
 msgstr "Prozatím tento týden"
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Tento rok"
 
@@ -17573,7 +17321,7 @@ msgstr "Škrtící"
 msgid "Thu"
 msgstr "Čt"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Čtvrtek"
 
@@ -17590,7 +17338,7 @@ msgstr "Do"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17623,7 +17371,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Časové období"
 
@@ -17675,12 +17423,11 @@ msgstr "Časové razítko"
 msgid "To"
 msgstr "Do"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "Na nastavení rozhraní hosta označte jeden typ položky pro všechny položky"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Dnes"
 
@@ -17795,7 +17542,7 @@ msgstr "Perioda uložení trendů"
 msgid "Trends"
 msgstr "Trendy"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17803,7 +17550,7 @@ msgstr "Trendy"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Spouštěč"
 
@@ -17907,7 +17654,7 @@ msgstr "Jméno spouštěče"
 msgid "Trigger overview"
 msgstr "Přehled spouštěčů"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17981,11 +17728,11 @@ msgstr "Prototypy spouštěčů aktualizované"
 msgid "Trigger severity"
 msgstr "Závažnost spouštěče"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "Status spouštěče \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "Status spouštěče \"Problém\""
 
@@ -18002,7 +17749,7 @@ msgstr "Spouštěč byl aktualizován"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -18037,7 +17784,7 @@ msgstr "Úprava"
 msgid "Tue"
 msgstr "Út"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Úterý"
 
@@ -18050,7 +17797,7 @@ msgstr "Turecky (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Dvě položky (\"%1$s\" a \"%2$s\") není možné naplnit stejným inventárním polem \"%3$s\", vedlo by to ke sporu."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr "Dva prvky mapy by měly být vybrány"
 
@@ -18066,19 +17813,19 @@ msgstr "Dva prvky mapy by měly být vybrány"
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18130,7 +17877,7 @@ msgstr "Typ informace"
 msgid "Types"
 msgstr "Typy"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18151,7 +17898,7 @@ msgstr "NEZNÁMÝ"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18197,12 +17944,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "URL musí mít \"jméno\" a \"url\" v mapě \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URL"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18287,12 +18034,12 @@ msgstr "Odblokovat"
 msgid "Unblock selected users?"
 msgstr "Odblokovat vybrané uživatele?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18312,21 +18059,23 @@ msgstr "Jednotky"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Neznámý"
@@ -18344,7 +18093,7 @@ msgid "Unknown error"
 msgstr "Neznáma chyba"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Zadaná položka ve vybraném hostiteli neexistuje"
@@ -18397,7 +18146,7 @@ msgstr "Odpojit od šablony"
 msgid "Unlink from templates"
 msgstr "Odpojit od šablon"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Povolit zvuky"
 
@@ -18429,7 +18178,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "Nepodporovaný parametr \"%2$s\" pro filtrovací podmínku akcie \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "Nepodporovaný parametr \"%2$s\" pro filtrovací podmínku objevovacího pravidla \"%1$s\"."
@@ -18439,7 +18188,7 @@ msgstr "Nepodporovaný parametr \"%2$s\" pro filtrovací podmínku objevovacího
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "Nepodporovaný parametr \"%2$s\" pro filtr akce \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "Nepodporovaný parametr \"%2$s\" pro filtr akcie \"%1$s\"."
@@ -18484,7 +18233,7 @@ msgstr "Dostupný"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18497,7 +18246,7 @@ msgstr "Dostupný"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18550,7 +18299,7 @@ msgstr "Aktualizace činností"
 msgid "Update problem"
 msgstr "Problém aktualizace"
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18568,7 +18317,7 @@ msgstr "Nahrát"
 msgid "Upper level maps"
 msgstr "Mapa nejvyšší úrovně"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18603,7 +18352,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "Používané v akcích"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18618,7 +18367,7 @@ msgstr "Používané v akcích"
 msgid "User"
 msgstr "Uživatel"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "User \"%1$s\" nemůže být bez skupiny uživatelů."
@@ -18670,7 +18419,7 @@ msgstr "Uživatel byl přidán"
 msgid "User agent string"
 msgstr "Uživatelský řetězec agenta"
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Uživatel nemůže sám sebe přidat do vypnuté skupiny nebo do skupiny s vypnutým GUI přístupem."
@@ -18691,7 +18440,7 @@ msgstr[0] "Uživatel byl smazán"
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18701,27 +18450,27 @@ msgstr[2] ""
 msgid "User group"
 msgstr "Skupina uživatelů"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Uživatelská skupina \"%1$s\" již existuje."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "Skupina uživatelů \"%1$s\" je použita v akci \"%2$s\"."
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Skupina \"%1$s\" je použitá v nastavení skupiny pro správu o nefunkční databáze."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Uživatelská skupina \"%1$s\" je použitá v skriptu \"%2$s\"."
@@ -18757,8 +18506,8 @@ msgstr[2] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18802,14 +18551,14 @@ msgstr "Heslo uživatele"
 msgid "User profile"
 msgstr "Profil uživatele"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18880,7 +18629,7 @@ msgstr "Uživatel byl aktualizován"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "Uživatel s ID \"%1$s\" není dostupný."
@@ -19196,14 +18945,14 @@ msgstr "Validace"
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19213,7 +18962,7 @@ msgstr "Validace"
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19255,7 +19004,7 @@ msgstr "Hodnota \"%1$s\" je neplatná pro parametr \"grid_show\". Možnosti: \"%
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "Hodnota \"%1$s\" je neplatná pro parametr \"grid_show\". Možnosti: \"%2$s\"."
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "Hodnota \"%1$s\" je příliš dlouhá pro pole \"%2$s\" - %3$d znaků. Povolená délka je do %4$d znaků."
@@ -19272,7 +19021,7 @@ msgstr "Statistiky cache hodnot. Platné mody jsou: total, free, pfree, used a p
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Mapa hodnot"
 
@@ -19315,11 +19064,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "Hodnota Windows čítače výkonu. Vráti celé, desetinné číslo, řetězec nebo text (závisí na dotazu)"
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19366,7 +19116,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19453,7 +19203,7 @@ msgstr "Zobrazované jméno nemůže být prázdné když jméno hostu chybí."
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "St"
@@ -19470,7 +19220,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Varování"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19479,7 +19229,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Je nám líto, maximální počet elementů na zapamatování byl již dosažen."
 
@@ -19495,7 +19245,7 @@ msgstr "Je nám líto, maximální počet elementů na zapamatování byl již d
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web"
 
@@ -19507,7 +19257,7 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Sledování webů"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr "Web scénář"
 
@@ -19522,29 +19272,29 @@ msgstr "Web scénář \"%1$s\" již existuje na hostu \"%2$s\"."
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Web scénář \"%1$s\" již existuje."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "Web scénář přidaný"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Web scénář smazaný"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Web scénář zakázaný"
 msgstr[1] "Web scénáře zakázané"
 msgstr[2] "Web scénáře zakázané"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Scénář povolený"
 msgstr[1] "Scénáře povolené"
 msgstr[2] "Scénáře povolené"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "Web scénář aktualizovaný"
 
@@ -19566,7 +19316,7 @@ msgstr ""
 msgid "Wed"
 msgstr "St"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Středa"
 
@@ -19577,7 +19327,7 @@ msgstr "Středa"
 msgid "Weekly"
 msgstr "Týdně"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19593,12 +19343,12 @@ msgstr "Vítejte v"
 msgid "When active"
 msgstr "Kdy je aktivní"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19793,6 +19543,10 @@ msgstr "d.m.Y H:i"
 msgid "Y-m-d H:i:s"
 msgstr "d.m.Y H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr "Y1"
@@ -19854,7 +19608,7 @@ msgstr "Ročně"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19911,18 +19665,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19934,9 +19682,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Nemáte oprávnění na vykonání této operace."
 
@@ -20052,24 +19797,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr "boolean je očekávám"
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "řetězec znaků se očekává"
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -20078,37 +19827,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr "je očekáván nález makra na nízké úrovni"
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr "číslo je očekáváno"
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr "číslo je moc veliké"
@@ -20129,28 +19878,29 @@ msgstr "je očekáván relativní čas"
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr "očekáváný čas"
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr "je očekávána perioda času"
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr "očekává se časový rozsah"
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr "je očekávána časová jednotka"
@@ -20198,7 +19948,7 @@ msgstr "vše"
 msgid "all media"
 msgstr "všechny média"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20206,42 +19956,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "očekává se pole"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr "řada či znakový řetězec je očekáván"
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20251,7 +19996,7 @@ msgid "an empty string is expected"
 msgstr "prázdný řetězec je očekávan"
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr "je očekáván sudý počet hexadecimálních znaků"
 
@@ -20259,11 +20004,15 @@ msgstr "je očekáván sudý počet hexadecimálních znaků"
 msgid "an explicit time is expected"
 msgstr "přesný čas je očekáván"
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20424,14 +20173,8 @@ msgstr "nemůže být změněno"
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20461,19 +20204,11 @@ msgstr "nemůže být změněno"
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20493,14 +20228,14 @@ msgstr "nemůže být změněno"
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20508,7 +20243,7 @@ msgstr "nemůže být změněno"
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "nemůže být prázdný"
@@ -20521,7 +20256,7 @@ msgstr "nelze převést na JSON, výsledná hodnota je příliš dlouhá"
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr "nelze vykonat požadavek Scroll API, data mohou být poškozena"
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr "nelze aktualizovat soubor pro šablonu pravidla nálezu"
 
@@ -20555,7 +20290,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "zacyklená provázanost položek není povolena"
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20573,7 +20308,8 @@ msgid "configure"
 msgstr "konfigurace"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr "obsahuje"
@@ -20602,7 +20338,7 @@ msgstr "count() - Počet úspěšně přijatých hodnot V (za které ručí oper
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20664,7 +20400,7 @@ msgstr "klesající"
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20686,13 +20422,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr "neobsahuje"
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr "nerovná se"
@@ -20718,7 +20454,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20755,6 +20492,10 @@ msgstr "výraz je prázdný"
 msgid "failed to parse JSON"
 msgstr "chyba v analýze JSON"
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20801,7 +20542,7 @@ msgstr "globálně nastavené údržby"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20842,6 +20583,11 @@ msgstr "ikonka"
 msgid "image"
 msgstr "obrázek"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "v"
@@ -20882,15 +20628,19 @@ msgstr "neplatný počet prvků"
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "nesprávná syntaxe u \"%1$s\""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20918,7 +20668,7 @@ msgstr "Neplatný vzorec Prometheus "
 msgid "invalid address range \"%1$s\""
 msgstr "neplatný rozsah adresy \"%1$s\""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr "neplatná bytová sekvence v UTF-8"
 
@@ -20947,27 +20697,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr "neplatná perioda historie ukládání"
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr "neplatný název skupiny"
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr "neplatné jméno hosta"
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr "neplatný regulérní výraz"
 
@@ -20995,7 +20745,7 @@ msgstr "je větší než nebo se rovná"
 msgid "is less than or equals"
 msgstr "je menší než nebo se rovná"
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr "není to uzavřeno v {} nebo je to poškozeno"
 
@@ -21081,12 +20831,12 @@ msgstr "základní pravidlo nálezu"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -21145,7 +20895,7 @@ msgstr "shody"
 msgid "max"
 msgstr "max"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21185,7 +20935,7 @@ msgid "min() - Minimum value for period T"
 msgstr "min() - Minimální hodnota pro periodu T"
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr "minimální délka je %1$s znaků"
@@ -21212,8 +20962,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21228,27 +20978,14 @@ msgstr "musí být platný uživatel LDAP"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "musí být mezi \"%1$s\" a \"%2$s\""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr "musí obsahovat minimálně jedno základní vyhledávací makro"
 
@@ -21276,6 +21013,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21286,7 +21031,7 @@ msgstr ""
 msgid "name"
 msgstr "název"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "nový"
 
@@ -21421,7 +21166,7 @@ msgstr "výstup"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21456,24 +21201,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21501,11 +21250,11 @@ msgstr ""
 msgid "regular expression"
 msgstr "regulární výraz"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21517,15 +21266,15 @@ msgstr ""
 msgid "right"
 msgstr "pravý"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21573,7 +21322,7 @@ msgstr ""
 msgid "short description"
 msgstr "krátký popis"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21592,15 +21341,15 @@ msgstr "krátký popis"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr "by měla být prázdná"
 
@@ -21616,31 +21365,31 @@ msgstr "zobrazit mapování ikon"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21648,11 +21397,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr "sum() - Souhrn hodnot za periodu T"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21668,8 +21417,8 @@ msgstr "zadaná pověření nejsou jedinečná"
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21680,7 +21429,7 @@ msgstr "zadaná pověření nejsou jedinečná"
 msgid "tag"
 msgstr "značka"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21689,13 +21438,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "šablona ID \"%1$s\" je použitá %2$s krát"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21704,20 +21457,20 @@ msgstr "šablona ID \"%1$s\" je použitá %2$s krát"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "parametr \"%1$s\" chybí"
@@ -21749,39 +21502,39 @@ msgstr "třetí"
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr "časový posun"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr "time() - Aktuální čas"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr "timeleft() - Odhad čas pro dosažení limitu je založen na periodě T"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21795,7 +21548,7 @@ msgstr "spouštěč"
 msgid "trigger does not allow manual closing"
 msgstr "spouštěč neumožňuje manuální zavírání"
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21807,26 +21560,26 @@ msgstr "prototyp spouštěče nelze přesunout do jiné šablony nebo hosta"
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr "spouštěc s vazbami nelze přesunout do jiné šablony nebo hosta"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "pište zde pro vyhledávání"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21834,11 +21587,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21855,10 +21608,10 @@ msgstr "neočekávaný konec klíče"
 msgid "unexpected end of macro"
 msgstr "neočekávaný konec makra"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21868,11 +21621,12 @@ msgstr "neočekávaný konec makra"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr "neočekávaný parametr \"%1$s\""
@@ -21898,8 +21652,8 @@ msgstr "neočekávaný text \"%1$s\""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21924,6 +21678,10 @@ msgstr "nepodporovaná časová přípona"
 msgid "unsupported version number"
 msgstr "nepodporované číslo verze"
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21939,7 +21697,7 @@ msgstr "nepodporované číslo verze"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21959,11 +21717,11 @@ msgstr "nepodporované číslo verze"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "hodnota"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr "hodnota \"%1$s\" již existuje"
@@ -21981,76 +21739,87 @@ msgstr "hodnota \"%1$s\" nebyla nalezena"
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr "hodnota %1$s již existuje"
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr "hodnota je příliš dlouhá"
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -22062,18 +21831,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr "hodnota musí být jedna z %1$s"
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -22082,7 +21849,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -22095,11 +21862,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -22116,7 +21883,7 @@ msgstr "špatný typ vyhledávacího pravidla"
 msgid "wrong item type"
 msgstr "špatný typ položky"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "r"
diff --git a/ui/locale/de/LC_MESSAGES/frontend.po b/ui/locale/de/LC_MESSAGES/frontend.po
index 1bba41bdb85..908b7f262fa 100644
--- a/ui/locale/de/LC_MESSAGES/frontend.po
+++ b/ui/locale/de/LC_MESSAGES/frontend.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
-"PO-Revision-Date: 2021-09-15 04:00+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
+"PO-Revision-Date: 2021-10-01 11:19+0300\n"
 "Last-Translator: Joachim <joachim.schwender@web.de>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
 "Language: de\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.5.1.3\n"
 "X-Poedit-Basepath: ../../\n"
-"X-POOTLE-MTIME: 1631671249.000000\n"
+"X-POOTLE-MTIME: 1633079978.000000\n"
 
 #: include/classes/db/MysqlDbBackend.php:70
 #: include/classes/db/OracleDbBackend.php:142
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d Tag"
 msgstr[1] "%1$d Tage"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -120,7 +120,7 @@ msgstr "%1$s (Jahr %2$s)"
 #: include/classes/core/CModuleManager.php:228
 #, c-format
 msgid "%1$s - thrown by module located at %2$s."
-msgstr ""
+msgstr "%1$s - ausgelöst von einem Modul mit der Adresse %2$s."
 
 #: include/classes/api/services/CItemGeneral.php:2608
 #: include/classes/import/readers/CXmlImportReader.php:46
@@ -179,7 +179,7 @@ msgstr[1] "%1$s Nachrichten"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "%1$s von %2$s Elementen in problematischem Zustand"
 msgstr[1] "%1$s von %2$s Elementen in problematischem Zustand"
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -226,14 +226,14 @@ msgstr[1] "Noch %1$s Versuche"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s Sekunde"
 msgstr[1] "%1$s Sekunden"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "%1$s Symbole übrig"
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Schweregrad, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, schreibgeschützt"
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -269,8 +269,8 @@ msgstr "%1$s, ausgewählt"
 #, c-format
 msgid "%4$s failed login attempt logged. Last failed attempt was from %1$s on %2$s at %3$s."
 msgid_plural "%4$s failed login attempts logged. Last failed attempt was from %1$s on %2$s at %3$s."
-msgstr[0] "%4$s fehlgeschlagener Anmeldeversuch von %1$s protokolliert. Letzter Fehlversuch stammt von %1$s auf %2$s um %3$s."
-msgstr[1] "%4$s fehlgeschlagene Anmeldeversuche von %1$s protokolliert. Letzter Fehlversuch stammt von %1$s auf %2$s um %3$s."
+msgstr[0] "%4$s fehlgeschlagener Anmeldeversuch protokolliert. Letzter Fehlversuch stammt von %1$s auf %2$s um %3$s."
+msgstr[1] "%4$s fehlgeschlagene Anmeldeversuche protokolliert. Letzter Fehlversuch stammt von %1$s auf %2$s um %3$s."
 
 #: include/classes/screens/CScreenDiscovery.php:213
 #, c-format
@@ -389,7 +389,7 @@ msgstr "API Zugriff"
 msgid "API methods"
 msgstr "API Methode"
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr "API Token"
 
@@ -448,11 +448,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:339
 msgid "Abscissa"
-msgstr ""
-
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr "Akzeptable SLA"
+msgstr "Abszisse"
 
 #: include/func.inc.php:1511
 msgid "Access denied"
@@ -485,7 +481,7 @@ msgstr "Zugriff zu Modulen"
 #: app/views/administration.user.edit.php:480
 #: app/views/administration.userrole.edit.php:135
 msgid "Access to services"
-msgstr ""
+msgstr "Zugriff auf Dienste"
 
 #: app/views/hintbox.eventlist.php:76
 #: app/views/monitoring.widget.problems.view.php:66
@@ -496,7 +492,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Bestätigt"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Bestätigen"
 
@@ -504,7 +500,7 @@ msgstr "Bestätigen"
 msgid "Acknowledge problems"
 msgstr "Probleme bestätigen"
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Bestätigt"
@@ -515,9 +511,9 @@ msgstr "Bestätigte PROBLEM-Ereignisse"
 
 #: app/views/administration.trigdisplay.edit.php:76
 msgid "Acknowledged RESOLVED events"
-msgstr "Gelöste Ereignisse bestätigen"
+msgstr "RESOLVED Ereignisse bestätigen"
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -544,9 +540,9 @@ msgstr "Gelöste Ereignisse bestätigen"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -604,19 +600,19 @@ msgstr "Aktion \"%1$s\" existiert bereits."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Aktion \"%1$s\" hat keine Operationen definiert."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
-msgstr ""
+msgstr "Aktion \"%2$s\" ist für die Benutzerrolle \"%1$s\" nicht verfügbar."
 
 #: actionconf.php:178
 msgid "Action added"
 msgstr "Aktion hinzugefügt"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
-msgstr ""
+msgstr "Aktionsklasse %1$s muss die Klasse %2$s erweitern."
 
 #: actionconf.php:200
 msgid "Action deleted"
@@ -645,7 +641,7 @@ msgstr "Aktionsprotokoll"
 #: app/views/administration.script.list.php:51
 #: app/views/administration.script.list.php:90
 msgid "Action operation"
-msgstr ""
+msgstr "Aktion Vorgang"
 
 #: actionconf.php:170
 msgid "Action updated"
@@ -662,8 +658,8 @@ msgstr "Aktion geändert"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Aktionen"
@@ -730,7 +726,7 @@ msgstr "Aktiv bis"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -741,7 +737,7 @@ msgstr "Aktiv bis"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -764,9 +760,9 @@ msgstr "Aktiv bis"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -836,7 +832,7 @@ msgstr "Aktiv bis"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -844,11 +840,11 @@ msgstr "Hinzufügen"
 msgid "Add (message type limit reached)"
 msgstr "Hinzufügen (Begrenzung für Nachrichtentyp erreicht)"
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "Neues Widget hinzufügen"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "Untergeordnetes Element hinzufügen"
 
@@ -856,7 +852,7 @@ msgstr "Untergeordnetes Element hinzufügen"
 msgid "Add child service"
 msgstr "Untergeordneten Dienst hinzugefügt"
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr "Untergeordneten Dienste hinzugefügt"
 
@@ -873,7 +869,7 @@ msgstr "Host hinzufügen"
 msgid "Add missing"
 msgstr "Fehlendes hinzugefügt"
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "Füge mehrere Karten hinzu"
 
@@ -895,9 +891,9 @@ msgstr "Neue Vorrangregel hinzufügen"
 msgid "Add page"
 msgstr "Seite hinzugefügt"
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
-msgstr ""
+msgstr "Übergeordnete Dienste hinzufügen"
 
 #: include/classes/helpers/CRoleHelper.php:420
 msgid "Add problem comments"
@@ -947,12 +943,12 @@ msgstr "Benutzergruppe hinzufügen"
 msgid "Add widget"
 msgstr "Widget hinzufügen"
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr "Hinzugefügt"
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -962,7 +958,7 @@ msgstr "Hinzugefügt, %1$s"
 msgid "Additional rule"
 msgstr "Regel hinzugefügt"
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr "Weitere Regeln"
 
@@ -975,9 +971,9 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administration"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
-msgstr ""
+msgstr "Erweiterte Konfiguration"
 
 #: include/views/monitoring.sysmap.edit.php:158
 msgid "Advanced labels"
@@ -997,7 +993,7 @@ msgstr "Jünger als"
 msgid "Age less than %1$s"
 msgstr "Jünger als %1$s"
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1015,7 +1011,7 @@ msgstr "Betreuer Verschlüsselung"
 #: include/classes/items/CHelpItems.php:65
 #: include/classes/items/CHelpItems.php:423
 msgid "Agent host metadata. Returns string"
-msgstr ""
+msgstr "Metadaten des Agenten Host. Gibt Zeichenkette zurück"
 
 #: include/classes/items/CHelpItems.php:69
 #: include/classes/items/CHelpItems.php:427
@@ -1069,13 +1065,13 @@ msgstr "Kartenelemente ausrichten"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Alle"
 
 #: app/views/monitoring.dashboard.view.php:180
 msgid "All dashboards"
-msgstr "Alle Dashboards"
+msgstr "Alle Übersichtsseiten"
 
 #: app/partials/administration.usergroup.grouprights.html.php:46
 #: app/views/administration.user.edit.php:431
@@ -1087,7 +1083,7 @@ msgstr "Alle Gruppen"
 msgid "All hosts"
 msgstr "Alle Rechner"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Alle Verknüpfungen sollten Angaben für \"Name\" und \"URL\" haben"
 
@@ -1105,9 +1101,9 @@ msgstr "Alle Probleme"
 msgid "All problems if tag values match"
 msgstr "Alle Probleme falls Marker Wert enthält"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
-msgstr ""
+msgstr "Alle Dienste"
 
 #: app/partials/administration.usergroup.tagfilters.html.php:47
 msgid "All tags"
@@ -1219,21 +1215,21 @@ msgstr "Programmfehler."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Verwenden"
 
 #: include/views/configuration.hostgroups.edit.php:46
 msgid "Apply permissions and tag filters to all subgroups"
-msgstr ""
+msgstr "Berechtigungen und Tag-Filter auf alle Untergruppen anwenden"
 
 #: include/views/configuration.maintenance.list.php:67
 #: include/views/configuration.maintenance.list.php:101
@@ -1245,7 +1241,7 @@ msgstr "Kommend"
 msgid "Apr"
 msgstr "Apr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "April"
 
@@ -1255,11 +1251,11 @@ msgstr "Soll dieser Filter wirklich gelöscht werden?"
 
 #: app/views/js/administration.macros.edit.js.php:86
 msgid "Are you sure you want to delete?"
-msgstr ""
+msgstr "Sind Sie sicher, dass Sie löschen wollen?"
 
 #: include/classes/html/CButtonQMessage.php:52
 msgid "Are you sure you want to perform this action?"
-msgstr ""
+msgstr "Sind Sie sicher, dass Sie diese Aktion durchführen wollen?"
 
 # Ich bin nicht sicher, ob das überhaupt noch verwendet wird.
 #: include/views/js/monitoring.sysmaps.js.php:116
@@ -1274,9 +1270,9 @@ msgstr "Bereichstyp"
 msgid "Arithmetic"
 msgstr "Arithmetik"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
-msgstr ""
+msgstr "Unverändert"
 
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
@@ -1292,7 +1288,7 @@ msgid "Asset tag"
 msgstr "Inventarnummer"
 
 #: include/maintenances.inc.php:70
-#, fuzzy, c-format
+#, c-format
 msgid "At %1$s:%2$s %3$s of every week"
 msgid_plural "At %1$s:%2$s %3$s of every %4$s weeks"
 msgstr[0] "Um %1$s:%2$s %3$s jede Woche"
@@ -1323,7 +1319,7 @@ msgstr "Um (Stunde:Minute)"
 msgid "At least one UI element must be checked."
 msgstr "Mindestens ein UI Element muss ausgewählt sein."
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr "Mindestens ein UI-Element muss für die Benutzerrolle \"%1$s\" aktiviert sein."
@@ -1332,7 +1328,7 @@ msgstr "Mindestens ein UI-Element muss für die Benutzerrolle \"%1$s\" aktiviert
 msgid "At least one action is mandatory."
 msgstr "Mindestens eine Aktion ist Pflicht."
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1344,6 +1340,11 @@ msgstr "At least one UI element must be enabled for the \"%1$s\" user role."
 msgid "At least one host group or host must be selected."
 msgstr "Mindestens eine Host-Gruppe oder ein Host muss ausgewählt sein."
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1355,7 +1356,7 @@ msgstr "Zumindest ein Wartungsfenster muss erstellt werden."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr "Mindestens eine der Datenbanken MySQL, PostgreSQL oder Oracle sollte unterstützt sein."
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr "Mindestens eine Operation muss ausgewählt sein."
 
@@ -1411,7 +1412,7 @@ msgstr "Audit-Einstellungen"
 msgid "Aug"
 msgstr "Aug"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "August"
 
@@ -1424,7 +1425,7 @@ msgstr "Authentifizierungstoken"
 msgid "AuthN requests"
 msgstr "AuthN-Anfragen"
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1501,7 +1502,7 @@ msgstr "Automatisches Abmelden"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1516,7 +1517,7 @@ msgstr "Automatische Symbolzuordnung"
 msgid "Automatic icon selection"
 msgstr "Automatische Symbolauswahl"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1566,9 +1567,9 @@ msgstr "Durchschnittliche Anzahl ausstehender Schreibanforderungen an die virtue
 
 #: app/views/administration.authentication.edit.php:94
 msgid "Avoid easy-to-guess passwords"
-msgstr ""
+msgstr "Vermeiden Sie leicht zu erratende Passwörter"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr "Achsen"
 
@@ -1585,7 +1586,7 @@ msgstr "Hintergrund"
 
 #: include/views/js/monitoring.sysmaps.js.php:565
 msgid "Background color"
-msgstr ""
+msgstr "Hintergrundfarbe"
 
 #: include/views/monitoring.sysmap.edit.php:121
 msgid "Background image"
@@ -1604,7 +1605,7 @@ msgstr "Base-DN"
 #: include/classes/widgets/CWidgetHelper.php:784
 #: include/classes/widgets/CWidgetHelper.php:1041
 msgid "Base color"
-msgstr ""
+msgstr "Grundfarbe"
 
 #: include/httptest.inc.php:28
 msgid "Basic"
@@ -1631,7 +1632,7 @@ msgstr "Bitweise Funktionen"
 msgid "Blocked"
 msgstr "Gesperrt"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "Blau"
 
@@ -1640,20 +1641,20 @@ msgstr "Blau"
 #: include/views/configuration.item.edit.php:394
 #: include/views/configuration.item.prototype.edit.php:375
 msgid "Body"
-msgstr ""
+msgstr "Hauptteil"
 
 #: app/views/popup.httpstep.php:162
 #: include/views/configuration.host.discovery.edit.php:360
 #: include/views/configuration.item.edit.php:396
 #: include/views/configuration.item.prototype.edit.php:377
 msgid "Body and headers"
-msgstr ""
+msgstr "Hauptteil und Kopfzeilen"
 
 # Vielleicht reichts sogar "fett"
 #: include/graphs.inc.php:59 include/views/js/monitoring.sysmaps.js.php:781
 #: include/views/js/monitoring.sysmaps.js.php:871
 msgid "Bold line"
-msgstr "Linie (fett)"
+msgstr "fette Linie"
 
 #: include/items.inc.php:1851
 msgid "Boolean to decimal"
@@ -1665,7 +1666,7 @@ msgstr "Rahmen"
 
 #: include/views/js/monitoring.sysmaps.js.php:596
 msgid "Border color"
-msgstr ""
+msgstr "Randfarbe"
 
 #: include/views/js/monitoring.sysmaps.js.php:574
 msgid "Border type"
@@ -1686,11 +1687,11 @@ msgstr "Beide Passwörter müssen gleich sein."
 msgid "Bottom"
 msgstr "Unten"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "Ebene nach vorn"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "In den Vordergrund"
 
@@ -1716,7 +1717,7 @@ msgstr "ZERTIFIKAT"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1738,11 +1739,11 @@ msgstr "CPU-Zeit, die für das Warten auf das Einlagern aufgewendet wurde, <url>
 
 #: include/classes/items/CHelpItems.php:885
 msgid "CPU usage as a percentage during the interval depends on power management or HT, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "CPU-Nutzung als Prozentsatz während des Intervalls hängt von der Energieverwaltung oder HT ab, <url> - VMware-Service-URL, <uuid> - VMware-Hypervisor-Hostname"
 
 #: include/classes/items/CHelpItems.php:881
 msgid "CPU usage as a percentage during the interval, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "CPU-Nutzung in Prozent während des Intervalls, <url> - VMware-Service-URL, <uuid> - VMware-Hypervisor-Hostname"
 
 #: include/classes/items/CHelpItems.php:1033
 msgid "CPU usage as a percentage during the interval, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
@@ -1761,17 +1762,17 @@ msgstr "CRLF"
 msgid "CSV to JSON"
 msgstr "CSV nach JSON"
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
-msgstr ""
+msgstr "CUID erwartet"
 
 #: include/items.inc.php:100 include/views/configuration.graph.edit.php:176
 #: include/views/configuration.graph.edit.php:263
 msgid "Calculated"
 msgstr "Berechnet"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -1796,7 +1797,7 @@ msgstr "Rückruf"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1809,15 +1810,15 @@ msgstr "Rückruf"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #: app/controllers/CControllerTokenCreate.php:44
 #: app/controllers/CControllerTokenCreate.php:105
 msgid "Cannot add API token"
-msgstr ""
+msgstr "Kann API Token nicht hinzufügen"
 
 #: include/classes/api/services/CGraph.php:517
 #: include/classes/api/services/CGraph.php:531
@@ -1840,17 +1841,17 @@ msgstr "Kann Aktion nicht hinzufügen"
 msgid "Cannot add correlation"
 msgstr "Korrelation kann nicht hinzugefügt werden"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
-msgstr ""
+msgstr "Übersichtsseite kann nicht hinzugefügt werden: Es wurde die maximale Anzahl von %1$d Übersichtsseiten hinzugefügt."
 
 #: include/classes/api/services/CTrigger.php:966
 #: include/classes/api/services/CTriggerPrototype.php:773
 msgid "Cannot add dependency from a host to a template."
 msgstr "Abhängigkeit von einem Host zu einer Vorlage nicht möglich."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1881,8 +1882,8 @@ msgid "Cannot add host prototype"
 msgstr "Kann Hostprototyp nicht hinzufügen"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Kann Bild nicht hinzufügen"
 
@@ -1912,8 +1913,8 @@ msgstr "Kann Medientyp nicht hinzufügen"
 #, c-format
 msgid "Cannot add module: %1$s."
 msgid_plural "Cannot add modules: %1$s."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Modul kann nicht hinzugefügt werden: %1$s."
+msgstr[1] "Module können nicht hinzugefügt werden: %1$s."
 
 #: include/classes/api/services/CGraph.php:40
 #, c-format
@@ -1941,7 +1942,7 @@ msgstr "Kann regulären Ausdruck nicht hinzufügen"
 
 #: app/controllers/CControllerScheduledReportCreate.php:152
 msgid "Cannot add scheduled report"
-msgstr ""
+msgstr "Kann keinen geplanten Bericht hinzufügen"
 
 #: app/controllers/CControllerScriptCreate.php:60
 #: app/controllers/CControllerScriptCreate.php:155
@@ -1974,18 +1975,18 @@ msgstr "Kann Benutzer nicht hinzufügen"
 msgid "Cannot add user group"
 msgstr "Kann Benutzergruppe nicht hinzufügen"
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Kann Web-Szenario nicht hinzufügen"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
-msgstr "Widget kann nicht hinzugefügt werden: nicht genügend freier Platz auf dem Dashboard."
+msgstr "Widget kann nicht hinzugefügt werden: nicht genügend freier Platz auf der Übersichtsseite."
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
-msgstr ""
+msgstr "Kann nicht entfernt werden"
 
 #: include/classes/validators/CLdapAuthValidator.php:79
 msgid "Cannot bind anonymously to LDAP server."
@@ -2000,36 +2001,32 @@ msgstr "Kann nicht an LDAP Server anbinden."
 #: include/forms.inc.php:1924 include/forms.inc.php:1934
 #, c-format
 msgid "Cannot build expression tree: %1$s."
-msgstr ""
+msgstr "Ausdrucksbaum kann nicht erstellt werden: %1$s."
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
-msgstr ""
+msgstr "Der Benutzertyp der eigenen Rolle kann nicht geändert werden."
 
 # Das heißt sonst nirgends "Verlauf", oder?
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Kann Verlauf nicht leeren"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr "Verlauf kann nicht gelöscht werden: mindestens eines der ausgewählten Elemente gehört zu keinem überwachten Host"
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Kann Diagramm-Vorlagen nicht klonen."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "Kann Hostprototypen nicht klonen."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Kann Datenpunktvorlagen nicht klonen."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Kann Auslöser-Vorlagen nicht klonen."
 
@@ -2056,7 +2053,7 @@ msgid_plural "Cannot copy graphs"
 msgstr[0] "Kann Schaubild nicht kopieren"
 msgstr[1] "Kann Schaubilder nicht kopieren"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "Kann Element nicht kopieren"
@@ -2108,11 +2105,11 @@ msgstr "Kann Symbolzuordnung nicht erstellen"
 msgid "Cannot create scheduled report"
 msgstr "Kann keinen geplanten Bericht erstellen"
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
-msgstr ""
+msgstr "Der Dienst \"%1$s\" kann nicht erstellt werden: %2$s."
 
 #: include/classes/setup/CSetupWizard.php:678
 msgid "Cannot create the configuration file."
@@ -2126,8 +2123,8 @@ msgstr "Benutzerrolle kann nicht erstellt werden"
 #: app/controllers/CControllerTokenDelete.php:64
 msgid "Cannot delete API token"
 msgid_plural "Cannot delete API tokens"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "API-Token kann nicht gelöscht werden"
+msgstr[1] "API-Token können nicht gelöscht werden"
 
 #: include/classes/api/services/CUser.php:1257
 #, c-format
@@ -2138,17 +2135,16 @@ msgstr "Kann Zabbix-internen Benutzer \"%1$s\" nicht löschen. Alternativ könnt
 msgid "Cannot delete action"
 msgstr "Kann Aktion nicht löschen"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
-msgstr ""
+msgstr "Die zugewiesene Benutzerrolle \"%1$s\" kann nicht gelöscht werden."
 
 #: app/controllers/CControllerCorrelationDelete.php:68
-#, fuzzy
 msgid "Cannot delete correlation"
 msgid_plural "Cannot delete correlations"
 msgstr[0] "Kann Korrelation nicht löschen"
-msgstr[1] "Kann Korrelation nicht löschen"
+msgstr[1] "Kann Korrelationen nicht löschen"
 
 #: app/controllers/CControllerDashboardDelete.php:63
 #: app/controllers/CControllerTemplateDashboardDelete.php:61
@@ -2163,11 +2159,10 @@ msgid "Cannot delete dependency"
 msgstr "Kann Abhängigkeit nicht löschen"
 
 #: app/controllers/CControllerDiscoveryDelete.php:69 host_discovery.php:412
-#, fuzzy
 msgid "Cannot delete discovery rule"
 msgid_plural "Cannot delete discovery rules"
 msgstr[0] "Kann Suchlauf nicht löschen"
-msgstr[1] "Kann Suchlauf nicht löschen"
+msgstr[1] "Kann Suchläufe nicht löschen"
 
 #: host_discovery.php:760
 msgid "Cannot delete discovery rules"
@@ -2200,13 +2195,13 @@ msgid "Cannot delete host"
 msgstr "Kann Host nicht löschen"
 
 #: include/classes/api/services/CHost.php:1355
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group."
 msgstr[0] "Kann den Host nicht löschen da die Wartung \"%1$s\" mindestens einen Host oder Host-Gruppe enthalten muss."
 msgstr[1] "Kann die ausgewählten Hosts nicht löschen da die Wartung \"%1$s\" mindestens einen Host oder Host-Gruppe enthalten muss."
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2217,18 +2212,18 @@ msgstr[1] "Kann die ausgewählten Hosts-Gruppen nicht löschen da die Wartung \"
 msgid "Cannot delete host prototypes"
 msgstr "Kann Hostprototypen nicht löschen"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Kann Symbolzuordnung nicht löschen"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Kann Bild nicht löschen"
 
 #: include/classes/api/services/CHostInterface.php:636
 #, c-format
 msgid "Cannot delete interface for discovered host \"%1$s\"."
-msgstr ""
+msgstr "Schnittstelle für erkannten Host \"%1$s\" kann nicht gelöscht werden."
 
 #: include/classes/api/services/CHost.php:1142
 msgid "Cannot delete inventory."
@@ -2246,7 +2241,7 @@ msgstr "Kann Datenpunktprototyp nicht löschen"
 msgid "Cannot delete item prototypes"
 msgstr "Kann Datenpunktprototypen nicht löschen"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Kann Datenpunkte nicht löschen"
 
@@ -2264,8 +2259,8 @@ msgstr[1] "Kann Medien-Typ nicht löschen"
 #, c-format
 msgid "Cannot delete module: %1$s."
 msgid_plural "Cannot delete modules: %1$s."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Modul kann nicht gelöscht werden: %1$s."
+msgstr[1] "Module können nicht gelöscht werden: %1$s."
 
 #: sysmaps.php:262
 msgid "Cannot delete network map"
@@ -2277,10 +2272,10 @@ msgid_plural "Cannot delete proxies"
 msgstr[0] "Kann Proxy nicht löschen"
 msgstr[1] "Kann Proxy nicht löschen"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
-msgstr ""
+msgstr "Schreibgeschützte Benutzerrolle \"%1$s\" kann nicht gelöscht werden."
 
 #: app/controllers/CControllerRegExDelete.php:55
 msgid "Cannot delete regular expression"
@@ -2291,8 +2286,8 @@ msgstr[1] "Kann regulären Ausdruck nicht löschen"
 #: app/controllers/CControllerScheduledReportDelete.php:71
 msgid "Cannot delete scheduled report"
 msgid_plural "Cannot delete scheduled reports"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Geplanter Bericht kann nicht gelöscht werden"
+msgstr[1] "Geplante Berichte können nicht gelöscht werden"
 
 #: app/controllers/CControllerScriptDelete.php:69
 msgid "Cannot delete script"
@@ -2300,7 +2295,7 @@ msgid_plural "Cannot delete scripts"
 msgstr[0] "Kann Skript nicht löschen"
 msgstr[1] "Kann Skript nicht löschen"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Kann Skript nicht löschen. Aktionsoperation \"%2$s\" verwendet Skript \"%1$s\"."
@@ -2315,11 +2310,11 @@ msgid_plural "Cannot delete services"
 msgstr[0] "Kann Dienst nicht löschen"
 msgstr[1] "Kann Dienst nicht löschen"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
-msgstr ""
+msgstr "Der Dienst \"%1$s\" kann nicht gelöscht werden: %2$s."
 
 #: templates.php:427 templates.php:441 templates.php:474
 msgid "Cannot delete template"
@@ -2339,13 +2334,13 @@ msgstr "Kann vorlagenbasierten Hostprototyp nicht löschen."
 
 #: include/classes/api/services/CItemPrototype.php:655
 msgid "Cannot delete templated item prototype."
-msgstr "Kann vorlagenbasierten Datenpunkt-Prototyp nicht löschen"
+msgstr "Kann vorlagenbasierten Datenpunkt-Prototyp nicht löschen."
 
 #: include/classes/api/services/CItem.php:770
 msgid "Cannot delete templated item."
 msgstr "Kann vorlagenbasierten Datenpunkt nicht löschen."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Kann vorlagenbasierte Datenpunkte nicht löschen."
 
@@ -2357,7 +2352,7 @@ msgstr "Kann vorlagenbasierten Auslöser \"%1$s:%2$s\" nicht löschen."
 #: include/classes/api/services/CTriggerPrototype.php:523
 #, c-format
 msgid "Cannot delete templated trigger prototype \"%1$s:%2$s\"."
-msgstr ""
+msgstr "Cannot delete templated trigger prototype \"%1$s:%2$s\"."
 
 #: include/classes/api/services/CHttpTest.php:610
 #, c-format
@@ -2398,15 +2393,15 @@ msgid_plural "Cannot delete user roles"
 msgstr[0] "Kann Benutzerrolle nicht löschen"
 msgstr[1] "Kann Benutzerrollen nicht löschen"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Kann Web-Szenario nicht löschen"
 
 #: app/controllers/CControllerTokenDisable.php:66
 msgid "Cannot disable API token"
 msgid_plural "Cannot disable API tokens"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Kann API Token nicht deaktivieren"
+msgstr[1] "Kann API Token nicht deaktivieren"
 
 #: actionconf.php:383
 msgid "Cannot disable action"
@@ -2433,7 +2428,7 @@ msgid_plural "Cannot disable hosts"
 msgstr[0] "Kann Host nicht deaktivieren"
 msgstr[1] "Kann Hosts nicht deaktivieren"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Kann Datenpunkt nicht deaktivieren"
@@ -2449,14 +2444,14 @@ msgstr[1] "Kann Medientypen nicht deaktivieren"
 #, c-format
 msgid "Cannot disable module: %1$s."
 msgid_plural "Cannot disable modules: %1$s."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Modul kann nicht deaktiviert werden: %1$s."
+msgstr[1] "Module können nicht deaktiviert werden: %1$s."
 
 #: app/controllers/CControllerScheduledReportDisable.php:78
 msgid "Cannot disable scheduled report"
 msgid_plural "Cannot disable scheduled reports"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Geplanter Bericht kann nicht deaktiviert werden"
+msgstr[1] "Geplante Berichte können nicht deaktiviert werden"
 
 #: triggers.php:461
 msgid "Cannot disable trigger"
@@ -2464,7 +2459,7 @@ msgid_plural "Cannot disable triggers"
 msgstr[0] "Kann Auslöser nicht deaktivieren"
 msgstr[1] "Kann Auslöser nicht deaktivieren"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Kann Web-Szenario nicht deaktivieren"
@@ -2483,8 +2478,8 @@ msgstr "Kann nicht mehr als ein Element des Typs \"Diagrammsumme\" anzeigen."
 #: app/controllers/CControllerTokenEnable.php:66
 msgid "Cannot enable API token"
 msgid_plural "Cannot enable API tokens"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Kann API Token nicht aktivieren"
+msgstr[1] "Kann API Token nicht aktivieren"
 
 #: actionconf.php:382
 msgid "Cannot enable action"
@@ -2511,7 +2506,7 @@ msgid_plural "Cannot enable hosts"
 msgstr[0] "Kann Host nicht aktivieren"
 msgstr[1] "Kann Hosts nicht aktivieren"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Kann Datenpunkt nicht aktivieren"
@@ -2527,14 +2522,14 @@ msgstr[1] "Kann Medientypen nicht aktivieren"
 #, c-format
 msgid "Cannot enable module: %1$s."
 msgid_plural "Cannot enable modules: %1$s."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Modul kann nicht aktiviert werden: %1$s."
+msgstr[1] "Module können nicht aktiviert werden: %1$s."
 
 #: app/controllers/CControllerScheduledReportEnable.php:78
 msgid "Cannot enable scheduled report"
 msgid_plural "Cannot enable scheduled reports"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Geplanter Bericht kann nicht aktiviert werden"
+msgstr[1] "Geplante Berichte können nicht aktiviert werden"
 
 #: triggers.php:460
 msgid "Cannot enable trigger"
@@ -2542,7 +2537,7 @@ msgid_plural "Cannot enable triggers"
 msgstr[0] "Kann Auslöser nicht aktivieren"
 msgstr[1] "Kann Auslöser nicht aktivieren"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Kann Webszenario nicht aktivieren"
@@ -2550,15 +2545,15 @@ msgstr[1] "Kann Webszenarios nicht aktivieren"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:199
 msgid "Cannot evaluate expression"
-msgstr ""
+msgstr "Ausdruck kann nicht ausgewertet werden"
 
 #: app/controllers/CControllerPopupScriptExec.php:123
 msgid "Cannot execute script."
-msgstr ""
+msgstr "Skript kann nicht ausgeführt werden."
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
-msgstr "Kann Macros nicht auflösen"
+msgstr "Kann Macros nicht auflösen."
 
 #: include/classes/import/importers/CMapImporter.php:270
 #, c-format
@@ -2568,7 +2563,7 @@ msgstr "Kann Hintergrundbild \"%1$s\" nicht finden, das in Karte \"%2$s\" verwen
 #: include/classes/import/importers/CTemplateDashboardImporter.php:170
 #, c-format
 msgid "Cannot find graph \"%1$s\" used in dashboard \"%2$s\"."
-msgstr ""
+msgstr "Das Diagramm \"%1$s\", das in der Übersichtsseite \"%2$s\" verwendet wird, kann nicht gefunden werden."
 
 #: include/classes/import/importers/CMapImporter.php:152
 #, c-format
@@ -2578,7 +2573,7 @@ msgstr "Kann Gruppe \"%1$s\" nicht finden, die in Karte \"%2$s\" verwendet wird.
 #: include/classes/import/importers/CTemplateDashboardImporter.php:140
 #, c-format
 msgid "Cannot find host \"%1$s\" used in dashboard \"%2$s\"."
-msgstr ""
+msgstr "Host \"%1$s\", der in der Übersichtsseite \"%2$s\" verwendet wird, kann nicht gefunden werden."
 
 #: include/classes/import/importers/CMapImporter.php:164
 #, c-format
@@ -2590,8 +2585,8 @@ msgstr "Kann Host \"%1$s\" nicht finden, der in Karte \"%2$s\" verwendet wird."
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Kann Hostgruppe \"%1$s\" nicht finden für Hostprototyp \"%2$s\" der Suchlaufregel \"%3$s\" auf \"%4$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2611,17 +2606,17 @@ msgstr "Kann Symbolzuordnung \"%1$s\" nicht finden, die in Karte \"%2$s\" verwen
 #: include/classes/import/CConfigurationImport.php:948
 #, c-format
 msgid "Cannot find interface \"%1$s\" used for discovery rule \"%2$s\" on \"%3$s\"."
-msgstr ""
+msgstr "Schnittstelle \"%1$s\", die für Suchlaufregel \"%2$s\" auf \"%3$s\" verwendet wird, kann nicht gefunden werden."
 
 #: include/classes/import/CConfigurationImport.php:717
 #, c-format
 msgid "Cannot find interface \"%1$s\" used for item \"%2$s\" on \"%3$s\"."
-msgstr ""
+msgstr "Schnittstelle \"%1$s\", die für Element \"%2$s\" auf \"%3$s\" verwendet wird, kann nicht gefunden werden."
 
 #: include/classes/import/CConfigurationImport.php:1100
 #, c-format
 msgid "Cannot find interface \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
-msgstr ""
+msgstr "Die Schnittstelle \"%1$s\", die für den Elementprototyp \"%2$s\" der Suchlaufregel \"%3$s\" auf \"%4$s\" verwendet wird, kann nicht gefunden werden."
 
 #: include/classes/import/CConfigurationImport.php:1631
 #, c-format
@@ -2656,7 +2651,7 @@ msgstr "Keine Wertezuordnung \"%1$s\" auf \"%2$s\" gefunden, für Datenpunktvorl
 #: include/classes/import/importers/CTemplateDashboardImporter.php:155
 #, c-format
 msgid "Cannot find item \"%1$s\" used in dashboard \"%2$s\"."
-msgstr ""
+msgstr "Element \"%1$s\", das in der Übersichtsseite \"%2$s\" verwendet wird, kann nicht gefunden werden."
 
 #: include/classes/import/importers/CMapImporter.php:140
 #, c-format
@@ -2671,7 +2666,7 @@ msgstr "Kann Hostgruppe \"%1$s\" nicht finden für Hostprototyp \"%2$s\" der Suc
 #: include/classes/import/CConfigurationImport.php:998
 #, c-format
 msgid "Cannot find template \"%1$s\" for override \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
-msgstr ""
+msgstr "Vorlage \"%1$s\" für Überschreibung \"%2$s\" der Erkennungsregel \"%3$s\" auf \"%4$s\" nicht gefunden."
 
 #: include/classes/import/importers/CMapImporter.php:179
 #: include/classes/import/importers/CMapImporter.php:229
@@ -2689,27 +2684,23 @@ msgstr "Keine Wertezuordnung \"%1$s\" gefunden, für Datenpunkt \"%2$s\" auf \"%
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Keine Wertezuordnung \"%1$s\" gefunden, für Datenpunktvorlage \"%2$s\" der Suchlaufregel \"%3$s\" auf \"%4$s\"."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "Kann keinen leeren Anzeigenamen haben."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
-msgstr ""
+msgstr "Nicht standardmäßige Regel \"%2$s\" kann nicht verwendet werden, wenn \"%3$s\" für die Benutzerrolle \"%1$s\" auf %4$d gesetzt ist."
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
-msgstr ""
+msgstr "Es kann kein nicht leerer Tag-Wert vorhanden sein, während ein leeres Tag in der Regel \"%2$s\" für die Benutzerrolle \"%1$s\" vorhanden ist."
 
 #: include/classes/import/importers/CTemplateImporter.php:253
 #: include/classes/import/importers/CTemplateImporter.php:405
@@ -2719,7 +2710,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
 msgstr[0] "Kann Vorlage nicht importieren \"%1$s\", verknüpfte Vorlage \"%2$s\" existiert nicht."
 msgstr[1] "Kann Vorlage nicht importieren \"%1$s\", verknüpfte Vorlagen \"%2$s\" existieren nicht."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "Kann Auslöser Ausdruck nicht einfügen"
 
@@ -2730,19 +2721,19 @@ msgstr "Kann Vorlage nicht verbinden"
 #: include/classes/api/services/CTemplate.php:1058
 #: include/classes/api/services/CTemplate.php:1072
 msgid "Cannot link template."
-msgstr "Kann Vorlage nicht verknüpfen"
+msgstr "Kann Vorlage nicht verknüpfen."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Modul kann nicht geladen werden bei: %1$s."
+msgstr[1] "Module können nicht geladen werden bei: %1$s."
 
 #: include/classes/api/services/CUser.php:1449
 msgid "Cannot log out."
-msgstr ""
+msgstr "Abmeldung nicht möglich."
 
 #: include/classes/api/services/CHost.php:986
 msgid "Cannot mass update host name."
@@ -2763,19 +2754,19 @@ msgstr "Massenänderung von sichtbarem Vorlagenname nicht möglich."
 #: include/classes/api/services/CHostBase.php:68
 #, c-format
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
-msgstr ""
+msgstr "Es können keine doppelten Vorlagen-IDs für die Verknüpfung: %1$s übergeben werden."
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Kann den Löschvorgang in Tabelle \"%1$s\" nicht durchführen ohne Where-Bedingung."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Kann keine Änderung der Tabelle \"%1$s\" ohne Werte durchführen."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Kann keine Änderung auf Tabelle \"%1$s\" durchführen ohne WHERE-Bedingung."
@@ -2795,14 +2786,14 @@ msgstr "Kann XML nicht lesen: %1$s."
 #: include/classes/import/readers/CYamlImportReader.php:55
 #, c-format
 msgid "Cannot read YAML: %1$s."
-msgstr ""
+msgstr "YAML kann nicht gelesen werden: %1$s."
 
 #: include/classes/server/CZabbixServer.php:527
 #, c-format
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Kann Antwort nicht lesen. Überprüfen Sie die Verbindungen mit dem Zabbix-Server \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Gastbenutzer kann nicht umbenannt werden."
 
@@ -2821,7 +2812,7 @@ msgstr "Kann Widget nicht speichern \"%1$s\"."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Kann Befehl nicht abschicken. Überprüfen Sie die Verbindungen mit dem Zabbix-Server \"%1$s\"."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr "Kann Anfrage nicht senden"
 
@@ -2861,12 +2852,12 @@ msgstr "Kann Inventarfeld nicht setzen wegen deaktivierter Inventarfunktion."
 msgid "Cannot set session cookie."
 msgstr "Session-Cookie kann nicht gesetzt werden."
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
-msgstr ""
+msgstr "Der Parameter \"propagation_rule\" kann nicht angegeben werden, ohne dass der Parameter \"propagation_value\" für den Dienst \"%1$s\" angegeben wird."
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr "Kann für dieses Gerät keine akustische Meldung unterstützen."
 
@@ -2885,7 +2876,7 @@ msgid_plural "Cannot unblock users"
 msgstr[0] "Kann Benutzer nicht entsperren"
 msgstr[1] "Kann Benutzer nicht entsperren"
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Kann Web-Szenarien nicht trennen und leeren."
 
@@ -2898,10 +2889,10 @@ msgstr "Kann Vorlage nicht trennen"
 msgid "Cannot unlink template."
 msgstr "Kann Vorlage nicht trennen."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
-msgstr ""
+msgstr "Der Auslöser \"%1$s\" kann nicht entkoppelt werden, da er Elemente aus der Vorlage enthält, die noch mit dem Host verknüpft ist."
 
 #: include/classes/api/services/CAction.php:2901
 #: include/classes/api/services/CAction.php:2906
@@ -2951,23 +2942,19 @@ msgstr "Kann \"%1$s\"\" für einen entdeckten Datenpunkt \"%2$s\" nicht aktualis
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "Kann \"%1$s\"\" für einen entdeckten Auslöser \"%2$s\" nicht aktualisieren."
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "\"Bild-Typ\" kann für Bild \"%1$s\" nicht aktualisiert werden."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
-msgstr ""
+msgstr "API-Token kann nicht aktualisiert werden"
 
 #: include/classes/api/services/CGraphGeneral.php:67
 msgid "Cannot update a discovered graph."
 msgstr "Per Suchlauf entdecktes Diagramm nicht aktualisierbar."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "Kann per Suchlauf entdeckte Host-Gruppe nicht aktualisieren."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3026,9 +3013,7 @@ msgstr "Kann Diagramm-Prototyp nicht aktualisieren"
 msgid "Cannot update group"
 msgstr "Kann Gruppe nicht ändern"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Kann Gruppen für per Suchlauf entdeckten Host \"%1$s\" nicht aktualisieren."
@@ -3051,13 +3036,13 @@ msgstr[1] "Kann Host-Prototypen nicht aktualisieren"
 msgid "Cannot update hosts"
 msgstr "Kann Hosts nicht ändern"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "Kann Symbolzuordnung nicht ändern"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Kann Bild nicht ändern"
 
@@ -3100,7 +3085,7 @@ msgstr "Kann Medientyp nicht ändern"
 #: app/controllers/CControllerModuleUpdate.php:157
 #, c-format
 msgid "Cannot update module: %1$s."
-msgstr ""
+msgstr "Modul kann nicht aktualisiert werden: %1$s."
 
 #: sysmaps.php:185
 msgid "Cannot update network map"
@@ -3111,15 +3096,15 @@ msgstr "Kann Karte nicht ändern"
 msgid "Cannot update proxy"
 msgstr "Kann Proxy nicht ändern"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Proxy für per Suchlauf enddeckten Host \"%1$s\" kann nicht aktualisiert werden."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
-msgstr ""
+msgstr "Die schreibgeschützte Benutzerrolle \"%1$s\" kann nicht aktualisiert werden."
 
 #: app/controllers/CControllerRegExUpdate.php:44
 #: app/controllers/CControllerRegExUpdate.php:89
@@ -3129,31 +3114,31 @@ msgstr "Kann regulären Ausdruck nicht ändern"
 #: app/controllers/CControllerScheduledReportUpdate.php:63
 #: app/controllers/CControllerScheduledReportUpdate.php:156
 msgid "Cannot update scheduled report"
-msgstr ""
+msgstr "Geplanter Bericht kann nicht aktualisiert werden"
 
 #: app/controllers/CControllerScriptUpdate.php:61
 #: app/controllers/CControllerScriptUpdate.php:170
 msgid "Cannot update script"
 msgstr "Kann Skript nicht ändern"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
-msgstr ""
+msgstr "Skriptbereich kann nicht aktualisiert werden. Skript \"%1$s\" wird in Aktion \"%2$s\" verwendet."
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
-msgstr ""
+msgstr "Der Dienst \"%1$s\" kann nicht aktualisiert werden: %2$s."
 
 #: app/controllers/CControllerPopupMassupdateService.php:157
 msgid "Cannot update services"
-msgstr ""
+msgstr "Dienste können nicht aktualisiert werden"
 
 #: include/classes/api/services/CHttpTest.php:538
 #: include/classes/api/services/CHttpTest.php:743
@@ -3219,9 +3204,9 @@ msgstr[1] "Kann Benutzergruppen nicht aktualisieren"
 #: app/controllers/CControllerUserroleUpdate.php:103
 #: app/controllers/CControllerUserroleUpdate.php:173
 msgid "Cannot update user role"
-msgstr ""
+msgstr "Benutzerrolle kann nicht aktualisiert werden"
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Kann Web-Szenario nicht ändern"
 
@@ -3233,7 +3218,7 @@ msgstr "Groß- und Kleinschreibung beachten"
 #: app/views/administration.authentication.edit.php:193
 #: app/views/administration.authentication.edit.php:316
 msgid "Case-sensitive login"
-msgstr ""
+msgstr "Anmeldung unter Berücksichtigung der Groß-/Kleinschreibung"
 
 #: include/locales.inc.php:48
 msgid "Catalan (ca_ES)"
@@ -3249,7 +3234,7 @@ msgstr "Erfasst alle SNMP-Traps welche nicht durch snmptrap[] Datenpunkte erfass
 
 #: include/views/js/monitoring.sysmaps.js.php:35
 msgid "Center"
-msgstr ""
+msgstr "Mittig"
 
 #: app/views/administration.proxy.edit.php:98
 #: app/views/administration.proxy.edit.php:106
@@ -3321,8 +3306,8 @@ msgid "Character string not included"
 msgstr "Zeichenfolge nicht enthalten"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr "Zeichen"
 
@@ -3437,9 +3422,9 @@ msgstr "Überprüft die Performanz eines UDP Dienstes. Rückgabe 0 - Dienst ist
 msgid "Checks should be unique."
 msgstr "Prüfungen sollten einzigartig sein."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
-msgstr ""
+msgstr "Tochter-Dienste"
 
 #: include/locales.inc.php:49
 msgid "Chinese (zh_CN)"
@@ -3458,10 +3443,10 @@ msgstr "Zirkularbezug in Vorlagen: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "Zirkulare Verknüpfungen zwischen Vorlagen sind unzulässig."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
-msgstr ""
+msgstr "Klasse %1$s nicht gefunden für Aktion %2$s."
 
 #: include/views/configuration.httpconf.list.php:217
 #: include/views/configuration.item.list.php:291
@@ -3479,11 +3464,11 @@ msgstr "Verlauf und Trends leeren"
 msgid "Clear when unlinking"
 msgstr "Leeren, wenn getrennt wird"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
-msgstr "Klicke und ziehe zur gewünschten Grösse"
+msgstr "Klicke und ziehe zur gewünschten Grösse."
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr "Klicke zum Betrachten oder Bearbeiten"
 
@@ -3498,7 +3483,7 @@ msgstr "Uhr"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3513,7 +3498,7 @@ msgstr "Uhr"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Klonen"
 
@@ -3524,8 +3509,8 @@ msgstr "Klonen"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Schließen"
 
@@ -3536,13 +3521,13 @@ msgstr "Schließen"
 msgid "Close expression constructor"
 msgstr "Ausdrucksgenerator schließen"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Schließe neues Ereignis"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Schließe alte Ereignisse"
 
@@ -3555,8 +3540,8 @@ msgid "Close problems"
 msgstr "Probleme schliessen"
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "Einklappen"
 
@@ -3571,9 +3556,9 @@ msgstr "Seitenbereich einklappen"
 #: include/views/js/monitoring.sysmaps.js.php:422
 #: include/views/js/monitoring.sysmaps.js.php:792
 msgid "Color"
-msgstr ""
+msgstr "Farbe"
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3639,7 +3624,7 @@ msgstr "Kompression"
 msgid "Concurrent sessions"
 msgstr "Aktuelle Sitzungen"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3650,17 +3635,12 @@ msgstr "Voraussetzung"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "Zustand \"%2$s\" in der Formel \"%3$s\" für Aktion \"%1$s\" ungenutzt."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "Zustand \"%2$s\" in der Formel \"%3$s\" für Korrelation \"%1$s\" ungenutzt."
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "Zustand \"%2$s\" in der Formel \"%3$s\" für Suchlaufregel \"%1$s\" ungenutzt."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr "Zustand \"%2$s\" in der Formel \"%3$s\" für Vorrangregel \"%1$s\" ungenutzt."
@@ -3670,17 +3650,12 @@ msgstr "Zustand \"%2$s\" in der Formel \"%3$s\" für Vorrangregel \"%1$s\" ungen
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "Zustand \"%2$s\" in der Formel \"%3$s\" für Aktion \"%1$s\" undefiniert."
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "Zustand \"%2$s\" verwendet in Formel \"%3$s\" für Korrelation \"%1$s\" ist nicht definiert."
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "Zustand \"%2$s\" verwendet in Formel \"%3$s\" für Suchlaufregel \"%1$s\" ist nicht definiert."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr "Zustand \"%2$s\" verwendet in Formel \"%3$s\" für Vorrangregel \"%1$s\" ist nicht definiert."
@@ -3696,7 +3671,7 @@ msgstr "Voraussetzungen"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -3719,7 +3694,7 @@ msgstr "Konfiguration von Aktionen"
 
 #: app/controllers/CControllerAuditSettingsEdit.php:60
 msgid "Configuration of audit log"
-msgstr ""
+msgstr "Konfiguration des Audit-Protokolls"
 
 #: app/controllers/CControllerAuthenticationEdit.php:196
 msgid "Configuration of authentication"
@@ -3728,7 +3703,7 @@ msgstr "Konfiguration der Authentifizierung"
 #: app/controllers/CControllerTemplateDashboardEdit.php:102
 #: app/controllers/CControllerTemplateDashboardList.php:93
 msgid "Configuration of dashboards"
-msgstr "Konfiguration der Kontrolltafel"
+msgstr "Konfiguration der Übersichtsseite"
 
 #: app/controllers/CControllerDiscoveryEdit.php:137
 #: app/controllers/CControllerDiscoveryList.php:128 host_discovery.php:27
@@ -3759,7 +3734,7 @@ msgstr "Konfiguration der Hosts"
 msgid "Configuration of housekeeping"
 msgstr "Konfiguration der Bereinigung"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Konfiguration der Symbolzuordnung"
@@ -3833,7 +3808,7 @@ msgstr "Konfiguration der Benutzergruppen"
 #: app/controllers/CControllerUserroleEdit.php:184
 #: app/controllers/CControllerUserroleList.php:130
 msgid "Configuration of user roles"
-msgstr ""
+msgstr "Konfiguration von Benutzerrollen"
 
 #: app/controllers/CControllerUserEdit.php:243
 #: app/controllers/CControllerUserList.php:170
@@ -3866,7 +3841,7 @@ msgstr "Bestätigungstext"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "Herzlichen Glückwunsch! Sie haben das Zabbix Frontend erfolgreich installiert."
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3899,6 +3874,9 @@ msgid ""
 "1. Incorrect server IP/DNS in the \"zabbix.conf.php\";\n"
 "2. Incorrect DNS server configuration.\n"
 msgstr ""
+"Die Verbindung zum Zabbix-Server \"%1$s\" ist fehlgeschlagen. Mögliche Gründe:\n"
+"1. Falsche Server IP/DNS in der \"zabbix.conf.php\";\n"
+"2. Falsche DNS-Server-Konfiguration.\n"
 
 #: include/classes/server/CZabbixServer.php:580
 #, c-format
@@ -3909,6 +3887,11 @@ msgid ""
 "3. Zabbix server daemon not running;\n"
 "4. Firewall is blocking TCP connection.\n"
 msgstr ""
+"Verbindung zum Zabbix-Server \"%1$s\" abgelehnt. Mögliche Gründe:\n"
+"1. Falsche Server IP/DNS in der \"zabbix.conf.php\";\n"
+"2. Die Sicherheitsumgebung (z.B. SELinux) blockiert die Verbindung;\n"
+"3. Der Zabbix-Server-Daemon läuft nicht;\n"
+"4. Die Firewall blockiert die TCP-Verbindung.\n"
 
 #: include/classes/server/CZabbixServer.php:588
 #, c-format
@@ -3917,6 +3900,9 @@ msgid ""
 "1. Incorrect server IP/DNS in the \"zabbix.conf.php\";\n"
 "2. Firewall is blocking TCP connection.\n"
 msgstr ""
+"Die Verbindung zum Zabbix-Server \"%1$s\" wurde unterbrochen. Mögliche Gründe:\n"
+"1. Falsche Server IP/DNS in der \"zabbix.conf.php\";\n"
+"2. Die Firewall blockiert die TCP-Verbindung.\n"
 
 #: include/classes/setup/CSetupWizard.php:373
 msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
@@ -3959,7 +3945,7 @@ msgstr "Kontakt"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4019,17 +4005,17 @@ msgstr "Enthält"
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr "Inhaltssteuerung"
 
 #: include/classes/html/widget/CWidget.php:177
 msgid "Content controls: header"
-msgstr ""
+msgstr "Inhaltssteuerung: Kopfteil"
 
 #: include/html.inc.php:316
 msgid "Content menu"
-msgstr ""
+msgstr "Inhaltsmenü"
 
 #: app/views/popup.discovery.check.php:81
 #: app/views/popup.itemtestedit.view.php:155 include/items.inc.php:1306
@@ -4058,8 +4044,8 @@ msgstr "Koordinaten"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Kopieren"
 
@@ -4068,12 +4054,11 @@ msgstr "Kopieren"
 msgid "Copy to clipboard"
 msgstr "In Zwischenablage kopieren"
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "Korrelation"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "Korrelation \"%1$s\" ist bereits vorhanden."
@@ -4083,11 +4068,10 @@ msgid "Correlation added"
 msgstr "Korrelation hinzugefügt"
 
 #: app/controllers/CControllerCorrelationDelete.php:65
-#, fuzzy
 msgid "Correlation deleted"
 msgid_plural "Correlations deleted"
 msgstr[0] "Korrelation gelöscht"
-msgstr[1] "Korrelation gelöscht"
+msgstr[1] "Korrelationen gelöscht"
 
 #: app/controllers/CControllerCorrelationDisable.php:72
 msgid "Correlation disabled"
@@ -4101,16 +4085,6 @@ msgid_plural "Correlations enabled"
 msgstr[0] "Korrelation aktiviert"
 msgstr[1] "Korrelationen aktiviert"
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "Fehlende Parameter in Korrelation: %1$s"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "Korrelationsname darf nicht leer sein."
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr "Korrelationsregel"
@@ -4119,27 +4093,23 @@ msgstr "Korrelationsregel"
 msgid "Correlation updated"
 msgstr "Korrelation aktualisiert"
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Konnte Bild nicht speichern!"
-
 # Zähler?
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Gesamt"
 
 #: include/classes/items/CHelpItems.php:229
 #: include/classes/items/CHelpItems.php:611
 msgid "Count of context switches. Returns integer"
-msgstr "Anzahl der Kontextwechsel. Gibt Ganzzahl zurück."
+msgstr "Anzahl der Kontextwechsel. Gibt Ganzzahl zurück"
 
 #: include/classes/items/CHelpItems.php:317
 #: include/classes/items/CHelpItems.php:699
 msgid "Count of directory entries, recursively. Returns integer"
-msgstr "Anzahl von Verzeichniseinträgen, rekursiv. Gibt Ganzzahl zurück."
+msgstr "Anzahl von Verzeichniseinträgen, rekursiv. Gibt Ganzzahl zurück"
 
 #: include/classes/items/CHelpItems.php:467
 msgid "Count of matched lines in log file monitoring with log rotation support. Returns integer"
@@ -4151,16 +4121,16 @@ msgstr "Anzahl übereinstimmender Zeilen in der Log Datei Überwachung. Gibt Gan
 
 #: include/classes/items/CHelpItems.php:1245
 msgid "Count of values enqueued in the low-level discovery processing queue."
-msgstr ""
+msgstr "Anzahl der Werte, die sich in der Warteschlange für die Verarbeitung von Low-Level-Discovery-Informationen befinden."
 
 #: include/classes/items/CHelpItems.php:1249
 msgid "Count of values enqueued in the preprocessing queue."
-msgstr ""
+msgstr "Anzahl der Werte, die in der Vorverarbeitungswarteschlange stehen."
 
 #: app/views/administration.token.list.php:106
 #: app/views/administration.user.token.list.php:71
 msgid "Create API token"
-msgstr ""
+msgstr "API-Token erstellen"
 
 #: include/views/configuration.action.list.php:57
 msgid "Create action"
@@ -4168,15 +4138,15 @@ msgstr "Neue Aktion"
 
 #: include/classes/helpers/CRoleHelper.php:411
 msgid "Create and edit dashboards"
-msgstr ""
+msgstr "Übersichtsseiten erstellen und bearbeiten"
 
 #: include/classes/helpers/CRoleHelper.php:416
 msgid "Create and edit maintenance"
-msgstr ""
+msgstr "Wartung erstellen und bearbeiten"
 
 #: include/classes/helpers/CRoleHelper.php:412
 msgid "Create and edit maps"
-msgstr ""
+msgstr "Karten erstellen und bearbeiten"
 
 #: app/views/administration.image.list.php:61
 msgid "Create background"
@@ -4189,13 +4159,13 @@ msgstr "Erstelle Korrelation"
 #: app/views/configuration.dashboard.list.php:76
 #: app/views/monitoring.dashboard.list.php:41
 msgid "Create dashboard"
-msgstr "Dashboard erstellen"
+msgstr "Übersichtsseite erstellen"
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr "Erzeuge abhängige Suchlaufregel"
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr "Abhängiges Element erstellen"
 
@@ -4294,11 +4264,11 @@ msgstr "Neuer Datenpunktprototyp"
 
 #: include/views/configuration.item.prototype.list.php:193
 msgid "Create items from selected prototypes as disabled?"
-msgstr ""
+msgstr "Datenpunkte aus ausgewählten Prototypen als deaktiviert erstellen?"
 
 #: include/views/configuration.item.prototype.list.php:190
 msgid "Create items from selected prototypes as enabled?"
-msgstr ""
+msgstr "Artikel aus ausgewählten Prototypen erstellen als aktiviert?"
 
 #: include/views/configuration.maintenance.list.php:30
 msgid "Create maintenance period"
@@ -4312,7 +4282,7 @@ msgstr "Neue Karte"
 msgid "Create media type"
 msgstr "Neuer Medientyp"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "Erstelle neues"
 
@@ -4330,13 +4300,13 @@ msgstr "Neues Skript"
 
 #: app/views/monitoring.service.list.edit.php:135
 msgid "Create service"
-msgstr ""
+msgstr "Dienst erstellen"
 
 #: include/views/configuration.template.list.php:90
 msgid "Create template"
 msgstr "Neue Vorlage"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Neuer Auslöser"
 
@@ -4354,7 +4324,7 @@ msgstr "Neuer Auslöserprototyp"
 
 #: include/views/configuration.trigger.prototype.list.php:199
 msgid "Create triggers from selected prototypes as disabled?"
-msgstr ""
+msgstr "Auslöser von ausgewählten Prototypen als deaktiviert erstellen?"
 
 #: include/views/configuration.trigger.prototype.list.php:196
 msgid "Create triggers from selected prototypes as enabled?"
@@ -4393,7 +4363,7 @@ msgstr "Erzeugt am"
 #: app/views/monitoring.dashboard.list.php:66
 #: app/views/reports.scheduledreport.list.php:57
 msgid "Created by me"
-msgstr ""
+msgstr "Von mir erstellt"
 
 #: app/views/administration.token.list.php:139
 msgid "Created by user"
@@ -4467,11 +4437,11 @@ msgstr "Benutzerdefinierter Multiplikator"
 #: app/views/js/popup.itemtestedit.view.js.php:381 include/forms.inc.php:1221
 #: include/forms.inc.php:1436 include/views/js/item.preprocessing.js.php:64
 msgid "Custom on fail"
-msgstr ""
+msgstr "Benutzerdefiniert bei Ausfall"
 
 #: include/items.inc.php:1862
 msgid "Custom scripts"
-msgstr ""
+msgstr "Benutzerdefinierte Skripte"
 
 #: app/views/administration.trigdisplay.edit.php:155
 msgid "Custom severity names affect all locales and require manual translation!"
@@ -4483,7 +4453,7 @@ msgstr "Benutzerdefinierte Größe"
 
 #: app/partials/scheduledreport.formgrid.html.php:99
 msgid "Cycle"
-msgstr ""
+msgstr "Zyklus"
 
 #: include/locales.inc.php:51
 msgid "Czech (cs_CZ)"
@@ -4501,7 +4471,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "DNS-Name"
@@ -4513,11 +4483,11 @@ msgstr "DNS-Name"
 msgid "Daily"
 msgstr "Täglich"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "Düster"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4525,53 +4495,53 @@ msgstr "Düster"
 #: include/classes/helpers/CMenuHelper.php:34
 #: include/classes/helpers/CRoleHelper.php:307
 msgid "Dashboard"
-msgstr "Dashboard"
+msgstr "Übersichtsseite"
 
 #: include/classes/api/services/CDashboard.php:388
 #: include/classes/api/services/CTemplateDashboard.php:431
 #, c-format
 msgid "Dashboard \"%1$s\" already exists."
-msgstr "Dashboard \"%1$s\" existiert bereits."
+msgstr "Übersichtsseite \"%1$s\" existiert bereits."
 
 #: include/classes/api/services/CDashboardGeneral.php:89
 #, c-format
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
-msgstr ""
+msgstr "Übersichtsseite \"%1$s\" wird in Bericht \"%2$s\" verwendet."
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
-msgstr "Dashboard angelegt"
+msgstr "Übersichtsseite angelegt"
 
 #: app/controllers/CControllerDashboardDelete.php:60
 #: app/controllers/CControllerTemplateDashboardDelete.php:58
 msgid "Dashboard deleted"
 msgid_plural "Dashboards deleted"
-msgstr[0] "Dashboard gelöscht"
-msgstr[1] "Dashboards gelöscht"
+msgstr[0] "Übersichtsseite gelöscht"
+msgstr[1] "Übersichtsseiten gelöscht"
 
 #: app/views/dashboard.page.properties.edit.php:60
 msgid "Dashboard page properties"
-msgstr ""
+msgstr "Eigenschaften der Übersichtsseite"
 
 #: app/views/dashboard.properties.edit.php:88
 msgid "Dashboard properties"
-msgstr "Dashboard Eigenschaften"
+msgstr "Eigenschaften der Übersichtsseite"
 
 #: app/views/popup.dashboard.share.edit.php:151
 msgid "Dashboard sharing"
-msgstr "Dashboard Teilen"
+msgstr "Übersichtsseite Teilen"
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
-msgstr "Dashboard aktualisiert"
+msgstr "Übersichtsseite aktualisiert"
 
 #: include/classes/api/services/CReport.php:277
 #, c-format
 msgid "Dashboard with ID \"%1$s\" is not available."
-msgstr ""
+msgstr "Die Übersichtsseite mit der ID \"%1$s\" ist nicht verfügbar."
 
 #: app/controllers/CControllerDashboardList.php:120
 #: app/controllers/CControllerHostDashboardView.php:122
@@ -4588,15 +4558,15 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
-msgstr "Dashboards"
+msgstr "Übersichtsseiten"
 
 # Vielleicht reicht "gestrichelt"
 #: include/graphs.inc.php:63 include/views/js/monitoring.sysmaps.js.php:783
 #: include/views/js/monitoring.sysmaps.js.php:873
 msgid "Dashed line"
-msgstr "Linie (gestrichelt)"
+msgstr "Gestrichelte Linie"
 
 #: include/classes/graphdraw/CLineGraphDraw.php:2214
 #: include/classes/graphdraw/CPieGraphDraw.php:772
@@ -4617,7 +4587,7 @@ msgstr "Datenübersicht"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr "Datensatz"
 
@@ -4633,38 +4603,38 @@ msgstr "Daten Speicherdauer"
 #: include/classes/setup/CSetupWizard.php:534
 #: include/classes/setup/CSetupWizard.php:740
 msgid "Database TLS CA file"
-msgstr ""
+msgstr "Datenbank TLS CA-Datei"
 
 #: include/classes/setup/CFrontendSetup.php:668
 #: include/classes/setup/CSetupWizard.php:400
 #: include/classes/setup/CSetupWizard.php:540
 #: include/classes/setup/CSetupWizard.php:748
 msgid "Database TLS certificate file"
-msgstr ""
+msgstr "Datenbank-TLS-Zertifikatsdatei"
 
 #: include/classes/setup/CFrontendSetup.php:672
 msgid "Database TLS certificate files must be read-only"
-msgstr ""
+msgstr "Datenbank-TLS-Zertifikatsdateien müssen schreibgeschützt sein"
 
 #: include/classes/setup/CSetupWizard.php:412
 #: include/classes/setup/CSetupWizard.php:548
 msgid "Database TLS cipher list"
-msgstr ""
+msgstr "Datenbank TLS-Chiffrierliste"
 
 #: include/classes/setup/CSetupWizard.php:370
 #: include/classes/setup/CSetupWizard.php:530
 msgid "Database TLS encryption"
-msgstr ""
+msgstr "TLS-Verschlüsselung der Datenbank"
 
 #: include/classes/setup/CSetupWizard.php:394
 #: include/classes/setup/CSetupWizard.php:537
 #: include/classes/setup/CSetupWizard.php:744
 msgid "Database TLS key file"
-msgstr ""
+msgstr "Datenbank-TLS-Schlüsseldatei"
 
 #: include/blocks.inc.php:609
 msgid "Database history tables upgraded"
-msgstr ""
+msgstr "Datenbankverlaufstabellen aktualisiert"
 
 #: include/classes/setup/CSetupWizard.php:302
 msgid "Database host"
@@ -4673,7 +4643,7 @@ msgstr "Datenbank-Host"
 #: include/classes/setup/CSetupWizard.php:406
 #: include/classes/setup/CSetupWizard.php:543
 msgid "Database host verification"
-msgstr ""
+msgstr "Überprüfung des Datenbank-Hosts"
 
 #: include/items.inc.php:94
 msgid "Database monitor"
@@ -4734,7 +4704,7 @@ msgstr "HW-Anschaffungsdatum"
 
 #: app/views/popup.triggerexpr.php:110
 msgid "Date and time functions"
-msgstr ""
+msgstr "Funktionen für Datum und Uhrzeit"
 
 #: report4.php:175
 msgid "Day"
@@ -4759,7 +4729,7 @@ msgstr "Wochentag"
 msgid "Days"
 msgstr "Tage"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Debug"
 
@@ -4773,45 +4743,45 @@ msgstr "Debug-Modus"
 msgid "Dec"
 msgstr "Dez"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Dezember"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr "Dezimalstellen"
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
-msgstr ""
+msgstr "Verringern um"
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Standard"
 
 #: app/views/dashboard.page.properties.edit.php:48
 #, c-format
 msgid "Default (%1$s)"
-msgstr ""
+msgstr "Voreinstellung (%1$s)"
 
 #: app/views/administration.userrole.edit.php:122
 msgid "Default access to new UI elements"
-msgstr ""
+msgstr "Standardzugriff auf neue UI-Elemente"
 
 #: app/views/administration.userrole.edit.php:342
 msgid "Default access to new actions"
-msgstr ""
+msgstr "Standardzugriff auf neue Aktionen"
 
 #: app/views/administration.userrole.edit.php:261
 msgid "Default access to new modules"
-msgstr ""
+msgstr "Standardzugriff auf neue Module"
 
 #: app/views/administration.authentication.edit.php:31
 msgid "Default authentication"
@@ -4824,11 +4794,11 @@ msgstr "Standard Host-Inventar-Modus"
 #: app/views/administration.gui.edit.php:71
 #: include/classes/setup/CSetupWizard.php:227
 msgid "Default language"
-msgstr ""
+msgstr "Standardsprache"
 
 #: app/views/administration.authentication.edit.php:116
 msgid "Default login form"
-msgstr ""
+msgstr "Standard-Anmeldeformular"
 
 #: app/partials/popup.operations.php:126
 msgid "Default media type"
@@ -4840,7 +4810,7 @@ msgstr "Standarddauer eines Operationsschritts"
 
 #: app/views/dashboard.properties.edit.php:79
 msgid "Default page display period"
-msgstr ""
+msgstr "Standardanzeigezeitraum der Seite"
 
 #: app/views/administration.gui.edit.php:83
 #: include/classes/setup/CSetupWizard.php:476
@@ -4850,7 +4820,7 @@ msgstr "Standard-Thema"
 #: app/views/administration.gui.edit.php:76
 #: include/classes/setup/CSetupWizard.php:469
 msgid "Default time zone"
-msgstr ""
+msgstr "Standardzeitzone"
 
 #: app/views/popup.lldoperation.php:105
 #: app/views/popup.massupdate.item.php:218
@@ -4885,7 +4855,7 @@ msgstr "Verspätung"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4909,14 +4879,14 @@ msgstr "Verspätung"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Löschen"
 
 #: app/views/js/popup.import.js.php:47
 msgid "Delete all elements that are not present in the import file?"
-msgstr ""
+msgstr "Alle Elemente löschen, die nicht in der Importdatei enthalten sind?"
 
 #: include/views/configuration.template.edit.php:242
 #: include/views/configuration.template.list.php:284
@@ -4935,13 +4905,13 @@ msgstr "Vorlage löschen und leeren? (Achtung: Alle verbundenen Hosts werden gel
 msgid "Delete current action?"
 msgstr "Aktuelle Aktion löschen?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "Aktuelle Korrelation löschen?"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
-msgstr "Dashboard löschen?"
+msgstr "Übersichtsseite löschen?"
 
 #: app/views/configuration.discovery.edit.php:160
 #: include/views/configuration.host.discovery.edit.php:904
@@ -4983,7 +4953,7 @@ msgstr "Datenpunkt Prototyp löschen?"
 msgid "Delete item?"
 msgstr "Datenpunkt löschen?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Verknüpfung zwischen ausgewählten Elementen löschen?"
 
@@ -5014,7 +4984,7 @@ msgstr "Skript löschen?"
 #: app/views/administration.token.edit.php:116
 #: app/views/administration.user.token.edit.php:97
 msgid "Delete selected API token?"
-msgstr ""
+msgstr "Ausgewähltes API-Token löschen?"
 
 #: app/views/administration.token.list.php:202
 #: app/views/administration.user.token.list.php:153
@@ -5032,14 +5002,14 @@ msgstr "Ausgewählte Korrelationen löschen?"
 #: app/views/configuration.dashboard.list.php:68
 #: app/views/monitoring.dashboard.list.php:124
 msgid "Delete selected dashboards?"
-msgstr "Ausgewählte Dashboards löschen?"
+msgstr "Ausgewählte Übersichtsseiten löschen?"
 
 #: app/views/configuration.discovery.list.php:122
 #: include/views/configuration.host.discovery.list.php:333
 msgid "Delete selected discovery rules?"
 msgstr "Ausgewählte Suchläufe löschen?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Ausgewählte Elemente löschen?"
 
@@ -5118,19 +5088,19 @@ msgstr "Ausgewählte reguläre Audrücke löschen?"
 
 #: app/views/administration.userrole.edit.php:367
 msgid "Delete selected role?"
-msgstr ""
+msgstr "Ausgewählte Rolle löschen?"
 
 #: app/views/administration.userrole.list.php:127
 msgid "Delete selected roles?"
-msgstr ""
+msgstr "Ausgewählte Rollen löschen?"
 
 #: app/partials/scheduledreport.formgrid.html.php:238
 msgid "Delete selected scheduled report?"
-msgstr ""
+msgstr "Ausgewählten geplanten Bericht löschen?"
 
 #: app/views/reports.scheduledreport.list.php:97
 msgid "Delete selected scheduled reports?"
-msgstr ""
+msgstr "Ausgewählte geplante Berichte löschen?"
 
 #: app/views/administration.script.list.php:198
 msgid "Delete selected scripts?"
@@ -5138,13 +5108,13 @@ msgstr "Ausgewählte Skripte löschen?"
 
 #: app/views/js/monitoring.service.list.js.php:90
 msgid "Delete selected service?"
-msgstr ""
+msgstr "Ausgewählten Dienst löschen?"
 
 #: app/partials/monitoring.service.list.edit.php:145
 msgid "Delete selected services?"
-msgstr ""
+msgstr "Ausgewählte Dienste löschen?"
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "Ausgewählten Formen löschen?"
 
@@ -5188,9 +5158,9 @@ msgstr "Auslöser löschen?"
 msgid "Delete web scenario?"
 msgstr "Web-Szenario löschen?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
-msgstr ""
+msgstr "Gelöscht"
 
 #: include/classes/api/services/CHost.php:1494
 #, c-format
@@ -5213,17 +5183,17 @@ msgstr "Trennzeichen"
 
 #: app/views/administration.user.edit.php:625
 msgid "Denied methods"
-msgstr ""
+msgstr "Abgelehnte Methoden"
 
 #: app/partials/administration.usergroup.grouprights.html.php:71
 #: app/views/administration.usergroup.edit.php:134 include/perm.inc.php:33
 #: include/users.inc.php:423
 msgid "Deny"
-msgstr "Verweigern"
+msgstr "Ablehnung"
 
 #: app/views/administration.userrole.edit.php:291
 msgid "Deny list"
-msgstr ""
+msgstr "Ablehnungsliste"
 
 #: app/views/popup.massupdate.trigger.php:151
 #: include/views/configuration.trigger.prototype.edit.php:606
@@ -5233,7 +5203,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Abhängigkeiten"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "ABHÄNGIGKEIT"
 
@@ -5241,7 +5211,7 @@ msgstr "ABHÄNGIGKEIT"
 msgid "Dependent item"
 msgstr "Abhängiger Datenpunkt"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5251,7 +5221,7 @@ msgstr "hängt ab von"
 msgid "Deployment status"
 msgstr "Verteilungsstatus"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5284,7 +5254,7 @@ msgid "Description"
 msgstr "Beschreibung"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5314,7 +5284,7 @@ msgstr "Eindeutigkeitsmerkmal des Hosts"
 
 #: include/httptest.inc.php:31
 msgid "Digest"
-msgstr ""
+msgstr "Auszug"
 
 #: app/views/administration.module.edit.php:42
 msgid "Directory"
@@ -5411,7 +5381,7 @@ msgstr "Ausgewählte Module deaktivieren?"
 
 #: app/views/reports.scheduledreport.list.php:92
 msgid "Disable selected scheduled reports?"
-msgstr ""
+msgstr "Ausgewählte geplante Berichte deaktivieren?"
 
 #: include/views/configuration.triggers.list.php:342
 msgid "Disable selected triggers?"
@@ -5450,10 +5420,10 @@ msgstr "Ausgewählte Web Szenarios löschen?"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5537,7 +5507,7 @@ msgid "Discovery by proxy"
 msgstr "Suchlauf durch Proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Suchlaufprüfung"
 
@@ -5549,40 +5519,40 @@ msgstr "Suchlaufprüfungen"
 msgid "Discovery list"
 msgstr "Suchlaufliste"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Suchlaufobjekt"
 
 #: include/classes/items/CHelpItems.php:829
 msgid "Discovery of VMware clusters, <url> - VMware service URL. Returns JSON"
-msgstr ""
+msgstr "Erkennung von VMware-Clustern, <url> - VMware-Service-URL. Gibt JSON zurück"
 
 #: include/classes/items/CHelpItems.php:841
 msgid "Discovery of VMware datastores, <url> - VMware service URL. Returns JSON"
-msgstr ""
+msgstr "Erkennung von VMware-Datenspeichern, <url> - VMware-Service-URL. Gibt JSON zurück"
 
 #: include/classes/items/CHelpItems.php:893
 msgid "Discovery of VMware hypervisor datastores, <url> - VMware service URL, <uuid> - VMware hypervisor host name. Returns JSON"
-msgstr ""
+msgstr "Erkennung von VMware-Hypervisor-Datenspeichern, <url> - VMware-Service-URL, <uuid> - VMware-Hypervisor-Hostname. Gibt JSON zurück"
 
 #: include/classes/items/CHelpItems.php:917
 msgid "Discovery of VMware hypervisors, <url> - VMware service URL. Returns JSON"
-msgstr ""
+msgstr "Erkennung von VMware-Hypervisoren, <url> - VMware-Dienst-URL. Gibt JSON zurück"
 
 #: include/classes/items/CHelpItems.php:1153
 msgid "Discovery of VMware virtual machine disk devices, <url> - VMware service URL, <uuid> - VMware virtual machine host name. Returns JSON"
-msgstr ""
+msgstr "Erkennung von Festplattengeräten virtueller VMware-Maschinen, <url> - VMware-Service-URL, <uuid> - Hostname der virtuellen VMware-Maschine. Gibt JSON zurück"
 
 #: include/classes/items/CHelpItems.php:1165
 msgid "Discovery of VMware virtual machine file systems, <url> - VMware service URL, <uuid> - VMware virtual machine host name. Returns JSON"
-msgstr ""
+msgstr "Erkennung von Dateisystemen virtueller VMware-Maschinen, <url> - VMware-Service-URL, <uuid> - Hostname der virtuellen VMware-Maschine. Gibt JSON zurück"
 
 #: include/classes/items/CHelpItems.php:1041
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
-msgstr ""
+msgstr "Erkennung von virtuellen VMware-Maschinen, <url> - VMware-Service-URL. Gibt JSON zurück"
 
 # Überschrift der Suchlauf-Liste bei "network discovery"
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5590,12 +5560,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Host-Suchläufe"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Suchlaufregel \"%1$s\" existiert bereits auf \"%2$s\", vererbt durch eine andere Vorlage."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "Suchlaufregel\"%1$s\" existiert bereits auf \"%2$s\"."
@@ -5608,7 +5578,7 @@ msgstr "Suchlaufregel\"%1$s\" existiert bereits auf \"%2$s\"."
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "Suchlaufregel \"%1$s\" ist bereits vorhanden."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr "Suchlaufregel \"%1$s\" kann ohne Master nicht kopiert werden."
@@ -5624,11 +5594,10 @@ msgid "Discovery rule created"
 msgstr "Suchlaufregel erstellt"
 
 #: app/controllers/CControllerDiscoveryDelete.php:66 host_discovery.php:412
-#, fuzzy
 msgid "Discovery rule deleted"
 msgid_plural "Discovery rules deleted"
 msgstr[0] "Suchlaufregel gelöscht"
-msgstr[1] "Suchlaufregel gelöscht"
+msgstr[1] "Suchlaufregeln gelöscht"
 
 #: app/controllers/CControllerDiscoveryDisable.php:71 host_discovery.php:747
 msgid "Discovery rule disabled"
@@ -5650,7 +5619,7 @@ msgstr "Suchlaufregel aktualisiert"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5661,7 +5630,7 @@ msgstr "Suchläufe"
 msgid "Discovery rules deleted"
 msgstr "Suchlaufregel gelöscht"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Suchlaufstatus"
@@ -5674,7 +5643,7 @@ msgstr "Festplatten-Lesestatistik. Gibt Ganzzahl für Anzahl der Sektoren und Op
 #: include/classes/items/CHelpItems.php:381
 #: include/classes/items/CHelpItems.php:763
 msgid "Disk space in bytes or in percentage from total. Returns integer for bytes; float for percentage"
-msgstr "Festplattenplatz in Bytes oder %, Rückgabe als Integer für Bytes oder Fließkomma für %."
+msgstr "Festplattenplatz in Bytes oder %; Rückgabe als Integer für Bytes oder Fließkomma für %"
 
 #: include/classes/items/CHelpItems.php:313
 #: include/classes/items/CHelpItems.php:695
@@ -5698,10 +5667,11 @@ msgid "Display stacked graph"
 msgstr "Gestapeltes Diagramm angezeigt"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Zeige %1$s von %2$s gefundenen"
@@ -5711,7 +5681,7 @@ msgstr "Zeige %1$s von %2$s gefundenen"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "Anzeigen %1$s bis %2$s von %3$s gefunden"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr "Anzeigeoptionen"
 
@@ -5733,7 +5703,7 @@ msgstr "Keine Historie aufbewahren"
 msgid "Do not keep trends"
 msgstr "Keine Trends aufbewahren"
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Wollen Sie den bedingten Ausdruck ersetzen?"
 
@@ -5789,7 +5759,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Nicht erreichbar"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr "Abbild herunterladen"
 
@@ -5797,7 +5767,7 @@ msgstr "Abbild herunterladen"
 msgid "Download the configuration file"
 msgstr "Konfigurationsdatei herunterladen"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5816,18 +5786,6 @@ msgstr "Anzeige"
 msgid "Draw style"
 msgstr "Anzeigestil"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5838,12 +5796,7 @@ msgstr "Doppelter \"name\" Wert \"%1$s\" für Karte."
 #: include/classes/api/services/CMap.php:1285
 #, c-format
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
+msgstr "Doppelte \"usrgrpid\" \"%1$s\" in Benutzergruppen für Karte \"%2$s\"."
 
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
@@ -5859,13 +5812,13 @@ msgstr "Doppelte Abhängigkeiten im Auslöser-Prototyp \"%1$s\"."
 #: include/classes/api/services/CHost.php:2229
 #, c-format
 msgid "Duplicate host. Host with the same host name \"%1$s\" already exists in data."
-msgstr ""
+msgstr "Duplizierter Host. Host mit demselben Hostnamen \"%1$s\" existiert bereits in den Daten."
 
 #: include/classes/api/services/CHost.php:1939
 #: include/classes/api/services/CHost.php:2249
 #, c-format
 msgid "Duplicate host. Host with the same visible name \"%1$s\" already exists in data."
-msgstr ""
+msgstr "Duplizierter Host. Host mit demselben sichtbaren Namen \"%1$s\" existiert bereits in den Daten."
 
 #: include/classes/api/services/CMap.php:743
 #: include/classes/api/services/CMap.php:1211
@@ -5896,7 +5849,7 @@ msgstr "Dynamisches Element"
 msgid "Dynamic items"
 msgstr "Dynamische Datenpunkte"
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Jede URL sollte einzigartig sein. Bitte überprüfen Sie, dass nur eine URL existiert namens"
 
@@ -5905,11 +5858,11 @@ msgid "Each item"
 msgstr "Jeder Datenpunkt"
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5923,14 +5876,14 @@ msgstr "Jeder Datenpunkt"
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #: app/views/monitoring.dashboard.view.php:108
 msgid "Edit dashboard"
-msgstr "Dashboard anpassen"
+msgstr "Übersichtsseite anpassen"
 
 #: app/views/monitoring.map.view.php:58
 msgid "Edit map"
@@ -5940,11 +5893,11 @@ msgstr "Karte anpassen"
 msgid "Edit operation"
 msgstr "Operation bearbeiten"
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr "Baum-Element bearbeiten"
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Bearbeite Auslöser"
 
@@ -5967,7 +5920,7 @@ msgstr ""
 #: include/classes/helpers/CElasticsearchHelper.php:195
 #, c-format
 msgid "Elasticsearch error: %1$s."
-msgstr ""
+msgstr "Elasticsearch-Fehler: %1$s."
 
 #: include/views/monitoring.sysmap.edit.php:278
 msgid "Element"
@@ -6005,23 +5958,19 @@ msgstr "SSL Schlüsseldatei leer für Web Szenario \"%1$s\"."
 
 #: include/classes/validators/CColorValidator.php:33
 msgid "Empty color."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "Leere Korrelations ID."
+msgstr "Leere Farbe."
 
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
-msgstr ""
+msgstr "Leere Filterbedingungsformel-ID für Aktion \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Leere Filterbedingungsformel-ID für Suchlaufregel \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "Leeres Makro Filterbedingung für Suchlaufregel \"%1$s\"."
@@ -6029,33 +5978,27 @@ msgstr "Leeres Makro Filterbedingung für Suchlaufregel \"%1$s\"."
 #: include/classes/api/services/CAction.php:2647
 #, c-format
 msgid "Empty filter condition operator for action \"%1$s\"."
-msgstr ""
+msgstr "Leerer Filterbedingungsoperator für Aktion \"%1$s\"."
 
 #: include/classes/api/services/CAction.php:2631
 #, c-format
 msgid "Empty filter condition type for action \"%1$s\"."
-msgstr ""
+msgstr "Leere Filterbedingungsart für Aktion \"%1$s\"."
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6065,14 +6008,6 @@ msgstr "Leerer Eingabe-Parameter."
 msgid "Empty map ID."
 msgstr "Leere Karten-ID."
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "Leere Medientyp-ID."
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Parameter leer"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6104,7 +6039,7 @@ msgstr "SAML Auth einschalten"
 
 #: app/views/administration.audit.settings.edit.php:43
 msgid "Enable audit logging"
-msgstr ""
+msgstr "Audit-Protokollierung einschalten"
 
 #: app/views/administration.housekeeping.edit.php:160
 msgid "Enable compression"
@@ -6151,7 +6086,7 @@ msgstr "Internen Bereinigungsdienst aktivieren"
 #: app/views/administration.token.list.php:200
 #: app/views/administration.user.token.list.php:151
 msgid "Enable selected API tokens?"
-msgstr ""
+msgstr "Ausgewählte API-Tokens aktivieren?"
 
 #: include/views/configuration.action.list.php:163
 msgid "Enable selected actions?"
@@ -6189,7 +6124,7 @@ msgstr "Ausgewählte Module aktivieren?"
 
 #: app/views/reports.scheduledreport.list.php:87
 msgid "Enable selected scheduled reports?"
-msgstr ""
+msgstr "Ausgewählte geplante Berichte aktivieren?"
 
 #: include/views/configuration.triggers.list.php:341
 msgid "Enable selected triggers?"
@@ -6238,7 +6173,7 @@ msgstr "Trapper einschalten"
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6249,7 +6184,7 @@ msgstr "Trapper einschalten"
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6292,7 +6227,7 @@ msgid "English (en_US)"
 msgstr "Englisch (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6308,7 +6243,7 @@ msgstr "Eintrag mit der UUID \"%1$s\" existiert bereits."
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6327,12 +6262,12 @@ msgstr "Ist gleich"
 msgid "Error"
 msgstr "Fehler"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Fehler bei der Suchanfrage für Tabelle \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr "Fehlermeldung"
 
@@ -6359,7 +6294,7 @@ msgstr "Ereignis-ID"
 msgid "Event acknowledged"
 msgstr "Ereignis bestätigt"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6367,7 +6302,7 @@ msgid "Event correlation"
 msgstr "Ereigniskorrelation"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "Regeln für Ereigniskorrelation"
@@ -6402,11 +6337,11 @@ msgstr "Ereignisprotokoll-Überwachung. Rückgabewert Log"
 msgid "Event name"
 msgstr "Ereignisname"
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "Ereignis Marker"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Ereignistyp"
 
@@ -6422,11 +6357,11 @@ msgstr "Ereignisse und Alarmierungen"
 
 #: app/views/popup.maintenance.period.php:82
 msgid "Every day(s)"
-msgstr "Jeden Tag"
+msgstr "Jeden Tag(e)"
 
 #: app/views/popup.maintenance.period.php:89
 msgid "Every week(s)"
-msgstr "Jede Woche"
+msgstr "Jede Woche(n)"
 
 #: app/views/administration.miscconfig.edit.php:37
 msgid "Example: https://localhost/zabbix/ui/"
@@ -6451,15 +6386,10 @@ msgstr "Ausschließen"
 msgid "Exclude host groups"
 msgstr "Host-Gruppen ausschließen"
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Ausführen"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "Fehler beim Ausführen von SQL [%1$s] in [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6467,7 +6397,7 @@ msgstr ""
 #: include/classes/items/CHelpItems.php:405
 #: include/classes/items/CHelpItems.php:787
 msgid "Execute WMI query and return the first selected object. Returns integer, float, string or text (depending on the request)"
-msgstr ""
+msgstr "Führt eine WMI-Abfrage aus und gibt das erste ausgewählte Objekt zurück. Gibt Integer, Float, String oder Text zurück (je nach Anfrage)"
 
 #: include/views/configuration.host.discovery.edit.php:895
 #: include/views/configuration.host.discovery.list.php:329
@@ -6497,7 +6427,7 @@ msgstr "Ausgeführt"
 msgid "Executed script"
 msgstr "Ausgeführtes Skript"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Ausführbestätigung"
 
@@ -6513,8 +6443,8 @@ msgid "Exists"
 msgstr "Existiert"
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "Erweitern"
 
@@ -6534,7 +6464,7 @@ msgstr "Bei einzelnem Problem Details anzeigen"
 #: app/partials/scheduledreport.table.html.php:92
 #: app/views/reports.scheduledreport.list.php:65
 msgid "Expired"
-msgstr ""
+msgstr "Abgelaufen"
 
 #: include/views/configuration.maintenance.list.php:68
 #: include/views/configuration.maintenance.list.php:98
@@ -6545,7 +6475,7 @@ msgstr "Abgelaufen"
 #: app/partials/scheduledreport.table.html.php:95
 #, c-format
 msgid "Expired on %1$s."
-msgstr "Abgelaufen am %1$s"
+msgstr "Abgelaufen am %1$s."
 
 #: app/views/administration.token.edit.php:82
 #: app/views/administration.token.list.php:133
@@ -6623,7 +6553,7 @@ msgstr "Ausdruckstyp"
 
 #: app/views/popup.testtriggerexpr.php:29
 msgid "Expression variable elements"
-msgstr ""
+msgstr "Ausdruck variable Elemente"
 
 #: app/views/administration.regex.edit.php:112
 #: app/views/administration.regex.edit.php:139
@@ -6635,7 +6565,7 @@ msgstr "Ausdrücke"
 msgid "External check"
 msgstr "Externe Überprüfung"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "Fr"
@@ -6660,50 +6590,50 @@ msgstr "Gescheitert"
 
 #: app/controllers/CControllerAuditLogList.php:192
 msgid "Failed login"
-msgstr ""
+msgstr "Anmeldung fehlgeschlagen"
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
-msgstr "Fehler bei Dashboard-Erstellung"
+msgstr "Fehler bei Übersichtsseiten-Erstellung"
 
 #: include/views/js/common.item.edit.js.php:330
 #: include/views/js/configuration.httpconf.edit.js.php:102
 msgid "Failed to parse URL."
 msgstr "Fehler beim Parsen der URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
-msgstr ""
+msgstr "Die Übersichtsseite konnte nicht eingefügt werden."
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
-msgstr ""
+msgstr "Einfügen des Widgets fehlgeschlagen."
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
-msgstr "Fehler beim Aktualisieren des Dashboards"
+msgstr "Fehler beim Aktualisieren der Übersichtsseite"
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
-msgstr ""
+msgstr "Die Eigenschaften der Übersichtsseite konnten nicht aktualisiert werden."
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
-msgstr ""
+msgstr "Die Eigenschaften der Übersichtsseite konnten nicht aktualisiert werden."
 
 #: include/classes/api/services/CTemplate.php:625
 msgid "Failed to update template."
 msgstr "Fehler beim Aktualisieren der Vorlage."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
-msgstr ""
+msgstr "Die Widget-Eigenschaften konnten nicht aktualisiert werden."
 
 #  Kommentar: Windows-Eventlog-Meldung: entspricht bei Microsoft EVENTLOG_AUDIT_FAILURE
 #: include/items.inc.php:37
@@ -6716,17 +6646,17 @@ msgstr "Schwerwiegender Fehler, bitte melden Sie dies dem Zabbix-Team"
 
 #: include/classes/widgets/CWidgetConfig.php:49
 msgid "Favorite graphs"
-msgstr ""
+msgstr "Bevorzugte Diagramme"
 
 #: include/classes/widgets/CWidgetConfig.php:50
 msgid "Favorite maps"
-msgstr ""
+msgstr "Bevorzugte Karten"
 
 #: include/func.inc.php:221
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Februar"
 
@@ -6748,10 +6678,9 @@ msgstr "Feld \"%1$s\" darf nicht NULL sein."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6762,13 +6691,6 @@ msgstr "\"%1$s\" ist ein Pflichtfeld."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "Im Feld \"%1$s\" fehlt ein Wert für die Karte \"%2$s\"."
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "Im Feld \"%1$s\" fehlt ein Wert für den Medientyp \"%2$s\"."
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6787,11 +6709,6 @@ msgstr "Feld \"%1$s\" ist keine Ganzzahl."
 msgid "Field \"%1$s\" is not string."
 msgstr "Feld \"%1$s\" ist keine Zeichenfolge."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "Das Feld \"%1$s\" ist für den Medientyp \"%2$s\" erforderlich."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6804,11 +6721,7 @@ msgstr "\"host\" ist ein Pflichtfeld."
 #: include/classes/items/CHelpItems.php:325
 #: include/classes/items/CHelpItems.php:707
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
-msgstr ""
-
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Dateiformat wird nicht unterstützt."
+msgstr "Dateiprüfsumme, berechnet mit dem UNIX-Algorithmus cksum. Liefert Ganzzahl für crc32 (Standard) und String für md5, sha256"
 
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
@@ -6822,12 +6735,12 @@ msgstr "Datei ist zu groß. Maximalgröße beträgt %1$s Byte."
 #: include/classes/items/CHelpItems.php:345
 #: include/classes/items/CHelpItems.php:727
 msgid "File owner information. Returns string"
-msgstr ""
+msgstr "Informationen zum Dateieigentümer. Rückgabe String"
 
 #: include/classes/items/CHelpItems.php:361
 #: include/classes/items/CHelpItems.php:743
 msgid "File size in bytes (default) or in newlines. Returns integer"
-msgstr ""
+msgstr "Dateigröße in Bytes (Standard) oder in Zeilenumbrüchen. Rückgabe Ganzzahl"
 
 #: include/classes/items/CHelpItems.php:365
 #: include/classes/items/CHelpItems.php:747
@@ -6874,7 +6787,8 @@ msgstr "Gefüllter Bereich"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6899,9 +6813,9 @@ msgstr "Filtern"
 msgid "Filter properties"
 msgstr "Filtereigenschaften"
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
-msgstr ""
+msgstr "Filterergebnisse"
 
 #: app/views/popup.lldoverride.php:183
 #: include/views/configuration.host.discovery.edit.php:765
@@ -6922,7 +6836,7 @@ msgstr "Suche nach einer Zeichenfolge in einer Datei. Gibt die Zeile zurück, di
 #: include/classes/items/CHelpItems.php:401
 #: include/classes/items/CHelpItems.php:783
 msgid "Find string on a web page. Returns the matched string, or as specified by the optional output parameter"
-msgstr ""
+msgstr "Sucht eine Zeichenkette auf einer Webseite. Gibt die übereinstimmende Zeichenkette zurück, oder wie durch den optionalen Ausgabeparameter angegeben"
 
 #: include/classes/setup/CSetupWizard.php:145
 msgid "Finish"
@@ -6951,9 +6865,9 @@ msgstr "An Karte anpassen"
 msgid "Fixed"
 msgstr "Fest"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
-msgstr ""
+msgstr "Behobener Status"
 
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
@@ -6981,7 +6895,7 @@ msgstr "Schriftart"
 
 #: include/views/js/monitoring.sysmaps.js.php:541
 msgid "Font color"
-msgstr ""
+msgstr "Schriftfarbe"
 
 #: include/views/js/monitoring.sysmaps.js.php:377
 #: include/views/js/monitoring.sysmaps.js.php:535
@@ -7002,15 +6916,15 @@ msgstr "Formel"
 msgid "Formula missing for action \"%1$s\"."
 msgstr "Formel für Aktion \"%1$s\" fehlt."
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
-msgstr ""
+msgstr "Formel fehlt für Suchregel \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
-msgstr ""
+msgstr "Formel für Überschreibung \"%1$s\" fehlt."
 
 #: include/locales.inc.php:54
 msgid "French (fr_FR)"
@@ -7020,7 +6934,7 @@ msgstr "Französisch (fr_FR)"
 msgid "Fri"
 msgstr "Fr"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Freitag"
 
@@ -7036,7 +6950,7 @@ msgstr "Von"
 
 #: app/views/administration.miscconfig.edit.php:34
 msgid "Frontend URL"
-msgstr ""
+msgstr "Frontend-URL"
 
 #: app/views/administration.usergroup.edit.php:79
 #: app/views/administration.usergroup.edit.php:87
@@ -7112,7 +7026,7 @@ msgstr "Deutsch (de_DE)"
 #: include/classes/items/CHelpItems.php:393
 #: include/classes/items/CHelpItems.php:775
 msgid "Get content of web page. Returns web page source as text"
-msgstr "Hole den Inhalt der Webseite. Gibt den Quellcode als Text zurück."
+msgstr "Hole den Inhalt der Webseite. Gibt den Quellcode als Text zurück"
 
 #: app/views/popup.itemtestedit.view.php:252
 msgid "Get value"
@@ -7132,10 +7046,10 @@ msgstr "Hole Wert vom Host"
 msgid "Given expression is not a macro"
 msgstr "Übergebene Expression ist kein Makro"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
-msgstr ""
+msgstr "Der globale reguläre Ausdruck \"%1$s\" existiert nicht."
 
 #: app/partials/hostmacros.inherited.list.html.php:56
 msgid "Global value"
@@ -7146,7 +7060,7 @@ msgstr "Globaler Wert"
 msgid "Go back to %1$s"
 msgstr "Zurück zu %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Gehe zu"
 
@@ -7184,15 +7098,15 @@ msgstr "Gehe zu Seite %1$s, aktuelle Seite"
 msgid "Go to previous page, %1$s"
 msgstr "Gehe zur vorangehenden Seite, %1$s"
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
 #: include/graphs.inc.php:65
 msgid "Gradient line"
-msgstr "Linie (Gradient)"
+msgstr "Gradientenlinie"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7220,7 +7134,7 @@ msgstr "Diagramm \"%1$s\" existiert schon auf \"%2$s\" (Unterschiedliche Element
 #: include/classes/api/services/CGraphGeneral.php:1135
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" as a graph created from graph prototype."
-msgstr ""
+msgstr "Diagramm \"%1$s\" existiert bereits auf \"%2$s\" als ein Diagramm, der aus dem Diagramm-Prototyp erstellt wurde."
 
 #: include/classes/api/services/CGraphGeneral.php:1038
 #: include/classes/api/services/CGraphGeneral.php:1246
@@ -7232,7 +7146,7 @@ msgstr "Diagramm \"%1$s\" existiert bereits auf \"%2$s\"."
 #: include/classes/api/services/CGraph.php:36
 #, c-format
 msgid "Graph \"%1$s\" with templated items cannot contain items from other hosts."
-msgstr "Diagramm \"%1$s\" mit vorlagenbasierten Elementen darf keine Elemente anderer Hosts enthalten,"
+msgstr "Diagramm \"%1$s\" mit vorlagenbasierten Elementen darf keine Elemente anderer Hosts enthalten."
 
 #: include/classes/widgets/CWidgetConfig.php:51
 msgid "Graph (classic)"
@@ -7252,7 +7166,7 @@ msgstr[1] "Diagramme kopiert"
 msgid "Graph deleted"
 msgstr "Diagramm gelöscht"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7275,7 +7189,7 @@ msgstr "Diagramm-Prototyp \"%1$s\" benötigt mindestens einen Datenpunkt-Prototy
 #: include/classes/api/services/CGraphPrototype.php:36
 #, c-format
 msgid "Graph prototype \"%1$s\" with templated items cannot contain items from other hosts."
-msgstr "Diagrammprototyp \"%1$s\" mit vorlagenbasierten Elementen darf keine Elemente anderer Hosts enthalten,"
+msgstr "Diagrammprototyp \"%1$s\" mit vorlagenbasierten Elementen darf keine Elemente anderer Hosts enthalten."
 
 #: graphs.php:230
 msgid "Graph prototype added"
@@ -7283,14 +7197,14 @@ msgstr "Diagramm-Prototyp hinzugefügt"
 
 #: graphs.php:275
 msgid "Graph prototype deleted"
-msgstr "Diagramm-Prototyp \"%s\" gelöscht"
+msgstr "Diagramm-Prototyp gelöscht"
 
 #: graphs.php:224
 msgid "Graph prototype updated"
 msgstr "Diagramm-Prototyp aktualisiert"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr "Diagram-Prototyp mit der ID \"%1$s\" ist nicht verfügbar."
@@ -7324,8 +7238,8 @@ msgstr "Diagrammtyp"
 msgid "Graph updated"
 msgstr "Diagramm aktualisiert"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr "Diagramm mit der ID \"%1$s\" ist nicht verfügbar."
@@ -7333,7 +7247,7 @@ msgstr "Diagramm mit der ID \"%1$s\" ist nicht verfügbar."
 #: include/classes/api/services/CGraphGeneral.php:859
 #, c-format
 msgid "Graph with name \"%1$s\" already exists in graphs or graph prototypes."
-msgstr "Diagramm namens \"%1$s\" existiert bereits (ggf. als Diagrammprototyp)."
+msgstr "Diagramm namens \"%1$s\" existiert bereits als Diagramm oder als Diagrammprototyp."
 
 #: app/controllers/CControllerPopupGeneric.php:262
 #: app/controllers/CControllerPopupImportCompare.php:167
@@ -7356,7 +7270,7 @@ msgstr "Diagramm namens \"%1$s\" existiert bereits (ggf. als Diagrammprototyp)."
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Diagramme"
 
@@ -7377,12 +7291,12 @@ msgstr "Raster"
 msgid "Group"
 msgstr "Gruppe"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Gruppe \"%1$s\" kann nicht gelöscht werden, da sie von einem Host-Prototyp verwendet wird."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr "Gruppe \"%1$s\" kann nicht gelöscht werden, da sie in einem Zustands-Korrelation verwendet wird."
@@ -7516,7 +7430,7 @@ msgstr "Hardware-Sensor auslesen. Gibt Fließkommazahl zurück"
 
 #: include/classes/setup/CSetupWizard.php:331
 msgid "HashiCorp Vault"
-msgstr ""
+msgstr "HashiCorp Tresor"
 
 #: app/views/popup.httpstep.php:133 app/views/popup.httpstep.php:161
 #: app/views/popup.massupdate.item.php:116
@@ -7558,11 +7472,11 @@ msgstr "Hilfe"
 msgid "Hexadecimal to decimal"
 msgstr "Hexadezimal in dezimal"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "Debug ausblenden"
 
@@ -7590,11 +7504,11 @@ msgstr "Hierarchie"
 msgid "High"
 msgstr "Hoch"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr "Kontrastreich dunkel"
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr "Konotrastreich hell"
 
@@ -7615,7 +7529,7 @@ msgstr "Ganze Zeile auswählen"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Verlauf"
 
@@ -7623,11 +7537,15 @@ msgstr "Verlauf"
 msgid "History and trends compression"
 msgstr "Historien- und Trendskompression"
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
+msgstr "Die Bereinigung des Verlaufs wird nicht unterstützt, wenn die Komprimierung aktiviert ist."
+
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Verlauf geleert"
 
@@ -7654,11 +7572,11 @@ msgstr "Speicherdauer Verlauf"
 
 #: include/classes/html/CTabFilter.php:150
 msgid "Home"
-msgstr ""
+msgstr "Startseite"
 
 #: app/views/administration.module.edit.php:44
 msgid "Homepage"
-msgstr ""
+msgstr "Internetseite"
 
 #: include/classes/widgets/forms/CWidgetFormHostAvail.php:49
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:122
@@ -7670,7 +7588,7 @@ msgstr "Horizontal"
 msgid "Horizontal align"
 msgstr "Horizontale Ausrichtung"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7699,7 +7617,7 @@ msgstr "Horizontale Ausrichtung"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7713,7 +7631,7 @@ msgstr[1] "Host"
 msgid "Host \"%1$s\" already exists."
 msgstr "Host \"%1$s\" existiert bereits."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7721,10 +7639,10 @@ msgstr "Host \"%1$s\" existiert bereits."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "Host \"%1$s\" kann nicht ohne Host-Gruppe sein."
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
-msgstr ""
+msgstr "Host \"%1$s\" wird von Proxy \"%2$s\" überwacht."
 
 #: include/actions.inc.php:55
 msgid "Host IP"
@@ -7774,7 +7692,7 @@ msgid_plural "Hosts enabled"
 msgstr[0] "Host aktiviert"
 msgstr[1] "Hosts aktiviert"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7788,25 +7706,25 @@ msgstr[1] "Hosts aktiviert"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Hostgruppe"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Hostgruppe \"%1$s\" existiert bereits."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Systemgruppe \"%1$s\" kann nicht gelöscht werden weil ein globales Skript sie verwendet."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
-msgstr ""
+msgstr "Die Hostgruppe \"%1$s\" ist intern und kann nicht gelöscht werden."
 
 #: include/views/js/monitoring.sysmaps.js.php:103
 msgid "Host group elements"
@@ -7816,10 +7734,10 @@ msgstr "Elemente der Hostgruppe"
 msgid "Host group label type"
 msgstr "Beschriftung Hostgruppe"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Host-Gruppe mit ID \"%1$s\" ist nicht verfügbar."
@@ -7835,8 +7753,8 @@ msgstr "Host-Gruppe mit ID \"%1$s\" ist nicht verfügbar."
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7910,7 +7828,7 @@ msgstr "Name des Hosts"
 msgid "Host networks"
 msgstr "Hostnetzwerke"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7932,7 +7850,7 @@ msgstr "Host-Prototyp hinzugefügt"
 
 #: include/classes/api/services/CHostPrototype.php:1759
 msgid "Host prototype cannot have more than one default interface of the same type."
-msgstr ""
+msgstr "Der Host-Prototyp kann nicht mehr als eine Standardschnittstelle desselben Typs haben."
 
 #: host_prototypes.php:149
 msgid "Host prototype deleted"
@@ -7940,7 +7858,7 @@ msgstr "Host-Prototyp gelöscht"
 
 #: include/views/configuration.host.prototype.edit.php:341
 msgid "Host prototype macros"
-msgstr ""
+msgstr "Host-Prototyp-Makros"
 
 #: host_prototypes.php:276 host_prototypes.php:306 host_prototypes.php:326
 msgid "Host prototype updated"
@@ -7990,7 +7908,7 @@ msgstr "Änderung des Hosts fehlgeschlagen."
 msgid "Host updated"
 msgstr "Host geändert"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr "Host mit ID \"%1$s\" ist nicht verfügbar."
@@ -8010,7 +7928,7 @@ msgstr "Mit dem gleichen Namen \"%1$s\" bereits vorhanden ist."
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Host mit identischen, sichtbarem Namen \"%1$s\" bereits vorhanden."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8023,7 +7941,7 @@ msgstr "Host mit identischen, sichtbarem Namen \"%1$s\" bereits vorhanden."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8071,7 +7989,7 @@ msgstr "Hosts geändert"
 msgid "Hours"
 msgstr "Stunden"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8084,7 +8002,7 @@ msgstr "Ungarisch (hu_HU)"
 
 #: app/partials/massupdate.macros.tab.php:111
 msgid "I confirm to remove all macros"
-msgstr ""
+msgstr "Ich bestätige die Entfernung aller Makros"
 
 #: app/partials/massupdate.valuemaps.tab.php:84
 msgid "I confirm to remove all value mappings"
@@ -8111,7 +8029,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IP-Adresse"
@@ -8136,7 +8054,7 @@ msgstr "IP-Bereich \"%1$s\" überschreitet \"%2$s\" Adressbereich"
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8160,7 +8078,7 @@ msgstr "IPMI-Sensor"
 
 #: include/classes/items/CHelpItems.php:1355
 msgid "IPMI sensor IDs and other sensor-related parameters. Returns JSON."
-msgstr ""
+msgstr "IPMI-Sensor-IDs und andere sensorbezogene Parameter. Gibt JSON zurück."
 
 #: app/views/administration.iconmap.edit.php:58
 #: app/views/administration.image.edit.php:73
@@ -8193,12 +8111,12 @@ msgstr "Symbol hervorheben"
 msgid "Icon map"
 msgstr "Symbolübersicht"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr "Icon Symbolübersicht \"%1$s\" existiert bereits."
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Symolzuordnung \"%1$s\" kann nicht gelöscht werden; benutzt in Karte \"%2$s\"."
@@ -8211,18 +8129,18 @@ msgstr "Symbolzuordnung erstellt"
 msgid "Icon map deleted"
 msgstr "Symbolzuordnung gelöscht"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Symbolzuordnung geändert"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "Symbol zuordnen"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "Symbol mit ID \"%1$s\" ist nicht verfügbar."
@@ -8233,22 +8151,22 @@ msgstr "Symbole"
 
 #: app/views/administration.authentication.edit.php:223
 msgid "IdP entity ID"
-msgstr ""
+msgstr "IdP-Entitäts-ID"
 
 #: include/classes/core/CModuleManager.php:155
 #, c-format
 msgid "Identical ID (%1$s) is used by modules located at %2$s."
-msgstr ""
+msgstr "Identische ID (%1$s) wird von Modulen verwendet, die sich auf %2$s befinden."
 
 #: include/classes/core/CModuleManager.php:173
 #, c-format
 msgid "Identical actions are used by modules located at %1$s."
-msgstr ""
+msgstr "Identische Aktionen werden von Modulen verwendet, die sich auf %1$s befinden."
 
 #: include/classes/core/CModuleManager.php:162
 #, c-format
 msgid "Identical namespace (%1$s) is used by modules located at %2$s."
-msgstr ""
+msgstr "Identischer Namespace (%1$s) wird von Modulen verwendet, die sich unter %2$s befinden."
 
 #: include/classes/items/CHelpItems.php:293
 #: include/classes/items/CHelpItems.php:675
@@ -8259,45 +8177,45 @@ msgstr "Identifikation des Systems. Rückgabewert Zeichenfolge"
 #, c-format
 msgid "If at least %2$s child service has %1$s status or above"
 msgid_plural "If at least %2$s child services have %1$s status or above"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Wenn mindestens %2$s Tochter-Dienst den Status %1$s oder höher hat"
+msgstr[1] "Wenn mindestens %2$s Tochter-Dienste den Status %1$s oder höher haben"
 
 #: include/classes/helpers/CServiceHelper.php:35
 #, c-format
 msgid "If at least %2$s child services have %1$s status or above"
-msgstr ""
+msgstr "Wenn mindestens %2$s Tochter-Dienste den Status %1$s oder höher haben"
 
 #: include/classes/helpers/CServiceHelper.php:40
 #: include/classes/helpers/CServiceHelper.php:89
 #, c-format
 msgid "If at least %2$s of child services have %1$s status or above"
-msgstr ""
+msgstr "Wenn mindestens %2$s der Tochter-Dienste den Status %1$s oder höher haben"
 
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
-msgstr ""
+msgstr "Wenn der Filter passt"
 
 #: include/classes/helpers/CServiceHelper.php:95
 #, c-format
 msgid "If less than %2$s child service has %1$s status or below"
 msgid_plural "If less than %2$s child services have %1$s status or below"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Wenn weniger als %2$s Kinderdienst den Status %1$s oder darunter hat"
+msgstr[1] "Wenn weniger als %2$s Kinderdienste den Status %1$s oder darunter hat"
 
 #: include/classes/helpers/CServiceHelper.php:45
 #, c-format
 msgid "If less than %2$s child services have %1$s status or below"
-msgstr ""
+msgstr "Wenn weniger als %2$s Kinderdienste den Status %1$s oder darunter haben"
 
 #: include/classes/helpers/CServiceHelper.php:50
 #: include/classes/helpers/CServiceHelper.php:101
 #, c-format
 msgid "If less than %2$s of child services have %1$s status or below"
-msgstr ""
+msgstr "Wenn weniger als %2$s der Kinderdienste den Status %1$s oder darunter haben"
 
 #: include/classes/api/services/CReport.php:348
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
-msgstr ""
+msgstr "Wenn keine Benutzergruppen angegeben sind, muss mindestens ein Benutzer in die Mailingliste aufgenommen werden."
 
 #: include/classes/helpers/CServiceHelper.php:55
 #: include/classes/helpers/CServiceHelper.php:60
@@ -8305,7 +8223,7 @@ msgstr ""
 #: include/classes/helpers/CServiceHelper.php:110
 #, c-format
 msgid "If weight of child services with %1$s status or above is at least %2$s"
-msgstr ""
+msgstr "Wenn das Gewicht der Kinderdienste mit Status %1$s oder höher mindestens %2$s beträgt"
 
 #: include/classes/helpers/CServiceHelper.php:65
 #: include/classes/helpers/CServiceHelper.php:70
@@ -8313,7 +8231,7 @@ msgstr ""
 #: include/classes/helpers/CServiceHelper.php:118
 #, c-format
 msgid "If weight of child services with %1$s status or below is less than %2$s"
-msgstr ""
+msgstr "Wenn die Gewichtung der Tochterdienste mit Status %1$s oder darunter kleiner ist als %2$s"
 
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
@@ -8321,25 +8239,22 @@ msgstr "Fragen Sie bitte ihren Administrator um die nötigen Berechtigungen, fal
 
 #: app/views/administration.miscconfig.edit.php:125
 msgid "Iframe sandboxing exceptions"
-msgstr ""
+msgstr "Ausnahmen beim Iframe-Sandboxing"
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
-msgstr ""
+msgstr "Diesen Dienst ignorieren"
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Bild"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "Bild \"%1$s\" bereits vorhanden."
@@ -8348,7 +8263,7 @@ msgstr "Bild \"%1$s\" bereits vorhanden."
 msgid "Image added"
 msgstr "Bild hinzugefügt"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Bild gelöscht"
 
@@ -8356,18 +8271,12 @@ msgstr "Bild gelöscht"
 msgid "Image label type"
 msgstr "Beschriftung Bild"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "Fehler [%1$s] beim Laden des Bildes in [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
-msgstr "Bildgrösse muss kleiner sein als %1$s"
+msgstr "Bildgrösse muss kleiner sein als %1$s."
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Bild geändert"
 
@@ -8410,7 +8319,7 @@ msgstr "Import erfolgreich"
 #: hostinventories.php:193
 #, c-format
 msgid "Impossible to filter by inventory field \"%1$s\", which does not exist."
-msgstr ""
+msgstr "Es ist nicht möglich, nach dem Bestandsfeld \"%1$s\" zu filtern, das nicht existiert."
 
 #: include/html.inc.php:281 include/maps.inc.php:409
 msgid "In maintenance"
@@ -8428,7 +8337,7 @@ msgstr "Im Bereich"
 #: app/controllers/CControllerPopupScheduledReportEdit.php:121
 #: app/controllers/CControllerScheduledReportEdit.php:303
 msgid "Inaccessible dashboard"
-msgstr ""
+msgstr "Nicht verfügbare Übersichtsseite"
 
 #: include/views/configuration.host.edit.php:70
 #: include/views/configuration.host.list.php:198
@@ -8462,7 +8371,7 @@ msgstr "Unerreichbarer Datenpunkt-Prototyp"
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8473,15 +8382,15 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr "Unerreichbare Karte"
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr "Unerreichbare Vorlage"
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
-msgstr ""
+msgstr "Unzugänglicher Auslöser"
 
 #: app/controllers/CControllerPopupScheduledReportEdit.php:105
 #: app/controllers/CControllerPopupScheduledReportList.php:77
@@ -8511,7 +8420,7 @@ msgstr "Einfügen"
 
 #: app/views/administration.mediatype.edit.php:241
 msgid "Include event menu entry"
-msgstr ""
+msgstr "Ereignismenüeintrag einbeziehen"
 
 #: app/views/administration.usergroup.edit.php:141
 #: app/views/administration.usergroup.edit.php:192
@@ -8523,10 +8432,10 @@ msgstr "Untergruppen enthalten"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Eingehenden Traffic-Statistiken auf Netzwerk-Schnittstelle. Gibt Ganzzahl zurück"
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
-msgstr ""
+msgstr "Inkompatible Parameter \"propagation_rule\" und \"propagation_value\" für Dienst \"%1$s\"."
 
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
@@ -8585,16 +8494,16 @@ msgstr "Falsche SNMP-Community."
 
 #: include/classes/helpers/CVaultHelper.php:137
 msgid "Incorrect Vault API endpoint."
-msgstr ""
+msgstr "Falscher Endpunkt der Vault-API."
 
 #: include/classes/helpers/CVaultHelper.php:61
 msgid "Incorrect Vault token."
-msgstr ""
+msgstr "Falsches Vault-Token."
 
 #: include/classes/api/services/CAction.php:3012
 #: include/classes/api/services/CAction.php:3030
 msgid "Incorrect action \"operationid\"."
-msgstr ""
+msgstr "Falsche Aktion \"operationid\"."
 
 #: include/classes/validators/CActionCondValidator.php:122
 msgid "Incorrect action condition discovery check."
@@ -8606,7 +8515,7 @@ msgstr "Unzulässige Aktionsbedingung: Suchlaufprüfung. Suchlaufprüfung existi
 
 #: include/classes/validators/CActionCondValidator.php:95
 msgid "Incorrect action condition discovery object."
-msgstr "Unzulässige Aktionsbedingung: Suchlaufobjekt"
+msgstr "Unzulässige Aktionsbedingung Suchlaufobjekt."
 
 #: include/classes/api/services/CAction.php:3140
 msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
@@ -8691,24 +8600,6 @@ msgstr "Unzulässige Aktionsoperation: Benutzergruppe. Benutzergruppe existiert
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Unzulässiger Benutzer für Aktionsoperation. Benutzer existiert nicht oder Sie haben keinen Zugriff auf ihn."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8763,8 +8654,6 @@ msgstr "Unzulässiger Benutzer für Aktionsoperation. Benutzer existiert nicht o
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Falsche/fehlerhafte Argumente an Funktion übergeben."
 
@@ -8777,7 +8666,7 @@ msgstr "Falscher Massenwert für die Schnittstelle."
 #: include/classes/api/services/CHost.php:2223
 #, c-format
 msgid "Incorrect characters used for host name \"%1$s\"."
-msgstr ""
+msgstr "Falsche Zeichen für den Hostnamen \"%1$s\" verwendet."
 
 #: include/classes/api/services/CTemplate.php:502
 #: include/classes/api/services/CTemplate.php:1232
@@ -8790,45 +8679,36 @@ msgstr "Unzulässige Zeichen im Vorlagennamen \"%1$s\"."
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "Unzulässige Aktionsbedingung: Port \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "Unzulässige Aktionsbedingung in Suchlaufregel \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "Unzulässige Korrelations ID."
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "Falscher benutzerdefinierter Ausdruck \"%2$s\" für Aktion \"%1$s\": %3$s."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "Falscher benutzerdefinierter Ausdruck \"%2$s\" für Korrelation \"%1$s\": %3$s."
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "Falscher benutzerdefinierter Ausdruck \"%2$s\" für die Suchlaufregel \"%1$s\":%3$s."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
-msgstr ""
+msgstr "Falscher benutzerdefinierter Ausdruck \"%2$s\" für Überschreibung \"%1$s\": %3$s."
 
 #: include/classes/db/MysqlDbBackend.php:69
 #: include/classes/db/PostgresqlDbBackend.php:95
 #, c-format
 msgid "Incorrect default charset for Zabbix database: %1$s."
-msgstr ""
+msgstr "Falscher Standardzeichensatz für Zabbix-Datenbank: %1$s."
 
 #: include/classes/api/services/CEvent.php:510
 #: include/classes/api/services/CProblem.php:375
 msgid "Incorrect evaltype value."
-msgstr ""
+msgstr "Falscher evaltype-Wert."
 
 #: include/classes/validators/event/CEventSourceObjectValidator.php:69
 #, c-format
@@ -8837,13 +8717,13 @@ msgstr "Unzulässiges Ereignisobjekt \"%1$s\" (%2$s) für Ereignisquelle \"%3$s\
 
 #: include/classes/api/services/CAlert.php:386
 msgid "Incorrect eventobject value."
-msgstr "Unzulässiger Wert für \"eventobject\""
+msgstr "Unzulässiger Wert für eventobject."
 
 #: include/classes/api/services/CAlert.php:379
 msgid "Incorrect eventsource value."
-msgstr "Unzulässiger Wert für \"eventsource\""
+msgstr "Unzulässiger Wert für eventsource."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Unzulässiges Feld \"%1$s\" Name oder Wert in Where-Klausel für Tabelle \"%2$s\"."
@@ -8857,7 +8737,7 @@ msgstr "Unzulässige Felder für Karte."
 #: include/classes/setup/CSetupWizard.php:748
 #, c-format
 msgid "Incorrect file path for \"%1$s\": %2$s."
-msgstr ""
+msgstr "Falscher Dateipfad für \"%1$s\": %2$s."
 
 #: include/classes/helpers/CUploadFile.php:162
 msgid "Incorrect file upload."
@@ -8868,25 +8748,20 @@ msgstr "Unzulässiger Datei-Upload."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "Falscher Filter Bedingung Formel-ID für die Aktion \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Falsche Filterbedingung Formel-ID für die Suchlaufregel \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "Falscher Filter Bedingung Formel-ID für die Korrelation \"%1$s\" gegeben."
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "Falsche Filterbedingung Makro für die Suchlaufregel \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
-msgstr ""
+msgstr "Falsches Filterbedingungsmakro für Überschreibung \"%1$s\"."
 
 #: include/classes/api/services/CAction.php:1616
 #: include/classes/api/services/CAction.php:2648
@@ -8894,7 +8769,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "Falscher Filter Bedingungsoperator für Aktion \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "Falsche Filterbedingung Operator für die Suchlaufregel \"%1$s\"."
@@ -8922,8 +8797,6 @@ msgstr "Unzulässiger Bildindex."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8933,18 +8806,18 @@ msgstr "Falsche Eingabeparameter."
 #: include/classes/api/services/CHostInterface.php:801
 #, c-format
 msgid "Incorrect interface DNS parameter \"%1$s\" provided."
-msgstr ""
+msgstr "Falscher Schnittstellen-DNS-Parameter \"%1$s\" bereitgestellt."
 
 #: include/classes/api/services/CHostInterface.php:846
 #, c-format
 msgid "Incorrect interface port \"%1$s\" provided."
-msgstr ""
+msgstr "Falscher Schnittstellenport \"%1$s\" angegeben."
 
 #: include/classes/api/services/CHost.php:2003
 #: include/classes/api/services/CHost.php:2206
 #, c-format
 msgid "Incorrect inventory field \"%1$s\"."
-msgstr ""
+msgstr "Falsches Inventarfeld \"%1$s\"."
 
 #: include/classes/api/services/CAction.php:1856
 msgid "Incorrect inventory mode in action operation."
@@ -8967,7 +8840,7 @@ msgstr "Falscher Datenpunkt Wertetyp"
 #: include/classes/api/services/CTriggerGeneral.php:1639
 #, c-format
 msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"."
-msgstr "Falscher Datenpunkt-Wert \"%1$s\" für Auslöser-Funktion \"%2$s\" übergeben"
+msgstr "Falscher Datenpunkt-Wert \"%1$s\" für Auslöser-Funktion \"%2$s\" übergeben."
 
 #: include/forms.inc.php:1516
 msgid "Incorrect list of items."
@@ -8975,7 +8848,7 @@ msgstr "Fehlerhafte Liste von Datenpunkten."
 
 #: app/controllers/CControllerPopupMaintenancePeriod.php:89
 msgid "Incorrect maintenance - date must be between 1970.01.01 and 2038.01.18"
-msgstr "Falsches Wartungsdatum - muss zwischen 01.01.1970 und 18.01.2038 liegen"
+msgstr "Falsches Wartungsdatum - muss zwischen 1970-01-01 und 2038-01-18 liegen"
 
 #: app/controllers/CControllerPopupMaintenancePeriod.php:125
 msgid "Incorrect maintenance period (minimum 5 minutes)"
@@ -8985,10 +8858,6 @@ msgstr "Falscher Wartungszeitraum (mindestens 5 Minuten)"
 msgid "Incorrect map ID."
 msgstr "Falsche Karten-ID."
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "Falsche Medientyp-ID."
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9004,7 +8873,7 @@ msgstr "Falscher Objektwert."
 #: include/classes/db/OracleDbBackend.php:141
 #, c-format
 msgid "Incorrect parameter \"%1$s\" value: %2$s."
-msgstr ""
+msgstr "Falscher Wert des Parameters \"%1$s\": %2$s."
 
 #: include/classes/api/services/CAction.php:2719
 #, c-format
@@ -9046,13 +8915,13 @@ msgstr "Falscher regulärer Ausdruck \"%1$s\": \"%2$s\""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Zabbix-Server \"%1$s\" hat eine falsche Antwort geschickt."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Falscher Endzeitpunkt für Dienst."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Falscher Startzeitpunkt für Dienst."
 
@@ -9105,19 +8974,14 @@ msgstr "Falsche Auslöser-Prototyp-Ausdruck. Die Elemente eines Ausdrucks sollte
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "Falsche Art der Berechnung für die Aktion \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "Falsche Art der Berechnung für die Korrelation \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "Unzulässige Aktionsbedingung in Suchlaufregel \"%1$s\"."
 
 #: include/classes/api/services/CAction.php:3067
 msgid "Incorrect update action \"operationid\"."
-msgstr ""
+msgstr "Falsche Aktualisierungsaktion \"operationid\"."
 
 #: include/classes/api/services/CMap.php:764
 #: include/classes/api/services/CMap.php:1232
@@ -9156,13 +9020,13 @@ msgstr "Falscher Benutzername oder falsches Passwort oder Konto ist vorübergehe
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9171,72 +9035,42 @@ msgstr "Falscher Wert \"%1$s\" für Feld \"%2$s\"."
 #: include/validate.inc.php:336
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s, and have no more than %5$s digits after the decimal point."
-msgstr ""
+msgstr "Falscher Wert \"%1$s\" für Feld \"%2$s\": muss zwischen %3$s und %4$s liegen und darf nicht mehr als %5$s Stellen nach dem Komma haben."
 
 #: app/controllers/CControllerAuthenticationUpdate.php:153
 #: include/classes/api/services/CAction.php:1752 include/validate.inc.php:341
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
-msgstr "Falscher Wert \"%1$s\" für Feld \"%2$s\": Muss zwischen %3$s und %4$s liegen"
+msgstr "Falscher Wert \"%1$s\" für Feld \"%2$s\": Muss zwischen %3$s und %4$s liegen."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "Falscher Wert \"%1$s\" für das Gleitkomma-Feld \"%2$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "Falscher Wert \"%1$s\" für das Ganzzahl-Feld \"%2$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Falscher Wert \"%1$s\" für das vorzeichenlose Ganzzahl-Feld \"%2$s\"."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "Falscher Wert \"%1$s\" im Feld \"%2$s\" Korrelation \"%3$s\"."
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "Falscher Wert \"%1$s\" im Feld \"%2$s\" für Medientyp \"%3$s\"."
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
-msgstr ""
+msgstr "Falscher Wert für das Feld \"%1$s\"."
 
 #: app/controllers/CControllerAuthenticationUpdate.php:103
 #: app/controllers/CControllerAuthenticationUpdate.php:143
@@ -9287,14 +9121,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9404,25 +9232,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9433,7 +9243,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9479,16 +9289,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9497,9 +9308,9 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "Falscher Wert für Feld \"%1$s\": %2$s."
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
-msgstr ""
+msgstr "Erhöhung um"
 
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
@@ -9507,7 +9318,7 @@ msgstr "Indonesisch (id_ID)"
 
 #: include/func.inc.php:1337 include/func.inc.php:1341
 msgid "Infinity"
-msgstr ""
+msgstr "Unendlichkeit"
 
 #: app/controllers/CControllerPopupMediatypeTestSend.php:172
 #: app/partials/monitoring.latest.view.html.php:60
@@ -9541,19 +9352,16 @@ msgstr "Information"
 #: include/classes/items/CHelpItems.php:337
 #: include/classes/items/CHelpItems.php:719
 msgid "Information about a file. Returns JSON"
-msgstr ""
+msgstr "Informationen über eine Datei. Gibt JSON zurück"
 
 #: include/classes/items/CHelpItems.php:201
 #: include/classes/items/CHelpItems.php:583
 msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
-msgstr ""
-"Informationen über einen Dienst. Gibt integer mit param als state, startup; string - mit param als displayname, path, user; text - mit param als description; Speziell für state: 0 - läuft, 1 - pausiert, 2 - Start anstehend, 3 - Pause anstehend, 4 - Fortsetzung anstehend, 5 - Stop anstehend, 6 - gestoppt, 7 - unbekannt, 255 - kein solcher Dienst; Speziell für startup: 0 - automatisch, 1 - automatisch verzögert, 2 - manuell, 3 - deaktiviert, 4 - unbekannt\n"
-"\n"
-"Übersetzt mit www.DeepL.com/Translator (kostenlose Version)"
+msgstr "Informationen über einen Dienst. Gibt integer mit param als state, startup; string - mit param als displayname, path, user; text - mit param als description; Speziell für state: 0 - läuft, 1 - pausiert, 2 - Start anstehend, 3 - Pause anstehend, 4 - Fortsetzung anstehend, 5 - Stop anstehend, 6 - gestoppt, 7 - unbekannt, 255 - kein solcher Dienst; Speziell für startup: 0 - automatisch, 1 - automatisch verzögert, 2 - manuell, 3 - deaktiviert, 4 - unbekannt"
 
 #: include/views/configuration.host.prototype.edit.php:104
 msgid "Inherit"
-msgstr ""
+msgstr "Erben"
 
 #: app/partials/configuration.filter.items.php:198
 #: include/views/configuration.triggers.list.php:112
@@ -9570,11 +9378,11 @@ msgstr "Vererbte und Host-Prototyp-Makros"
 
 #: app/partials/configuration.tags.tab.php:138
 msgid "Inherited and item tags"
-msgstr ""
+msgstr "Vererbte und Element-Tags"
 
 #: app/partials/configuration.tags.tab.php:133
 msgid "Inherited and scenario tags"
-msgstr ""
+msgstr "Vererbte und Szenario-Tags"
 
 #: include/views/configuration.template.edit.php:211
 msgid "Inherited and template macros"
@@ -9582,18 +9390,18 @@ msgstr "Vererbte und Vorlagen Makros"
 
 #: app/partials/configuration.tags.tab.php:128
 msgid "Inherited and trigger tags"
-msgstr ""
+msgstr "Vererbte und auslösende Tags"
 
 #: include/forms.inc.php:306
 msgid "Inherited items"
-msgstr ""
+msgstr "Vererbte Datenpunkte"
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Einfügen"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "Ausdruck einfügen"
 
@@ -9612,7 +9420,7 @@ msgstr "Installiert von"
 
 #: include/classes/helpers/CMenuHelper.php:344
 msgid "Integrations"
-msgstr ""
+msgstr "Integrationen"
 
 #: app/partials/monitoring.host.view.html.php:30
 #: app/views/administration.proxy.edit.php:77 disc_prototypes.php:42
@@ -9628,7 +9436,7 @@ msgstr "Schnittstelle ist verknüpft mit Datenpunkt \"%1$s\" auf \"%2$s\"."
 
 #: include/classes/widgets/forms/CWidgetFormHostAvail.php:39
 msgid "Interface type"
-msgstr ""
+msgstr "Typ der Schnittstelle"
 
 #: include/classes/api/services/CHostInterface.php:337
 #, c-format
@@ -9697,7 +9505,7 @@ msgstr "Internes Problem"
 msgid "Internal problem recovery"
 msgstr "Interne Problembehebung"
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9705,7 +9513,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9716,15 +9524,15 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Intervall"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
-msgstr ""
+msgstr "Ungültige API-Methode \"%2$s\" für Benutzerrolle \"%1$s\"."
 
 #: include/classes/api/services/CHostInterface.php:829
 #, c-format
 msgid "Invalid IP address \"%1$s\"."
-msgstr "Ungültige IP-Adresse \"%s\"."
+msgstr "Ungültige IP-Adresse \"%1$s\"."
 
 #: include/classes/core/CJsonRpc.php:172
 msgid "Invalid JSON. An error occurred on the server while parsing the JSON text."
@@ -9732,17 +9540,17 @@ msgstr "Ungültiges JSON. Beim Parsen am Server trat ein Fehler auf."
 
 #: include/classes/import/readers/CYamlImportReader.php:55
 msgid "Invalid YAML file contents"
-msgstr ""
+msgstr "Ungültiger Inhalt der YAML-Datei"
 
 #: include/classes/validators/CActionCondValidator.php:113
 #, c-format
 msgid "Invalid action condition: %1$s."
 msgstr "Ungültige Aktionsbedingung: %1$s."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
-msgstr ""
+msgstr "Ungültige Bedingung: %1$s."
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:219
 msgid "Invalid date."
@@ -9756,7 +9564,7 @@ msgstr "Ungültige E-Mail Adresse \"%1$s\"."
 #: include/classes/api/services/CUser.php:934
 #, c-format
 msgid "Invalid email address for media type with ID \"%1$s\"."
-msgstr "Ungültige E-Mail Adresse \"%1$s\" für Medientyp mit ID \"%1$s\"."
+msgstr "Ungültige E-Mail Adresse für Medientyp mit ID \"%1$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:177
 #: app/controllers/CControllerPopupLldOperation.php:182
@@ -9771,7 +9579,7 @@ msgstr "Ungültige E-Mail Adresse \"%1$s\" für Medientyp mit ID \"%1$s\"."
 msgid "Invalid interval \"%1$s\"."
 msgstr "Ungültiges Intervall \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Ungültiger Schlüssel \"%1$s\" für Suchlaufregel \"%2$s\" auf \"%3$s\": %4$s."
@@ -9796,27 +9604,29 @@ msgstr "Ungültiger Schlüssel \"%1$s\": %2$s."
 msgid "Invalid method parameters."
 msgstr "Ungültige Methoden-Parameter."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9842,17 +9652,17 @@ msgstr "Ungültige Methoden-Parameter."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9860,8 +9670,8 @@ msgstr "Ungültige Methoden-Parameter."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9875,106 +9685,116 @@ msgstr "Ungültige Methoden-Parameter."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9988,7 +9808,7 @@ msgstr "Ungültige Parameter."
 
 #: include/classes/core/CJsonRpc.php:176
 msgid "Invalid request."
-msgstr ""
+msgstr "Ungültige Anfrage."
 
 #: include/classes/api/services/CHttpTest.php:786
 #, c-format
@@ -10016,43 +9836,38 @@ msgstr "Ungültiger Antwort-Code \"%1$s\"."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10073,14 +9888,14 @@ msgstr "Ungültige Zeitspanne."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Inventar"
 
 #: include/classes/api/services/CHost.php:1161
 #, c-format
 msgid "Inventory disabled for host \"%1$s\"."
-msgstr "Inventar für Host \"%1$s\" abgeschaltet"
+msgstr "Inventar für Host \"%1$s\" abgeschaltet."
 
 #: app/views/administration.iconmap.edit.php:58
 msgid "Inventory field"
@@ -10114,7 +9929,7 @@ msgstr "Nach Benutzer-Passwort kann nicht gesucht werden."
 msgid "Italian (it_IT)"
 msgstr "Italienisch (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10146,7 +9961,7 @@ msgstr "Datenpunkt \"%1$s\" kann nicht ohne seinen Stammartikel kopiert werden."
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "Datenpunkt \"%1$s\" kann das fehlende Inventarfeld Nummer \"%2$d\" nicht befüllen. Zur Wahl steht: 0 (nicht befüllen) bis %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10160,7 +9975,7 @@ msgstr "Datenpunkt hinzugefügt"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr "Der Datenpunkt enthält benutzerdefinierte Makros mit geheimen Werten. Die Werte für diese Makros müssen manuell eingegeben werden."
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "Datenpunkt kopiert"
@@ -10174,13 +9989,13 @@ msgstr "Anzahl der Datenpunkte"
 msgid "Item deleted"
 msgstr "Elemente gelöscht"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Datenpunkt deaktiviert"
 msgstr[1] "Datenpunkte deaktiviert"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Datenpunkt aktiviert"
@@ -10190,7 +10005,7 @@ msgstr[1] "Datenpunkte aktiviert"
 msgid "Item in \"not supported\" state"
 msgstr "Element im Zustand \"nicht unterstützt\""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "Datenpunkt nicht ausgewählt"
 
@@ -10199,7 +10014,7 @@ msgstr "Datenpunkt nicht ausgewählt"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr "Bei der Elementvorverarbeitung fehlen Parameter: %1$s"
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10210,17 +10025,17 @@ msgstr "Elementen-Prototyp"
 #: include/classes/api/services/CItemPrototype.php:50
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template."
-msgstr ""
+msgstr "Datenpunkt-Prototyp \"%1$s\" existiert bereits auf \"%2$s\", geerbt von einer anderen Vorlage."
 
 #: include/classes/api/services/CItemGeneral.php:1041
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\", linked to another rule."
-msgstr ""
+msgstr "Der Datenpunkt-Prototyp \"%1$s\" existiert bereits auf \"%2$s\", verknüpft mit einer anderen Regel."
 
 #: include/classes/api/services/CItemPrototype.php:51
 #, c-format
 msgid "Item prototype \"%1$s\" already exists on \"%2$s\"."
-msgstr ""
+msgstr "Der Datenpunkt-Prototyp \"%1$s\" existiert bereits auf \"%2$s\"."
 
 #: disc_prototypes.php:610
 msgid "Item prototype added"
@@ -10236,8 +10051,8 @@ msgid_plural "Item prototypes updated"
 msgstr[0] "Datenpunkt-Prototyp aktualisiert"
 msgstr[1] "Datenpunkt-Prototypen aktualisiert"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr "Datenpunkt-Prototyp mit ID \"%1$s\" ist nicht verfügbar."
@@ -10263,7 +10078,7 @@ msgstr "Datenpunkt-Prototypen aktualisiert"
 msgid "Item tags"
 msgstr "Datenpunkt Kennzeichen"
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr "Datenpunkttyp verwendet keine Schnittstelle"
 
@@ -10295,8 +10110,8 @@ msgstr "Das Element wird nicht aktualisiert. Für das angegebene Aktualisierungs
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr "Das Element wird nicht aktualisiert. Das Aktualisierungsintervall sollte zwischen 1s und 1d liegen. Es können auch geplante/flexible Intervalle verwendet werden."
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr "Datenpunkt mit ID \"%1$s\" ist nicht verfügbar."
@@ -10347,11 +10162,11 @@ msgstr "Datenpunkt mit Schlüssel \"%1$s\" existiert bereits auf \"%2$s\"."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Datenpunkte"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Datenpunkte gelöscht"
 
@@ -10369,7 +10184,7 @@ msgstr "Datenpunkte geändert"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10392,6 +10207,10 @@ msgstr "JMX-Schnittstellen"
 
 #: include/classes/html/CButtonExport.php:75
 msgid "JSON"
+msgstr "JSON"
+
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
 msgstr ""
 
 #: app/views/popup.massupdate.item.php:95
@@ -10399,32 +10218,32 @@ msgstr ""
 #: include/views/configuration.item.edit.php:308
 #: include/views/configuration.item.prototype.edit.php:289
 msgid "JSON data"
-msgstr ""
+msgstr "JSON Daten"
 
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
 msgid "JSON is expected"
-msgstr ""
+msgstr "JSON wird erwartet"
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr "JSON-String wird erwartet"
 
 #: include/classes/core/CJsonRpc.php:146
 #, c-format
 msgid "JSON-RPC error generation failed. No such error \"%1$s\"."
-msgstr ""
+msgstr "JSON-RPC-Fehlergenerierung fehlgeschlagen. Kein solcher Fehler \"%1$s\"."
 
 #: include/items.inc.php:1827
 #: include/views/configuration.host.discovery.edit.php:780
 msgid "JSONPath"
-msgstr ""
+msgstr "JSONPath"
 
 #: include/func.inc.php:220
 msgid "Jan"
 msgstr "Jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Januar"
 
@@ -10440,13 +10259,13 @@ msgstr "Japanisch (ja_JP)"
 #: include/views/configuration.item.prototype.edit.php:248
 #: include/views/js/item.preprocessing.js.php:181
 msgid "JavaScript"
-msgstr ""
+msgstr "JavaScript"
 
 #: include/func.inc.php:226
 msgid "Jul"
 msgstr "Jul"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Juli"
 
@@ -10454,14 +10273,14 @@ msgstr "Juli"
 msgid "Jun"
 msgstr "Jun"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Juni"
 
 #: include/views/configuration.host.discovery.edit.php:632
 #: include/views/configuration.host.discovery.list.php:143
 msgid "Keep lost resources period"
-msgstr ""
+msgstr "Zeit für das Behalten verlorener Ressourcen"
 
 #: include/httptest.inc.php:30
 msgid "Kerberos"
@@ -10527,16 +10346,16 @@ msgstr "LDAP Einstellungen"
 
 #: app/views/popup.itemtestedit.view.php:300
 msgid "LF"
-msgstr ""
+msgstr "LF"
 
 #: include/views/configuration.host.discovery.edit.php:780
 msgid "LLD macro"
-msgstr ""
+msgstr "LLD Makro"
 
 #: include/views/configuration.host.discovery.edit.php:838
 #: include/views/configuration.host.discovery.edit.php:882
 msgid "LLD macros"
-msgstr ""
+msgstr "LLD Makros"
 
 # Bei Auswahl dieses Punkts kann für jedes Kartenelement eine eigene Beschriftung festgelegt werden; Übersetzung wird gleichzeitig für Eingabetextfeld benutzt
 #: app/partials/popup.operations.php:257
@@ -10611,22 +10430,6 @@ msgid_plural "Last %1$d years"
 msgstr[0] "Letztes %1$d Jahr"
 msgstr[1] "Letzte %1$d Jahre"
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr "Letzte 24 Stunden"
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr "Letzte 30 Tage"
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr "Letzten 365 Tage"
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr "Letzten 7 Tage"
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10638,11 +10441,11 @@ msgstr "Letzter Zugriff am"
 msgid "Last check"
 msgstr "Letzte Überprüfung"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Diagramm der letzten Stunde"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Diagramm des letzten Monats"
 
@@ -10651,7 +10454,7 @@ msgstr "Diagramm des letzten Monats"
 #: app/views/administration.user.list.php:71
 #: app/views/administration.user.list.php:109
 msgid "Last name"
-msgstr ""
+msgstr "Nachname"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:62
 #: app/controllers/CControllerPopupTriggerExpr.php:76
@@ -10680,11 +10483,11 @@ msgstr "Zuletzt gesendet"
 msgid "Last value"
 msgstr "Aktueller Wert"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Diagramm der letzten Woche"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10693,11 +10496,11 @@ msgstr "Diagramm der letzten Woche"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Aktuelle Daten"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "Aktuellste Werte"
 
@@ -10708,7 +10511,7 @@ msgstr "Lettisch (lv_LV)"
 #: include/classes/widgets/forms/CWidgetFormHostAvail.php:48
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:121
 msgid "Layout"
-msgstr ""
+msgstr "Layout"
 
 #: include/classes/widgets/CWidgetHelper.php:767
 #: include/classes/widgets/CWidgetHelper.php:842
@@ -10738,7 +10541,7 @@ msgstr "Links Y"
 msgid "Left trim"
 msgstr "Beschnitt links"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr "Legende"
 
@@ -10767,7 +10570,7 @@ msgstr "Linie"
 
 #: include/views/js/monitoring.sysmaps.js.php:597
 msgid "Line color"
-msgstr ""
+msgstr "Linienfarbe"
 
 #: include/views/js/monitoring.sysmaps.js.php:575
 msgid "Line type"
@@ -10787,13 +10590,13 @@ msgstr "Verbindung"
 #: include/classes/api/services/CMap.php:1476
 #, c-format
 msgid "Link \"selementid1\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
-msgstr ""
+msgstr "Das Feld \"selementid1\" des Links verweist auf eine nicht existierende Kartenelement-ID \"%1$s\" für die Karte \"%2$s\"."
 
 #: include/classes/api/services/CMap.php:1014
 #: include/classes/api/services/CMap.php:1484
 #, c-format
 msgid "Link \"selementid2\" field is pointing to a nonexistent map selement ID \"%1$s\" for map \"%2$s\"."
-msgstr ""
+msgstr "Das Feld \"selementid2\" des Links verweist auf eine nicht existierende Kartenelement-ID \"%1$s\" für die Karte \"%2$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:737
 #: include/views/js/monitoring.sysmaps.js.php:748
@@ -10964,7 +10767,7 @@ msgstr "Überwachung von Protokolldateien mit Unterstützung der Protokollrotati
 
 #: include/classes/items/CHelpItems.php:455
 msgid "Log file monitoring. Returns log"
-msgstr ""
+msgstr "Überwachung von Protokolldateien. Gibt Protokoll zurück"
 
 #: app/views/popup.massupdate.item.php:344
 #: include/views/configuration.item.edit.php:809
@@ -11001,11 +10804,11 @@ msgstr "Abmelden"
 
 #: app/views/administration.authentication.edit.php:288
 msgid "Logout requests"
-msgstr ""
+msgstr "Logout-Anforderungen"
 
 #: app/views/administration.authentication.edit.php:294
 msgid "Logout responses"
-msgstr ""
+msgstr "Logout-Antworten"
 
 #: include/discovery.inc.php:139
 msgid "Lost"
@@ -11019,7 +10822,7 @@ msgstr "Suchlauf-Regel im Zustand \"nicht unterstützt\""
 msgid "M"
 msgstr "Mo"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "Mo"
@@ -11041,7 +10844,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "MD5-Prüfsumme der Datei. Rückgabewert Zeichenkette (MD5-Hash der Datei)"
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11052,12 +10855,12 @@ msgid "Macro"
 msgstr "Makro"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Makro \"%1$s\" existiert bereits auf \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Makro \"%1$s\" existiert bereits."
@@ -11085,7 +10888,7 @@ msgstr "Makros geändert"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr "Hauptfilter"
 
@@ -11093,7 +10896,7 @@ msgstr "Hauptfilter"
 msgid "Main navigation"
 msgstr "Hauptnavigation"
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11158,7 +10961,7 @@ msgstr "Wartung ohne Datensammlung"
 #: include/html.inc.php:972
 #, c-format
 msgid "Maintenance: %1$s"
-msgstr ""
+msgstr "Wartung: %1$s"
 
 #: app/views/administration.token.view.php:42
 #: app/views/administration.user.token.view.php:41
@@ -11167,16 +10970,16 @@ msgstr "Achten Sie darauf, das Authentifizierungs-Token zu kopieren, da Sie es n
 
 #: include/classes/helpers/CRoleHelper.php:425
 msgid "Manage API tokens"
-msgstr ""
+msgstr "Verwalten von API-Tokens"
 
 #: include/classes/helpers/CRoleHelper.php:429
 msgid "Manage scheduled reports"
-msgstr ""
+msgstr "Verwalten von geplanten Berichten"
 
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11186,25 +10989,25 @@ msgstr "Manuell"
 #: app/views/administration.script.list.php:53
 #: app/views/administration.script.list.php:130
 msgid "Manual event action"
-msgstr ""
+msgstr "Manuelle Ereignisaktion"
 
 #: app/views/administration.script.edit.php:102
 #: app/views/administration.script.list.php:52
 #: app/views/administration.script.list.php:126
 msgid "Manual host action"
-msgstr ""
+msgstr "Manuelle Host-Aktion"
 
 #: include/actions.inc.php:2070
 msgid "Manually closed"
 msgstr "Manuell geschlossen"
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Karte"
 
@@ -11273,7 +11076,7 @@ msgstr "Tafelform"
 msgid "Map update failed."
 msgstr "Karten Aktualisierung fehlgeschlagen."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr "Karte mit der ID \"%1$s\" ist nicht verfügbar."
@@ -11305,7 +11108,7 @@ msgstr "Karten"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "März"
 
@@ -11376,7 +11179,7 @@ msgstr "Mathematische Funktionen"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
 msgid "Max"
-msgstr ""
+msgstr "Max"
 
 #: app/views/administration.gui.edit.php:103
 msgid "Max count of elements to show inside table cell"
@@ -11392,7 +11195,7 @@ msgstr "Maximale Anzahl von Spalten und Zeilen in Übersichtstabellen"
 
 #: app/views/administration.gui.edit.php:136
 msgid "Max period for time selector"
-msgstr ""
+msgstr "Maximale Zeitspanne für die Zeitwahl"
 
 #: include/classes/items/CHelpItems.php:81
 #: include/classes/items/CHelpItems.php:443
@@ -11407,10 +11210,10 @@ msgstr "Maximale Anzahl der vom Betriebssystem unterstützten Prozesse. Rückgab
 #: include/blocks.inc.php:632
 #, c-format
 msgid "Maximum required %1$s database version is %2$s."
-msgstr ""
+msgstr "Die maximal erforderliche %1$s-Datenbankversion ist %2$s."
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11424,7 +11227,7 @@ msgstr[1] "Maximal darstellbare Zeitspanne ist %1$s Tage."
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "Maximale Gesamtlänge der E-Mail Adresse für Medientyp mit ID \"%1$s\" überschritten."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Mai"
 
@@ -11439,18 +11242,15 @@ msgstr "Mai"
 msgid "Media"
 msgstr "Medien"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Medientyp"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
-msgstr ""
+msgstr "Der Medientyp \"%1$s\" existiert bereits."
 
 #: app/controllers/CControllerMediatypeCreate.php:158
 msgid "Media type added"
@@ -11474,19 +11274,14 @@ msgid_plural "Media types enabled"
 msgstr[0] "Medientyp aktiviert"
 msgstr[1] "Medientyp aktiviert"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr ""
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
-msgstr ""
+msgstr "Der Medientyp-Test ist fehlgeschlagen."
 
 #: app/views/js/popup.mediatypetest.edit.js.php:108
 msgid "Media type test log"
-msgstr ""
+msgstr "Protokoll der Medientypprüfung"
 
 #: app/controllers/CControllerPopupMediatypeTestSend.php:142
 msgid "Media type test successful."
@@ -11508,10 +11303,10 @@ msgstr "Medientyp der ID \"%1$s\" ist nicht verfügbar."
 msgid "Media types"
 msgstr "Medientypen"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
-msgstr ""
+msgstr "Von der Aktion \"%1$s\" verwendete Medientypen."
 
 #: app/views/administration.usergroup.list.php:75
 #: include/views/configuration.hostgroups.list.php:67
@@ -11535,15 +11330,15 @@ msgstr "Speicherbenutzung der Prozesse in Bytes. Gibt Ganzzahl zurück"
 
 #: app/views/administration.mediatype.edit.php:256
 msgid "Menu entry URL"
-msgstr ""
+msgstr "Menüeintrag URL"
 
 #: app/views/administration.mediatype.edit.php:247
 msgid "Menu entry name"
-msgstr ""
+msgstr "Menüeintrag Name"
 
 #: app/views/administration.script.edit.php:107
 msgid "Menu path"
-msgstr ""
+msgstr "Menü Pfad"
 
 #: app/partials/popup.operations.php:160
 #: app/partials/scheduledreport.formgrid.html.php:182
@@ -11596,9 +11391,9 @@ msgstr "Nachrichtensystem"
 msgid "Method not found."
 msgstr "Methode nicht gefunden."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
-msgstr ""
+msgstr "Microsoft Edge"
 
 #: include/views/js/monitoring.sysmaps.js.php:41
 msgid "Middle"
@@ -11610,46 +11405,46 @@ msgstr "Mitte"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:193
 msgid "Min"
-msgstr ""
+msgstr "Min"
 
 #: app/views/administration.authentication.edit.php:40
 msgid "Minimum password length"
-msgstr ""
+msgstr "Minimale Passwortlänge"
 
 #: include/blocks.inc.php:626
 #, c-format
 msgid "Minimum required %1$s database version is %2$s."
-msgstr ""
+msgstr "Die minimal erforderliche Datenbankversion %1$s ist %2$s."
 
 #: include/classes/setup/CFrontendSetup.php:124
 #, c-format
 msgid "Minimum required PHP memory limit is %1$s (configuration option \"memory_limit\")."
-msgstr ""
+msgstr "Das minimal erforderliche PHP-Speicherlimit ist %1$s (Konfigurationsoption \"memory_limit\")."
 
 #: include/classes/setup/CFrontendSetup.php:162
 #, c-format
 msgid "Minimum required PHP upload filesize is %1$s (configuration option \"upload_max_filesize\")."
-msgstr ""
+msgstr "Die minimal erforderliche PHP-Upload-Dateigröße beträgt %1$s (Konfigurationsoption \"upload_max_filesize\")."
 
 #: include/classes/setup/CFrontendSetup.php:106
 #, c-format
 msgid "Minimum required PHP version is %1$s."
-msgstr ""
+msgstr "Die minimal erforderliche PHP-Version ist %1$s."
 
 #: include/classes/setup/CFrontendSetup.php:193
 #, c-format
 msgid "Minimum required limit on execution time of PHP scripts is %1$s (configuration option \"max_execution_time\")."
-msgstr ""
+msgstr "Die Mindestausführungszeit von PHP-Skripten muss auf %1$s begrenzt werden (Konfigurationsoption \"max_execution_time\")."
 
 #: include/classes/setup/CFrontendSetup.php:216
 #, c-format
 msgid "Minimum required limit on input parse time for PHP scripts is %1$s (configuration option \"max_input_time\")."
-msgstr ""
+msgstr "Die erforderliche Mindestgrenze für die Parse-Zeit von PHP-Skripten ist %1$s (Konfigurationsoption \"max_input_time\")."
 
 #: include/classes/setup/CFrontendSetup.php:143
 #, c-format
 msgid "Minimum required size of PHP post is %1$s (configuration option \"post_max_size\")."
-msgstr ""
+msgstr "Die erforderliche Mindestgröße eines PHP-Posts beträgt %1$s (Konfigurationsoption \"post_max_size\")."
 
 #: app/partials/common.filter.trigger.php:103
 #: app/views/monitoring.map.view.php:48
@@ -11658,7 +11453,7 @@ msgid "Minimum severity"
 msgstr "Niedrigste Priorität"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11717,17 +11512,17 @@ msgstr "Modus"
 msgid "Model"
 msgstr "Modell"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
-msgstr ""
+msgstr "Modul"
 
 #: app/controllers/CControllerModuleScan.php:98
 #, c-format
 msgid "Module added: %1$s."
 msgid_plural "Modules added: %1$s."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Modul hinzugefügt: %1$s."
+msgstr[1] "Module hinzugefügt: %1$s."
 
 #: app/controllers/CControllerModuleScan.php:113
 #, c-format
@@ -11740,30 +11535,30 @@ msgstr[1] "Module : %1$s gelöscht."
 #, c-format
 msgid "Module disabled: %1$s."
 msgid_plural "Modules disabled: %1$s."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Modul deaktiviert: %1$s."
+msgstr[1] "Module deaktiviert: %1$s."
 
 #: app/controllers/CControllerModuleUpdate.php:145
 #, c-format
 msgid "Module enabled: %1$s."
 msgid_plural "Modules enabled: %1$s."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Modul aktiviert: %1$s."
+msgstr[1] "Module aktiviert: %1$s."
 
 #: app/controllers/CControllerModuleUpdate.php:142
 #, c-format
 msgid "Module updated: %1$s."
-msgstr ""
+msgstr "Modul aktualisiert: %1$s."
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
-msgstr ""
+msgstr "Das Modul mit der ID \"%2$s\" ist für die Benutzerrolle \"%1$s\" nicht verfügbar."
 
 #: include/classes/core/CModuleManager.php:222
 #, c-format
 msgid "Module.php class must extend %1$s for module located at %2$s."
-msgstr ""
+msgstr "Die Klasse Module.php muss %1$s für das Modul unter %2$s erweitern."
 
 #: app/controllers/CControllerModuleEdit.php:98
 #: app/controllers/CControllerModuleList.php:122
@@ -11781,7 +11576,7 @@ msgstr "Module aktualisiert"
 msgid "Mon"
 msgstr "Mo"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Montag"
 
@@ -11821,15 +11616,15 @@ msgstr "Monat"
 msgid "Monthly"
 msgstr "Monatlich"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "Mehrere Übereinstimmungen gefunden..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
-msgstr ""
+msgstr "Mehr als %1$d Treffer für %2$s gefunden"
 
 #: app/views/administration.queue.overview.php:51
 #: app/views/administration.queue.overview.proxy.php:51
@@ -11843,13 +11638,13 @@ msgstr "Es existiert mehr als ein Diagramm namens \"%1$s\" auf dem Host."
 
 #: include/classes/helpers/CServiceHelper.php:27
 msgid "Most critical if all children have problems"
-msgstr ""
+msgstr "Besonders kritisch, wenn alle Tochterprozesse Probleme haben"
 
 #: include/classes/helpers/CServiceHelper.php:26
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11862,7 +11657,7 @@ msgstr "Mehrfach"
 msgid "Multiple PROBLEM events"
 msgstr "Mehrere PROBLEM-Ereignisse"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Stumm"
 
@@ -11873,14 +11668,14 @@ msgstr "Meine"
 #: include/classes/helpers/CServiceHelper.php:37
 #: include/classes/helpers/CServiceHelper.php:47
 msgid "N"
-msgstr ""
+msgstr "N"
 
 #: include/classes/helpers/CServiceHelper.php:42
 #: include/classes/helpers/CServiceHelper.php:52
 #: include/classes/helpers/CServiceHelper.php:62
 #: include/classes/helpers/CServiceHelper.php:72
 msgid "N%"
-msgstr ""
+msgstr "N%"
 
 #: include/discovery.inc.php:53
 msgid "NNTP"
@@ -11991,11 +11786,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12073,7 +11868,7 @@ msgstr "Vorname"
 
 #: app/views/administration.authentication.edit.php:304
 msgid "Name ID"
-msgstr ""
+msgstr "Name ID"
 
 #: include/views/js/configuration.httpconf.edit.js.php:100
 msgid "Name of the form field should not exceed 255 characters."
@@ -12128,11 +11923,11 @@ msgstr "Netzwerk-Timeout für geplanten Berichtstest"
 
 #: app/views/administration.miscconfig.edit.php:157
 msgid "Network timeout for script execution"
-msgstr ""
+msgstr "Netzwerkablaufzeit für die Skriptausführung"
 
 #: include/classes/items/CHelpItems.php:1109
 msgid "Network utilization (combined transmit-rates and receive-rates) during the interval, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - network interface instance"
-msgstr ""
+msgstr "Netzwerkauslastung (kombinierte Sende- und Empfangsraten) während des Intervalls, <url> - VMware-Service-URL, <uuid> - Hostname der virtuellen VMware-Maschine, <instance> - Netzwerkschnittstelleninstanz"
 
 #: app/views/administration.proxy.list.php:158 include/func.inc.php:191
 msgid "Never"
@@ -12140,7 +11935,7 @@ msgstr "Niemals"
 
 #: app/views/popup.service.statusrule.edit.php:94
 msgid "New additional rule"
-msgstr ""
+msgstr "Neue Zusatzregel"
 
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
@@ -12151,21 +11946,23 @@ msgstr "Neue Bedingung"
 #: app/controllers/CControllerDashboardView.php:154
 #: app/controllers/CControllerTemplateDashboardEdit.php:80
 msgid "New dashboard"
-msgstr "Neues dashboard"
+msgstr "Neue Übersichtsseite"
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Neues Element"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr "Neuer Ereignis-Marker Wert"
 
@@ -12177,15 +11974,15 @@ msgstr "Neue Operation"
 msgid "New regular expression"
 msgstr "Neuer regulärer Ausdruck"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
-msgstr ""
+msgstr "Neuer Dienst"
 
 #: app/controllers/CControllerPopupServiceTimeEdit.php:119
 msgid "New service time"
 msgstr "Neue Servicezeit"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12194,7 +11991,7 @@ msgid "New triggers"
 msgstr "Neue Auslöser"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr "Nächste Seite"
 
@@ -12212,7 +12009,7 @@ msgstr "Nächster Schritt"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12241,30 +12038,6 @@ msgstr "Nächster Schritt"
 msgid "No"
 msgstr "Nein"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "Kein \"%1$s\" für Korrelation \"%2$s\" übergeben."
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "Kein \"%1$s\" für die Korrelation übergeben."
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12280,11 +12053,6 @@ msgstr "Kein \"%1$s\" für Diagramm übergeben."
 msgid "No \"%1$s\" given for map."
 msgstr "Kein \"%1$s\" für Karte übergeben."
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "Kein \"%1$s\" für Medientyp übergeben."
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12292,7 +12060,7 @@ msgstr "Kein \"%1$s\" für Medientyp übergeben."
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "Kein \"%2$s\" für Filterbedingung der Aktion \"%1$s\" gegeben."
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "Kein \"%2$s\" für eine Filterbedingung der Suchlaufregel \"%1$s\" übergeben."
@@ -12302,7 +12070,7 @@ msgstr "Kein \"%2$s\" für eine Filterbedingung der Suchlaufregel \"%1$s\" über
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "Kein \"%2$s\" für Filter der Aktion \"%1$s\" gegeben."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "Kein \"%2$s\" für den Filter der Suchlaufregel \"%1$s\" übergeben."
@@ -12319,11 +12087,6 @@ msgstr "Kein Benutzername für Authentifizierung angegeben."
 msgid "No changes."
 msgstr "Keine Änderungen"
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "Keine Konditionsart für Korrelation \"%1$s\"angegeben."
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12354,14 +12117,14 @@ msgstr "Keine Standardschnittstelle für Typ \"%1$s\" bei \"%2$s\"."
 msgid "No details"
 msgstr "Keine Details"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "Keine Suchlauf-IDs festgelegt."
 
 #: app/views/administration.user.edit.php:580
 #: app/views/administration.userrole.edit.php:254
 msgid "No enabled modules found."
-msgstr ""
+msgstr "Keine aktivierten Module gefunden."
 
 #: app/views/administration.autoreg.edit.php:48
 #: app/views/administration.proxy.edit.php:96
@@ -12384,20 +12147,20 @@ msgstr "Keine Datei hinaufgeladen."
 #: include/graphs.inc.php:153
 #, c-format
 msgid "No graph item with graph ID \"%1$s\"."
-msgstr ""
+msgstr "Kein Diagrammelement mit der Diagramm-ID \"%1$s\"."
 
 #: app/views/monitoring.widget.favgraphs.view.php:26
 msgid "No graphs added."
 msgstr "Keine Diagramme hinzugefügt."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Keine Host-IDs angegeben."
 
 #: include/hosts.inc.php:515
 #, c-format
 msgid "No host groups with group ID \"%1$s\"."
-msgstr ""
+msgstr "Keine Host-Gruppen mit Gruppen-ID \"%1$s\"."
 
 #: app/controllers/CControllerWidgetUrlView.php:51
 msgid "No host selected."
@@ -12406,12 +12169,12 @@ msgstr "Kein Host ausgewählt."
 #: include/hosts.inc.php:558
 #, c-format
 msgid "No host with host ID \"%1$s\"."
-msgstr ""
+msgstr "Kein Host mit Host-ID \"%1$s\"."
 
 #: include/classes/api/services/CMapElement.php:176
 #, c-format
 msgid "No icon for map element \"\"%1$s\"."
-msgstr ""
+msgstr "Kein Symbol für Kartenelement \"\"%1$s\"."
 
 #: include/views/monitoring.sysmap.edit.php:115
 msgid "No image"
@@ -12420,7 +12183,7 @@ msgstr "Kein Bild"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Keine Schnittstelle gefunden"
 
@@ -12430,7 +12193,7 @@ msgstr "Keine Schnittstelle gefunden."
 
 #: include/views/js/configuration.host.edit.js.php:183
 msgid "No interfaces are defined."
-msgstr ""
+msgstr "Es sind keine Schnittstellen definiert."
 
 #: include/classes/api/services/CAction.php:1851
 msgid "No inventory mode specified for action operation."
@@ -12439,7 +12202,7 @@ msgstr "Keine Inventarisierungs-Modus für Aktion angegeben."
 #: include/items.inc.php:742
 #, c-format
 msgid "No item with item ID \"%1$s\"."
-msgstr ""
+msgstr "Kein Datenpunkte mit der Datenpunkt-ID \"%1$s\"."
 
 #: chart3.php:145 chart7.php:56
 msgid "No items defined."
@@ -12454,7 +12217,7 @@ msgstr "Keine Makros gefunden."
 msgid "No maps added."
 msgstr "Keine Karten hinzugefügt."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "Keine Treffer gefunden"
 
@@ -12462,25 +12225,54 @@ msgstr "Keine Treffer gefunden"
 msgid "No new modules discovered"
 msgstr "Keine neuen Module entdeckt"
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Keine Berechtigung zum Zugriff auf die Oberfläche."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
-msgstr ""
+msgstr "Keine Berechtigung zum Aufruf von \"%1$s.%2$s\"."
 
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12508,19 +12300,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12535,16 +12326,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12564,12 +12361,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12590,27 +12385,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12627,14 +12424,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12643,7 +12440,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Keine Berechtigungen für dieses bestimmte Objekt oder es existiert nicht!"
 
@@ -12663,7 +12460,7 @@ msgstr "Keine Datei mit öffentlichem Schlüssel angegeben."
 msgid "No recipients for action operation message."
 msgstr "Keine Empfänger für die Nachricht der Aktionsoperation."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr "Keine Aktualisierung"
 
@@ -12675,14 +12472,14 @@ msgstr "Kein Skript festgelegt für das Kommando der Aktionsoperation."
 msgid "No target selected"
 msgstr "Kein Ziel ausgewählt"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Kein Ziel ausgewählt."
 
 #: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
-msgstr ""
+msgstr "Kein Trigger mit der Trigger-ID \"%1$s\"."
 
 #: chart4.php:42
 msgid "No triggers defined."
@@ -12692,7 +12489,7 @@ msgstr "Keine Auslöser definiert."
 msgid "No value"
 msgstr "Kein Wert"
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr "Nicht boolesche Markierungen sind veraltet."
 
@@ -12760,25 +12557,25 @@ msgstr "Es werden nicht alle Ergebnisse angezeigt. Bitte geben Sie genauere Such
 #: include/classes/api/services/CTriggerPrototype.php:852
 #, c-format
 msgid "Not all templates are linked to \"%1$s\"."
-msgstr ""
+msgstr "Nicht alle Vorlagen sind mit \"%1$s\" verknüpft."
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr "Nicht erlaubt, Sprache für Benutzer \"guest\" zu setzen."
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Nicht erlaubt, Passwort für Benutzer \"guest\" zu setzen."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
-msgstr ""
+msgstr "Es ist nicht erlaubt, das Thema für den Benutzer \"Gast\" festzulegen."
 
 #: include/classes/api/clients/CLocalApiClient.php:164
 #: include/classes/api/clients/CLocalApiClient.php:192
 #: include/classes/api/clients/CLocalApiClient.php:218
 msgid "Not authorized."
-msgstr ""
+msgstr "Nicht zulässig."
 
 #: app/views/monitoring.widget.hostavail.view.php:34
 #: app/views/monitoring.widget.hostavail.view.php:62
@@ -12803,7 +12600,7 @@ msgstr "Keine geerbten Datenpunkte"
 msgid "Not supported"
 msgstr "Nicht unterstützt"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Notiz"
@@ -12829,13 +12626,13 @@ msgstr "Benachrichtigungen"
 #: include/actions.inc.php:865 include/actions.inc.php:1038
 #: include/actions.inc.php:1039
 msgid "Notify all involved"
-msgstr ""
+msgstr "Alle Beteiligten benachrichtigen"
 
 #: include/func.inc.php:230
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "November"
 
@@ -12846,12 +12643,12 @@ msgstr "Anzahl der CPUs. Rückgabewert Ganzzahl"
 
 #: include/classes/items/CHelpItems.php:901
 msgid "Number of available DS paths, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - Datastore name, <partitionid> - internal id of physical device from vmware.hv.datastore.discovery"
-msgstr ""
+msgstr "Anzahl der verfügbaren DS-Pfade, <url> - VMware-Service-URL, <uuid> - VMware-Hypervisor-Hostname, <datastore> - Name des Datenspeichers, <partitionid> - interne ID des physischen Geräts aus vmware.hv.datastore.discovery"
 
 #: include/classes/items/CHelpItems.php:89
 #: include/classes/items/CHelpItems.php:451
 msgid "Number of currently open file descriptors. Returns integer"
-msgstr ""
+msgstr "Anzahl der aktuell geöffneten Dateideskriptoren. Rückgabe Integer"
 
 #: include/classes/items/CHelpItems.php:1209
 msgid "Number of enabled items on the host."
@@ -12859,7 +12656,7 @@ msgstr "Anzahl der aktivierten Datenpunkte auf dem Host."
 
 #: include/blocks.inc.php:536
 msgid "Number of hosts (enabled/disabled)"
-msgstr ""
+msgstr "Anzahl der Hosts (aktiviert/deaktiviert)"
 
 #: include/blocks.inc.php:549
 msgid "Number of items (enabled/disabled/not supported)"
@@ -12881,7 +12678,7 @@ msgstr "Anzahl an Datenpunkten in der Warteschlange, die von bis Sekunden, inklu
 #: include/classes/items/CHelpItems.php:795
 #: include/classes/items/CHelpItems.php:1281
 msgid "Number of items in the queue which are delayed in Zabbix server or proxy by \"from\" till \"to\" seconds, inclusive."
-msgstr ""
+msgstr "Anzahl der Elemente in der Warteschlange, die im Zabbix-Server oder -Proxy um \"von\" bis einschließlich \"bis\" Sekunden verzögert werden."
 
 #: include/classes/items/CHelpItems.php:1229
 msgid "Number of monitored hosts"
@@ -12890,7 +12687,7 @@ msgstr "Anzahl der überwachten Hosts"
 #: include/classes/items/CHelpItems.php:105
 #: include/classes/items/CHelpItems.php:487
 msgid "Number of out-of-window collisions. Returns integer"
-msgstr ""
+msgstr "Anzahl der Kollisionen außerhalb des Fensters. Rückgabe Ganzzahl"
 
 #: include/views/monitoring.sysmap.edit.php:153
 msgid "Number of problems"
@@ -12902,7 +12699,7 @@ msgstr "Anzahl der Probleme und Erweiterung des kritischsten Problems"
 
 #: include/classes/items/CHelpItems.php:933
 msgid "Number of processor cores on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Anzahl der Prozessorkerne auf dem VMware-Hypervisor, <url> - URL des VMware-Dienstes, <uuid> - Hostname des VMware-Hypervisors"
 
 #: include/classes/items/CHelpItems.php:937
 msgid "Number of processor threads on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
@@ -12931,19 +12728,19 @@ msgstr "Anzahl von Vorlagen"
 
 #: include/blocks.inc.php:560
 msgid "Number of triggers (enabled/disabled [problem/ok])"
-msgstr ""
+msgstr "Anzahl der Auslöser (aktiviert/deaktiviert [Problem/ok])"
 
 #: include/classes/items/CHelpItems.php:1297
 msgid "Number of triggers in Zabbix database."
-msgstr ""
+msgstr "Anzahl der Auslöser in der Zabbix-Datenbank."
 
 #: include/classes/items/CHelpItems.php:1237
 msgid "Number of unsupported items in Zabbix database."
-msgstr ""
+msgstr "Anzahl der nicht unterstützten Datenpunkte in der Zabbix-Datenbank."
 
 #: include/classes/items/CHelpItems.php:1213
 msgid "Number of unsupported items on the host."
-msgstr ""
+msgstr "Anzahl der nicht unterstützten Datenpunkte auf dem Host."
 
 #: include/blocks.inc.php:572
 msgid "Number of users (online)"
@@ -12952,27 +12749,27 @@ msgstr "Anzahl der Benutzer (online)"
 #: include/classes/items/CHelpItems.php:301
 #: include/classes/items/CHelpItems.php:683
 msgid "Number of users logged in. Returns integer"
-msgstr ""
+msgstr "Anzahl der eingeloggten Benutzer. Gibt ganze Zahl zurück"
 
 #: include/classes/items/CHelpItems.php:1189
 msgid "Number of values stored in table HISTORY."
-msgstr ""
+msgstr "Anzahl der in der Tabelle HISTORY gespeicherten Werte."
 
 #: include/classes/items/CHelpItems.php:1193
 msgid "Number of values stored in table HISTORY_LOG."
-msgstr ""
+msgstr "Anzahl der in der Tabelle HISTORY_LOG gespeicherten Werte."
 
 #: include/classes/items/CHelpItems.php:1197
 msgid "Number of values stored in table HISTORY_STR."
-msgstr ""
+msgstr "Anzahl der in der Tabelle HISTORY_STR gespeicherten Werte."
 
 #: include/classes/items/CHelpItems.php:1201
 msgid "Number of values stored in table HISTORY_TEXT."
-msgstr ""
+msgstr "Anzahl der in der Tabelle HISTORY_TEXT gespeicherten Werte."
 
 #: include/classes/items/CHelpItems.php:1205
 msgid "Number of values stored in table HISTORY_UINT."
-msgstr ""
+msgstr "Anzahl der in der Tabelle HISTORY_UNIT gespeicherten Werte."
 
 #: include/classes/items/CHelpItems.php:1289
 msgid "Number of values stored in table TRENDS."
@@ -12980,11 +12777,11 @@ msgstr "Anzahl der Werte in welche Tabelle TRENDS gespeichert sind."
 
 #: include/classes/items/CHelpItems.php:1293
 msgid "Number of values stored in table TRENDS_UINT."
-msgstr ""
+msgstr "Anzahl der in der Tabelle TRENDS_UINT gespeicherten Werte."
 
 #: include/classes/items/CHelpItems.php:997
 msgid "Number of virtual machines on VMware hypervisor, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "Anzahl der virtuellen Maschinen auf VMware-Hypervisor, <url> - VMware-Service-URL, <uuid> - VMware-Hypervisor-Hostname"
 
 #: include/classes/items/CHelpItems.php:377
 #: include/classes/items/CHelpItems.php:759
@@ -13022,8 +12819,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13036,12 +12833,12 @@ msgstr "OK"
 #: include/views/configuration.trigger.prototype.edit.php:500
 #: include/views/configuration.triggers.edit.php:527
 msgid "OK event closes"
-msgstr ""
+msgstr "OK Ereignis wird geschlossen"
 
 #: include/views/configuration.trigger.prototype.edit.php:295
 #: include/views/configuration.triggers.edit.php:320
 msgid "OK event generation"
-msgstr ""
+msgstr "OK-Ereigniserzeugung"
 
 #: include/hosts.inc.php:299
 msgid "OOB IP address"
@@ -13083,13 +12880,13 @@ msgstr "Okt"
 msgid "Octal to decimal"
 msgstr "Oktal zu Dezimal"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Oktober"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Aus"
 
@@ -13097,30 +12894,31 @@ msgstr "Aus"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
-msgstr ""
+msgstr "Alter Ereignis-Tag-Name"
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr "Alter Ereignis-Marker Wert"
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "An"
 
@@ -13136,35 +12934,15 @@ msgstr "Einmal"
 msgid "One"
 msgstr "Einer"
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "Eines der Objekte bleibt ohne eine Host-Gruppe."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Einmalig"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Einmalige Downtime"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Nur Super-Admins können Hostgruppen erstellen."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Nur Super-Admins können Medientypen erstellen."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Nur Super-Admins können Medientypen löschen."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Nur Super-Admins können Medientypen bearbeiten."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Nur Zabbix Agent, SNMPv1, SNMPv2 und SNMPv3 Checks können einzigartig gemacht werden."
@@ -13192,12 +12970,12 @@ msgstr "Nur eine Prüfung kann als einzigartig markiert werden."
 
 #: include/classes/api/services/CItemGeneral.php:1602
 msgid "Only one not supported value check is allowed."
-msgstr ""
+msgstr "Es ist nur eine Prüfung auf nicht unterstützte Werte zulässig."
 
 #: include/classes/api/services/CItemGeneral.php:1421
 #: include/classes/api/services/CItemGeneral.php:1470
 msgid "Only one throttling step is allowed."
-msgstr ""
+msgstr "Es ist nur eine Drosselungsstufe zulässig."
 
 #: app/views/popup.acknowledge.edit.php:58
 msgid "Only selected problem"
@@ -13213,28 +12991,20 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "Nur Super-Admins können Korrelationen erstellen."
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
-msgstr "Nur Super-Admins können den Dashboard-Besitzer festlegen."
+msgstr "Nur Super-Admins können den Übersichtsseiten-Besitzer festlegen."
 
 #: include/classes/api/services/CReport.php:334
 msgid "Only super admins can set report owner."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr "Nur Super-Admins können Korrelationen aktualisieren."
+msgstr "Nur Superadmins können den Berichtseigentümer festlegen."
 
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Nur Auslöser, die mit aktiven Hosts und aktiven Datenpunkten verbunden sind, werden gezählt"
 
 # Der Browser
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13243,20 +13013,20 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Informationen zum Betriebssystem. Rüchgabewert Zeichenfolge"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
 #: actionconf.php:279
 #, c-format
 msgid "Operation \"%1$s\" already exists."
-msgstr ""
+msgstr "Operation \"%1$s\" existiert bereits."
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Operation kann wegen unautorisierter Anfrage nicht ausgeführt werden."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Operations-Details"
 
@@ -13276,9 +13046,9 @@ msgstr "Operation hat keine zugeordneten Vorlagen zur Ausführung."
 #: include/views/configuration.triggers.edit.php:106
 #: include/views/configuration.triggers.list.php:193
 msgid "Operational data"
-msgstr ""
+msgstr "Operative Daten"
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13287,39 +13057,39 @@ msgstr ""
 msgid "Operations"
 msgstr "Operationen"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operator"
 
 #: app/views/popup.triggerexpr.php:113
 msgid "Operator functions"
-msgstr ""
+msgstr "Operator-Funktionen"
 
 #: app/views/administration.mediatype.edit.php:346
 msgid "Options"
@@ -13424,7 +13194,7 @@ msgid "Other parameters"
 msgstr "Weitere Einstellungen"
 
 # Andere Browser
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Andere"
@@ -13438,10 +13208,10 @@ msgstr "Ausgehenden Traffic-Statistiken auf Netzwerk-Schnittstelle. Rückgabewer
 msgid "Output"
 msgstr "Ausgabe"
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
-msgstr ""
+msgstr "Überlappende Widgets bei X:%3$d, Y:%4$d auf Seite #%2$d der Übersichtsseite \"%1$s\"."
 
 #: include/views/configuration.item.edit.php:749
 #: include/views/configuration.item.edit.php:785
@@ -13467,7 +13237,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr "Der Vorrang mit dem Namen \"%1$s\" existiert bereits."
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13479,7 +13249,7 @@ msgstr "Vorränge"
 #: include/classes/helpers/CRoleHelper.php:324
 #: include/views/inventory.host.view.php:235 overview.php:27
 msgid "Overview"
-msgstr "Übersicht"
+msgstr "Überblick"
 
 #: app/partials/scheduledreport.formgrid.html.php:69
 #: app/partials/scheduledreport.table.html.php:40
@@ -13499,11 +13269,11 @@ msgstr "PHP LDAP Erweiterung fehlt."
 
 #: include/classes/setup/CFrontendSetup.php:547
 msgid "PHP OpenSSL"
-msgstr ""
+msgstr "PHP OpenSSL"
 
 #: include/classes/setup/CFrontendSetup.php:551
 msgid "PHP OpenSSL extension missing."
-msgstr ""
+msgstr "PHP OpenSSL-Erweiterung fehlt."
 
 #: include/classes/setup/CFrontendSetup.php:290
 msgid "PHP bcmath"
@@ -13539,11 +13309,11 @@ msgstr "PHP gd FreeType support fehlt."
 
 #: include/classes/setup/CFrontendSetup.php:437
 msgid "PHP gd GIF image support missing."
-msgstr ""
+msgstr "PHP gd GIF-Bildunterstützung fehlt."
 
 #: include/classes/setup/CFrontendSetup.php:433
 msgid "PHP gd GIF support"
-msgstr ""
+msgstr "PHP gd GIF-Unterstützung"
 
 #: include/classes/setup/CFrontendSetup.php:420
 msgid "PHP gd JPEG image support missing."
@@ -13612,11 +13382,11 @@ msgstr "PHP session"
 
 #: include/classes/setup/CFrontendSetup.php:612
 msgid "PHP session auto start must be disabled (PHP directive \"session.auto_start\")."
-msgstr ""
+msgstr "Der automatische Start der PHP-Sitzung muss deaktiviert sein (PHP-Direktive \"session.auto_start\")."
 
 #: include/classes/setup/CFrontendSetup.php:595
 msgid "PHP session extension missing (PHP configuration parameter --enable-session)."
-msgstr ""
+msgstr "PHP-Session-Erweiterung fehlt (PHP-Konfigurationsparameter --enable-session)."
 
 #: include/classes/setup/CFrontendSetup.php:345
 msgid "PHP sockets"
@@ -13624,7 +13394,7 @@ msgstr "PHP sockets"
 
 #: include/classes/setup/CFrontendSetup.php:349
 msgid "PHP sockets extension missing (PHP configuration parameter --enable-sockets)."
-msgstr ""
+msgstr "PHP-Sockets-Erweiterung fehlt (PHP-Konfigurationsparameter --enable-sockets)."
 
 #: include/classes/setup/CFrontendSetup.php:332
 msgid "PHP string function overloading must be disabled."
@@ -13640,7 +13410,7 @@ msgstr "PHP xmlreader"
 
 #: include/classes/setup/CFrontendSetup.php:517
 msgid "PHP xmlreader extension missing."
-msgstr ""
+msgstr "PHP xmlreader-Erweiterung fehlt."
 
 #: include/classes/setup/CFrontendSetup.php:496
 msgid "PHP xmlwriter"
@@ -13648,7 +13418,7 @@ msgstr "PHP xmlwriter"
 
 #: include/classes/setup/CFrontendSetup.php:500
 msgid "PHP xmlwriter extension missing."
-msgstr ""
+msgstr "PHP xmlwriter-Erweiterung fehlt."
 
 #: include/discovery.inc.php:52
 msgid "POP"
@@ -13656,7 +13426,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13667,7 +13437,7 @@ msgstr "PROBLEM"
 #: include/views/configuration.trigger.prototype.edit.php:493
 #: include/views/configuration.triggers.edit.php:520
 msgid "PROBLEM event generation mode"
-msgstr ""
+msgstr "PROBLEM Ereignisgenerierungsmodus"
 
 #: app/views/administration.autoreg.edit.php:50
 #: app/views/administration.autoreg.edit.php:67
@@ -13701,14 +13471,14 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "PSK-Identität"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr "Seite %1$d"
 
 #: app/views/dashboard.page.properties.edit.php:55
 msgid "Page display period"
-msgstr ""
+msgstr "Anzeigezeitraum der Seite"
 
 #: app/controllers/CControllerWidgetIteratorGraphPrototypeView.php:46
 #: include/validate.inc.php:435
@@ -13724,16 +13494,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parameter"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "Parameter \"%1$s\" ist veraltet."
@@ -13764,7 +13534,7 @@ msgstr "Übergeordnete Elemente"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13781,7 +13551,7 @@ msgstr "Übergeordnete Auslöser"
 msgid "Parent web scenarios"
 msgstr "Übergeordnete Web-Szenarien"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13793,11 +13563,6 @@ msgstr ""
 msgid "Parse"
 msgstr "Analysieren"
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "SQL-Parsing-Fehler [%1$s] in [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Parsing-Fehler"
@@ -13846,19 +13611,19 @@ msgstr "Für nicht-interne Authentifizierungsarten ist das Passwort nicht zwinge
 
 #: app/views/administration.authentication.edit.php:45
 msgid "Password must contain"
-msgstr ""
+msgstr "Das Passwort muss enthalten"
 
 #: app/views/administration.authentication.edit.php:39
 msgid "Password policy"
-msgstr ""
+msgstr "Passwort-Richtlinie"
 
 #: app/views/administration.authentication.edit.php:47
 #: app/views/administration.authentication.edit.php:96
 #: app/views/administration.user.edit.php:153
 msgid "Password requirements:"
-msgstr ""
+msgstr "Passwort-Anforderungen:"
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr "Einfügen"
 
@@ -13868,15 +13633,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr "Ohne externe Links einfügen"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr "Muster"
@@ -13892,7 +13657,7 @@ msgstr "Höchstwert Speichernutzung: %1$s"
 
 #: include/classes/items/CHelpItems.php:1009
 msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Prozentsatz der Zeit, in der die virtuelle Maschine nicht ausgeführt werden kann, weil sie um den Zugriff auf die physische(n) CPU(s) kämpft, <url> - VMware-Service-URL, <uuid> - Hostname der virtuellen VMware-Maschine"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:213
 msgid "Percentage"
@@ -13900,7 +13665,7 @@ msgstr "Prozentsatz"
 
 #: include/classes/items/CHelpItems.php:1093
 msgid "Percentage of host physical memory that has been consumed, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Prozentsatz des verbrauchten physischen Arbeitsspeichers des Hosts, <url> - VMware-Service-URL, <uuid> - Hostname der virtuellen VMware-Maschine"
 
 #: include/classes/items/CHelpItems.php:1017
 msgid "Percentage of time that the virtual machine was ready, but could not get scheduled to run on the physical CPU, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - CPU instance"
@@ -13922,18 +13687,17 @@ msgstr "Führt eine DNS-Abfrage durch. Gibt eine Zeichenkette mit dem gewünscht
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Zeitraum"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:95
 msgid "Period shift"
-msgstr ""
+msgstr "Periodenverschiebung"
 
 #: app/views/popup.maintenance.period.php:69
 #: app/views/popup.service.time.edit.php:39
@@ -13993,7 +13757,7 @@ msgstr "Geräusch abspielen"
 #: include/classes/setup/CSetupWizard.php:567
 #, c-format
 msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
-msgstr ""
+msgstr "Bitte überprüfen Sie die Konfigurationsparameter. Wenn alles korrekt ist, drücken Sie die Taste \"%1$s\" oder \"%2$s\", um die Konfigurationsparameter zu ändern."
 
 #: app/views/js/popup.massupdate.js.php:401
 msgid "Please confirm that you want to remove all macros."
@@ -14001,7 +13765,7 @@ msgstr "Bitte bestätigen Sie, dass Sie alle Makros entfernen möchten."
 
 #: app/views/js/popup.massupdate.js.php:404
 msgid "Please confirm that you want to remove all value mappings."
-msgstr ""
+msgstr "Bitte bestätigen Sie, dass Sie alle Wertezuordnungen entfernen möchten."
 
 #: include/classes/setup/CSetupWizard.php:430
 #, c-format
@@ -14010,13 +13774,13 @@ msgstr "Bitte erstellen Sie Datenbank manuell und legen Sie die Konfigurationspa
 
 #: include/classes/setup/CSetupWizard.php:888
 msgid "Please enable \"allow_url_fopen\" directive."
-msgstr ""
+msgstr "Bitte aktivieren Sie die Richtlinie \"allow_url_fopen\"."
 
 #: include/classes/setup/CSetupWizard.php:458
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Bitte geben Sie den Hostnamen oder die Host-IP-Adresse und die Portnummer des Zabbix-Servers sowie den Namen der Installation (optional) ein."
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Bitte zwei Elemente auswählen"
 
@@ -14033,7 +13797,7 @@ msgstr "Bitte zwei Elemente auswählen"
 #: include/classes/widgets/CWidgetHelper.php:836
 #: include/classes/widgets/CWidgetHelper.php:1062
 msgid "Point size"
-msgstr ""
+msgstr "Punktgröße"
 
 #: include/classes/widgets/CWidgetHelper.php:756
 #: include/classes/widgets/CWidgetHelper.php:799
@@ -14056,7 +13820,7 @@ msgstr "Befüllt das Inventarfeld des Hosts"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14088,7 +13852,7 @@ msgstr "Beitragstyp"
 
 #: include/classes/items/CHelpItems.php:977
 msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
-msgstr ""
+msgstr "Stromverbrauch , <url> - VMware-Service-URL, <uuid> - VMware-Hypervisor-Hostname, <max> - Maximal zulässiger Stromverbrauch"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:825
 msgid "Power value"
@@ -14101,7 +13865,7 @@ msgstr "Zusammenfassung vor Installation"
 
 #: app/views/popup.triggerexpr.php:114
 msgid "Prediction functions"
-msgstr ""
+msgstr "Vorhersagefunktionen"
 
 #: app/views/popup.massupdate.item.php:494
 #: include/views/configuration.host.discovery.edit.php:875
@@ -14145,7 +13909,7 @@ msgid "Previous month"
 msgstr "Vorangehender Monat"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr "Vorangehende Seite"
 
@@ -14195,13 +13959,13 @@ msgstr "Anzeigename für Primärkontakt"
 #: app/views/popup.itemtestedit.view.php:224
 #: include/views/js/configuration.host.edit.js.php:135
 msgid "Privacy passphrase"
-msgstr ""
+msgstr "Datenschutz-Passphrase"
 
 #: app/views/popup.discovery.check.php:110
 #: app/views/popup.itemtestedit.view.php:214
 #: include/views/js/configuration.host.edit.js.php:129
 msgid "Privacy protocol"
-msgstr ""
+msgstr "Datenschutz-Protokoll"
 
 #: app/views/popup.dashboard.share.edit.php:125
 #: include/views/monitoring.sysmap.edit.php:398
@@ -14277,7 +14041,7 @@ msgstr "Problem ist nicht unterdrückt"
 msgid "Problem is suppressed"
 msgstr "Problem ist unterdrückt"
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Problem auf"
 
@@ -14290,22 +14054,17 @@ msgstr "Problembehebung"
 msgid "Problem resolved"
 msgstr "Problem gelöst"
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-# Bezieht sich auf SLA-Berechnung
-#: srv_status.php:147
-msgid "Problem time"
-msgstr "Ausfallzeit"
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr "Problemaktualisierung"
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14319,9 +14078,9 @@ msgstr "Problemaktualisierung"
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Probleme"
 
@@ -14332,7 +14091,7 @@ msgstr "Probleme nach Schweregrad"
 #: include/classes/items/CHelpItems.php:181
 #: include/classes/items/CHelpItems.php:563
 msgid "Process CPU utilization percentage. Returns float"
-msgstr ""
+msgstr "Prozentuale CPU-Auslastung des Prozesses. Rückgabe float"
 
 #: app/views/administration.mediatype.edit.php:235
 msgid "Process tags"
@@ -14355,7 +14114,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "Boats"
 
@@ -14366,7 +14125,7 @@ msgstr "Boats"
 #: include/classes/helpers/CVaultHelper.php:107
 #, c-format
 msgid "Provided URL \"%1$s\" is invalid."
-msgstr ""
+msgstr "Die angegebene URL \"%1$s\" ist ungültig."
 
 #: app/controllers/CControllerPopupGeneric.php:171
 #: app/views/administration.proxy.edit.php:29
@@ -14376,13 +14135,13 @@ msgstr ""
 msgid "Proxies"
 msgstr "Proxys"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14390,22 +14149,22 @@ msgstr "Proxys"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
-msgstr ""
+msgstr "Proxy \"%1$s\" existiert bereits."
 
 #: include/classes/import/importers/CHostImporter.php:313
 #, c-format
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Proxy \"%1$s\" für Host \"%2$s\" existiert nicht."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
-msgstr ""
+msgstr "Proxy \"%1$s\" wird von Aktion \"%2$s\" verwendet."
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Suchlaufregel \"%2$s\" verwendet Proxy \"%1$s\"."
@@ -14498,7 +14257,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14542,12 +14301,12 @@ msgstr "Nur lesen"
 #: app/views/administration.user.edit.php:552
 #: app/views/administration.userrole.edit.php:180
 msgid "Read-only access to services"
-msgstr ""
+msgstr "Nur-Lese-Zugriff auf Dienste"
 
 #: app/views/administration.user.edit.php:561
 #: app/views/administration.userrole.edit.php:204
 msgid "Read-only access to services with tag"
-msgstr ""
+msgstr "Nur-Lese-Zugriff auf Dienste mit Tag"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
@@ -14563,7 +14322,7 @@ msgstr "Lesen/Schreiben"
 #: app/views/administration.user.edit.php:507
 #: app/views/administration.userrole.edit.php:139
 msgid "Read-write access to services"
-msgstr ""
+msgstr "Lese- und Schreibzugriff auf Dienste"
 
 #: app/views/administration.user.edit.php:516
 #: app/views/administration.userrole.edit.php:163
@@ -14575,10 +14334,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr "Liest Modbus-Daten. Gibt verschiedene Typen zurück"
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr "Grund"
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Empfangener Wert"
@@ -14637,11 +14392,11 @@ msgstr "Ausdruck der Wiederherstellung"
 #: include/forms.inc.php:1918 include/forms.inc.php:1925
 #: include/forms.inc.php:1935
 msgid "Recovery expression syntax error."
-msgstr ""
+msgstr "Syntaxfehler des Wiederherstellungsausdrucks."
 
 #: include/views/configuration.action.edit.php:396
 msgid "Recovery operations"
-msgstr ""
+msgstr "Wiederherstellungsmassnahmen"
 
 #: app/views/hintbox.eventlist.php:73
 #: app/views/monitoring.widget.problems.view.php:55
@@ -14660,7 +14415,7 @@ msgstr "Rechteck"
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr "Aktualisierungsintervall"
 
@@ -14678,16 +14433,16 @@ msgstr "Ausgewähltes API-Token neu generieren? Das zuvor generierte Token wird
 msgid "Regular"
 msgstr "Regulär"
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Regulärer Ausdruck"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
-msgstr ""
+msgstr "Regulärer Ausdruck \"%1$s\" existiert bereits."
 
 #: app/controllers/CControllerRegExCreate.php:67
 msgid "Regular expression added"
@@ -14715,11 +14470,11 @@ msgstr "Reguläre Ausdrücke"
 
 #: app/controllers/CControllerPopupScheduledReportList.php:52
 msgid "Related reports"
-msgstr ""
+msgstr "Verwandte Berichte"
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
-msgstr ""
+msgstr "Freigeben, um ein Widget zu erstellen."
 
 #: include/views/general.login.php:77
 msgid "Remember me for 30 days"
@@ -14749,8 +14504,6 @@ msgstr "Befehl ausführen"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14771,7 +14524,9 @@ msgstr "Befehl ausführen"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14784,7 +14539,7 @@ msgstr "Befehl ausführen"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14861,8 +14616,8 @@ msgstr "Befehl ausführen"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -14877,7 +14632,7 @@ msgstr "Domänenname entfernen"
 
 #: app/controllers/CControllerFavouriteCreate.php:64 include/html.inc.php:147
 msgid "Remove from favorites"
-msgstr ""
+msgstr "Aus Favoriten entfernen"
 
 #: include/actions.inc.php:1034
 msgid "Remove from host group"
@@ -14902,15 +14657,15 @@ msgstr "Entferne, %1$s"
 msgid "Removed"
 msgstr "Entfernt"
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
-msgstr ""
+msgstr "Entfernt, %1$s"
 
 #: app/partials/massupdate.valuemaps.tab.php:96
 msgid "Rename"
-msgstr ""
+msgstr "Umbenennen"
 
 #: app/controllers/CControllerPopupScheduledReportCreate.php:70
 #: app/controllers/CControllerScheduledReportCreate.php:82
@@ -14944,7 +14699,7 @@ msgid "Replace dependencies"
 msgstr "Abhängigkeiten ersetzen"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14959,26 +14714,26 @@ msgstr "Berichte, die von anderen Benutzern erstellt wurden, werden auf den aktu
 
 #: app/controllers/CControllerPopupScheduledReportTest.php:97
 msgid "Report generating test failed."
-msgstr ""
+msgstr "Der Test zur Berichterstellung ist fehlgeschlagen."
 
 #: app/controllers/CControllerPopupScheduledReportTest.php:94
 msgid "Report generating test successful."
-msgstr ""
+msgstr "Berichtserstellungstest erfolgreich."
 
 #: app/views/popup.scheduledreport.subscription.php:108
 #, c-format
 msgid "Report is currently generated by \"%1$s\"."
-msgstr ""
+msgstr "Der Bericht wird derzeit von \"%1$s\" erstellt."
 
 #: app/views/popup.scheduledreport.test.php:52
 #, c-format
 msgid "Report sending failed for: %1$s."
-msgstr ""
+msgstr "Berichtssendung fehlgeschlagen für: %1$s."
 
 #: app/views/popup.scheduledreport.test.php:44
 #, c-format
 msgid "Report was successfully sent to: %1$s."
-msgstr ""
+msgstr "Bericht wurde erfolgreich gesendet an: %1$s."
 
 #: include/classes/helpers/CMenuHelper.php:141
 #: include/classes/helpers/CRoleHelper.php:279
@@ -14999,15 +14754,15 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
-msgstr ""
+msgstr "Anfrage erfolgreich gesendet"
 
 #: include/views/configuration.host.discovery.edit.php:245
 #: include/views/configuration.item.edit.php:281
 #: include/views/configuration.item.prototype.edit.php:262
 msgid "Request type"
-msgstr ""
+msgstr "Typ der Anfrage"
 
 #: include/classes/setup/CSetupWizard.php:237
 #: include/views/configuration.httpconf.edit.php:205
@@ -15041,8 +14796,8 @@ msgstr "Geforderter HTTP-Statuscode"
 msgid "Required string"
 msgstr "Geforderte Zeichenkette"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Zurücksetzen"
 
@@ -15075,7 +14830,7 @@ msgstr "Bestätigung zurücksetzen"
 msgid "Reset defaults"
 msgstr "Auf Standardwerte zurücksetzen"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Wiederhergestellt"
 
@@ -15089,17 +14844,17 @@ msgstr "Behoben durch"
 #: include/classes/screens/CScreenProblem.php:990
 #, c-format
 msgid "Resolved by correlation rule \"%1$s\"."
-msgstr ""
+msgstr "Gelöst durch Korrelationsregel \"%1$s\"."
 
 #: app/views/monitoring.widget.problems.view.php:157
 #: include/classes/screens/CScreenProblem.php:993
 msgid "Resolved by correlation rule."
-msgstr ""
+msgstr "Gelöst durch die Korrelationsregel."
 
 #: app/views/monitoring.widget.problems.view.php:164
 #: include/classes/screens/CScreenProblem.php:1000
 msgid "Resolved by inaccessible user."
-msgstr ""
+msgstr "Gelöst von einem unzugänglichen Benutzer."
 
 #: app/views/monitoring.widget.problems.view.php:163
 #: include/classes/screens/CScreenProblem.php:999
@@ -15142,7 +14897,7 @@ msgstr "Antworttyp: Zeichenkette"
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Ergebnis"
@@ -15150,7 +14905,7 @@ msgstr "Ergebnis"
 #: app/controllers/CControllerPopupItemTestSend.php:418
 #, c-format
 msgid "Result converted to %1$s"
-msgstr ""
+msgstr "Ergebnis konvertiert in %1$s"
 
 #: app/views/js/administration.regex.edit.js.php:176
 #: include/classes/helpers/CRegexHelper.php:30
@@ -15188,11 +14943,11 @@ msgstr "Wiederholen"
 
 #: include/classes/items/CHelpItems.php:1345
 msgid "Return a JSON array with LLD macros describing the MBean objects or their attributes. Can be used for LLD."
-msgstr ""
+msgstr "Gibt ein JSON-Array mit LLD-Makros zurück, die die MBean-Objekte oder ihre Attribute beschreiben. Kann für LLD verwendet werden."
 
 #: include/classes/items/CHelpItems.php:1349
 msgid "Return a JSON array with MBean objects or their attributes. Compared to jmx.discovery it does not define LLD macros. Can be used for LLD."
-msgstr ""
+msgstr "Gibt ein JSON-Array mit MBean-Objekten oder deren Attributen zurück. Im Vergleich zu jmx.discovery definiert es keine LLD-Makros. Kann für LLD verwendet werden."
 
 #: include/classes/items/CHelpItems.php:1327
 msgid "Return first column of the first row of the SQL query result."
@@ -15200,12 +14955,12 @@ msgstr "Gibt die erste Spalte der ersten Zeile des SQL-Abfrageergebnisses zurüc
 
 #: include/classes/items/CHelpItems.php:1341
 msgid "Return value of an attribute of MBean object."
-msgstr ""
+msgstr "Rückgabewert eines Attributs des MBean-Objekts."
 
 #: include/classes/items/CHelpItems.php:349
 #: include/classes/items/CHelpItems.php:731
 msgid "Returns 4-digit string containing octal number with Unix permissions"
-msgstr ""
+msgstr "Gibt eine 4-stellige Zeichenkette zurück, die eine Oktalzahl mit Unix-Berechtigungen enthält"
 
 #: include/classes/items/CHelpItems.php:809
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
@@ -15213,17 +14968,17 @@ msgstr "Gibt die ICMP-Ping-Antwortzeit in Sekunden zurück. Beispiel: 0,02"
 
 #: include/classes/items/CHelpItems.php:1221
 msgid "Returns a JSON array describing the host network interfaces configured in Zabbix. Can be used for LLD."
-msgstr ""
+msgstr "Gibt ein JSON-Array zurück, das die in Zabbix konfigurierten Host-Netzwerkschnittstellen beschreibt. Kann für LLD verwendet werden."
 
 #: include/classes/items/CHelpItems.php:413
 #: include/classes/items/CHelpItems.php:791
 #: include/classes/items/CHelpItems.php:1277
 msgid "Returns a JSON object containing Zabbix server or proxy internal metrics."
-msgstr ""
+msgstr "Gibt ein JSON-Objekt mit den internen Metriken des Zabbix-Servers oder -Proxys zurück."
 
 #: include/classes/items/CHelpItems.php:1225
 msgid "Returns availability of a particular type of checks on the host. Value of this item corresponds to availability icons in the host list. Valid types are: agent, snmp, ipmi, jmx."
-msgstr ""
+msgstr "Gibt die Verfügbarkeit einer bestimmten Art von Checks auf dem Host zurück. Der Wert dieses Elements entspricht den Verfügbarkeitssymbolen in der Host-Liste. Gültige Typen sind: agent, snmp, ipmi, jmx."
 
 #: include/classes/items/CHelpItems.php:1217
 msgid "Returns current maintenance status of the host."
@@ -15236,7 +14991,7 @@ msgstr "Gibt Informationen zurück, die mit dem Zabbix Java-Gateway verbunden si
 #: include/classes/items/CHelpItems.php:145
 #: include/classes/items/CHelpItems.php:527
 msgid "Returns number of TCP sockets that match parameters. Returns integer"
-msgstr ""
+msgstr "Gibt die Anzahl der TCP-Sockets zurück, die den Parametern entsprechen. Gibt ganze Zahl zurück"
 
 #: include/classes/items/CHelpItems.php:161
 #: include/classes/items/CHelpItems.php:543
@@ -15245,11 +15000,11 @@ msgstr ""
 
 #: include/classes/items/CHelpItems.php:805
 msgid "Returns percentage of lost ICMP ping packets."
-msgstr ""
+msgstr "Gibt den Prozentsatz der verlorenen ICMP-Ping-Pakete zurück."
 
 #: include/classes/html/CMacroValue.php:94
 msgid "Revert changes"
-msgstr ""
+msgstr "Änderungen rückgängig machen"
 
 #: include/classes/widgets/CWidgetHelper.php:768
 #: include/classes/widgets/CWidgetHelper.php:843
@@ -15268,11 +15023,11 @@ msgstr "Rechts"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:208
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
 msgid "Right Y"
-msgstr ""
+msgstr "Rechts Y"
 
 #: include/items.inc.php:1815
 msgid "Right trim"
-msgstr ""
+msgstr "Rechter Beschnitt"
 
 #: app/views/administration.user.edit.php:408
 #: app/views/administration.user.edit.php:418
@@ -15286,7 +15041,7 @@ msgstr "Rumänisch (ro_RO)"
 #: app/partials/monitoring.service.list.edit.php:55
 #: app/partials/monitoring.service.list.php:52
 msgid "Root cause"
-msgstr ""
+msgstr "Ursache"
 
 #: include/classes/widgets/forms/CWidgetForm.php:81
 msgid "Rows"
@@ -15303,22 +15058,22 @@ msgstr "Regeln"
 #: include/actions.inc.php:635 include/actions.inc.php:813
 #, c-format
 msgid "Run script \"%1$s\" on Zabbix server"
-msgstr ""
+msgstr "Skript \"%1$s\" auf dem Zabbix-Server ausführen"
 
 #: include/actions.inc.php:648 include/actions.inc.php:826
 #, c-format
 msgid "Run script \"%1$s\" on current host"
-msgstr ""
+msgstr "Skript \"%1$s\" auf dem aktuellen Host ausführen"
 
 #: include/actions.inc.php:679 include/actions.inc.php:857
 #, c-format
 msgid "Run script \"%1$s\" on host groups"
-msgstr ""
+msgstr "Skript \"%1$s\" auf Rechnergruppen ausführen"
 
 #: include/actions.inc.php:661 include/actions.inc.php:839
 #, c-format
 msgid "Run script \"%1$s\" on hosts"
-msgstr ""
+msgstr "Skript \"%1$s\" auf Hosts ausführen"
 
 #: include/classes/items/CHelpItems.php:261
 #: include/classes/items/CHelpItems.php:643
@@ -15330,13 +15085,13 @@ msgid "Russian (ru_RU)"
 msgstr "Russisch (ru_RU)"
 
 # Samstag
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "Sa"
 
 # Sonntag
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "So"
@@ -15347,14 +15102,14 @@ msgstr "SAML Einstellungen"
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
 #: app/views/administration.authentication.edit.php:237
 msgid "SLO service URL"
-msgstr ""
+msgstr "SLO-Dienst-URL"
 
 #: include/media.inc.php:26
 msgid "SMS"
@@ -15385,7 +15140,7 @@ msgstr "SMTP Server Port"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15432,12 +15187,12 @@ msgstr "SNMP Version"
 #: include/items.inc.php:1302
 #, c-format
 msgid "SNMPv%1$d"
-msgstr ""
+msgstr "SNMPv%1$d"
 
 #: app/views/popup.itemtestedit.view.php:134
 #: include/views/js/configuration.host.edit.js.php:80
 msgid "SNMPv1"
-msgstr ""
+msgstr "SNMPv1"
 
 #: include/discovery.inc.php:57
 msgid "SNMPv1 agent"
@@ -15446,7 +15201,7 @@ msgstr "SNMPv1-Agent"
 #: app/views/popup.itemtestedit.view.php:135
 #: include/views/js/configuration.host.edit.js.php:81
 msgid "SNMPv2"
-msgstr ""
+msgstr "SNMPv2"
 
 #: include/discovery.inc.php:58
 msgid "SNMPv2 agent"
@@ -15455,7 +15210,7 @@ msgstr "SNMPv2-Agent"
 #: app/views/popup.itemtestedit.view.php:136
 #: include/views/js/configuration.host.edit.js.php:82
 msgid "SNMPv3"
-msgstr ""
+msgstr "SNMPv3"
 
 #: include/discovery.inc.php:59
 msgid "SNMPv3 agent"
@@ -15481,12 +15236,12 @@ msgstr ""
 msgid "SQL query"
 msgstr "SQL Abfrage"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "Fehler beim Ausführen der SQL-Anweisung \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Fehler beim Ausführen der SQL-Anweisung \"%1$s\"."
@@ -15549,7 +15304,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15561,7 +15316,7 @@ msgstr "Serifenlos"
 msgid "Sat"
 msgstr "Sa"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -15603,7 +15358,7 @@ msgstr "Zeitplanung"
 msgid "Scheduled check"
 msgstr "Turnusmäßige Kontrolle"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr "Geplanter Bericht"
@@ -15670,7 +15425,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr "Umfang"
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15683,11 +15438,10 @@ msgstr "Umfang"
 msgid "Script"
 msgstr "Skript"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
-msgstr ""
+msgstr "Das Skript \"%1$s\" existiert bereits."
 
 #: app/controllers/CControllerScriptCreate.php:150
 msgid "Script added"
@@ -15716,12 +15470,6 @@ msgstr "Scriptname"
 msgid "Script parameters"
 msgstr "Skriptparameter"
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "Skriptparameter \"%1$s\" fehlen für den letzten neuen Zeilenvorschub für Medientyp \"%2$s\"."
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Skript-Profiler"
@@ -15734,7 +15482,7 @@ msgstr "Skript geändert"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Skripte"
 
@@ -15785,7 +15533,7 @@ msgstr "Anzeigename für Zweitkontakt"
 
 #: include/classes/html/CMacroValue.php:157
 msgid "Secret text"
-msgstr ""
+msgstr "Geheimer Text"
 
 #: app/views/administration.miscconfig.edit.php:99
 msgid "Security"
@@ -15804,8 +15552,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15813,7 +15561,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Auswählen"
 
@@ -15849,19 +15597,19 @@ msgstr "Ausgewählte Elemente"
 msgid "Selected items only"
 msgstr "Nur ausgewählte Datenpunkte"
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr "Nach hinten senden"
 
@@ -15886,7 +15634,7 @@ msgstr "Schicke nur an"
 msgid "Send to"
 msgstr "Empfänger"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr "Zurücksenden"
 
@@ -15919,7 +15667,7 @@ msgstr "Getrennt"
 msgid "Separately"
 msgstr "Einzeln"
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "September"
 
@@ -15950,28 +15698,28 @@ msgstr "Server (proxy)"
 msgid "Server time"
 msgstr "Serverzeit"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Dienst"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
-msgstr ""
+msgstr "Dienst \"%1$s\" akzeptable SLA darf nicht mehr als 4 Ziffern nach dem Dezimalzeichen haben."
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15981,13 +15729,13 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "Dienst erstellt"
 
 #: app/views/administration.housekeeping.edit.php:58
 msgid "Service data storage period"
-msgstr ""
+msgstr "Aufbewahrungsdauer der Dienstdaten"
 
 #: app/controllers/CControllerServiceDelete.php:69
 msgid "Service deleted"
@@ -15998,11 +15746,11 @@ msgstr[1] "Dienst gelöscht"
 #: app/views/administration.userrole.edit.php:145
 #: app/views/administration.userrole.edit.php:186
 msgid "Service list"
-msgstr ""
+msgstr "Liste der Dienste"
 
 #: include/actions.inc.php:68
 msgid "Service name"
-msgstr ""
+msgstr "Dienstname"
 
 #: include/actions.inc.php:57
 msgid "Service port"
@@ -16011,18 +15759,18 @@ msgstr "Serviceport"
 #: app/views/popup.mediatype.message.php:61
 #: include/classes/helpers/CMediatypeHelper.php:119
 msgid "Service recovery"
-msgstr ""
+msgstr "Wiederherstellung der Dienste"
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "Startzeitpunkt des Dienstes muss vor dem Endzeitpunkt liegen."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -16030,11 +15778,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Servicezeiten"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Servicetyp"
 
@@ -16043,38 +15791,37 @@ msgstr "Servicetyp"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Dienst geändert"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
-msgstr ""
+msgstr "Der Dienst mit der ID \"%2$s\" ist für die Benutzerrolle \"%1$s\" nicht verfügbar."
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Dienste"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "Dienste bilden eine zirkläre Abhängigkeit."
 
 #: app/controllers/CControllerPopupMassupdateService.php:150
 msgid "Services updated"
-msgstr ""
+msgstr "Dienste aktualisiert"
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr "Fehler bei der Sitzungsinitialisierung."
 
@@ -16104,7 +15851,7 @@ msgstr "Verfallsdatum und -zeit einstellen"
 msgid "Set host inventory mode"
 msgstr "Host-Inventarisierungsmodus einstellen"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr "Setze neuen Wert"
 
@@ -16114,7 +15861,7 @@ msgstr ""
 
 #: include/classes/helpers/CServiceHelper.php:28
 msgid "Set status to OK"
-msgstr ""
+msgstr "Status auf OK gesetzt"
 
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
@@ -16123,17 +15870,17 @@ msgstr "Wert einstellen auf"
 
 #: include/classes/validators/CLdapAuthValidator.php:83
 msgid "Setting LDAP dereferencing mode failed."
-msgstr ""
+msgstr "Die Einstellung des LDAP-Dereferenzierungsmodus ist fehlgeschlagen."
 
 #: include/classes/validators/CLdapAuthValidator.php:80
 msgid "Setting LDAP protocol failed."
-msgstr ""
+msgstr "Die Einstellung des LDAP-Protokolls ist fehlgeschlagen."
 
 #: include/classes/validators/CLdapAuthValidator.php:82
 msgid "Setting LDAP referrals to \"Off\" failed."
-msgstr ""
+msgstr "Die Einstellung von LDAP-Referenzen auf \"Aus\" ist fehlgeschlagen."
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -16142,7 +15889,7 @@ msgstr "Einstellungen"
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16198,7 +15945,7 @@ msgstr "Form"
 msgid "Shared"
 msgstr "Geteilt"
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "Teilen"
 
@@ -16207,12 +15954,12 @@ msgstr "Teilen"
 #: include/classes/api/services/CMap.php:1261
 #, c-format
 msgid "Sharing option \"%1$s\" is missing a value for map \"%2$s\"."
-msgstr ""
+msgstr "In der Freigabeoption \"%1$s\" fehlt ein Wert für die Karte \"%2$s\"."
 
 #: app/partials/monitoring.problem.filter.php:222
 #: include/classes/widgets/forms/CWidgetFormProblems.php:139
 msgid "Shortened"
-msgstr ""
+msgstr "Gekürzt"
 
 #: app/partials/common.filter.trigger.php:45
 #: app/partials/monitoring.problem.filter.php:27
@@ -16341,7 +16088,7 @@ msgstr "Warnung zeigen, wenn der Zabbix-Server nicht läuft"
 msgid "Show working time"
 msgstr "Zeige Arbeitszeit"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Angezeigt"
 
@@ -16359,11 +16106,11 @@ msgstr "Anmelden"
 
 #: include/views/general.login.php:46
 msgid "Sign in with HTTP"
-msgstr ""
+msgstr "Anmeldung über HTTP"
 
 #: include/views/general.login.php:50
 msgid "Sign in with Single Sign-On (SAML)"
-msgstr ""
+msgstr "Anmeldung mit Single-Sign-On (SAML)"
 
 #: include/classes/helpers/CMenuHelper.php:396
 #: include/classes/helpers/CMenuHelper.php:399
@@ -16398,7 +16145,7 @@ msgstr "Einfach"
 
 #: include/hosts.inc.php:364
 msgid "Site ZIP / postal"
-msgstr "Aufstellort Postleitzahl"
+msgstr "Aufstellort / Postleitzahl"
 
 # Aufstellort vielleicht?
 #: include/hosts.inc.php:334
@@ -16431,7 +16178,7 @@ msgstr "Position im Schrank"
 
 #: include/hosts.inc.php:354
 msgid "Site state / province"
-msgstr "Bundesland"
+msgstr "Bundesland / Provinz"
 
 #: include/views/js/monitoring.sysmaps.js.php:455
 msgid "Size"
@@ -16440,7 +16187,7 @@ msgstr "Grösse"
 #: include/classes/server/CZabbixServer.php:514
 #, c-format
 msgid "Size of the response received from Zabbix server \"%1$s\" exceeds the allowed size of %2$s bytes. This value can be increased in the ZBX_SOCKET_BYTES_LIMIT constant in include/defines.inc.php."
-msgstr ""
+msgstr "Die Größe der vom Zabbix-Server \"%1$s\" empfangenen Antwort überschreitet die zulässige Größe von %2$s Bytes. Dieser Wert kann in der Konstante ZBX_SOCKET_BYTES_LIMIT in include/defines.inc.php erhöht werden."
 
 #: include/graphs.inc.php:459
 #, c-format
@@ -16451,7 +16198,7 @@ msgstr "Kopieren des Diagramms \"%1$s\" zum Host \"%2$s\" übersprungen."
 msgid "Slovak (sk_SK)"
 msgstr "Slovakisch (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Dösen"
 
@@ -16497,7 +16244,7 @@ msgstr "Ein Teil der Historie für diesen Datenpunkt kann komprimiert sein, eine
 msgid "Sort entries by"
 msgstr "Sortiere nach"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Sortierreihenfolge (0->999)"
 
@@ -16534,7 +16281,7 @@ msgstr "Geben den Host an um die Diagramme zu sehen."
 
 #: app/views/popup.generic.php:165 include/views/monitoring.history.php:295
 msgid "Specify some filter condition to see the values."
-msgstr "Gebe die Filterbedingung an um die Werte zu sehen"
+msgstr "Gebe die Filterbedingung an um die Werte zu sehen."
 
 #: httpdetails.php:107 include/classes/screens/CScreenHttpTestDetails.php:82
 msgid "Speed"
@@ -16558,7 +16305,7 @@ msgstr "Standard-Element"
 #: app/controllers/CControllerPopupTriggerExpr.php:630
 #: app/controllers/CControllerPopupTriggerExpr.php:748
 msgid "Start"
-msgstr ""
+msgstr "Start"
 
 #: app/partials/scheduledreport.formgrid.html.php:155
 msgid "Start date"
@@ -16572,13 +16319,13 @@ msgstr "Start bei"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
-msgstr ""
+msgstr "Diashow starten"
 
 #: app/views/dashboard.properties.edit.php:81
 msgid "Start slideshow automatically"
-msgstr ""
+msgstr "Diashow automatisch starten"
 
 #: app/partials/scheduledreport.formgrid.html.php:111
 msgid "Start time"
@@ -16586,11 +16333,11 @@ msgstr "Startzeit"
 
 #: include/classes/validators/CLdapAuthValidator.php:81
 msgid "Starting TLS failed."
-msgstr ""
+msgstr "Der Start von TLS ist fehlgeschlagen."
 
 #: include/classes/items/CHelpItems.php:1185
 msgid "Startup time of Zabbix server, Unix timestamp."
-msgstr ""
+msgstr "Startzeit des Zabbix-Servers, Unix-Zeitstempel."
 
 #: app/partials/configuration.filter.items.php:174 include/forms.inc.php:522
 #: include/views/configuration.host.discovery.list.php:154
@@ -16608,7 +16355,7 @@ msgstr "Statisch"
 
 #: include/classes/items/CHelpItems.php:1321
 msgid "Statistics and availability of Zabbix write cache. Cache - one of values (modes: all, float, uint, str, log, text, not supported), history (modes: pfree, free, total, used, pused), index (modes: pfree, free, total, used, pused), trend (modes: pfree, free, total, used, pused)."
-msgstr ""
+msgstr "Statistik und Verfügbarkeit des Zabbix-Schreibcache. Cache - einer der Werte (Modi: all, float, uint, str, log, text, nicht unterstützt), history (Modi: pfree, free, total, used, pused), index (Modi: pfree, free, total, used, pused), trend (Modi: pfree, free, total, used, pused)."
 
 #: app/controllers/CControllerPopupGeneric.php:193
 #: app/controllers/CControllerPopupGeneric.php:207
@@ -16675,13 +16422,17 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Status"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
+msgstr "Statusberechnungsregel"
+
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
 msgstr ""
 
 #: include/views/configuration.httpconf.edit.php:206
@@ -16694,7 +16445,7 @@ msgstr "Status Deaktiviert"
 
 #: include/classes/helpers/CMapHelper.php:287
 msgid "Status maintenance"
-msgstr "'Status Wartung"
+msgstr "Status Wartung"
 
 #: app/controllers/CControllerDiscoveryView.php:90
 #: app/views/monitoring.discovery.view.php:35
@@ -16703,7 +16454,7 @@ msgstr "Status des Suchlaufs"
 
 #: include/classes/helpers/CMapHelper.php:283
 msgid "Status ok"
-msgstr ""
+msgstr "Status ok"
 
 #: include/maps.inc.php:48
 msgid "Status only"
@@ -16713,9 +16464,9 @@ msgstr "Status des Elements"
 msgid "Status problem"
 msgstr "Status Problem"
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
-msgstr ""
+msgstr "Statusfortschreibungsregel"
 
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
@@ -16734,7 +16485,7 @@ msgstr "Dauer des Schritts"
 
 #: app/controllers/CControllerPopupHttpStep.php:145
 msgid "Step of web scenario"
-msgstr ""
+msgstr "Schritt des Webszenarios"
 
 #: app/controllers/CControllerPopupHttpStep.php:110
 #, c-format
@@ -16761,7 +16512,7 @@ msgstr "Verarbeitung anhalten"
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr "Diashow anhalten"
 
@@ -16777,7 +16528,7 @@ msgstr "Speicherzeitraum"
 
 #: include/classes/setup/CSetupWizard.php:328
 msgid "Store credentials in"
-msgstr ""
+msgstr "Berechtigungsnachweise speichern in"
 
 #: include/classes/setup/CSetupWizard.php:500
 #: include/classes/setup/CSetupWizard.php:501
@@ -16796,7 +16547,7 @@ msgstr ""
 #: app/controllers/CControllerPopupTriggerExpr.php:490
 #: include/triggers.inc.php:1596
 msgid "String"
-msgstr ""
+msgstr "Zeichenkette"
 
 #: app/views/popup.triggerexpr.php:115
 msgid "String functions"
@@ -16827,43 +16578,43 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Subjekt"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Unter-Karte"
 
 #: app/controllers/CControllerPopupScheduledReportSubscriptionEdit.php:168
 msgid "Subscription"
-msgstr ""
+msgstr "Abonnement"
 
 #: app/partials/scheduledreport.formgrid.html.php:191
 msgid "Subscriptions"
-msgstr ""
+msgstr "Abonnements"
 
 # Windows-Eventlog-Meldung: entspricht bei Microsoft EVENTLOG_AUDIT_SUCCESS
 #: include/items.inc.php:39
 msgid "Success Audit"
 msgstr "Erfolgreiche Anmeldung"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr "Erfolgsnachricht"
 
 #: include/classes/items/CHelpItems.php:125
 #: include/classes/items/CHelpItems.php:507
 msgid "Sum of incoming and outgoing traffic statistics on network interface. Returns integer"
-msgstr ""
+msgstr "Summe der Statistiken über eingehenden und ausgehenden Datenverkehr auf der Netzwerkschnittstelle. Rückgabe Ganzzahl"
 
 #: include/func.inc.php:196
 msgid "Sun"
 msgstr "So"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Sonntag"
 
 #: include/users.inc.php:54
 msgid "Super admin"
-msgstr ""
+msgstr "Super admin"
 
 #: include/classes/helpers/CMenuHelper.php:337
 #: include/views/general.login.php:94
@@ -16878,12 +16629,12 @@ msgstr "Unterdrückt bis: %1$s"
 #: include/classes/items/CHelpItems.php:281
 #: include/classes/items/CHelpItems.php:663
 msgid "Swap in (from device into memory) statistics. Returns integer"
-msgstr ""
+msgstr "Swap-In-Statistik (vom Gerät in den Speicher). Rückgabe Ganzzahl"
 
 #: include/classes/items/CHelpItems.php:285
 #: include/classes/items/CHelpItems.php:667
 msgid "Swap out (from memory onto device) statistics. Returns integer"
-msgstr ""
+msgstr "Auslagern von Statistiken (vom Speicher auf das Gerät). Rückgabe Ganzzahl"
 
 #: include/classes/items/CHelpItems.php:289
 #: include/classes/items/CHelpItems.php:671
@@ -16900,7 +16651,7 @@ msgstr "Alle Sitzungen werden zurückgesetzt beim Wechseln der Authentifizierung
 
 #: include/classes/helpers/CDateTimeZoneHelper.php:97
 msgid "System"
-msgstr ""
+msgstr "System"
 
 #: include/classes/items/CHelpItems.php:209
 #: include/classes/items/CHelpItems.php:591
@@ -16932,7 +16683,7 @@ msgstr "System-Host-Name. Rückgabewert Zeichenfolge"
 #: include/classes/helpers/CRoleHelper.php:331
 #: include/classes/widgets/CWidgetConfig.php:61
 msgid "System information"
-msgstr ""
+msgstr "Systeminformation"
 
 #: include/classes/items/CHelpItems.php:265
 #: include/classes/items/CHelpItems.php:647
@@ -16942,21 +16693,21 @@ msgstr "Sastemstatistik. Gibt Ganzzahl oder Fließkommazahl zurück"
 #: include/classes/items/CHelpItems.php:257
 #: include/classes/items/CHelpItems.php:639
 msgid "System time. Returns integer with type as UTC; string - with type as local"
-msgstr ""
+msgstr "Systemzeit. Rückgabe Integer mit Typ UTC; String - mit Typ local"
 
 #: include/classes/items/CHelpItems.php:297
 #: include/classes/items/CHelpItems.php:679
 msgid "System uptime in seconds. Returns integer"
-msgstr "Systembetriebszeit in s. Gibt Integer zurück."
+msgstr "Systembetriebszeit in s. Gibt Integer zurück"
 
 # Donnerstag
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Do"
 
 # Dienstag
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Di"
@@ -16983,17 +16734,17 @@ msgstr "WAHR"
 msgid "Table \"%1$s\" does not exist."
 msgstr "Tabelle \"%1$s\" existiert nicht."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "Tabelle \"%1$s\" hat keine Spalte namens \"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Marker"
@@ -17049,7 +16800,7 @@ msgstr "Maker-Wert"
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17109,7 +16860,7 @@ msgstr "Zieltyp"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17130,12 +16881,12 @@ msgstr "Vorlage"
 msgid "Template \"%1$s\" already exists."
 msgstr "Vorlage \"%1$s\" existiert bereits."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
 msgid "Template \"%1$s\" cannot be without host group."
-msgstr ""
+msgstr "Vorlage \"%1$s\" kann nicht ohne Host-Gruppe sein."
 
 #: include/classes/import/importers/CHostImporter.php:54
 #, c-format
@@ -17154,13 +16905,13 @@ msgstr "Vorlagen- und Host-Eigenschaften, die durch Vorlagenverknüpfung vererbt
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Vorlage kann nicht mehrfach mit anderer Vorlage verbunden werden -- auch nicht durch andere Vorlagen."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
-msgstr "Vorlage Dashboard"
+msgstr "Vorlage Übersichtsseite"
 
 #: app/views/popup.import.php:33
 msgid "Template dashboards"
-msgstr "Vorlage Dashboards"
+msgstr "Vorlage Übersichtsseiten"
 
 #: templates.php:427 templates.php:441 templates.php:474
 msgid "Template deleted"
@@ -17176,7 +16927,7 @@ msgstr "Vorlagenverlinkung"
 
 #: include/views/configuration.template.edit.php:210
 msgid "Template macros"
-msgstr ""
+msgstr "Makrovorlagen"
 
 #: include/views/configuration.template.edit.php:82 templates.php:43
 msgid "Template name"
@@ -17199,7 +16950,7 @@ msgstr "Vorlage Wert"
 #: include/classes/api/services/CTemplate.php:1209
 #, c-format
 msgid "Template with the same name \"%1$s\" already exists."
-msgstr ""
+msgstr "Vorlage mit dem gleichen Namen \"%1$s\" existiert bereits."
 
 #: include/classes/api/services/CHost.php:2055
 #: include/classes/api/services/CHost.php:2343
@@ -17207,14 +16958,14 @@ msgstr ""
 #: include/classes/api/services/CTemplate.php:1174
 #, c-format
 msgid "Template with the same visible name \"%1$s\" already exists."
-msgstr ""
+msgstr "Vorlage mit demselben sichtbaren Namen \"%1$s\" existiert bereits."
 
 #: app/controllers/CControllerPopupGeneric.php:135
 #: app/controllers/CControllerPopupImportCompare.php:132
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17303,11 +17054,11 @@ msgstr "Teste Medientyp \"%1$s\""
 #: app/controllers/CControllerPopupItemTestSend.php:151
 #, c-format
 msgid "Test of \"%1$s\" items is not supported."
-msgstr ""
+msgstr "Der Test von \"%1$s\"-Elementen wird nicht unterstützt."
 
 #: app/controllers/CControllerPopupScheduledReportTest.php:79
 msgid "Test report generating"
-msgstr ""
+msgstr "Erstellung von Testberichten"
 
 #: app/views/administration.regex.edit.php:119
 msgid "Test string"
@@ -17315,7 +17066,7 @@ msgstr "Test-String"
 
 #: app/controllers/CControllerPopupMediatypeTestEdit.php:81
 msgid "Test subject"
-msgstr ""
+msgstr "Test-Thema"
 
 #: app/partials/configuration.filter.items.php:141
 #: app/views/popup.massupdate.item.php:160
@@ -17332,46 +17083,46 @@ msgstr "Text"
 #: include/classes/api/clients/CLocalApiClient.php:89
 #, c-format
 msgid "The \"%1$s.%2$s\" method must be called without the \"auth\" parameter."
-msgstr ""
+msgstr "Die Methode \"%1$s.%2$s\" muss ohne den Parameter \"auth\" aufgerufen werden."
 
 #: include/classes/db/DbBackend.php:130
 #, c-format
 msgid "The Zabbix database version does not match current requirements. Your database version: %1$s. Required version: %2$s. Please contact your system administrator."
-msgstr ""
+msgstr "Die Version der Zabbix-Datenbank entspricht nicht den aktuellen Anforderungen. Ihre Datenbankversion: %1$s. Erforderliche Version: %2$s. Bitte kontaktieren Sie Ihren Systemadministrator."
 
 #: include/classes/items/CHelpItems.php:1129
 msgid "The average time a read from the virtual disk takes, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance"
-msgstr ""
+msgstr "Die durchschnittliche Zeit, die ein Lesevorgang von der virtuellen Festplatte benötigt, <url> - VMware-Service-URL, <uuid> - Hostname der virtuellen VMware-Maschine, <instance> - Instanz des Festplattengeräts"
 
 #: include/classes/items/CHelpItems.php:1133
 msgid "The average time a write to the virtual disk takes, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance"
-msgstr ""
+msgstr "Die durchschnittliche Zeit, die ein Schreibvorgang auf die virtuelle Festplatte benötigt, <url> - VMware-Service-URL, <uuid> - Hostname der virtuellen VMware-Maschine, <instance> - Instanz des Festplattengeräts"
 
 #: hosts.php:322
 msgid "The cloned host contains user defined macros with type \"Secret text\". The value and type of these macros were reset."
-msgstr ""
+msgstr "Der geklonte Host enthält benutzerdefinierte Makros vom Typ \"Geheimtext\". Der Wert und der Typ dieser Makros wurden zurückgesetzt."
 
 #: host_prototypes.php:170
 msgid "The cloned host prototype contains user defined macros with type \"Secret text\". The value and type of these macros were reset."
-msgstr ""
+msgstr "Der geklonte Host-Prototyp enthält benutzerdefinierte Makros vom Typ \"Geheimtext\". Der Wert und der Typ dieser Makros wurden zurückgesetzt."
 
 #: templates.php:182
 msgid "The cloned template contains user defined macros with type \"Secret text\". The value and type of these macros were reset."
-msgstr ""
+msgstr "Die geklonte Vorlage enthält benutzerdefinierte Makros mit dem Typ \"Geheimtext\". Der Wert und der Typ dieser Makros wurden zurückgesetzt."
 
 #: include/html.inc.php:688
 #, c-format
 msgid "The graph is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
-msgstr ""
+msgstr "Der Graph wird nicht mehr entdeckt und wird in %1$s (am %2$s um %3$s) gelöscht."
 
 #: include/html.inc.php:683
 msgid "The graph is not discovered anymore and will be deleted the next time discovery rule is processed."
-msgstr ""
+msgstr "Das Diagramm wird nicht mehr erkannt und wird mit dem nächsten Suchlauf gelöscht."
 
 #: include/html.inc.php:634
 #, c-format
 msgid "The host group is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
-msgstr ""
+msgstr "Die Hostgruppe wird nicht mehr erkannt und wird in %1$s (am %2$s um %3$s) gelöscht."
 
 #: include/html.inc.php:629
 msgid "The host group is not discovered anymore and will be deleted the next time discovery rule is processed."
@@ -17380,20 +17131,20 @@ msgstr "Die Host-Gruppe wird nicht mehr gefunden und wird mit dem nächsten Such
 #: include/html.inc.php:661
 #, c-format
 msgid "The host is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
-msgstr ""
+msgstr "Der Host wird nicht mehr erkannt und wird in %1$s (am %2$s um %3$s) gelöscht. "
 
 #: include/html.inc.php:656
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "Der Host wird nicht mehr gefunden und wird mit dem nächsten Suchlauf gelöscht. "
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "Das Bild wird in Symbol Karte %1$s verwendet."
 msgstr[1] "Das Bild wird in Symbol Karten %1$s verwendet."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17417,7 +17168,7 @@ msgstr "Anzahl der Prozesse. Gibt Integer zurück"
 #: index_sso.php:193
 #, c-format
 msgid "The parameter \"%1$s\" is missing from the user attributes."
-msgstr ""
+msgstr "Der Parameter \"%1$s\" fehlt in den Benutzerattributen."
 
 #: include/classes/core/CJsonRpc.php:177
 msgid "The received JSON is not a valid JSON-RPC request."
@@ -17425,7 +17176,7 @@ msgstr ""
 
 #: include/classes/core/CJsonRpc.php:182
 msgid "The requested remote-procedure does not exist / is not available"
-msgstr "Die angeforderte Remote-Prozedur existiert nicht oder ist nicht verfügbar"
+msgstr "Die angeforderte Remote-Prozedur existiert nicht / ist nicht verfügbar"
 
 #: app/views/administration.token.view.php:52
 #: app/views/administration.user.token.view.php:51
@@ -17435,11 +17186,11 @@ msgstr "Das Token ist abgelaufen. Bitte aktualisieren Sie das Ablaufdatum, um da
 #: include/html.inc.php:715
 #, c-format
 msgid "The trigger is not discovered anymore and will be deleted in %1$s (on %2$s at %3$s)."
-msgstr ""
+msgstr "Der Auslöser wird nicht mehr entdeckt und wird in %1$s (am %2$s um %3$s) gelöscht."
 
 #: include/html.inc.php:710
 msgid "The trigger is not discovered anymore and will be deleted the next time discovery rule is processed."
-msgstr ""
+msgstr "Der Auslöser wird nicht mehr erkannt und wird bei der nächsten Verarbeitung der Suchlaufregel gelöscht."
 
 #: app/views/administration.user.edit.php:251
 msgid "Theme"
@@ -17458,7 +17209,7 @@ msgstr "Dieses Feld wird automatisch gefüllt vom Datenpunkt \"%1$s\"."
 msgid "This is the test message from Zabbix"
 msgstr "Dies ist eine Testnachricht von Zabbix"
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Diesen Monat"
 
@@ -17466,7 +17217,7 @@ msgstr "Diesen Monat"
 msgid "This month so far"
 msgstr "Dieser Monat bis jetzt"
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Diese Woche"
 
@@ -17474,7 +17225,7 @@ msgstr "Diese Woche"
 msgid "This week so far"
 msgstr "Diese Woche bis jetzt"
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Dieses Jahr"
 
@@ -17494,7 +17245,7 @@ msgstr "Drosselung"
 msgid "Thu"
 msgstr "Do"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -17511,7 +17262,7 @@ msgstr "Bis"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17528,7 +17279,7 @@ msgstr "Zeit"
 
 #: include/classes/items/CHelpItems.php:1253
 msgid "Time a particular Zabbix process or a group of processes (identified by <type> and <mode>) spent in <state> in percentage."
-msgstr ""
+msgstr "Zeit, die ein bestimmter Zabbix-Prozess oder eine Gruppe von Prozessen (identifiziert durch <Typ> und <Modus>) im <Zustand> verbracht hat, in Prozent."
 
 #: app/views/js/popup.mediatypetest.edit.js.php:103
 #: app/views/js/popup.scriptexec.js.php:44
@@ -17541,10 +17292,10 @@ msgstr "Zeitfilter Standardzeitraum"
 
 #: include/classes/items/CHelpItems.php:1257
 msgid "Time of proxy last access. Name - proxy name. Valid params are: lastaccess - Unix timestamp, delay - seconds."
-msgstr ""
+msgstr "Zeitpunkt des letzten Zugriffs auf den Proxy. Name - Name des Proxys. Gültige Parameter sind: lastaccess - Unix-Zeitstempel, delay - Sekunden."
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Zeitspanne"
 
@@ -17596,12 +17347,11 @@ msgstr "Zeitstempel"
 msgid "To"
 msgstr "Bis"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "Zur Festlegung der Hostschnittstelle wählen Sie nur Datenpunkt eines Typs"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Heute"
 
@@ -17641,7 +17391,7 @@ msgstr "Gesamte SQL Zeit: %1$s"
 
 #: include/classes/items/CHelpItems.php:1049
 msgid "Total time elapsed, in seconds, since last operating system boot-up, <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "Gesamtzeit in Sekunden seit dem letzten Hochfahren des Betriebssystems, <url> - VMware-Service-URL, <uuid> - Hostname der virtuellen VMware-Maschine"
 
 #: include/classes/debug/CProfiler.php:147
 #, c-format
@@ -17658,7 +17408,7 @@ msgstr ""
 
 #: include/page_footer.php:40
 msgid "Transaction has not been closed. Aborting..."
-msgstr "Transaktion wurde nicht geschlossen. Abbruch ..."
+msgstr "Transaktion wurde nicht geschlossen. Abbruch..."
 
 #: include/classes/items/CHelpItems.php:1331
 msgid "Transform SQL query result into a JSON array for low-level discovery."
@@ -17716,7 +17466,7 @@ msgstr "Speicherdauer Tendenz"
 msgid "Trends"
 msgstr "Trends"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17724,7 +17474,7 @@ msgstr "Trends"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Auslöser"
 
@@ -17736,7 +17486,7 @@ msgstr "Auslöser \"%1$s\" existiert bereits für \"%2$s\"."
 #: include/classes/api/services/CTriggerGeneral.php:1813
 #, c-format
 msgid "Trigger \"%1$s\" belongs to templates with different linkages."
-msgstr ""
+msgstr "Der Auslöser \"%1$s\" gehört zu Vorlagen mit unterschiedlichen Verknüpfungen."
 
 #: include/classes/import/CConfigurationImport.php:1830
 #, c-format
@@ -17750,7 +17500,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:179
 #: include/views/configuration.action.list.php:27
 msgid "Trigger actions"
-msgstr ""
+msgstr "Auslöseraktionen"
 
 #: triggers.php:296
 msgid "Trigger added"
@@ -17768,7 +17518,7 @@ msgstr[1] "Auslöser kopiert"
 
 #: app/views/administration.housekeeping.edit.php:49
 msgid "Trigger data storage period"
-msgstr ""
+msgstr "Speicherdauer der Auslöserdaten"
 
 #: triggers.php:416
 msgid "Trigger deleted"
@@ -17776,7 +17526,7 @@ msgstr "Auslöser wurde gelöscht"
 
 #: tr_events.php:173
 msgid "Trigger details"
-msgstr ""
+msgstr "Details zum Auslöser"
 
 #: triggers.php:458
 msgid "Trigger disabled"
@@ -17803,7 +17553,7 @@ msgstr "Auslöser verwendet Datenpunkte von Vorlage \"%1$s\", die nicht mit dem
 
 #: include/actions.inc.php:1267
 msgid "Trigger in \"unknown\" state"
-msgstr ""
+msgstr "Auslöser im Zustand \"unbekannt\""
 
 #: include/classes/api/services/CHostBase.php:116
 #, c-format
@@ -17825,7 +17575,7 @@ msgstr "Auslöser-Name"
 msgid "Trigger overview"
 msgstr "Auslöser"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17836,27 +17586,27 @@ msgstr "Auslöser-Prototyp"
 #: include/classes/api/services/CTriggerGeneral.php:637
 #, c-format
 msgid "Trigger prototype \"%1$s\" already exists on \"%2$s\"."
-msgstr ""
+msgstr "Der Auslöserprototyp \"%1$s\" existiert bereits auf \"%2$s\"."
 
 #: include/classes/api/services/CTriggerGeneral.php:1817
 #, c-format
 msgid "Trigger prototype \"%1$s\" belongs to templates with different linkages."
-msgstr ""
+msgstr "Der Auslöserprototyp \"%1$s\" gehört zu Vorlagen mit unterschiedlichen Verknüpfungen."
 
 #: include/classes/api/services/CTriggerGeneral.php:1715
 #, c-format
 msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules."
-msgstr ""
+msgstr "Der Auslöserprototyp \"%1$s\" enthält Elementprototypen aus mehreren Suchregeln."
 
 #: include/classes/import/CConfigurationImport.php:1511
 #, c-format
 msgid "Trigger prototype \"%1$s\" depends on trigger \"%2$s\", which does not exist."
-msgstr ""
+msgstr "Der Auslöserprototyp \"%1$s\" hängt vom Auslöser \"%2$s\" ab, der nicht existiert."
 
 #: include/classes/api/services/CTriggerGeneral.php:1710
 #, c-format
 msgid "Trigger prototype \"%1$s\" must contain at least one item prototype."
-msgstr ""
+msgstr "Der Auslöserprototyp \"%1$s\" muss mindestens einen Artikelprototyp enthalten."
 
 #: trigger_prototypes.php:248
 msgid "Trigger prototype added"
@@ -17864,7 +17614,7 @@ msgstr "Auslöser-Prototyp hinzugefügt"
 
 #: include/classes/api/services/CTriggerPrototype.php:909
 msgid "Trigger prototype cannot be dependent on a trigger that is inherited from it."
-msgstr ""
+msgstr "Der Auslöserprototyp kann nicht von einem Auslöser abhängig sein, der von ihm geerbt wird."
 
 #: trigger_prototypes.php:366
 msgid "Trigger prototype deleted"
@@ -17898,11 +17648,11 @@ msgstr "Auslöser-Prototypen aktualisiert"
 msgid "Trigger severity"
 msgstr "Auslöserpriorität"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "Auslöser Status \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "Auslöserstatus \"Problem\""
 
@@ -17919,7 +17669,7 @@ msgstr "Auslöser geändert"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17954,7 +17704,7 @@ msgstr "Menüleiste"
 msgid "Tue"
 msgstr "Di"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -17967,7 +17717,7 @@ msgstr "Türkisch (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Zwei Datenpunkte (\"%1$s\" und \"%2$s\") können nicht das gleiche Inventarfeld \"%3$s\" befüllen."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr "Zwei Kartenelemente sollten ausgewählt sein"
 
@@ -17983,19 +17733,19 @@ msgstr "Zwei Kartenelemente sollten ausgewählt sein"
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18047,10 +17797,10 @@ msgstr "Informationstyp"
 msgid "Types"
 msgstr "Typen"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
-msgstr ""
+msgstr "Das UI-Element \"%2$s\" ist für die Benutzerrolle \"%1$s\" nicht verfügbar."
 
 #: app/views/js/administration.regex.edit.js.php:194
 #: include/translateDefines.inc.php:25
@@ -18068,13 +17818,13 @@ msgstr "UNBEKANNT"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
 #: app/views/administration.user.edit.php:282
 msgid "URL (after login)"
-msgstr "URL nach dem Anmelden"
+msgstr "URL (nach Anmeldung)"
 
 #: include/hosts.inc.php:269
 msgid "URL A"
@@ -18091,37 +17841,37 @@ msgstr "URL C"
 #: include/views/js/common.item.edit.js.php:330
 #: include/views/js/configuration.httpconf.edit.js.php:105
 msgid "URL is not properly encoded."
-msgstr ""
+msgstr "Die URL ist nicht richtig kodiert."
 
 #: include/classes/api/services/CMap.php:961
 #: include/classes/api/services/CMap.php:1436
 #, c-format
 msgid "URL name should be unique for map \"%1$s\"."
-msgstr ""
+msgstr "Der URL-Name sollte für die Karte \"%1$s\" eindeutig sein."
 
 #: include/html.inc.php:104
 msgid "URL parameter cannot be array."
-msgstr ""
+msgstr "URL-Parameter kann kein Array sein."
 
 #: include/html.inc.php:110
 msgid "URL parameter name is empty."
-msgstr ""
+msgstr "URL-Parametername ist leer."
 
 #: include/classes/api/services/CMap.php:955
 #: include/classes/api/services/CMap.php:1430
 #, c-format
 msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
-msgstr ""
+msgstr "URL sollte sowohl \"name\" als auch \"url\" Felder für die Karte \"%1$s\" haben."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URLs"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
-msgstr ""
+msgstr "UUIDv4 wird erwartet"
 
 #: include/locales.inc.php:77
 msgid "Ukrainian (uk_UA)"
@@ -18129,22 +17879,22 @@ msgstr "Ukrainisch (uk_UA)"
 
 #: include/classes/core/CConfigFile.php:249
 msgid "Unable to change configuration file permissions to 0600."
-msgstr ""
+msgstr "Die Berechtigungen für die Konfigurationsdatei können nicht auf 0600 geändert werden."
 
 #: include/classes/core/CConfigFile.php:258
 msgid "Unable to create the configuration file."
-msgstr ""
+msgstr "Die Konfigurationsdatei konnte nicht erstellt werden."
 
 #: include/classes/db/MysqlDbBackend.php:35
 #: include/classes/db/OracleDbBackend.php:36
 #: include/classes/db/PostgresqlDbBackend.php:61
 #, c-format
 msgid "Unable to determine current Zabbix database version: %1$s."
-msgstr ""
+msgstr "Die aktuelle Version der Zabbix-Datenbank kann nicht ermittelt werden: %1$s."
 
 #: include/classes/helpers/CAuthenticationHelper.php:75
 msgid "Unable to load authentication API parameters."
-msgstr ""
+msgstr "Authentifizierungs-API-Parameter können nicht geladen werden."
 
 #: include/classes/core/CConfigFile.php:184
 msgid "Unable to load database credentials from Vault."
@@ -18164,7 +17914,7 @@ msgstr ""
 
 #: include/blocks.inc.php:638
 msgid "Unable to retrieve database version."
-msgstr ""
+msgstr "Die Datenbankversion kann nicht abgerufen werden."
 
 #: include/classes/db/DbBackend.php:147
 msgid "Unable to select configuration."
@@ -18204,16 +17954,16 @@ msgstr "Freigeben"
 msgid "Unblock selected users?"
 msgstr "Ausgewählte Benutzer entsperren?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
-msgstr ""
+msgstr "Unerwarteter Serverfehler."
 
 #: app/views/popup.massupdate.item.php:165
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:149
@@ -18229,21 +17979,23 @@ msgstr "Einheit"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Unbekannt"
@@ -18261,7 +18013,7 @@ msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Ausgewählter Host enthält keinen solchen Datenpunkt"
@@ -18283,7 +18035,7 @@ msgstr "Unbekannte Ressource"
 #: include/views/configuration.httpconf.list.php:174
 #, c-format
 msgid "Unknown step failed: %1$s"
-msgstr ""
+msgstr "Unbekannter Schritt fehlgeschlagen: %1$s"
 
 #: include/items.inc.php:1416
 msgid "Unknown value type"
@@ -18315,7 +18067,7 @@ msgstr "Verbindung mit Vorlage entfernen"
 msgid "Unlink from templates"
 msgstr "Verbindung mit Vorlagen entfernen"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Ton an"
 
@@ -18344,9 +18096,9 @@ msgstr ""
 #: include/classes/api/services/CAction.php:2656
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
-msgstr ""
+msgstr "Nicht unterstützter Parameter \"%2$s\" für eine Filterbedingung der Aktion \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "Nicht unterstützter Parameter \"%2$s\" für die Filterbedingung der Suchlaufregel \"%1$s\"."
@@ -18354,9 +18106,9 @@ msgstr "Nicht unterstützter Parameter \"%2$s\" für die Filterbedingung der Suc
 #: include/classes/api/services/CAction.php:2617
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
-msgstr ""
+msgstr "Nicht unterstützter Parameter \"%2$s\" für den Filter der Aktion \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "Nicht unterstützter Parameter \"%2$s\" für den Filter der Suchlaufregel \"%1$s\". "
@@ -18401,7 +18153,7 @@ msgstr "Erreichbar"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18414,7 +18166,7 @@ msgstr "Erreichbar"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18460,14 +18212,14 @@ msgstr "Aktualisierungsintervall"
 
 #: include/views/configuration.action.edit.php:472
 msgid "Update operations"
-msgstr ""
+msgstr "Vorgänge aktualisieren"
 
 #: app/controllers/CControllerPopupAcknowledgeEdit.php:176
 #: app/controllers/CControllerPopup.php:45
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18475,7 +18227,7 @@ msgstr ""
 #: include/classes/api/services/CHost.php:1256
 #, c-format
 msgid "Updated status of host \"%1$s\"."
-msgstr ""
+msgstr "Aktualisierter Status des Hosts \"%1$s\"."
 
 #: app/views/administration.image.edit.php:52
 msgid "Upload"
@@ -18485,7 +18237,7 @@ msgstr "Hochladen"
 msgid "Upper level maps"
 msgstr "Übergeordnete Karten"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18505,7 +18257,7 @@ msgstr "Massenanfragen nutzen"
 
 #: app/views/administration.trigdisplay.edit.php:35
 msgid "Use custom event status colors"
-msgstr ""
+msgstr "Benutzerdefinierte Farben für den Ereignisstatus verwenden"
 
 #: app/views/administration.user.edit.php:296 app/views/popup.media.php:88
 msgid "Use if severity"
@@ -18520,7 +18272,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "Benutzt in Aktion"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18535,7 +18287,7 @@ msgstr "Benutzt in Aktion"
 msgid "User"
 msgstr "Benutzer"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "Benutzer \"%1$s\" geht nicht ohne Benutzergruppe."
@@ -18543,7 +18295,7 @@ msgstr "Benutzer \"%1$s\" geht nicht ohne Benutzergruppe."
 #: include/classes/api/services/CUser.php:1331
 #, c-format
 msgid "User \"%1$s\" is dashboard \"%2$s\" owner."
-msgstr "Benutzer \"%1$s\" ist Besitzer von Dashboard \"%2$s\"."
+msgstr "Benutzer \"%1$s\" ist Besitzer von Übersichtsseite \"%2$s\"."
 
 #: include/classes/api/services/CUser.php:1316
 #, c-format
@@ -18573,7 +18325,7 @@ msgstr ""
 #: app/controllers/CControllerUserUnblock.php:61
 #, c-format
 msgid "User \"%1$s\" unblocked."
-msgstr ""
+msgstr "Benutzer \"%1$s\" entsperrt."
 
 #: include/actions.inc.php:1976
 msgid "User action"
@@ -18587,7 +18339,7 @@ msgstr "Benutzer hinzugefügt"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Benutzer kann sich nicht selbst eintragen in eine deaktiverte Gruppe oder eine ohne Zugriff auf die Oberfläche."
@@ -18595,11 +18347,11 @@ msgstr "Benutzer kann sich nicht selbst eintragen in eine deaktiverte Gruppe ode
 #: app/views/administration.user.edit.php:411
 #: include/classes/api/services/CUser.php:966
 msgid "User cannot change own role."
-msgstr ""
+msgstr "Der Benutzer kann seine eigene Rolle nicht ändern."
 
 #: app/views/administration.userrole.edit.php:62
 msgid "User cannot change the user type of own role."
-msgstr ""
+msgstr "Der Benutzer kann den Benutzertyp der eigenen Rolle nicht ändern."
 
 #: app/controllers/CControllerUserDelete.php:56
 msgid "User deleted"
@@ -18607,7 +18359,7 @@ msgid_plural "Users deleted"
 msgstr[0] "Benutzer gelöscht"
 msgstr[1] "Benutzer gelöscht"
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18617,27 +18369,27 @@ msgstr[1] "Benutzer gelöscht"
 msgid "User group"
 msgstr "Benutzergruppe"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
-msgstr ""
+msgstr "Die Benutzergruppe \"%1$s\" existiert bereits."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Benutzer-Gruppe \"%1$s\" wird verwendet in Skript \"%2$s\"."
@@ -18671,8 +18423,8 @@ msgstr[1] "Benutzergruppen aktualisiert"
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18716,14 +18468,14 @@ msgstr "Benutzerpasswort"
 msgid "User profile"
 msgstr "Benutzerprofil"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr "Benutzerrolle"
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18792,7 +18544,7 @@ msgstr "Benutzer geändert"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -18997,7 +18749,7 @@ msgstr ""
 
 #: include/classes/items/CHelpItems.php:1037
 msgid "VMware virtual machine datacenter name, <url> - VMware service URL, <uuid> - VMware virtual machine host name. Returns string"
-msgstr ""
+msgstr "Name des Rechenzentrums der virtuellen VMware-Maschine, <url> - URL des VMware-Dienstes, <uuid> - Hostname der virtuellen VMware-Maschine. Rückgabe Zeichenkette"
 
 #: include/classes/items/CHelpItems.php:1157
 msgid "VMware virtual machine disk device read statistics, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance, <mode> - bps/ops - bytes/operations per second"
@@ -19108,14 +18860,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19125,7 +18877,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19167,7 +18919,7 @@ msgstr ""
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "Wert \"%1$s\" ist zu lang für Feld \"%2$s\" - %3$d Zeichen. Die erlaubte Länge beträgt %4$d Zeichen."
@@ -19184,7 +18936,7 @@ msgstr "Wert Zwischenspeicher Statistik. Gültige Modi sind: total, free, used u
 msgid "Value cannot be empty."
 msgstr "Wert kann nicht leer sein."
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Wertezuordnung"
 
@@ -19227,11 +18979,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "Wert eines beliebigen Windows-Leistungsindikator. Gibt Ganzzahl, Gleitkommazahl, Zeichenkette oder Text zurück (je nach Wunsch)"
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19278,7 +19031,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19365,7 +19118,7 @@ msgstr "Sichtbarer Name darf nicht leer sein wenn der Hostname fehlt."
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "M"
@@ -19382,7 +19135,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Warnung"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr "Warnmeldung"
 
@@ -19392,7 +19145,7 @@ msgid "Warning! Unsupported %1$s database server version. Should be at least (%2
 msgstr ""
 
 # "remember"?
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Leider wurde die maximale mögliche Anzahl von Elementen zur Erinnerung erreicht."
 
@@ -19408,7 +19161,7 @@ msgstr "Leider wurde die maximale mögliche Anzahl von Elementen zur Erinnerung
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web"
 
@@ -19420,7 +19173,7 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Web-Überwachung"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr ""
 
@@ -19435,27 +19188,27 @@ msgstr ""
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "Web-Szenario hinzugefügt"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Web-Szenario gelöscht"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Web-Szenario deaktiviert"
 msgstr[1] "Web-Szenarios deaktiviert"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Web-Szenario aktiviert"
 msgstr[1] "Web-Szenarios aktiviert"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "Web-Szenario aktualisiert"
 
@@ -19477,7 +19230,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Mi"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -19488,7 +19241,7 @@ msgstr "Mittwoch"
 msgid "Weekly"
 msgstr "wöchentlich"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19504,14 +19257,14 @@ msgstr "Willkommen bei"
 msgid "When active"
 msgstr "Aktiv um"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
-msgstr ""
+msgstr "Widget bei X:%3$d, Y:%4$d auf Seite #%2$d der Übersichtsseite \"%1$s\" liegt außerhalb des zulässigen Bereichs."
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
-msgstr ""
+msgstr "Das Widget ist zu klein für die angegebene Anzahl von Spalten und Zeilen."
 
 #: graphs.php:44 include/classes/widgets/CWidgetHelper.php:753
 #: include/classes/widgets/CWidgetHelper.php:786
@@ -19553,7 +19306,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:142
 #: include/classes/widgets/forms/CWidgetFormProblems.php:162
 msgid "With problem name"
-msgstr ""
+msgstr "Mit Problemname"
 
 #: app/views/monitoring.widget.problemhosts.view.php:33
 msgid "With problems"
@@ -19704,6 +19457,10 @@ msgstr ""
 msgid "Y-m-d H:i:s"
 msgstr "Y-m-d H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr "J1"
@@ -19765,7 +19522,7 @@ msgstr "jährlich"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19814,26 +19571,20 @@ msgstr "Du bist nicht eingeloggt"
 
 #: app/views/popup.generic.php:90
 msgid "You cannot switch hosts for current selection."
-msgstr ""
+msgstr "Sie können den Host für die aktuelle Auswahl nicht wechseln."
 
 #: include/classes/api/services/CAction.php:1808
 #, c-format
 msgid "You did not specify targets for action operation global script \"%1$s\"."
-msgstr ""
+msgstr "Sie haben keine Ziele für das globale Skript \"%1$s\" der Aktionsoperation angegeben."
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19845,9 +19596,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Sie haben keine Berechtigung, diese Operation durchzuführen."
 
@@ -19963,63 +19711,67 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
-msgstr ""
+msgstr "ein DNS-Name wird erwartet"
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr "boolescher Wert erwartet"
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "Zeichenfolge erwartet"
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
-msgstr ""
+msgstr "ein Datum im Format JJJJ-MM-TT wird erwartet"
 
 #: app/views/administration.authentication.edit.php:80
 msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr "ein low-level Suchlauf-Makro wird erwartet"
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr "Nummer erwartet"
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr "eine Zahl ist zu groß"
@@ -20040,28 +19792,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr "Zeitangabe erwartet"
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr "Zeitspanne erwartet"
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr "es wird ein Zeitraum erwartet"
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr "Zeiteinheit erwartet"
@@ -20109,7 +19862,7 @@ msgstr "alle"
 msgid "all media"
 msgstr "Alle Medien"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr "eine IP Adresse wird erwartet"
 
@@ -20117,42 +19870,37 @@ msgstr "eine IP Adresse wird erwartet"
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "ein Array wird erwartet"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr "ein Array oder eine Zeichenfolge wird erwartet"
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20162,7 +19910,7 @@ msgid "an empty string is expected"
 msgstr "eine leere Zeichenfolge wird erwartet"
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr "eine gerade Anzahl von hexadezimalen Zeichen wird erwartet"
 
@@ -20170,11 +19918,15 @@ msgstr "eine gerade Anzahl von hexadezimalen Zeichen wird erwartet"
 msgid "an explicit time is expected"
 msgstr "eine explizite Zeit ist erwartet"
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr "eine Integerzahl ist erwartet"
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20247,7 +19999,7 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:213
 #: include/views/js/configuration.graph.edit.js.php:280
 msgid "avg"
-msgstr "durchschn."
+msgstr "durchschnitt"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:349
 msgid "avg() - Average value of a period T"
@@ -20279,11 +20031,11 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:427
 msgid "bitrshift() - Bitwise shift right"
-msgstr ""
+msgstr "bitrshift() - Bitweises Verschieben nach rechts"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:440
 msgid "bitxor() - Bitwise exclusive OR"
-msgstr ""
+msgstr "bitxor() - Bitweises exklusives ODER"
 
 #: app/views/administration.trigdisplay.edit.php:48
 #: app/views/administration.trigdisplay.edit.php:60
@@ -20294,11 +20046,11 @@ msgstr "Blinkt"
 
 #: include/classes/api/services/CItemGeneral.php:488
 msgid "both username and password should be either present or empty"
-msgstr ""
+msgstr "sowohl Benutzername als auch Passwort sollten entweder vorhanden oder leer sein"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:453
 msgid "bytelength() - Returns the length in bytes"
-msgstr ""
+msgstr "bytelength() - Gibt die Länge in Bytes zurück"
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:120
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:135
@@ -20335,14 +20087,8 @@ msgstr "nicht änderbar"
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20372,19 +20118,11 @@ msgstr "nicht änderbar"
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20404,14 +20142,14 @@ msgstr "nicht änderbar"
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20419,38 +20157,38 @@ msgstr "nicht änderbar"
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "darf nicht leer sein"
 
 #: include/classes/api/services/CItemGeneral.php:2556
 msgid "cannot convert to JSON, result value too long"
-msgstr ""
+msgstr "kann nicht in JSON konvertiert werden, Ergebniswert zu lang"
 
 #: include/classes/helpers/CElasticsearchHelper.php:87
 msgid "cannot perform Scroll API request, data could be truncated"
-msgstr ""
+msgstr "keine Scroll-API-Anfrage durchführen kann, könnten die Daten abgeschnitten werden"
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr "Kann Eigenschaften für eine vorlagengestützte Suchlaufregel nicht aktualisieren"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:460
 msgid "cbrt() - Cube root"
-msgstr ""
+msgstr "cbrt() - kubische Wurzel"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:467
 msgid "ceil() - Rounds up to the nearest greater integer"
-msgstr ""
+msgstr "ceil() - Rundet auf die nächsthöhere ganze Zahl"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:474
 msgid "change() - Difference between last and previous value"
-msgstr ""
+msgstr "change() - Differenz zwischen dem letzten und dem vorherigen Wert"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:480
 msgid "char() - Returns the character which represents the given ASCII code"
-msgstr ""
+msgstr "char() - Gibt das Zeichen zurück, das den angegebenen ASCII-Code darstellt"
 
 #: include/classes/parsers/CConditionFormula.php:219
 #, c-format
@@ -20459,21 +20197,21 @@ msgstr "Prüfen des Ausdrucks beginnend bei \"%1$s\""
 
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:125
 msgid "circular dependency is not allowed"
-msgstr ""
+msgstr "zirkuläre Abhängigkeiten sind nicht erlaubt"
 
 #: include/classes/api/services/CItemGeneral.php:2270
 #: include/classes/import/CConfigurationImport.php:2843
 msgid "circular item dependency is not allowed"
 msgstr "zirkuläre Datenpunkt Abhängigkeit ist nicht zulässig"
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
-msgstr ""
+msgstr "Farbe"
 
 #: app/partials/monitoring.problem.filter.php:236
 #: include/classes/widgets/views/widget.problems.form.view.php:94
 msgid "comma-separated list"
-msgstr ""
+msgstr "Kommagetrennte Liste"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:487
 msgid "concat() - Returns a string that is the result of concatenating value to string"
@@ -20484,7 +20222,8 @@ msgid "configure"
 msgstr "konfigurieren"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20507,13 +20246,13 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:521
 msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
-msgstr ""
+msgstr "count() - Anzahl der erfolgreich abgerufenen Werte V (die den Operator O erfüllen) für den Zeitraum T"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:528
 msgid "countunique() - The number of unique values"
-msgstr ""
+msgstr "countunique() - Die Anzahl der einmaligen Werte"
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "T"
@@ -20524,15 +20263,15 @@ msgstr "d.M"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:535
 msgid "date() - Current date"
-msgstr ""
+msgstr "date() - Aktuelles Datum"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:541
 msgid "dayofmonth() - Day of month"
-msgstr ""
+msgstr "dayofmonth() - Tag des Monats"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:547
 msgid "dayofweek() - Day of week"
-msgstr ""
+msgstr "dayofweek() - Wochentag"
 
 #: app/partials/common.filter.trigger.php:116
 #: app/partials/monitoring.problem.filter.php:124
@@ -20551,7 +20290,7 @@ msgstr "Standard"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:553
 msgid "degrees() - Converts a value from radians to degrees"
-msgstr ""
+msgstr "degrees() - Konvertiert einen Wert von Radiant in Grad"
 
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:31
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
@@ -20575,9 +20314,9 @@ msgstr "absteigend"
 msgid "description"
 msgstr "Beschreibung"
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
-msgstr ""
+msgstr "Verzeichnis darf nicht leer sein"
 
 #: include/events.inc.php:61
 msgid "discovered host"
@@ -20594,16 +20333,16 @@ msgstr "Suchlauf"
 #: include/classes/api/services/CTask.php:452
 #, c-format
 msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
-msgstr ""
+msgstr "Suchregel \"%1$s\" auf Host \"%2$s\" wird nicht überwacht"
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr "enthält nicht"
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr "ist ungleich"
@@ -20629,7 +20368,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20666,6 +20406,10 @@ msgstr "Ausdruck ist leer"
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20682,15 +20426,15 @@ msgstr "erster Parameter erwartet"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:586
 msgid "first() - The oldest value in the specified time interval"
-msgstr ""
+msgstr "first() - Der älteste Wert im angegebenen Zeitintervall"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:593
 msgid "floor() - Rounds down to the nearest smaller integer"
-msgstr ""
+msgstr "floor() - Rundet auf die nächstkleinere ganze Zahl ab"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:600
 msgid "forecast() - Forecast for next t seconds based on period T"
-msgstr ""
+msgstr "forecast() - Vorhersage für die nächsten t Sekunden auf der Grundlage des Zeitraums T"
 
 #: app/views/popup.maintenance.period.php:127 include/maintenances.inc.php:108
 msgid "fourth"
@@ -20698,7 +20442,7 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:607
 msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
-msgstr ""
+msgstr "fuzzytime() - Die Differenz zwischen dem Elementwert (als Zeitstempel) und dem Zeitstempel des Zabbix-Servers ist kleiner oder gleich T Sekunden (1 - wahr, 0 - falsch)"
 
 #: include/views/configuration.item.edit.php:741
 #: include/views/configuration.item.edit.php:746
@@ -20712,7 +20456,7 @@ msgstr "globale Einstellungen Bereinigungsprozess"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20753,6 +20497,11 @@ msgstr "Symbol"
 msgid "image"
 msgstr "Bild"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "in"
@@ -20793,15 +20542,19 @@ msgstr "falsche Elementanzahl"
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "falsche Syntax bei \"%1$s\""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20829,7 +20582,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr "Ungültige Adressbereich \"%1$s\""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr "ungültigen Byte-Sequenz in UTF-8"
 
@@ -20840,17 +20593,17 @@ msgstr "ungültige Verzögerung"
 #: include/classes/validators/CHistFunctionValidator.php:67
 #, c-format
 msgid "invalid fifth parameter in function \"%1$s\""
-msgstr ""
+msgstr "Ungültiger fünfter Parameter in Funktion \"%1$s\""
 
 #: include/classes/validators/CHistFunctionValidator.php:63
 #, c-format
 msgid "invalid first parameter in function \"%1$s\""
-msgstr ""
+msgstr "Ungültiger erster Parameter in Funktion \"%1$s\""
 
 #: include/classes/validators/CHistFunctionValidator.php:66
 #, c-format
 msgid "invalid fourth parameter in function \"%1$s\""
-msgstr ""
+msgstr "Ungültiger vierter Parameter in Funktion \"%1$s\""
 
 #: include/classes/graphdraw/CLineGraphDraw.php:241
 #: include/classes/graphdraw/CPieGraphDraw.php:168
@@ -20858,27 +20611,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr "Ungültige Speicherdauer für historische Daten"
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr "ungültiger Hostname"
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr "Ungültiger regulärer Ausdruck"
 
@@ -20906,7 +20659,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr "ist nicht in {} eingeschlossen oder falsch formatiert"
 
@@ -20930,7 +20683,7 @@ msgstr "Schlüssel ist leer"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:650
 msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
-msgstr ""
+msgstr "kurtosis() - Misst die \"Schwanzlosigkeit\" der Wahrscheinlichkeitsverteilung"
 
 #: include/classes/graphdraw/CLineGraphDraw.php:1377
 #: include/classes/graphdraw/CPieGraphDraw.php:296 include/graphs.inc.php:88
@@ -20970,19 +20723,19 @@ msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:690
 msgid "log10() - Decimal logarithm"
-msgstr ""
+msgstr "log10() - Dezimaler Logarithmus"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:697
 msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
-msgstr ""
+msgstr "logeventid() - Ereignis-ID des letzten Protokolleintrags, der dem regulären Ausdruck V für den Zeitraum T entspricht (1 - Übereinstimmung, 0 - keine Übereinstimmung)"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:704
 msgid "logseverity() - Log severity of the last log entry for period T"
-msgstr ""
+msgstr "logseverity() - Schweregrad des letzten Protokolleintrags für den Zeitraum T"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:711
 msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
-msgstr ""
+msgstr "logsource() - Quelle des letzten Protokolleintrags, der dem Parameter V im Zeitraum T entspricht (1 - Übereinstimmung, 0 - keine Übereinstimmung)"
 
 #: include/events.inc.php:65
 msgid "low-level discovery rule"
@@ -20992,12 +20745,12 @@ msgstr "Suchlaufregel"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -21027,7 +20780,7 @@ msgstr ""
 #: include/classes/validators/CHistFunctionValidator.php:91
 #, c-format
 msgid "mandatory parameter is missing in function \"%1$s\""
-msgstr ""
+msgstr "In der Funktion \"%1$s\" fehlt ein obligatorischer Parameter."
 
 #: include/classes/api/services/CMap.php:861
 #: include/classes/api/services/CMap.php:1329
@@ -21054,15 +20807,15 @@ msgstr "übereinstimmend"
 #: include/views/js/configuration.graph.edit.js.php:281
 #: include/views/js/item.preprocessing.js.php:163
 msgid "max"
-msgstr "max."
+msgstr "max"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
-msgstr ""
+msgstr "Maximaler Zeitraum ist kleiner als der Standardzeitraum des Zeitfilters"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:738
 msgid "max() - Maximum value for period T"
-msgstr ""
+msgstr "max() - Höchstwert für den Zeitraum T"
 
 #: include/classes/api/services/CItemGeneral.php:2364
 msgid "maximum dependent items count reached"
@@ -21089,14 +20842,14 @@ msgstr ""
 #: include/views/js/configuration.graph.edit.js.php:279
 #: include/views/js/item.preprocessing.js.php:162
 msgid "min"
-msgstr "min."
+msgstr "min"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:763
 msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr "die Mindestlänge beträgt %1$s Zeichen"
@@ -21123,8 +20876,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21139,27 +20892,14 @@ msgstr "muss ein gültiger LDAP-Benutzer sein"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "muss zwischen \"%1$s\" und \"%2$s\" liegen"
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21187,6 +20927,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21197,7 +20945,7 @@ msgstr ""
 msgid "name"
 msgstr "Name"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "neu"
 
@@ -21333,7 +21081,7 @@ msgstr "Leistung"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21368,24 +21116,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21413,11 +21165,11 @@ msgstr ""
 msgid "regular expression"
 msgstr "Regulärer Ausdruck"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21429,15 +21181,15 @@ msgstr ""
 msgid "right"
 msgstr "rechts"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21485,7 +21237,7 @@ msgstr ""
 msgid "short description"
 msgstr "Kurzbeschreibung"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21504,15 +21256,15 @@ msgstr "Kurzbeschreibung"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr "Sollte leer sein"
 
@@ -21528,31 +21280,31 @@ msgstr "Zeige Symbolzuordnung"
 msgid "sign in as guest"
 msgstr "als Gast anmelden"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21560,11 +21312,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21580,8 +21332,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21592,7 +21344,7 @@ msgstr ""
 msgid "tag"
 msgstr "Marker"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21601,13 +21353,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "Vorlagen ID \"%1$s\" kommt %2$s mal vor"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21616,20 +21372,20 @@ msgstr "Vorlagen ID \"%1$s\" kommt %2$s mal vor"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "der Parameter \"%1$s\" fehlt"
@@ -21661,39 +21417,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21707,7 +21463,7 @@ msgstr "Auslöser"
 msgid "trigger does not allow manual closing"
 msgstr "Auslöser erlaubt manuelle Schließung nicht"
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21719,26 +21475,26 @@ msgstr "Auslöser-Prototyp nicht zu einer anderen Vorlage oder anderem Host vers
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "Hier klicken um zu suchen"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21746,11 +21502,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21767,10 +21523,10 @@ msgstr "unerwartetes Ende des Schlüssels"
 msgid "unexpected end of macro"
 msgstr "unerwartetes Ende des Makros"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21780,11 +21536,12 @@ msgstr "unerwartetes Ende des Makros"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr "unerwarteter Parameter \"%1$s\""
@@ -21810,8 +21567,8 @@ msgstr "unerwarteter Text \"%1$s\""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21836,6 +21593,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr "nicht unterstützte Version"
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21851,7 +21612,7 @@ msgstr "nicht unterstützte Version"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21871,11 +21632,11 @@ msgstr "nicht unterstützte Version"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "Wert"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21893,76 +21654,85 @@ msgstr "Wert \"%1$s\" nicht gefunden"
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr "Wert %1$s ist bereits vorhanden"
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr "Wert ist zu lang"
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21974,18 +21744,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr "Wert muss einer von %1$s sein"
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21994,7 +21762,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -22007,11 +21775,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -22028,7 +21796,7 @@ msgstr "Falscher Suchlaufregel-Typ"
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "J"
diff --git a/ui/locale/el/LC_MESSAGES/frontend.po b/ui/locale/el/LC_MESSAGES/frontend.po
index 7beb79f2b68..90194d724c5 100644
--- a/ui/locale/el/LC_MESSAGES/frontend.po
+++ b/ui/locale/el/LC_MESSAGES/frontend.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2014-10-03 08:43+0300\n"
 "Last-Translator: ΓΙΑΝΝΗΣ <yannis@computerstudio.gr>\n"
 "Language-Team: none\n"
@@ -98,7 +98,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d ημέρα"
 msgstr[1] "%1$d ημέρες"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -183,7 +183,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -197,7 +197,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -230,14 +230,14 @@ msgstr[1] "%1$s προσπάθειες απέμειναν"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s δευτερόλεπτο"
 msgstr[1] "%1$s δευτερόλεπτα"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -257,13 +257,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -393,7 +393,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -454,10 +454,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr ""
@@ -500,7 +496,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Αναγνώριση"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Αναγνώριση"
 
@@ -508,7 +504,7 @@ msgstr "Αναγνώριση"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Αναγνωρισμένο"
@@ -521,7 +517,7 @@ msgstr "Αναγνωρισμένα συμβάντα ΠΡΟΒΛΗΜΑ"
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -548,9 +544,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -607,7 +603,7 @@ msgstr "Ενέργεια \"%1$s\" υπάρχει ήδη."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Ενέργεια \"%1$s\" χωρίς καθορισμένες λειτουργίες."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -616,7 +612,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Η ενέργεια προστέθηκε"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -665,8 +661,8 @@ msgstr "Η Ενέργεια ενημερώθηκε"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Ενέργειες"
@@ -733,7 +729,7 @@ msgstr "Ενεργό έως"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -744,7 +740,7 @@ msgstr "Ενεργό έως"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -767,9 +763,9 @@ msgstr "Ενεργό έως"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -839,7 +835,7 @@ msgstr "Ενεργό έως"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Προσθήκη"
 
@@ -847,11 +843,11 @@ msgstr "Προσθήκη"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr ""
 
@@ -859,7 +855,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -876,7 +872,7 @@ msgstr "Προσθήκη ξενιστή"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr ""
 
@@ -898,7 +894,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -950,12 +946,12 @@ msgstr ""
 msgid "Add widget"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -965,7 +961,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -978,7 +974,7 @@ msgstr "Διαχειριστής"
 msgid "Administration"
 msgstr "Διαχείριση"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -1000,7 +996,7 @@ msgstr "Ηλικία μικρότερη απο"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1072,7 +1068,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Όλα"
 
@@ -1090,7 +1086,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Όλοι οι σύνδεσμοι πρέπει να έχουν \"Όνομα\" και \"URL\" καθορισμένο"
 
@@ -1108,7 +1104,7 @@ msgstr ""
 msgid "All problems if tag values match"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1221,15 +1217,15 @@ msgstr "Σφάλμα εφαρμογής."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Εφαρμογή"
 
@@ -1247,7 +1243,7 @@ msgstr "Προσεγγίζοντας"
 msgid "Apr"
 msgstr "Απρ"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Απρίλιος"
 
@@ -1275,7 +1271,7 @@ msgstr "Τύπος περιοχής"
 msgid "Arithmetic"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1322,7 +1318,7 @@ msgstr "Σε (ώρα:λεπτό)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1331,7 +1327,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1343,6 +1339,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1354,7 +1355,7 @@ msgstr "Τουλάχιστον μία περίοδος συντήρησης να
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1410,7 +1411,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Αυγ"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Αύγουστος"
 
@@ -1423,7 +1424,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1500,7 +1501,7 @@ msgstr ""
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1515,7 +1516,7 @@ msgstr "Αυτόματη αντιστοίχιση εικονιδίου"
 msgid "Automatic icon selection"
 msgstr "Αυτόματη επιλογή εικονιδίου"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1567,7 +1568,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1630,7 +1631,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Αποκλεισμένο"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr ""
 
@@ -1684,11 +1685,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Κάτω"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr ""
 
@@ -1714,7 +1715,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1759,8 +1760,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1769,7 +1770,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Υπολογισμένο"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1794,7 +1795,7 @@ msgstr "Επανάκληση"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1807,8 +1808,8 @@ msgstr "Επανάκληση"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Ματαίωση"
 
@@ -1838,7 +1839,7 @@ msgstr "Αδύνατη η προσθήκη ενέργειας"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1848,7 +1849,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Αδύνατη η προσθήκη εξάρτησης απο ξενιστή σε σχεδιότυπο."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1879,8 +1880,8 @@ msgid "Cannot add host prototype"
 msgstr "δύνατη η προσθήκη πρωτότυπου ξενιστή"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Αδύνατη η προσθήκη εικόνας"
 
@@ -1972,15 +1973,15 @@ msgstr "Αδύνατη η προσθήκη χρήστη"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Αδύνατη η προσθήκη σενάριου ιστού"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2000,33 +2001,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Αδύνατη η εκκαθάριση ιστορικού"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Αδύνατη η κλωνοποίηση προτότυπων γραφημάτων."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "Αδύνατη η κλωνοποίηση πρωτότυπων ξενιστών."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Αδύνατη η κλωνοποίηση προτότυπων συλλεκτών."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Αδύνατη η κλωνοποίηση προτότυπων εναυσμάτων."
 
@@ -2053,7 +2050,7 @@ msgid_plural "Cannot copy graphs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] ""
@@ -2105,8 +2102,8 @@ msgstr "Αδύνατη η δημιουργία αντιστοίχισης εικ
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2135,7 +2132,7 @@ msgstr "Αδύνατη η διαγραφή Zabbix εσωτερικού χρήσ�
 msgid "Cannot delete action"
 msgstr "Αδύνατη η διαγραφή ενέργειας"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2202,7 +2199,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2213,11 +2210,11 @@ msgstr[1] ""
 msgid "Cannot delete host prototypes"
 msgstr "Αδύνατη η διαγραφή πρωτότυπων ξενιστών"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Αδύνατη η διαγραφή αντιστοίχισης εικονιδίου"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Αδύνατη η διαγραφή εικόνας"
 
@@ -2242,7 +2239,7 @@ msgstr "Αδύνατη η διαγραφή πρωτότυπου συλλέκτη
 msgid "Cannot delete item prototypes"
 msgstr "Αδύνατη η διαγραφή πρωτότυπων συλλεκτών"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Αδύνατη η διαγραφή συλλεκτών"
 
@@ -2275,7 +2272,7 @@ msgid_plural "Cannot delete proxies"
 msgstr[0] "Αδύνατη η διαγραφή διαμεσολαβητή"
 msgstr[1] "Αδύνατη η διαγραφή διαμεσολαβητή"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2299,7 +2296,7 @@ msgid_plural "Cannot delete scripts"
 msgstr[0] "Αδύνατη η διαγραφή δέσμης ενεργειών"
 msgstr[1] "Αδύνατη η διαγραφή δέσμης ενεργειών"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Αδύνατη η διαγραφή δεσμών ενεργειών. Η Δέσμη ενεργειών \"%1$s\" χρησιμοποιείτε στην εργασία ενέργειας \"%2$s\"."
@@ -2315,8 +2312,8 @@ msgid_plural "Cannot delete services"
 msgstr[0] "Αδύνατη η διαγραφή υπηρεσίας"
 msgstr[1] "Αδύνατη η διαγραφή υπηρεσίας"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2345,7 +2342,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr "Αδύνατη η διαγραφή σχεδιότυπου συλλέκτη."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Αδύνατη η διαγραφή σχεδιότυπων συλλεκτών."
 
@@ -2398,7 +2395,7 @@ msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Αδύνατη η διαγραφή σενάριου ιστού"
 
@@ -2433,7 +2430,7 @@ msgid_plural "Cannot disable hosts"
 msgstr[0] "Αδύνατη η απενεργοποίηση ξενιστή"
 msgstr[1] "Αδύνατη η απενεργοποίηση ξενιστών"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Αδύνατη η απενεργοποίηση συλλέκτη"
@@ -2464,7 +2461,7 @@ msgid_plural "Cannot disable triggers"
 msgstr[0] "Αδύνατη η απενεργοποίηση εναύσματος"
 msgstr[1] "Αδύνατη η απενεργοποίηση εναυσμάτων"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Αδύνατη η απενεργοποίηση σενάριου ιστού"
@@ -2511,7 +2508,7 @@ msgid_plural "Cannot enable hosts"
 msgstr[0] "Αδύνατη η ενεργοποίηση ξενιστή"
 msgstr[1] "Αδύνατη η ενεργοποίηση ξενιστών"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Αδύνατη η ενεργοποίηση συλλέκτη"
@@ -2542,7 +2539,7 @@ msgid_plural "Cannot enable triggers"
 msgstr[0] "Αδύνατη η ενεργοποίηση εναύσματος"
 msgstr[1] "Αδύνατη η ενεργοποίηση εναυσμάτων"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Αδύνατη η ενεργοποίηση σενάριου ιστού"
@@ -2556,7 +2553,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2590,8 +2587,8 @@ msgstr "Δεν βρίσκω ξενιστή \"%1$s\" χρησιμοποιούμε
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Δεν βρίσκω ομάδα ξενιστή \"%1$s\" για πρωτότυπο ξενιστή \"%2$s\" κανόνα εντοπισμού \"%3$s\" σε \"%4$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2689,24 +2686,20 @@ msgstr "Δεν βρίσκω αντιστοίχιση τιμής \"%1$s\" με χ
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Δεν βρίσκω αντιστοίχιση τιμής \"%1$s\" με χρήση σε πρωτότυπο συλλέκτη \"%2$s\" κανόνα εντοπισμού \"%3$s\" σε \"%4$s\"."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "Δεν μπορώ να έχω κενό ορατό όνομα σχεδιότυπου."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2719,7 +2712,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
 msgstr[0] "Δεν μπορώ να εισάγω σχεδιότυπο \"%1$s\", συνδεδεμένο σχεδιότυπο \"%2$s\" ανύπαρκτο."
 msgstr[1] "Δεν μπορώ να εισάγω σχεδιότυπο \"%1$s\", συνδεδεμένα σχεδιότυπα \"%2$s\" ανύπαρκτα."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "Αδύνατη η εισαγωγή έκφρασης εναύσματος"
 
@@ -2733,7 +2726,7 @@ msgid "Cannot link template."
 msgstr "Αδύνατη η συσχέτιση σχεδιότυπου."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2765,17 +2758,17 @@ msgstr "Αδύνατη η μαζική ενημέρωση ορατού ονόμ�
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Αδύνατη η εκτέλεση πρότασης διαγραφής σε πίνακα \"%1$s\" χωρίς συνθήκη where."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Αδύνατη η εκτέλεση πρότασης ενημέρωσης σε πίνακα \"%1$s\" χωρίς τιμές."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Αδύνατη η εκτέλεση πρότασης ενημέρωσης σε πίνακα \"%1$s\" χωρίς συνθήκη where."
@@ -2802,7 +2795,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Αδύνατη η ανάγνωση απάντησης, ελέγξτε σύνδεση με Zabbix εξυπηρετητή \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Αδύνατη η μετονομασία χρήστη επισκέπτη."
 
@@ -2821,7 +2814,7 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Αδύνατη η αποστολή εντολής, ελέγξτε σύνδεση με Zabbix εξυπηρετητή \"%1$s\"."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2861,12 +2854,12 @@ msgstr "Αδύνατη η τοποθέτηση πεδίων απογραφής �
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2885,7 +2878,7 @@ msgid_plural "Cannot unblock users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Αδύνατη η αποσύνδεση και καθαρισμός σεναρίων ιστού."
 
@@ -2898,7 +2891,7 @@ msgstr "Αδύνατη η αποσύνδεση σχεδιότυπου"
 msgid "Cannot unlink template."
 msgstr "Αδύνατη η αποσύνδεση σχεδιότυπου."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2951,11 +2944,6 @@ msgstr ""
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "Αδύνατη η ενημέρωση \"imagetype\" εικόνας \"%1$s\"."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2965,9 +2953,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "Αδύνατη η ενημέρωση εντοπισμένου γραφήματος."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "Αδύνατη η ενημέρωση εντοπισμένης ομάδος ξενιστή."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3026,9 +3015,7 @@ msgstr "Αδύνατη η ενημέρωση πρωτότυπου γραφήμα
 msgid "Cannot update group"
 msgstr "Αδύνατη η ενημέρωση ομάδος"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Αδύνατη η ενημέρωση ομάδων εντοπισμένων ξενιστών \"%1$s\"."
@@ -3052,13 +3039,13 @@ msgstr[1] "Αδύνατη η ενημέρωση πρωτότυπου ξενισ�
 msgid "Cannot update hosts"
 msgstr "Αδύνατη η ενημέρωση ξενιστών"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "Αδύνατη η ενημέρωση αντιστοίχισης εικονιδίου"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Αδύνατη η ενημέρωση εικόνας"
 
@@ -3113,12 +3100,12 @@ msgstr "Αδύνατη η ενημέρωση χάρτη δικτύου"
 msgid "Cannot update proxy"
 msgstr "Αδύνατη η ενημέρωση διαμεσολαβητή"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Αδύνατη η ενημέρωση διαμεσολαβητή εντοπισμένου ξενιστή \"%1$s\"."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3138,17 +3125,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Αδύνατη η ενημέρωση δέσμης ενεργειών"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3224,7 +3211,7 @@ msgstr[1] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Αδύνατη η ενημέρωση σενάριου ιστού"
 
@@ -3324,8 +3311,8 @@ msgid "Character string not included"
 msgstr "Δεν περιλαμβάνεται στοιχειοσειρά χαρακτήρων"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3440,7 +3427,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr "Οι έλεγχοι πρέπει να είναι μοναδικοί."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3461,7 +3448,7 @@ msgstr "Κυκλική αναφορά σε σχεδιότυπα: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "Κυκλική σύνδεση σχεδιότυπου μη επιτρεπτή."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3482,11 +3469,11 @@ msgstr "Εκκαθάριση ιστορικού και τάσεων"
 msgid "Clear when unlinking"
 msgstr "Εκκαθάριση όταν αποσυνδέεται"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3501,7 +3488,7 @@ msgstr "Ρολόι"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3516,7 +3503,7 @@ msgstr "Ρολόι"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Κλώνος"
 
@@ -3527,8 +3514,8 @@ msgstr "Κλώνος"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Κλείσιμο"
 
@@ -3539,13 +3526,13 @@ msgstr "Κλείσιμο"
 msgid "Close expression constructor"
 msgstr "Κλείσιμο κατασκευής έκφρασης"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
 
@@ -3558,8 +3545,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr ""
 
@@ -3576,7 +3563,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3642,7 +3629,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3653,17 +3640,12 @@ msgstr "Συνθήκη"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "Συνθήκη \"%2$s\" εκτός χρήσης σε τύπο \"%3$s\" διά ενέργεια \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "Συνθήκη \"%2$s\" εκτός χρήσης σε τύπο \"%3$s\" για κανόνα εντοπισμού \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3673,17 +3655,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "Συνθήκη \"%2$s\" μέ χρήση σε τύπο \"%3$s\" για ενέργεια \"%1$s\" ακαθόριστη."
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "Συνθήκη \"%2$s\" μέ χρήση σε τύπο \"%3$s\" για κανόνα εντοπισμού \"%1$s\" ακαθόριστη."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3699,7 +3676,7 @@ msgstr "Συνθήκες"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Διαμόρφωση"
 
@@ -3762,7 +3739,7 @@ msgstr "Διαμόρφωση ξενιστών"
 msgid "Configuration of housekeeping"
 msgstr "Διαμόρφωση τακτοποίησης"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Διαμόρφωση αντιστοίχισης εικονιδίου"
@@ -3869,7 +3846,7 @@ msgstr "Κείμενο επιβεβαίωσης"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr ""
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3962,7 +3939,7 @@ msgstr "Επαφή"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4022,7 +3999,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -4061,8 +4038,8 @@ msgstr "Συντεταγμένες"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Αντιγραφή"
 
@@ -4071,12 +4048,11 @@ msgstr "Αντιγραφή"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr ""
@@ -4103,16 +4079,6 @@ msgid_plural "Correlations enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr ""
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr ""
@@ -4121,14 +4087,10 @@ msgstr ""
 msgid "Correlation updated"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Αδύνατη η αποθήκευση εικόνας!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Απαρίθμηση"
 
@@ -4192,11 +4154,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr ""
 
@@ -4313,7 +4275,7 @@ msgstr "Δημιουργία χάρτη"
 msgid "Create media type"
 msgstr "Δημιουργία τύπου μέσων"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "Δημιουργία νέου"
 
@@ -4337,7 +4299,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Δημιουργία σχεδιότυπου"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Δημιουργία εναύσματος"
 
@@ -4500,7 +4462,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "DNS όνομα"
@@ -4512,11 +4474,11 @@ msgstr "DNS όνομα"
 msgid "Daily"
 msgstr "Ημερησίως"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4537,8 +4499,8 @@ msgstr ""
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr ""
 
@@ -4561,9 +4523,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr ""
 
@@ -4587,7 +4549,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4615,7 +4577,7 @@ msgstr "Επισκόπηση δεδομένων"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4757,7 +4719,7 @@ msgstr "Ημέρα της εβδομάδος"
 msgid "Days"
 msgstr "Ημέρες"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Εκσφαλμάτωση"
 
@@ -4771,26 +4733,26 @@ msgstr "Λειτουργία εκσφαλμάτωσης"
 msgid "Dec"
 msgstr "Δεκ"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Δεκέμβριος"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Προκαθορισμένο"
 
@@ -4883,7 +4845,7 @@ msgstr "Καθυστερημένο από"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4907,8 +4869,8 @@ msgstr "Καθυστερημένο από"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -4933,11 +4895,11 @@ msgstr "Διαγραφή και καθαρισμός σχεδιότυπου; (Π
 msgid "Delete current action?"
 msgstr "Διαγραφή τρέχουσας ενέργειας;"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4981,7 +4943,7 @@ msgstr "Διαγραφή πρωτότυπου συλλέκτη;"
 msgid "Delete item?"
 msgstr "Διαγραφή συλλέκτη;"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Διαγραφή συνδέσμων μεταξύ επιλεγμένων στοιχείων;"
 
@@ -5037,7 +4999,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "Διαγραφή επιλεγμένων κανόνων εντοπισμού;"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Διαγραφή επιλεγμένων στοιχείων;"
 
@@ -5142,7 +5104,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5186,7 +5148,7 @@ msgstr "Διαγραφή εναύσματος;"
 msgid "Delete web scenario?"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5231,7 +5193,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Εξαρτήσεις"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Εξαρτημένο"
 
@@ -5239,7 +5201,7 @@ msgstr "Εξαρτημένο"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5249,7 +5211,7 @@ msgstr "Εξαρτάται από"
 msgid "Deployment status"
 msgstr "Κατάσταση υλοποίησης"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5282,7 +5244,7 @@ msgid "Description"
 msgstr "Περιγραφή"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5448,10 +5410,10 @@ msgstr "Απενεργοποίηση επιλεγμένων σεναρίων ι�
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5534,7 +5496,7 @@ msgid "Discovery by proxy"
 msgstr "Εντοπισμός με διαμεσολαβητή"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Έλεγχος εντοπισμού"
 
@@ -5546,7 +5508,7 @@ msgstr "Έλεγχοι εντοπισμών"
 msgid "Discovery list"
 msgstr "Κατάλογος εντοπισμού"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Αντικείμενο εντοπισμού"
 
@@ -5578,7 +5540,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5586,12 +5548,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Κανόνας εντοπισμού"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Ο κανόνας εντοπισμού \"%1$s\" υπάρχει ήδη σε \"%2$s\", κληρονομημένος από άλλο σχεδιότυπο."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "Κανόνας εντοπισμού \"%1$s\" υπάρχει ήδη σε \"%2$s\"."
@@ -5604,7 +5566,7 @@ msgstr "Κανόνας εντοπισμού \"%1$s\" υπάρχει ήδη σε
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "Κανόνας εντοπισμού \"%1$s\" υπάρχει ήδη."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5646,7 +5608,7 @@ msgstr "Κανόνας εντοπισμού ενημερώθηκε"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5657,7 +5619,7 @@ msgstr "Κανόνες εντοπισμού"
 msgid "Discovery rules deleted"
 msgstr "Κανόνες εντοπισμού διεγράφησαν"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Κατάσταση εντοπισμού"
@@ -5694,10 +5656,11 @@ msgid "Display stacked graph"
 msgstr "Εμφάνιση στοιβαγμένου γραφήματος"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Εμφάνιση %1$s από %2$s βρέθηκαν"
@@ -5707,7 +5670,7 @@ msgstr "Εμφάνιση %1$s από %2$s βρέθηκαν"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5729,7 +5692,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Θέλετε να αντικαταστήσετε την υπο συνθήκη έκφραση;"
 
@@ -5785,7 +5748,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Ανενεργό"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5793,7 +5756,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr ""
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5812,18 +5775,6 @@ msgstr ""
 msgid "Draw style"
 msgstr "Τρόπος σχεδίασης"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5836,11 +5787,6 @@ msgstr ""
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5892,7 +5838,7 @@ msgstr "Δυναμικός συλλέκτης"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Κάθε URL πρέπει να έχει μοναδικό όνομα. Βεβαιωθείτε να υπάρχει μόνο ένα ονομαζόμενο URL"
 
@@ -5901,11 +5847,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5919,8 +5865,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Επεξεργασία"
 
@@ -5936,11 +5882,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Επεξεργασία εναύσματος"
 
@@ -6000,21 +5946,17 @@ msgstr "Κενό αρχείο κλειδιού SSL γιά σενάριο ιστ�
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "Κενό φίλτρο συνθήκης τύπου ID γιά ενέργεια \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Κενό φίλτρο συνθήκης τύπου ID γιά  γιά κανόνα εντοπισμού \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "Κενό φίλτρο συνθήκης μακροεντολής γιά κανόνα εντοπισμού \"%1$s\"."
@@ -6030,25 +5972,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6058,14 +5994,6 @@ msgstr "Κενή παράμετρος εισόδου."
 msgid "Empty map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Κενές παράμετροι"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6231,7 +6159,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6242,7 +6170,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6285,7 +6213,7 @@ msgid "English (en_US)"
 msgstr "Αγγλικά (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6301,7 +6229,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6320,12 +6248,12 @@ msgstr ""
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Σφάλμα στό αίτημα αναζήτησης για πίνακα \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6353,7 +6281,7 @@ msgstr "Αναγνωριστικό συμβάντος"
 msgid "Event acknowledged"
 msgstr "Αναγνωρισμένο συμβάν"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6361,7 +6289,7 @@ msgid "Event correlation"
 msgstr ""
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr ""
@@ -6396,11 +6324,11 @@ msgstr ""
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Τύπος συμβάντος"
 
@@ -6445,15 +6373,10 @@ msgstr "Εξαίρεση"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "Σφάλμα εκτέλεσης SQL [%1$s] in [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6491,7 +6414,7 @@ msgstr "Εκτελεσμένο"
 msgid "Executed script"
 msgstr "Εκτελέσιμη δέσμη ενεργειών"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Επιβεβαίωση εκτέλεσης"
 
@@ -6507,8 +6430,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr ""
 
@@ -6629,7 +6552,7 @@ msgstr "Εκφράσεις"
 msgid "External check"
 msgstr "Εξωτερικός έλεγχος"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "Π"
@@ -6656,8 +6579,8 @@ msgstr "Απέτυχε"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6668,26 +6591,26 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6695,7 +6618,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Αποτυχία ενημέρωσης σχεδιότυπου."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6719,7 +6642,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Φεβ"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Φεβρουάριος"
 
@@ -6741,10 +6664,9 @@ msgstr "Πεδίο \"%1$s\" δεν ορίζεται NULL."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6755,13 +6677,6 @@ msgstr "Πεδίο \"%1$s\" υποχρεωτικό."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6780,11 +6695,6 @@ msgstr "Πεδίο \"%1$s\" δεν είναι ακέραιος."
 msgid "Field \"%1$s\" is not string."
 msgstr "Πεδίο \"%1$s\" δεν είναι συμβολοσειρά."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6799,10 +6709,6 @@ msgstr "Πεδίο \"ξενιστής\" υποχρεωτικό."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Ανυποστήρικτος τύπος αρχείου."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6867,7 +6773,8 @@ msgstr "Γεμισμένη περιοχή"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6892,7 +6799,7 @@ msgstr "Φίλτρο"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6944,7 +6851,7 @@ msgstr "Προσαρμογή στο χάρτη"
 msgid "Fixed"
 msgstr "Σταθερό"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6995,12 +6902,12 @@ msgstr "Τύπος"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7013,7 +6920,7 @@ msgstr "Γαλλικά (fr_FR)"
 msgid "Fri"
 msgstr "Παρ"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Παρασκευή"
 
@@ -7124,7 +7031,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "Η δοσμένη έκφραση δεν είναι μακροεντολή"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr ""
@@ -7138,7 +7045,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Μετάβαση σε"
 
@@ -7176,7 +7083,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7184,7 +7091,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Χρωμοβαθμισμένη γραμμή"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7244,7 +7151,7 @@ msgstr[1] ""
 msgid "Graph deleted"
 msgstr "Γράφημα διεγράφη"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7281,8 +7188,8 @@ msgstr "Πρωτότυπο γράφημα διεγράφη"
 msgid "Graph prototype updated"
 msgstr "Πρωτότυπο γράφημα ενημερώθηκε"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7316,8 +7223,8 @@ msgstr "Τύπος γραφήματος"
 msgid "Graph updated"
 msgstr "Γράφημα ενημερώθηκε"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7348,7 +7255,7 @@ msgstr "Γράφημα με όνομα \"%1$s\" υπάρχει ήδη σε γρ�
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Γραφήματα"
 
@@ -7369,12 +7276,12 @@ msgstr "Πλέγμα"
 msgid "Group"
 msgstr "Ομάδα"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Ομάδα \"%1$s\" δεν διαγράφεται, διότι χρησιμοποιείται σε πρωτότυπο ξενιστή."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr ""
@@ -7548,11 +7455,11 @@ msgstr "Βοήθεια"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Κρυφό"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr ""
 
@@ -7579,11 +7486,11 @@ msgstr ""
 msgid "High"
 msgstr "Υψηλή"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7604,7 +7511,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Ιστορικό"
 
@@ -7612,11 +7519,15 @@ msgstr "Ιστορικό"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Ιστορικό καθαρίστηκε"
 
@@ -7659,7 +7570,7 @@ msgstr "Οριζόντια"
 msgid "Horizontal align"
 msgstr "Οριζόντια ευθυγράμμιση"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7688,7 +7599,7 @@ msgstr "Οριζόντια ευθυγράμμιση"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7702,7 +7613,7 @@ msgstr[1] "Ξενιστές"
 msgid "Host \"%1$s\" already exists."
 msgstr "Ο ξενιστής \"%1$s\" υπάρχει ήδη."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7710,7 +7621,7 @@ msgstr "Ο ξενιστής \"%1$s\" υπάρχει ήδη."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7762,7 +7673,7 @@ msgid_plural "Hosts enabled"
 msgstr[0] "Ξενιστής ενεργοποιημένος"
 msgstr[1] "Ξενιστές ενεργοποιημένοι"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7776,22 +7687,22 @@ msgstr[1] "Ξενιστές ενεργοποιημένοι"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Ομάδα ξενιστών"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Ομάδα ξενιστών \"%1$s\" υπάρχει ήδη."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Ομάδα ξενιστών \"%1$s\" μη διαγραφόμενη, διότι χρησιμοποιείται σε καθολική δέσμη ενεργειών."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7804,10 +7715,10 @@ msgstr "Στοιχεία ομάδος ξενιστών"
 msgid "Host group label type"
 msgstr "Τύπος ετικέτας ομάδος ξενιστών"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7823,8 +7734,8 @@ msgstr ""
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7898,7 +7809,7 @@ msgstr "Όνομα ξενιστή"
 msgid "Host networks"
 msgstr "Δίκτυα ξενιστών"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7979,7 +7890,7 @@ msgstr "Αποτυχία ενημέρωσης ξενιστή."
 msgid "Host updated"
 msgstr "Ξενιστής ενημερώθηκε"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr ""
@@ -7999,7 +7910,7 @@ msgstr "Ξενιστής με ίδιο όνομα \"%1$s\" υπάρχει ήδη
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Ξενιστής με ίδιο ορατό όνομα \"%1$s\" υπάρχει ήδη."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8012,7 +7923,7 @@ msgstr "Ξενιστής με ίδιο ορατό όνομα \"%1$s\" υπάρχ
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8060,7 +7971,7 @@ msgstr "Ξενιστές ενημερώθηκαν"
 msgid "Hours"
 msgstr "Ώρες"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8100,7 +8011,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IP διεύθυνση"
@@ -8125,7 +8036,7 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8182,12 +8093,12 @@ msgstr "Εικόνα τονισμένη"
 msgid "Icon map"
 msgstr "Αντιστοίχιση εικονιδίων"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Η Αντιστοίχιση εικονιδίου \"%1$s\" δεν διαγράφεται. Σε χρήση στον χάρτη \"%2$s\"."
@@ -8200,18 +8111,18 @@ msgstr "Αντιστοίχιση εικονιδίου δημιουργήθηκε
 msgid "Icon map deleted"
 msgstr "Αντιστοίχιση εικονιδίου διεγράφη"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Αντιστοίχιση εικονιδίου ενημερώθηκε"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "Αντιστοιχία εικονιδίου"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
@@ -8312,23 +8223,20 @@ msgstr "Αν νομίζετε ότι το μήνυμα είναι λάθος, σ
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Εικόνα"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "Εικόνα \"%1$s\" υπάρχει ήδη."
@@ -8337,7 +8245,7 @@ msgstr "Εικόνα \"%1$s\" υπάρχει ήδη."
 msgid "Image added"
 msgstr "Εικόνα προστέθηκε"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Εικόνα διεγράφη"
 
@@ -8345,18 +8253,12 @@ msgstr "Εικόνα διεγράφη"
 msgid "Image label type"
 msgstr "Τύπος σήμανσης εικόνας"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "Σφάλμα φόρτωσης εικόνας [%1$s] σε [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Εικόνα ενημερώθηκε"
 
@@ -8451,7 +8353,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8462,13 +8364,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr ""
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8512,7 +8414,7 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8680,24 +8582,6 @@ msgstr "Λανθασμένη ομάδα χρήστη εργασίας ενέργ
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Λανθασμένος χρήστης εργασίας ενέργειας. Ο χρήστης δεν υπάρχει ή δεν έχετε πρόσβαση σε αυτόν."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8752,8 +8636,6 @@ msgstr "Λανθασμένος χρήστης εργασίας ενέργεια�
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Λανθασμένες μεταβλητές πέρασαν στη συνάρτηση."
 
@@ -8779,31 +8661,22 @@ msgstr "Λανθασμένοι χαρακτήρες σε χρήση για όν�
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "Λανθασμένες συνθήκες ενέργειας \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "Λανθασμένες συνθήκες κανόνα εντοπισμού \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "Λανθασμένη προσαρμοσμένη έκφραση \"%2$s\" ενέργειας \"%1$s\": %3$s."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "Λανθασμένη προσαρμοσμένη έκφραση \"%2$s\" κανόνα εντοπισμού \"%1$s\": %3$s."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8832,7 +8705,7 @@ msgstr "Λανθασμένη τιμή αντικειμένου συμβάντο�
 msgid "Incorrect eventsource value."
 msgstr "Λανθασμένη τιμή προέλευσης συμβάντος."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Λανθασμένο πεδίο \"%1$s\" όνομα ή τιμή στη δήλωση where του πίνακα \"%2$s\"."
@@ -8857,22 +8730,17 @@ msgstr "Λανθασμένο αρχείο αναφόρτωσης."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "Λανθασμένο φίλτρο ID είδους συνθήκης γιά ενέργεια \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Λανθασμένο φίλτρο ID είδους συνθήκης γιά κανόνα εντοπισμού \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "Λανθασμένο φίλτρο συνθήκης μακροεντολής γιά κανόνα εντοπισμού \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8883,7 +8751,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "Λανθασμένο φίλτρο συνθήκης τελεστή ενέργειας \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "Λανθασμένο φίλτρο συνθήκης τελεστή γιά κανόνα εντοπισμού \"%1$s\"."
@@ -8911,8 +8779,6 @@ msgstr "Δείκτης λανθασμένης εικόνας."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8974,10 +8840,6 @@ msgstr "Λανθασμένη περίοδος συντήρησης (ελάχισ
 msgid "Incorrect map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr ""
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9035,13 +8897,13 @@ msgstr "Ανακριβής κανονική έκφραση \"%1$s\": \"%2$s\""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Ανακριβής απόκριση ληφθείσα από Zabbix εξυπηρετητή \"%1$s\"."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Λανθασμένη ώρα λήξης υπηρεσίας."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Λανθασμένη ώρα έναρξης υπηρεσίας."
 
@@ -9094,12 +8956,7 @@ msgstr "Λανθασμένη έκφραση πρωτότυπου εναύσμα�
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "Λανθασμένος τύπος υπολογισμού ενέργειας \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "Λανθασμένος τύπος υπολογισμού κανόνα εντοπισμού \"%1$s\"."
@@ -9145,13 +9002,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9168,60 +9025,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Λανθασμένη τιμή \"%1$s\" για \"%2$s\" πεδίο: να είναι μεταξύ %3$s και %4$s."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "Λανθασμένη τιμή \"%1$s\" για πεδίο κινητής υποδιαστολής \"%2$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "Λανθασμένη τιμή \"%1$s\" για πεδίο ακεραίου \"%2$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Λανθασμένη τιμή \"%1$s\" για πεδίο απρόσημου ακέραιου \"%2$s\"."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr ""
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9276,14 +9103,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9393,25 +9214,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9422,7 +9225,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9468,16 +9271,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9486,7 +9290,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9574,12 +9378,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Εισαγωγή"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "Εισαγωγή έκφρασης"
 
@@ -9683,7 +9487,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9691,7 +9495,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9702,7 +9506,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Χρονικό διάστημα"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9725,7 +9529,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9757,7 +9561,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Άκυρο κλειδί \"%1$s\" κανόνα εντοπισμού \"%2$s\" σε \"%3$s\": %4$s."
@@ -9782,27 +9586,29 @@ msgstr "Άκυρο κλειδί \"%1$s\": %2$s."
 msgid "Invalid method parameters."
 msgstr "Άκυρες παράμετροι μεθόδου."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9828,17 +9634,17 @@ msgstr "Άκυρες παράμετροι μεθόδου."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9846,8 +9652,8 @@ msgstr "Άκυρες παράμετροι μεθόδου."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9861,106 +9667,116 @@ msgstr "Άκυρες παράμετροι μεθόδου."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -10002,43 +9818,38 @@ msgstr "Άκυρος κωδικός απόκρισης \"%1$s\"."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10059,7 +9870,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Απογραφή"
 
@@ -10100,7 +9911,7 @@ msgstr "Αναζήτηση με συνθηματικό χρήστη αδύνατ
 msgid "Italian (it_IT)"
 msgstr "Ιταλικά (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10132,7 +9943,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "Ο συλλέκτης \"%1$s\" δεν συμπληρώνει ελλιπές πεδίο απογραφής ξενιστή \"%2$d\". Επιλογές: απο 0 (μήν συμπληρώνεις) έως %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10146,7 +9957,7 @@ msgstr "Συλλέκτης προστέθηκε"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] ""
@@ -10160,13 +9971,13 @@ msgstr "Πλήθος συλλεκτών"
 msgid "Item deleted"
 msgstr "Συλλέκτης διεγράφη"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Συλλέκτης απενεργοποιημένος"
 msgstr[1] "Συλλέκτες απενεργοποιημένοι"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Συλλέκτης ενεργοποιημένος"
@@ -10176,7 +9987,7 @@ msgstr[1] "Συλλέκτες ενεργοποιημένοι"
 msgid "Item in \"not supported\" state"
 msgstr "Συλλέκτης σε \"ανυποστήρικτη\" κατάσταση"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "Συλλέκτης μή επιλεγμένος"
 
@@ -10185,7 +9996,7 @@ msgstr "Συλλέκτης μή επιλεγμένος"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10223,8 +10034,8 @@ msgid_plural "Item prototypes updated"
 msgstr[0] "Πρωτότυπος συλλέκτης ενημερώθηκε"
 msgstr[1] "Πρωτότυπος συλλέκτης ενημερώθηκε"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10250,7 +10061,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10282,8 +10093,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10334,11 +10145,11 @@ msgstr "Ο συλλέκτης με κλειδί \"%1$s\" υπάρχει ήδη �
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Συλλέκτες"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Συλλέκτες διεγράφησαν"
 
@@ -10356,7 +10167,7 @@ msgstr "Συλλέκτες ενημερώθηκαν"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10381,6 +10192,10 @@ msgstr "JMX διεπαφές"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10393,7 +10208,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10411,7 +10226,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Ιαν"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Ιανουάριος"
 
@@ -10433,7 +10248,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Ιούλ"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Ιούλιος"
 
@@ -10441,7 +10256,7 @@ msgstr "Ιούλιος"
 msgid "Jun"
 msgstr "Ιούν"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Ιούνιος"
 
@@ -10597,22 +10412,6 @@ msgid_plural "Last %1$d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10624,11 +10423,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Τελευταίος έλεγχος"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Γράφημα τελευταίας ώρας"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Γράφημα τελευταίου μήνα"
 
@@ -10666,11 +10465,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Τελευταία τιμή"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Γράφημα τελευταίας εβδομάδος"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10679,11 +10478,11 @@ msgstr "Γράφημα τελευταίας εβδομάδος"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Τελευταία δεδομένα"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "Τελευταίες τιμές"
 
@@ -10724,7 +10523,7 @@ msgstr ""
 msgid "Left trim"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -11005,7 +10804,7 @@ msgstr "Κανόνας εντοπισμού χαμηλού επιπέδου σε
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "Δ"
@@ -11027,7 +10826,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11038,12 +10837,12 @@ msgid "Macro"
 msgstr "Μακροεντολή"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Η μακροεντολή \"%1$s\" υπάρχει ήδη σε \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Η μακροεντολή \"%1$s\" υπάρχει ήδη."
@@ -11071,7 +10870,7 @@ msgstr "Μακροεντολές ενημερώθηκαν"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -11079,7 +10878,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11162,7 +10961,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11184,13 +10983,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Χάρτης"
 
@@ -11259,7 +11058,7 @@ msgstr ""
 msgid "Map update failed."
 msgstr "Αποτυχία ενημέρωσης χάρτη."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11291,7 +11090,7 @@ msgstr "Χάρτες"
 msgid "Mar"
 msgstr "Μαρ"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Μάρτιος"
 
@@ -11395,7 +11194,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11409,7 +11208,7 @@ msgstr[1] "Μέγιστη χρονική περίοδος εμφάνισης %1$
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Μάιος"
 
@@ -11424,15 +11223,12 @@ msgstr "Μάι"
 msgid "Media"
 msgstr "Μέσα ενημέρωσης"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Τύπος μέσων"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr ""
@@ -11460,11 +11256,6 @@ msgid_plural "Media types enabled"
 msgstr[0] "Ενεργοποιημένος τύπος μέσων"
 msgstr[1] "Ενεργοποιημένοι τύποι μέσων"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr ""
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11494,7 +11285,7 @@ msgstr ""
 msgid "Media types"
 msgstr "Τύποι μέσων ενημέρωσης"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11582,7 +11373,7 @@ msgstr "Ανταλλαγή μηνυμάτων"
 msgid "Method not found."
 msgstr "Μέθοδος δεν βρέθηκε."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11644,7 +11435,7 @@ msgid "Minimum severity"
 msgstr "Ελάχιστη βαρύτητα"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11703,7 +11494,7 @@ msgstr "Τρόπος"
 msgid "Model"
 msgstr "Πρότυπο"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11741,7 +11532,7 @@ msgstr[1] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11767,7 +11558,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Δευ"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Δευτέρα"
 
@@ -11807,11 +11598,11 @@ msgstr "Μήνας"
 msgid "Monthly"
 msgstr "Μηνιαίως"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "Βρέθηκαν περισσότερα ταιριάσματα..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11835,7 +11626,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11848,7 +11639,7 @@ msgstr ""
 msgid "Multiple PROBLEM events"
 msgstr "Πολλαπλά ΠΡΟΒΛΗΜΑΤΙΚΑ συμβάντα"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Σίγαση"
 
@@ -11977,11 +11768,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12139,19 +11930,21 @@ msgstr "Νέα συνθήκη"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Νέο στοιχείο"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr ""
 
@@ -12163,7 +11956,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Νέα κανονική έκφραση"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12171,7 +11964,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Νέος χρόνος υπηρεσίας"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12180,7 +11973,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12198,7 +11991,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12227,30 +12020,6 @@ msgstr ""
 msgid "No"
 msgstr "Όχι"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr ""
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12266,11 +12035,6 @@ msgstr "Δεν δίνεται \"%1$s\" γραφήματος."
 msgid "No \"%1$s\" given for map."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12278,7 +12042,7 @@ msgstr ""
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "Δέν δίνεται \"%2$s\" για συνθήκη φίλτρου ενέργειας \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "Δέν δίνεται \"%2$s\" για συνθήκη φίλτρου κανόνα εντοπισμού \"%1$s\"."
@@ -12288,7 +12052,7 @@ msgstr "Δέν δίνεται \"%2$s\" για συνθήκη φίλτρου κα
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "Δέν δίνεται \"%2$s\" για φίλτρο ενέργειας \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "Δέν δίνεται \"%2$s\" γιά φίλτρο κανόνα εντοπισμού \"%1$s\"."
@@ -12305,11 +12069,6 @@ msgstr "Δεν καθορίστηκε όνομα χρήστη αυθεντικό
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr ""
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12340,7 +12099,7 @@ msgstr "Όχι προεπιλεγμένη διεπαφή για \"%1$s\" τύπ�
 msgid "No details"
 msgstr "Χωρίς λεπτομέρειες"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "Δεν δόθηκαν IDs κανόνα εντοπισμού."
 
@@ -12376,7 +12135,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "Δεν προστέθηκαν γραφήματα."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Δεν δίνονται αναγνωριστικά ξενιστή."
 
@@ -12406,7 +12165,7 @@ msgstr "Χωρίς εικόνα"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Δεν βρέθηκε διεπαφή"
 
@@ -12440,7 +12199,7 @@ msgstr "Δεν βρέθηκαν μακροεντολές."
 msgid "No maps added."
 msgstr "Δεν προστέθηκαν χάρτες."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "Δεν βρέθηκαν ταιριάσματα"
 
@@ -12448,17 +12207,46 @@ msgstr "Δεν βρέθηκαν ταιριάσματα"
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Χωρίς δικαιώματα για πρόσβαση συστήματος."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12466,7 +12254,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12494,19 +12282,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12521,16 +12308,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12550,12 +12343,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12576,27 +12367,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12613,14 +12406,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12629,7 +12422,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Χωρίς δικαιώματα σε αντικείμενο που αναφέρεται ή δεν υπάρχει!"
 
@@ -12649,7 +12442,7 @@ msgstr "Δεν καθορίστηκε αρχείο δημοσίου κλειδι
 msgid "No recipients for action operation message."
 msgstr "Χωρίς παραλήπτες για μήνυμα εργασίας ενέργειας."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr ""
 
@@ -12661,7 +12454,7 @@ msgstr "Δεν καθορίσθηκε δέσμη ενεργειών για εν�
 msgid "No target selected"
 msgstr "Δεν επιλέχθηκε στόχος"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Δεν επιλέχθηκε στόχος."
 
@@ -12678,7 +12471,7 @@ msgstr "Δεν ορίσθηκαν εναύσματα."
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr ""
 
@@ -12748,15 +12541,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Δεν επιτρέπεται ορισμός συνθηματικού για χρήστη \"guest\"."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12788,7 +12581,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "Μη υποστηριζόμενο"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Σημείωση"
@@ -12819,7 +12612,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Νοε"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "Νοέμβριος"
 
@@ -13006,8 +12799,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13067,13 +12860,13 @@ msgstr "Οκτ"
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Οκτώβριος"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Εκτός"
 
@@ -13081,30 +12874,31 @@ msgstr "Εκτός"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr ""
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "Επί"
 
@@ -13120,35 +12914,15 @@ msgstr "Άπαξ"
 msgid "One"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "Ένα των αντικειμένων χωρίς ομάδα ξενιστή."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Μία φορά μόνο"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Μία φορά μή διαθέσιμο"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Μόνο Υπερ Διαχειριστές δημιουργούν ομάδες ξενιστών."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Μόνο Υπερ Διαχειριστές δημιουργούν τύπους μέσων ενημέρωσης."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Μόνο Υπερ Διαχειριστές διαγράφουν τύπους μέσων ενημέρωσης."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Μόνο Υπερ Διαχειριστές επεξεργάζονται τύπους μέσων ενημέρωσης."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Μοναδικοί έλεγχοι μόνο Zabbix agent, SNMPv1, SNMPv2 and SNMPv3."
@@ -13197,10 +12971,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr ""
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13209,15 +12979,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr ""
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Απαριθμώνται μόνο εναύσματα εκχωρημένα σε ενεργούς ξενιστές και εξαρτώμενα απο ενεργούς συλλέκτες"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13226,7 +12992,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13235,11 +13001,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Η λειτουργία δεν εκτελείται λόγω μη εξουσιοδοτημένης αίτησης."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Λεπτομέρειες λειτουργίας"
 
@@ -13261,7 +13027,7 @@ msgstr "Η λειτουργία δεν έχει σχεδιότυπο να λει
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13270,33 +13036,33 @@ msgstr ""
 msgid "Operations"
 msgstr "Λειτουργίες"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Χειριστής"
 
@@ -13405,7 +13171,7 @@ msgstr "Άλλες παράμετροι διαμόρφωσης"
 msgid "Other parameters"
 msgstr "Άλλες παράμετροι"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Άλλα"
@@ -13419,7 +13185,7 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13448,7 +13214,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13637,7 +13403,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13682,7 +13448,7 @@ msgstr ""
 msgid "PSK identity"
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13705,16 +13471,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Παράμετρος"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr ""
@@ -13744,7 +13510,7 @@ msgstr "Γονικοί συλλέκτες"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13761,7 +13527,7 @@ msgstr "Γονικά εναύσματα"
 msgid "Parent web scenarios"
 msgstr "Γονικά σενάρια ιστού"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13773,11 +13539,6 @@ msgstr ""
 msgid "Parse"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "Σφάλμα ανάλυσης SQL [%1$s] in [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Σφάλμα ανάλυσης"
@@ -13838,7 +13599,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr ""
 
@@ -13848,15 +13609,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13902,12 +13663,11 @@ msgstr ""
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Περίοδος"
 
@@ -13996,7 +13756,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Επιλέξτε δύο στοιχεία"
 
@@ -14036,7 +13796,7 @@ msgstr "Συμπληρώνει πεδίο απογραφής ξενιστή"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14125,7 +13885,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14257,7 +14017,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Πρόβλημα σε"
 
@@ -14270,21 +14030,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14298,9 +14054,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Προβλήματα"
 
@@ -14334,7 +14090,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr ""
 
@@ -14355,13 +14111,13 @@ msgstr ""
 msgid "Proxies"
 msgstr "Διαμεσολαβητές"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14369,7 +14125,7 @@ msgstr "Διαμεσολαβητές"
 msgid "Proxy"
 msgstr "Διαμεσολαβητής"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14379,12 +14135,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Διαμεσολαβητής \"%1$s\" για ξενιστή \"%2$s\" δεν υπάρχει."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Διαμεσολαβητής \"%1$s\" σε χρήση από κανόνα εντοπισμού \"%2$s\"."
@@ -14478,7 +14234,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14555,10 +14311,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Ληφθείσα τιμή"
@@ -14640,7 +14392,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14658,13 +14410,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Κανονική έκφραση"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14697,7 +14449,7 @@ msgstr "Κανονικές εκφράσεις"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14729,8 +14481,6 @@ msgstr "Απομακρυσμένη εντολή"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14751,7 +14501,9 @@ msgstr "Απομακρυσμένη εντολή"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14764,7 +14516,7 @@ msgstr "Απομακρυσμένη εντολή"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14841,8 +14593,8 @@ msgstr "Απομακρυσμένη εντολή"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Αφαίρεση"
 
@@ -14882,7 +14634,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14924,7 +14676,7 @@ msgid "Replace dependencies"
 msgstr "Αντικατάσταση εξαρτήσεων"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14979,7 +14731,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -15021,8 +14773,8 @@ msgstr "Απαιτούμενοι κωδικοί κατάστασης"
 msgid "Required string"
 msgstr "Απαιτούμενη στοιχειοσειρά"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Επαναφορά"
 
@@ -15055,7 +14807,7 @@ msgstr "Επιβεβαίωση επαναφοράς"
 msgid "Reset defaults"
 msgstr "Επαναφορά προκαθορισμένων"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Επιλυμένο"
 
@@ -15121,7 +14873,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Αποτέλεσμα"
@@ -15308,12 +15060,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Ρωσικά (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "Σ"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Κ"
@@ -15324,8 +15076,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15362,7 +15114,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15458,12 +15210,12 @@ msgstr ""
 msgid "SQL query"
 msgstr "Ερώτημα SQL"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "Αποτυχία εκτέλεσης δήλωσης SQL \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Αποτυχία εκτέλεσης δήλωσης SQL \"%1$s\"."
@@ -15526,7 +15278,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15538,7 +15290,7 @@ msgstr ""
 msgid "Sat"
 msgstr "Σάβ"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Σάββατο"
 
@@ -15580,7 +15332,7 @@ msgstr "Χρονοδιάγραμμα"
 msgid "Scheduled check"
 msgstr "Προγραμματισμένος έλεγχος"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15647,7 +15399,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15660,8 +15412,7 @@ msgstr ""
 msgid "Script"
 msgstr "Δέσμη ενεργειών"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Δέσμη ενεργειών \"%1$s\" υπάρχει ήδη."
@@ -15694,12 +15445,6 @@ msgstr "Όνομα δέσμης ενεργειών"
 msgid "Script parameters"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr ""
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Προφίλ δέσμης ενεργειών"
@@ -15712,7 +15457,7 @@ msgstr "Δέσμη ενεργειών ενημερώθηκε"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Δέσμες ενεργειών"
 
@@ -15782,8 +15527,8 @@ msgid "Security name"
 msgstr "Όνομα ασφάλειας"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15791,7 +15536,7 @@ msgstr "Όνομα ασφάλειας"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Επιλέξτε"
 
@@ -15827,19 +15572,19 @@ msgstr "Επιλεγμένα στοιχεία"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr ""
 
@@ -15864,7 +15609,7 @@ msgstr "Αποστολή μόνο σε"
 msgid "Send to"
 msgstr "Αποστολή σε"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr ""
 
@@ -15897,7 +15642,7 @@ msgstr "Χωριστό"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "Σεπτέμβριος"
 
@@ -15928,28 +15673,28 @@ msgstr ""
 msgid "Server time"
 msgstr "Ώρα εξυπηρετητή"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Υπηρεσία"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15959,7 +15704,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "Υπηρεσία δημιουργήθηκε"
 
@@ -15992,16 +15737,16 @@ msgstr "Θύρα υπηρεσίας"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "Χρόνος έναρξης υπηρεσίας πρέπει να είναι μικρότερος του χρόνου λήξης."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -16009,11 +15754,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Χρόνοι υπηρεσίας"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Τύπος υπηρεσίας"
 
@@ -16022,30 +15767,29 @@ msgstr "Τύπος υπηρεσίας"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Υπηρεσία ενημερώθηκε"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Υπηρεσίες"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "Υπηρεσίες από κυκλική εξάρτηση."
 
@@ -16053,7 +15797,7 @@ msgstr "Υπηρεσίες από κυκλική εξάρτηση."
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16083,7 +15827,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16112,7 +15856,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16121,7 +15865,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16177,7 +15921,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr ""
 
@@ -16319,7 +16063,7 @@ msgstr "Εμφάνιση προειδοποίησης εάν εξυπηρετη�
 msgid "Show working time"
 msgstr "Εμφάνιση χρόνου εργασίας"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Ορατό"
 
@@ -16428,7 +16172,7 @@ msgstr "Παράλειψη αντιγραφής γραφήματος \"%1$s\" σ
 msgid "Slovak (sk_SK)"
 msgstr "Σλοβακικά (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Αναβολή"
 
@@ -16474,7 +16218,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Ταξινόμηση καταχωρίσεων με"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Σειρά ταξινόμησης (0->999)"
 
@@ -16548,7 +16292,7 @@ msgstr "Έναρξη σε"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16651,15 +16395,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Κωδικοί κατάστασης"
@@ -16689,7 +16437,7 @@ msgstr "Κατάσταση μόνο"
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16737,7 +16485,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16802,7 +16550,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Υποχάρτης"
 
@@ -16818,7 +16566,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Επιτυχής επιθεώρηση"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16831,7 +16579,7 @@ msgstr ""
 msgid "Sun"
 msgstr "Κυρ"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Κυριακή"
 
@@ -16923,12 +16671,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Π"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Τ"
@@ -16955,17 +16703,17 @@ msgstr "ΑΛΗΘΕΣ"
 msgid "Table \"%1$s\" does not exist."
 msgstr "Ο πίνακας \"%1$s\" δεν υπάρχει."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "Ο πίνακας \"%1$s\" δεν έχει πεδίο με όνομα \"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Ετικέτα"
@@ -17021,7 +16769,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17081,7 +16829,7 @@ msgstr "Τύπος στόχου"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17102,7 +16850,7 @@ msgstr "Σχεδιότυπο"
 msgid "Template \"%1$s\" already exists."
 msgstr "Το σχεδιότυπο \"%1$s\" υπάρχει ήδη."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17126,7 +16874,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Σχεδιότυπο δεν μπορεί να συνδεθεί με άλλο σχεδιότυπο πλέον της μίας φοράς, ακόμη και μέσω άλλων σχεδιότυπων."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17186,7 +16934,7 @@ msgstr "Σχεδιότυπο με ίδιο ορατό όνομα \"%1$s\" υπά
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17358,14 +17106,14 @@ msgstr "Ξενιστής δεν εντοπίζεται πλέον καί θά δ
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "Η εικόνα σε χρήση στην αντιστοίχιση εικονιδίου %1$s."
 msgstr[1] "Η εικόνα σε χρήση στην αντιστοίχιση εικονιδίων %1$s."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17430,7 +17178,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Αυτό το μήνα"
 
@@ -17438,7 +17186,7 @@ msgstr "Αυτό το μήνα"
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Αυτή την εβδομάδα"
 
@@ -17446,7 +17194,7 @@ msgstr "Αυτή την εβδομάδα"
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Αυτό το έτος"
 
@@ -17466,7 +17214,7 @@ msgstr ""
 msgid "Thu"
 msgstr "Πέμ"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Πέμπτη"
 
@@ -17483,7 +17231,7 @@ msgstr "Έως"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17516,7 +17264,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Χρονική περίοδος"
 
@@ -17568,12 +17316,11 @@ msgstr "Σήμανση χρόνου"
 msgid "To"
 msgstr "Σε"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "Για να ορίσετε διεπαφή ξενιστή επιλέξτε απλό τύπο στοιχείου για όλα τα στοιχεία"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Σήμερα"
 
@@ -17688,7 +17435,7 @@ msgstr "Περίοδος αποθήκευσης τάσεων"
 msgid "Trends"
 msgstr "Τάσεις"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17696,7 +17443,7 @@ msgstr "Τάσεις"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Έναυσμα"
 
@@ -17797,7 +17544,7 @@ msgstr "Όνομα εναύσματος"
 msgid "Trigger overview"
 msgstr "Επισκόπηση εναυσμάτων"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17871,11 +17618,11 @@ msgstr "Πρωτότυπα εναύσματα ενημερώθηκαν"
 msgid "Trigger severity"
 msgstr "Σοβαρότητα εναύσματος"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "Κατάσταση εναύσματος \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "Κατάσταση εναύσματος \"Problem\""
 
@@ -17892,7 +17639,7 @@ msgstr "Έναυσμα ενημερώθηκε"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17927,7 +17674,7 @@ msgstr ""
 msgid "Tue"
 msgstr "Τρι"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Τρίτη"
 
@@ -17940,7 +17687,7 @@ msgstr "Τουρκικά (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Δύο συλλέκτες (\"%1$s\" και \"%2$s\") δεν μπορούν να συμπληρώσουν ίδιο πεδίο απογραφής ξενιστή \"%3$s\", αυτό θα οδηγούσε σε σύγκρουση."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17956,19 +17703,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18020,7 +17767,7 @@ msgstr "Τύπος πληροφοριών"
 msgid "Types"
 msgstr "Τύποι"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18041,7 +17788,7 @@ msgstr "ΑΓΝΩΣΤΟ"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18087,12 +17834,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URLs"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18177,12 +17924,12 @@ msgstr ""
 msgid "Unblock selected users?"
 msgstr "Απεμπλοκή επιλεγμένων χρηστών;"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18202,21 +17949,23 @@ msgstr "Μονάδες"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Άγνωστο"
@@ -18234,7 +17983,7 @@ msgid "Unknown error"
 msgstr "Άγνωστο σφάλμα"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Άγνωστος συλλέκτης ξενιστή, κανένας τέτοιος συλλέκτης σε επιλεγμένο ξενιστή"
@@ -18287,7 +18036,7 @@ msgstr "Αποσύνδεση από σχεδιότυπο"
 msgid "Unlink from templates"
 msgstr "Αποσύνδεση από σχεδιότυπα"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Αναίρεση σίγασης"
 
@@ -18318,7 +18067,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "Ανυποστήρικτη παράμετρος \"%2$s\" γιά φίλτρο συνθήκης ενέργειας \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "Ανυποστήρικτη παράμετρος \"%2$s\" γιά φίλτρο συνθήκης κανόνα εντοπισμού \"%1$s\"."
@@ -18328,7 +18077,7 @@ msgstr "Ανυποστήρικτη παράμετρος \"%2$s\" γιά φίλτ
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "Ανυποστήρικτη παράμετρος \"%2$s\" γιά φίλτρο ενέργειας \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "Ανυποστήρικτη παράμετρος \"%2$s\" γιά φίλτρο κανόνα εντοπισμού \"%1$s\"."
@@ -18373,7 +18122,7 @@ msgstr "Ανοικτά"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18386,7 +18135,7 @@ msgstr "Ανοικτά"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18439,7 +18188,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18457,7 +18206,7 @@ msgstr "Ανεβάστε"
 msgid "Upper level maps"
 msgstr "Χάρτες Άνω επίπεδο"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18492,7 +18241,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "Χρησιμοποιείται σε ενέργειες"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18507,7 +18256,7 @@ msgstr "Χρησιμοποιείται σε ενέργειες"
 msgid "User"
 msgstr "Χρήστης"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
@@ -18559,7 +18308,7 @@ msgstr "Χρήστης προστέθηκε"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Χρήστης δεν αυτοπροστίθεται σε απενεργοποιημένη ομάδα ή ομάδα απενεργοποιημένης πρόσβασης GUI."
@@ -18579,7 +18328,7 @@ msgid_plural "Users deleted"
 msgstr[0] "Χρήστης διεγράφη"
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18589,27 +18338,27 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Ομάδα χρήστη"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Ομάδα χρήστη \"%1$s\" υπάρχει ήδη."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Ομάδα χρήστη \"%1$s\" χρησιμοποιείται σε ρύθμιση μηνυμάτων πτώσης βάσης."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Ομάδα χρήστη \"%1$s\" χρησιμοποιείται στη δέσμη ενεργειών \"%2$s\"."
@@ -18643,8 +18392,8 @@ msgstr[1] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18688,14 +18437,14 @@ msgstr "Συνθηματικό χρήστη"
 msgid "User profile"
 msgstr "Προφιλ χρήστη"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18764,7 +18513,7 @@ msgstr "Χρήστης ενημερώθηκε"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -19080,14 +18829,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19097,7 +18846,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19139,7 +18888,7 @@ msgstr "Τιμή \"%1$s\" άκυρη για παράμετρο \"grid_show\". Ε
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "Τιμή \"%1$s\" άκυρη για παράμετρο \"grid_show\". Επιλογές: \"%2$s\"."
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "Η Τιμή \"%1$s\" είναι μεγάλη για το πεδίο \"%2$s\" - %3$d χαρακτήρες. Επιτρεπόμενο μήκος %4$d χαρακτήρες."
@@ -19156,7 +18905,7 @@ msgstr "Στατιστικά τιμής cache. Έγκυρες τρόποι: tota
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Αντιστοιχία τιμής"
 
@@ -19199,11 +18948,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr ""
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19250,7 +19000,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19337,7 +19087,7 @@ msgstr "Το ορατό όνομα δεν μπορεί να είναι κενό
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Τ"
@@ -19354,7 +19104,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Προσοχή"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19363,7 +19113,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Λυπούμαστε, ο μέγιστος πιθανόν αριθμός στοιχείων για υπενθύμιση έχει καλυφθεί."
 
@@ -19379,7 +19129,7 @@ msgstr "Λυπούμαστε, ο μέγιστος πιθανόν αριθμός
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Ιστός"
 
@@ -19391,7 +19141,7 @@ msgstr "Ιστός"
 msgid "Web monitoring"
 msgstr "Εποπτεία Ιστού"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr ""
 
@@ -19406,27 +19156,27 @@ msgstr "Σενάριο ιστού \"%1$s\" υπάρχει ήδη σε ξενισ
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Σενάριο ιστού \"%1$s\" υπάρχει ήδη."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Σενάριο ιστού διεγράφη"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Σενάριο ιστού απενεργοποιημένο"
 msgstr[1] "Σενάρια ιστού απενεργοποιημένα"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Σενάριο ιστού ενεργοποιημένο"
 msgstr[1] "Σενάρια ιστού ενεργοποιημένα"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr ""
 
@@ -19448,7 +19198,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Τετ"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
@@ -19459,7 +19209,7 @@ msgstr "Τετάρτη"
 msgid "Weekly"
 msgstr "Εβδομαδιαίως"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19475,12 +19225,12 @@ msgstr ""
 msgid "When active"
 msgstr "Όταν είναι ενεργά"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19675,6 +19425,10 @@ msgstr "Ε-μ-η Ω:λ"
 msgid "Y-m-d H:i:s"
 msgstr "Y-m-d H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr ""
@@ -19736,7 +19490,7 @@ msgstr "Ετησίως"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19793,18 +19547,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19816,9 +19564,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Δεν έχετε άδεια για να εκτελέσετε αυτή τη λειτουργία."
 
@@ -19934,24 +19679,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr ""
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19960,37 +19709,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr ""
@@ -20011,28 +19760,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr ""
@@ -20080,7 +19830,7 @@ msgstr "όλα"
 msgid "all media"
 msgstr "όλα τα μέσα"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20088,42 +19838,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20133,7 +19878,7 @@ msgid "an empty string is expected"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr ""
 
@@ -20141,11 +19886,15 @@ msgstr ""
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20306,14 +20055,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20343,19 +20086,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20375,14 +20110,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20390,7 +20125,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr ""
@@ -20403,7 +20138,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20437,7 +20172,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20455,7 +20190,8 @@ msgid "configure"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20484,7 +20220,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "η"
@@ -20546,7 +20282,7 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20568,13 +20304,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20600,7 +20336,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20637,6 +20374,10 @@ msgstr "κενή έκφραση"
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20683,7 +20424,7 @@ msgstr "καθολικές ρυθμίσεις τακτοποίησης"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "ω"
@@ -20725,6 +20466,11 @@ msgstr "εικονίδιο"
 msgid "image"
 msgstr "εικόνα"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "εν"
@@ -20765,15 +20511,19 @@ msgstr ""
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "ανακριβής σύνταξη πλησίον \"%1$s\""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20801,7 +20551,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr ""
 
@@ -20830,27 +20580,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr ""
 
@@ -20878,7 +20628,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr ""
 
@@ -20964,12 +20714,12 @@ msgstr "κανόνας εντοπισμού χαμηλού επιπέδου"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "λ"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "μ"
@@ -21028,7 +20778,7 @@ msgstr "ταιριάσματα"
 msgid "max"
 msgstr "μεγ."
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21068,7 +20818,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr ""
@@ -21095,8 +20845,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21111,27 +20861,14 @@ msgstr "πρέπει να είναι έγκυρος χρήστης LDAP"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr ""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21159,6 +20896,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21169,7 +20914,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "νέο"
 
@@ -21304,7 +21049,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21339,24 +21084,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21384,11 +21133,11 @@ msgstr ""
 msgid "regular expression"
 msgstr "κανονική έκφραση"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21400,15 +21149,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21456,7 +21205,7 @@ msgstr ""
 msgid "short description"
 msgstr "σύντομη περιγραφή"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21475,15 +21224,15 @@ msgstr "σύντομη περιγραφή"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr ""
 
@@ -21499,31 +21248,31 @@ msgstr "εμφάνιση αντιστοιχίσεων εικονίδιου"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21531,11 +21280,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21551,8 +21300,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21563,7 +21312,7 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21572,13 +21321,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "το ID σχεδιότυπου \"%1$s\" πέρασε %2$s φορές"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21587,20 +21340,20 @@ msgstr "το ID σχεδιότυπου \"%1$s\" πέρασε %2$s φορές"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr ""
@@ -21632,39 +21385,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21678,7 +21431,7 @@ msgstr "έναυσμα"
 msgid "trigger does not allow manual closing"
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21690,26 +21443,26 @@ msgstr ""
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "Πληκτρολογήστε για αναζήτηση"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21717,11 +21470,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21738,10 +21491,10 @@ msgstr "απροσδόκητο τέλος κλειδιού"
 msgid "unexpected end of macro"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21751,11 +21504,12 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr ""
@@ -21781,8 +21535,8 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21807,6 +21561,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21822,7 +21580,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21842,11 +21600,11 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "τιμή"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21864,76 +21622,85 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr ""
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr ""
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21945,18 +21712,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21965,7 +21730,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21978,11 +21743,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21999,7 +21764,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "ε"
diff --git a/ui/locale/es/LC_MESSAGES/frontend.po b/ui/locale/es/LC_MESSAGES/frontend.po
index 32cdc3bfdb8..effec2c5bd2 100644
--- a/ui/locale/es/LC_MESSAGES/frontend.po
+++ b/ui/locale/es/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2014-10-01 18:50+0300\n"
 "Last-Translator: Saúl <saulortega.co@gmail.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d día"
 msgstr[1] "%1$d días"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "%1$s elemento de %2$s en estado de problema"
 msgstr[1] "%1$s elementos de %2$s en estado de problema"
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -226,14 +226,14 @@ msgstr[1] "Quedan %1$s intentos"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s segundo"
 msgstr[1] "%1$s segundos"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -389,7 +389,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -450,10 +450,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "Acceso denegado"
@@ -496,7 +492,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Reconocer"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Aceptada"
 
@@ -504,7 +500,7 @@ msgstr "Aceptada"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Reconocida"
@@ -517,7 +513,7 @@ msgstr "Eventos reconocidos en estado PROBLEMA"
 msgid "Acknowledged RESOLVED events"
 msgstr "Aceptar eventos RESUELTOS"
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -544,9 +540,9 @@ msgstr "Aceptar eventos RESUELTOS"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -603,7 +599,7 @@ msgstr "La acción \"%1$s\" ya existe."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "La acción \"%1$s\" no tiene operaciones definidas."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -612,7 +608,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Acción agregada"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -661,8 +657,8 @@ msgstr "Acción actualizada"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Acciones"
@@ -729,7 +725,7 @@ msgstr "Activo hasta"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -740,7 +736,7 @@ msgstr "Activo hasta"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -763,9 +759,9 @@ msgstr "Activo hasta"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -835,7 +831,7 @@ msgstr "Activo hasta"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Agregar"
 
@@ -843,11 +839,11 @@ msgstr "Agregar"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "Agregar un nuevo widget"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "Agregar un elemento hijo"
 
@@ -855,7 +851,7 @@ msgstr "Agregar un elemento hijo"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -872,7 +868,7 @@ msgstr "Agregar equipo"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "Agregar varios mapas"
 
@@ -894,7 +890,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -946,12 +942,12 @@ msgstr ""
 msgid "Add widget"
 msgstr "Agregar widget"
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -961,7 +957,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -974,7 +970,7 @@ msgstr "Administrador"
 msgid "Administration"
 msgstr "Administración"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -996,7 +992,7 @@ msgstr "Edad menor que"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1068,7 +1064,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Todo"
 
@@ -1086,7 +1082,7 @@ msgstr "Todos los grupos"
 msgid "All hosts"
 msgstr "Todos los hosts"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Todos los enlaces deben tener especificados \"Nombre\" y \"URL\""
 
@@ -1104,7 +1100,7 @@ msgstr "Todos los problemas"
 msgid "All problems if tag values match"
 msgstr "Todos los problemas si los valores coinciden"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1217,15 +1213,15 @@ msgstr "Error de aplicación."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1243,7 +1239,7 @@ msgstr "Acercamiento"
 msgid "Apr"
 msgstr "Abr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Abril"
 
@@ -1271,7 +1267,7 @@ msgstr "Tipo de área"
 msgid "Arithmetic"
 msgstr "Aritmético"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1318,7 +1314,7 @@ msgstr "En (horas:minutos)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1327,7 +1323,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1339,6 +1335,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1350,7 +1351,7 @@ msgstr "Debe crearse al menos un periodo de mantenimiento."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1406,7 +1407,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Ago"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Agosto"
 
@@ -1419,7 +1420,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1496,7 +1497,7 @@ msgstr "Cierre de sesión automático"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1511,7 +1512,7 @@ msgstr "Asignación automática de iconos"
 msgid "Automatic icon selection"
 msgstr "Selección automática de iconos"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1563,7 +1564,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1626,7 +1627,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "Azul"
 
@@ -1680,11 +1681,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Debajo"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "Traer al frente"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "Traer al frente"
 
@@ -1710,7 +1711,7 @@ msgstr "CERT"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1755,8 +1756,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1765,7 +1766,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Calculado"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1790,7 +1791,7 @@ msgstr "Devolución de llamada"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1803,8 +1804,8 @@ msgstr "Devolución de llamada"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1834,7 +1835,7 @@ msgstr "No se pudo agregar la acción"
 msgid "Cannot add correlation"
 msgstr "No se pudo agregar la correlación"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1844,7 +1845,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "No se puede agregar una dependencia desde un equipo a una plantilla."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1875,8 +1876,8 @@ msgid "Cannot add host prototype"
 msgstr "No se pudo agregar el prototipo de equipo"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "No se pudo agregar la imagen"
 
@@ -1968,15 +1969,15 @@ msgstr "No se pudo agregar el usuario"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "No se pudo agregar el escenario web"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1996,33 +1997,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "No se pudo eliminar el histórico"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "No se pudo clonar los prototipos de gráfico."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "No se pudo clonar los prototipos de equipo."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "No se pudo clonar los prototipos de ítem."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "No se pudo clonar los prototipos de disparador."
 
@@ -2049,7 +2046,7 @@ msgid_plural "Cannot copy graphs"
 msgstr[0] "No se pudieron copiar la gráfica"
 msgstr[1] "No se pudieron copiar las gráficas"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "No se pudo copiar el monitor"
@@ -2101,8 +2098,8 @@ msgstr "No se puede crear la asignación de icono"
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2131,7 +2128,7 @@ msgstr "No se puede borrar el usuario \"%1$s\", prueba deshabilitandolo primero.
 msgid "Cannot delete action"
 msgstr "No es posible eliminar la acción"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2199,7 +2196,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2210,11 +2207,11 @@ msgstr[1] ""
 msgid "Cannot delete host prototypes"
 msgstr "No se pudo eliminar los prototipos de equipo"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "No es posible eliminar la asignación de icono"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "No es posible eliminar la imágen"
 
@@ -2239,7 +2236,7 @@ msgstr "No se pudo eliminar el prototipo de ítem"
 msgid "Cannot delete item prototypes"
 msgstr "No se pudo eliminar los prototipos de ítems"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "No es posible eliminar los monitores"
 
@@ -2270,7 +2267,7 @@ msgid_plural "Cannot delete proxies"
 msgstr[0] "No es posible eliminar el proxy"
 msgstr[1] "No es posible eliminar el proxy"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2293,7 +2290,7 @@ msgid_plural "Cannot delete scripts"
 msgstr[0] "No es posible eliminar el script"
 msgstr[1] "No es posible eliminar el script"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "No es posible eliminar los scripts. script \"%1$s\" es usado en accioón \"%2$s\"."
@@ -2309,8 +2306,8 @@ msgid_plural "Cannot delete services"
 msgstr[0] "No es posible eliminar el servicio"
 msgstr[1] "No es posible eliminar el servicio"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2339,7 +2336,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr "No se pudo eliminar el ítem de la plantilla."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "No se pudo eliminar los ítems de la plantilla."
 
@@ -2392,7 +2389,7 @@ msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "No se pudo eliminar el escenario web"
 
@@ -2427,7 +2424,7 @@ msgid_plural "Cannot disable hosts"
 msgstr[0] "No se pudo deshabilitar el equipo"
 msgstr[1] "No se pudo deshabilitar los equipos"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "No se pudo desactivar el ítem"
@@ -2458,7 +2455,7 @@ msgid_plural "Cannot disable triggers"
 msgstr[0] "No se pudo desactivar el disparador"
 msgstr[1] "No se pudo desactivar los disparadores"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "No se pudo desactivar el escenario web"
@@ -2505,7 +2502,7 @@ msgid_plural "Cannot enable hosts"
 msgstr[0] "No se pudo habilitar el equipo"
 msgstr[1] "No se pudo habilitar los equipos"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "No se pudo habilitar el ítem"
@@ -2536,7 +2533,7 @@ msgid_plural "Cannot enable triggers"
 msgstr[0] "No se pudo habilitar el disparador"
 msgstr[1] "No se pudo habilitar los disparadores"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "No se pudo habilitar el escenario web"
@@ -2550,7 +2547,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr "No pude expandir las macros."
 
@@ -2584,8 +2581,8 @@ msgstr "No se pudo encontrar el equipo \"%1$s\" usado en el mapa \"%2$s\"."
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "No se pudo encontrar el grupo de equipos \"%1$s\" para el prototipo de equipos \"%2$s\" de la regla de descubrimiento \"%3$s\" en \"%4$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2683,24 +2680,20 @@ msgstr "No se pudo encontrar el mapa de valores \"%1$s\" usado en el ítem \"%2$
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "No se pudo encontrar el mapa de valores \"%1$s\" usado en el prototipo de ítem \"%2$s\" de la regla de descubrimiento \"%3$s\" en \"%4$s\"."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "No puede tener un nombre visible de plantilla vacío."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2713,7 +2706,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
 msgstr[0] "No se pudo importar la plantilla \"%1$s\" porque la plantilla enlazada \"%2$s\" no existe."
 msgstr[1] "No se pudo importar la plantilla \"%1$s\" porque las plantillas enlazadas \"%2$s\" no existen."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "No se pudo insertar la expresión del disparador"
 
@@ -2727,7 +2720,7 @@ msgid "Cannot link template."
 msgstr "No pude enlazar la plantilla."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2759,17 +2752,17 @@ msgstr "No se pudo realizar la actualización múltiple de los nombres de planti
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "No se puede ejecutar la orden de borrado de la tabla \"%1$s\" sin una condición WHERE."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "No se puede ejecutar la orden de actualización de la tabla \"%1$s\" sin ningún valor especificado."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "No se puede ejecutar la orden de actualización de la tabla \"%1$s\" sin una condición WHERE."
@@ -2796,7 +2789,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "No se pudo leer la respuesta. Verifique la conexión con el servidor Zabbix \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "No se puede cambiar el nombre al usuario guest."
 
@@ -2815,7 +2808,7 @@ msgstr "No pude guardar el widget: \"%1$s\"."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "No se pudo enviar la instrucción. Verifique la conexión con el servidor Zabbix \"%1$s\"."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2855,12 +2848,12 @@ msgstr "No se puede establecer campos de inventario en un inventario deshabilita
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2879,7 +2872,7 @@ msgid_plural "Cannot unblock users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "No se puede desenlazar y limpiar un escenario web."
 
@@ -2892,7 +2885,7 @@ msgstr "No se pudo desenlazar la plantilla"
 msgid "Cannot unlink template."
 msgstr "No se pudo desenlazar la plantilla."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2945,11 +2938,6 @@ msgstr "No se pudo actualizar \"%2$s\" en el ítem descubierto \"%1$s\"."
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "No se pudo actualizar \"%2$s\" en el disparador descubierto \"%1$s\"."
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "No se pudo actualizar \"imagetype\" en la imagen \"%1$s\"."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2959,9 +2947,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "No se puede actualizar una gráfica descubierta."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "No se puede actualizar un grupo de equipos descubierto."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3020,9 +3009,7 @@ msgstr "No se pudo actualizar el prototipo de gráfica"
 msgid "Cannot update group"
 msgstr "No es posible actualizar el grupo"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "No se pudo actualizar los grupos del equipo descubierto \"%1$s\"."
@@ -3046,13 +3033,13 @@ msgstr[1] "No se pudo actualizar el prototipo de equipo"
 msgid "Cannot update hosts"
 msgstr "No pude actualizar los equipos"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "No pude actualizar la asignación de icono"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "No se pudo actualizar la imagen"
 
@@ -3107,12 +3094,12 @@ msgstr "No se pudo actualizar el mapa de red"
 msgid "Cannot update proxy"
 msgstr "No se pudo actualizar el proxy"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "No se pudo actualizar el proxy del equipo descubierto \"%1$s\"."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3132,17 +3119,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "No se pudo actualizar el script"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3218,7 +3205,7 @@ msgstr[1] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "No se pudo actualizar el escenario web"
 
@@ -3318,8 +3305,8 @@ msgid "Character string not included"
 msgstr "Cadena de caracteres no incluidos"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3434,7 +3421,7 @@ msgstr "Comprueba el rendimiento del servicio UDP. Devuelve 0 - servicio caído;
 msgid "Checks should be unique."
 msgstr "Las comprobaciones deben ser únicas."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3455,7 +3442,7 @@ msgstr "Referencias circulares en plantillas: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "No se permite el enlace de plantillas circular."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3476,11 +3463,11 @@ msgstr "Limpiar historial y tendencias"
 msgid "Clear when unlinking"
 msgstr "Limpiar cuando se deslinke"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3495,7 +3482,7 @@ msgstr "Reloj"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3510,7 +3497,7 @@ msgstr "Reloj"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Clonar"
 
@@ -3521,8 +3508,8 @@ msgstr "Clonar"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Cerrar"
 
@@ -3533,13 +3520,13 @@ msgstr "Cerrar"
 msgid "Close expression constructor"
 msgstr "Cerrar el constructor de expresiones"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Cerrar nuevo evento"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Cerrar eventos antiguos"
 
@@ -3552,8 +3539,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "Plegar"
 
@@ -3570,7 +3557,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3636,7 +3623,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr "Sesiones simultáneas"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3647,17 +3634,12 @@ msgstr "Condición"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "La condición \"%2$s\" no está siendo usada en la fórmula \"%3$s\" de la acción \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "La condición \"%2$s\" no es usada en la fórmula \"%3$s\" para la correlación \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "La condición \"%2$s\" no está siendo usada en la fórmula \"%3$s\" de la regla de descubrimiento \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3667,17 +3649,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "La condición \"%2$s\" usada en la fórmula \"%3$s\" de la acción \"%1$s\" no está definida."
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "La condición \"%2$s\" usada en la fórmula \"%3$s\" para la correlación \"%1$s\" no está definida."
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "La condición \"%2$s\" usada en la fórmula \"%3$s\" de la regla de descubrimiento \"%1$s\" no está definida."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3693,7 +3670,7 @@ msgstr "Condiciones"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Configuración"
 
@@ -3756,7 +3733,7 @@ msgstr "Configuración de equipos"
 msgid "Configuration of housekeeping"
 msgstr "Configuración de limpieza"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Configuración de asignación de iconos"
@@ -3863,7 +3840,7 @@ msgstr "Texto de confirmación"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "¡Felicidades! Has instalado la interfaz web de Zabbix satisfactoriamente."
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3956,7 +3933,7 @@ msgstr "Contacto"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4016,7 +3993,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -4055,8 +4032,8 @@ msgstr "Coordenadas"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Copiar"
 
@@ -4065,12 +4042,11 @@ msgstr "Copiar"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "Correlación"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "Ya existe la correlación \"%1$s\"."
@@ -4098,16 +4074,6 @@ msgid_plural "Correlations enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr ""
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr ""
@@ -4116,14 +4082,10 @@ msgstr ""
 msgid "Correlation updated"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "¡No se puede guardar imagen!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Contador"
 
@@ -4187,11 +4149,11 @@ msgstr "Crear correlación"
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr "Crear elemento dependiente"
 
@@ -4308,7 +4270,7 @@ msgstr "Crear mapa"
 msgid "Create media type"
 msgstr "Crear tipo de medio"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "Crear nuevo"
 
@@ -4332,7 +4294,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Crear plantilla"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Crear iniciador"
 
@@ -4495,7 +4457,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "Nombre DNS"
@@ -4507,11 +4469,11 @@ msgstr "Nombre DNS"
 msgid "Daily"
 msgstr "Diario"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "Oscuro"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4532,8 +4494,8 @@ msgstr "Ya existe el tablero \"%1$s\"."
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr "Tablero creado"
 
@@ -4556,9 +4518,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr "Tablero actualizado"
 
@@ -4582,7 +4544,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4610,7 +4572,7 @@ msgstr "Vistado general de los datos"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4752,7 +4714,7 @@ msgstr "Día de semana"
 msgid "Days"
 msgstr "Días"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Depurar"
 
@@ -4766,26 +4728,26 @@ msgstr "Modo depuración"
 msgid "Dec"
 msgstr "Dic"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Diciembre"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Por defecto"
 
@@ -4878,7 +4840,7 @@ msgstr "Demorado por"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4902,8 +4864,8 @@ msgstr "Demorado por"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -4928,11 +4890,11 @@ msgstr "¿Desea eliminar y limpiar la plantilla? (Advertencia: Todos los equipos
 msgid "Delete current action?"
 msgstr "¿Desea eliminar la acción actual?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "¿Borrar la correlación actual?"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4976,7 +4938,7 @@ msgstr "¿Desea eliminar el prototipo de ítem?"
 msgid "Delete item?"
 msgstr "¿Desea eliminar el ítem?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "¿Desea eliminar los enlaces entre los elementos seleccionados?"
 
@@ -5032,7 +4994,7 @@ msgstr "¿Borrar los tableros seleccionados?"
 msgid "Delete selected discovery rules?"
 msgstr "¿Desea eliminar las reglas de descubrimiento seleccionadas?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "¿Desea eliminar los elementos seleccionados?"
 
@@ -5137,7 +5099,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "¿Borrar las formas seleccionadas?"
 
@@ -5181,7 +5143,7 @@ msgstr "¿Desea eliminar el disparador?"
 msgid "Delete web scenario?"
 msgstr "¿Desea eliminar el escenario web?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5226,7 +5188,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Dependencias"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Dependiente"
 
@@ -5234,7 +5196,7 @@ msgstr "Dependiente"
 msgid "Dependent item"
 msgstr "Elemento dependiente"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5244,7 +5206,7 @@ msgstr "Depende de"
 msgid "Deployment status"
 msgstr "Estado de implementación"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5277,7 +5239,7 @@ msgid "Description"
 msgstr "Descripción"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5443,10 +5405,10 @@ msgstr "¿Desea desactivar los escenarios web seleccionados?"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5529,7 +5491,7 @@ msgid "Discovery by proxy"
 msgstr "Descubierto por proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Comprobación de descubrimiento"
 
@@ -5541,7 +5503,7 @@ msgstr "Comprobaciones de descubrimiento"
 msgid "Discovery list"
 msgstr "Lista de descubrimiento"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Objeto de descubrimiento"
 
@@ -5573,7 +5535,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5581,12 +5543,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Regla de descubrimiento"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "La regla de descubrimiento \"%1$s\" ya existe en \"%2$s\", heredada de otra plantilla."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "La regla de descubrimiento \"%1$s\" ya existe en \"%2$s\"."
@@ -5599,7 +5561,7 @@ msgstr "La regla de descubrimiento \"%1$s\" ya existe en \"%2$s\"."
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "La regla de descubrimiento \"%1$s\" ya existe."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5641,7 +5603,7 @@ msgstr "Regla de descubrimiento actualizada"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5652,7 +5614,7 @@ msgstr "Reglas de descubrimiento"
 msgid "Discovery rules deleted"
 msgstr "Reglas de descubrimiento eliminadas"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Estado del descubrimiento"
@@ -5690,10 +5652,11 @@ msgid "Display stacked graph"
 msgstr "Mostrar gráfico apilado"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Mostrando %1$s de %2$s encontrados"
@@ -5703,7 +5666,7 @@ msgstr "Mostrando %1$s de %2$s encontrados"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "Mostrando %1$s a %2$s de %3$s encontrados"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5725,7 +5688,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "¿Desea sustituir la expresión condicional?"
 
@@ -5781,7 +5744,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Caído"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5789,7 +5752,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr "Descargar el archivo de configuración"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5808,18 +5771,6 @@ msgstr ""
 msgid "Draw style"
 msgstr "Estilo del trazado"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "Valor \"%2$s\" duplicado \"%1$s\" para la correlación \"%3$s\"."
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5832,11 +5783,6 @@ msgstr "Valor \"nombre\" duplicado \"%1$s\" para el mapa."
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5888,7 +5834,7 @@ msgstr "Elemento dinámico"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Cada URL debería tener un único nombre. Por favor, asegúrese que sólo hay nombrada una URL"
 
@@ -5897,11 +5843,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5915,8 +5861,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Editar"
 
@@ -5932,11 +5878,11 @@ msgstr "Editar mapa"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Editar disparador"
 
@@ -5996,21 +5942,17 @@ msgstr "Vaciar el archivo de claves SSL del escenario web \"%1$s\"."
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "Vaciar identificador de filtro de condición para la acción \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Filtro de condición del Identificador de fórmula vacío para la regla de descubrimiento \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "Filtro de condición de macro vacío para la regla de descubrimiento \"%1$s\"."
@@ -6026,25 +5968,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6054,14 +5990,6 @@ msgstr "Vaciar parámetro de entrada."
 msgid "Empty map ID."
 msgstr "Vaciar identificador de mapa."
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "Vaciar identificador de tipo de soporte."
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Vaciar parámetros"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6227,7 +6155,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6238,7 +6166,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6281,7 +6209,7 @@ msgid "English (en_US)"
 msgstr "Inglés (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6297,7 +6225,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6316,12 +6244,12 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Error en la solicitud de búsqueda de la tabla \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6348,7 +6276,7 @@ msgstr "Identificador de evento"
 msgid "Event acknowledged"
 msgstr "Evento reconocido"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6356,7 +6284,7 @@ msgid "Event correlation"
 msgstr "Corrrelación de evento"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "Reglas de correlación de evento"
@@ -6391,11 +6319,11 @@ msgstr "Monitorización del registro de eventos. Devuelve un log"
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "Par de etiquetas de evento"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Tipo de evento"
 
@@ -6440,15 +6368,10 @@ msgstr "Excluir"
 msgid "Exclude host groups"
 msgstr "Excluir grupos de equipos"
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "Ejecutar error SQL [%1$s] en [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6486,7 +6409,7 @@ msgstr "Ejecutado"
 msgid "Executed script"
 msgstr "Script ejecutado"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Confirmación de ejecución"
 
@@ -6502,8 +6425,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "Expandir"
 
@@ -6625,7 +6548,7 @@ msgstr "Expresiones"
 msgid "External check"
 msgstr "Comprobación externa"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "V"
@@ -6652,8 +6575,8 @@ msgstr "Falló"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6664,26 +6587,26 @@ msgstr "Falló la creación del tablero"
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr "Falló la actualización del tablero"
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6691,7 +6614,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Falló la actualización de la plantilla."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6715,7 +6638,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Febrero"
 
@@ -6737,10 +6660,9 @@ msgstr "El campo \"%1$s\" no puede estar vacío."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6751,13 +6673,6 @@ msgstr "El campo \"%1$s\" es obligatorio."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "Falta el valor del campo \"%1$s\" para el mapa \"%2$s\"."
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "Falta el valor del campo \"%1$s\" para el tipo de soporte \"%2$s\"."
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6776,11 +6691,6 @@ msgstr "El campo \"%1$s\" no es un entero."
 msgid "Field \"%1$s\" is not string."
 msgstr "El campo \"%1$s\" no es una cadena."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "Se requiere el campo \"%1$s\" para el tipo de soporte \"%2$s\"."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6795,10 +6705,6 @@ msgstr "El campo \"host\" es obligatorio."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Formato de archivo no soportado."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6863,7 +6769,8 @@ msgstr "Región rellenada"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6888,7 +6795,7 @@ msgstr "Filtro"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6940,7 +6847,7 @@ msgstr "Ajustar al mapa"
 msgid "Fixed"
 msgstr "Fijo"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6991,12 +6898,12 @@ msgstr "Fórmula"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7009,7 +6916,7 @@ msgstr "Francés (fr_FR)"
 msgid "Fri"
 msgstr "Vie"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Viernes"
 
@@ -7120,7 +7027,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "La expresión dada no es una macro"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr ""
@@ -7134,7 +7041,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr "Volver a %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr ""
 
@@ -7172,7 +7079,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7180,7 +7087,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Línea de gradiente"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7240,7 +7147,7 @@ msgstr[1] "Gráficos copiados"
 msgid "Graph deleted"
 msgstr "Gráfico eliminado"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7277,8 +7184,8 @@ msgstr "Prototipo de gráfico borrado"
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7312,8 +7219,8 @@ msgstr "Tipo de gráfico"
 msgid "Graph updated"
 msgstr "Gráfico actualizado"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7344,7 +7251,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Gráficos"
 
@@ -7365,12 +7272,12 @@ msgstr "Cuadrícula"
 msgid "Group"
 msgstr "Grupo"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "El grupo \"%1$s\" no puede ser eliminado porque está siendo usado por un prototipo de equipo."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr ""
@@ -7544,11 +7451,11 @@ msgstr "Ayuda"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr ""
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr ""
 
@@ -7575,11 +7482,11 @@ msgstr ""
 msgid "High"
 msgstr "Alta"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr "Oscuro de alto contraste"
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr "Claro de alto contraste"
 
@@ -7600,7 +7507,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Histórico"
 
@@ -7608,11 +7515,15 @@ msgstr "Histórico"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Histórico eliminado"
 
@@ -7655,7 +7566,7 @@ msgstr "Horizontal"
 msgid "Horizontal align"
 msgstr "Alineación horizontal"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7684,7 +7595,7 @@ msgstr "Alineación horizontal"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7698,7 +7609,7 @@ msgstr[1] "Equipos"
 msgid "Host \"%1$s\" already exists."
 msgstr "El equipo \"%1$s\" ya existe."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7706,7 +7617,7 @@ msgstr "El equipo \"%1$s\" ya existe."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "El equipo \"%1$s\" no puede estar sin grupo de equipos."
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7759,7 +7670,7 @@ msgid_plural "Hosts enabled"
 msgstr[0] "Equipo habilitado"
 msgstr[1] "Equipos habilitados"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7773,22 +7684,22 @@ msgstr[1] "Equipos habilitados"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Grupo del equipo"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Ya existe el grupo de equipos \"%1$s\"."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7801,10 +7712,10 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7820,8 +7731,8 @@ msgstr ""
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7895,7 +7806,7 @@ msgstr "Nombre de equipo"
 msgid "Host networks"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7976,7 +7887,7 @@ msgstr ""
 msgid "Host updated"
 msgstr "Equipo actualizado"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr "El equipo con ID \"%1$s\" no está disponible."
@@ -7996,7 +7907,7 @@ msgstr ""
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8009,7 +7920,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8057,7 +7968,7 @@ msgstr "Equipos actualizados"
 msgid "Hours"
 msgstr "Horas"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8097,7 +8008,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "Dirección IP"
@@ -8122,7 +8033,7 @@ msgstr "El rango IP \"%1$s\" sobrepasa el límite de direccionamiento \"%2$s\""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8179,12 +8090,12 @@ msgstr "Icono resaltado"
 msgid "Icon map"
 msgstr "Icono asignado"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "No pudo ser borrada la asignación de icono \"%1$s\". En uso en el mapa \"%2$s\"."
@@ -8197,18 +8108,18 @@ msgstr "Creada asignación de icono"
 msgid "Icon map deleted"
 msgstr "Borrada asignación de icono"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Actualizada la asignación de icono"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "Asignación de icono"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "El icono con ID \"%1$s\" no está disponible."
@@ -8309,23 +8220,20 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Imagen"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -8334,7 +8242,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Imágen añadida"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Imágen eliminada"
 
@@ -8342,18 +8250,12 @@ msgstr "Imágen eliminada"
 msgid "Image label type"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Imágen actualizada"
 
@@ -8448,7 +8350,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8459,13 +8361,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr "Mapa inaccesible"
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8509,7 +8411,7 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8678,24 +8580,6 @@ msgstr ""
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8750,8 +8634,6 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
@@ -8777,31 +8659,22 @@ msgstr ""
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8830,7 +8703,7 @@ msgstr ""
 msgid "Incorrect eventsource value."
 msgstr ""
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Valor o nombre de campo incorrecto \"%1$s\" en la cláusula where para la tabla \"%2$s\"."
@@ -8855,22 +8728,17 @@ msgstr "Subida de archivo incorrecta."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8881,7 +8749,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
@@ -8909,8 +8777,6 @@ msgstr "Índice de imagen incorrecto."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8973,10 +8839,6 @@ msgstr "Periodo de mantenimiento incorrecto (mínimo 5 minutos)"
 msgid "Incorrect map ID."
 msgstr "Identificador de mapa incorrecto."
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "Identificador de tipo de soporte incorrecto."
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9034,13 +8896,13 @@ msgstr "Expresión regular incorrecta \"%1$s\": \"%2$s\""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Recibida respuesta incorrecta desde el servidor Zabbix \"%1$s\"."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr ""
 
@@ -9093,12 +8955,7 @@ msgstr ""
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
@@ -9144,13 +9001,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9167,60 +9024,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr ""
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr ""
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9275,14 +9102,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9392,25 +9213,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9421,7 +9224,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9467,16 +9270,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9485,7 +9289,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9573,12 +9377,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Insertar"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr ""
 
@@ -9682,7 +9486,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr ""
 
@@ -9690,7 +9494,7 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9701,7 +9505,7 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9724,7 +9528,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9756,7 +9560,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
@@ -9781,27 +9585,29 @@ msgstr ""
 msgid "Invalid method parameters."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9827,17 +9633,17 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9845,8 +9651,8 @@ msgstr ""
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9860,106 +9666,116 @@ msgstr ""
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -10001,43 +9817,38 @@ msgstr ""
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10058,7 +9869,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Inventario"
 
@@ -10099,7 +9910,7 @@ msgstr ""
 msgid "Italian (it_IT)"
 msgstr "Italiano (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10131,7 +9942,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10145,7 +9956,7 @@ msgstr "Monitor añadido"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] ""
@@ -10159,13 +9970,13 @@ msgstr "Número de elementos"
 msgid "Item deleted"
 msgstr "Monitor eliminado"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -10175,7 +9986,7 @@ msgstr[1] ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr ""
 
@@ -10184,7 +9995,7 @@ msgstr ""
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10221,8 +10032,8 @@ msgid_plural "Item prototypes updated"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10248,7 +10059,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10280,8 +10091,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10332,11 +10143,11 @@ msgstr ""
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Monitores"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Monitores eliminados"
 
@@ -10354,7 +10165,7 @@ msgstr "Monitores actualizados"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10379,6 +10190,10 @@ msgstr ""
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10391,7 +10206,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10409,7 +10224,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Ene"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Enero"
 
@@ -10431,7 +10246,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Jul"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Julio"
 
@@ -10439,7 +10254,7 @@ msgstr "Julio"
 msgid "Jun"
 msgstr "Jun"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Junio"
 
@@ -10595,22 +10410,6 @@ msgid_plural "Last %1$d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10622,11 +10421,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Última comprobación"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Gráfico de la última hora"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Gráfico del último mes"
 
@@ -10664,11 +10463,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Último valor"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Gráfico de la última semana"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10677,11 +10476,11 @@ msgstr "Gráfico de la última semana"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Última fecha"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr ""
 
@@ -10722,7 +10521,7 @@ msgstr ""
 msgid "Left trim"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -11003,7 +10802,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
@@ -11025,7 +10824,7 @@ msgstr ""
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11036,12 +10835,12 @@ msgid "Macro"
 msgstr "Macro"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
@@ -11069,7 +10868,7 @@ msgstr ""
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -11077,7 +10876,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11160,7 +10959,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11182,13 +10981,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Mapa"
 
@@ -11257,7 +11056,7 @@ msgstr ""
 msgid "Map update failed."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11289,7 +11088,7 @@ msgstr "Mapas"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Marzo"
 
@@ -11393,7 +11192,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11407,7 +11206,7 @@ msgstr[1] ""
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Mayo"
 
@@ -11422,15 +11221,12 @@ msgstr "May"
 msgid "Media"
 msgstr "Medio"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Tipo de medio"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr ""
@@ -11457,11 +11253,6 @@ msgid_plural "Media types enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr ""
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11491,7 +11282,7 @@ msgstr ""
 msgid "Media types"
 msgstr "Tipos de medios"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11579,7 +11370,7 @@ msgstr "Mensajería"
 msgid "Method not found."
 msgstr ""
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11641,7 +11432,7 @@ msgid "Minimum severity"
 msgstr "Gravedad mínima"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11700,7 +11491,7 @@ msgstr "Modo"
 msgid "Model"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11738,7 +11529,7 @@ msgstr[1] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11764,7 +11555,7 @@ msgstr ""
 msgid "Mon"
 msgstr ""
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Lunes"
 
@@ -11804,11 +11595,11 @@ msgstr "Mes"
 msgid "Monthly"
 msgstr "Mensual"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11832,7 +11623,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11845,7 +11636,7 @@ msgstr ""
 msgid "Multiple PROBLEM events"
 msgstr "Múltiples eventos PROBLEMA"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Silenciar"
 
@@ -11974,11 +11765,11 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12136,19 +11927,21 @@ msgstr "Nueva condición"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Nuevo elemento"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr ""
 
@@ -12160,7 +11953,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nueva expresión regular"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12168,7 +11961,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Nuevo tiempo del servicio"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12177,7 +11970,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12195,7 +11988,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12224,30 +12017,6 @@ msgstr ""
 msgid "No"
 msgstr "No"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr ""
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12263,11 +12032,6 @@ msgstr ""
 msgid "No \"%1$s\" given for map."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12275,7 +12039,7 @@ msgstr ""
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -12285,7 +12049,7 @@ msgstr ""
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -12302,11 +12066,6 @@ msgstr ""
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr ""
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12337,7 +12096,7 @@ msgstr ""
 msgid "No details"
 msgstr "Sin detalles"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr ""
 
@@ -12373,7 +12132,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "No se agregaron gráficas."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr ""
 
@@ -12403,7 +12162,7 @@ msgstr ""
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr ""
 
@@ -12437,7 +12196,7 @@ msgstr ""
 msgid "No maps added."
 msgstr "No se agregaron mapas."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr ""
 
@@ -12445,17 +12204,46 @@ msgstr ""
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12463,7 +12251,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12491,19 +12279,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12518,16 +12305,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12547,12 +12340,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12573,27 +12364,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12610,14 +12403,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12626,7 +12419,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "¡Sin permisos en el objeto o éste no existe!"
 
@@ -12646,7 +12439,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr "No actualizar"
 
@@ -12658,7 +12451,7 @@ msgstr ""
 msgid "No target selected"
 msgstr ""
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr ""
 
@@ -12675,7 +12468,7 @@ msgstr ""
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr ""
 
@@ -12745,15 +12538,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12785,7 +12578,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "No soportado"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Nota"
@@ -12816,7 +12609,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "Noviembre"
 
@@ -13003,8 +12796,8 @@ msgstr ""
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13064,13 +12857,13 @@ msgstr "Oct"
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Octubre"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "INACTIVO"
 
@@ -13078,30 +12871,31 @@ msgstr "INACTIVO"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr ""
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "ACTIVO"
 
@@ -13117,35 +12911,15 @@ msgstr "Una vez"
 msgid "One"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr ""
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr ""
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Una vez inoperativo"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13194,10 +12968,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr ""
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13206,15 +12976,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr ""
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Sólo cuentan los iniciadores asignados a equipos habilitados y que dependan de monitores habilitados"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr ""
 
@@ -13223,7 +12989,7 @@ msgstr ""
 msgid "Operating system information. Returns string"
 msgstr "Información del sistema operativo. Devuelve una cadena"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13232,11 +12998,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr ""
 
@@ -13258,7 +13024,7 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13267,33 +13033,33 @@ msgstr ""
 msgid "Operations"
 msgstr "Operaciones"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operador"
 
@@ -13402,7 +13168,7 @@ msgstr "Otros parámetros de configuración"
 msgid "Other parameters"
 msgstr "Otros parámetros"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Otros"
@@ -13416,7 +13182,7 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13445,7 +13211,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13634,7 +13400,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13679,7 +13445,7 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "Identidad PSK"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13702,16 +13468,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parámetro"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr ""
@@ -13741,7 +13507,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13758,7 +13524,7 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13770,11 +13536,6 @@ msgstr ""
 msgid "Parse"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr ""
@@ -13835,7 +13596,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr ""
 
@@ -13845,15 +13606,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13899,12 +13660,11 @@ msgstr ""
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Período"
 
@@ -13993,7 +13753,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Por favor, selecciona dos elementos"
 
@@ -14033,7 +13793,7 @@ msgstr ""
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14122,7 +13882,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14253,7 +14013,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Problema en"
 
@@ -14266,21 +14026,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14294,9 +14050,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Problemas"
 
@@ -14330,7 +14086,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "Propiedades"
 
@@ -14351,13 +14107,13 @@ msgstr "La URL proporcionada \"%1$s\" no es válida."
 msgid "Proxies"
 msgstr "Proxies"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14365,7 +14121,7 @@ msgstr "Proxies"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14375,12 +14131,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Proxy \"%1$s\" para el host \"%2$s\" no existe."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Proxy \"%1$s\" está siendo usado por la regla de descubrimiento \"%2$s\"."
@@ -14473,7 +14229,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14550,10 +14306,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Valor recibido"
@@ -14635,7 +14387,7 @@ msgstr ""
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr "Intervalo de refresco"
 
@@ -14653,13 +14405,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Expresión regular"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14692,7 +14444,7 @@ msgstr "Expresiones regulares"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14724,8 +14476,6 @@ msgstr "Comando remoto"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14746,7 +14496,9 @@ msgstr "Comando remoto"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14759,7 +14511,7 @@ msgstr "Comando remoto"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14836,8 +14588,8 @@ msgstr "Comando remoto"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -14877,7 +14629,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14919,7 +14671,7 @@ msgid "Replace dependencies"
 msgstr "Reemplazar dependencias"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14974,7 +14726,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -15016,8 +14768,8 @@ msgstr "Códigos de estado requeridos"
 msgid "Required string"
 msgstr "Cadena requerida"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Restablecer"
 
@@ -15050,7 +14802,7 @@ msgstr "Confirmar restablecer"
 msgid "Reset defaults"
 msgstr "Restablecer predeterminados"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Resuelto"
 
@@ -15116,7 +14868,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Resultado"
@@ -15303,12 +15055,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Ruso (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15319,8 +15071,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15357,7 +15109,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15453,12 +15205,12 @@ msgstr "Resultado SQL: %1$s (selecciona: %2$s | ejecuta: %3$s)"
 msgid "SQL query"
 msgstr "Consulta SQL"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "La ejecución de la instrucción SQL ha fallado \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "La ejecución de la instrucción SQL ha fallado \"%1$s\"."
@@ -15521,7 +15273,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15533,7 +15285,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Sáb"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -15575,7 +15327,7 @@ msgstr "Planificación"
 msgid "Scheduled check"
 msgstr "Comprobación de planificación"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15642,7 +15394,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15655,8 +15407,7 @@ msgstr ""
 msgid "Script"
 msgstr "Script"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
@@ -15688,12 +15439,6 @@ msgstr "Nombre del script"
 msgid "Script parameters"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr ""
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr ""
@@ -15706,7 +15451,7 @@ msgstr ""
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr ""
 
@@ -15776,8 +15521,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15785,7 +15530,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Seleccione"
 
@@ -15821,19 +15566,19 @@ msgstr ""
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr ""
 
@@ -15858,7 +15603,7 @@ msgstr ""
 msgid "Send to"
 msgstr "Enviar a"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr ""
 
@@ -15891,7 +15636,7 @@ msgstr "Separado"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "Septiembre"
 
@@ -15922,28 +15667,28 @@ msgstr ""
 msgid "Server time"
 msgstr "Hora del sevidor"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Servicio"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15953,7 +15698,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr ""
 
@@ -15986,16 +15731,16 @@ msgstr "Puerto del servicio"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -16003,11 +15748,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Tiempos del servicio"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Tipo de servicio"
 
@@ -16016,30 +15761,29 @@ msgstr "Tipo de servicio"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Servicio actualizado"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Servicios"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -16047,7 +15791,7 @@ msgstr ""
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16077,7 +15821,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16106,7 +15850,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16115,7 +15859,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16171,7 +15915,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr ""
 
@@ -16313,7 +16057,7 @@ msgstr "Mostrar una advertencia si el servidor Zabbix está caído"
 msgid "Show working time"
 msgstr "Mostrar tiempo de trabajo"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Se muestra"
 
@@ -16422,7 +16166,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr ""
 
@@ -16468,7 +16212,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Ordenar entradas por"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Orden de clasificación (0->999)"
 
@@ -16542,7 +16286,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16645,15 +16389,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Estado"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Códigos de estado"
@@ -16683,7 +16431,7 @@ msgstr "Sólo el estado"
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16731,7 +16479,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16796,7 +16544,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Asunto"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Submapa"
 
@@ -16812,7 +16560,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr ""
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16825,7 +16573,7 @@ msgstr ""
 msgid "Sun"
 msgstr "Domingo"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -16917,12 +16665,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16949,17 +16697,17 @@ msgstr "ACTIVO"
 msgid "Table \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Etiqueta"
@@ -17015,7 +16763,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17075,7 +16823,7 @@ msgstr "Tipo de destino"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17096,7 +16844,7 @@ msgstr "Plantilla"
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17120,7 +16868,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17180,7 +16928,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17352,14 +17100,14 @@ msgstr ""
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "La imagen está en uso en la asignación de icono %1$s."
 msgstr[1] "La imagen está en uso en las asignaciones de iconos %1$s."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17424,7 +17172,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Este mes"
 
@@ -17432,7 +17180,7 @@ msgstr "Este mes"
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Esta semana"
 
@@ -17440,7 +17188,7 @@ msgstr "Esta semana"
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Este año"
 
@@ -17460,7 +17208,7 @@ msgstr ""
 msgid "Thu"
 msgstr "Jueves"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Jueves"
 
@@ -17477,7 +17225,7 @@ msgstr "Hasta"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17510,7 +17258,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Período de tiempo"
 
@@ -17562,12 +17310,11 @@ msgstr "Marca de hora"
 msgid "To"
 msgstr "A"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Hoy"
 
@@ -17682,7 +17429,7 @@ msgstr ""
 msgid "Trends"
 msgstr "Tendencias"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17690,7 +17437,7 @@ msgstr "Tendencias"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Iniciadores"
 
@@ -17791,7 +17538,7 @@ msgstr ""
 msgid "Trigger overview"
 msgstr "Vistazo general de los iniciadores"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17864,11 +17611,11 @@ msgstr ""
 msgid "Trigger severity"
 msgstr "Gravedad del iniciador"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17885,7 +17632,7 @@ msgstr "Iniciador actualizado"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17920,7 +17667,7 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -17933,7 +17680,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17949,19 +17696,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18013,7 +17760,7 @@ msgstr "Tipo de información"
 msgid "Types"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18034,7 +17781,7 @@ msgstr "DESCONOCIDO"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18080,12 +17827,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URLs"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18170,12 +17917,12 @@ msgstr ""
 msgid "Unblock selected users?"
 msgstr ""
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18195,21 +17942,23 @@ msgstr "Unidad"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Desconocido"
@@ -18227,7 +17976,7 @@ msgid "Unknown error"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
@@ -18280,7 +18029,7 @@ msgstr "Desvincular de plantilla"
 msgid "Unlink from templates"
 msgstr "Desvincular de plantillas"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr ""
 
@@ -18311,7 +18060,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -18321,7 +18070,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -18366,7 +18115,7 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18379,7 +18128,7 @@ msgstr ""
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18432,7 +18181,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18450,7 +18199,7 @@ msgstr "Subir"
 msgid "Upper level maps"
 msgstr "Mapas de nivel superior"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18485,7 +18234,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18500,7 +18249,7 @@ msgstr ""
 msgid "User"
 msgstr "Usuario"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
@@ -18552,7 +18301,7 @@ msgstr "Usuario añadido"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
@@ -18572,7 +18321,7 @@ msgid_plural "Users deleted"
 msgstr[0] "Usuario eliminado"
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18582,27 +18331,27 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Un grupo de usuarios"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
@@ -18636,8 +18385,8 @@ msgstr[1] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18681,14 +18430,14 @@ msgstr "Contraseña de usuario"
 msgid "User profile"
 msgstr "Perfil de usuario"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18757,7 +18506,7 @@ msgstr "Usuario actualizado"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -19073,14 +18822,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19090,7 +18839,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19132,7 +18881,7 @@ msgstr "El valor \"%1$s\" es incorrecto para el parámetro \"grid_show\". Las op
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr ""
@@ -19149,7 +18898,7 @@ msgstr ""
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Valor asignado"
 
@@ -19192,11 +18941,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr ""
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19243,7 +18993,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19330,7 +19080,7 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19347,7 +19097,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19356,7 +19106,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19372,7 +19122,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web"
 
@@ -19384,7 +19134,7 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Monitorización web"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr ""
 
@@ -19399,27 +19149,27 @@ msgstr ""
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr ""
 
@@ -19441,7 +19191,7 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Miércoles"
 
@@ -19452,7 +19202,7 @@ msgstr "Miércoles"
 msgid "Weekly"
 msgstr "Semanal"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19468,12 +19218,12 @@ msgstr ""
 msgid "When active"
 msgstr "Cuándo está activo"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19668,6 +19418,10 @@ msgstr ""
 msgid "Y-m-d H:i:s"
 msgstr "Y-m-d H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr ""
@@ -19729,7 +19483,7 @@ msgstr "Anual"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19786,18 +19540,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19809,9 +19557,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
@@ -19927,24 +19672,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr ""
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19953,37 +19702,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr ""
@@ -20004,28 +19753,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr ""
@@ -20073,7 +19823,7 @@ msgstr "todo"
 msgid "all media"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20081,42 +19831,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20126,7 +19871,7 @@ msgid "an empty string is expected"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr ""
 
@@ -20134,11 +19879,15 @@ msgstr ""
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20299,14 +20048,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20336,19 +20079,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20368,14 +20103,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20383,7 +20118,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "no puede estar vacío"
@@ -20396,7 +20131,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20430,7 +20165,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20448,7 +20183,8 @@ msgid "configure"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20477,7 +20213,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20539,7 +20275,7 @@ msgstr "descendiente"
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20561,13 +20297,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20593,7 +20329,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20630,6 +20367,10 @@ msgstr ""
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20676,7 +20417,7 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr ""
@@ -20717,6 +20458,11 @@ msgstr "icono"
 msgid "image"
 msgstr "imagen"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "contenido en"
@@ -20757,15 +20503,19 @@ msgstr ""
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20793,7 +20543,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr ""
 
@@ -20822,27 +20572,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr ""
 
@@ -20870,7 +20620,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr ""
 
@@ -20956,12 +20706,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -21020,7 +20770,7 @@ msgstr ""
 msgid "max"
 msgstr "máximo"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21060,7 +20810,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr ""
@@ -21087,8 +20837,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21103,27 +20853,14 @@ msgstr "debe ser un usuario LDAP válido"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr ""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21151,6 +20888,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21161,7 +20906,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr ""
 
@@ -21296,7 +21041,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21331,24 +21076,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21376,11 +21125,11 @@ msgstr ""
 msgid "regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21392,15 +21141,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21448,7 +21197,7 @@ msgstr ""
 msgid "short description"
 msgstr "descripción corta"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21467,15 +21216,15 @@ msgstr "descripción corta"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr ""
 
@@ -21491,31 +21240,31 @@ msgstr "mostrar asignaciones de icono"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21523,11 +21272,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21543,8 +21292,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21555,7 +21304,7 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21564,13 +21313,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21579,20 +21332,20 @@ msgstr ""
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "falta el parámetro \"%1$s\""
@@ -21624,39 +21377,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21670,7 +21423,7 @@ msgstr "iniciador"
 msgid "trigger does not allow manual closing"
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21682,26 +21435,26 @@ msgstr ""
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "pulse aquí para buscar"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21709,11 +21462,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21730,10 +21483,10 @@ msgstr ""
 msgid "unexpected end of macro"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21743,11 +21496,12 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr ""
@@ -21773,8 +21527,8 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21799,6 +21553,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21814,7 +21572,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21834,11 +21592,11 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "valor"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21856,76 +21614,85 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr ""
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr ""
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21937,18 +21704,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21957,7 +21722,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21970,11 +21735,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21991,7 +21756,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr ""
diff --git a/ui/locale/fa/LC_MESSAGES/frontend.po b/ui/locale/fa/LC_MESSAGES/frontend.po
index 8fad560aee1..449aa85ef6c 100644
--- a/ui/locale/fa/LC_MESSAGES/frontend.po
+++ b/ui/locale/fa/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2013-10-10 08:30+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d روز%1$d روز"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -170,7 +170,7 @@ msgstr[0] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -182,7 +182,7 @@ msgid "%1$s of %2$s element in problem state"
 msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -212,13 +212,13 @@ msgstr[0] ""
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] ""
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -237,13 +237,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -371,7 +371,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -429,10 +429,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr ""
@@ -475,7 +471,7 @@ msgstr ""
 msgid "Ack"
 msgstr "تأیید"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "تأیید کردن"
 
@@ -483,7 +479,7 @@ msgstr "تأیید کردن"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "تأیید شده"
@@ -496,7 +492,7 @@ msgstr "تأیید رویدادهای مشکل"
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -523,9 +519,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -582,7 +578,7 @@ msgstr ""
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -591,7 +587,7 @@ msgstr ""
 msgid "Action added"
 msgstr "فعالیت اضافه شد"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -638,8 +634,8 @@ msgstr "فعالیت بروز شد"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "فعالیت ها"
@@ -706,7 +702,7 @@ msgstr "فعال تا"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -717,7 +713,7 @@ msgstr "فعال تا"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -740,9 +736,9 @@ msgstr "فعال تا"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -812,7 +808,7 @@ msgstr "فعال تا"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "افزودن"
 
@@ -820,11 +816,11 @@ msgstr "افزودن"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr ""
 
@@ -832,7 +828,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -849,7 +845,7 @@ msgstr "افزودن هاست"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr ""
 
@@ -871,7 +867,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -923,12 +919,12 @@ msgstr ""
 msgid "Add widget"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -938,7 +934,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -951,7 +947,7 @@ msgstr "مدیر"
 msgid "Administration"
 msgstr "مدیریت"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -973,7 +969,7 @@ msgstr "سن کمتر از"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1045,7 +1041,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "همه"
 
@@ -1063,7 +1059,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "همه لینک ها باید \"نام\" و \"آدرس\" مشخص داشته باشند"
 
@@ -1081,7 +1077,7 @@ msgstr ""
 msgid "All problems if tag values match"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1194,15 +1190,15 @@ msgstr "خطای برنامه."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "اعمال"
 
@@ -1220,7 +1216,7 @@ msgstr ""
 msgid "Apr"
 msgstr "آوریل"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "آوریل"
 
@@ -1248,7 +1244,7 @@ msgstr "نوع ناحیه"
 msgid "Arithmetic"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1295,7 +1291,7 @@ msgstr "در (ساعت:دقیقه)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1304,7 +1300,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1316,6 +1312,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1327,7 +1328,7 @@ msgstr ""
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1383,7 +1384,7 @@ msgstr ""
 msgid "Aug"
 msgstr "اوت"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "اوت"
 
@@ -1396,7 +1397,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1473,7 +1474,7 @@ msgstr ""
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1488,7 +1489,7 @@ msgstr "نگاشت خودکار آیکن"
 msgid "Automatic icon selection"
 msgstr "انتخاب آیکن خودکار"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1540,7 +1541,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1603,7 +1604,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "مسدود شده"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr ""
 
@@ -1657,11 +1658,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "پایین"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr ""
 
@@ -1687,7 +1688,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1732,8 +1733,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1742,7 +1743,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "محاسبه کردن"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1767,7 +1768,7 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1780,8 +1781,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "لغو"
 
@@ -1811,7 +1812,7 @@ msgstr "فعالیت نمی تواند اضافه شود"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1821,7 +1822,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "وابستگی از یک هاست به یک قالب نمی‌تواند اضافه شود"
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1852,8 +1853,8 @@ msgid "Cannot add host prototype"
 msgstr ""
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "تصویر نمی تواند اضافه شود"
 
@@ -1944,15 +1945,15 @@ msgstr "کاربر نمی تواند اضافه شود"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1972,33 +1973,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "تاریخچه نمی‌تواند پاک شود"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "نمونه اولیه نمودارها نمی‌توانند کپی شوند"
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "نمونه اولیه آیتم ها نمی‌توانند کپی شوند"
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "نمونه اولیه هشدارها نمی‌توانند کپی شوند"
 
@@ -2024,7 +2021,7 @@ msgid "Cannot copy graph"
 msgid_plural "Cannot copy graphs"
 msgstr[0] ""
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] ""
@@ -2074,8 +2071,8 @@ msgstr "نگاشت آیکن نمی‌توانند ایجاد شود."
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2103,7 +2100,7 @@ msgstr ""
 msgid "Cannot delete action"
 msgstr "فعالیت نمی‌تواند حذف شود"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2166,7 +2163,7 @@ msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one
 msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group."
 msgstr[0] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2176,11 +2173,11 @@ msgstr[0] ""
 msgid "Cannot delete host prototypes"
 msgstr ""
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "نگاشت آیکن نمی‌توانند حذف شود"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "تصویر نمی‌تواند حذف شود"
 
@@ -2205,7 +2202,7 @@ msgstr ""
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "آیتم ها نمی‌توانند حذف شوند"
 
@@ -2233,7 +2230,7 @@ msgid "Cannot delete proxy"
 msgid_plural "Cannot delete proxies"
 msgstr[0] "پروکسی نمی تواند حذف شود"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2253,7 +2250,7 @@ msgid "Cannot delete script"
 msgid_plural "Cannot delete scripts"
 msgstr[0] "اسکریپت نمی تواند حذف شود"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "اسکریپت ها نمی توانند حذف شوند.اسکریپت \"%1$s\" در عملکرد فعالیت \"%2$s\" استفاده شده است.اسکریپت ها نمی توانند حذف شوند.اسکریپت \"%1$s\" در عملکرد فعالیت \"%2$s\" استفاده شده است.اسکریپت ها نمی توانند حذف شوند.اسکریپت \"%1$s\" در عملکرد فعالیت \"%2$s\" استفاده شده است.اسکریپت ها نمی توانند حذف شوند.اسکریپت \"%1$s\" در عملکرد فعالیت \"%2$s\" استفاده شده است.اسکریپت ها نمی توانند حذف شوند.اسکریپت \"%1$s\" در عملکرد فعالیت \"%2$s\" استفاده شده است."
@@ -2268,8 +2265,8 @@ msgid "Cannot delete service"
 msgid_plural "Cannot delete services"
 msgstr[0] "سرویس نمی‌تواند حذف شود"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2298,7 +2295,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr ""
 
@@ -2348,7 +2345,7 @@ msgid "Cannot delete user role"
 msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr ""
 
@@ -2378,7 +2375,7 @@ msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
@@ -2405,7 +2402,7 @@ msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -2446,7 +2443,7 @@ msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
@@ -2473,7 +2470,7 @@ msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
@@ -2486,7 +2483,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2520,8 +2517,8 @@ msgstr ""
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2619,24 +2616,20 @@ msgstr ""
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2648,7 +2641,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr ""
 
@@ -2662,7 +2655,7 @@ msgid "Cannot link template."
 msgstr ""
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2693,17 +2686,17 @@ msgstr ""
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "دستور حذف برای جدول \"%1$s\" را نمیتوانید بدون شرط اجرا کنید."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "دستور بروزرسانی برای جدول \"%1$s\" را نمیتوانید بدون مقدار اجرا کنید."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "دستور بروزرسانی برای جدول \"%1$s\" را نمیتوانید بدون شرط اجرا کنید."
@@ -2730,7 +2723,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr ""
 
@@ -2749,7 +2742,7 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2789,12 +2782,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2812,7 +2805,7 @@ msgid "Cannot unblock user"
 msgid_plural "Cannot unblock users"
 msgstr[0] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
@@ -2825,7 +2818,7 @@ msgstr "قالب را نمی‌توانید جدا کنید"
 msgid "Cannot unlink template."
 msgstr ""
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2878,11 +2871,6 @@ msgstr ""
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr ""
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2892,8 +2880,9 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
@@ -2952,9 +2941,7 @@ msgstr ""
 msgid "Cannot update group"
 msgstr "گروه نمی‌تواند بروز شود"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
@@ -2976,13 +2963,13 @@ msgstr[0] ""
 msgid "Cannot update hosts"
 msgstr "هاست ها نمی‌تواند بروز شود"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "نگاشت آیکن نمی‌توانند بروز شود."
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "تصویر نمیتواند بروز شود"
 
@@ -3035,12 +3022,12 @@ msgstr "نقشه شبکه نمی تواند بروز شود"
 msgid "Cannot update proxy"
 msgstr "پروکسی نمی‌تواند بروز شود"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3060,17 +3047,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "اسکریپت نمی تواند بروز شود"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3143,7 +3130,7 @@ msgstr[0] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr ""
 
@@ -3243,8 +3230,8 @@ msgid "Character string not included"
 msgstr "در بر نداشتن رشته کاراکتری"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3359,7 +3346,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr "تطبیق ها باید منحصر به فرد باشد."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3380,7 +3367,7 @@ msgstr ""
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3401,11 +3388,11 @@ msgstr "پاک کردن تاریخچه و روند ها"
 msgid "Clear when unlinking"
 msgstr "پاک کردن وقتی جدا شد"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3420,7 +3407,7 @@ msgstr "ساعت"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3435,7 +3422,7 @@ msgstr "ساعت"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "کپی برداری"
 
@@ -3446,8 +3433,8 @@ msgstr "کپی برداری"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "بستن"
 
@@ -3458,13 +3445,13 @@ msgstr "بستن"
 msgid "Close expression constructor"
 msgstr "بستن عبارت سازنده"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
 
@@ -3477,8 +3464,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr ""
 
@@ -3495,7 +3482,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3561,7 +3548,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3572,17 +3559,12 @@ msgstr "شرط"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3592,17 +3574,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3618,7 +3595,7 @@ msgstr "شروط"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "پیکربندی"
 
@@ -3681,7 +3658,7 @@ msgstr ""
 msgid "Configuration of housekeeping"
 msgstr ""
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr ""
@@ -3788,7 +3765,7 @@ msgstr "متن تایید"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr ""
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3881,7 +3858,7 @@ msgstr "تماس"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3941,7 +3918,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -3980,8 +3957,8 @@ msgstr ""
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "رونوشت"
 
@@ -3990,12 +3967,11 @@ msgstr "رونوشت"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr ""
@@ -4019,16 +3995,6 @@ msgid "Correlation enabled"
 msgid_plural "Correlations enabled"
 msgstr[0] ""
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr ""
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr ""
@@ -4037,14 +4003,10 @@ msgstr ""
 msgid "Correlation updated"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "نتوانست تصویر را ذخیره کند."
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "تعداد"
 
@@ -4108,11 +4070,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr ""
 
@@ -4229,7 +4191,7 @@ msgstr "ایجاد نقشه"
 msgid "Create media type"
 msgstr "ایجاد نوع رسانه"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr ""
 
@@ -4253,7 +4215,7 @@ msgstr ""
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "ایجاد هشدار"
 
@@ -4416,7 +4378,7 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr ""
@@ -4428,11 +4390,11 @@ msgstr ""
 msgid "Daily"
 msgstr "روزانه"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4453,8 +4415,8 @@ msgstr ""
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr ""
 
@@ -4476,9 +4438,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr ""
 
@@ -4502,7 +4464,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4530,7 +4492,7 @@ msgstr "نمای کلی"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4672,7 +4634,7 @@ msgstr "روز از هفته"
 msgid "Days"
 msgstr "روز"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "رفع خطا"
 
@@ -4686,26 +4648,26 @@ msgstr "حالت رفع خطا"
 msgid "Dec"
 msgstr ""
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "دسامبر"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "پیش فرض"
 
@@ -4798,7 +4760,7 @@ msgstr "تأخیر توسط"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4822,8 +4784,8 @@ msgstr "تأخیر توسط"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "حذف"
 
@@ -4848,11 +4810,11 @@ msgstr ""
 msgid "Delete current action?"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4896,7 +4858,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -4952,7 +4914,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr ""
 
@@ -5057,7 +5019,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5101,7 +5063,7 @@ msgstr ""
 msgid "Delete web scenario?"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5146,7 +5108,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "وابستگی‌ها"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "وابسته"
 
@@ -5154,7 +5116,7 @@ msgstr "وابسته"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5164,7 +5126,7 @@ msgstr "وابسته به"
 msgid "Deployment status"
 msgstr "وضعیت گسترش"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5197,7 +5159,7 @@ msgid "Description"
 msgstr "توصیف"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5363,10 +5325,10 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5449,7 +5411,7 @@ msgid "Discovery by proxy"
 msgstr "کشف با پروکسی"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "تطبیق کشف"
 
@@ -5461,7 +5423,7 @@ msgstr "تطبیق کشف"
 msgid "Discovery list"
 msgstr ""
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "تطبیق شیء"
 
@@ -5493,7 +5455,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5501,12 +5463,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "قانون کشف"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
@@ -5519,7 +5481,7 @@ msgstr ""
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5557,7 +5519,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5568,7 +5530,7 @@ msgstr "قوانین کشف"
 msgid "Discovery rules deleted"
 msgstr ""
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "وضعیت کشف"
@@ -5605,10 +5567,11 @@ msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "نمایش %1$s از %2$s پیدا شده"
@@ -5618,7 +5581,7 @@ msgstr "نمایش %1$s از %2$s پیدا شده"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5640,7 +5603,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
@@ -5696,7 +5659,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5704,7 +5667,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr ""
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5723,18 +5686,6 @@ msgstr ""
 msgid "Draw style"
 msgstr "رسم سبک"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5747,11 +5698,6 @@ msgstr ""
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5803,7 +5749,7 @@ msgstr "آیتم پویا"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است.هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است.هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است.هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است.هر آدرس اینترنتی باید یک نام واحد داشته باشد.لطفاً مطمئن شوید که این آدرس فقط یکبار استفاده شده است."
 
@@ -5812,11 +5758,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5830,8 +5776,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "ویرایش"
 
@@ -5847,11 +5793,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "ویرایش هشدار"
 
@@ -5911,21 +5857,17 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
@@ -5941,25 +5883,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -5969,14 +5905,6 @@ msgstr ""
 msgid "Empty map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr ""
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6142,7 +6070,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6153,7 +6081,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6196,7 +6124,7 @@ msgid "English (en_US)"
 msgstr ""
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6212,7 +6140,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6231,12 +6159,12 @@ msgstr ""
 msgid "Error"
 msgstr "خطا"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6264,7 +6192,7 @@ msgstr "شناسه‌ی رویداد"
 msgid "Event acknowledged"
 msgstr "رویداد تأیید شده"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6272,7 +6200,7 @@ msgid "Event correlation"
 msgstr ""
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr ""
@@ -6307,11 +6235,11 @@ msgstr ""
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6355,15 +6283,10 @@ msgstr "مانع شدن"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "اجرا"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6401,7 +6324,7 @@ msgstr ""
 msgid "Executed script"
 msgstr "اجرای اسکریپت"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "تأیید اجرا"
 
@@ -6417,8 +6340,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr ""
 
@@ -6539,7 +6462,7 @@ msgstr "عبارات"
 msgid "External check"
 msgstr "تطبیق خارجی"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
@@ -6566,8 +6489,8 @@ msgstr "شکست خورد"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6578,26 +6501,26 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6605,7 +6528,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6629,7 +6552,7 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "فوریه"
 
@@ -6651,10 +6574,9 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6665,13 +6587,6 @@ msgstr ""
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6690,11 +6605,6 @@ msgstr ""
 msgid "Field \"%1$s\" is not string."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6709,10 +6619,6 @@ msgstr ""
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr ""
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6777,7 +6683,8 @@ msgstr "منطقه پرشده"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6802,7 +6709,7 @@ msgstr "فیلتر"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6854,7 +6761,7 @@ msgstr "متناسب با نقشه"
 msgid "Fixed"
 msgstr "ثابت"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6905,12 +6812,12 @@ msgstr ""
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -6923,7 +6830,7 @@ msgstr ""
 msgid "Fri"
 msgstr ""
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "جمعه"
 
@@ -7034,7 +6941,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr ""
@@ -7048,7 +6955,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "برو به"
 
@@ -7086,7 +6993,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr ""
 
@@ -7094,7 +7001,7 @@ msgstr ""
 msgid "Gradient line"
 msgstr "خط گراديان"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7153,7 +7060,7 @@ msgstr[0] ""
 msgid "Graph deleted"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7190,8 +7097,8 @@ msgstr ""
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7225,8 +7132,8 @@ msgstr "نوع گراف"
 msgid "Graph updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7257,7 +7164,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "نمودارها"
 
@@ -7278,12 +7185,12 @@ msgstr "شبکه اى"
 msgid "Group"
 msgstr "گروه"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr ""
@@ -7456,11 +7363,11 @@ msgstr "راهنما"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "پنهان"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr ""
 
@@ -7487,11 +7394,11 @@ msgstr ""
 msgid "High"
 msgstr "بالا"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7512,7 +7419,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "تاریخچه"
 
@@ -7520,11 +7427,15 @@ msgstr "تاریخچه"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr ""
 
@@ -7567,7 +7478,7 @@ msgstr "افقی"
 msgid "Horizontal align"
 msgstr "ردیف کردن افقی"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7596,7 +7507,7 @@ msgstr "ردیف کردن افقی"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 #, fuzzy
 msgid "Host"
@@ -7610,7 +7521,7 @@ msgstr[0] "هاست"
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7618,7 +7529,7 @@ msgstr ""
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7668,7 +7579,7 @@ msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7682,22 +7593,22 @@ msgstr[0] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "گروه هاست"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7710,10 +7621,10 @@ msgstr "عناصر گروه هاست"
 msgid "Host group label type"
 msgstr "نوع برچسب گروه هاست"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7729,8 +7640,8 @@ msgstr ""
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7804,7 +7715,7 @@ msgstr "نام هاست"
 msgid "Host networks"
 msgstr "شبکه‌های هاست"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7883,7 +7794,7 @@ msgstr ""
 msgid "Host updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr ""
@@ -7903,7 +7814,7 @@ msgstr ""
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -7916,7 +7827,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -7964,7 +7875,7 @@ msgstr ""
 msgid "Hours"
 msgstr "ساعت"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8004,7 +7915,7 @@ msgstr ""
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "آدرس IP"
@@ -8029,7 +7940,7 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8086,12 +7997,12 @@ msgstr "نشان پررنگ"
 msgid "Icon map"
 msgstr "نگاشت نشان"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
@@ -8104,18 +8015,18 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "نگاشت نشان"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
@@ -8214,23 +8125,20 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "تصویر"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -8239,7 +8147,7 @@ msgstr ""
 msgid "Image added"
 msgstr ""
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr ""
 
@@ -8247,18 +8155,12 @@ msgstr ""
 msgid "Image label type"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr ""
 
@@ -8353,7 +8255,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8364,13 +8266,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr ""
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8414,7 +8316,7 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8582,24 +8484,6 @@ msgstr ""
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8654,8 +8538,6 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
@@ -8681,31 +8563,22 @@ msgstr ""
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8734,7 +8607,7 @@ msgstr ""
 msgid "Incorrect eventsource value."
 msgstr ""
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
@@ -8759,22 +8632,17 @@ msgstr ""
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8785,7 +8653,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
@@ -8813,8 +8681,6 @@ msgstr ""
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8876,10 +8742,6 @@ msgstr ""
 msgid "Incorrect map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr ""
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -8937,13 +8799,13 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr ""
 
@@ -8996,12 +8858,7 @@ msgstr ""
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
@@ -9047,13 +8904,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9070,60 +8927,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr ""
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr ""
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9178,14 +9005,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9295,25 +9116,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9324,7 +9127,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9370,16 +9173,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9388,7 +9192,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9476,12 +9280,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "درج"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr ""
 
@@ -9585,7 +9389,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr ""
 
@@ -9593,7 +9397,7 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9604,7 +9408,7 @@ msgstr ""
 msgid "Interval"
 msgstr "بازه"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9627,7 +9431,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9659,7 +9463,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
@@ -9684,27 +9488,29 @@ msgstr ""
 msgid "Invalid method parameters."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9730,17 +9536,17 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9748,8 +9554,8 @@ msgstr ""
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9763,106 +9569,116 @@ msgstr ""
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9904,43 +9720,38 @@ msgstr ""
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -9961,7 +9772,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "فهرست"
 
@@ -10002,7 +9813,7 @@ msgstr ""
 msgid "Italian (it_IT)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10034,7 +9845,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10048,7 +9859,7 @@ msgstr ""
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] ""
@@ -10061,12 +9872,12 @@ msgstr "تعداد آیتم"
 msgid "Item deleted"
 msgstr ""
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -10075,7 +9886,7 @@ msgstr[0] ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr ""
 
@@ -10084,7 +9895,7 @@ msgstr ""
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10120,8 +9931,8 @@ msgid "Item prototype updated"
 msgid_plural "Item prototypes updated"
 msgstr[0] ""
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10147,7 +9958,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10179,8 +9990,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10231,11 +10042,11 @@ msgstr ""
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "آیتم ها"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr ""
 
@@ -10253,7 +10064,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10278,6 +10089,10 @@ msgstr "واسط های JMX"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10290,7 +10105,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10308,7 +10123,7 @@ msgstr ""
 msgid "Jan"
 msgstr ""
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr ""
 
@@ -10330,7 +10145,7 @@ msgstr ""
 msgid "Jul"
 msgstr ""
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr ""
 
@@ -10338,7 +10153,7 @@ msgstr ""
 msgid "Jun"
 msgstr ""
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr ""
 
@@ -10488,22 +10303,6 @@ msgid "Last %1$d year"
 msgid_plural "Last %1$d years"
 msgstr[0] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10515,11 +10314,11 @@ msgstr ""
 msgid "Last check"
 msgstr "آخرین بررسی"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "نمودار ساعت گذشته"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "نمودار ماه گذشته"
 
@@ -10557,11 +10356,11 @@ msgstr ""
 msgid "Last value"
 msgstr "آخرین مقدار"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "نمودار هفته گذشته"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10570,11 +10369,11 @@ msgstr "نمودار هفته گذشته"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "آخرین اطلاعات"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr ""
 
@@ -10615,7 +10414,7 @@ msgstr ""
 msgid "Left trim"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -10896,7 +10695,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
@@ -10918,7 +10717,7 @@ msgstr ""
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -10929,12 +10728,12 @@ msgid "Macro"
 msgstr "ماکرو"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
@@ -10962,7 +10761,7 @@ msgstr ""
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -10970,7 +10769,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11053,7 +10852,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11075,13 +10874,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "نقشه"
 
@@ -11150,7 +10949,7 @@ msgstr ""
 msgid "Map update failed."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11182,7 +10981,7 @@ msgstr "نقشه‌ها"
 msgid "Mar"
 msgstr ""
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr ""
 
@@ -11286,7 +11085,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11299,7 +11098,7 @@ msgstr[0] ""
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr ""
 
@@ -11314,15 +11113,12 @@ msgstr ""
 msgid "Media"
 msgstr "رسانه"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "نوع رسانه"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr ""
@@ -11346,11 +11142,6 @@ msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] ""
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr ""
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11380,7 +11171,7 @@ msgstr ""
 msgid "Media types"
 msgstr "انوع رسانه"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11468,7 +11259,7 @@ msgstr "پیام‌رسانی"
 msgid "Method not found."
 msgstr ""
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11530,7 +11321,7 @@ msgid "Minimum severity"
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11588,7 +11379,7 @@ msgstr "حالت"
 msgid "Model"
 msgstr "مدل"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11622,7 +11413,7 @@ msgstr[0] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11648,7 +11439,7 @@ msgstr ""
 msgid "Mon"
 msgstr "دوشنبه"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "دوشنبه"
 
@@ -11688,11 +11479,11 @@ msgstr "ماه"
 msgid "Monthly"
 msgstr "ماهانه"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11716,7 +11507,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr ""
 
@@ -11729,7 +11520,7 @@ msgstr ""
 msgid "Multiple PROBLEM events"
 msgstr "رویدادهای مشکلات چندگانه"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "بی‌صدا"
 
@@ -11858,11 +11649,11 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12020,19 +11811,21 @@ msgstr "شرط جدید"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "عنصر جدید"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr ""
 
@@ -12044,7 +11837,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "عبارت منظم جدید"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12052,7 +11845,7 @@ msgstr ""
 msgid "New service time"
 msgstr "زمان سرویس جدید"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12061,7 +11854,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12079,7 +11872,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12108,30 +11901,6 @@ msgstr ""
 msgid "No"
 msgstr "خیر"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr ""
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12147,11 +11916,6 @@ msgstr ""
 msgid "No \"%1$s\" given for map."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12159,7 +11923,7 @@ msgstr ""
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -12169,7 +11933,7 @@ msgstr ""
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -12186,11 +11950,6 @@ msgstr ""
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr ""
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12221,7 +11980,7 @@ msgstr ""
 msgid "No details"
 msgstr "بدون جزئیات"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr ""
 
@@ -12257,7 +12016,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr ""
 
@@ -12287,7 +12046,7 @@ msgstr "بدون تصویر"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr ""
 
@@ -12321,7 +12080,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr ""
 
@@ -12329,17 +12088,46 @@ msgstr ""
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12347,7 +12135,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12375,19 +12163,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12402,16 +12189,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12431,12 +12224,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12457,27 +12248,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12494,14 +12287,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12510,7 +12303,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
@@ -12530,7 +12323,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr ""
 
@@ -12542,7 +12335,7 @@ msgstr ""
 msgid "No target selected"
 msgstr "هدف انتخاب نشده"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "هدف انتخاب نشده"
 
@@ -12559,7 +12352,7 @@ msgstr ""
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr ""
 
@@ -12629,15 +12422,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12669,7 +12462,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "عدم پشتیبانی"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr ""
@@ -12700,7 +12493,7 @@ msgstr ""
 msgid "Nov"
 msgstr ""
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "نوامبر"
 
@@ -12887,8 +12680,8 @@ msgstr ""
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -12948,13 +12741,13 @@ msgstr ""
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "اکتبر"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "خاموش"
 
@@ -12962,30 +12755,31 @@ msgstr "خاموش"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "صحیح"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr ""
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "روشن"
 
@@ -13001,35 +12795,15 @@ msgstr "یکبار"
 msgid "One"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr ""
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "فقط یکبار"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "یکبار پایین آمده"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13077,10 +12851,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr ""
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13089,15 +12859,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr ""
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr ""
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr ""
 
@@ -13106,7 +12872,7 @@ msgstr ""
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13115,11 +12881,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "جزئیات عملکرد"
 
@@ -13141,7 +12907,7 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13150,33 +12916,33 @@ msgstr ""
 msgid "Operations"
 msgstr "عملکردها"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "عملگر"
 
@@ -13285,7 +13051,7 @@ msgstr ""
 msgid "Other parameters"
 msgstr "پارامترهای دیگر"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "دیگران"
@@ -13299,7 +13065,7 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13328,7 +13094,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13517,7 +13283,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13562,7 +13328,7 @@ msgstr ""
 msgid "PSK identity"
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13585,16 +13351,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "پارامتر"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr ""
@@ -13624,7 +13390,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13641,7 +13407,7 @@ msgstr "هشدارهای والد"
 msgid "Parent web scenarios"
 msgstr ""
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13653,11 +13419,6 @@ msgstr ""
 msgid "Parse"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr ""
@@ -13718,7 +13479,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr ""
 
@@ -13728,15 +13489,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13782,12 +13543,11 @@ msgstr ""
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "دوره"
 
@@ -13876,7 +13636,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "لطفاً دو عنصر انتخاب کنید"
 
@@ -13916,7 +13676,7 @@ msgstr "قرار گرفتن در فیلد هاست"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14005,7 +13765,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14136,7 +13896,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "نمایش مشکل"
 
@@ -14149,21 +13909,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14177,9 +13933,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "مشکل"
 
@@ -14213,7 +13969,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr ""
 
@@ -14234,13 +13990,13 @@ msgstr ""
 msgid "Proxies"
 msgstr "پروکسی ها"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14248,7 +14004,7 @@ msgstr "پروکسی ها"
 msgid "Proxy"
 msgstr "پروکسی"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14258,12 +14014,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
@@ -14355,7 +14111,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14432,10 +14188,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "وقادیر دریافت شده"
@@ -14517,7 +14269,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14535,13 +14287,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "عبارت منظم"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14573,7 +14325,7 @@ msgstr "عبارات منظم"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14605,8 +14357,6 @@ msgstr "فرمان راه دور"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14627,7 +14377,9 @@ msgstr "فرمان راه دور"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14640,7 +14392,7 @@ msgstr "فرمان راه دور"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14717,8 +14469,8 @@ msgstr "فرمان راه دور"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "حذف"
 
@@ -14758,7 +14510,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14800,7 +14552,7 @@ msgid "Replace dependencies"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14855,7 +14607,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -14897,8 +14649,8 @@ msgstr "کدهای وضعیت مورد نیاز"
 msgid "Required string"
 msgstr "رشته مورد نیاز"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "بازنشانی"
 
@@ -14931,7 +14683,7 @@ msgstr "بازنشاندن تصدیق"
 msgid "Reset defaults"
 msgstr "بازنشانی پیش‌فرضها"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "رفع شد"
 
@@ -14997,7 +14749,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "نتیجه"
@@ -15184,12 +14936,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr ""
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15200,8 +14952,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "سطح سرویس"
 
@@ -15238,7 +14990,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15334,12 +15086,12 @@ msgstr ""
 msgid "SQL query"
 msgstr ""
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr ""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
@@ -15402,7 +15154,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr ""
 
@@ -15414,7 +15166,7 @@ msgstr ""
 msgid "Sat"
 msgstr "شنبه"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "شنبه"
 
@@ -15456,7 +15208,7 @@ msgstr "زمان‌بندی"
 msgid "Scheduled check"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15520,7 +15272,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15533,8 +15285,7 @@ msgstr ""
 msgid "Script"
 msgstr "اسکریپت"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
@@ -15565,12 +15316,6 @@ msgstr "نام اسکریپت"
 msgid "Script parameters"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr ""
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr ""
@@ -15583,7 +15328,7 @@ msgstr ""
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "اسکریپت ها"
 
@@ -15653,8 +15398,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15662,7 +15407,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "انتخاب"
 
@@ -15698,19 +15443,19 @@ msgstr "عناصر انتخاب شده"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr ""
 
@@ -15735,7 +15480,7 @@ msgstr "ارسال فقط به"
 msgid "Send to"
 msgstr "ارسال به"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr ""
 
@@ -15768,7 +15513,7 @@ msgstr "جداشده"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "سپتامبر"
 
@@ -15799,28 +15544,28 @@ msgstr ""
 msgid "Server time"
 msgstr "زمان سرور"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "سرویس"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15830,7 +15575,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr ""
 
@@ -15861,16 +15606,16 @@ msgstr "پرت سرویس"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -15878,11 +15623,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "مدت سرویس"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "نوع سرویس"
 
@@ -15891,30 +15636,29 @@ msgstr "نوع سرویس"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "سرویس ها "
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -15922,7 +15666,7 @@ msgstr ""
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -15952,7 +15696,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -15981,7 +15725,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -15990,7 +15734,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16046,7 +15790,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr ""
 
@@ -16188,7 +15932,7 @@ msgstr ""
 msgid "Show working time"
 msgstr "نمایش ساعت کاری"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "نمایش"
 
@@ -16297,7 +16041,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "بعدا"
 
@@ -16343,7 +16087,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "مرتب سازی(0->999)"
 
@@ -16417,7 +16161,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16520,15 +16264,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "وضعیت"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "کد وضعیت"
@@ -16558,7 +16306,7 @@ msgstr "فقط وضعیت"
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16606,7 +16354,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16671,7 +16419,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "زیر نقشه"
 
@@ -16687,7 +16435,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "رسیدگی موفق"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16700,7 +16448,7 @@ msgstr ""
 msgid "Sun"
 msgstr "یکشنبه"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "یکشنبه"
 
@@ -16792,12 +16540,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16824,17 +16572,17 @@ msgstr "درست"
 msgid "Table \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr ""
@@ -16890,7 +16638,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -16950,7 +16698,7 @@ msgstr "نوع هدف"
 msgid "Telnet"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -16971,7 +16719,7 @@ msgstr "قالب"
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -16995,7 +16743,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17055,7 +16803,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17227,13 +16975,13 @@ msgstr ""
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17297,7 +17045,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "این ماه"
 
@@ -17305,7 +17053,7 @@ msgstr "این ماه"
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "این هفته"
 
@@ -17313,7 +17061,7 @@ msgstr "این هفته"
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "امسال"
 
@@ -17333,7 +17081,7 @@ msgstr ""
 msgid "Thu"
 msgstr "پنجشنبه"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "پنجشنبه"
 
@@ -17350,7 +17098,7 @@ msgstr "تا"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17383,7 +17131,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "دوره زمانی"
 
@@ -17435,12 +17183,11 @@ msgstr "مهر زمان"
 msgid "To"
 msgstr "به"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "امروز"
 
@@ -17555,7 +17302,7 @@ msgstr ""
 msgid "Trends"
 msgstr "روندها"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17563,7 +17310,7 @@ msgstr "روندها"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "هشدار"
 
@@ -17661,7 +17408,7 @@ msgstr "نام هشدار"
 msgid "Trigger overview"
 msgstr "نمای کلی هشدارها"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17733,11 +17480,11 @@ msgstr ""
 msgid "Trigger severity"
 msgstr "جدیت هشدار"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17754,7 +17501,7 @@ msgstr ""
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17789,7 +17536,7 @@ msgstr ""
 msgid "Tue"
 msgstr "سه شنبه"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "سه شنبه"
 
@@ -17802,7 +17549,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17818,19 +17565,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -17882,7 +17629,7 @@ msgstr "نوع اطلاعات"
 msgid "Types"
 msgstr "انواع"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -17903,7 +17650,7 @@ msgstr "ناشناخته"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "نشانی اینترنتی"
 
@@ -17949,12 +17696,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "نشانی های اینترنتی"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18039,12 +17786,12 @@ msgstr ""
 msgid "Unblock selected users?"
 msgstr ""
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18064,21 +17811,23 @@ msgstr "واحدها"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "ناشناخته"
@@ -18096,7 +17845,7 @@ msgid "Unknown error"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
@@ -18149,7 +17898,7 @@ msgstr "حذف پیوند از قالب"
 msgid "Unlink from templates"
 msgstr "حذف پیوند از قالب ها"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "وصل صدا"
 
@@ -18179,7 +17928,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -18189,7 +17938,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -18234,7 +17983,7 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18247,7 +17996,7 @@ msgstr ""
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18300,7 +18049,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18318,7 +18067,7 @@ msgstr "بارگذاری"
 msgid "Upper level maps"
 msgstr "نقشه های سطح بالاتر"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18353,7 +18102,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "استفاده شده در فعالیت"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18368,7 +18117,7 @@ msgstr "استفاده شده در فعالیت"
 msgid "User"
 msgstr "کار‌بر"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
@@ -18420,7 +18169,7 @@ msgstr ""
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
@@ -18439,7 +18188,7 @@ msgid "User deleted"
 msgid_plural "Users deleted"
 msgstr[0] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18449,27 +18198,27 @@ msgstr[0] ""
 msgid "User group"
 msgstr "گروه کابر"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
@@ -18501,8 +18250,8 @@ msgstr[0] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18546,14 +18295,14 @@ msgstr "گذرواژه کاربر"
 msgid "User profile"
 msgstr "پروفایل کاربر"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18620,7 +18369,7 @@ msgstr ""
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -18936,14 +18685,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -18953,7 +18702,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -18995,7 +18744,7 @@ msgstr ""
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr ""
@@ -19012,7 +18761,7 @@ msgstr ""
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "نگاشت مقدار"
 
@@ -19055,11 +18804,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr ""
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19106,7 +18856,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19193,7 +18943,7 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19210,7 +18960,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19219,7 +18969,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19235,7 +18985,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "وب"
 
@@ -19247,7 +18997,7 @@ msgstr "وب"
 msgid "Web monitoring"
 msgstr "مانیتورینگ وب"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr ""
 
@@ -19262,25 +19012,25 @@ msgstr ""
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr ""
 
@@ -19302,7 +19052,7 @@ msgstr ""
 msgid "Wed"
 msgstr "چهارشنبه"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "چهارشنبه"
 
@@ -19313,7 +19063,7 @@ msgstr "چهارشنبه"
 msgid "Weekly"
 msgstr "هفتگی"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19329,12 +19079,12 @@ msgstr ""
 msgid "When active"
 msgstr "وقتی فعال شد"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19529,6 +19279,10 @@ msgstr ""
 msgid "Y-m-d H:i:s"
 msgstr ""
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr ""
@@ -19590,7 +19344,7 @@ msgstr "سالانه"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19647,18 +19401,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19670,9 +19418,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
@@ -19788,24 +19533,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr ""
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19814,37 +19563,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr ""
@@ -19865,28 +19614,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr ""
@@ -19934,7 +19684,7 @@ msgstr "همه"
 msgid "all media"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -19942,42 +19692,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -19987,7 +19732,7 @@ msgid "an empty string is expected"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr ""
 
@@ -19995,11 +19740,15 @@ msgstr ""
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20160,14 +19909,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20197,19 +19940,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20229,14 +19964,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20244,7 +19979,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr ""
@@ -20257,7 +19992,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20291,7 +20026,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20309,7 +20044,8 @@ msgid "configure"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20338,7 +20074,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20400,7 +20136,7 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20422,13 +20158,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20454,7 +20190,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20491,6 +20228,10 @@ msgstr ""
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20537,7 +20278,7 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr ""
@@ -20578,6 +20319,11 @@ msgstr "نشان"
 msgid "image"
 msgstr "تصویر"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "در"
@@ -20618,15 +20364,19 @@ msgstr ""
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20654,7 +20404,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr ""
 
@@ -20683,27 +20433,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr ""
 
@@ -20731,7 +20481,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr ""
 
@@ -20817,12 +20567,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -20881,7 +20631,7 @@ msgstr ""
 msgid "max"
 msgstr "بیشترین"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -20921,7 +20671,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr ""
@@ -20948,8 +20698,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -20964,27 +20714,14 @@ msgstr ""
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr ""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21012,6 +20749,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21022,7 +20767,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr ""
 
@@ -21157,7 +20902,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21192,24 +20937,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21237,11 +20986,11 @@ msgstr ""
 msgid "regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21253,15 +21002,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21309,7 +21058,7 @@ msgstr ""
 msgid "short description"
 msgstr "شرح کوتاه"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21328,15 +21077,15 @@ msgstr "شرح کوتاه"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr ""
 
@@ -21352,31 +21101,31 @@ msgstr "نمایش نشان های نگاشت شده"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21384,11 +21133,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21404,8 +21153,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21416,7 +21165,7 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21425,13 +21174,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21440,20 +21193,20 @@ msgstr ""
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr ""
@@ -21485,39 +21238,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21531,7 +21284,7 @@ msgstr "هشدار"
 msgid "trigger does not allow manual closing"
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21543,26 +21296,26 @@ msgstr ""
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21570,11 +21323,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21591,10 +21344,10 @@ msgstr ""
 msgid "unexpected end of macro"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21604,11 +21357,12 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr ""
@@ -21634,8 +21388,8 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21660,6 +21414,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21675,7 +21433,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21695,11 +21453,11 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "مقدار"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21717,76 +21475,83 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr ""
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr ""
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21798,18 +21563,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21818,7 +21581,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21831,11 +21594,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21852,7 +21615,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr ""
diff --git a/ui/locale/fi/LC_MESSAGES/frontend.po b/ui/locale/fi/LC_MESSAGES/frontend.po
index f952966e24e..a948132cfa4 100644
--- a/ui/locale/fi/LC_MESSAGES/frontend.po
+++ b/ui/locale/fi/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2013-10-10 08:23+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -93,7 +93,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d vuorokausi"
 msgstr[1] "%1$d vuorokautta"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -178,7 +178,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -192,7 +192,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -225,14 +225,14 @@ msgstr[1] "%1$s yritystä jäljellä"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s sekuntti"
 msgstr[1] "%1$s sekunttia"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -252,13 +252,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -390,7 +390,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -451,10 +451,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "Ei käyttöoikeutta."
@@ -497,7 +493,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Kuittaa"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Kuittaa"
 
@@ -505,7 +501,7 @@ msgstr "Kuittaa"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Kuitattu"
@@ -518,7 +514,7 @@ msgstr "Kuitatut ONGELMA-tapahtumat"
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -545,9 +541,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -604,7 +600,7 @@ msgstr "Toiminto \"%1$s\" on jo olemassa."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Toiminnolle \"%1$s\" ei ole määritelty operaatioita."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -613,7 +609,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Toiminto lisätty"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -662,8 +658,8 @@ msgstr "Toiminto päivitetty"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Toiminnot"
@@ -730,7 +726,7 @@ msgstr "Aktiivinen asti"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -741,7 +737,7 @@ msgstr "Aktiivinen asti"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -764,9 +760,9 @@ msgstr "Aktiivinen asti"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -836,7 +832,7 @@ msgstr "Aktiivinen asti"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Lisää"
 
@@ -844,11 +840,11 @@ msgstr "Lisää"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr ""
 
@@ -856,7 +852,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -873,7 +869,7 @@ msgstr "Lisää kone"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr ""
 
@@ -895,7 +891,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -947,12 +943,12 @@ msgstr ""
 msgid "Add widget"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -962,7 +958,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -975,7 +971,7 @@ msgstr "Hallinta"
 msgid "Administration"
 msgstr "Hallinta"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -997,7 +993,7 @@ msgstr "Ikä vähemmän kuin"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1070,7 +1066,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Kaikki"
 
@@ -1088,7 +1084,7 @@ msgstr ""
 msgid "All hosts"
 msgstr "Kaikki isäntäkoneet"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Kaikilla linkeillä pitäisi olla \"Nimi\" tai \"URL\" määriteltynä"
 
@@ -1106,7 +1102,7 @@ msgstr ""
 msgid "All problems if tag values match"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1219,15 +1215,15 @@ msgstr "Sovelluksessa virhe."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Käytä"
 
@@ -1245,7 +1241,7 @@ msgstr "Lähestyy"
 msgid "Apr"
 msgstr "Huhti"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Huhtikuu"
 
@@ -1273,7 +1269,7 @@ msgstr "Alueen tyyppi"
 msgid "Arithmetic"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1320,7 +1316,7 @@ msgstr "klo (tunti:minuutti)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1329,7 +1325,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1341,6 +1337,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1352,7 +1353,7 @@ msgstr "Ainakin yksi ylläpitoikkuna täytyy olla luotuna."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1408,7 +1409,7 @@ msgstr ""
 msgid "Aug"
 msgstr "elo"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "elokuu"
 
@@ -1421,7 +1422,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1498,7 +1499,7 @@ msgstr ""
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1513,7 +1514,7 @@ msgstr "Automaattinen ikonien kartoitus"
 msgid "Automatic icon selection"
 msgstr "Automaattinen ikonien valinta"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1565,7 +1566,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1628,7 +1629,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Estetty"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr ""
 
@@ -1682,11 +1683,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Alareuna"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr ""
 
@@ -1712,7 +1713,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1757,8 +1758,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1767,7 +1768,7 @@ msgstr ""
 msgid "Calculated"
 msgstr ""
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1792,7 +1793,7 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1805,8 +1806,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr ""
 
@@ -1836,7 +1837,7 @@ msgstr ""
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1846,7 +1847,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1877,8 +1878,8 @@ msgid "Cannot add host prototype"
 msgstr ""
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr ""
 
@@ -1970,15 +1971,15 @@ msgstr ""
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1998,33 +1999,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr ""
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr ""
 
@@ -2051,7 +2048,7 @@ msgid_plural "Cannot copy graphs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] ""
@@ -2103,8 +2100,8 @@ msgstr ""
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2133,7 +2130,7 @@ msgstr ""
 msgid "Cannot delete action"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2199,7 +2196,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2210,11 +2207,11 @@ msgstr[1] ""
 msgid "Cannot delete host prototypes"
 msgstr ""
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr ""
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr ""
 
@@ -2239,7 +2236,7 @@ msgstr ""
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr ""
 
@@ -2270,7 +2267,7 @@ msgid_plural "Cannot delete proxies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2293,7 +2290,7 @@ msgid_plural "Cannot delete scripts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr ""
@@ -2308,8 +2305,8 @@ msgid_plural "Cannot delete services"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2338,7 +2335,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr ""
 
@@ -2391,7 +2388,7 @@ msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr ""
 
@@ -2426,7 +2423,7 @@ msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
@@ -2457,7 +2454,7 @@ msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -2504,7 +2501,7 @@ msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
@@ -2535,7 +2532,7 @@ msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
@@ -2549,7 +2546,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2583,8 +2580,8 @@ msgstr ""
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2682,24 +2679,20 @@ msgstr ""
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2712,7 +2705,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr ""
 
@@ -2726,7 +2719,7 @@ msgid "Cannot link template."
 msgstr ""
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2758,17 +2751,17 @@ msgstr ""
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr ""
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr ""
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr ""
@@ -2795,7 +2788,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr ""
 
@@ -2814,7 +2807,7 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2854,12 +2847,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2878,7 +2871,7 @@ msgid_plural "Cannot unblock users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
@@ -2891,7 +2884,7 @@ msgstr ""
 msgid "Cannot unlink template."
 msgstr ""
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2944,11 +2937,6 @@ msgstr ""
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr ""
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2958,8 +2946,9 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
@@ -3019,9 +3008,7 @@ msgstr ""
 msgid "Cannot update group"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
@@ -3044,13 +3031,13 @@ msgstr[1] ""
 msgid "Cannot update hosts"
 msgstr ""
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr ""
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr ""
 
@@ -3104,12 +3091,12 @@ msgstr ""
 msgid "Cannot update proxy"
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3129,17 +3116,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr ""
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3214,7 +3201,7 @@ msgstr[1] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr ""
 
@@ -3314,8 +3301,8 @@ msgid "Character string not included"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3430,7 +3417,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr ""
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3451,7 +3438,7 @@ msgstr ""
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3472,11 +3459,11 @@ msgstr ""
 msgid "Clear when unlinking"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3491,7 +3478,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3506,7 +3493,7 @@ msgstr ""
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr ""
 
@@ -3517,8 +3504,8 @@ msgstr ""
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr ""
 
@@ -3529,13 +3516,13 @@ msgstr ""
 msgid "Close expression constructor"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
 
@@ -3548,8 +3535,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr ""
 
@@ -3566,7 +3553,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3632,7 +3619,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3643,17 +3630,12 @@ msgstr ""
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3663,17 +3645,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3689,7 +3666,7 @@ msgstr ""
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr ""
 
@@ -3752,7 +3729,7 @@ msgstr ""
 msgid "Configuration of housekeeping"
 msgstr ""
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr ""
@@ -3859,7 +3836,7 @@ msgstr ""
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr ""
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3952,7 +3929,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4012,7 +3989,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -4051,8 +4028,8 @@ msgstr ""
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr ""
 
@@ -4061,12 +4038,11 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr ""
@@ -4093,16 +4069,6 @@ msgid_plural "Correlations enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr ""
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr ""
@@ -4111,14 +4077,10 @@ msgstr ""
 msgid "Correlation updated"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr ""
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr ""
 
@@ -4182,11 +4144,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr ""
 
@@ -4303,7 +4265,7 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr ""
 
@@ -4327,7 +4289,7 @@ msgstr ""
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr ""
 
@@ -4490,7 +4452,7 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr ""
@@ -4502,11 +4464,11 @@ msgstr ""
 msgid "Daily"
 msgstr ""
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4527,8 +4489,8 @@ msgstr ""
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr ""
 
@@ -4551,9 +4513,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr ""
 
@@ -4577,7 +4539,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4605,7 +4567,7 @@ msgstr ""
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4747,7 +4709,7 @@ msgstr ""
 msgid "Days"
 msgstr ""
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr ""
 
@@ -4761,26 +4723,26 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr ""
 
@@ -4873,7 +4835,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4897,8 +4859,8 @@ msgstr ""
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr ""
 
@@ -4923,11 +4885,11 @@ msgstr ""
 msgid "Delete current action?"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4971,7 +4933,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -5027,7 +4989,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr ""
 
@@ -5132,7 +5094,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5176,7 +5138,7 @@ msgstr ""
 msgid "Delete web scenario?"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5221,7 +5183,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr ""
 
@@ -5229,7 +5191,7 @@ msgstr ""
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5239,7 +5201,7 @@ msgstr ""
 msgid "Deployment status"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5272,7 +5234,7 @@ msgid "Description"
 msgstr ""
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5438,10 +5400,10 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5524,7 +5486,7 @@ msgid "Discovery by proxy"
 msgstr ""
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr ""
 
@@ -5536,7 +5498,7 @@ msgstr ""
 msgid "Discovery list"
 msgstr ""
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr ""
 
@@ -5568,7 +5530,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5576,12 +5538,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
@@ -5594,7 +5556,7 @@ msgstr ""
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5635,7 +5597,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5646,7 +5608,7 @@ msgstr ""
 msgid "Discovery rules deleted"
 msgstr ""
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr ""
@@ -5683,10 +5645,11 @@ msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
@@ -5696,7 +5659,7 @@ msgstr ""
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5718,7 +5681,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
@@ -5774,7 +5737,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5782,7 +5745,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr ""
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5801,18 +5764,6 @@ msgstr ""
 msgid "Draw style"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5825,11 +5776,6 @@ msgstr ""
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5881,7 +5827,7 @@ msgstr ""
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
@@ -5890,11 +5836,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5908,8 +5854,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr ""
 
@@ -5925,11 +5871,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr ""
 
@@ -5989,21 +5935,17 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
@@ -6019,25 +5961,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6047,14 +5983,6 @@ msgstr ""
 msgid "Empty map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr ""
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6220,7 +6148,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6231,7 +6159,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6274,7 +6202,7 @@ msgid "English (en_US)"
 msgstr ""
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6290,7 +6218,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6309,12 +6237,12 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6341,7 +6269,7 @@ msgstr ""
 msgid "Event acknowledged"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6349,7 +6277,7 @@ msgid "Event correlation"
 msgstr ""
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr ""
@@ -6384,11 +6312,11 @@ msgstr ""
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6433,15 +6361,10 @@ msgstr ""
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6479,7 +6402,7 @@ msgstr ""
 msgid "Executed script"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr ""
 
@@ -6495,8 +6418,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr ""
 
@@ -6617,7 +6540,7 @@ msgstr ""
 msgid "External check"
 msgstr ""
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
@@ -6644,8 +6567,8 @@ msgstr ""
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6656,26 +6579,26 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6683,7 +6606,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6707,7 +6630,7 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr ""
 
@@ -6729,10 +6652,9 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6743,13 +6665,6 @@ msgstr ""
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6768,11 +6683,6 @@ msgstr ""
 msgid "Field \"%1$s\" is not string."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6787,10 +6697,6 @@ msgstr ""
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr ""
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6855,7 +6761,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6880,7 +6787,7 @@ msgstr ""
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6932,7 +6839,7 @@ msgstr ""
 msgid "Fixed"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6983,12 +6890,12 @@ msgstr ""
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7001,7 +6908,7 @@ msgstr ""
 msgid "Fri"
 msgstr ""
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr ""
 
@@ -7112,7 +7019,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr ""
@@ -7126,7 +7033,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr ""
 
@@ -7164,7 +7071,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr ""
 
@@ -7172,7 +7079,7 @@ msgstr ""
 msgid "Gradient line"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7232,7 +7139,7 @@ msgstr[1] ""
 msgid "Graph deleted"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7269,8 +7176,8 @@ msgstr ""
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7304,8 +7211,8 @@ msgstr ""
 msgid "Graph updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7336,7 +7243,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr ""
 
@@ -7357,12 +7264,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr ""
@@ -7536,11 +7443,11 @@ msgstr ""
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr ""
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr ""
 
@@ -7567,11 +7474,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7592,7 +7499,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr ""
 
@@ -7600,11 +7507,15 @@ msgstr ""
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr ""
 
@@ -7647,7 +7558,7 @@ msgstr ""
 msgid "Horizontal align"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7676,7 +7587,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7690,7 +7601,7 @@ msgstr[1] ""
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7698,7 +7609,7 @@ msgstr ""
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7750,7 +7661,7 @@ msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7764,22 +7675,22 @@ msgstr[1] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7792,10 +7703,10 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7811,8 +7722,8 @@ msgstr ""
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7886,7 +7797,7 @@ msgstr ""
 msgid "Host networks"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7966,7 +7877,7 @@ msgstr ""
 msgid "Host updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr ""
@@ -7986,7 +7897,7 @@ msgstr ""
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -7999,7 +7910,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8047,7 +7958,7 @@ msgstr ""
 msgid "Hours"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8087,7 +7998,7 @@ msgstr ""
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr ""
@@ -8112,7 +8023,7 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8169,12 +8080,12 @@ msgstr ""
 msgid "Icon map"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
@@ -8187,18 +8098,18 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
@@ -8299,23 +8210,20 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -8324,7 +8232,7 @@ msgstr ""
 msgid "Image added"
 msgstr ""
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr ""
 
@@ -8332,18 +8240,12 @@ msgstr ""
 msgid "Image label type"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr ""
 
@@ -8438,7 +8340,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8449,13 +8351,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr ""
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8499,7 +8401,7 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8667,24 +8569,6 @@ msgstr ""
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8739,8 +8623,6 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
@@ -8766,31 +8648,22 @@ msgstr ""
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8819,7 +8692,7 @@ msgstr ""
 msgid "Incorrect eventsource value."
 msgstr ""
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
@@ -8844,22 +8717,17 @@ msgstr ""
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8870,7 +8738,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
@@ -8898,8 +8766,6 @@ msgstr ""
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8961,10 +8827,6 @@ msgstr ""
 msgid "Incorrect map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr ""
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9022,13 +8884,13 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr ""
 
@@ -9081,12 +8943,7 @@ msgstr ""
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
@@ -9132,13 +8989,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9155,60 +9012,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr ""
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr ""
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9263,14 +9090,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9380,25 +9201,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9409,7 +9212,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9455,16 +9258,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9473,7 +9277,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9561,12 +9365,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr ""
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr ""
 
@@ -9670,7 +9474,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr ""
 
@@ -9678,7 +9482,7 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9689,7 +9493,7 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9712,7 +9516,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9744,7 +9548,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
@@ -9769,27 +9573,29 @@ msgstr ""
 msgid "Invalid method parameters."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9815,17 +9621,17 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9833,8 +9639,8 @@ msgstr ""
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9848,106 +9654,116 @@ msgstr ""
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9989,43 +9805,38 @@ msgstr ""
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10046,7 +9857,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr ""
 
@@ -10087,7 +9898,7 @@ msgstr ""
 msgid "Italian (it_IT)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10119,7 +9930,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10133,7 +9944,7 @@ msgstr ""
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] ""
@@ -10147,13 +9958,13 @@ msgstr ""
 msgid "Item deleted"
 msgstr ""
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -10163,7 +9974,7 @@ msgstr[1] ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr ""
 
@@ -10172,7 +9983,7 @@ msgstr ""
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10209,8 +10020,8 @@ msgid_plural "Item prototypes updated"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10236,7 +10047,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10268,8 +10079,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10320,11 +10131,11 @@ msgstr ""
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr ""
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr ""
 
@@ -10342,7 +10153,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10367,6 +10178,10 @@ msgstr ""
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10379,7 +10194,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10397,7 +10212,7 @@ msgstr ""
 msgid "Jan"
 msgstr ""
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr ""
 
@@ -10419,7 +10234,7 @@ msgstr ""
 msgid "Jul"
 msgstr ""
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr ""
 
@@ -10427,7 +10242,7 @@ msgstr ""
 msgid "Jun"
 msgstr ""
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr ""
 
@@ -10583,22 +10398,6 @@ msgid_plural "Last %1$d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10610,11 +10409,11 @@ msgstr ""
 msgid "Last check"
 msgstr ""
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr ""
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr ""
 
@@ -10652,11 +10451,11 @@ msgstr ""
 msgid "Last value"
 msgstr ""
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr ""
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10665,11 +10464,11 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr ""
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr ""
 
@@ -10710,7 +10509,7 @@ msgstr ""
 msgid "Left trim"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -10991,7 +10790,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
@@ -11013,7 +10812,7 @@ msgstr ""
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11024,12 +10823,12 @@ msgid "Macro"
 msgstr ""
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
@@ -11057,7 +10856,7 @@ msgstr ""
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -11065,7 +10864,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11148,7 +10947,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11170,13 +10969,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr ""
 
@@ -11245,7 +11044,7 @@ msgstr ""
 msgid "Map update failed."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11277,7 +11076,7 @@ msgstr ""
 msgid "Mar"
 msgstr ""
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr ""
 
@@ -11381,7 +11180,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11395,7 +11194,7 @@ msgstr[1] ""
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr ""
 
@@ -11410,15 +11209,12 @@ msgstr ""
 msgid "Media"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr ""
@@ -11445,11 +11241,6 @@ msgid_plural "Media types enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr ""
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11479,7 +11270,7 @@ msgstr ""
 msgid "Media types"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11567,7 +11358,7 @@ msgstr ""
 msgid "Method not found."
 msgstr ""
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11629,7 +11420,7 @@ msgid "Minimum severity"
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11688,7 +11479,7 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11726,7 +11517,7 @@ msgstr[1] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11752,7 +11543,7 @@ msgstr ""
 msgid "Mon"
 msgstr ""
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr ""
 
@@ -11792,11 +11583,11 @@ msgstr ""
 msgid "Monthly"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11820,7 +11611,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr ""
 
@@ -11833,7 +11624,7 @@ msgstr ""
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr ""
 
@@ -11962,11 +11753,11 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12124,19 +11915,21 @@ msgstr ""
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr ""
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr ""
 
@@ -12148,7 +11941,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12156,7 +11949,7 @@ msgstr ""
 msgid "New service time"
 msgstr ""
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12165,7 +11958,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12183,7 +11976,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12212,30 +12005,6 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr ""
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12251,11 +12020,6 @@ msgstr ""
 msgid "No \"%1$s\" given for map."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12263,7 +12027,7 @@ msgstr ""
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -12273,7 +12037,7 @@ msgstr ""
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -12290,11 +12054,6 @@ msgstr ""
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr ""
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12325,7 +12084,7 @@ msgstr ""
 msgid "No details"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr ""
 
@@ -12361,7 +12120,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr ""
 
@@ -12391,7 +12150,7 @@ msgstr ""
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr ""
 
@@ -12425,7 +12184,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr ""
 
@@ -12433,17 +12192,46 @@ msgstr ""
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12451,7 +12239,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12479,19 +12267,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12506,16 +12293,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12535,12 +12328,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12561,27 +12352,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12598,14 +12391,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12614,7 +12407,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
@@ -12634,7 +12427,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr ""
 
@@ -12646,7 +12439,7 @@ msgstr ""
 msgid "No target selected"
 msgstr ""
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr ""
 
@@ -12663,7 +12456,7 @@ msgstr ""
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr ""
 
@@ -12733,15 +12526,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12773,7 +12566,7 @@ msgstr ""
 msgid "Not supported"
 msgstr ""
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr ""
@@ -12804,7 +12597,7 @@ msgstr ""
 msgid "Nov"
 msgstr ""
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr ""
 
@@ -12991,8 +12784,8 @@ msgstr ""
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13052,13 +12845,13 @@ msgstr ""
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr ""
 
@@ -13066,30 +12859,31 @@ msgstr ""
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr ""
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr ""
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr ""
 
@@ -13105,35 +12899,15 @@ msgstr ""
 msgid "One"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr ""
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr ""
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13182,10 +12956,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr ""
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13194,15 +12964,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr ""
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr ""
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr ""
 
@@ -13211,7 +12977,7 @@ msgstr ""
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13220,11 +12986,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr ""
 
@@ -13246,7 +13012,7 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13255,33 +13021,33 @@ msgstr ""
 msgid "Operations"
 msgstr ""
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr ""
 
@@ -13390,7 +13156,7 @@ msgstr ""
 msgid "Other parameters"
 msgstr ""
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr ""
@@ -13404,7 +13170,7 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13433,7 +13199,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13622,7 +13388,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13667,7 +13433,7 @@ msgstr ""
 msgid "PSK identity"
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13690,16 +13456,16 @@ msgstr ""
 msgid "Parameter"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr ""
@@ -13729,7 +13495,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13746,7 +13512,7 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13758,11 +13524,6 @@ msgstr ""
 msgid "Parse"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr ""
@@ -13823,7 +13584,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr ""
 
@@ -13833,15 +13594,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13887,12 +13648,11 @@ msgstr ""
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr ""
 
@@ -13981,7 +13741,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr ""
 
@@ -14021,7 +13781,7 @@ msgstr ""
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14110,7 +13870,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14241,7 +14001,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr ""
 
@@ -14254,21 +14014,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14282,9 +14038,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr ""
 
@@ -14318,7 +14074,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr ""
 
@@ -14339,13 +14095,13 @@ msgstr ""
 msgid "Proxies"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14353,7 +14109,7 @@ msgstr ""
 msgid "Proxy"
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14363,12 +14119,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
@@ -14461,7 +14217,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14538,10 +14294,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr ""
@@ -14623,7 +14375,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14641,13 +14393,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr ""
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14680,7 +14432,7 @@ msgstr ""
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14712,8 +14464,6 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14734,7 +14484,9 @@ msgstr ""
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14747,7 +14499,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14824,8 +14576,8 @@ msgstr ""
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr ""
 
@@ -14865,7 +14617,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14907,7 +14659,7 @@ msgid "Replace dependencies"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14962,7 +14714,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -15004,8 +14756,8 @@ msgstr ""
 msgid "Required string"
 msgstr ""
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr ""
 
@@ -15038,7 +14790,7 @@ msgstr ""
 msgid "Reset defaults"
 msgstr ""
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr ""
 
@@ -15104,7 +14856,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr ""
@@ -15291,12 +15043,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr ""
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15307,8 +15059,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr ""
 
@@ -15345,7 +15097,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15441,12 +15193,12 @@ msgstr ""
 msgid "SQL query"
 msgstr ""
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr ""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
@@ -15509,7 +15261,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr ""
 
@@ -15521,7 +15273,7 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr ""
 
@@ -15563,7 +15315,7 @@ msgstr ""
 msgid "Scheduled check"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15630,7 +15382,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15643,8 +15395,7 @@ msgstr ""
 msgid "Script"
 msgstr ""
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
@@ -15676,12 +15427,6 @@ msgstr ""
 msgid "Script parameters"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr ""
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr ""
@@ -15694,7 +15439,7 @@ msgstr ""
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr ""
 
@@ -15764,8 +15509,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15773,7 +15518,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr ""
 
@@ -15809,19 +15554,19 @@ msgstr ""
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr ""
 
@@ -15846,7 +15591,7 @@ msgstr ""
 msgid "Send to"
 msgstr ""
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr ""
 
@@ -15879,7 +15624,7 @@ msgstr ""
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr ""
 
@@ -15910,28 +15655,28 @@ msgstr ""
 msgid "Server time"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr ""
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15941,7 +15686,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr ""
 
@@ -15973,16 +15718,16 @@ msgstr ""
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -15990,11 +15735,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr ""
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr ""
 
@@ -16003,30 +15748,29 @@ msgstr ""
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -16034,7 +15778,7 @@ msgstr ""
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16064,7 +15808,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16093,7 +15837,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16102,7 +15846,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16158,7 +15902,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr ""
 
@@ -16300,7 +16044,7 @@ msgstr ""
 msgid "Show working time"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr ""
 
@@ -16409,7 +16153,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr ""
 
@@ -16455,7 +16199,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr ""
 
@@ -16529,7 +16273,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16632,15 +16376,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr ""
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr ""
@@ -16670,7 +16418,7 @@ msgstr ""
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16718,7 +16466,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16783,7 +16531,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr ""
 
@@ -16799,7 +16547,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr ""
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16812,7 +16560,7 @@ msgstr ""
 msgid "Sun"
 msgstr ""
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr ""
 
@@ -16904,12 +16652,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16936,17 +16684,17 @@ msgstr ""
 msgid "Table \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr ""
@@ -17002,7 +16750,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17062,7 +16810,7 @@ msgstr ""
 msgid "Telnet"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17083,7 +16831,7 @@ msgstr ""
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17107,7 +16855,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17167,7 +16915,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17339,14 +17087,14 @@ msgstr ""
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17411,7 +17159,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr ""
 
@@ -17419,7 +17167,7 @@ msgstr ""
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr ""
 
@@ -17427,7 +17175,7 @@ msgstr ""
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr ""
 
@@ -17447,7 +17195,7 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr ""
 
@@ -17464,7 +17212,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17497,7 +17245,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr ""
 
@@ -17549,12 +17297,11 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr ""
 
@@ -17669,7 +17416,7 @@ msgstr ""
 msgid "Trends"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17677,7 +17424,7 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr ""
 
@@ -17778,7 +17525,7 @@ msgstr ""
 msgid "Trigger overview"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17851,11 +17598,11 @@ msgstr ""
 msgid "Trigger severity"
 msgstr ""
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17872,7 +17619,7 @@ msgstr ""
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17907,7 +17654,7 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr ""
 
@@ -17920,7 +17667,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17936,19 +17683,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18000,7 +17747,7 @@ msgstr ""
 msgid "Types"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18021,7 +17768,7 @@ msgstr ""
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr ""
 
@@ -18067,12 +17814,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18157,12 +17904,12 @@ msgstr ""
 msgid "Unblock selected users?"
 msgstr ""
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18182,21 +17929,23 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr ""
@@ -18214,7 +17963,7 @@ msgid "Unknown error"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
@@ -18267,7 +18016,7 @@ msgstr ""
 msgid "Unlink from templates"
 msgstr ""
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr ""
 
@@ -18298,7 +18047,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -18308,7 +18057,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -18353,7 +18102,7 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18366,7 +18115,7 @@ msgstr ""
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18419,7 +18168,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18437,7 +18186,7 @@ msgstr ""
 msgid "Upper level maps"
 msgstr ""
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18472,7 +18221,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18487,7 +18236,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
@@ -18539,7 +18288,7 @@ msgstr ""
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
@@ -18559,7 +18308,7 @@ msgid_plural "Users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18569,27 +18318,27 @@ msgstr[1] ""
 msgid "User group"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
@@ -18623,8 +18372,8 @@ msgstr[1] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18668,14 +18417,14 @@ msgstr ""
 msgid "User profile"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18744,7 +18493,7 @@ msgstr ""
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -19060,14 +18809,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19077,7 +18826,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19119,7 +18868,7 @@ msgstr ""
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr ""
@@ -19136,7 +18885,7 @@ msgstr ""
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr ""
 
@@ -19179,11 +18928,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr ""
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19230,7 +18980,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19317,7 +19067,7 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19334,7 +19084,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19343,7 +19093,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19359,7 +19109,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr ""
 
@@ -19371,7 +19121,7 @@ msgstr ""
 msgid "Web monitoring"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr ""
 
@@ -19386,27 +19136,27 @@ msgstr ""
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr ""
 
@@ -19428,7 +19178,7 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr ""
 
@@ -19439,7 +19189,7 @@ msgstr ""
 msgid "Weekly"
 msgstr ""
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19455,12 +19205,12 @@ msgstr ""
 msgid "When active"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19655,6 +19405,10 @@ msgstr ""
 msgid "Y-m-d H:i:s"
 msgstr ""
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr ""
@@ -19716,7 +19470,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19773,18 +19527,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19796,9 +19544,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
@@ -19914,24 +19659,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr ""
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19940,37 +19689,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr ""
@@ -19991,28 +19740,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr ""
@@ -20060,7 +19810,7 @@ msgstr ""
 msgid "all media"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20068,42 +19818,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20113,7 +19858,7 @@ msgid "an empty string is expected"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr ""
 
@@ -20121,11 +19866,15 @@ msgstr ""
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20286,14 +20035,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20323,19 +20066,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20355,14 +20090,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20370,7 +20105,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr ""
@@ -20383,7 +20118,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20417,7 +20152,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20435,7 +20170,8 @@ msgid "configure"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20464,7 +20200,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20526,7 +20262,7 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20548,13 +20284,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20580,7 +20316,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20617,6 +20354,10 @@ msgstr ""
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20663,7 +20404,7 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr ""
@@ -20704,6 +20445,11 @@ msgstr ""
 msgid "image"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr ""
@@ -20744,15 +20490,19 @@ msgstr ""
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20780,7 +20530,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr ""
 
@@ -20809,27 +20559,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr ""
 
@@ -20857,7 +20607,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr ""
 
@@ -20943,12 +20693,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -21007,7 +20757,7 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21047,7 +20797,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr ""
@@ -21074,8 +20824,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21090,27 +20840,14 @@ msgstr ""
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr ""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21138,6 +20875,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21148,7 +20893,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr ""
 
@@ -21283,7 +21028,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21318,24 +21063,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21363,11 +21112,11 @@ msgstr ""
 msgid "regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21379,15 +21128,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21435,7 +21184,7 @@ msgstr ""
 msgid "short description"
 msgstr "lyhyt kuvaus"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21454,15 +21203,15 @@ msgstr "lyhyt kuvaus"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr ""
 
@@ -21478,31 +21227,31 @@ msgstr "näytä ikoni"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21510,11 +21259,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21530,8 +21279,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21542,7 +21291,7 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21551,13 +21300,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21566,20 +21319,20 @@ msgstr ""
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr ""
@@ -21611,39 +21364,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21657,7 +21410,7 @@ msgstr ""
 msgid "trigger does not allow manual closing"
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21669,26 +21422,26 @@ msgstr ""
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21696,11 +21449,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21717,10 +21470,10 @@ msgstr ""
 msgid "unexpected end of macro"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21730,11 +21483,12 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr ""
@@ -21760,8 +21514,8 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21786,6 +21540,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21801,7 +21559,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21821,11 +21579,11 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21843,76 +21601,85 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr ""
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr ""
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21924,18 +21691,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21944,7 +21709,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21957,11 +21722,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21978,7 +21743,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr ""
diff --git a/ui/locale/fr/LC_MESSAGES/frontend.po b/ui/locale/fr/LC_MESSAGES/frontend.po
index 076314ba597..f60def6719d 100644
--- a/ui/locale/fr/LC_MESSAGES/frontend.po
+++ b/ui/locale/fr/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2018-01-15 09:21+0300\n"
 "Last-Translator: Christophe <ctr@pmspos.fr>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d jour"
 msgstr[1] "%1$d jours"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] "%1$s messages"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "%1$s de %2$s élément en défaut"
 msgstr[1] "%1$s de %2$s éléments en défaut"
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -226,14 +226,14 @@ msgstr[1] "%1$s essais restants"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s seconde"
 msgstr[1] "%1$s secondes"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "%1$s symboles restants"
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Séverité, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, lecture seule"
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -389,7 +389,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -450,10 +450,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "Accès refusé"
@@ -496,7 +492,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Acquitté"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Acquittement"
 
@@ -504,7 +500,7 @@ msgstr "Acquittement"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Acquitté"
@@ -517,7 +513,7 @@ msgstr "Événements PROBLÈME acquittés"
 msgid "Acknowledged RESOLVED events"
 msgstr "Événements RÉSOLUS acquittés"
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -544,9 +540,9 @@ msgstr "Événements RÉSOLUS acquittés"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -603,7 +599,7 @@ msgstr "Action \"%1$s\" déjà existante."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Aucune opération définie pour l'action \"%1$s\"."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -612,7 +608,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Action ajoutée"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -661,8 +657,8 @@ msgstr "Action mise à jour"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Actions"
@@ -729,7 +725,7 @@ msgstr "Actif jusqu'à"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -740,7 +736,7 @@ msgstr "Actif jusqu'à"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -763,9 +759,9 @@ msgstr "Actif jusqu'à"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -835,7 +831,7 @@ msgstr "Actif jusqu'à"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Ajouter"
 
@@ -843,11 +839,11 @@ msgstr "Ajouter"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "Ajouter un nouveau widget"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "Ajouter un élément enfant"
 
@@ -855,7 +851,7 @@ msgstr "Ajouter un élément enfant"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -872,7 +868,7 @@ msgstr "Ajouter hôte"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "Ajouter plusieurs cartes"
 
@@ -894,7 +890,7 @@ msgstr "Ajouter une nouvelle surcharge"
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -946,12 +942,12 @@ msgstr ""
 msgid "Add widget"
 msgstr "Ajouter un widget"
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -961,7 +957,7 @@ msgstr "Ajouté, %1$s"
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -974,7 +970,7 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administration"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -996,7 +992,7 @@ msgstr "Âge inférieur à"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1068,7 +1064,7 @@ msgstr "Aligner les éléments de carte"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Tous"
 
@@ -1086,7 +1082,7 @@ msgstr "Tous les groupes"
 msgid "All hosts"
 msgstr "Tous les hôtes"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Tous liens doivent avoir \"Nom\" et \"URL\" spécifiés"
 
@@ -1104,7 +1100,7 @@ msgstr "Tous les problèmes"
 msgid "All problems if tag values match"
 msgstr "Tous les problèmes si les valeurs de tag correspondent"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1217,15 +1213,15 @@ msgstr "Erreur d'application."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -1243,7 +1239,7 @@ msgstr "Proche de"
 msgid "Apr"
 msgstr "Avr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Avril"
 
@@ -1271,7 +1267,7 @@ msgstr "Type de zone"
 msgid "Arithmetic"
 msgstr "Arithmétique"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1320,7 +1316,7 @@ msgstr "À (heure:minute)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1329,7 +1325,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1341,6 +1337,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr "Au moins un groupe hôte ou un hôte doit être sélectionné."
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1352,7 +1353,7 @@ msgstr "Au moins une période de maintenance doit être créée."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1408,7 +1409,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Aoû"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Août"
 
@@ -1421,7 +1422,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1498,7 +1499,7 @@ msgstr "Auto-déconnexion"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1513,7 +1514,7 @@ msgstr "Correspondance d'icône automatique"
 msgid "Automatic icon selection"
 msgstr "Sélection automatique d'icône"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1565,7 +1566,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr "Axes"
 
@@ -1628,7 +1629,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Bloqué"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "Bleu"
 
@@ -1682,11 +1683,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Bas"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "Amener vers l'avant"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "Amener à l'avant"
 
@@ -1712,7 +1713,7 @@ msgstr "CERT"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1757,8 +1758,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1767,7 +1768,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Calculé"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr "Calendrier"
 
@@ -1792,7 +1793,7 @@ msgstr "Rappel"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1805,8 +1806,8 @@ msgstr "Rappel"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -1836,7 +1837,7 @@ msgstr "Impossible d'ajouter l'action"
 msgid "Cannot add correlation"
 msgstr "Impossible d'ajouter la corrélation"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1846,7 +1847,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Impossible d'ajouter une dépendance d'un hôte à un modèle."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1877,8 +1878,8 @@ msgid "Cannot add host prototype"
 msgstr "Impossible d'ajouter un prototype d'hôte"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Impossible d'ajouter l'image"
 
@@ -1970,15 +1971,15 @@ msgstr "Impossible d'ajouter l'utilisateur"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Impossible d'ajouter le scénario web"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1998,33 +1999,29 @@ msgstr "Impossible d'établir une liaison avec le serveur LDAP."
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Impossible de nettoyer l'historique"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Impossible de cloner les prototypes de graphiques."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "Impossible de cloner des prototypes d'hôtes."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Impossible de cloner les prototypes d'éléments."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Impossible de cloner les prototypes de déclencheurs."
 
@@ -2051,7 +2048,7 @@ msgid_plural "Cannot copy graphs"
 msgstr[0] "Impossible de copier le graphique"
 msgstr[1] "Impossible de copier les graphiques"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "Impossible de copier l'élément"
@@ -2103,8 +2100,8 @@ msgstr "Impossible de créer la correspondance d'icône"
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2133,7 +2130,7 @@ msgstr "Impossible de supprimer l'utilisateur interne Zabbix \"%1$s\", essayez d
 msgid "Cannot delete action"
 msgstr "Impossible de supprimer l'action"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2201,7 +2198,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con
 msgstr[0] "Impossible de supprimer l'hôte car la maintenance \"%1$s\" doit contenir au moins un hôte ou un groupe d'hôtes."
 msgstr[1] "Impossible de supprimer les hôtes sélectionnés car la maintenance \"%1$s\" doit contenir au moins un hôte ou un groupe d'hôtes."
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2212,11 +2209,11 @@ msgstr[1] "Impossible de supprimer les groupes d'hôtes sélectionnés car la ma
 msgid "Cannot delete host prototypes"
 msgstr "Impossible de supprimer des prototypes d'hôtes"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Impossible de supprimer la correspondance d'icône"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Impossible de supprimer l'image"
 
@@ -2241,7 +2238,7 @@ msgstr "Impossible de supprimer le prototype d'élément"
 msgid "Cannot delete item prototypes"
 msgstr "Impossible de supprimer les prototypes d'éléments"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Impossible de supprimer les éléments"
 
@@ -2272,7 +2269,7 @@ msgid_plural "Cannot delete proxies"
 msgstr[0] "Impossible de supprimer le proxy"
 msgstr[1] "Impossible de supprimer les proxy"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2295,7 +2292,7 @@ msgid_plural "Cannot delete scripts"
 msgstr[0] "Impossible de supprimer le script"
 msgstr[1] "Impossible de supprimer les scripts"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Impossible de supprimer les scripts. Le script \"%1$s\" est utilisé dans l'opération de l'action \"%2$s\"."
@@ -2311,8 +2308,8 @@ msgid_plural "Cannot delete services"
 msgstr[0] "Impossible de supprimer le service"
 msgstr[1] "Impossible de supprimer le service"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2341,7 +2338,7 @@ msgstr "Impossible de supprimer le prototype d'élément basé sur un modèle."
 msgid "Cannot delete templated item."
 msgstr "Impossible de supprimer un élément provenant d'un modèle."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Impossible de supprimer des éléments provenant d'un modèle."
 
@@ -2394,7 +2391,7 @@ msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Impossible de supprimer le scénario web"
 
@@ -2429,7 +2426,7 @@ msgid_plural "Cannot disable hosts"
 msgstr[0] "Impossible de désactiver l'hôte"
 msgstr[1] "Impossible de désactiver les hôtes"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Impossible de désactiver l'élément"
@@ -2460,7 +2457,7 @@ msgid_plural "Cannot disable triggers"
 msgstr[0] "Impossible de désactiver le déclencheur"
 msgstr[1] "Impossible de désactiver les déclencheurs"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Impossible de désactiver le scénario web"
@@ -2507,7 +2504,7 @@ msgid_plural "Cannot enable hosts"
 msgstr[0] "Impossible d'activer l'hôte"
 msgstr[1] "Impossible d'activer les hôtes"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Impossible d'activer l'élément"
@@ -2538,7 +2535,7 @@ msgid_plural "Cannot enable triggers"
 msgstr[0] "Impossible d'activer le déclencheur"
 msgstr[1] "Impossible d'activer les déclencheurs"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Impossible d'activer le scénario web"
@@ -2552,7 +2549,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr "Substitution des macros impossible."
 
@@ -2586,8 +2583,8 @@ msgstr "Impossible de trouver l'hôte \"%1$s\" utilisé dans la carte \"%2$s\"."
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Impossible de trouver le groupe d'hôtes \"%1$s\" pour le prototype d'hôte \"%2$s\" de la règle de découverte \"%3$s\" sur \"%4$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2685,24 +2682,20 @@ msgstr "Impossible de trouver la table de correspondances \"%1$s\" utilisée pou
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Impossible de trouver la table de correspondances \"%1$s\" utilisée pour le prototype d'élément \"%2$s\" de la règle de découverte \"%3$s\" sur \"%4$s\"."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "Le nom visible du modèle ne peut pas être vide."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2715,7 +2708,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
 msgstr[0] "Impossible d'importer le modèle \"%1$s\", le modèle lié \"%2$s\" n'existe pas."
 msgstr[1] "Impossible d'importer le modèle \"%1$s\", les modèles liés \"%2$s\" n'existent pas."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "Impossible d'insérer l'expression de déclencheur"
 
@@ -2729,7 +2722,7 @@ msgid "Cannot link template."
 msgstr "Impossible de lier le modèle."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2761,17 +2754,17 @@ msgstr "Impossible de réaliser une mise à jour collective du nom visible de mo
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Impossible d'effectuer une suppression sur la table \"%1$s\" sans condition \"where\"."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Impossible d'effectuer une mise à jour sur la table \"%1$s\" sans valeur."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Impossible d'effectuer une mise à jour sur la table \"%1$s\" sans condition \"where\"."
@@ -2798,7 +2791,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Impossible de lire la réponse, veuillez vérifier la connexion avec le serveur Zabbix \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Impossible de renommer l'utilisateur invité."
 
@@ -2817,7 +2810,7 @@ msgstr "Impossible de sauvegarder un widget: %1$s."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Impossible d'envoyer une commande, veuillez vérifier la connexion avec le serveur Zabbix \"%1$s\"."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr "Impossible d'envoyer la requête"
 
@@ -2857,12 +2850,12 @@ msgstr "Impossible de configurer les champs d'inventaire pour un inventaire dés
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2881,7 +2874,7 @@ msgid_plural "Cannot unblock users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Impossible de délier et effacer les scénarios web."
 
@@ -2894,7 +2887,7 @@ msgstr "Impossible de délier le modèle"
 msgid "Cannot unlink template."
 msgstr "Impossible de délier le modèle."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2947,11 +2940,6 @@ msgstr "Impossible de mettre à jour \"%2$s\" pour un élément découvert \"%1$
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "Impossible de mettre à jour \"%2$s\" pour un déclencheur découvert \"%1$s\"."
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "Impossible de mettre à jour la valeur \"imagetype\" pour l'image \"%1$s\"."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2961,9 +2949,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "Impossible de mettre à jour un graphique découvert."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "Impossible de mettre à jour un groupe d'hôtes découvert."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3022,9 +3011,7 @@ msgstr "Impossible de mettre à jour le prototype de graphique"
 msgid "Cannot update group"
 msgstr "Impossible de mettre à jour le groupe"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Impossible de mettre à jour les groupes pour l'hôte découvert \"%1$s\"."
@@ -3047,13 +3034,13 @@ msgstr[1] "Impossible de mettre à jour les prototypes d'hôtes"
 msgid "Cannot update hosts"
 msgstr "Impossible de mettre à jour les hôtes"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "Impossible de mettre à jour la table de correspondance d'icônes"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Impossible de mettre à jour l'image"
 
@@ -3107,12 +3094,12 @@ msgstr "Impossible de mettre à jour la carte"
 msgid "Cannot update proxy"
 msgstr "Impossible de mettre à jour le proxy"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Impossible de mettre à jour le proxy pour l'hôte découvert \"%1$s\"."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3132,17 +3119,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Impossible de mettre à jour le script"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3217,7 +3204,7 @@ msgstr[1] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Impossible de mettre à jour le scénario web"
 
@@ -3317,8 +3304,8 @@ msgid "Character string not included"
 msgstr "Chaîne de caractères non inclue"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3433,7 +3420,7 @@ msgstr "Vérifie la performance du service UDP. Retourne 0 - le service est inac
 msgid "Checks should be unique."
 msgstr "Les vérifications doivent être uniques."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3454,7 +3441,7 @@ msgstr "Référence circulaire dans les modèles : %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "La liaison circulaire de modèle n'est pas autorisée."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3475,11 +3462,11 @@ msgstr "Effacer l'historique et les tendances"
 msgid "Clear when unlinking"
 msgstr "Effacer en déliant"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr "Cliquez et faites glisser jusqu'à la taille désirée."
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr "Cliquez pour voir ou éditer"
 
@@ -3494,7 +3481,7 @@ msgstr "Horloge"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3509,7 +3496,7 @@ msgstr "Horloge"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Clone"
 
@@ -3520,8 +3507,8 @@ msgstr "Clone"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Fermer"
 
@@ -3532,13 +3519,13 @@ msgstr "Fermer"
 msgid "Close expression constructor"
 msgstr "Fermer le constructeur d'expression"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Fermer le nouvel événement"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Fermer les anciens événements"
 
@@ -3551,8 +3538,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "Replier"
 
@@ -3569,7 +3556,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3635,7 +3622,7 @@ msgstr "Compression"
 msgid "Concurrent sessions"
 msgstr "Sessions concurrentes"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3646,17 +3633,12 @@ msgstr "Condition"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "La condition \"%2$s\" n'est pas utilisée dans la formule \"%3$s\" pour l'action \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "La condition \"%2$s\" n'est pas utilisée dans la formule \"%3$s\" pour la corrélation \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "La condition \"%2$s\" n'est pas utilisée dans la formule \"%3$s\" pour la règle de découverte \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3666,17 +3648,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "La condition \"%2$s\" utilisée dans la formule \"%3$s\" pour l'action \"%1$s\" n'est pas définie."
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "La condition \"%2$s\" utilisée dans la formule \"%3$s\" pour la corrélation \"%1$s\" n'est pas définie."
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "La condition \"%2$s\" utilisée dans la formule \"%3$s\" pour la règle de découverte \"%1$s\" n'est pas définie."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3692,7 +3669,7 @@ msgstr "Conditions"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Configuration"
 
@@ -3755,7 +3732,7 @@ msgstr "Configuration des hôtes"
 msgid "Configuration of housekeeping"
 msgstr "Configuration du nettoyage"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Configuration des correspondances d'icônes"
@@ -3862,7 +3839,7 @@ msgstr "Texte de confirmation"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "Félicitations ! Vous avez installé l'interface Zabbix avec succès."
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3955,7 +3932,7 @@ msgstr "Contact"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4015,7 +3992,7 @@ msgstr "Contient"
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr "Contrôles du contenu"
 
@@ -4054,8 +4031,8 @@ msgstr "Coordonnées"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Copier"
 
@@ -4064,12 +4041,11 @@ msgstr "Copier"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "Corrélation"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "La corrélation \"%1$s\" existe déjà."
@@ -4097,16 +4073,6 @@ msgid_plural "Correlations enabled"
 msgstr[0] "Corrélation activée"
 msgstr[1] "Corrélations activées"
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "Paramètre manquant pour la corrélation : %1$s"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "Le nom de la corrélation ne peut pas être vide."
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr "Règle de corrélation"
@@ -4115,14 +4081,10 @@ msgstr "Règle de corrélation"
 msgid "Correlation updated"
 msgstr "Corrélation mise à jour"
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Impossible de sauvegarder l'image !"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Compte"
 
@@ -4186,11 +4148,11 @@ msgstr "Créer une corrélation"
 msgid "Create dashboard"
 msgstr "Créer un tableau de bord"
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr "Créer une règle de découverte dépendante"
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr "Créer un élément dépendant"
 
@@ -4307,7 +4269,7 @@ msgstr "Créer une carte"
 msgid "Create media type"
 msgstr "Créer un type de média"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "Créer un nouveau"
 
@@ -4331,7 +4293,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Créer un modèle"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Créer un déclencheur"
 
@@ -4494,7 +4456,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "Nom DNS"
@@ -4506,11 +4468,11 @@ msgstr "Nom DNS"
 msgid "Daily"
 msgstr "Journalier"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "Sombre"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4531,8 +4493,8 @@ msgstr "Le tableau de bord \"%1$s\" existe déjà."
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr "Tableau de bord créé"
 
@@ -4555,9 +4517,9 @@ msgstr "Propriété du tableau de bord"
 msgid "Dashboard sharing"
 msgstr "Partage du tableau de bord"
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr "Tableau de bord mis à jour"
 
@@ -4581,7 +4543,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr "Tableaux de bord"
 
@@ -4609,7 +4571,7 @@ msgstr "Aperçu des données"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr "Jeu de données"
 
@@ -4751,7 +4713,7 @@ msgstr "Jour de la semaine"
 msgid "Days"
 msgstr "Jours"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Debug"
 
@@ -4765,26 +4727,26 @@ msgstr "Mode debug"
 msgid "Dec"
 msgstr "Déc"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Décembre"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Défaut"
 
@@ -4877,7 +4839,7 @@ msgstr "Retardé de"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4901,8 +4863,8 @@ msgstr "Retardé de"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -4927,11 +4889,11 @@ msgstr "Supprimer et nettoyer le modèle ? (Attention : tous les hôtes liés se
 msgid "Delete current action?"
 msgstr "Effacer l'action actuelle ?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "Effacer la corrélation actuelle ?"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr "Effacer le tableau de bord ?"
 
@@ -4975,7 +4937,7 @@ msgstr "Supprimer le prototype d'élément ?"
 msgid "Delete item?"
 msgstr "Effacer l'élément ?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Supprimer les liens entre les éléments sélectionnés ?"
 
@@ -5031,7 +4993,7 @@ msgstr "Effacer le tableau de bord sélectionné ?"
 msgid "Delete selected discovery rules?"
 msgstr "Supprimer les règles de découverte sélectionnées ?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Supprimer les éléments sélectionnés ?"
 
@@ -5136,7 +5098,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "Supprimer les formes sélectionnées ?"
 
@@ -5180,7 +5142,7 @@ msgstr "Supprimer le déclencheur ?"
 msgid "Delete web scenario?"
 msgstr "Supprimer le scénario web ?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5225,7 +5187,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Dépendances"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Dépendant"
 
@@ -5233,7 +5195,7 @@ msgstr "Dépendant"
 msgid "Dependent item"
 msgstr "Élément dépendant"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5243,7 +5205,7 @@ msgstr "Dépend de"
 msgid "Deployment status"
 msgstr "État du déploiement"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5276,7 +5238,7 @@ msgid "Description"
 msgstr "Description"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5442,10 +5404,10 @@ msgstr "Désactiver les scénarios web sélectionnés ?"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5528,7 +5490,7 @@ msgid "Discovery by proxy"
 msgstr "Découverte par le proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Test de découverte"
 
@@ -5540,7 +5502,7 @@ msgstr "Tests de découverte"
 msgid "Discovery list"
 msgstr "Liste des découvertes"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Objet de découverte"
 
@@ -5572,7 +5534,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5580,12 +5542,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Règle de découverte"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "La règle de découverte \"%1$s\" existe déjà sur \"%2$s\", héritée d'un autre modèle."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "La règle de découverte \"%1$s\" existe déjà sur \"%2$s\"."
@@ -5598,7 +5560,7 @@ msgstr "La règle de découverte \"%1$s\" existe déjà sur \"%2$s\"."
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "La règle de découverte \"%1$s\" existe déjà."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr "La règle de découverte \"%1$s\" ne peut pas être copiée sans son élément principal."
@@ -5640,7 +5602,7 @@ msgstr "Règle de découverte mise à jour"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5651,7 +5613,7 @@ msgstr "Règles de découverte"
 msgid "Discovery rules deleted"
 msgstr "Règles de découverte supprimées"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "État de la découverte"
@@ -5688,10 +5650,11 @@ msgid "Display stacked graph"
 msgstr "Afficher le graphique empilé"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Affichage de %1$s sur %2$s trouvés"
@@ -5701,7 +5664,7 @@ msgstr "Affichage de %1$s sur %2$s trouvés"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "Affichage de %1$s à %2$s parmi %3$s trouvés"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr "Options d'affichage"
 
@@ -5723,7 +5686,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Souhaitez-vous remplacer l'expression conditionnelle ?"
 
@@ -5779,7 +5742,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Arrêté"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5787,7 +5750,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr "Télécharger le fichier de configuration"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5806,18 +5769,6 @@ msgstr "Dessiner"
 msgid "Draw style"
 msgstr "Style de dessin"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "Valeur \"%1$s\" \"%2$s\" dupliquée pour la corrélation \"%3$s\"."
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr "Valeur \"%1$s\" \"%2$s\" dupliquée pour la corrélation."
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5830,11 +5781,6 @@ msgstr "Valeur \"name\" \"%1$s\" en doublon pour la carte."
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5886,7 +5832,7 @@ msgstr "Élément dynamique"
 msgid "Dynamic items"
 msgstr "Éléments dynamiques"
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Chaque URL doit avoir un nom unique. Veuillez vous assurer qu'il n'existe qu'un URL du même nom"
 
@@ -5895,11 +5841,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5913,8 +5859,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Édition"
 
@@ -5930,11 +5876,11 @@ msgstr "Éditer la carte"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr "Éditer un élément d'arborescence"
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Éditer le déclencheur"
 
@@ -5994,21 +5940,17 @@ msgstr "Clé SSL vide pour le scénario web \"%1$s\"."
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "Identifiant de corrélation vide."
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "Identifiant de formule de condition vide pour l'action \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Identifiant de formule de condition vide pour la règle de découverte \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "Macro de condition vide pour l'action \"%1$s\"."
@@ -6024,25 +5966,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr "Type de condition de filtre vide pour l'action \"%1$s\"."
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6052,14 +5988,6 @@ msgstr "Paramètre d'entrée vide."
 msgid "Empty map ID."
 msgstr "Identifiant de carte vide."
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "Identifiant de type de média vide."
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Paramètres vide"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6225,7 +6153,7 @@ msgstr "Activer les trap"
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6236,7 +6164,7 @@ msgstr "Activer les trap"
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6279,7 +6207,7 @@ msgid "English (en_US)"
 msgstr "Anglais (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6295,7 +6223,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6314,12 +6242,12 @@ msgstr "Égal"
 msgid "Error"
 msgstr "Erreur"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Erreur dans la requête de recherche dans la table \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr "Message d'erreur"
 
@@ -6346,7 +6274,7 @@ msgstr "ID événement"
 msgid "Event acknowledged"
 msgstr "Événement acquitté"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6354,7 +6282,7 @@ msgid "Event correlation"
 msgstr "Corrélation d'événement"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "Règles de corrélation d'événement"
@@ -6389,11 +6317,11 @@ msgstr "Supervision du journal d'événements. Retourne un journal"
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "Paire de tags d'événement"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Type d'événement"
 
@@ -6438,15 +6366,10 @@ msgstr "Exclure"
 msgid "Exclude host groups"
 msgstr "Exclure un groupe d'hôte"
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Exécuter"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "Erreur d'exécution SQL [%1$s] dans [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6484,7 +6407,7 @@ msgstr "Exécuté"
 msgid "Executed script"
 msgstr "Script exécuté"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Confirmation d'exécution"
 
@@ -6500,8 +6423,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "Déplier"
 
@@ -6622,7 +6545,7 @@ msgstr "Expressions"
 msgid "External check"
 msgstr "Vérification externe"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "V"
@@ -6649,8 +6572,8 @@ msgstr "Échoué"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6661,26 +6584,26 @@ msgstr "Impossible de créer le tableau de bord"
 msgid "Failed to parse URL."
 msgstr "Échec d'analyse de l'URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr "Impossible de mettre à jour le tableau de bord"
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6688,7 +6611,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Échec lors de la mise à jour du modèle."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6712,7 +6635,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Fév"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Février"
 
@@ -6734,10 +6657,9 @@ msgstr "Le champ \"%1$s\" ne peut pas être configuré à NULL."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6748,13 +6670,6 @@ msgstr "Le champ \"%1$s\" est obligatoire."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "La valeur pour le champ \"%1$s\" de la carte \"%2$s\" est manquante."
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "La valeur pour le champ \"%1$s\" du type de média \"%2$s\" est manquante."
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6773,11 +6688,6 @@ msgstr "Le champ \"%1$s\" n'est pas un entier."
 msgid "Field \"%1$s\" is not string."
 msgstr "Le champ \"%1$s\" n'est pas une chaîne."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "Le champ \"%1$s\" est requis pour le type de média \"%2$s\"."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6792,10 +6702,6 @@ msgstr "Le champ \"hôte\" est obligatoire."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Ce format de fichier n'est pas supporté."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6860,7 +6766,8 @@ msgstr "Région remplie"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6885,7 +6792,7 @@ msgstr "Filtre"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6937,7 +6844,7 @@ msgstr "Ajuster à la carte"
 msgid "Fixed"
 msgstr "Fixe"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6988,12 +6895,12 @@ msgstr "Formule"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7006,7 +6913,7 @@ msgstr "Français (fr_FR)"
 msgid "Fri"
 msgstr "Ven"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Vendredi"
 
@@ -7117,7 +7024,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "L'expression fournie n'est pas une macro"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr "L'expression régulière globale \"%1$s\" n'existe pas."
@@ -7131,7 +7038,7 @@ msgstr "Valeur globale"
 msgid "Go back to %1$s"
 msgstr "Retour vers %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Aller à"
 
@@ -7169,7 +7076,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7177,7 +7084,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Ligne et dégradé"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7237,7 +7144,7 @@ msgstr[1] "Graphiques copiés"
 msgid "Graph deleted"
 msgstr "Graphique supprimé"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7274,8 +7181,8 @@ msgstr "Prototype de graphique supprimé"
 msgid "Graph prototype updated"
 msgstr "Prototype de graphique mis à jour"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr "Le prototype de graphique avec l'ID \"%1$s\" n'est pas disponible."
@@ -7309,8 +7216,8 @@ msgstr "Type de graphique"
 msgid "Graph updated"
 msgstr "Graphique mis à jour"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr "Le graphique avec l'ID \"%1$s\" n'est pas disponible."
@@ -7341,7 +7248,7 @@ msgstr "Un graphique nommé \"%1$s\" existe déjà parmi les graphiques ou proto
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Graphiques"
 
@@ -7362,12 +7269,12 @@ msgstr "Grille"
 msgid "Group"
 msgstr "Groupe"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Le groupe \"%1$s\" ne peut pas être effacé, car il est utilisé par un prototype d'hôte."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr "Le groupe \"%1$s\" ne peut pas être effacé, car il est utilisé dans une condition de corrélation."
@@ -7541,11 +7448,11 @@ msgstr "Aide"
 msgid "Hexadecimal to decimal"
 msgstr "Hexadécimal vers décimal"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Caché"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "Cacher le debug"
 
@@ -7572,11 +7479,11 @@ msgstr "Hiérarchie"
 msgid "High"
 msgstr "Haut"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr "Noir à contraste élevé"
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr "Clair à contraste élevé"
 
@@ -7597,7 +7504,7 @@ msgstr "Mettre en surbrillance la ligne entière"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Historique"
 
@@ -7605,11 +7512,15 @@ msgstr "Historique"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Historique nettoyé"
 
@@ -7652,7 +7563,7 @@ msgstr "Horizontal"
 msgid "Horizontal align"
 msgstr "Alignement horizontal"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7681,7 +7592,7 @@ msgstr "Alignement horizontal"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7695,7 +7606,7 @@ msgstr[1] "Hôtes"
 msgid "Host \"%1$s\" already exists."
 msgstr "L'hôte \"%1$s\" existe déjà."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7703,7 +7614,7 @@ msgstr "L'hôte \"%1$s\" existe déjà."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "L'hôte \"%1$s\" ne peut pas ne pas avoir de groupe d'hôte."
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7755,7 +7666,7 @@ msgid_plural "Hosts enabled"
 msgstr[0] "Hôte activé"
 msgstr[1] "Hôtes désactivés"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7769,22 +7680,22 @@ msgstr[1] "Hôtes désactivés"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Groupe d'hôtes"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Le groupe d'hôtes \"%1$s\" existe déjà."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Le groupe d'hôtes \"%1$s\" ne peut pas être effacé, car il est utilisé dans un script global."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7797,10 +7708,10 @@ msgstr "Éléments du groupe d'hôtes"
 msgid "Host group label type"
 msgstr "Type d'étiquette du groupe d'hôtes"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Le groupe d'hôtes avec l'ID \"%1$s\" n'est pas disponible."
@@ -7816,8 +7727,8 @@ msgstr "Le groupe d'hôtes avec l'ID \"%1$s\" n'est pas disponible."
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7891,7 +7802,7 @@ msgstr "Nom de l'hôte"
 msgid "Host networks"
 msgstr "Réseaux de l'hôte"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7971,7 +7882,7 @@ msgstr "Échec de la mise à jour de l'hôte."
 msgid "Host updated"
 msgstr "Hôte mis à jour"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr "L'hôte avec l'ID \"%1$s\" n'est pas disponible."
@@ -7991,7 +7902,7 @@ msgstr "Un hôte ayant le même nom \"%1$s\" existe déjà."
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Un hôte ayant le même nom visible \"%1$s\" existe déjà."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8004,7 +7915,7 @@ msgstr "Un hôte ayant le même nom visible \"%1$s\" existe déjà."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8052,7 +7963,7 @@ msgstr "Hôtes mis à jour"
 msgid "Hours"
 msgstr "Heures"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8092,7 +8003,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "adresse IP"
@@ -8117,7 +8028,7 @@ msgstr "La plage d'IP \"%1$s\" dépasse la limite d'adresses \"%2$s\""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8174,12 +8085,12 @@ msgstr "Icône surlignée"
 msgid "Icon map"
 msgstr "Correspondance d'icône"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "La correspondance d'icône \"%1$s\" ne peut pas être supprimée. Utilisée dans la carte \"%2$s\"."
@@ -8192,18 +8103,18 @@ msgstr "Correspondance d'icône créée"
 msgid "Icon map deleted"
 msgstr "Correspondance d'icône supprimée"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Correspondance d'icône mise à jour"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "Correspondance d'icônes"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "L'icône avec l'IS \"%1$s\" n'est pas disponible."
@@ -8304,23 +8215,20 @@ msgstr "Si vous pensez que ce message n'est pas correct, veuillez consulter votr
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Image"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "L'image \"%1$s\" existe déjà."
@@ -8329,7 +8237,7 @@ msgstr "L'image \"%1$s\" existe déjà."
 msgid "Image added"
 msgstr "Image ajoutée"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Image supprimée"
 
@@ -8337,18 +8245,12 @@ msgstr "Image supprimée"
 msgid "Image label type"
 msgstr "Type d'étiquette d'image"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "Erreur de chargement d'image [%1$s] dans [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Image modifiée"
 
@@ -8443,7 +8345,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8454,13 +8356,13 @@ msgstr "Maintenance inaccessible"
 msgid "Inaccessible map"
 msgstr "Carte inaccessible"
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr "Modèle inaccessible"
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr "Déclencheur inaccessible"
 
@@ -8504,7 +8406,7 @@ msgstr "Inclure les sous-groupes"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Statistiques de trafic entrant sur une interface réseau. Retourne un entier"
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8672,24 +8574,6 @@ msgstr "Groupe d'utilisateurs associé à l'action incorrect. Le groupe d'utilis
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Utilisateur associé à l'action incorrect. L'utilisateur n'existe pas ou vous n'y avez pas accès."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8744,8 +8628,6 @@ msgstr "Utilisateur associé à l'action incorrect. L'utilisateur n'existe pas o
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Arguments incorrects passés à la fonction."
 
@@ -8771,31 +8653,22 @@ msgstr "Caractères incorrects utilisés pour le nom de modèle \"%1$s\"."
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "Conditions incorrectes pour l'action \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "Conditions incorrectes pour la règle de découverte \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "Identifiant de corrélation incorrect."
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "Expression personnalisée \"%2$s\" incorrecte pour l'action \"%1$s\" : %3$s."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "Expression personnalisée \"%2$s\" incorrecte pour la corrélation \"%1$s\": %3$s."
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "Expression personnalisée \"%2$s\" incorrecte pour la règle de découverte \"%1$s\" : %3$s."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8824,7 +8697,7 @@ msgstr "Valeur eventobject incorrecte."
 msgid "Incorrect eventsource value."
 msgstr "Valeur eventsource incorrecte."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Nom ou valeur incorrecte du champ \"%1$s\" dans l'instruction \"where\" pour la table \"%2$s\"."
@@ -8849,22 +8722,17 @@ msgstr "Téléversement de fichier incorrect."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "Identifiant de formule de condition de filtre incorrect pour l'action \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Identifiant de formule de condition de filtre incorrect pour la règle de découverte \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "Identifiant de formule de condition de filtre incorrect pour la corrélation \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "Macro de condition de filtre incorrect pour la règle de découverte \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8875,7 +8743,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "Opérateur de condition de filtre incorrect pour l'action \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "Opérateur de condition de filtre incorrect pour la règle de découverte \"%1$s\"."
@@ -8903,8 +8771,6 @@ msgstr "Index d'image incorrect."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8966,10 +8832,6 @@ msgstr "Période de maintenance incorrecte (5 minutes minimum)"
 msgid "Incorrect map ID."
 msgstr "Identifiant de carte incorrect."
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "Identifiant de type de média incorrect."
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9027,13 +8889,13 @@ msgstr "Expression régulière \"%1$s\" incorrecte : \"%2$s\""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Réponse incorrecte reçue du serveur Zabbix \"%1$s\"."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Heure de fin de service incorrecte."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Heure de début de service incorrecte."
 
@@ -9086,12 +8948,7 @@ msgstr "Expression du prototype de déclencheur incorrecte. Les éléments de l'
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "Type de calcul incorrect pour l'action \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "Type de calcul incorrect pour la corrélation \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "Type de calcul incorrect pour la règle de découverte \"%1$s\"."
@@ -9137,13 +8994,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9160,60 +9017,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Valeur \"%1$s\" incorrecte pour le champ \"%2$s\" : doit être entre %3$s et %4$s."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "Valeur incorrecte \"%1$s\" pour le champ de nombre flottant \"%2$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "Valeur incorrecte \"%1$s\" pour le champ d'entier \"%2$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Valeur incorrecte \"%1$s\" pour le champ d'entier non signé \"%2$s\"."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "Valeur incorrecte \"%1$s\" dans le champ \"%2$s\" pour la corrélation \"%3$s\"."
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "Valeur \"%1$s\" incorrecte dans le champ \"%2$s\" pour le type de média \"%3$s\"."
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9268,14 +9095,8 @@ msgstr "Valeur incorrecte pour le champ \"%1$s\"."
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9385,25 +9206,7 @@ msgstr "Valeur incorrecte pour le champ \"%1$s\"."
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9414,7 +9217,7 @@ msgstr "Valeur incorrecte pour le champ \"%1$s\"."
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9460,16 +9263,17 @@ msgstr "Valeur incorrecte pour le champ \"%1$s\"."
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9478,7 +9282,7 @@ msgstr "Valeur incorrecte pour le champ \"%1$s\"."
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "Valeur incorrecte pour le champ \"%1$s\" : %2$s."
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9566,12 +9370,12 @@ msgstr "Tags hérités et déclencheurs"
 msgid "Inherited items"
 msgstr "Éléments hérités "
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Insertion"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "Insérer une expression"
 
@@ -9675,7 +9479,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9683,7 +9487,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9694,7 +9498,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Intervalle"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9717,7 +9521,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr "Condition d'action invalide: %1$s."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9749,7 +9553,7 @@ msgstr "Adresse e-mail incorrecte pour le type de media avec l'ID \"%1$s\"."
 msgid "Invalid interval \"%1$s\"."
 msgstr "Intervalle \"%1$s\" invalide."
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Clé \"%1$s\" invalide pour la règle de découverte \"%2$s\" sur \"%3$s\" : %4$s."
@@ -9774,27 +9578,29 @@ msgstr "Clé \"%1$s\" invalide : %2$s."
 msgid "Invalid method parameters."
 msgstr "Paramètres de la méthode invalides."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9820,17 +9626,17 @@ msgstr "Paramètres de la méthode invalides."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9838,8 +9644,8 @@ msgstr "Paramètres de la méthode invalides."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9853,106 +9659,116 @@ msgstr "Paramètres de la méthode invalides."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9994,43 +9810,38 @@ msgstr "Code de réponse \"%1$s\" invalide."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10051,7 +9862,7 @@ msgstr "Période de temps invalide."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Inventaire"
 
@@ -10092,7 +9903,7 @@ msgstr "Impossible de chercher par mot de passe utilisateur."
 msgid "Italian (it_IT)"
 msgstr "Italien (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10124,7 +9935,7 @@ msgstr "L'élément \"%1$s\" ne peut pas être copié sans son élément princip
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "L'élément \"%1$s\" ne peut pas remplir le champ d'inventair numéro \"%2$d\" manquant. Les choix sont : de 0 (ne pas remplir) à %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10138,7 +9949,7 @@ msgstr "Élément ajouté"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "Élément copié"
@@ -10152,13 +9963,13 @@ msgstr "Nombre d'éléments"
 msgid "Item deleted"
 msgstr "Élément supprimé"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Élément désactivé"
 msgstr[1] "Éléments désactivés"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Élément activé"
@@ -10168,7 +9979,7 @@ msgstr[1] "Éléments activés"
 msgid "Item in \"not supported\" state"
 msgstr "Élément dans l'état \"non supporté\""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "Élément non sélectionné"
 
@@ -10177,7 +9988,7 @@ msgstr "Élément non sélectionné"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr "Des paramètres manquent au prétraitement de l'élément: %1$s"
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10214,8 +10025,8 @@ msgid_plural "Item prototypes updated"
 msgstr[0] "Prototype d'élément mis à jour"
 msgstr[1] "Prototypes d'éléments mis à jour"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr "Le prototype d'élément avec l'ID \"%1$s\" n'est pas disponible."
@@ -10241,7 +10052,7 @@ msgstr "Prototypes d'élément mis à jour"
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10273,8 +10084,8 @@ msgstr "L'élément ne sera pas rafraîchi. L'intervalle de mise à jour spécif
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr "L'élément ne sera pas rafraîchi. L'intervalle de mise à jour devrait être entre 1s et 1d. Des intervalles planifiés/flexibles peuvent également être utilisés."
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr "L’élément avec l'ID \"%1$s\" n'est pas disponible."
@@ -10325,11 +10136,11 @@ msgstr "Un élément avec la clé \"%1$s\" existe déjà sur \"%2$s\"."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Éléments"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Éléments supprimés"
 
@@ -10347,7 +10158,7 @@ msgstr "Éléments modifiés"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10372,6 +10183,10 @@ msgstr "Interfaces JMX"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10384,7 +10199,7 @@ msgstr "Données JSON"
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr "Une chaîne JSON est attendue"
 
@@ -10402,7 +10217,7 @@ msgstr "JSONPath"
 msgid "Jan"
 msgstr "Jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Janvier"
 
@@ -10424,7 +10239,7 @@ msgstr "JavaScript"
 msgid "Jul"
 msgstr "Juil"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Juillet"
 
@@ -10432,7 +10247,7 @@ msgstr "Juillet"
 msgid "Jun"
 msgstr "Juin"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Juin"
 
@@ -10588,22 +10403,6 @@ msgid_plural "Last %1$d years"
 msgstr[0] "Dernière %1$d année"
 msgstr[1] "%1$d dernières années"
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10615,11 +10414,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Dernière vérification"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Graphique de la dernière heure"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Graphique du dernier mois"
 
@@ -10657,11 +10456,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Dernière valeur"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Graphique dernière semaine"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10670,11 +10469,11 @@ msgstr "Graphique dernière semaine"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Dernières données"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "Dernières valeurs"
 
@@ -10715,7 +10514,7 @@ msgstr "Y gauche"
 msgid "Left trim"
 msgstr "Rogner à gauche"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr "Légende"
 
@@ -10996,7 +10795,7 @@ msgstr "Règle de découverte bas niveau dans l'état \"non supportée\""
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "L"
@@ -11018,7 +10817,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "Checksum MD5 d'un fichier. Retourne une chaîne de caractères (le hash MD5 du fichier)"
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11029,12 +10828,12 @@ msgid "Macro"
 msgstr "Macro"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "La macro \"%1$s\" existe déjà sur \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "La macro \"%1$s\" existe déjà."
@@ -11062,7 +10861,7 @@ msgstr "Macro modifiée"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr "Filtre principal"
 
@@ -11070,7 +10869,7 @@ msgstr "Filtre principal"
 msgid "Main navigation"
 msgstr "Navigation principale"
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11153,7 +10952,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11175,13 +10974,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr "Fermé manuellement"
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Carte"
 
@@ -11250,7 +11049,7 @@ msgstr "Forme de carte"
 msgid "Map update failed."
 msgstr "La mise à jour de la carte a échoué."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr "La carte avec l'ID \"%1$s\" n'est pas disponible."
@@ -11282,7 +11081,7 @@ msgstr "Cartes"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Mars"
 
@@ -11386,7 +11185,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11400,7 +11199,7 @@ msgstr[1] "La période maximale à afficher est %1$s jours."
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "Longueur totale maximale de l'adresse e-mail dépassée pour le type de media avec l'ID \"%1$s\"."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Mai"
 
@@ -11415,15 +11214,12 @@ msgstr "Mai"
 msgid "Media"
 msgstr "Média"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Type de média"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr "Le type de média \"%1$s\" existe déjà."
@@ -11450,11 +11246,6 @@ msgid_plural "Media types enabled"
 msgstr[0] "Type de média activé"
 msgstr[1] "Types de média activés"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr "Les paramètres %1$s manquent pour le type de média"
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11484,7 +11275,7 @@ msgstr "Le type de média avec l'IS \"%1$s\" n'est pas disponible."
 msgid "Media types"
 msgstr "Types de média"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11572,7 +11363,7 @@ msgstr "Messagerie"
 msgid "Method not found."
 msgstr "Méthode pas trouvée."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11634,7 +11425,7 @@ msgid "Minimum severity"
 msgstr "Sévérité minimale"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11693,7 +11484,7 @@ msgstr "Mode"
 msgid "Model"
 msgstr "Modèle"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11731,7 +11522,7 @@ msgstr[1] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11757,7 +11548,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Lun"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Lundi"
 
@@ -11797,11 +11588,11 @@ msgstr "Mois"
 msgid "Monthly"
 msgstr "Mensuel"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "Plus de correspondances trouvées..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11825,7 +11616,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11838,7 +11629,7 @@ msgstr "Multiple"
 msgid "Multiple PROBLEM events"
 msgstr "Événements PROBLÈME multiples"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Sourdine"
 
@@ -11967,11 +11758,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12129,19 +11920,21 @@ msgstr "Nouvelle condition"
 msgid "New dashboard"
 msgstr "Nouveau tableau de bord"
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Nouvel élément"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr "Nouveau groupe d'hôte d'événement"
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr "Nouvelle valeur de tag d'événement"
 
@@ -12153,7 +11946,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nouvelle expression régulière"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12161,7 +11954,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Nouvelle période de maintenance"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12170,7 +11963,7 @@ msgid "New triggers"
 msgstr "Nouveaux déclencheurs"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12188,7 +11981,7 @@ msgstr "Prochaine étape"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12217,30 +12010,6 @@ msgstr "Prochaine étape"
 msgid "No"
 msgstr "Non"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "Aucun \"%1$s\" donné pour la corrélation \"%2$s\"."
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "Pas de \"%1$s\" donné pour la corrélation."
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12256,11 +12025,6 @@ msgstr "Aucun \"%1$s\" donné pour le graphique."
 msgid "No \"%1$s\" given for map."
 msgstr "Aucun \"%1$s\" donné pour la carte."
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "Aucun \"%1$s\" donné pour le type de média."
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12268,7 +12032,7 @@ msgstr "Aucun \"%1$s\" donné pour le type de média."
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "Aucun \"%2$s\" donné pour la condition de filtre de l'action \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "Aucun \"%2$s\" donné pour la condition de filtre de la règle de découverte \"%1$s\"."
@@ -12278,7 +12042,7 @@ msgstr "Aucun \"%2$s\" donné pour la condition de filtre de la règle de décou
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "Aucun \"%2$s\" donné pour le filtre d'action \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "Aucun \"%2$s\" donné pour le filtre de règle de découverte \"%1$s\"."
@@ -12295,11 +12059,6 @@ msgstr "Aucun nom d'utilisateur d'authentification spécifié."
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "Aucun type de condition donné pour la corrélation \"%1$s\"."
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12330,7 +12089,7 @@ msgstr "Aucune interface par défaut pour le type \"%1$s\" sur \"%2$s\"."
 msgid "No details"
 msgstr "Pas de détails"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "Aucun identifiant de règle de découverte fourni."
 
@@ -12366,7 +12125,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "Aucun graphique ajouté."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Aucun identifiant d'hôte fourni."
 
@@ -12396,7 +12155,7 @@ msgstr "Aucune image"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Aucune interface trouvée"
 
@@ -12430,7 +12189,7 @@ msgstr "Aucune macro trouvée."
 msgid "No maps added."
 msgstr "Aucune carte ajoutée."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "Aucune correspondance trouvée"
 
@@ -12438,17 +12197,46 @@ msgstr "Aucune correspondance trouvée"
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr "Aucun type d'opération donné pour la corrélation \"%1$s\"."
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Aucune permission pour l'accès au système."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12456,7 +12244,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12484,19 +12272,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12511,16 +12298,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12540,12 +12333,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12566,27 +12357,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12603,14 +12396,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12619,7 +12412,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Aucune permission pour l'objet appelé ou il n'existe pas !"
 
@@ -12639,7 +12432,7 @@ msgstr "Aucun fichier de clé publique spécifié."
 msgid "No recipients for action operation message."
 msgstr "Aucun destinataire pour le message d'opération d'action."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr "Pas de rafraîchissement"
 
@@ -12651,7 +12444,7 @@ msgstr "Aucun script spécifié pour la commande d'opération d'action."
 msgid "No target selected"
 msgstr "Aucune cible sélectionnée"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Aucune cible sélectionnée."
 
@@ -12668,7 +12461,7 @@ msgstr "Aucun déclencheur défini."
 msgid "No value"
 msgstr "Pas de valeur"
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr "Les drapeaux non-booléens sont obsolètes."
 
@@ -12738,15 +12531,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Configuration du mot de passe de l'utilisateur \"guest\" interdite."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12778,7 +12571,7 @@ msgstr "Éléments non hérités"
 msgid "Not supported"
 msgstr "Non supporté"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Note"
@@ -12809,7 +12602,7 @@ msgstr "Notifier tous les participants"
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "Novembre"
 
@@ -12996,8 +12789,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13057,13 +12850,13 @@ msgstr "Oct"
 msgid "Octal to decimal"
 msgstr "Octal vers décimal"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Octobre"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Inactif"
 
@@ -13071,30 +12864,31 @@ msgstr "Inactif"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr "Ancienne valeur du tag d'événement"
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "Actif"
 
@@ -13110,35 +12904,15 @@ msgstr "Une fois"
 msgid "One"
 msgstr "Un"
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "Un des objets reste sans groupe d'hôtes."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Une fois uniquement"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Temps d'arrêt unique"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Seuls les super administrateurs peuvent créer des groupes d'hôtes."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Seuls les super administrateurs peuvent créer des types de médias."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Seuls les super administrateurs peuvent effacer des types de médias."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Seuls les super administrateurs peuvent éditer les types de médias."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Seules les vérifications d'agents Zabbix, SNMPv1, SNMPv2 et SNMPv3 peuvent être mises uniques."
@@ -13187,10 +12961,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "Seuls les super administateurs peuvent créer des corrélations."
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr "Seul les super-admin peuvent spécifier le propriétaire d'un tableau de bord."
@@ -13199,15 +12969,11 @@ msgstr "Seul les super-admin peuvent spécifier le propriétaire d'un tableau de
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr "Seuls les super administrateurs peuvent mettre à jour les corrélations."
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Seuls les déclencheurs assignés à des hôtes activés et dépendant d'éléments activés sont comptés"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13216,7 +12982,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Informations du système d'exploitation. Retourne une chaîne"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13225,11 +12991,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "L'opération ne peut pas être effectuée en raison d'une requête non autorisée."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Détails de l'opération"
 
@@ -13251,7 +13017,7 @@ msgstr "L'opération n'a pas de modèle à exploiter."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13260,33 +13026,33 @@ msgstr ""
 msgid "Operations"
 msgstr "Opérations"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Opérateur"
 
@@ -13395,7 +13161,7 @@ msgstr "Autres paramètres de configuration"
 msgid "Other parameters"
 msgstr "Autres paramètres"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Autres"
@@ -13409,7 +13175,7 @@ msgstr "Statistiques de trafic sortant sur une interface réseau. Retourne un en
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13438,7 +13204,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13627,7 +13393,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13672,7 +13438,7 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "Identité PSK"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13695,16 +13461,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Paramètre"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "Le paramètre \"%1$s\" est obsolète."
@@ -13734,7 +13500,7 @@ msgstr "Éléments parents"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13751,7 +13517,7 @@ msgstr "Déclencheurs parents"
 msgid "Parent web scenarios"
 msgstr "Scénario web parent"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13763,11 +13529,6 @@ msgstr ""
 msgid "Parse"
 msgstr "Analyser"
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "Erreur d'analyse SQL [%1$s] dans [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Erreur d'analyse"
@@ -13828,7 +13589,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr "Coller"
 
@@ -13838,15 +13599,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr "Coller sans les liens externes"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13892,12 +13653,11 @@ msgstr "Réalise une requête DNS. Retourne une chaîne de caractères avec le t
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Période"
 
@@ -13986,7 +13746,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Veuillez renseigner le nom d'hôte ou l'adresse IP et le numéro de port du serveur Zabbix ainsi que le nom de l'installation (facultatif)."
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Veuillez sélectionner deux éléments"
 
@@ -14026,7 +13786,7 @@ msgstr "Remplit le champ d'inventaire d'hôte"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14115,7 +13875,7 @@ msgid "Previous month"
 msgstr "Mois précédent"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14246,7 +14006,7 @@ msgstr "Le problème n'est pas supprimé"
 msgid "Problem is suppressed"
 msgstr "Le problème est supprimé"
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Problème sur"
 
@@ -14259,21 +14019,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr "Problème résolu"
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14287,9 +14043,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Problèmes"
 
@@ -14323,7 +14079,7 @@ msgid "Prometheus to JSON"
 msgstr "Prometheus vers JSON"
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "Propriétés"
 
@@ -14344,13 +14100,13 @@ msgstr "L'URL fourni \"%1$s\" est invalide."
 msgid "Proxies"
 msgstr "Proxys"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14358,7 +14114,7 @@ msgstr "Proxys"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14368,12 +14124,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Le proxy \"%1$s\" pour l'hôte \"%2$s\" n'existe pas."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr "Le proxy \"%1$s\" est utilisé par l'action \"%2$s\"."
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Le proxy \"%1$s\" est utilisé par la règle de découverte \"%2$s\"."
@@ -14466,7 +14222,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14543,10 +14299,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Valeur reçue"
@@ -14628,7 +14380,7 @@ msgstr "Rectangle"
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr "Intervalle de rafraîchissement"
 
@@ -14646,13 +14398,13 @@ msgstr ""
 msgid "Regular"
 msgstr "Normal"
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Expression régulière"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14685,7 +14437,7 @@ msgstr "Expressions régulières"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14717,8 +14469,6 @@ msgstr "Commande à distance"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14739,7 +14489,9 @@ msgstr "Commande à distance"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14752,7 +14504,7 @@ msgstr "Commande à distance"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14829,8 +14581,8 @@ msgstr "Commande à distance"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -14870,7 +14622,7 @@ msgstr "Supprimer, %1$s"
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14912,7 +14664,7 @@ msgid "Replace dependencies"
 msgstr "Remplacer les dépendances"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14967,7 +14719,7 @@ msgstr "Corps de la requête"
 msgid "Request body type"
 msgstr "Type du corps de la requête"
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr "Requête envoyée avec succès"
 
@@ -15009,8 +14761,8 @@ msgstr "Code d'état requis"
 msgid "Required string"
 msgstr "Chaîne requise"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Réinitialiser"
 
@@ -15043,7 +14795,7 @@ msgstr "Confirmation de la réinitialisation"
 msgid "Reset defaults"
 msgstr "Réinitialiser aux valeurs par défaut"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Résolu"
 
@@ -15109,7 +14861,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Résultat"
@@ -15296,12 +15048,12 @@ msgstr "Exécute la commande spécifiée sur l'hôte. Retourne le résultat text
 msgid "Russian (ru_RU)"
 msgstr "Russe (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "D"
@@ -15312,8 +15064,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15350,7 +15102,7 @@ msgstr "Port du serveur SMTP"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15446,12 +15198,12 @@ msgstr "Compte SQL : %1$s (selects: %2$s | executes : %3$s)"
 msgid "SQL query"
 msgstr "Requête SQL"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "L'exécution de l'instruction SQL a échoué \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "L'exécution de l'instruction SQL a échoué\"%1$s\"."
@@ -15514,7 +15266,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15526,7 +15278,7 @@ msgstr "Sans empattement"
 msgid "Sat"
 msgstr "Sam"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Samedi"
 
@@ -15568,7 +15320,7 @@ msgstr "Planification"
 msgid "Scheduled check"
 msgstr "Vérification planifiée"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15635,7 +15387,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr "Étendue"
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15648,8 +15400,7 @@ msgstr "Étendue"
 msgid "Script"
 msgstr "Script"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Le script \"%1$s\" existe déjà."
@@ -15681,12 +15432,6 @@ msgstr "Nom du script"
 msgid "Script parameters"
 msgstr "Paramètres du script"
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "Le dernier retour à la ligne manque dans les paramètres \"%1$s\" du script pour le type de média \"%2$s\"."
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Profileur de script"
@@ -15699,7 +15444,7 @@ msgstr "Script modifié"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Scripts"
 
@@ -15769,8 +15514,8 @@ msgid "Security name"
 msgstr "Nom de la sécurité"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15778,7 +15523,7 @@ msgstr "Nom de la sécurité"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Sélectionner"
 
@@ -15814,19 +15559,19 @@ msgstr "Éléments sélectonnés"
 msgid "Selected items only"
 msgstr "Éléments sélectionnés uniquement"
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "Sélectionné, %1$s en position  %2$d de %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "Sélectionné, %1$s, lecture seule, en position %2$d de %3$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr "Envoyer vers l'arrière"
 
@@ -15851,7 +15596,7 @@ msgstr "Envoyer uniquement à"
 msgid "Send to"
 msgstr "Envoyer"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr "Envoyer à l'arrière"
 
@@ -15884,7 +15629,7 @@ msgstr "Séparé"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "Septembre"
 
@@ -15915,28 +15660,28 @@ msgstr "Serveur (proxy)"
 msgid "Server time"
 msgstr "Temps serveur"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Service"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15946,7 +15691,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "Service créé"
 
@@ -15979,16 +15724,16 @@ msgstr "Port du service"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "L'heure de démarrage du service doit être antérieure à l'heure de fin."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -15996,11 +15741,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Périodes de maintenance"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Type de service"
 
@@ -16009,30 +15754,29 @@ msgstr "Type de service"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Service mis à jour"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Services"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "Les services forment une dépendance circulaire."
 
@@ -16040,7 +15784,7 @@ msgstr "Les services forment une dépendance circulaire."
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16070,7 +15814,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Configurer le mode d'inventaire d'hôte"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16099,7 +15843,7 @@ msgstr "La définition du protocole LDAP a échoué."
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr "La définition des références LDAP sur \"Off\" a échoué."
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16108,7 +15852,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16164,7 +15908,7 @@ msgstr "Forme"
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "Partage"
 
@@ -16306,7 +16050,7 @@ msgstr "Afficher une alerte si le serveur Zabbix est arrêté"
 msgid "Show working time"
 msgstr "Afficher les heures ouvrées"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Affiché"
 
@@ -16415,7 +16159,7 @@ msgstr "Copie du graphique \"%1$s\" sur l'hôte \"%2$s\" sautée."
 msgid "Slovak (sk_SK)"
 msgstr "Slovaque (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Reporter"
 
@@ -16461,7 +16205,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Classer les entrées par"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Ordre de tri (0->999)"
 
@@ -16535,7 +16279,7 @@ msgstr "Démarrer dans"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16638,15 +16382,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "État"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Codes d'état"
@@ -16676,7 +16424,7 @@ msgstr "État seulement"
 msgid "Status problem"
 msgstr "Statut problème"
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16724,7 +16472,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16789,7 +16537,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Sujet"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Sous-carte"
 
@@ -16805,7 +16553,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Succès Audit"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr "Message de succès"
 
@@ -16818,7 +16566,7 @@ msgstr "Somme des statistiques de trafic entrant et sortant sur l'interface rés
 msgid "Sun"
 msgstr "Dim"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -16910,12 +16658,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Uptime du système en secondes. Retourne un entier"
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "J"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "M"
@@ -16942,17 +16690,17 @@ msgstr "VRAI"
 msgid "Table \"%1$s\" does not exist."
 msgstr "La table \"%1$s\" n'existe pas."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "La table \"%1$s\" n'a pas de champ nommé \"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Étiquette"
@@ -17008,7 +16756,7 @@ msgstr "Valeur du tag"
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17068,7 +16816,7 @@ msgstr "Type de cible"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17089,7 +16837,7 @@ msgstr "Modèle"
 msgid "Template \"%1$s\" already exists."
 msgstr "Le modèle \"%1$s\" existe déjà."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17113,7 +16861,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Un modèle ne peut pas être lié à un autre modèle plus d'une fois, même à travers d'autres modèles."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17173,7 +16921,7 @@ msgstr "Un modèle avec le même nom visible \"%1$s\" existe déjà."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17345,14 +17093,14 @@ msgstr "L'hôte n'est plus découvert et sera supprimé dans %1$s (le %2$s à %3
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "L'hôte n'est plus découvert et sera supprimé la prochaine fois que la règle de découverte est traitée."
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "L'image est utilisée dans l'icône de carte %1$s."
 msgstr[1] "L'image est utilisée dans les icônes de carte %1$s."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17417,7 +17165,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr "Ceci est un message de test de Zabbix"
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Ce mois-ci"
 
@@ -17425,7 +17173,7 @@ msgstr "Ce mois-ci"
 msgid "This month so far"
 msgstr "Ce mois-ci jusqu'à présent"
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Cette semaine"
 
@@ -17433,7 +17181,7 @@ msgstr "Cette semaine"
 msgid "This week so far"
 msgstr "Cette semaine jusqu'à présent"
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Cette année"
 
@@ -17453,7 +17201,7 @@ msgstr "Étranglement"
 msgid "Thu"
 msgstr "Jeu"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Jeudi"
 
@@ -17470,7 +17218,7 @@ msgstr "À"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17503,7 +17251,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Période de temps"
 
@@ -17555,12 +17303,11 @@ msgstr "Horodateur"
 msgid "To"
 msgstr "À"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "Pour configurer une interface d'hôte, sélectionner un type d'élément pour tous les éléments"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Aujourd'hui"
 
@@ -17675,7 +17422,7 @@ msgstr "Période de stockage des tendances"
 msgid "Trends"
 msgstr "Tendances"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17683,7 +17430,7 @@ msgstr "Tendances"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Déclencheur"
 
@@ -17784,7 +17531,7 @@ msgstr "Nom du déclencheur"
 msgid "Trigger overview"
 msgstr "Aperçu des déclencheurs"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17857,11 +17604,11 @@ msgstr "Prototypes de déclencheurs mis à jour"
 msgid "Trigger severity"
 msgstr "Sévérité du déclencheur"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "État du déclencheur \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "État du déclencheur \"Problème\""
 
@@ -17878,7 +17625,7 @@ msgstr "Déclencheur mis à jour"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17913,7 +17660,7 @@ msgstr "Rogner"
 msgid "Tue"
 msgstr "Mar"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Mardi"
 
@@ -17926,7 +17673,7 @@ msgstr "Turc (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Deux éléments (\"%1$s\" et \"%2$s\") ne peuvent pas remplir un champ d'inventaire d'hôte \"%3$s\", cela mènerait à un conflit."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr "Deux éléments de carte devraient être sélectionnés"
 
@@ -17942,19 +17689,19 @@ msgstr "Deux éléments de carte devraient être sélectionnés"
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18006,7 +17753,7 @@ msgstr "Type d'information"
 msgid "Types"
 msgstr "Types"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18027,7 +17774,7 @@ msgstr "INCONNU"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18073,12 +17820,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "Les URLS doivent avoir les champs \"name\" et \"url\" pour la carte \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URLs"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18163,12 +17910,12 @@ msgstr "Débloquer"
 msgid "Unblock selected users?"
 msgstr "Débloquer les utilisateurs sélectionnés ?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18188,21 +17935,23 @@ msgstr "Unités"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Inconnu"
@@ -18220,7 +17969,7 @@ msgid "Unknown error"
 msgstr "Erreur inconnue"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Élément inconnu, cet élément n'existe pas dans l'hôte sélectionné"
@@ -18273,7 +18022,7 @@ msgstr "Supprimer lien au modèle"
 msgid "Unlink from templates"
 msgstr "Supprimer lien aux modèles"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Enlever la sourdine"
 
@@ -18304,7 +18053,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "Paramètre \"%2$s\" non supporté pour une condition de filtre de l'action \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "Paramètre \"%2$s\" non supporté pour une condition de filtre de la règle de découverte \"%1$s\"."
@@ -18314,7 +18063,7 @@ msgstr "Paramètre \"%2$s\" non supporté pour une condition de filtre de la rè
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "Paramètre \"%2$s\" non supporté pour le filtre de l'action \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "Paramètre \"%2$s\" non supporté pour le filtre de la règle de découverte \"%1$s\"."
@@ -18359,7 +18108,7 @@ msgstr "Fonctionne"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18372,7 +18121,7 @@ msgstr "Fonctionne"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18425,7 +18174,7 @@ msgstr "Opérations de mise à jour"
 msgid "Update problem"
 msgstr "Mise à jour du problème"
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18443,7 +18192,7 @@ msgstr "Télécharger"
 msgid "Upper level maps"
 msgstr "Cartes de niveau supérieur"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18478,7 +18227,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "Utilisé dans les actions"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18493,7 +18242,7 @@ msgstr "Utilisé dans les actions"
 msgid "User"
 msgstr "Utilisateur"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "L'utilisateur \"%1$s\" ne peut pas ne pas avoir de groupe d'utilisateurs."
@@ -18545,7 +18294,7 @@ msgstr "Utilisateur ajouté"
 msgid "User agent string"
 msgstr "Chaîne du \"user agent\""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Un utilisateur ne peut pas s'ajouter à un groupe désactivé ou à un groupe sans accès GUI."
@@ -18565,7 +18314,7 @@ msgid_plural "Users deleted"
 msgstr[0] "Utilisateur supprimé"
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18575,27 +18324,27 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Groupe d'utilisateurs"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Le groupe d'utilisateurs \"%1$s\" existe déjà."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "Le groupe d'utilisateurs \"%1$s\" est utilisé dans l'action \"%2$s\"."
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Le groupe d'utilisateurs \"%1$s\" est utilisé dans la configuration pour les messages envoyés lorsque la base de données est arrêtée."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Le groupe d'utilisateurs \"%1$s\" est utilisé dans le script \"%2$s\"."
@@ -18629,8 +18378,8 @@ msgstr[1] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18674,14 +18423,14 @@ msgstr "Mot de passe de l'utilisateur"
 msgid "User profile"
 msgstr "Profil utilisateur"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18750,7 +18499,7 @@ msgstr "Utilisateur mis à jour"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "L'utilisateur avec l'ID \"%1$s\" n'est pas disponible."
@@ -19066,14 +18815,14 @@ msgstr "Validation"
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19083,7 +18832,7 @@ msgstr "Validation"
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19125,7 +18874,7 @@ msgstr "La valeur \"%1$s\" est invalide pour le paramètre \"grid_show\". Les ch
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "La valeur \"%1$s\" est invalide pour le paramètre \"grid_show\". Les choix sont : \"%2$s\"."
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "La valeur \"%1$s\" est trop longue pour le champ \"%2$s\" - %3$d caractères. La longueur autorisée est de %4$d caractères."
@@ -19142,7 +18891,7 @@ msgstr "Statistiques du cache de valeurs. Les modes valides sont : total, free,
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Table de correspondance"
 
@@ -19185,11 +18934,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "Valeur de n'importe quel compteur de performances Windows. Retourne un entier, un flottant une chaîne ou un texte (selon la requête)"
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19236,7 +18986,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19323,7 +19073,7 @@ msgstr "Le nom visible ne peut pas être vide si le nom d'hôte est manquant."
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "M"
@@ -19340,7 +19090,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Avertissement"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19349,7 +19099,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Nous sommes désolés, le nombre maximal d'éléments à mémoriser a été atteint."
 
@@ -19365,7 +19115,7 @@ msgstr "Nous sommes désolés, le nombre maximal d'éléments à mémoriser a é
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web"
 
@@ -19377,7 +19127,7 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Supervision Web"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr "Scénario web"
 
@@ -19392,27 +19142,27 @@ msgstr "Le scénario web \"%1$s\" existe déjà sur l'hôte \"%2$s\"."
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Le scénario web \"%1$s\" existe déjà."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "Scénario web ajouté"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Scénario web supprimé"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Scénario web désactivé"
 msgstr[1] "Scénarios web désactivés"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Scénarion web activé"
 msgstr[1] "Scénarios web activés"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "Scénario web mis à jour"
 
@@ -19434,7 +19184,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Mer"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Mercredi"
 
@@ -19445,7 +19195,7 @@ msgstr "Mercredi"
 msgid "Weekly"
 msgstr "Hebdomadaire"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19461,12 +19211,12 @@ msgstr "Bienvenue dans"
 msgid "When active"
 msgstr "Lorsque actif"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19661,6 +19411,10 @@ msgstr "d/m/Y H:i"
 msgid "Y-m-d H:i:s"
 msgstr "d/m/Y H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr "Y1"
@@ -19722,7 +19476,7 @@ msgstr "Annuel"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19779,18 +19533,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19802,9 +19550,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Vous n'avez pas la permission d'effectuer cette opération."
 
@@ -19920,24 +19665,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr "un booléen est nécessaire"
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "une chaîne de caractères est attendue"
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19946,37 +19695,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr "une macro de découverte de bas niveau est attendue"
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr "un nombre est nécessaire"
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr "un nombre est trop grand"
@@ -19997,28 +19746,29 @@ msgstr "une durée relative est attendue"
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr "un temps est attendu"
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr "une période de temps est nécessaire"
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr "une plage de temps est nécessaire"
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr "une unité de temps est nécessaire"
@@ -20066,7 +19816,7 @@ msgstr "tous"
 msgid "all media"
 msgstr "tous les médias"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20074,42 +19824,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "un tableau est attendu"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr "un tableau ou une chaîne de caractères est attendu"
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20119,7 +19864,7 @@ msgid "an empty string is expected"
 msgstr "une chaîne vie est attendue"
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr "un nombre pair de caractères hexadécimaux est nécessaire"
 
@@ -20127,11 +19872,15 @@ msgstr "un nombre pair de caractères hexadécimaux est nécessaire"
 msgid "an explicit time is expected"
 msgstr "un temps explicite est attendu"
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20292,14 +20041,8 @@ msgstr "ne peut pas être changé"
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20329,19 +20072,11 @@ msgstr "ne peut pas être changé"
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20361,14 +20096,14 @@ msgstr "ne peut pas être changé"
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20376,7 +20111,7 @@ msgstr "ne peut pas être changé"
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "ne peut pas être vide"
@@ -20389,7 +20124,7 @@ msgstr "impossible de convertir en JSON, la valeur du résultat est trop longue"
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr "ne peut pas exécuter la requête API de défilement, les données peuvent être tronquées"
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr "impossible de mettre à jour la propriété pour la règle de découverte basée sur un modèle"
 
@@ -20423,7 +20158,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "la dépendance d'élément circulaire n'est pas autorisée"
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20441,7 +20176,8 @@ msgid "configure"
 msgstr "configurer"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr "contient"
@@ -20470,7 +20206,7 @@ msgstr "count () - Nombre de valeurs récupérées avec succès V (qui remplisse
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "j"
@@ -20532,7 +20268,7 @@ msgstr "décroissant"
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20554,13 +20290,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr "ne contient pas"
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr "n'est pas égal"
@@ -20586,7 +20322,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20623,6 +20360,10 @@ msgstr "l'expression est vide"
 msgid "failed to parse JSON"
 msgstr "impossible de parcourir le JSON"
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20669,7 +20410,7 @@ msgstr "paramètres de nettoyage globaux"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20710,6 +20451,11 @@ msgstr "icône"
 msgid "image"
 msgstr "image"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "dans"
@@ -20750,15 +20496,19 @@ msgstr "compte d'éléments incorrect"
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "syntaxe incorrecte à proximité de \"%1$s\""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20786,7 +20536,7 @@ msgstr "motif Prometheus invalide"
 msgid "invalid address range \"%1$s\""
 msgstr "plage d'adresses \"%1$s\" invalide"
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr "séquence d'octets invalide en UTF-8"
 
@@ -20815,27 +20565,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr "période de stockage de l'historique invalide"
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr "nom de groupe d'hôte non valide"
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr "nom d'hôte invalide"
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr "expression régulière invalide"
 
@@ -20863,7 +20613,7 @@ msgstr "est supérieur ou égal à"
 msgid "is less than or equals"
 msgstr "est inférieur ou égal à"
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr "n'est pas entouré de {} ou est malformé"
 
@@ -20949,12 +20699,12 @@ msgstr "règle de découverte bas niveau"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -21013,7 +20763,7 @@ msgstr "correspond à"
 msgid "max"
 msgstr "max"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21053,7 +20803,7 @@ msgid "min() - Minimum value for period T"
 msgstr "min () - Valeur minimale pour la période T"
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr "la longueur minimale est de %1$s caractères"
@@ -21080,8 +20830,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21096,27 +20846,14 @@ msgstr "doit être un utilisateur LDAP correct"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "doit être entre \"%1$s\" et \"%2$s\""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr "doit contenir au moins une macro de découverte de bas niveau"
 
@@ -21144,6 +20881,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21154,7 +20899,7 @@ msgstr ""
 msgid "name"
 msgstr "nom"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "nouveau"
 
@@ -21289,7 +21034,7 @@ msgstr "sortie"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21324,24 +21069,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21369,11 +21118,11 @@ msgstr ""
 msgid "regular expression"
 msgstr "expression régulière"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21385,15 +21134,15 @@ msgstr ""
 msgid "right"
 msgstr "droite"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21441,7 +21190,7 @@ msgstr ""
 msgid "short description"
 msgstr "description courte"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21460,15 +21209,15 @@ msgstr "description courte"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr "doit être vide"
 
@@ -21484,31 +21233,31 @@ msgstr "afficher les correspondances d'icônes"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21516,11 +21265,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr "sum () - Somme des valeurs d'une période T"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21536,8 +21285,8 @@ msgstr "les informations d'identification fournies ne sont pas uniques"
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21548,7 +21297,7 @@ msgstr "les informations d'identification fournies ne sont pas uniques"
 msgid "tag"
 msgstr "tag"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21557,13 +21306,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "ID du modèle \"%1$s\" passé %2$s fois"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21572,20 +21325,20 @@ msgstr "ID du modèle \"%1$s\" passé %2$s fois"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "le paramètre \"%1$s\" est manquant"
@@ -21617,39 +21370,39 @@ msgstr "troisième"
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr "décalage horaire"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr "time () - Heure actuelle"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr "timeleft () - Temps nécessaire pour atteindre le seuil estimé en fonction de la période T"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21663,7 +21416,7 @@ msgstr "déclencheur"
 msgid "trigger does not allow manual closing"
 msgstr "le déclencheur ne permet pas une fermeture manuelle"
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21675,26 +21428,26 @@ msgstr "un prototype de déclencheur ne peut pas être déplacé vers un autre m
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr "un déclencheur avec liens ne peut pas être déplacé vers un autre modèle ou hôte"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "taper ici pour rechercher"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21702,11 +21455,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21723,10 +21476,10 @@ msgstr "fin de clé inattendue"
 msgid "unexpected end of macro"
 msgstr "fin de macro inattendue"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21736,11 +21489,12 @@ msgstr "fin de macro inattendue"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr "paramètre inattendu \"%1$s\""
@@ -21766,8 +21520,8 @@ msgstr "texte \"%1$s\" inattendu"
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21792,6 +21546,10 @@ msgstr "suffixe de temps non supporté"
 msgid "unsupported version number"
 msgstr "numéro de version non supporté"
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21807,7 +21565,7 @@ msgstr "numéro de version non supporté"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21827,11 +21585,11 @@ msgstr "numéro de version non supporté"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "valeur"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr "la valeur \"%1$s\" existe déjà"
@@ -21849,76 +21607,85 @@ msgstr "valeur \"%1$s\" non trouvée"
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr "la valeur %1$s existe déjà"
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr "la valeur est trop longue"
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21930,18 +21697,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr "la valeur doit être l'un de %1$s"
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21950,7 +21715,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21963,11 +21728,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21984,7 +21749,7 @@ msgstr "mauvais type de règle de découverte"
 msgid "wrong item type"
 msgstr "mauvais type d'élément"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "a"
diff --git a/ui/locale/he/LC_MESSAGES/frontend.po b/ui/locale/he/LC_MESSAGES/frontend.po
index 1d9c5a017dd..d85945111ff 100644
--- a/ui/locale/he/LC_MESSAGES/frontend.po
+++ b/ui/locale/he/LC_MESSAGES/frontend.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
-"PO-Revision-Date: 2021-09-19 07:04+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
+"PO-Revision-Date: 2021-10-17 14:01+0300\n"
 "Last-Translator: Yaron <sh.yaron@gmail.com>\n"
 "Language-Team: none\n"
 "Language: he\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.5.1.3\n"
-"X-POOTLE-MTIME: 1632027850.000000\n"
+"X-POOTLE-MTIME: 1634472067.000000\n"
 
 #: include/classes/db/MysqlDbBackend.php:70
 #: include/classes/db/OracleDbBackend.php:142
@@ -93,7 +93,7 @@ msgid_plural "%1$d days"
 msgstr[0] "יום אחד"
 msgstr[1] "%1$d ימים"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -178,7 +178,7 @@ msgstr[1] "%1$s הודעות"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -192,7 +192,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "%1$s מתוך רכיב %2$s נמצא במצב תקלה"
 msgstr[1] "%1$s מתוך %2$s רכיבים נמצאים במצב תקלה"
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -225,14 +225,14 @@ msgstr[1] "נותרו %1$s ניסיונות"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "שנייה אחת"
 msgstr[1] "%1$s שניות"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "נותרו %1$s סמלים"
@@ -252,13 +252,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, דרגת חומרה, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, קריאה בלבד"
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -388,7 +388,7 @@ msgstr "גישה ל־API"
 msgid "API methods"
 msgstr "שיטות API"
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr "אסימון API"
 
@@ -449,10 +449,6 @@ msgstr "אסימוני API"
 msgid "Abscissa"
 msgstr "אבסיסה"
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr "SLA מקובל"
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "הגישה נדחתה"
@@ -495,7 +491,7 @@ msgstr "גישה לשירותים"
 msgid "Ack"
 msgstr "מוכר"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "הכרה"
 
@@ -503,7 +499,7 @@ msgstr "הכרה"
 msgid "Acknowledge problems"
 msgstr "הכרה בתקלות"
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "מוכר"
@@ -516,7 +512,7 @@ msgstr "אירועי תקלה מוכרים"
 msgid "Acknowledged RESOLVED events"
 msgstr "אירועים מוכרים שנפתרו"
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -543,9 +539,9 @@ msgstr "אירועים מוכרים שנפתרו"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -602,7 +598,7 @@ msgstr "המשימה „%1$s” כבר קיימת."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "למשימה „%1$s” לא הוגדרו פעולות."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr "המשימה „%2$s” אינה זמינה לתפקיד משתמש „%1$s”."
@@ -611,7 +607,7 @@ msgstr "המשימה „%2$s” אינה זמינה לתפקיד משתמש „%
 msgid "Action added"
 msgstr "נוספה משימה"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr "מחלקת הפעולה %1$s חייבת להרחיב את המחלקה %2$s."
@@ -660,8 +656,8 @@ msgstr "המשימה עודכנה"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "פעולות"
@@ -728,7 +724,7 @@ msgstr "פעיל עד"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -739,7 +735,7 @@ msgstr "פעיל עד"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -762,9 +758,9 @@ msgstr "פעיל עד"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -834,7 +830,7 @@ msgstr "פעיל עד"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "הוספה"
 
@@ -842,11 +838,11 @@ msgstr "הוספה"
 msgid "Add (message type limit reached)"
 msgstr "הוספה (הגעת לגבול כמות סוגי הודעות)"
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "הוספת וידג׳ט חדש"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "הוספת פריט צאצא"
 
@@ -854,7 +850,7 @@ msgstr "הוספת פריט צאצא"
 msgid "Add child service"
 msgstr "הוספת שירות צאצא"
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr "הוספת שירותים צאצאים"
 
@@ -871,7 +867,7 @@ msgstr "הוספת מארח"
 msgid "Add missing"
 msgstr "הוספת חוסר"
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "הוספת מספר מפות"
 
@@ -893,7 +889,7 @@ msgstr "הוספת מעקף חדש"
 msgid "Add page"
 msgstr "הוספת עמוד"
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr "הוספת שירותים הורים"
 
@@ -945,12 +941,12 @@ msgstr "הוספת קבוצת משתמשים"
 msgid "Add widget"
 msgstr "הוספת וידג׳ט"
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr "נוסף"
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -960,7 +956,7 @@ msgstr "נוסף, %1$s"
 msgid "Additional rule"
 msgstr "כלל נוסף"
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr "כללים נוספים"
 
@@ -973,7 +969,7 @@ msgstr "מנהל"
 msgid "Administration"
 msgstr "ניהול"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr "הגדרות מתקדמות"
 
@@ -995,7 +991,7 @@ msgstr "הגיל קטן מ־"
 msgid "Age less than %1$s"
 msgstr "הגיל קטן מ־%1$s"
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1067,7 +1063,7 @@ msgstr "יישור רכיבים במפה"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "הכול"
 
@@ -1085,7 +1081,7 @@ msgstr "כל הקבוצות"
 msgid "All hosts"
 msgstr "כל המארחים"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "יש לציין „שם” ו־„כתובת” לכל הקישורים"
 
@@ -1103,7 +1099,7 @@ msgstr "כל התקלות"
 msgid "All problems if tag values match"
 msgstr "כל התקלות אם ערכי התגית תואמים"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr "כל השירותים"
 
@@ -1216,15 +1212,15 @@ msgstr "שגיאת יישום."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "החלה"
 
@@ -1242,7 +1238,7 @@ msgstr "בהמשך"
 msgid "Apr"
 msgstr "אפר׳"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "אפריל"
 
@@ -1270,7 +1266,7 @@ msgstr "סוג השטח"
 msgid "Arithmetic"
 msgstr "חשבוני"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr "כפי שזה"
 
@@ -1319,7 +1315,7 @@ msgstr "בשעה (שעה:דקה)"
 msgid "At least one UI element must be checked."
 msgstr "יש לסמן לפחות רכיב מנשק משתמש אחד."
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr "יש להפעיל לפחות רכיב מנשק משתמש אחד לתפקיד המשתמש „%1$s”."
@@ -1328,7 +1324,7 @@ msgstr "יש להפעיל לפחות רכיב מנשק משתמש אחד לתפ�
 msgid "At least one action is mandatory."
 msgstr "חובה לפחות פעולה אחת."
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1340,6 +1336,11 @@ msgstr "לפחות משתמש פעיל אחד חייב להיות קיים עם
 msgid "At least one host group or host must be selected."
 msgstr "חובה לבחור לפחות קבוצת מארחים אחת."
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr "חובה לציין מארח או תבנית אחת לפחות."
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1351,7 +1352,7 @@ msgstr "יש ליצור תקופת תחזוקה אחת לפחות."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr "אמורה להיות תמיכה באחד לפחות מבין MySQL,‏ PostgreSQL או Oracle."
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr "יש לבחור בפעילות אחת לפחות."
 
@@ -1407,7 +1408,7 @@ msgstr "הגדרות פיקוח"
 msgid "Aug"
 msgstr "אוג׳"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "אוגוסט"
 
@@ -1420,7 +1421,7 @@ msgstr "אסימון אימות"
 msgid "AuthN requests"
 msgstr "בקשות AuthN"
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1497,7 +1498,7 @@ msgstr "יציאה אוטומטית"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1512,7 +1513,7 @@ msgstr "מיפוי סמלים אוטומטי"
 msgid "Automatic icon selection"
 msgstr "בחירת סמלים אוטומטית"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1564,7 +1565,7 @@ msgstr "מספר ממוצע של בקשות כתיבה ממתינות לכונן
 msgid "Avoid easy-to-guess passwords"
 msgstr "מומלץ להימנע מססמאות שקל לנחש"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr "צירים"
 
@@ -1627,7 +1628,7 @@ msgstr "פונקציות על סיביות"
 msgid "Blocked"
 msgstr "חסום"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "כחול"
 
@@ -1681,11 +1682,11 @@ msgstr "שתי הססמאות חייבות להיות זהות."
 msgid "Bottom"
 msgstr "תחתית"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "קידום לעבר החזית"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "קידום לחזית"
 
@@ -1711,7 +1712,7 @@ msgstr "CERT"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1756,8 +1757,8 @@ msgstr "CRLF"
 msgid "CSV to JSON"
 msgstr "CSV ל־JSON"
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr "אמור להיות CUID"
 
@@ -1766,7 +1767,7 @@ msgstr "אמור להיות CUID"
 msgid "Calculated"
 msgstr "מחושב"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr "לוח שנה"
 
@@ -1791,7 +1792,7 @@ msgstr "קריאה"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1804,8 +1805,8 @@ msgstr "קריאה"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "ביטול"
 
@@ -1835,7 +1836,7 @@ msgstr "לא ניתן להוסיף משימה"
 msgid "Cannot add correlation"
 msgstr "לא ניתן להוסיף יחס"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr "לא ניתן להוסיף עמוד ללוח מחוונים: נוספו כבר %1$d עמודי לוחות מחוונים שזו הכמות המרבית."
@@ -1845,7 +1846,7 @@ msgstr "לא ניתן להוסיף עמוד ללוח מחוונים: נוספו
 msgid "Cannot add dependency from a host to a template."
 msgstr "לא ניתן להוסיף תלות ממארח לתבנית."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1876,8 +1877,8 @@ msgid "Cannot add host prototype"
 msgstr "לא ניתן להוסיף אבטיפוס למארח"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "לא ניתן להוסיף תמונה"
 
@@ -1969,15 +1970,15 @@ msgstr "לא ניתן להוסיף משתמש"
 msgid "Cannot add user group"
 msgstr "לא ניתן להוסיף משתמש לקבוצה"
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "לא ניתן להוסיף תרחיש רשת"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr "לא ניתן להוסיף וידג׳ט: אין מספיק מקום פנוי בלוח המחוונים."
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr "לא ניתן להסיר"
@@ -1997,33 +1998,29 @@ msgstr "לא ניתן להתאגד אל שרת ה־LDAP."
 msgid "Cannot build expression tree: %1$s."
 msgstr "לא ניתן לבנות עץ ביטויים: %1$s."
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr "אי אפשר לשנות את סוג המשתמש של תפקיד עצמי."
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "לא ניתן לפנות את ההיסטוריה"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr "לא ניתן לפנות את ההיסטוריה: לפחות אחד מהפריטים הנבחרים לא שייך לאף מארח שתחת מעקב"
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "לא ניתן לשכפל את האבטיפוס לתרשימים."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "לא ניתן לשכפל את אבות הטיפוס של המארחים."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "לא ניתן לשכפל את אבות הטיפוס של הפריטים."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "לא ניתן לשכפל את אבות הטיפוס של ההקפצות."
 
@@ -2050,7 +2047,7 @@ msgid_plural "Cannot copy graphs"
 msgstr[0] "לא ניתן להעתיק תרשים"
 msgstr[1] "לא ניתן להעתיק תרשימים"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "לא ניתן להעתיק פריט"
@@ -2102,8 +2099,8 @@ msgstr "לא ניתן ליצור מפת סמלים"
 msgid "Cannot create scheduled report"
 msgstr "לא ניתן ליצור דוח מתוזמן"
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr "לא ניתן ליצור את השירות „%1$s”:‏ %2$s."
@@ -2132,7 +2129,7 @@ msgstr "לא ניתן למחוק את המשתמש הפנימי של Zabbix בש
 msgid "Cannot delete action"
 msgstr "לא ניתן למחוק את המשימה"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr "לא ניתן למחוק את תפקיד המשתמש המוקצה „%1$s”."
@@ -2198,7 +2195,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con
 msgstr[0] "לא ניתן למחוק את המארח כיוון שעל משימת התחזוקה „%1$s” להכיל מארח אחד ומעלה או קבוצת מארחים אחת ומעלה."
 msgstr[1] "לא ניתן למחוק את המארחים הנבחרים כיוון שעל משימת התחזוקה „%1$s” להכיל מארח אחד ומעלה או קבוצת מארחים אחת ומעלה."
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2209,11 +2206,11 @@ msgstr[1] "לא ניתן למחוק את קבוצות המארחים הנבחר�
 msgid "Cannot delete host prototypes"
 msgstr "לא ניתן למחוק את אבות הטיפוס של המארחים"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "לא ניתן למחוק את סמל המפה"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "לא ניתן למחוק את התמונה"
 
@@ -2238,7 +2235,7 @@ msgstr "לא ניתן למחוק אבטיפוס של פרי"
 msgid "Cannot delete item prototypes"
 msgstr "לא ניתן למחוק אבות טיפוס של פריטים"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "לא ניתן למחוק פריטים"
 
@@ -2269,7 +2266,7 @@ msgid_plural "Cannot delete proxies"
 msgstr[0] "לא ניתן למחוק מתווך"
 msgstr[1] "לא ניתן למחוק מתווכים"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr "לא ניתן למחוק תפקיד משתמש לקריאה בלבד „%1$s”."
@@ -2292,7 +2289,7 @@ msgid_plural "Cannot delete scripts"
 msgstr[0] "לא ניתן למחוק סקריפט"
 msgstr[1] "לא ניתן למחוק סקריפטים"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "לא ניתן למחוק את הסקריפטים. בסקריפט „%1$s” נעשה שימוש במשימת הפעולה „%2$s”."
@@ -2307,8 +2304,8 @@ msgid_plural "Cannot delete services"
 msgstr[0] "לא ניתן למחוק שירות"
 msgstr[1] "לא ניתן למחוק שירותים"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr "לא ניתן למחוק את השירות „%1$s”:‏ %2$s."
@@ -2337,7 +2334,7 @@ msgstr "לא ניתן למחוק אבטיפוס פריט מתבנית."
 msgid "Cannot delete templated item."
 msgstr "לא ניתן למחוק פריט בתבנית."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "לא ניתן למחוק פריטים בתבנית."
 
@@ -2390,7 +2387,7 @@ msgid_plural "Cannot delete user roles"
 msgstr[0] "לא ניתן למחוק תפקיד משתמש"
 msgstr[1] "לא ניתן למחוק תפקידי משתמשים"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "לא ניתן למחוק תרחיש רשת"
 
@@ -2425,7 +2422,7 @@ msgid_plural "Cannot disable hosts"
 msgstr[0] "לא ניתן לנטרל מארח"
 msgstr[1] "לא ניתן לנטרל מארחים"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "לא ניתן לנטרל פריט"
@@ -2456,7 +2453,7 @@ msgid_plural "Cannot disable triggers"
 msgstr[0] "לא ניתן לנטרל הקפצה"
 msgstr[1] "לא ניתן לנטרל הקפצות"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "לא ניתן לנטרל תרחיש רשת"
@@ -2503,7 +2500,7 @@ msgid_plural "Cannot enable hosts"
 msgstr[0] "לא ניתן להפעיל מארח"
 msgstr[1] "לא ניתן להפעיל מארחים"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "לא ניתן להפעיל פריט"
@@ -2534,7 +2531,7 @@ msgid_plural "Cannot enable triggers"
 msgstr[0] "לא ניתן להפעיל הקפצה"
 msgstr[1] "לא ניתן להפעיל הקפצות"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "לא ניתן להפעיל תרחיש רשת"
@@ -2548,7 +2545,7 @@ msgstr "לא ניתן להעריך ביטוי"
 msgid "Cannot execute script."
 msgstr "לא ניתן להריץ סקריפט."
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr "לא ניתן להרחיב מאקרואים."
 
@@ -2582,8 +2579,8 @@ msgstr "לא ניתן למצוא את המארח „%1$s” הנמצא בשימ�
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "לא ניתן למצוא את קבוצת המארחים „%1$s” עבור האבטיפוס למארח „%2$s” של כלל הגילוי „%3$s” על „%4$s”."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2681,27 +2678,23 @@ msgstr "לא ניתן למצוא את מפת הערכים „%1$s” שמשמש�
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "לא ניתן למצוא את מפת הערכים „%1$s” שמשמשת את אבטיפוס הפריט „%2$s” של כלל הגילוי „%3$s” תחת „%4$s”."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr "לא ניתן לעצב עץ. נא לבדוק את המבנה הלוגי בקישורי השירות."
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "שם התצוגה של התבנית לא יכול להיות ריק."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
-msgstr ""
+msgstr "לא יכול להיות כלל „%2$s” שחורג מבררת המחדל בזמן ש־„%3$s” מוגדר לכדי %4$d לתפקיד המשתמש „%1$s”."
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
-msgstr ""
+msgstr "לא יכול להיות ערך תגית שאינו ריק כשיש תגית ריקה בכלל „%2$s” לתפקיד המשתמש „%1$s”."
 
 #: include/classes/import/importers/CTemplateImporter.php:253
 #: include/classes/import/importers/CTemplateImporter.php:405
@@ -2711,7 +2704,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
 msgstr[0] "לא ניתן לייבא את התבנית „%1$s”, התבנית המקושרת „%2$s” אינה קיימת."
 msgstr[1] "לא ניתן לייבא את התבנית „%1$s”, התבניות המקושרות „%2$s” אינן קיימות."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "לא ניתן להוסיף ביטוי הקפצה"
 
@@ -2725,7 +2718,7 @@ msgid "Cannot link template."
 msgstr "לא ניתן לקשר תבנית."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2757,17 +2750,17 @@ msgstr "לא ניתן לעדכן כמותית את שם תצוגת התבנית.
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr "לא ניתן להעביר מזהי תבניות כפולים לקישוריות: %1$s."
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "לא ניתן לבצע פעולת delete על הטבלה „%1$s” ללא תנאי where."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "לא ניתן לבצע פעולת update על הטבלה „%1$s” בלי ערכים."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "לא ניתן לבצע פעולת update על הטבלה „%1$s” ללא תנאי where."
@@ -2794,7 +2787,7 @@ msgstr "לא ניתן לקרוא YAML‏: %1$s."
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "לא ניתן לקרוא את התגובה, יש לבדוק את החיבור לשרת ה־Zabbix‏ „%1$s”."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "לא ניתן לשנות את שם משתמש האורח."
 
@@ -2813,7 +2806,7 @@ msgstr "לא ניתן לשמור את הווידג׳ט „%1$s”."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "לא ניתן לשלוח פקודה, נא לבדוק את החיבור לשרת ה־Zabbix‏ „%1$s“."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr "לא ניתן לשלוח בקשה"
 
@@ -2853,12 +2846,12 @@ msgstr "לא ניתן להגדיר את שדות המלאי עבור מלאי מ
 msgid "Cannot set session cookie."
 msgstr "לא ניתן להגדיר עוגיית הפעלה."
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
-msgstr ""
+msgstr "אי אפשר לציין משתנה „propagation_rule” (כלל הפצה) מבלי לציין משתנה „propagation_value” (ערך הפצה) לשירות „%1$s”."
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr "לא ניתן לתמוך בהתראה קולית עבור התקן זה."
 
@@ -2877,7 +2870,7 @@ msgid_plural "Cannot unblock users"
 msgstr[0] "לא ניתן לשחרר חסימת משתמש"
 msgstr[1] "לא ניתן לשחרר חסימות משתמשים"
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "לא ניתן לנתק ולפנות תרחישי רשת."
 
@@ -2890,7 +2883,7 @@ msgstr "לא ניתן לנתק ולפנות תבנית"
 msgid "Cannot unlink template."
 msgstr "לא ניתן לנתק ולפנות תבנית."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr "לא ניתן לנתק את ההקפצה „%1$s”, יש לה פריטים מתבנית שנותרה מקושרת למארח."
@@ -2943,11 +2936,6 @@ msgstr "לא ניתן לעדכן את „%2$s“ עבור הפריט שהתגל�
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "לא ניתן לעדכן את „%2$s” עבור הקפצה שהתגלתה „%1$s”."
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "לא ניתן לעדכן את „imagetype“ עבור התמונה „%1$s“."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2957,9 +2945,10 @@ msgstr "לא ניתן לעדכן אסימון API"
 msgid "Cannot update a discovered graph."
 msgstr "לא ניתן לעדכן את התרשים שהתגלה."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "לא ניתן לעדכן קבוצת מארחים שהתגלתה."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr "לא ניתן לעדכן את קבוצת המארחים שהתגלתה „%1$s”."
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3018,9 +3007,7 @@ msgstr "לא ניתן לעדכן את האבטיפוס של התרשים"
 msgid "Cannot update group"
 msgstr "לא ניתן לעדכן קבוצה"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "לא ניתן לעדכן קבוצות עבור המארח שהתגלה „%1$s”."
@@ -3043,13 +3030,13 @@ msgstr[1] "לא ניתן לעדכן אבות טיפוס של מארח"
 msgid "Cannot update hosts"
 msgstr "לא ניתן לעדכן מארחים"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "לא ניתן לעדכן סמל מפה"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "לא ניתן לעדכן תמונה"
 
@@ -3103,12 +3090,12 @@ msgstr "לא ניתן לעדכן את מפת הרשת"
 msgid "Cannot update proxy"
 msgstr "לא ניתן לעדכן את המתווך"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "לא ניתן לעדכן את המתווך עבור המארח שהתגלה „%1$s”."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr "לא ניתן לעדכן תפקיד משתמש לקריאה בלבד „%1$s”."
@@ -3128,17 +3115,17 @@ msgstr "לא ניתן לעדכן דוח מתוזמן"
 msgid "Cannot update script"
 msgstr "לא ניתן לעדכן את הסקריפט"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr "לא ניתן לעדכן את היקף הסקריפט. הסקריפט „%1$s” משמש את הפעולה „%2$s”."
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr "לא ניתן לעדכן את השירות „%1$s”:‏ %2$s."
@@ -3213,7 +3200,7 @@ msgstr[1] "לא ניתן לעדכן קבוצות משתמשים"
 msgid "Cannot update user role"
 msgstr "לא ניתן לעדכן תפקיד משתמש"
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "לא ניתן לעדכן תרחישי רשת"
 
@@ -3313,8 +3300,8 @@ msgid "Character string not included"
 msgstr "מחרוזת תווים אינה כלולה"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr "תווים"
 
@@ -3429,7 +3416,7 @@ msgstr "בודקת ביצועים של שירות UDP. מחזירה 0 - השיר
 msgid "Checks should be unique."
 msgstr "הבדיקות צריכות להיות ייחודיות."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr "שירותים צאצאים"
 
@@ -3450,7 +3437,7 @@ msgstr "הפנייה מעגלית בתבניות: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "קישור תבניות מעגלי אסור."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr "המחלקה %1$s לא נמצאה לפעולה %2$s."
@@ -3471,11 +3458,11 @@ msgstr "פינוי היסטוריה ומגמות"
 msgid "Clear when unlinking"
 msgstr "פינוי בעת ניתוק"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr "יש לגרור לגודל הרצוי."
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr "יש ללחוץ כדי לצפות או לערוך"
 
@@ -3490,7 +3477,7 @@ msgstr "שעון"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3505,7 +3492,7 @@ msgstr "שעון"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "שכפול"
 
@@ -3516,8 +3503,8 @@ msgstr "שכפול"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "סגירה"
 
@@ -3528,13 +3515,13 @@ msgstr "סגירה"
 msgid "Close expression constructor"
 msgstr "סגירת מרכיב הביטויים"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "סגירת אירוע חדש"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "סגירת אירועים ישנים"
 
@@ -3547,8 +3534,8 @@ msgid "Close problems"
 msgstr "סגירת תקלות"
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "צמצום"
 
@@ -3565,7 +3552,7 @@ msgstr "צמצום סרגל הצד"
 msgid "Color"
 msgstr "צבע"
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr "הצבע „%1$s” שגוי: אמור להיות צבע קוד הקסדצימלי (6 תווים)."
@@ -3631,7 +3618,7 @@ msgstr "דחיסה"
 msgid "Concurrent sessions"
 msgstr "הפעלות בו־זמנית"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3642,17 +3629,12 @@ msgstr "תנאי"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "לא נעשה שימוש בתנאי „%2$s” בנוסחה „%3$s” עבור המשימה „%1$s”."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "לא נעשה שימוש בתנאי „%2$s” בנוסחה „%3$s” עבור היחס „%1$s”."
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "לא נעשה שימוש בתנאי „%2$s” בנוסחה „%3$s” עבור כלל הגילוי „%1$s”."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr "התנאי „%2$s” לא נמצא בשימוש בנוסחה „%3$s” למעקף „%1$s”."
@@ -3662,17 +3644,12 @@ msgstr "התנאי „%2$s” לא נמצא בשימוש בנוסחה „%3$s”
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "התנאי „%2$s” בו נעשה שימוש בנוסחה „%3$s” עבור המשימה „%1$s” אינו מוגדר."
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "התנאי „%2$s” בו נעשה שימוש בנוסחה „%3$s” עבור היחס „%1$s” אינו מוגדר."
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "התנאי „%2$s” בו נעשה שימוש בנוסחה „%3$s” עבור כלל הגילוי „%1$s” אינו מוגדר."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr "התנאי „%2$s” שנמצא בשימוש בנוסחה „%3$s” למעקף „%1$s” אינו מוגדר."
@@ -3688,7 +3665,7 @@ msgstr "תנאים"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "הגדרות"
 
@@ -3751,7 +3728,7 @@ msgstr "הגדרת מארחים"
 msgid "Configuration of housekeeping"
 msgstr "הגדרות של סדר וניקיון"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "הגדרת מיפוי סמלים"
@@ -3858,7 +3835,7 @@ msgstr "טקסט אימות"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "ברכותינו! התקנת בהצלחה את מנשק המשתמש של Zabbix."
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3962,7 +3939,7 @@ msgstr "פרטי קשר"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4022,7 +3999,7 @@ msgstr "מכיל"
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr "פקדי תוכן"
 
@@ -4061,8 +4038,8 @@ msgstr "נקודות ציון"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "העתקה"
 
@@ -4071,12 +4048,11 @@ msgstr "העתקה"
 msgid "Copy to clipboard"
 msgstr "העתקה ללוח הגזירים"
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "יחס"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "היחס „%1$s“ כבר קיים."
@@ -4103,16 +4079,6 @@ msgid_plural "Correlations enabled"
 msgstr[0] "היחס הופעל"
 msgstr[1] "היחסים הופעלו"
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "ליחס חסר הפרמטר: %1$s"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "שם היחס לא יכול להיות ריק."
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr "כלל יחס"
@@ -4121,14 +4087,10 @@ msgstr "כלל יחס"
 msgid "Correlation updated"
 msgstr "יחס עודכן"
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "לא ניתן לשמור את התמונה!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "ספירה"
 
@@ -4192,11 +4154,11 @@ msgstr "יצירת יחס"
 msgid "Create dashboard"
 msgstr "יצירת לוח מחוונים"
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr "יצירת כלל גילוי תלוי"
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr "יצירת פריט תלוי"
 
@@ -4313,7 +4275,7 @@ msgstr "יצירת מפה"
 msgid "Create media type"
 msgstr "יצירת סוג מדיה"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "יצירת חדש"
 
@@ -4337,7 +4299,7 @@ msgstr "יצירת שירות"
 msgid "Create template"
 msgstr "יצירת תבנית"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "יצירת הקפצה"
 
@@ -4500,7 +4462,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "שם DNS"
@@ -4512,11 +4474,11 @@ msgstr "שם DNS"
 msgid "Daily"
 msgstr "יומי"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "כהה"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4537,8 +4499,8 @@ msgstr "לוח המחוונים „%1$s“ כבר קיים."
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr "לוח המחוונים „%1$s” משמש את הדוח „%2$s”."
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr "נוצר לוח מחוונים"
 
@@ -4561,9 +4523,9 @@ msgstr "מאפייני לוח המחוונים"
 msgid "Dashboard sharing"
 msgstr "שיתוף לוח מחוונים"
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr "לוח המחוונים עודכן"
 
@@ -4587,7 +4549,7 @@ msgstr "לוח מחוונים עם המזהה „%1$s” אינו זמין."
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr "לוחות מחוונים"
 
@@ -4615,7 +4577,7 @@ msgstr "סקירת נתונים"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr "ערכת נתונים"
 
@@ -4757,7 +4719,7 @@ msgstr "יום בשבוע"
 msgid "Days"
 msgstr "ימים"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "ניפוי שגיאות"
 
@@ -4771,26 +4733,26 @@ msgstr "מצב ניפוי שגיאות"
 msgid "Dec"
 msgstr "דצמ׳"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "דצמבר"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr "מקומות עשרוניים"
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr "הקטנה בשיעור"
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "בררת מחדל"
 
@@ -4883,7 +4845,7 @@ msgstr "בהשהיה של"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4907,8 +4869,8 @@ msgstr "בהשהיה של"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "מחיקה"
 
@@ -4933,11 +4895,11 @@ msgstr "למחוק ולפנות את התבנית? (אזהרה: כל המארח�
 msgid "Delete current action?"
 msgstr "למחוק את המשימה הנוכחית?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "למחוק את היחס הנוכחי?"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr "למחוק את לוח המחוונים?"
 
@@ -4981,7 +4943,7 @@ msgstr "למחוק אבטיפוס פריט?"
 msgid "Delete item?"
 msgstr "למחוק פריט?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "למחוק קישורים בין הפריטים הנבחרים?"
 
@@ -5037,7 +4999,7 @@ msgstr "למחוק את לוחות המחוונים הנבחרים?"
 msgid "Delete selected discovery rules?"
 msgstr "למחוק את כללי הגילוי הנבחרים?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "למחוק את הפריטים הנבחרים?"
 
@@ -5142,7 +5104,7 @@ msgstr "למחוק את השירות הנבחר?"
 msgid "Delete selected services?"
 msgstr "למחוק את השירותים הנבחרים?"
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "למחוק את הצורות הנבחרות?"
 
@@ -5186,7 +5148,7 @@ msgstr "למחוק הקפצה?"
 msgid "Delete web scenario?"
 msgstr "למחוק תרחיש רשת?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr "נמחק"
 
@@ -5231,7 +5193,7 @@ msgstr "רשימת דחייה"
 msgid "Dependencies"
 msgstr "תלויות"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "תלוי"
 
@@ -5239,7 +5201,7 @@ msgstr "תלוי"
 msgid "Dependent item"
 msgstr "פריט תלוי"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5249,7 +5211,7 @@ msgstr "תלוי ב־"
 msgid "Deployment status"
 msgstr "מצב הטמעה"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5282,7 +5244,7 @@ msgid "Description"
 msgstr "תיאור"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5448,10 +5410,10 @@ msgstr "להשבית את תרחישי הרשת הנבחרים?"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5534,7 +5496,7 @@ msgid "Discovery by proxy"
 msgstr "התגלה על ידי המתווך"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "בדיקת גילוי"
 
@@ -5546,7 +5508,7 @@ msgstr "בדיקות גילוי"
 msgid "Discovery list"
 msgstr "רשימת גילוי"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "פריט גילוי"
 
@@ -5578,7 +5540,7 @@ msgstr "גילוי מערכות קבצים של מכונות וירטואליו�
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr "גילוי מכונות וירטואליות של VMware.‏ <url> - כתובת שירות VMware. מחזירה JSON"
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5586,12 +5548,12 @@ msgstr "גילוי מכונות וירטואליות של VMware.‏ <url> - כ�
 msgid "Discovery rule"
 msgstr "כלל גילוי"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "כלל הגילוי „%1$s” כבר קיים על „%2$s”, התקבל בירושה מתבנית אחרת."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "כלל הגילוי „%1$s” כבר קיים תחת „%2$s”."
@@ -5604,7 +5566,7 @@ msgstr "כלל הגילוי „%1$s” כבר קיים תחת „%2$s”."
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "כלל הגילוי „%1$s“ כבר קיים."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr "לא ניתן להעתיק את כלל הגילוי „%1$s” ללא פריט ההורה שלו."
@@ -5645,7 +5607,7 @@ msgstr "כלל הגילוי התעדכן"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5656,7 +5618,7 @@ msgstr "כללי גילוי"
 msgid "Discovery rules deleted"
 msgstr "כללי גלוי נמחקו"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "מצב הגילוי"
@@ -5693,10 +5655,11 @@ msgid "Display stacked graph"
 msgstr "הצגת תרשים מוערם"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "מוצגים %1$s מתוך %2$s שנמצאו"
@@ -5706,7 +5669,7 @@ msgstr "מוצגים %1$s מתוך %2$s שנמצאו"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "מוצגים %1$s עד %2$s מתוך %3$s פריטים שנמצאו"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr "אפשרויות הצגה"
 
@@ -5728,7 +5691,7 @@ msgstr "לא לשמור היסטוריה"
 msgid "Do not keep trends"
 msgstr "לא לשמור מגמות"
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "להחליף את הביטוי המותנה?"
 
@@ -5784,7 +5747,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "למטה"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr "הורדת תמונה"
 
@@ -5792,7 +5755,7 @@ msgstr "הורדת תמונה"
 msgid "Download the configuration file"
 msgstr "הורדת קובץ ההגדרות"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5811,18 +5774,6 @@ msgstr "ציור"
 msgid "Draw style"
 msgstr "סגנון ציור"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "ערך „%1$s” כפול „%2$s” עבור היחס „%3$s”."
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr "ערך „%1$s” כפול „%2$s” עבור יחס."
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5835,11 +5786,6 @@ msgstr "ערך „name” (שם) כפול „%1$s” עבור מפה."
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr "„usrgrpid” (מזהה קבוצת משתמשים) כפול „%1$s” בקבוצות משתמשים למפה „%2$s”."
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr "תנאים כפולים ליחס „%1$s”."
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5891,7 +5837,7 @@ msgstr "פריט דינמי"
 msgid "Dynamic items"
 msgstr "פריטים דינמיים"
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "לכל כתובת צריך להיות שם ייחודי. נא לוודא שאין כפילות שם לכתובת"
 
@@ -5900,11 +5846,11 @@ msgid "Each item"
 msgstr "כל פריט"
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5918,8 +5864,8 @@ msgstr "כל פריט"
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "עריכה"
 
@@ -5935,11 +5881,11 @@ msgstr "עריכת מפה"
 msgid "Edit operation"
 msgstr "עריכת פעולה"
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr "עריכת רכיב בעץ"
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "עריכת הקפצה"
 
@@ -5999,21 +5945,17 @@ msgstr "קובץ מפתח SSL ריק עבור תרחיש הרשת „%1$s”."
 msgid "Empty color."
 msgstr "צבע ריק."
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "מזהה היחס ריק."
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "מזהה נוסחה ריק לתנאי מסנן עבור המשימה „%1$s”."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "מזהה נוסחה ריק לתנאי מסנן עבור כלל הגילוי „%1$s”."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "מאקרו תנאי מסנן ריק לכלל הגילוי „%1$s”."
@@ -6029,25 +5971,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr "סוג תנאי מסנן ריק לפעולה „%1$s”."
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6057,14 +5993,6 @@ msgstr "פרמטר הקלט ריק."
 msgid "Empty map ID."
 msgstr "מזהה המפה ריק."
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "מזהה סוג מדיה ריק."
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "פרמטרים ריקים"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6230,7 +6158,7 @@ msgstr "הפעלת לכידה"
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6241,7 +6169,7 @@ msgstr "הפעלת לכידה"
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6284,7 +6212,7 @@ msgid "English (en_US)"
 msgstr "אנגלית (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6300,7 +6228,7 @@ msgstr "כבר קיימת רשומה עם המזהה הייחודי „%1$s”."
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6319,19 +6247,19 @@ msgstr "שווה"
 msgid "Error"
 msgstr "שגיאה"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "שגיאה בבקשת החיפוש בטבלה „%1$s“."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr "הודעת שגיאה"
 
 #: include/blocks.inc.php:643
 #, c-format
 msgid "Error! Unable to start Zabbix server due to unsupported %1$s database server version. Must be at least (%2$s)"
-msgstr ""
+msgstr "שגיאה! לא ניתן להפעיל את שרת ה־Zabbix עקב גרסת מסד נתונים %1$s שאינה נתמכת. חייבת להיות לפחות (%2$s)"
 
 #: include/classes/screens/CScreenHttpTestDetails.php:111
 #: include/classes/screens/CScreenHttpTestDetails.php:182
@@ -6351,7 +6279,7 @@ msgstr "מזהה אירוע"
 msgid "Event acknowledged"
 msgstr "אירוע הוכר"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6359,7 +6287,7 @@ msgid "Event correlation"
 msgstr "יחס בין אירועים"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "כללי יחסים בין אירועים"
@@ -6394,11 +6322,11 @@ msgstr "ניטור יומן אירועים. מחזירה יומן אירועים
 msgid "Event name"
 msgstr "שם אירוע"
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "צמד תגיות של אירוע"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "סוג אירוע"
 
@@ -6443,15 +6371,10 @@ msgstr "להדיר"
 msgid "Exclude host groups"
 msgstr "הדרת קבוצות מארחים"
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "הרצה"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "שגיאת הרצת SQL‏ [%1$s] תחת [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr "הרצת שאילתת WMI והחזרת מסמך ה־JSON עם כל הפריטים הנבחרים"
@@ -6489,7 +6412,7 @@ msgstr "רץ"
 msgid "Executed script"
 msgstr "סקריפט שרץ"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "אימות הרצה"
 
@@ -6505,8 +6428,8 @@ msgid "Exists"
 msgstr "קיים"
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "הרחבה"
 
@@ -6627,7 +6550,7 @@ msgstr "ביטויים"
 msgid "External check"
 msgstr "בדיקה חיצונית"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "ו׳"
@@ -6654,8 +6577,8 @@ msgstr "נכשל"
 msgid "Failed login"
 msgstr "כניסה שנכשלה"
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6666,26 +6589,26 @@ msgstr "יצירת לוח מחוונים נכשלה"
 msgid "Failed to parse URL."
 msgstr "פענוח הכתובת נכשל."
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr "הדבקת עמוד לוח המחוונים נכשלה."
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr "הדבקת הווידג׳ט נכשלה."
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr "עדכון לוח המחוונים נכשל"
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr "עדכון מאפייני עמוד לוח המחוונים נכשל."
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr "עדכון מאפייני לוח המחוונים נכשל."
 
@@ -6693,7 +6616,7 @@ msgstr "עדכון מאפייני לוח המחוונים נכשל."
 msgid "Failed to update template."
 msgstr "עדכון התבנית נכשל."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr "עדכון מאפייני הווידג׳ט נכשל."
 
@@ -6717,7 +6640,7 @@ msgstr "מפות מועדפות"
 msgid "Feb"
 msgstr "פבר׳"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "פברואר"
 
@@ -6739,10 +6662,9 @@ msgstr "לא ניתן להגדיר את השדה „%1$s” כריק (NULL)."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6753,13 +6675,6 @@ msgstr "השדה „%1$s” הוא בגדר חובה."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "לשדה „%1$s” חסר ערך עבור המפה „%2$s”."
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "לשדה „%1$s” חסר ערך עבור סוג המדיה „%2$s”."
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6778,11 +6693,6 @@ msgstr "השדה „%1$s” אינו מספר שלם וחיובי."
 msgid "Field \"%1$s\" is not string."
 msgstr "השדה „%1$s” אינו מחרוזת."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "השדה „%1$s” נדרש עבור סוג המדיה „%2$s”."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6797,10 +6707,6 @@ msgstr "השדה „host” (מארח) הוא בגדר חובה."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr "מחרוזת אימות קובץ, מחושבת על ידי האלגוריתם cksum מבית יוניקס. מחזירה מספר שלם וחיובי עבור crc32 (בררת מחדל) ומחרוזת עבור md5,‏ sha256"
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "תבנית הקובץ אינה נתמכת."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr "הקובץ ריק"
@@ -6865,7 +6771,8 @@ msgstr "אזור מלא"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6890,7 +6797,7 @@ msgstr "מסנן"
 msgid "Filter properties"
 msgstr "מאפייני מסנן"
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr "סינון תוצאות"
 
@@ -6942,7 +6849,7 @@ msgstr "התאמה למפה"
 msgid "Fixed"
 msgstr "קבוע"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr "מצב קבוע"
 
@@ -6993,12 +6900,12 @@ msgstr "נוסחה"
 msgid "Formula missing for action \"%1$s\"."
 msgstr "חסרה נוסחה לפעולה „%1$s”."
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr "חסרה נוסחה לכלל הגילוי „%1$s”."
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr "חסרה נוסחה למעקף „%1$s”."
@@ -7011,7 +6918,7 @@ msgstr "צרפתית (fr_FR)"
 msgid "Fri"
 msgstr "ו׳"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "יום שישי"
 
@@ -7122,7 +7029,7 @@ msgstr "קבלת ערך ממארח"
 msgid "Given expression is not a macro"
 msgstr "הביטוי שסופק אינו מאקרו"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr "הביטוי הרגולרי הכללי „%1$s” לא קיים."
@@ -7136,7 +7043,7 @@ msgstr "ערך גלובלי"
 msgid "Go back to %1$s"
 msgstr "חזרה אל %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "מעבר אל"
 
@@ -7174,7 +7081,7 @@ msgstr "מעבר לעמוד %1$s, העמוד הנוכחי"
 msgid "Go to previous page, %1$s"
 msgstr "מעבר לעמוד הקודם, %1$s"
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7182,7 +7089,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "קו מדורג"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7242,7 +7149,7 @@ msgstr[1] "הועתקו תרשימים"
 msgid "Graph deleted"
 msgstr "תרשים נמחק"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7279,8 +7186,8 @@ msgstr "נמחק אבטיפוס תרשים"
 msgid "Graph prototype updated"
 msgstr "אבטיפוס תרשים עודכן"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr "אבטיפוס התרשים עם המזהה „%1$s” אינו זמין."
@@ -7314,8 +7221,8 @@ msgstr "סוג תרשים"
 msgid "Graph updated"
 msgstr "תרשים עודכן"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr "התרשים עם המזהה „%1$s” אינו זמין."
@@ -7346,7 +7253,7 @@ msgstr "תרשים בשם „%1$s” כבר קיים בתרשימים או בא�
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "תרשימים"
 
@@ -7367,12 +7274,12 @@ msgstr "רשת"
 msgid "Group"
 msgstr "קבוצה"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "לא ניתן למחוק את הקבוצה „%1$s”, כיוון שנעשה בה שימוש לטובת אבטיפוס מארח."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr "לא ניתן למחוק את הקבוצה „%1$s”, כיוון שנעשה בה שימוש לטובת תנאי יחס."
@@ -7546,11 +7453,11 @@ msgstr "עזרה"
 msgid "Hexadecimal to decimal"
 msgstr "הקסדצימלי לעשרוני"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "מוסתר"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "הסתרת ניפוי שגיאות"
 
@@ -7577,11 +7484,11 @@ msgstr "היררכיה"
 msgid "High"
 msgstr "גבוהה"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr "כהה בניגודיות גבוהה"
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr "בהיר בניגודיות גבוהה"
 
@@ -7602,7 +7509,7 @@ msgstr "הדגשת שורה שלמה"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "היסטוריה"
 
@@ -7610,11 +7517,15 @@ msgstr "היסטוריה"
 msgid "History and trends compression"
 msgstr "דחיסת היסטוריה ומגמות"
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr "אין תמיכה בניקוי היסטוריה אם מופעלת דחיסה"
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr "פינוי היסטוריה"
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "ההיסטוריה נמחקה"
 
@@ -7657,7 +7568,7 @@ msgstr "אופקי"
 msgid "Horizontal align"
 msgstr "יישור אופקי"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7686,7 +7597,7 @@ msgstr "יישור אופקי"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7700,7 +7611,7 @@ msgstr[1] "מארחים"
 msgid "Host \"%1$s\" already exists."
 msgstr "המארח „%1$s” כבר קיים."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7708,7 +7619,7 @@ msgstr "המארח „%1$s” כבר קיים."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "המארח „%1$s” לא יכול להישאר בלי קבוצת מארחים."
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr "המארח „%1$s” נמצא במעקב של המתווך „%2$s”."
@@ -7760,7 +7671,7 @@ msgid_plural "Hosts enabled"
 msgstr[0] "מארח מופעל"
 msgstr[1] "מארחים מופעלים"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7774,22 +7685,22 @@ msgstr[1] "מארחים מופעלים"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "קבוצת מארחים"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "קבוצת המארחים „%1$s” כבר קיימת."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "לא ניתן למחוק את קבוצת המארחים „%1$s”, כיוון שנעשה בה שימוש בסקריפט כללי."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr "קבוצת המארחים „%1$s” היא פנימית ואי אפשר למחוק אותה."
@@ -7802,10 +7713,10 @@ msgstr "רכיבי קבוצת מארחים"
 msgid "Host group label type"
 msgstr "סוג תווית קבוצת מארחים"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "קבוצת מארחים עם המזהה „%1$s” אינה זמינה."
@@ -7821,8 +7732,8 @@ msgstr "קבוצת מארחים עם המזהה „%1$s” אינה זמינה."
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7896,7 +7807,7 @@ msgstr "שם מארח"
 msgid "Host networks"
 msgstr "רשתות המארח"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7976,7 +7887,7 @@ msgstr "עדכון המארח נכשל."
 msgid "Host updated"
 msgstr "המארח עודכן"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr "מארח עם המזהה „%1$s” אינו זמין."
@@ -7996,7 +7907,7 @@ msgstr "מארח עם אותו השם „%1$s” כבר קיים."
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "מארח עם אותו שם התצוגה „%1$s” כבר קיים."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8009,7 +7920,7 @@ msgstr "מארח עם אותו שם התצוגה „%1$s” כבר קיים."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8057,7 +7968,7 @@ msgstr "המארחים עודכנו"
 msgid "Hours"
 msgstr "שעות"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8097,7 +8008,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "כתובת IP"
@@ -8122,7 +8033,7 @@ msgstr "טווח ה־IP‏ „%1$s” חורג ממגבלת הכתובות „%2
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8179,12 +8090,12 @@ msgstr "הדגשת סמל"
 msgid "Icon map"
 msgstr "מפת סמלים"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr "סמל המפה „%1$s” כבר קיים."
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "לא ניתן למחוק את מפת הסמלים „%1$s”. נעשה בה שימוש במפה „%2$s”."
@@ -8197,18 +8108,18 @@ msgstr "מפת הסמלים נוצרה"
 msgid "Icon map deleted"
 msgstr "מפת הסמלים נמחקה"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "מפת הסמלים עודכנה"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "מיפוי סמלים"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "הסמל עם המזהה „%1$s” לא זמין."
@@ -8245,19 +8156,19 @@ msgstr "זיהוי המערכת. מחזירה מחרוזת"
 #, c-format
 msgid "If at least %2$s child service has %1$s status or above"
 msgid_plural "If at least %2$s child services have %1$s status or above"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "אם לפחות שירות צאצא אחד הוא במצב %1$s ומעלה"
+msgstr[1] "אם לפחות %2$s שירותים צאצאיים הם במצב %1$s ומעלה"
 
 #: include/classes/helpers/CServiceHelper.php:35
 #, c-format
 msgid "If at least %2$s child services have %1$s status or above"
-msgstr ""
+msgstr "אם לפחות %2$s שירותים צאצאיים הם במצב %1$s ומעלה"
 
 #: include/classes/helpers/CServiceHelper.php:40
 #: include/classes/helpers/CServiceHelper.php:89
 #, c-format
 msgid "If at least %2$s of child services have %1$s status or above"
-msgstr ""
+msgstr "אם לפחות %2$s מהשירותים צאצאיים הם במצב %1$s ומעלה"
 
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
@@ -8267,19 +8178,19 @@ msgstr "אם המסנן תואם"
 #, c-format
 msgid "If less than %2$s child service has %1$s status or below"
 msgid_plural "If less than %2$s child services have %1$s status or below"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "אם פחות משירות צאצא %2$s הוא במצב %1$s ומטה"
+msgstr[1] "אם פחות מ־%2$s שירותים צאצאיים הם במצב %1$s ומטה"
 
 #: include/classes/helpers/CServiceHelper.php:45
 #, c-format
 msgid "If less than %2$s child services have %1$s status or below"
-msgstr ""
+msgstr "אם פחות מ־%2$s שירותים צאצאיים הם במצב %1$s ומטה"
 
 #: include/classes/helpers/CServiceHelper.php:50
 #: include/classes/helpers/CServiceHelper.php:101
 #, c-format
 msgid "If less than %2$s of child services have %1$s status or below"
-msgstr ""
+msgstr "אם פחות מ־%2$s מהשירותים צאצאיים הם במצב %1$s ומטה"
 
 #: include/classes/api/services/CReport.php:348
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
@@ -8291,7 +8202,7 @@ msgstr "אם לא צוינו קבוצות משתמשים, יש לכלול לפח
 #: include/classes/helpers/CServiceHelper.php:110
 #, c-format
 msgid "If weight of child services with %1$s status or above is at least %2$s"
-msgstr ""
+msgstr "אם משקל השירותים הצאצאיים במצב %1$s ומעלה הוא לפחות %2$s"
 
 #: include/classes/helpers/CServiceHelper.php:65
 #: include/classes/helpers/CServiceHelper.php:70
@@ -8299,7 +8210,7 @@ msgstr ""
 #: include/classes/helpers/CServiceHelper.php:118
 #, c-format
 msgid "If weight of child services with %1$s status or below is less than %2$s"
-msgstr ""
+msgstr "אם משקל השירותים הצאצאיים במצב %1$s ומטה הוא לפחות %2$s"
 
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
@@ -8309,23 +8220,20 @@ msgstr "אם לדעתך הודעה זו שגויה, נא ליצור קשר עם
 msgid "Iframe sandboxing exceptions"
 msgstr "חריגות למידור מסגרות פנימיות (Iframes)"
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
-msgstr ""
+msgstr "התעלמות מהשירות הזה"
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "תמונה"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "התמונה „%1$s” כבר קיימת."
@@ -8334,7 +8242,7 @@ msgstr "התמונה „%1$s” כבר קיימת."
 msgid "Image added"
 msgstr "נוספה תמונה"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "נמחקה תמונה"
 
@@ -8342,18 +8250,12 @@ msgstr "נמחקה תמונה"
 msgid "Image label type"
 msgstr "סוג תווית תמונה"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "שגיאה בטעינת תמונה [%1$s] תחת [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr "גודל התמונה חייב להיות קטן מ־%1$s."
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "התמונה עודכנה"
 
@@ -8448,7 +8350,7 @@ msgstr "אבטיפוס פריט בלתי נגיש"
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8459,13 +8361,13 @@ msgstr "תחזוקה בלתי נגישה"
 msgid "Inaccessible map"
 msgstr "מפה בלתי נגישה"
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr "תבנית בלתי נגישה"
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr "הקפצה בלתי נגישה"
 
@@ -8509,10 +8411,10 @@ msgstr "לכלול תת־קבוצות"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "סטטיסטיקת תעבורה נכנסת על מנשק רשת. מחזירה מספר שלם וחיובי"
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
-msgstr ""
+msgstr "משתני „propagation_rule” (כלל הפצה) מבלי לציין משתנה „propagation_value” (ערך הפצה) אינם תואמים לשירות „%1$s”."
 
 #: include/classes/api/services/CMap.php:655
 #: include/classes/api/services/CMap.php:1138
@@ -8677,24 +8579,6 @@ msgstr "קבוצת משתמשים של משימת פעולה שגויה. קבו�
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "משתמש משימת הפעולה שגוי. המשתמש לא קיים או שאין לך גישה למשתמש זה."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8749,8 +8633,6 @@ msgstr "משתמש משימת הפעולה שגוי. המשתמש לא קיים
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "ארגומנטים שגויים הועברו לפונקציה."
 
@@ -8776,31 +8658,22 @@ msgstr "נעשה שימוש בתווים שגויים לשם התבנית „%1$
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "תנאים שגויים לפעולה „%1$s”."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "תנאים שגויים לכלל הגילוי „%1$s”."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "מזהה היחס שגוי."
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "ביטוי מותאם אישית שגוי „%2$s” לפעולה „%1$s”:‏ %3$s."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "ביטוי מותאם אישית שגוי „%2$s” ליחס „%1$s”:‏ %3$s."
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "ביטוי מותאם אישית שגוי „%2$s” לכלל הגילוי „%1$s”:‏ %3$s."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr "ביטוי מותאם אישית „%2$s” שגוי למעקף „%1$s”:‏ %3$s."
@@ -8829,7 +8702,7 @@ msgstr "ערך eventobject שגוי."
 msgid "Incorrect eventsource value."
 msgstr "ערך eventsource שגוי."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "שם או ערך שגוי לשדה „%1$s” בביטוי where בטבלה „%2$s”."
@@ -8854,22 +8727,17 @@ msgstr "העלאת קובץ שגוי."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "מזהה נוסחת תנאי מסנן שגויה עבור הפעולה „%1$s”."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "מזהה הנוסחה של תנאי המסנן שגוי עבור כלל הגילוי „%1$s”."
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "מזהה הנוסחה של תנאי המסנן שסופק שגוי עבור היחס „%1$s”."
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "מאקרו תנאי מסנן שגוי לכלל הגילוי „%1$s”."
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr "מאקרו תנאי מסנן שגוי למעקף „%1$s”."
@@ -8880,7 +8748,7 @@ msgstr "מאקרו תנאי מסנן שגוי למעקף „%1$s”."
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "סימן תנאי מסנן שגוי לפעולה „%1$s”."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "סימן תנאי מסנן שגוי לכלל הגילוי „%1$s”."
@@ -8908,8 +8776,6 @@ msgstr "מפתח תמונה שגוי."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8971,10 +8837,6 @@ msgstr "תקופת התחזוקה שגויה (5 דקות לכל הפחות)"
 msgid "Incorrect map ID."
 msgstr "מזהה המפה שגוי."
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "מזהה סוג מדיה שגוי."
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9032,13 +8894,13 @@ msgstr "הביטוי הרגולרי „%1$s” שגוי: „%2$s”"
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "התקבלה תגובה שגויה משרת ה־Zabbix‏ „%1$s”."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "זמן תום השירות שגוי."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "מועד ההתחלה של השירות שגוי."
 
@@ -9091,12 +8953,7 @@ msgstr "ביטוי אבטיפוס הקפצה שגוי. רכיבי ביטוי א�
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "סוג חישוב שגוי לפעולה „%1$s”."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "סוג החישוב ליחס „%1$s” שגוי."
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "סוג החישוב לכלל הגילוי „%1$s” שגוי."
@@ -9142,13 +8999,13 @@ msgstr "שם המשתמש או הססמה או החשבון חסומים זמנ�
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9165,60 +9022,30 @@ msgstr "ערך שגוי „%1$s” לשדה „%2$s”: חייב להיות בי
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "ערך שגוי „%1$s” לשדה „%2$s”: חייב להיות בין %3$s ל־%4$s."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "ערך שגוי „%1$s” עבור שדה נקודה צפה „%2$s”."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "ערך שגוי „%1$s” עבור שדה מספר שלם „%2$s”."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "ערך שגוי „%1$s” עבור שדה מספר שלם וחיובי „%2$s”."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "ערך שגוי „%1$s” בשדה „%2$s” עבור היחס „%3$s”."
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "ערך שגוי „%1$s” בשדה „%2$s” עבור סוג המדיה „%3$s”."
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9273,14 +9100,8 @@ msgstr "ערך שגוי לשדה „%1$s”."
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9390,25 +9211,7 @@ msgstr "ערך שגוי לשדה „%1$s”."
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9419,7 +9222,7 @@ msgstr "ערך שגוי לשדה „%1$s”."
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9465,16 +9268,17 @@ msgstr "ערך שגוי לשדה „%1$s”."
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9483,7 +9287,7 @@ msgstr "ערך שגוי לשדה „%1$s”."
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "ערך שגוי עבור השדה „%1$s”:‏ %2$s."
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr "הגדלה בשיעור"
 
@@ -9571,12 +9375,12 @@ msgstr "תגיות שהתקבלו בירושה ושל ההקפצה"
 msgid "Inherited items"
 msgstr "פריטים שהתקבלו בירושה"
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "הוספה"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "הוספת ביטוי"
 
@@ -9680,7 +9484,7 @@ msgstr "תקלה פנימית"
 msgid "Internal problem recovery"
 msgstr "שיקום של תקלה פנימית"
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9688,7 +9492,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9699,7 +9503,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "משך"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr "שיטת API שגויה „%2$s” לתפקיד משתמש „%1$s”."
@@ -9722,7 +9526,7 @@ msgstr "תכני קובץ ה־YAML שגויים"
 msgid "Invalid action condition: %1$s."
 msgstr "תנאי פעולה שגוי: %1$s."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr "תנאי שגוי: %1$s."
@@ -9754,7 +9558,7 @@ msgstr "כתובת דוא״ל שגויה עבור סוג המדיה עם המז�
 msgid "Invalid interval \"%1$s\"."
 msgstr "מרווח זמן שגוי „%1$s”."
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "מפתח שגוי „%1$s” עבור כלל הגילוי „%2$s” תחת „%3$s”:‏ %4$s."
@@ -9779,27 +9583,29 @@ msgstr "מפתח שגוי „%1$s”‏: %2$s."
 msgid "Invalid method parameters."
 msgstr "הפרמטרים לשיטה שגויים."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9825,17 +9631,17 @@ msgstr "הפרמטרים לשיטה שגויים."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9843,8 +9649,8 @@ msgstr "הפרמטרים לשיטה שגויים."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9858,106 +9664,116 @@ msgstr "הפרמטרים לשיטה שגויים."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9999,43 +9815,38 @@ msgstr "קוד התגובה שגוי „%1$s”."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10056,7 +9867,7 @@ msgstr "פרק הזמן שגוי."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "מאגר"
 
@@ -10097,7 +9908,7 @@ msgstr "אי אפשר לחפש לפי ססמת משתמש."
 msgid "Italian (it_IT)"
 msgstr "איטלקית (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10129,7 +9940,7 @@ msgstr "לא ניתן להעתיק את הפריט „%1$s” ללא פריט ה
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "הפריט %1$s לא יכול לאכלס שדה מאגר ריק של מארח מספר „%2$d”. האפשרויות הן: החל מ־0 (לא לאכלס) ועד %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10143,7 +9954,7 @@ msgstr "נוסף פריט"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr "הפריט מכיל תסריטי מאקרו שנערכו על ידי המשתמש עם ערכים סודיים. את הערכים של תסריטי המאקרו האלה יש למלא ידנית."
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "פריט הועתק"
@@ -10157,13 +9968,13 @@ msgstr "כמות פריטים"
 msgid "Item deleted"
 msgstr "פריט נמחק"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "פריט מושבת"
 msgstr[1] "פריטים מושבתים"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "פריט מופעל"
@@ -10173,7 +9984,7 @@ msgstr[1] "פריטים מופעלים"
 msgid "Item in \"not supported\" state"
 msgstr "פריט במצב „לא נתמך”"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "לא נבחר פריט"
 
@@ -10182,7 +9993,7 @@ msgstr "לא נבחר פריט"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr "חסרים פרמטרים בעיבוד הטרומי של הפריט: %1$s"
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10219,8 +10030,8 @@ msgid_plural "Item prototypes updated"
 msgstr[0] "עודכן אבטיפוס פריט"
 msgstr[1] "עודכנו אבות טיפוס פריט"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr "אבטיפוס פריט עם המזהה „%1$s” אינו זמין."
@@ -10246,7 +10057,7 @@ msgstr "אבות הטיפוס של הפריט עודכנו"
 msgid "Item tags"
 msgstr "תגיות פריט"
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr "סוג הפריט אינו משתמש במנשק"
 
@@ -10278,8 +10089,8 @@ msgstr "הפריט לא יעבור רענון. ההפרש שהוגדר בין ה
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr "הפריט לא יעבור רענון. ההפרש בינן העדכונים אמור להיות בין שנייה ליום. ניתן גם להשתמש בהפרשי תזמון/גמישות."
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr "פריט עם המזהה „%1$s” אינו זמין."
@@ -10330,11 +10141,11 @@ msgstr "פריט עם המפתח „%1$s” כבר קיים תחת „%2$s”."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "פריטים"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "פריטים נמחקו"
 
@@ -10352,7 +10163,7 @@ msgstr "פריטים התעדכנו"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10377,6 +10188,10 @@ msgstr "מנשקי JMX"
 msgid "JSON"
 msgstr "JSON"
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr "הקלט אמור להיות מערך JSON."
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10389,7 +10204,7 @@ msgstr "נתוני JSON"
 msgid "JSON is expected"
 msgstr "אמור היה להיות JSON"
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr "אמורה להיות מחרוזת JSON"
 
@@ -10407,7 +10222,7 @@ msgstr "JSONPath"
 msgid "Jan"
 msgstr "ינו׳"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "ינואר"
 
@@ -10429,7 +10244,7 @@ msgstr "JavaScript"
 msgid "Jul"
 msgstr "יול׳"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "יולי"
 
@@ -10437,7 +10252,7 @@ msgstr "יולי"
 msgid "Jun"
 msgstr "יונ׳"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "יוני"
 
@@ -10593,22 +10408,6 @@ msgid_plural "Last %1$d years"
 msgstr[0] "בשנה האחרונה"
 msgstr[1] "ב־%1$d השנים האחרונות"
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr "24 השעות האחרונות"
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr "30 הימים האחרונים"
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr "365 הימים האחרונים"
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr "7 הימים האחרונים"
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10620,11 +10419,11 @@ msgstr "גישה אחרונה ב־"
 msgid "Last check"
 msgstr "הבדיקה האחרונה"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "תרשים של השעה האחרונה"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "תרשים של החודש שעבר"
 
@@ -10662,11 +10461,11 @@ msgstr "נשלח לאחרונה"
 msgid "Last value"
 msgstr "ערך אחרון"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "תרשים השבוע שעבר"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10675,11 +10474,11 @@ msgstr "תרשים השבוע שעבר"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "נתונים עדכניים"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "ערכים אחרונים"
 
@@ -10720,7 +10519,7 @@ msgstr "Y שמאל"
 msgid "Left trim"
 msgstr "צמצום משמאל"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr "מקרא"
 
@@ -11001,7 +10800,7 @@ msgstr "כלל גילוי ברמה נמוכה במצב „לא נתמך“"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "ב׳"
@@ -11023,7 +10822,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "בדיקת סכום MD5 על קובץ. מחזירה מחרוזת תווים (גיבוב ה־MD5 של הקובץ)"
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11034,12 +10833,12 @@ msgid "Macro"
 msgstr "מאקרו"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "המאקרו „%1$s” כבר קיים תחת „%2$s”."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "המאקרו „%1$s” כבר קיים."
@@ -11067,7 +10866,7 @@ msgstr "תבניות המאקרו עודכנו"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr "מסנן ראשי"
 
@@ -11075,7 +10874,7 @@ msgstr "מסנן ראשי"
 msgid "Main navigation"
 msgstr "ניווט ראשי"
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11158,7 +10957,7 @@ msgstr "ניהול דוחות מתוזמנים"
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11180,13 +10979,13 @@ msgstr "פעולת מארח ידנית"
 msgid "Manually closed"
 msgstr "נסגר ידנית"
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "מפה"
 
@@ -11255,7 +11054,7 @@ msgstr "צורת המפה"
 msgid "Map update failed."
 msgstr "עדכון המפה נכשל."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr "מפה עם המזהה „%1$s” אינה זמינה."
@@ -11287,7 +11086,7 @@ msgstr "מפות"
 msgid "Mar"
 msgstr "מרץ"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "מרץ"
 
@@ -11391,7 +11190,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr "גרסת מסד הנתונים %1$s העדכנית ביותר הנדרשת היא %2$s."
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11405,7 +11204,7 @@ msgstr[1] "תקופת הזמן המרבית להצגה היא %1$s ימים."
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "חרגת מהאורך הכללי המרבי המותר לכתובת דוא״ל עבור סוג המדיה עם המזהה „%1$s”."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "מאי"
 
@@ -11420,15 +11219,12 @@ msgstr "מאי"
 msgid "Media"
 msgstr "מדיה"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "סוג המדיה"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr "סוג המדיה „%1$s“ כבר קיים."
@@ -11455,11 +11251,6 @@ msgid_plural "Media types enabled"
 msgstr[0] "סוג המדיה מופעל"
 msgstr[1] "סוגי המדיה מופעלים"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr "בסוג המדיה חסרים פרמטרים: %1$s"
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11489,7 +11280,7 @@ msgstr "סוג המדיה עם המזהה „%1$s” אינו זמין."
 msgid "Media types"
 msgstr "סוגי המדיה"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr "סוגי המדיה שמשמשים את הפעולה „%1$s”."
@@ -11577,7 +11368,7 @@ msgstr "התכתבות"
 msgid "Method not found."
 msgstr "השיטה לא נמצאה."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr "Microsoft Edge"
 
@@ -11639,7 +11430,7 @@ msgid "Minimum severity"
 msgstr "רמת חומרה מזערית"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11698,7 +11489,7 @@ msgstr "מצב"
 msgid "Model"
 msgstr "דגם"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr "מודול"
@@ -11736,7 +11527,7 @@ msgstr[1] "הופעלו מודולים: %1$s."
 msgid "Module updated: %1$s."
 msgstr "עודכן מודול: %1$s."
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr "המודול עם המזהה „%2$s” אינו זמין לתפקיד המשתמש „%1$s”."
@@ -11762,7 +11553,7 @@ msgstr "המודולים עודכנו"
 msgid "Mon"
 msgstr "ב׳"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "יום שני"
 
@@ -11802,11 +11593,11 @@ msgstr "חודש"
 msgid "Monthly"
 msgstr "חודשי"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "נמצאו תוצאות נוספות…"
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11830,7 +11621,7 @@ msgstr "הכי קריטי אם לכל הצאצאים יש תקלות"
 msgid "Most critical of child services"
 msgstr "הכי קריטי מבין שירותי הצאצאים"
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Firefox מבית Mozilla"
 
@@ -11843,7 +11634,7 @@ msgstr "מרובים"
 msgid "Multiple PROBLEM events"
 msgstr "מגוון אירועי תקלה"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "השתקה"
 
@@ -11972,11 +11763,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12134,19 +11925,21 @@ msgstr "תנאי חדש"
 msgid "New dashboard"
 msgstr "לוח מחוונים חדש"
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "רכיב חדש"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr "קבוצת אירועים למארחים חדשה"
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr "שם תגית אירוע חדש"
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr "ערך חדש לתגית אירועים"
 
@@ -12158,7 +11951,7 @@ msgstr "פעילות חדשה"
 msgid "New regular expression"
 msgstr "ביטוי רגולרי חדש"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr "שירות חדש"
 
@@ -12166,7 +11959,7 @@ msgstr "שירות חדש"
 msgid "New service time"
 msgstr "זמן שירות חדש"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr "שם תגית חדש"
 
@@ -12175,7 +11968,7 @@ msgid "New triggers"
 msgstr "הקפצות חדשות"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr "העמוד הבא"
 
@@ -12193,7 +11986,7 @@ msgstr "השלב הבא"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12222,30 +12015,6 @@ msgstr "השלב הבא"
 msgid "No"
 msgstr "לא"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "לא סופק „%1$s” עבור היחס „%2$s”."
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "לא סופק „%1$s” עבור יחס."
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12261,11 +12030,6 @@ msgstr "לא סופק „%1$s” עבור תרשים."
 msgid "No \"%1$s\" given for map."
 msgstr "לא סופק „%1$s” עבור מפה."
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "לא סופק „%1$s” עבור סוג מדיה."
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12273,7 +12037,7 @@ msgstr "לא סופק „%1$s” עבור סוג מדיה."
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "לא סופק „%2$s” עבור תנאי מסנן לפעולה „%1$s”."
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "לא סופק „%2$s” עבור תנאי מסנן לכלל גילוי „%1$s”."
@@ -12283,7 +12047,7 @@ msgstr "לא סופק „%2$s” עבור תנאי מסנן לכלל גילוי
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "לא סופק „%2$s” עבור המסנן של הפעולה „%1$s”."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "לא סופק „%2$s” עבור המסנן של כלל הגילוי „%1$s”."
@@ -12300,11 +12064,6 @@ msgstr "לא צוין שם משתמש לאימות."
 msgid "No changes."
 msgstr "אין שינויים."
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "לא צוין סוג תנאי עבור היחס „%1$s”."
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12335,7 +12094,7 @@ msgstr "אין מנשק בררת מחדל עבור הסוג „%1$s” תחת �
 msgid "No details"
 msgstr "אין פרטים"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "לא סופק מזהה של כלל גילוי."
 
@@ -12371,7 +12130,7 @@ msgstr "אין פריט תרשים עם מזהה התרשים „%1$s”."
 msgid "No graphs added."
 msgstr "לא נוספו תרשימים."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "לא סופקו מזהי מארחים."
 
@@ -12401,7 +12160,7 @@ msgstr "אין תמונה"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "לא נמצא מנשק"
 
@@ -12420,7 +12179,7 @@ msgstr "לא צוין מצב מאגר לפעולת משימה."
 #: include/items.inc.php:742
 #, c-format
 msgid "No item with item ID \"%1$s\"."
-msgstr "אין פריט עם מזהה הפריט „%1$s”"
+msgstr "אין פריט עם מזהה הפריט „%1$s”."
 
 #: chart3.php:145 chart7.php:56
 msgid "No items defined."
@@ -12435,7 +12194,7 @@ msgstr "לא נמצאו מאקרואים."
 msgid "No maps added."
 msgstr "לא נוספו מפות."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "לא נמצאו התאמות"
 
@@ -12443,17 +12202,46 @@ msgstr "לא נמצאו התאמות"
 msgid "No new modules discovered"
 msgstr "לא התגלו מודולים חדשים"
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr "לא צוין סוג משימה ליחס „%1$s”."
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "אין הרשאות לגישה למערכת."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”."
@@ -12461,7 +12249,7 @@ msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”."
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12489,19 +12277,18 @@ msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”."
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12516,16 +12303,22 @@ msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”."
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12545,12 +12338,10 @@ msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”."
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12571,27 +12362,29 @@ msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”."
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12608,14 +12401,14 @@ msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”."
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12624,7 +12417,7 @@ msgstr "אין הרשאות לקרוא ל־„%1$s.%2$s”."
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "אין הרשה לפריט המופנה או שהוא לא קיים!"
 
@@ -12644,7 +12437,7 @@ msgstr "לא צוין מפתח ציבורי."
 msgid "No recipients for action operation message."
 msgstr "אין נמענים להודעת משימת הפעולה."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr "ללא רענון"
 
@@ -12656,7 +12449,7 @@ msgstr "לא צוין סקריפט לפקודת משימת הפעולה."
 msgid "No target selected"
 msgstr "לא נבחר יעד"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "לא נבחר יעד."
 
@@ -12673,7 +12466,7 @@ msgstr "לא הוגדרו הקפצות."
 msgid "No value"
 msgstr "אין ערך"
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr "הופסק השימוש בדגלונים שאינם בוליאנים."
 
@@ -12743,15 +12536,15 @@ msgstr "לא כל התוצאות מוצגות. נא לספק תנאי חיפוש
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr "לא כל התבנויות מקושרות אל „%1$s”."
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr "אין הרשאה להגדיר שפה למשתמש „guest” (אורח)."
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "אין הרשאה להגדיר את הססמה למשתמש „guest” (אורח)."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr "אין הרשאה להגדיר ערכת עיצוב למשתמש „guest” (אורח)."
 
@@ -12783,7 +12576,7 @@ msgstr "פריטים שלא התקבלו בירושה"
 msgid "Not supported"
 msgstr "אין תמיכה"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "הערה"
@@ -12814,7 +12607,7 @@ msgstr "לשלוח התרעות לכל המעורבים"
 msgid "Nov"
 msgstr "נוב׳"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "נובמבר"
 
@@ -12825,7 +12618,7 @@ msgstr "מספר המעבדים. מחזירה מספר שלם וחיובי"
 
 #: include/classes/items/CHelpItems.php:901
 msgid "Number of available DS paths, <url> - VMware service URL, <uuid> - VMware hypervisor host name, <datastore> - Datastore name, <partitionid> - internal id of physical device from vmware.hv.datastore.discovery"
-msgstr ""
+msgstr "מספר נתיבי מאגרי נתונים, <url> - כתובת שירות ה־VMware,‏<uuid> - שם המארח של ה־hypervisor של VMware,‏ <datastore> - שם מאגר הנתונים, <partitionid> - המזהה הפנימי של ההתקן הפיזי מתוך vmware.hv.datastore.discovery"
 
 #: include/classes/items/CHelpItems.php:89
 #: include/classes/items/CHelpItems.php:451
@@ -13001,8 +12794,8 @@ msgstr "יצרן"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13062,13 +12855,13 @@ msgstr "אוק׳"
 msgid "Octal to decimal"
 msgstr "אוקטלי לעשרוני"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "אוקטובר"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "כבוי"
 
@@ -13076,30 +12869,31 @@ msgstr "כבוי"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "בסדר"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr "שם תגית אירוע ישן"
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr "ערך תגית אירוע ישן"
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr "שם התגית הקודם"
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "פעיל"
 
@@ -13115,35 +12909,15 @@ msgstr "פעם אחת"
 msgid "One"
 msgstr "אחד"
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "אחד מהפריטים נותר ללא קבוצת מארחים."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "פעם אחת בלבד"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "חוסר פעילות חד־פעמית"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "רק משתמשי על יכולים ליצור קבוצות מארחים."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "רק משתמשי על יכולים ליצור סוגי מדיה."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "רק משתמשי על יכולים למחוק סוגי מדיה."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "רק משתמשי על יכולים לערוך סוגי מדיה."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "רק בדיקות של סוכן Zabbix,‏ SNMPv1,‏ SNMPv2 ו־SNMPv3 יכולות להיות ייחודיות."
@@ -13186,16 +12960,12 @@ msgstr[1] "רק תקלות נבחרות"
 
 #: app/views/monitoring.service.list.edit.php:93
 msgid "Only services without children"
-msgstr "רק שירותים בלי ילדים"
+msgstr "רק שירותים בלי צאצאים"
 
 #: app/views/monitoring.service.list.edit.php:101
 msgid "Only services without problem tags"
 msgstr "רק שירותים ללא תגיות של תקלות"
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "רק מנהלי על יכולים ליצור יחסים."
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr "רק מנהלי על יכולים להגדיר בעלות על לוח מחוונים."
@@ -13204,15 +12974,11 @@ msgstr "רק מנהלי על יכולים להגדיר בעלות על לוח מ
 msgid "Only super admins can set report owner."
 msgstr "רק מנהלי על יכולים להגדיר בעלות על דוח."
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr "רק מנהלי על יכולים לעדכן יחסים."
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "רק הקפצות שמוקצות למארחים מופעלים שתלויות בפריטים פעילים נספרות"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13221,7 +12987,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "פרטים על מערכת ההפעלה. מחזירה מחרוזת"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr "פעילות"
 
@@ -13230,11 +12996,11 @@ msgstr "פעילות"
 msgid "Operation \"%1$s\" already exists."
 msgstr "הפעילות „%1$s” כבר קיימת."
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "לא ניתן לבצע את הפעולה עקב בקשה בלתי מורשית."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "פרטי הפעולה"
 
@@ -13256,7 +13022,7 @@ msgstr "לפעולה אין תבנית לפעילות."
 msgid "Operational data"
 msgstr "נתונים תפעוליים"
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13265,33 +13031,33 @@ msgstr "נתונים תפעוליים"
 msgid "Operations"
 msgstr "פעולות"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "מפעיל"
 
@@ -13400,7 +13166,7 @@ msgstr "פרמטרים אחרים של תצורה"
 msgid "Other parameters"
 msgstr "פרמטרים אחרים"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "אחרים"
@@ -13414,7 +13180,7 @@ msgstr "סטטיסטיקת תעבורה יוצאת במנשק רשת. מחזיר
 msgid "Output"
 msgstr "פלט"
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr "וידג׳טים חופפים בנקודה X:%3$d,‏ Y:%4$d בעמוד מס׳ %2$d של לוח המחוונים „%1$s”."
@@ -13443,7 +13209,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr "כבר קיים מעקף עם השם „%1$s”."
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13632,7 +13398,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13677,7 +13443,7 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "זהות PSK"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr "עמוד %1$d"
@@ -13700,16 +13466,16 @@ msgstr "נווט"
 msgid "Parameter"
 msgstr "פרמטר"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "הפרמטר „%1$s” נזנח."
@@ -13739,7 +13505,7 @@ msgstr "פריטי הורה"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr "שירותי הורה"
 
@@ -13756,7 +13522,7 @@ msgstr "הקפצות הורה"
 msgid "Parent web scenarios"
 msgstr "תרחישי רשת הורה"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr "סתירה ביחס הורה-צאצא בשירותים „%1$s” ו־„%2$s”."
@@ -13768,11 +13534,6 @@ msgstr "סתירה ביחס הורה-צאצא בשירותים „%1$s” ו־�
 msgid "Parse"
 msgstr "ניתוח"
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "שגיאה בפענוח SQL ‏[%1$s] ב־[%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "שגיאת פענוח"
@@ -13833,7 +13594,7 @@ msgstr "מדיניות הססמה"
 msgid "Password requirements:"
 msgstr "דרישות ססמה:"
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr "הדבקה"
 
@@ -13843,15 +13604,15 @@ msgid "Paste page"
 msgstr "הדבקת עמוד"
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr "הדבקת וידג׳ט"
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr "הדבקה ללא קישורים חיצוניים"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr "תבנית"
@@ -13867,7 +13628,7 @@ msgstr "השימוש המרבי בזיכרון: %1$s"
 
 #: include/classes/items/CHelpItems.php:1009
 msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
-msgstr ""
+msgstr "אחוז הזמן שמכונה וירטואלית לא יכולה לרוץ כי היא מתחרה על גישה למעבדים פיזיים, <url> - כתובת שירות VMware,‏ <uuid> - שם מארח של מכונה וירטואלית ב־VMware"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:213
 msgid "Percentage"
@@ -13897,12 +13658,11 @@ msgstr "ביצוע שאילתת DNS. מחזירה מחרוזת תווים עם �
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "תקופה"
 
@@ -13991,7 +13751,7 @@ msgstr "נא להפעיל את ההנחיה „allow_url_fopen” (לאפשר פ
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "נא להזין את שם המארח או את כתובת ה־IP ומספר הפתחה של שרת ה־Zabbix כמו גם את שם ההתקנה (רשות)."
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "נא לבחור בשני רכיבים"
 
@@ -14031,7 +13791,7 @@ msgstr "ממלא שדה במאגר המארח"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14120,7 +13880,7 @@ msgid "Previous month"
 msgstr "החודש הקודם"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr "העמוד הקודם"
 
@@ -14251,7 +14011,7 @@ msgstr "התקלה אינה מוסתרת"
 msgid "Problem is suppressed"
 msgstr "התקלה מוסתרת"
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "תקלה עם"
 
@@ -14264,21 +14024,17 @@ msgstr "שיקום תקלה"
 msgid "Problem resolved"
 msgstr "התקלה נפתרה"
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr "תגיות תקלה"
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr "מועד תקלה"
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr "עדכון תקלה"
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14292,9 +14048,9 @@ msgstr "עדכון תקלה"
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "תקלות"
 
@@ -14328,7 +14084,7 @@ msgid "Prometheus to JSON"
 msgstr "Prometheus ל־JSON"
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "תכונות"
 
@@ -14349,13 +14105,13 @@ msgstr "הכתובת שסופקה „%1$s” שגויה."
 msgid "Proxies"
 msgstr "מתווכים"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14363,7 +14119,7 @@ msgstr "מתווכים"
 msgid "Proxy"
 msgstr "מתווך"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr "המתווך „%1$s” כבר קיים."
@@ -14373,12 +14129,12 @@ msgstr "המתווך „%1$s” כבר קיים."
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "המתווך „%1$s” עבור המארח „%2$s” לא קיים."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr "הפעולה „%2$s” משתמשת במתווך „%1$s”."
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "נעשה שימוש במתווך „%1$s” על ידי כלל הגילוי „%2$s”."
@@ -14471,7 +14227,7 @@ msgstr "סקירת התור לפי מתווך"
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14548,10 +14304,6 @@ msgstr "גישה לקריאה-כתיבה לשירותים עם תגית"
 msgid "Reads modbus data. Returns various types"
 msgstr "קוראת נתוני modbus. מחזירה מגוון סוגים"
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr "סיבה"
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "ערך שהתקבל"
@@ -14633,7 +14385,7 @@ msgstr "מרובע"
 msgid "Refresh"
 msgstr "רענון"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr "תדירות רענון"
 
@@ -14651,13 +14403,13 @@ msgstr "לייצר את אסימון ה־API הנבחר מחדש? האסימון
 msgid "Regular"
 msgstr "רגיל"
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "ביטוי רגולרי"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr "הביטוי הרגולרי „%1$s” כבר קיים."
@@ -14690,7 +14442,7 @@ msgstr "ביטויים רגולריים"
 msgid "Related reports"
 msgstr "דוחות קשורים"
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr "יש לשחרר כדי ליצור וידג׳ט."
 
@@ -14722,8 +14474,6 @@ msgstr "פקודה מרוחקת"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14744,7 +14494,9 @@ msgstr "פקודה מרוחקת"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14757,7 +14509,7 @@ msgstr "פקודה מרוחקת"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14834,8 +14586,8 @@ msgstr "פקודה מרוחקת"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "הסרה"
 
@@ -14875,7 +14627,7 @@ msgstr "הסרה, %1$s"
 msgid "Removed"
 msgstr "הוסר"
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14917,7 +14669,7 @@ msgid "Replace dependencies"
 msgstr "החלפת תלויות"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr "החלפה"
 
@@ -14972,7 +14724,7 @@ msgstr "גוף בקשה"
 msgid "Request body type"
 msgstr "סוג גוף הבקשה"
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr "הבקשה נשלחה בהצלחה"
 
@@ -15014,8 +14766,8 @@ msgstr "קודים נדרשים למצב"
 msgid "Required string"
 msgstr "מחרוזת נדרשת"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "איפוס"
 
@@ -15048,7 +14800,7 @@ msgstr "אישור איפוס"
 msgid "Reset defaults"
 msgstr "איפוס לבררות המחדל"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "נפתר"
 
@@ -15114,7 +14866,7 @@ msgstr "סוג התגובה: מחרוזת"
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "תוצאה"
@@ -15301,12 +15053,12 @@ msgstr "הרצת פקודה מסוימת על המארח. מחזירה את פל
 msgid "Russian (ru_RU)"
 msgstr "רוסית (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "ש׳"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "א׳"
@@ -15317,8 +15069,8 @@ msgstr "הגדרות SAML"
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15355,7 +15107,7 @@ msgstr "פתחת שרת ה־SMTP"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15451,12 +15203,12 @@ msgstr "ספירת SQL:‏ %1$s (בחירות: %2$s | הפעלות: %3$s)"
 msgid "SQL query"
 msgstr "שאילתת SQL"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "הרצת ביטוי ה־SQL נכשל „%1$s”"
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "הרצת ביטוי ה־SQL נכשל „%1$s”."
@@ -15519,7 +15271,7 @@ msgstr "כתובת שירות SSO"
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15531,7 +15283,7 @@ msgstr "ללא עיטורים"
 msgid "Sat"
 msgstr "ש׳"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "שבת"
 
@@ -15573,7 +15325,7 @@ msgstr "תזמון"
 msgid "Scheduled check"
 msgstr "בדיקה מתוזמנת"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr "דוח מתוזמן"
@@ -15640,7 +15392,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr "היקף"
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15653,8 +15405,7 @@ msgstr "היקף"
 msgid "Script"
 msgstr "סקריפט"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "הסקריפט „%1$s“ כבר קיים."
@@ -15686,12 +15437,6 @@ msgstr "שם הסקריפט"
 msgid "Script parameters"
 msgstr "הפרמטרים של הסקריפט"
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "למשתנים של הסקריפט „%1$s” חסרה ירידת השורה האחרונה בסוג המדיה „%2$s”."
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "מנתח סקריפטים"
@@ -15704,7 +15449,7 @@ msgstr "הסקריפט עודכן"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "סקריפטים"
 
@@ -15774,8 +15519,8 @@ msgid "Security name"
 msgstr "שם אבטחה"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15783,7 +15528,7 @@ msgstr "שם אבטחה"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "בחירה"
 
@@ -15819,19 +15564,19 @@ msgstr "רכיבים שנבחרו"
 msgid "Selected items only"
 msgstr "פריטים נבחרים בלבד"
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "נבחר, %1$s במיקום %2$d מתוך %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "נבחר, %1$s, לקריאה בלבד, במיקום %2$d מתוך %3$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr "שליחה לרקע"
 
@@ -15856,7 +15601,7 @@ msgstr "שליחה רק אל"
 msgid "Send to"
 msgstr "שליחה אל"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr "הרחקה לרקע"
 
@@ -15889,7 +15634,7 @@ msgstr "מופרד"
 msgid "Separately"
 msgstr "בנפרד"
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "ספטמבר"
 
@@ -15920,38 +15665,38 @@ msgstr "שרת (מתווך)"
 msgid "Server time"
 msgstr "זמן השרת"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "שירות"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
-msgstr ""
+msgstr "לחוזה השירות המקובל של השירות „%1$s” לא יכולות להיות יותר מ־4 ספרות אחרי הנקודה העשרונית."
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr "לשירות „%1$s” לא יכולות להיות תגיות תקלה וצאצאים בו־זמנית."
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
-msgstr ""
+msgstr "השירות „%1$s” לא יכול להציג חוזה שירות לכלל חישוב המצב הנבחר."
 
 #: include/classes/helpers/CMenuHelper.php:184
 #: include/views/configuration.action.list.php:28
 msgid "Service actions"
 msgstr "פעולות שירות"
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "שירות נוצר"
 
@@ -15983,16 +15728,16 @@ msgstr "פתחת שירות"
 msgid "Service recovery"
 msgstr "שחזור שירות"
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "מועד ההתחלה של השירות חייב להיות לפני מועד הסיום."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr "שם תגית שירות"
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr "ערך תגית שירות"
 
@@ -16000,11 +15745,11 @@ msgstr "ערך תגית שירות"
 msgid "Service time"
 msgstr "זמן שירות"
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "זמני שירות"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "סוג השירות"
 
@@ -16013,30 +15758,29 @@ msgstr "סוג השירות"
 msgid "Service update"
 msgstr "עדכון שירות"
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "השירות עודכן"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr "השירות עם המזהה „%2$s” אינו זמין לתפקיד המשתמש „%1$s”."
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "שירותים"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "שירותים מתלות מעגלית."
 
@@ -16044,7 +15788,7 @@ msgstr "שירותים מתלות מעגלית."
 msgid "Services updated"
 msgstr "שירותים עודכנו"
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr "שגיאת אתחול הפעלה."
 
@@ -16074,7 +15818,7 @@ msgstr "הגדרת תאריך ושעת תפוגה"
 msgid "Set host inventory mode"
 msgstr "הגדרת מצב מלאי למארח"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr "הגדרת ערך חדש"
 
@@ -16103,7 +15847,7 @@ msgstr "הגדרת פרוטוקול ה־LDAP נכשלה."
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr "הגדרת ההפניות ב־LDAP ל„כבוי” נכשלה."
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr "הגדרות"
 
@@ -16112,7 +15856,7 @@ msgstr "הגדרות"
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16168,7 +15912,7 @@ msgstr "צורה"
 msgid "Shared"
 msgstr "משותף"
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "שיתוף"
 
@@ -16310,7 +16054,7 @@ msgstr "הצגת אזהרה אם שרת ה־Zabbix אינו פעיל"
 msgid "Show working time"
 msgstr "הצגת זמן עבודה"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "מוצג"
 
@@ -16419,7 +16163,7 @@ msgstr "התבצע דילוג על ההעתקה של התרשים „%1$s” ל�
 msgid "Slovak (sk_SK)"
 msgstr "סלובקית (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "נודניק"
 
@@ -16465,7 +16209,7 @@ msgstr "ייתכן שחלק מההיסטוריה לפריט הזה דחוסה, �
 msgid "Sort entries by"
 msgstr "מיון רשומות לפי"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "אופן המיון (0->999)"
 
@@ -16539,7 +16283,7 @@ msgstr "התחלה בעוד"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr "להתחיל מצגת"
 
@@ -16642,15 +16386,19 @@ msgstr "סטטיסטיקה וזמינות זיכרון מטמון הכתיבה �
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "מצב"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr "כלל חישוב מצב"
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr "כלל חישוב המצב וכללים נוספים חלים רק אם קיימים שירותים צאצאיים."
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "קודים של מצב"
@@ -16680,7 +16428,7 @@ msgstr "מצב בלבד"
 msgid "Status problem"
 msgstr "מצב תקלה"
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr "כלל הפצת מצב"
 
@@ -16728,7 +16476,7 @@ msgstr "להפסיק עיבוד"
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr "לעצור מצגת"
 
@@ -16793,7 +16541,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "נושא"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "תת־מפה"
 
@@ -16809,7 +16557,7 @@ msgstr "מינויים"
 msgid "Success Audit"
 msgstr "הצלחה בפיקוח"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr "הודעת הצלחה"
 
@@ -16822,7 +16570,7 @@ msgstr "סכום של תעבורת נתונים נכנסת ויוצאת על מ�
 msgid "Sun"
 msgstr "א׳"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "יום ראשון"
 
@@ -16914,12 +16662,12 @@ msgstr "שעת המערכת. מחזירה מספר שלם וחיובי עם סו
 msgid "System uptime in seconds. Returns integer"
 msgstr "זמן הפעילות של המערכת בשניות. מחזירה מספר שלם וחיובי"
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "ה"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "ג׳"
@@ -16946,17 +16694,17 @@ msgstr "אמת"
 msgid "Table \"%1$s\" does not exist."
 msgstr "הטבלה „%1$s“ אינה קיימת."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "לטבלה „%1$s“ אין שדה בשם „%2$s“."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "תגית"
@@ -17012,7 +16760,7 @@ msgstr "ערך תגית"
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17072,7 +16820,7 @@ msgstr "סוג היעד"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17093,7 +16841,7 @@ msgstr "תבנית"
 msgid "Template \"%1$s\" already exists."
 msgstr "התבנית „%1$s“ כבר קיימת."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17117,7 +16865,7 @@ msgstr "מאפייני תבנית ומארח שמתקבלים בירושה דר�
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "אי אפשר לקשר תבנית אחת לתבנית אחרת יותר מפעם אחת אפילו דרך תבניות אחרות."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr "תבנית של לוח מחוונים"
 
@@ -17147,7 +16895,7 @@ msgstr "שם התבנית"
 
 #: report2.php:394
 msgid "Template trigger"
-msgstr "הקפצה של תבנית"
+msgstr "הקפצה מתבנית"
 
 #: templates.php:210
 msgid "Template updated"
@@ -17177,7 +16925,7 @@ msgstr "כבר קיימת תבנית עם אותו שם התצוגה „%1$s”.
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17304,7 +17052,7 @@ msgstr "גרסת מסד הנתונים של Zabbix אינה תואמת לדרי�
 
 #: include/classes/items/CHelpItems.php:1129
 msgid "The average time a read from the virtual disk takes, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance"
-msgstr ""
+msgstr "הזמן שלוקח לקרוא מהכונן הווירטואלי, <url> - כתובת שירות ה־VMware,‏ <uuid> שם מארח המכונה הווירטואלית ב־VMware,‏ <instance> - מופע התקן הכונן"
 
 #: include/classes/items/CHelpItems.php:1133
 msgid "The average time a write to the virtual disk takes, <url> - VMware service URL, <uuid> - VMware virtual machine host name, <instance> - disk device instance"
@@ -17349,14 +17097,14 @@ msgstr "המארח לא מתגלה עוד והוא יימחק בעוד %1$s (%2$
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "המארח אינ מתגלה עוד והוא יימחק בפעם הבאה שכלל הגילוי עובר עיבוד."
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "בתמונה זו נעשה שימוש במפת הסמלים %1$s."
 msgstr[1] "בתמונה זו נעשה שימוש במפות הסמלים %1$s."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17421,7 +17169,7 @@ msgstr "השדה הזה מתמלא אוטומטית בפריט „%1$s”."
 msgid "This is the test message from Zabbix"
 msgstr "זו הודעת הבדיקה מ־Zabbix"
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "החודש"
 
@@ -17429,7 +17177,7 @@ msgstr "החודש"
 msgid "This month so far"
 msgstr "החודש הזה עד כה"
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "השבוע"
 
@@ -17437,7 +17185,7 @@ msgstr "השבוע"
 msgid "This week so far"
 msgstr "השבוע הזה עד כה"
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "השנה"
 
@@ -17457,7 +17205,7 @@ msgstr "האטה"
 msgid "Thu"
 msgstr "ה"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "יום חמישי"
 
@@ -17474,7 +17222,7 @@ msgstr "עד"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17507,7 +17255,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr "זמן הגישה האחרונה למתווך. שם - שם המתווך. משתנים תקפים הם: lastaccess - חותמת זמן יוניקס, delay - בשניות."
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "תקופת זמן"
 
@@ -17559,12 +17307,11 @@ msgstr "חותמת זמן"
 msgid "To"
 msgstr "עד"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "כדי להגדיר מנשק מארח יש לבחור בסוג פריט אחד לכל הפריטים"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "היום"
 
@@ -17679,7 +17426,7 @@ msgstr "תקופת אחסון מגמות"
 msgid "Trends"
 msgstr "מגמות"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17687,7 +17434,7 @@ msgstr "מגמות"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "הקפצה"
 
@@ -17788,7 +17535,7 @@ msgstr "שם ההקפצה"
 msgid "Trigger overview"
 msgstr "סקירת הקפצה"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17861,11 +17608,11 @@ msgstr "אבות טיפוס של הקפצות עודכנו"
 msgid "Trigger severity"
 msgstr "חומרת הקפצה"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "מצב ההקפצה הוא „תקין“"
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "מצב ההקפצה הוא „תקלה”"
 
@@ -17882,7 +17629,7 @@ msgstr "הקפצה עודכנה"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17917,7 +17664,7 @@ msgstr "צמצום"
 msgid "Tue"
 msgstr "ג׳"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "יום שלישי"
 
@@ -17930,7 +17677,7 @@ msgstr "טורקית (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "אין אפשרות ששני פריטים שונים („%1$s” ו־„%2$s”) ימלאו את שדה המאגר „%3$s”, מצב כזה עשוי להוביל להתנגשות."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr "יש לבחור בשני רכיבים במפה"
 
@@ -17946,19 +17693,19 @@ msgstr "יש לבחור בשני רכיבים במפה"
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18010,7 +17757,7 @@ msgstr "סוג מידע"
 msgid "Types"
 msgstr "סוגים"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr "רכיב מנשק המשתמש „%2$s” אינו זמין לתפקיד המשתמש „%1$s”."
@@ -18031,7 +17778,7 @@ msgstr "לא ידוע"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "כתובת"
 
@@ -18077,12 +17824,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "לכתובת אמורים להיות שני השדות: „name” ו־„url” (שם וכתובת) עבור המפה „%1$s”."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "כתובות"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr "אמור להיות UUIDv4"
 
@@ -18167,12 +17914,12 @@ msgstr "שחרור"
 msgid "Unblock selected users?"
 msgstr "לשחרר את המשתמשים הנבחרים?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr "תגובה לא צפויה לפעולה %1$s."
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18192,21 +17939,23 @@ msgstr "יחידות"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "לא ידוע"
@@ -18224,7 +17973,7 @@ msgid "Unknown error"
 msgstr "שגיאה לא ידועה"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "פריט מארח לא ידוע, אין כזה פריט במארח הנבחר"
@@ -18277,7 +18026,7 @@ msgstr "הפרדה מתבנית"
 msgid "Unlink from templates"
 msgstr "הפרדה מתבניות"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "ביטול השתקה"
 
@@ -18308,7 +18057,7 @@ msgstr "פעילות לא צפויה."
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "משתנה לא נתמך „%2$s” עבור תנאי מסנן של פקודה „%1$s”."
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "משתנה בלתי נתמך „%2$s” לתנאי מסנן של כלל הגילוי „%1$s”."
@@ -18318,7 +18067,7 @@ msgstr "משתנה בלתי נתמך „%2$s” לתנאי מסנן של כלל
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "משתנה לא נתמך „%2$s” עבור מסנן של פקודה „%1$s”."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "משתנה לא נתמך „%2$s” למסנן של כלל הגילוי „%1$s”."
@@ -18363,7 +18112,7 @@ msgstr "פעיל"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18376,7 +18125,7 @@ msgstr "פעיל"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18429,7 +18178,7 @@ msgstr "עדכון פעולות"
 msgid "Update problem"
 msgstr "עדכון תקלה"
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr "מעודכן"
@@ -18447,7 +18196,7 @@ msgstr "העלאה"
 msgid "Upper level maps"
 msgstr "מפות ברמות עליונות"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18482,7 +18231,7 @@ msgstr "להשתמש במידור מסגרות פנימיות (Iframes)"
 msgid "Used in actions"
 msgstr "בשימוש בפעולות"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18497,7 +18246,7 @@ msgstr "בשימוש בפעולות"
 msgid "User"
 msgstr "משתמש"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "המשתמש „%1$s” לא יכול להיות ללא קבוצת משתמשים."
@@ -18549,7 +18298,7 @@ msgstr "משתמש נוסף"
 msgid "User agent string"
 msgstr "מחרוזת סוכן משתמש"
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "המשתמש לא יכול להוסיף את עצמו לקבוצת משתמשים מושבתת או לקבוצה שהגישה שלה למנשק המשתמש הושבתה."
@@ -18569,7 +18318,7 @@ msgid_plural "Users deleted"
 msgstr[0] "משתמש נמחק"
 msgstr[1] "משתמשים נמחקו"
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18579,27 +18328,27 @@ msgstr[1] "משתמשים נמחקו"
 msgid "User group"
 msgstr "קבוצת משתמשים"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "קבוצת המשתמשים „%1$s” כבר קיימת."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr "קבוצת המשתמשים „%1$s” היא הנמענת של הדוח „%2$s”."
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "כבר נעשה שימוש בקבוצת המשתמשים „%1$s” בפעולה „%2$s”."
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "נעשה שימוש בקבוצת המשתמשים „%1$s” בהגדרות לקבלת הודעות על מסד נתונים מושבת."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "נעשה שימוש בקבוצת המשתמשים „%1$s” בקבוצה „%2$s”."
@@ -18633,8 +18382,8 @@ msgstr[1] "קבוצות משתמשים עודכנו"
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18678,14 +18427,14 @@ msgstr "ססמת המשתמש"
 msgid "User profile"
 msgstr "פרופיל משתמש"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr "תפקיד משתמש"
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr "תפקיד המשתמש „%1$s” כבר קיים."
@@ -18754,7 +18503,7 @@ msgstr "משתמש עודכן"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "המשתמש עם המזהה „%1$s” לא זמין."
@@ -18851,7 +18600,7 @@ msgstr "יומן אירועים של VMware,‏ <url> - כתובת שירות VM
 
 #: include/classes/items/CHelpItems.php:949
 msgid "VMware hypervisor BIOS UUID, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
-msgstr ""
+msgstr "המזהה הייחודי של ה־BIOS של ה־hypervisor של VMware‏, <url> - כתובת שירות VMware,‏ <uuid> - שם המארח של ה־VMware hypervisor"
 
 #: include/classes/items/CHelpItems.php:957
 msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
@@ -18879,7 +18628,7 @@ msgstr "רשימת מאגרי הנתונים של ה־Hypervisor של VMware,‏
 
 #: include/classes/items/CHelpItems.php:981
 msgid "VMware hypervisor health state rollup sensor, <url> - VMware service URL, <uuid> - VMware hypervisor host name. Returns 0 - gray; 1 - green; 2 - yellow; 3 - red"
-msgstr ""
+msgstr "מצב בריאות חיישן rollup של VMware hypervisor,‏ <url> - כתובת שירות VMware,‏ <uuid> - שם מארח של מכונה וירטואלית ב־VMware. מחזירה 0 - אפור, 1 - ירוק, 2 - צהוב, 3 - אדום"
 
 #: include/classes/items/CHelpItems.php:945
 msgid "VMware hypervisor model, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
@@ -19070,14 +18819,14 @@ msgstr "אימות"
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19087,7 +18836,7 @@ msgstr "אימות"
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19129,7 +18878,7 @@ msgstr "הערך %1$s הוא שגוי עבור המשתנה „grid_show” (ה�
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "הערך %1$s הוא שגוי עבור המשתנה „grid_show” (הצגת רשת). האפשרויות הן „%2$s”."
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "הערך %1$s\" ארוך מדי לשדה „%2$s”‏ - %3$d תווים. האורך המותר הוא %4$d תווים."
@@ -19146,7 +18895,7 @@ msgstr "סטטיסטיקת זכרון המטמון של הערכים. המשתנ
 msgid "Value cannot be empty."
 msgstr "הערך לא יכול להיות ריק."
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "מפת ערכים"
 
@@ -19189,11 +18938,12 @@ msgstr "ערך של כל מונה ביצועים של Windows באנגלית. מ
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "ערך של מונה ביצועים כלשהו של Windows. מחזירה מספר שלם, שבר עשרוני, מחרוזת או טקסט (בהתאם לבקשה)"
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr "ערך של תגית אירוע חדשה"
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr "ערך של תגית אירוע ישנה"
 
@@ -19240,7 +18990,7 @@ msgstr "נקודת הגישה ל־API של הכספת"
 msgid "Vault authentication token"
 msgstr "אסימון אימות כספת"
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr "החיבור לכספת נכשל."
@@ -19327,7 +19077,7 @@ msgstr "שם התצוגה לא יכול להיות ריק אם אין שם מא�
 msgid "W"
 msgstr "מ"
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "ד׳"
@@ -19344,7 +19094,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "אזהרה"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr "הודעת אזהרה"
 
@@ -19353,7 +19103,7 @@ msgstr "הודעת אזהרה"
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr "אזהרה! גרסת שרת מסד נתונים %1$s אינה נתמכת. עליה להיות לפחות (%2$s)"
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "אנו מתנצלים, כמות הרכיבים המרבית האפשרית נוצלה."
 
@@ -19369,7 +19119,7 @@ msgstr "אנו מתנצלים, כמות הרכיבים המרבית האפשרי
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "אינטרנט"
 
@@ -19381,7 +19131,7 @@ msgstr "אינטרנט"
 msgid "Web monitoring"
 msgstr "מעקב אחר עמוד אינטרנט"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr "תרחיש אינטרנט"
 
@@ -19396,27 +19146,27 @@ msgstr "תרחיש האינטרנט „%1$s“ כבר קיים במארח „%2$
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "תרחיש האינטרנט „%1$s“ כבר קיים."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "נוסף תרחיש רשת"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "תרחיש רשת נמחק"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "תרחיש הרשת נוטרל"
 msgstr[1] "תרחישי הרשת נוטרלו"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "תרחיש הרשת הופעל"
 msgstr[1] "תרחישי הרשת הופעלו"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "תרחיש הרשת עודכן"
 
@@ -19438,7 +19188,7 @@ msgstr "להתלייה אין משתנים."
 msgid "Wed"
 msgstr "ד׳"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "יום רביעי"
 
@@ -19449,7 +19199,7 @@ msgstr "יום רביעי"
 msgid "Weekly"
 msgstr "שבועי"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr "משקל"
 
@@ -19465,12 +19215,12 @@ msgstr "ברוך בואך אל"
 msgid "When active"
 msgstr "בעת פעילות"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
-msgstr "הווידג׳ט בנקודה X:%3$d,‏ Y:%4$d בעמוד מס׳ %2$d של לוח המחוונים „%1$s” חורג מגבולות העמוד. "
+msgstr "הווידג׳ט בנקודה X:%3$d,‏ Y:%4$d בעמוד מס׳ %2$d של לוח המחוונים „%1$s” חורג מגבולות העמוד."
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr "הווידג׳ט קטן לעומת גודל העמודות והשורות שצוין."
 
@@ -19665,6 +19415,10 @@ msgstr "Y-m-d H:i"
 msgid "Y-m-d H:i:s"
 msgstr "Y-m-d H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr "Y-n-d"
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr "Y1"
@@ -19726,7 +19480,7 @@ msgstr "שנתי"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19783,18 +19537,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr "לא ציינת יעדים לסקריפט גלובלי לפעילויות פעולות „%1$s”."
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19806,9 +19554,6 @@ msgstr "לא ציינת יעדים לסקריפט גלובלי לפעילויו�
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "אין לך הרשאה לבצע פעולה זו."
 
@@ -19927,24 +19672,28 @@ msgstr "[ערך שגוי ליום: „%1$s” ]"
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr "[ערך שגוי לחודש: „%1$s” ]"
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr "אמור להיות שם DNS"
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr "אמור להיות בוליאני"
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr "אמור להיות ערך בוליאני"
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "אמור להיות מחרוזת תווים"
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr "התאריך אמור להיות בתצורה YYYY-MM-DD"
 
@@ -19953,37 +19702,37 @@ msgid "a digit"
 msgstr "ספרה"
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr "אמור להיות ערך עם נקודה עשרונית"
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr "אמור להיות קוד צבע הקדסצימלי (6 תווים)"
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr "אמור להיות מאקרו לגילוי ברמה נמוכה"
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr "למספר יש יותר מדי ספרות אחרי הנקודה"
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr "אמור להיות מספר"
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr "המספר גדול מדי"
@@ -20004,28 +19753,29 @@ msgstr "אמור להיות זמן יחסי"
 msgid "a special character"
 msgstr "תו מיוחד"
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr "אמור להיות מחרוזת, מספר או ריק"
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr "אמור להיות זמן"
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr "אמור להיות טווח זמנים"
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr "אמור להיות טווח זמן"
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr "אמור להיות יחידת זמן"
@@ -20073,7 +19823,7 @@ msgstr "הכול"
 msgid "all media"
 msgstr "כל סוגי המדיה"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr "אמורה להיות כתובת IP"
 
@@ -20081,42 +19831,37 @@ msgstr "אמורה להיות כתובת IP"
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "אמור להיות מערך"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr "אמור להיות מערך או מחרוזת תווים"
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr "אמור להיות מערך"
 
@@ -20126,7 +19871,7 @@ msgid "an empty string is expected"
 msgstr "אמור להיות מחרוזת ריקה"
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr "אמור להיות מספר זוגי או תווים הקסדצימליים"
 
@@ -20134,11 +19879,15 @@ msgstr "אמור להיות מספר זוגי או תווים הקסדצימלי
 msgid "an explicit time is expected"
 msgstr "אמורה להיות שעה מפורשת"
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr "לא הוגדר מזהה בנוסחה"
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr "אמור להיות ערך שלם"
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr "אמור להיות ערך שלם וחיובי"
 
@@ -20193,7 +19942,7 @@ msgstr "atan()‎ - הטנגנס ההפוך של ערך כזווית, מבוטא
 
 #: app/controllers/CControllerPopupTriggerExpr.php:336
 msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
-msgstr ""
+msgstr "atan2()‎ - הארקטנגנס של הנקודות בצירים האנכי והאופקי שמיוצגים כזווית, ברדיאנים"
 
 #: include/events.inc.php:63
 msgid "autoregistered host"
@@ -20299,14 +20048,8 @@ msgstr "לא ניתן לשנות"
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20336,19 +20079,11 @@ msgstr "לא ניתן לשנות"
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20368,14 +20103,14 @@ msgstr "לא ניתן לשנות"
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20383,7 +20118,7 @@ msgstr "לא ניתן לשנות"
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "לא יכול להישאר ריק"
@@ -20396,7 +20131,7 @@ msgstr "לא ניתן להמיר ל־JSON, ערך התוצאה ארוך מדי"
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr "בקשת ה־Scroll API אינה תקינה, יכול להיות שהנתונים נקטעו"
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr "לא ניתן לעדכן מאפיין של כלל גילוי מתבנית"
 
@@ -20430,7 +20165,7 @@ msgstr "אין ליצור תלות מעגלית"
 msgid "circular item dependency is not allowed"
 msgstr "תלות מעגלית לפריט אסורה"
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr "צבע"
 
@@ -20448,7 +20183,8 @@ msgid "configure"
 msgstr "הגדרה"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr "מכיל"
@@ -20477,7 +20213,7 @@ msgstr "count()‎ - מספר ערכי ה־ V שהתקבלו בהצלחה (ומ�
 msgid "countunique() - The number of unique values"
 msgstr "countunique()‎ - מספר הערכים היחודיים"
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20539,7 +20275,7 @@ msgstr "סדר יורד"
 msgid "description"
 msgstr "תיאור"
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr "התיקייה לא יכולה להיות ריקה"
 
@@ -20561,13 +20297,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr "כלל הגילוי „%1$s” במארח „%2$s” אינו במעקב"
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr "אינו מכיל"
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr "אינו שווה"
@@ -20593,7 +20329,8 @@ msgid "e() - Returns Euler's number"
 msgstr "e()‎ - מחזירה את קבוע אוילר"
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20630,9 +20367,13 @@ msgstr "הביטוי ריק"
 msgid "failed to parse JSON"
 msgstr "פענוח ה־JSON נכשל"
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr "סוג הקובץ אינו נתמך"
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
-msgstr ""
+msgstr "find()‎ - בדיקת מופעי התבנית V (שמקיימת את הסימן O) למשך T (1 - תואם, 0 - לא תואם)"
 
 #: app/views/popup.maintenance.period.php:124 include/graphs.inc.php:86
 #: include/maintenances.inc.php:105
@@ -20676,7 +20417,7 @@ msgstr "הגדרות תחזוקה כלליות"
 msgid "graph pattern"
 msgstr "תבנית תרשים"
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20717,6 +20458,11 @@ msgstr "סמל"
 msgid "image"
 msgstr "תמונה"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr "גודל התמונה חייב להיות קטן מ־%1$s"
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "בתוך"
@@ -20757,15 +20503,19 @@ msgstr "מניין רכיבים שגוי"
 msgid "incorrect expression starting from \"%1$s\""
 msgstr "ביטוי שגוי החל מ־„%1$s”"
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr "מספר התנאים שגוי"
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "שגיאת תחביר ליד „%1$s“"
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr "שימוש שגוי בפונקציה „%1$s”"
@@ -20793,7 +20543,7 @@ msgstr "תבנית Prometheus שגויה"
 msgid "invalid address range \"%1$s\""
 msgstr "טווח כתובות שגוי „%1$s”"
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr "רצף בתים שגוי ב־UTF-8"
 
@@ -20822,27 +20572,27 @@ msgstr "משתנה רביעי שגוי בפונקציה „%1$s”"
 msgid "invalid history storage period"
 msgstr "תקופת אחסון היסטוריה שגויה"
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr "שם קבוצת המארחים שגויה"
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr "שם המארח שגוי"
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr "משתנה חמישי שגוי בפונקציה „%1$s”"
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr "ביטוי טווח שגוי"
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr "ביטוי רגולרי שגוי"
 
@@ -20870,7 +20620,7 @@ msgstr "גדול או שווה"
 msgid "is less than or equals"
 msgstr "קטן או שווה"
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr "לא תחום ב־{} או שגוי"
 
@@ -20894,7 +20644,7 @@ msgstr "המפתח ריק"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:650
 msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
-msgstr ""
+msgstr "kurtosis()‎ - מודדת את „ההזדנבות” של ההתפלגות"
 
 #: include/classes/graphdraw/CLineGraphDraw.php:1377
 #: include/classes/graphdraw/CPieGraphDraw.php:296 include/graphs.inc.php:88
@@ -20938,7 +20688,7 @@ msgstr "log10()‎ - לוגריתם עשרוני"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:697
 msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
-msgstr ""
+msgstr "logeventid()‎ - מזהה האירוע של רשומת היומן האחרונה שתואמת לביטוי הרגולרי V למשך T (1 - תואם, 0 - לא תואם)"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:704
 msgid "logseverity() - Log severity of the last log entry for period T"
@@ -20946,7 +20696,7 @@ msgstr "logseverity()‎ - חומרת היומן של רשומת היומן הא
 
 #: app/controllers/CControllerPopupTriggerExpr.php:711
 msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
-msgstr ""
+msgstr "logsource()‎ - מקור היומן של רשומת היומן האחרונה שתואמת לביטוי הרגולרי V למשך T (1 - תואם, 0 - לא תואם)"
 
 #: include/events.inc.php:65
 msgid "low-level discovery rule"
@@ -20956,12 +20706,12 @@ msgstr "כלל גילוי ברמה נמוכה"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr "ltrim()‎ - מסירה תווים מסוימים מהתחלה של מחרוזת"
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -21020,7 +20770,7 @@ msgstr "התאמות"
 msgid "max"
 msgstr "מרבי"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr "משך הזמן המרבי קטן ממשך הזמן של מסנן הזמן כבררת מחדל"
 
@@ -21060,7 +20810,7 @@ msgid "min() - Minimum value for period T"
 msgstr "min()‎ - ערך מזערי במשך T"
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr "האורך המזערי הוא %1$s תווים"
@@ -21087,8 +20837,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "מש"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr "חייב להיות באורך %1$s תווים"
@@ -21103,27 +20853,14 @@ msgstr "חייב להיות משתמש LDAP תקני"
 msgid "must be at least %1$d characters long"
 msgstr "חייב להיות באורך של %1$d תווים לפחות"
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "חייב להיות בין „%1$s“ לבין „%2$s“"
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr "חייב להכיל לפחות תו אחד"
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr "חייב להכיל לפחות מאקרו אחד של זיהוי ברמה נמוכה"
 
@@ -21151,6 +20888,14 @@ msgstr "אסור שתהיה ססמה נפוצה או תלוית הקשר"
 msgid "must not contain user's name, surname or username"
 msgstr "לא יכולה להכיל את השם הפרטי של המשתמש, את שם משפחתו או את שם המשתמש שלו"
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr "n-d"
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr "n-d H:i"
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21161,7 +20906,7 @@ msgstr "לא יכולה להכיל את השם הפרטי של המשתמש, א�
 msgid "name"
 msgstr "שם"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "חדש"
 
@@ -21296,7 +21041,7 @@ msgstr "פלט"
 msgid "path/to/secret"
 msgstr "נתיב/אל/סוד"
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr "נתיב/אל/סוד:מפתח"
 
@@ -21331,26 +21076,30 @@ msgstr "radians()‎ - ממירה ערך ממעלות לרדיאנים"
 msgid "rand() - A random integer value"
 msgstr "rand()‎ - ערך מספרי שלם אקראי"
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr "rate()‎ - מחזירה רמה ממוצעת לכל שנייה למונים שגדלים באופן אחיד"
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr "דרושה גישה לקריאה-כתיבה לשירות הצאצא „%1$s”"
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
-msgstr ""
+msgstr "יש לשמר את הגישה לקריאה-כתיבה לשירות הצאצא „%1$s”"
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr "דרושה גישה לקריאה-כתיבה לשירות"
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
-msgstr ""
+msgstr "יש לשמר את הגישה לקריאה-כתיבה לשירות"
 
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:110
 msgid "reference to a non-existent tree element"
@@ -21376,11 +21125,11 @@ msgstr "ביטוי רגולרי"
 msgid "regular expression"
 msgstr "ביטוי רגולרי"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr "repeat()‎ - מחזירה מחרוזת שמורכבת מערך שחוזר מספר פעמים"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr "replace()‎ - חיפוש מופעים של תבנית בערך מסוים והחלפתם"
 
@@ -21392,15 +21141,15 @@ msgstr "החלפה"
 msgid "right"
 msgstr "ימינה"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr "right()‎ - מחזירה כמות כזאת של התווים הימניים ביותר"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr "round()‎ - מעגלת ערך למיקומים אחרי הנקודה העשרונית"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr "rtrim()‎ - מסירה תווים מסוימים מסוף המחרוזת"
 
@@ -21448,7 +21197,7 @@ msgstr "שירות"
 msgid "short description"
 msgstr "תיאור קצר"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21467,15 +21216,15 @@ msgstr "תיאור קצר"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr "אמור להיות ריק"
 
@@ -21491,31 +21240,31 @@ msgstr "הצגת מיפוי סמלים"
 msgid "sign in as guest"
 msgstr "כניסה כאורח"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr "signum()‎ - מחזירה ‎-1 אם ערך הוא שלילי, 0 עם הערך הוא אפס, 1 אם ערך הוא חיובי"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr "sin()‎ - סינוס של ערך, כאשר הערך הוא זווית שמיוצגת ברדיאנים"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr "sinh()‎ - הסינוס ההיפרבולי של הערך"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr "skewness()‎ - מודדת את האסימטריה של התפלגות ההסתברות"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr "sqrt()‎ - שורש ריבועי של ערך"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr "stddevpop()‎ - סטיית תקן של הקבוצה"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr "stddevsamp()‎ - סטיית תקן של מדגם"
 
@@ -21523,11 +21272,11 @@ msgstr "stddevsamp()‎ - סטיית תקן של מדגם"
 msgid "sum"
 msgstr "סכום"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr "sum()‎ - סכום הערכים במשך T"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr "sumofsquares()‎ - סכום ריבועים"
 
@@ -21543,8 +21292,8 @@ msgstr "פרטי הגישה שסופקו אינם יחודיים"
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21555,7 +21304,7 @@ msgstr "פרטי הגישה שסופקו אינם יחודיים"
 msgid "tag"
 msgstr "תגית"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr "tan()‎ - הטנגנס (משיק) של הערך"
 
@@ -21564,13 +21313,17 @@ msgstr "tan()‎ - הטנגנס (משיק) של הערך"
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "מזהה התבנית %1$s מועבר %2$s פעמים"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr "הזנת השורה החדשה האחרונה חסרה"
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21579,20 +21332,20 @@ msgstr "מזהה התבנית %1$s מועבר %2$s פעמים"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "הפרמטר „%1$s” חסר"
@@ -21624,39 +21377,39 @@ msgstr "שלישי"
 msgid "third parameter is expected"
 msgstr "אמור להיות משתנה שלישי"
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr "משך הזמן כבררת המחדל של מסנן הזמן חורג ממשך הזמן המרבי"
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr "הפרש זמן"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr "time()‎ - השעה הנוכחית"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr "timeleft()‎ - זמן להגיע לסף המוערך בהתאם למשך T"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr "trendavg()‎ - ערך ממוצע של משך זמן T עם הזחת משך זמן מדויקת"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr "trendcount()‎ - מספר הערכים שהתקבלו בהצלחה בפרק הזמן T"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr "trendmax()‎ - ערך מרבי לפרק זמן T עם הזחת זמן מדויקת"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr "trendmin()‎ - ערך מזערי לפרק זמן T עם הזחת זמן מדויקת"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr "trendsum()‎ - סכוםה ערכים לפרק זמן T עם הזחת זמן מדויקת"
 
@@ -21670,7 +21423,7 @@ msgstr "הקפצה"
 msgid "trigger does not allow manual closing"
 msgstr "ההקפצה אינה מאפשרת סגירה ידנית"
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr "ביטוי ההקפצה חייב להכיל לפחות הפניית /מארח/ערך אחת"
 
@@ -21682,26 +21435,26 @@ msgstr "אבטיפוס ההקפצה אינו ניתן להעברה לתבנית
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr "הקפצות עם קישוריות אינן ניתנות להעברה לתבנית או למארח אחרים"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr "trim()‎ - הסרת תווים מסוימים מתחילת או סוף מחרוזת"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr "truncate()‎ - קוצץ ערך למקומות עשרוניים"
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "יש להקליד כאן כדי לחפש"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr "כתובת לא מקובלת"
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21709,11 +21462,11 @@ msgstr "קבוע לא צפוי „%1$s”"
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr "ערך הקבוע אינו צפוי „%1$s”"
@@ -21730,10 +21483,10 @@ msgstr "סוף המפתח בלתי צפוי"
 msgid "unexpected end of macro"
 msgstr "סוף המאקרו בלתי צפוי"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21743,11 +21496,12 @@ msgstr "סוף המאקרו בלתי צפוי"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr "הפרמטר בלתי מתקבל „%1$s”"
@@ -21773,8 +21527,8 @@ msgstr "הטקסט „%1$s“ בלתי צפוי"
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21799,6 +21553,10 @@ msgstr "סיומת הזמן אינה נתמכת"
 msgid "unsupported version number"
 msgstr "מספר הגרסה אינו נתמך"
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr "אמור להיות מזהה באותיות גדולות"
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21814,7 +21572,7 @@ msgstr "מספר הגרסה אינו נתמך"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21834,11 +21592,11 @@ msgstr "מספר הגרסה אינו נתמך"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "ערך"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr "הערך „%1$s” כבר קיים"
@@ -21856,76 +21614,85 @@ msgstr "הערך „%1$s” לא נמצא"
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr "הערך %1$s כבר קיים"
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr "הערך ארוך מדי"
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr "הערך חייב להיות %1$s"
+msgid_plural "value must be one of %1$s"
+msgstr[0] "הערך חייב להיות %1$s"
+msgstr[1] "הערך חייב להיות אחד מבין %1$s"
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr "הערך חייב להיות בין „%1$s” לבין „%2$s”"
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr "הערך חייב להיות ריק"
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr "הערך חייב להיות ריק או אחד מבין %1$s"
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] "הערך חייב להיות ריק או %1$s"
+msgstr[1] "הערך חייב להיות ריק או אחד מבין %1$s"
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr "הערך לא יכול לעלות על „%1$s”"
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr "הערך לא יכול להיות פחות מאשר „%1$s”"
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21937,18 +21704,16 @@ msgstr "הערך לא יכול להיות פחות מאשר „%1$s”"
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr "הערך חייב להיות אחד מבין %1$s"
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr "הערך חייב להיות בטווח של %1$s"
@@ -21957,7 +21722,7 @@ msgstr "הערך חייב להיות בטווח של %1$s"
 msgid "value of first parameter is too long"
 msgstr "ערך המשתנה הראשון ארוך מדי"
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr "ערך של תגית אירוע חדשה"
 
@@ -21970,11 +21735,11 @@ msgstr "ערך המשתנה השני ארוך מדי"
 msgid "value of third parameter must be one of %1$s"
 msgstr "ערך המשתנה השלישי חייב להיות אחת מתוך %1$s"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr "varpop()‎ - שונות אוכלוסיה"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr "varsamp()‎ - סטיית דגימה"
 
@@ -21991,7 +21756,7 @@ msgstr "סוג כללי הגילוי שגוי"
 msgid "wrong item type"
 msgstr "סוג פריט שגוי"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/hu/LC_MESSAGES/frontend.po b/ui/locale/hu/LC_MESSAGES/frontend.po
index 69ce4b4418c..d68186bc773 100644
--- a/ui/locale/hu/LC_MESSAGES/frontend.po
+++ b/ui/locale/hu/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2013-01-09 22:10+0300\n"
 "Last-Translator: Robert <szenasy.robert@gmail.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -226,14 +226,14 @@ msgstr[1] ""
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -389,7 +389,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -450,10 +450,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr ""
@@ -496,7 +492,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Nyugtázom"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Visszaigazolás"
 
@@ -504,7 +500,7 @@ msgstr "Visszaigazolás"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Nyugtázva"
@@ -517,7 +513,7 @@ msgstr "Nyugtázott PROBLEM események"
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -544,9 +540,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -603,7 +599,7 @@ msgstr ""
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -612,7 +608,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Eljárás hozzáadva"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -661,8 +657,8 @@ msgstr "Eljárás frissítve"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Eljárások"
@@ -729,7 +725,7 @@ msgstr "Aktív eddig"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -740,7 +736,7 @@ msgstr "Aktív eddig"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -763,9 +759,9 @@ msgstr "Aktív eddig"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -835,7 +831,7 @@ msgstr "Aktív eddig"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Hozzáadás"
 
@@ -843,11 +839,11 @@ msgstr "Hozzáadás"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr ""
 
@@ -855,7 +851,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -872,7 +868,7 @@ msgstr "Új hoszt"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr ""
 
@@ -894,7 +890,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -946,12 +942,12 @@ msgstr ""
 msgid "Add widget"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -961,7 +957,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -974,7 +970,7 @@ msgstr "Rendszergazda"
 msgid "Administration"
 msgstr "Adminisztráció"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -996,7 +992,7 @@ msgstr ""
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1068,7 +1064,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Mind"
 
@@ -1086,7 +1082,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr ""
 
@@ -1104,7 +1100,7 @@ msgstr ""
 msgid "All problems if tag values match"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1217,15 +1213,15 @@ msgstr "Alkalmazás hiba."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Alkalmaz"
 
@@ -1243,7 +1239,7 @@ msgstr ""
 msgid "Apr"
 msgstr "Ápr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Április"
 
@@ -1271,7 +1267,7 @@ msgstr "Terület típusa"
 msgid "Arithmetic"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1318,7 +1314,7 @@ msgstr ""
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1327,7 +1323,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1339,6 +1335,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1350,7 +1351,7 @@ msgstr ""
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1406,7 +1407,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Aug"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Augusztus"
 
@@ -1419,7 +1420,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1496,7 +1497,7 @@ msgstr ""
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1511,7 +1512,7 @@ msgstr ""
 msgid "Automatic icon selection"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1563,7 +1564,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1626,7 +1627,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Zárolva"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr ""
 
@@ -1680,11 +1681,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Alúl"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr ""
 
@@ -1710,7 +1711,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1755,8 +1756,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1765,7 +1766,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Kalkulált"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1790,7 +1791,7 @@ msgstr "Visszahívás"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1803,8 +1804,8 @@ msgstr "Visszahívás"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Mégsem"
 
@@ -1834,7 +1835,7 @@ msgstr "Az eljárást nem lehet felvenni"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1844,7 +1845,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1875,8 +1876,8 @@ msgid "Cannot add host prototype"
 msgstr ""
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Nem sikerült a képet hozzáadni"
 
@@ -1968,15 +1969,15 @@ msgstr "Felhasználó létrehozása sikertelen"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1996,33 +1997,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Előzmények törlése sikertelen"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr ""
 
@@ -2049,7 +2046,7 @@ msgid_plural "Cannot copy graphs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] ""
@@ -2101,8 +2098,8 @@ msgstr ""
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2131,7 +2128,7 @@ msgstr ""
 msgid "Cannot delete action"
 msgstr "Az eljárást nem lehet törölni"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2199,7 +2196,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2210,11 +2207,11 @@ msgstr[1] ""
 msgid "Cannot delete host prototypes"
 msgstr ""
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr ""
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Nem sikerült a képet törölni"
 
@@ -2239,7 +2236,7 @@ msgstr ""
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Cannot delete items"
 
@@ -2270,7 +2267,7 @@ msgid_plural "Cannot delete proxies"
 msgstr[0] "Proxy törlése sikertelen"
 msgstr[1] "Proxy törlése sikertelen"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2294,7 +2291,7 @@ msgid_plural "Cannot delete scripts"
 msgstr[0] "Script törlése sikertelen"
 msgstr[1] "Script törlése sikertelen"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr ""
@@ -2310,8 +2307,8 @@ msgid_plural "Cannot delete services"
 msgstr[0] "Szolgáltatás törlése sikertelen"
 msgstr[1] "Szolgáltatás törlése sikertelen"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2340,7 +2337,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr ""
 
@@ -2393,7 +2390,7 @@ msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr ""
 
@@ -2428,7 +2425,7 @@ msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
@@ -2459,7 +2456,7 @@ msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -2506,7 +2503,7 @@ msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
@@ -2537,7 +2534,7 @@ msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
@@ -2551,7 +2548,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2585,8 +2582,8 @@ msgstr ""
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2684,24 +2681,20 @@ msgstr ""
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2714,7 +2707,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr ""
 
@@ -2728,7 +2721,7 @@ msgid "Cannot link template."
 msgstr ""
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2760,17 +2753,17 @@ msgstr ""
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr ""
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr ""
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr ""
@@ -2797,7 +2790,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr ""
 
@@ -2816,7 +2809,7 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2856,12 +2849,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2880,7 +2873,7 @@ msgid_plural "Cannot unblock users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
@@ -2893,7 +2886,7 @@ msgstr "Minta leválasztása sikertelen"
 msgid "Cannot unlink template."
 msgstr ""
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2946,11 +2939,6 @@ msgstr ""
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr ""
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2960,8 +2948,9 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
@@ -3021,9 +3010,7 @@ msgstr ""
 msgid "Cannot update group"
 msgstr "Csoport frissítése sikertelen"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
@@ -3046,13 +3033,13 @@ msgstr[1] ""
 msgid "Cannot update hosts"
 msgstr ""
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr ""
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Nem sikerült a képet frissíteni"
 
@@ -3106,12 +3093,12 @@ msgstr "Hálózati térkép frissítése sikertelen"
 msgid "Cannot update proxy"
 msgstr "Proxy frissítése sikertelen"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3131,17 +3118,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Script frissítése sikertelen"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3216,7 +3203,7 @@ msgstr[1] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr ""
 
@@ -3316,8 +3303,8 @@ msgid "Character string not included"
 msgstr "Nem tartalmazza a következő szót"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3432,7 +3419,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr ""
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3453,7 +3440,7 @@ msgstr ""
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3474,11 +3461,11 @@ msgstr ""
 msgid "Clear when unlinking"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3493,7 +3480,7 @@ msgstr "Óra"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3508,7 +3495,7 @@ msgstr "Óra"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Klón"
 
@@ -3519,8 +3506,8 @@ msgstr "Klón"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Bezár"
 
@@ -3531,13 +3518,13 @@ msgstr "Bezár"
 msgid "Close expression constructor"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
 
@@ -3550,8 +3537,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr ""
 
@@ -3568,7 +3555,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3634,7 +3621,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3645,17 +3632,12 @@ msgstr "Feltétel"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3665,17 +3647,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3691,7 +3668,7 @@ msgstr "Feltételek"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Konfiguráció"
 
@@ -3754,7 +3731,7 @@ msgstr ""
 msgid "Configuration of housekeeping"
 msgstr ""
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr ""
@@ -3861,7 +3838,7 @@ msgstr ""
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr ""
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3954,7 +3931,7 @@ msgstr "Kapcsolat"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4014,7 +3991,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -4053,8 +4030,8 @@ msgstr ""
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Másolás"
 
@@ -4063,12 +4040,11 @@ msgstr "Másolás"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr ""
@@ -4095,16 +4071,6 @@ msgid_plural "Correlations enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr ""
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr ""
@@ -4113,14 +4079,10 @@ msgstr ""
 msgid "Correlation updated"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Kép mentése sikertelen!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Számol"
 
@@ -4184,11 +4146,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr ""
 
@@ -4305,7 +4267,7 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr ""
 
@@ -4329,7 +4291,7 @@ msgstr ""
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr ""
 
@@ -4492,7 +4454,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "DNS név"
@@ -4504,11 +4466,11 @@ msgstr "DNS név"
 msgid "Daily"
 msgstr "Napi"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4529,8 +4491,8 @@ msgstr ""
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr ""
 
@@ -4553,9 +4515,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr ""
 
@@ -4579,7 +4541,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4607,7 +4569,7 @@ msgstr "Adat áttekintés"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4749,7 +4711,7 @@ msgstr "Hét napja"
 msgid "Days"
 msgstr "Napok"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Hibakeresés"
 
@@ -4763,26 +4725,26 @@ msgstr "Hibakereső mód"
 msgid "Dec"
 msgstr ""
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "December"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Alapértelmezett"
 
@@ -4875,7 +4837,7 @@ msgstr "Késleltetve"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4899,8 +4861,8 @@ msgstr "Késleltetve"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Törlés"
 
@@ -4925,11 +4887,11 @@ msgstr ""
 msgid "Delete current action?"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4973,7 +4935,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -5029,7 +4991,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "Törli a kijelölt felderítési szabályokat?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr ""
 
@@ -5134,7 +5096,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5178,7 +5140,7 @@ msgstr "Törli a kiválasztott triggert?"
 msgid "Delete web scenario?"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5223,7 +5185,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Függő"
 
@@ -5231,7 +5193,7 @@ msgstr "Függő"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5241,7 +5203,7 @@ msgstr "Függőség"
 msgid "Deployment status"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5274,7 +5236,7 @@ msgid "Description"
 msgstr "Leírás"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5440,10 +5402,10 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5526,7 +5488,7 @@ msgid "Discovery by proxy"
 msgstr "Felderítés proxy-n keresztül"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Felderítés"
 
@@ -5538,7 +5500,7 @@ msgstr ""
 msgid "Discovery list"
 msgstr ""
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr ""
 
@@ -5570,7 +5532,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5578,12 +5540,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Felderítési szabály"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
@@ -5596,7 +5558,7 @@ msgstr ""
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5638,7 +5600,7 @@ msgstr "Felderítési szabály frissítve"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5649,7 +5611,7 @@ msgstr ""
 msgid "Discovery rules deleted"
 msgstr "Felderítési szabályok törölve"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Felderítés állapota"
@@ -5686,10 +5648,11 @@ msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
@@ -5699,7 +5662,7 @@ msgstr ""
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5721,7 +5684,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
@@ -5777,7 +5740,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5785,7 +5748,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr ""
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5804,18 +5767,6 @@ msgstr ""
 msgid "Draw style"
 msgstr "Rajz stílusa"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5828,11 +5779,6 @@ msgstr ""
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5884,7 +5830,7 @@ msgstr "Dinamikus elem"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
@@ -5893,11 +5839,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5911,8 +5857,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Szerkesztés"
 
@@ -5928,11 +5874,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr ""
 
@@ -5992,21 +5938,17 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
@@ -6022,25 +5964,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6050,14 +5986,6 @@ msgstr ""
 msgid "Empty map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr ""
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6223,7 +6151,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6234,7 +6162,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6277,7 +6205,7 @@ msgid "English (en_US)"
 msgstr ""
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6293,7 +6221,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6312,12 +6240,12 @@ msgstr ""
 msgid "Error"
 msgstr "Hiba"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6345,7 +6273,7 @@ msgstr "Esemény azonosító"
 msgid "Event acknowledged"
 msgstr "Esemény visszaigazolva"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6353,7 +6281,7 @@ msgid "Event correlation"
 msgstr ""
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr ""
@@ -6388,11 +6316,11 @@ msgstr ""
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6437,15 +6365,10 @@ msgstr "Kivéve"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6483,7 +6406,7 @@ msgstr ""
 msgid "Executed script"
 msgstr "Végrehajtott szkript"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr ""
 
@@ -6499,8 +6422,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr ""
 
@@ -6621,7 +6544,7 @@ msgstr "Kifejezések"
 msgid "External check"
 msgstr "Külső ellenőrzés"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
@@ -6648,8 +6571,8 @@ msgstr "Hiba"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6660,26 +6583,26 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6687,7 +6610,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6711,7 +6634,7 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Február"
 
@@ -6733,10 +6656,9 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6747,13 +6669,6 @@ msgstr ""
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6772,11 +6687,6 @@ msgstr ""
 msgid "Field \"%1$s\" is not string."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6791,10 +6701,6 @@ msgstr ""
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr ""
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6859,7 +6765,8 @@ msgstr "Kitöltés"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6884,7 +6791,7 @@ msgstr "Szűrő"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6936,7 +6843,7 @@ msgstr ""
 msgid "Fixed"
 msgstr "Fix"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6987,12 +6894,12 @@ msgstr ""
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7005,7 +6912,7 @@ msgstr "Francia (fr_FR)"
 msgid "Fri"
 msgstr ""
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Péntek"
 
@@ -7116,7 +7023,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr ""
@@ -7130,7 +7037,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr ""
 
@@ -7168,7 +7075,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr ""
 
@@ -7176,7 +7083,7 @@ msgstr ""
 msgid "Gradient line"
 msgstr "Meredek vonal"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7236,7 +7143,7 @@ msgstr[1] ""
 msgid "Graph deleted"
 msgstr "Grafikon törölve"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7273,8 +7180,8 @@ msgstr ""
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7308,8 +7215,8 @@ msgstr "Grafikon típusa"
 msgid "Graph updated"
 msgstr "Grafikon frissítve"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7340,7 +7247,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Grafikonok"
 
@@ -7361,12 +7268,12 @@ msgstr ""
 msgid "Group"
 msgstr "Csoport"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr ""
@@ -7541,11 +7448,11 @@ msgstr "Segítség"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr ""
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr ""
 
@@ -7572,11 +7479,11 @@ msgstr ""
 msgid "High"
 msgstr "Magas"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7597,7 +7504,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Előzmények"
 
@@ -7605,11 +7512,15 @@ msgstr "Előzmények"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Előzmények törölve"
 
@@ -7652,7 +7563,7 @@ msgstr "Vízszintes"
 msgid "Horizontal align"
 msgstr "Vízszintes igazítás"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7681,7 +7592,7 @@ msgstr "Vízszintes igazítás"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7695,7 +7606,7 @@ msgstr[1] "Hoszt"
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7703,7 +7614,7 @@ msgstr ""
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7755,7 +7666,7 @@ msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7769,22 +7680,22 @@ msgstr[1] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Hoszt csoport"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7797,10 +7708,10 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7816,8 +7727,8 @@ msgstr ""
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7891,7 +7802,7 @@ msgstr "Hoszt név"
 msgid "Host networks"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7971,7 +7882,7 @@ msgstr ""
 msgid "Host updated"
 msgstr "Hoszt frissítve"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr ""
@@ -7991,7 +7902,7 @@ msgstr ""
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8004,7 +7915,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8052,7 +7963,7 @@ msgstr ""
 msgid "Hours"
 msgstr "Órák"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8092,7 +8003,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IP cím"
@@ -8117,7 +8028,7 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8174,12 +8085,12 @@ msgstr ""
 msgid "Icon map"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
@@ -8192,18 +8103,18 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
@@ -8304,23 +8215,20 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Kép"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -8329,7 +8237,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Kép hozzáadva"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Kép törölve"
 
@@ -8337,18 +8245,12 @@ msgstr "Kép törölve"
 msgid "Image label type"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Kép frissítve"
 
@@ -8443,7 +8345,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8454,13 +8356,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr ""
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8504,7 +8406,7 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8672,24 +8574,6 @@ msgstr ""
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8744,8 +8628,6 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
@@ -8771,31 +8653,22 @@ msgstr ""
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8824,7 +8697,7 @@ msgstr ""
 msgid "Incorrect eventsource value."
 msgstr ""
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
@@ -8849,22 +8722,17 @@ msgstr ""
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8875,7 +8743,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
@@ -8903,8 +8771,6 @@ msgstr ""
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8966,10 +8832,6 @@ msgstr ""
 msgid "Incorrect map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr ""
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9027,13 +8889,13 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr ""
 
@@ -9086,12 +8948,7 @@ msgstr ""
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
@@ -9137,13 +8994,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9160,60 +9017,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr ""
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr ""
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9268,14 +9095,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9385,25 +9206,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9414,7 +9217,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9460,16 +9263,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9478,7 +9282,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9566,12 +9370,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Beszúrás"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr ""
 
@@ -9675,7 +9479,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr ""
 
@@ -9683,7 +9487,7 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9694,7 +9498,7 @@ msgstr ""
 msgid "Interval"
 msgstr "Intervallum"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9717,7 +9521,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9749,7 +9553,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
@@ -9774,27 +9578,29 @@ msgstr ""
 msgid "Invalid method parameters."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9820,17 +9626,17 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9838,8 +9644,8 @@ msgstr ""
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9853,106 +9659,116 @@ msgstr ""
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9994,43 +9810,38 @@ msgstr ""
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10051,7 +9862,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Leltár"
 
@@ -10092,7 +9903,7 @@ msgstr ""
 msgid "Italian (it_IT)"
 msgstr "Olasz (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10124,7 +9935,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10138,7 +9949,7 @@ msgstr "Adatsor hozzáadva"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] ""
@@ -10152,13 +9963,13 @@ msgstr ""
 msgid "Item deleted"
 msgstr "Elem törölve"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -10168,7 +9979,7 @@ msgstr[1] ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr ""
 
@@ -10177,7 +9988,7 @@ msgstr ""
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10214,8 +10025,8 @@ msgid_plural "Item prototypes updated"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10241,7 +10052,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10273,8 +10084,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10325,11 +10136,11 @@ msgstr ""
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Elemek"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Elemek törölve"
 
@@ -10347,7 +10158,7 @@ msgstr "Adatsorok hozzáadva"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10372,6 +10183,10 @@ msgstr ""
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10384,7 +10199,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10402,7 +10217,7 @@ msgstr ""
 msgid "Jan"
 msgstr ""
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Január"
 
@@ -10424,7 +10239,7 @@ msgstr ""
 msgid "Jul"
 msgstr ""
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Július"
 
@@ -10432,7 +10247,7 @@ msgstr "Július"
 msgid "Jun"
 msgstr ""
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Június"
 
@@ -10588,22 +10403,6 @@ msgid_plural "Last %1$d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10615,11 +10414,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Utolsó ellenőrzés"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Utolsó óra grafikonja"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Utolsó hónap grafikonja"
 
@@ -10657,11 +10456,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Utolsó érték"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Utolsó hét grafikonja"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10670,11 +10469,11 @@ msgstr "Utolsó hét grafikonja"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Legfrissebb adat"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr ""
 
@@ -10715,7 +10514,7 @@ msgstr ""
 msgid "Left trim"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -10996,7 +10795,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
@@ -11018,7 +10817,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11029,12 +10828,12 @@ msgid "Macro"
 msgstr ""
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
@@ -11062,7 +10861,7 @@ msgstr ""
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -11070,7 +10869,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11153,7 +10952,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11175,13 +10974,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Térkép"
 
@@ -11250,7 +11049,7 @@ msgstr ""
 msgid "Map update failed."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11282,7 +11081,7 @@ msgstr "Térképek"
 msgid "Mar"
 msgstr ""
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Március"
 
@@ -11386,7 +11185,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11400,7 +11199,7 @@ msgstr[1] ""
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Május"
 
@@ -11415,15 +11214,12 @@ msgstr ""
 msgid "Media"
 msgstr "Eszköztípus"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Eszköztípus"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr ""
@@ -11450,11 +11246,6 @@ msgid_plural "Media types enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr ""
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11484,7 +11275,7 @@ msgstr ""
 msgid "Media types"
 msgstr "Eszköztípusok"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11572,7 +11363,7 @@ msgstr ""
 msgid "Method not found."
 msgstr ""
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11634,7 +11425,7 @@ msgid "Minimum severity"
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11693,7 +11484,7 @@ msgstr "Mód"
 msgid "Model"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11731,7 +11522,7 @@ msgstr[1] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11757,7 +11548,7 @@ msgstr ""
 msgid "Mon"
 msgstr ""
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Hétfő"
 
@@ -11797,11 +11588,11 @@ msgstr "Hónap"
 msgid "Monthly"
 msgstr "Havi"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11825,7 +11616,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr ""
 
@@ -11838,7 +11629,7 @@ msgstr ""
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr ""
 
@@ -11967,11 +11758,11 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12129,19 +11920,21 @@ msgstr "Új feltétel"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr ""
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr ""
 
@@ -12153,7 +11946,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Új reguláris kifejezés"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12161,7 +11954,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Új szolgáltatási időszak felvétele"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12170,7 +11963,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12188,7 +11981,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12217,30 +12010,6 @@ msgstr ""
 msgid "No"
 msgstr "Nem"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr ""
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12256,11 +12025,6 @@ msgstr ""
 msgid "No \"%1$s\" given for map."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12268,7 +12032,7 @@ msgstr ""
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -12278,7 +12042,7 @@ msgstr ""
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -12295,11 +12059,6 @@ msgstr ""
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr ""
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12330,7 +12089,7 @@ msgstr ""
 msgid "No details"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr ""
 
@@ -12366,7 +12125,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr ""
 
@@ -12396,7 +12155,7 @@ msgstr "Nincs kép"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr ""
 
@@ -12430,7 +12189,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr ""
 
@@ -12438,17 +12197,46 @@ msgstr ""
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12456,7 +12244,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12484,19 +12272,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12511,16 +12298,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12540,12 +12333,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12566,27 +12357,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12603,14 +12396,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12619,7 +12412,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
@@ -12639,7 +12432,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr ""
 
@@ -12651,7 +12444,7 @@ msgstr ""
 msgid "No target selected"
 msgstr "Nincs cél kiválasztva"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr ""
 
@@ -12668,7 +12461,7 @@ msgstr ""
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr ""
 
@@ -12738,15 +12531,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12778,7 +12571,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "Nem támogatott"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Jegyzet"
@@ -12809,7 +12602,7 @@ msgstr ""
 msgid "Nov"
 msgstr ""
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "November"
 
@@ -12996,8 +12789,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13057,13 +12850,13 @@ msgstr ""
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Október"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "KIKAPCSOL"
 
@@ -13071,30 +12864,31 @@ msgstr "KIKAPCSOL"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr ""
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "BEKAPCSOL"
 
@@ -13110,35 +12904,15 @@ msgstr ""
 msgid "One"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr ""
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Egy alkalommal"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Egyszeri kiesés"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13187,10 +12961,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr ""
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13199,15 +12969,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr ""
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Csak az engedélyezett hosztokhoz rendelt, engedélyezett elemekhez tartozó triggerekből számítva"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr ""
 
@@ -13216,7 +12982,7 @@ msgstr ""
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13225,11 +12991,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr ""
 
@@ -13251,7 +13017,7 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13260,33 +13026,33 @@ msgstr ""
 msgid "Operations"
 msgstr "Műveletek"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operátor"
 
@@ -13395,7 +13161,7 @@ msgstr ""
 msgid "Other parameters"
 msgstr "Egyéb paraméterek"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr ""
@@ -13409,7 +13175,7 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13438,7 +13204,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13627,7 +13393,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13672,7 +13438,7 @@ msgstr ""
 msgid "PSK identity"
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13695,16 +13461,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Paraméter"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr ""
@@ -13734,7 +13500,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13751,7 +13517,7 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13763,11 +13529,6 @@ msgstr ""
 msgid "Parse"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr ""
@@ -13828,7 +13589,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr ""
 
@@ -13838,15 +13599,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13892,12 +13653,11 @@ msgstr ""
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Időszak"
 
@@ -13986,7 +13746,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr ""
 
@@ -14026,7 +13786,7 @@ msgstr ""
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14115,7 +13875,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14246,7 +14006,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr ""
 
@@ -14259,21 +14019,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14287,9 +14043,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Hibák"
 
@@ -14323,7 +14079,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr ""
 
@@ -14344,13 +14100,13 @@ msgstr ""
 msgid "Proxies"
 msgstr "Proxik"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14358,7 +14114,7 @@ msgstr "Proxik"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14368,12 +14124,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
@@ -14466,7 +14222,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14543,10 +14299,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Fogadott érték"
@@ -14628,7 +14380,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14646,13 +14398,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Reguláris kifejezés"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14686,7 +14438,7 @@ msgstr "Reguláris kifejezések"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14718,8 +14470,6 @@ msgstr "Távoli parancs"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14740,7 +14490,9 @@ msgstr "Távoli parancs"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14753,7 +14505,7 @@ msgstr "Távoli parancs"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14830,8 +14582,8 @@ msgstr "Távoli parancs"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Eltávolítás"
 
@@ -14871,7 +14623,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14913,7 +14665,7 @@ msgid "Replace dependencies"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14968,7 +14720,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -15010,8 +14762,8 @@ msgstr ""
 msgid "Required string"
 msgstr ""
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Visszaállítás"
 
@@ -15044,7 +14796,7 @@ msgstr ""
 msgid "Reset defaults"
 msgstr ""
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr ""
 
@@ -15110,7 +14862,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Eredmény"
@@ -15297,12 +15049,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Orosz (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15313,8 +15065,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15351,7 +15103,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15447,12 +15199,12 @@ msgstr ""
 msgid "SQL query"
 msgstr ""
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr ""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
@@ -15515,7 +15267,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr ""
 
@@ -15527,7 +15279,7 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Szombat"
 
@@ -15569,7 +15321,7 @@ msgstr "Időzítés"
 msgid "Scheduled check"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15636,7 +15388,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15649,8 +15401,7 @@ msgstr ""
 msgid "Script"
 msgstr "Script"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
@@ -15682,12 +15433,6 @@ msgstr "Script név"
 msgid "Script parameters"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr ""
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr ""
@@ -15700,7 +15445,7 @@ msgstr "Script frissítve"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Scriptek"
 
@@ -15770,8 +15515,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15779,7 +15524,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Kiválaszt"
 
@@ -15815,19 +15560,19 @@ msgstr ""
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr ""
 
@@ -15852,7 +15597,7 @@ msgstr "Küldés csak ide"
 msgid "Send to"
 msgstr "Küldés"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr ""
 
@@ -15885,7 +15630,7 @@ msgstr ""
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "Szeptember"
 
@@ -15916,28 +15661,28 @@ msgstr ""
 msgid "Server time"
 msgstr "Szerver idő"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Szolgáltatás"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15947,7 +15692,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr ""
 
@@ -15980,16 +15725,16 @@ msgstr "Szerviz port"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -15997,11 +15742,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Szolgáltatási időszakok"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Szerviz típus"
 
@@ -16010,30 +15755,29 @@ msgstr "Szerviz típus"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Szolgáltatás frissítve"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Szolgáltatások"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -16041,7 +15785,7 @@ msgstr ""
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16071,7 +15815,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16100,7 +15844,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16109,7 +15853,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16165,7 +15909,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr ""
 
@@ -16307,7 +16051,7 @@ msgstr ""
 msgid "Show working time"
 msgstr "Munkaidő megjelenítése"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr ""
 
@@ -16416,7 +16160,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr ""
 
@@ -16462,7 +16206,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Sorba rendezés (0->999)"
 
@@ -16536,7 +16280,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16639,15 +16383,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Státusz"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Státusz kódok"
@@ -16677,7 +16425,7 @@ msgstr "Csak státusz"
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16725,7 +16473,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16790,7 +16538,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr ""
 
@@ -16806,7 +16554,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Sikeres Események"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16819,7 +16567,7 @@ msgstr ""
 msgid "Sun"
 msgstr ""
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Vasárnap"
 
@@ -16911,12 +16659,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16943,17 +16691,17 @@ msgstr "IGAZ"
 msgid "Table \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Cimke"
@@ -17009,7 +16757,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17069,7 +16817,7 @@ msgstr "Cél típusa"
 msgid "Telnet"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17090,7 +16838,7 @@ msgstr "Minta"
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17114,7 +16862,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17174,7 +16922,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17346,14 +17094,14 @@ msgstr ""
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17418,7 +17166,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Ebben a hónapban"
 
@@ -17426,7 +17174,7 @@ msgstr "Ebben a hónapban"
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Ezen a héten"
 
@@ -17434,7 +17182,7 @@ msgstr "Ezen a héten"
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Ebben az évben"
 
@@ -17454,7 +17202,7 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Csütörtök"
 
@@ -17471,7 +17219,7 @@ msgstr "-ig"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17504,7 +17252,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Idő periódus"
 
@@ -17556,12 +17304,11 @@ msgstr "Időpecsét"
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Ma"
 
@@ -17676,7 +17423,7 @@ msgstr ""
 msgid "Trends"
 msgstr "Trendek"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17684,7 +17431,7 @@ msgstr "Trendek"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Trigger"
 
@@ -17785,7 +17532,7 @@ msgstr ""
 msgid "Trigger overview"
 msgstr "Trigger áttekintés"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17858,11 +17605,11 @@ msgstr ""
 msgid "Trigger severity"
 msgstr "Trigger súlyosság"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17879,7 +17626,7 @@ msgstr "Trigger frissítve"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17914,7 +17661,7 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Kedd"
 
@@ -17927,7 +17674,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17943,19 +17690,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18007,7 +17754,7 @@ msgstr "Információ típusa"
 msgid "Types"
 msgstr "Típusok"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18028,7 +17775,7 @@ msgstr "ISMERETLEN"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18074,12 +17821,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18164,12 +17911,12 @@ msgstr ""
 msgid "Unblock selected users?"
 msgstr "Engedélyezi a kijelölt zárolt felhasználókat?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18189,21 +17936,23 @@ msgstr "Egységek"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Ismeretlen"
@@ -18221,7 +17970,7 @@ msgid "Unknown error"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
@@ -18274,7 +18023,7 @@ msgstr "Eltávolítás a sablonból"
 msgid "Unlink from templates"
 msgstr ""
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr ""
 
@@ -18305,7 +18054,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -18315,7 +18064,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -18360,7 +18109,7 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18373,7 +18122,7 @@ msgstr ""
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18426,7 +18175,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18444,7 +18193,7 @@ msgstr "Feltöltés"
 msgid "Upper level maps"
 msgstr "Felsőbb szintű térképek"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18479,7 +18228,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18494,7 +18243,7 @@ msgstr ""
 msgid "User"
 msgstr "Felhasználó"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
@@ -18546,7 +18295,7 @@ msgstr "Új felhasználó felvéve"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
@@ -18566,7 +18315,7 @@ msgid_plural "Users deleted"
 msgstr[0] "Felhasználó törölve"
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18576,27 +18325,27 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Felhasználói csoport"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
@@ -18630,8 +18379,8 @@ msgstr[1] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18675,14 +18424,14 @@ msgstr ""
 msgid "User profile"
 msgstr "Felhasználói profil"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18751,7 +18500,7 @@ msgstr "Felhasználó frissítve"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -19067,14 +18816,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19084,7 +18833,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19126,7 +18875,7 @@ msgstr ""
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr ""
@@ -19143,7 +18892,7 @@ msgstr ""
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Érték-hozzárendelési lista"
 
@@ -19186,11 +18935,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr ""
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19237,7 +18987,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19324,7 +19074,7 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19341,7 +19091,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19350,7 +19100,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19366,7 +19116,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web"
 
@@ -19378,7 +19128,7 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Web felügyelet"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr ""
 
@@ -19393,27 +19143,27 @@ msgstr ""
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr ""
 
@@ -19435,7 +19185,7 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Szerda"
 
@@ -19446,7 +19196,7 @@ msgstr "Szerda"
 msgid "Weekly"
 msgstr "Heti"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19462,12 +19212,12 @@ msgstr ""
 msgid "When active"
 msgstr "Amikor aktív"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19662,6 +19412,10 @@ msgstr ""
 msgid "Y-m-d H:i:s"
 msgstr ""
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr ""
@@ -19723,7 +19477,7 @@ msgstr "Évi"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19780,18 +19534,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19803,9 +19551,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
@@ -19921,24 +19666,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr ""
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19947,37 +19696,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr ""
@@ -19998,28 +19747,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr ""
@@ -20067,7 +19817,7 @@ msgstr "mind"
 msgid "all media"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20075,42 +19825,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20120,7 +19865,7 @@ msgid "an empty string is expected"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr ""
 
@@ -20128,11 +19873,15 @@ msgstr ""
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20293,14 +20042,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20330,19 +20073,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20362,14 +20097,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20377,7 +20112,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr ""
@@ -20390,7 +20125,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20424,7 +20159,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20442,7 +20177,8 @@ msgid "configure"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20471,7 +20207,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20533,7 +20269,7 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20555,13 +20291,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20587,7 +20323,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20624,6 +20361,10 @@ msgstr ""
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20670,7 +20411,7 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr ""
@@ -20711,6 +20452,11 @@ msgstr ""
 msgid "image"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "ban / ben"
@@ -20751,15 +20497,19 @@ msgstr ""
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20787,7 +20537,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr ""
 
@@ -20816,27 +20566,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr ""
 
@@ -20864,7 +20614,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr ""
 
@@ -20950,12 +20700,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -21014,7 +20764,7 @@ msgstr ""
 msgid "max"
 msgstr "max"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21054,7 +20804,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr ""
@@ -21081,8 +20831,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21097,27 +20847,14 @@ msgstr ""
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr ""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21145,6 +20882,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21155,7 +20900,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr ""
 
@@ -21290,7 +21035,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21325,24 +21070,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21370,11 +21119,11 @@ msgstr ""
 msgid "regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21386,15 +21135,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21442,7 +21191,7 @@ msgstr ""
 msgid "short description"
 msgstr "rövid leírás"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21461,15 +21210,15 @@ msgstr "rövid leírás"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr ""
 
@@ -21485,31 +21234,31 @@ msgstr ""
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21517,11 +21266,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21537,8 +21286,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21549,7 +21298,7 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21558,13 +21307,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21573,20 +21326,20 @@ msgstr ""
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr ""
@@ -21618,39 +21371,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21664,7 +21417,7 @@ msgstr ""
 msgid "trigger does not allow manual closing"
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21676,26 +21429,26 @@ msgstr ""
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21703,11 +21456,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21724,10 +21477,10 @@ msgstr ""
 msgid "unexpected end of macro"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21737,11 +21490,12 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr ""
@@ -21767,8 +21521,8 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21793,6 +21547,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21808,7 +21566,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21828,11 +21586,11 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "érték"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21850,76 +21608,85 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr ""
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr ""
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21931,18 +21698,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21951,7 +21716,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21964,11 +21729,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21985,7 +21750,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "é"
diff --git a/ui/locale/id/LC_MESSAGES/frontend.po b/ui/locale/id/LC_MESSAGES/frontend.po
index c7c1a86c020..ade10c4f698 100644
--- a/ui/locale/id/LC_MESSAGES/frontend.po
+++ b/ui/locale/id/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2013-10-10 08:26+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] ""
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -170,7 +170,7 @@ msgstr[0] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -182,7 +182,7 @@ msgid "%1$s of %2$s element in problem state"
 msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -212,13 +212,13 @@ msgstr[0] ""
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] ""
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -237,13 +237,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -371,7 +371,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -429,10 +429,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr ""
@@ -475,7 +471,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Ack"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Pemberitahuan"
 
@@ -483,7 +479,7 @@ msgstr "Pemberitahuan"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Pemberitahuan"
@@ -496,7 +492,7 @@ msgstr "Pemberitahuan event MASALAH"
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -523,9 +519,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -582,7 +578,7 @@ msgstr ""
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -591,7 +587,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Aksi ditambahkan"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -638,8 +634,8 @@ msgstr "Aksi diperbarui"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Aksi"
@@ -706,7 +702,7 @@ msgstr "Aktif sampai"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -717,7 +713,7 @@ msgstr "Aktif sampai"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -740,9 +736,9 @@ msgstr "Aktif sampai"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -812,7 +808,7 @@ msgstr "Aktif sampai"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Tambah"
 
@@ -820,11 +816,11 @@ msgstr "Tambah"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr ""
 
@@ -832,7 +828,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -849,7 +845,7 @@ msgstr "Tambah host"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr ""
 
@@ -871,7 +867,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -923,12 +919,12 @@ msgstr ""
 msgid "Add widget"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -938,7 +934,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -951,7 +947,7 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administrasi"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -973,7 +969,7 @@ msgstr "Usia kurang dari"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1045,7 +1041,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Semua"
 
@@ -1063,7 +1059,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Semua tautan harus memiliki \"Nama\" dan \"URL\""
 
@@ -1081,7 +1077,7 @@ msgstr ""
 msgid "All problems if tag values match"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1194,15 +1190,15 @@ msgstr "Aplikasi bermasalah."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Terapkan"
 
@@ -1220,7 +1216,7 @@ msgstr "Menjelang"
 msgid "Apr"
 msgstr "Apr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "April"
 
@@ -1248,7 +1244,7 @@ msgstr "Jenis area"
 msgid "Arithmetic"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1295,7 +1291,7 @@ msgstr "Pada (jam:menit)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1304,7 +1300,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1316,6 +1312,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1327,7 +1328,7 @@ msgstr "Setidaknya satu periode pemeliharaan harus dibuat."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1383,7 +1384,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Agu"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Agustus"
 
@@ -1396,7 +1397,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1473,7 +1474,7 @@ msgstr ""
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1488,7 +1489,7 @@ msgstr "Pemetaan ikon otomatis"
 msgid "Automatic icon selection"
 msgstr "Pemilihan ikon otomatis"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1540,7 +1541,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1603,7 +1604,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Diblokir"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr ""
 
@@ -1657,11 +1658,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Bawah"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr ""
 
@@ -1687,7 +1688,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1732,8 +1733,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1742,7 +1743,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Dihitung"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1767,7 +1768,7 @@ msgstr "Callback"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1780,8 +1781,8 @@ msgstr "Callback"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Batal"
 
@@ -1811,7 +1812,7 @@ msgstr "Tidak dapat menambah aksi"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1821,7 +1822,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Tidak dapat menambah dependency dari host ke template."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1852,8 +1853,8 @@ msgid "Cannot add host prototype"
 msgstr ""
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Tidak dapat menambah gambar"
 
@@ -1944,15 +1945,15 @@ msgstr "Tidak dapat menambah user"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1972,33 +1973,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Tidak dapat membersihkan jejak"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Tidak dapat meng-klon protipe grafik."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Tidak dapat meng-klon prototipe item."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Tidak dapat meng-klon prototipe trigger."
 
@@ -2024,7 +2021,7 @@ msgid "Cannot copy graph"
 msgid_plural "Cannot copy graphs"
 msgstr[0] ""
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] ""
@@ -2074,8 +2071,8 @@ msgstr "Tidak dapat membuat ikon peta"
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2103,7 +2100,7 @@ msgstr "Tidak dapat menghapus user Zabbix internal \"%1$s\", coba non-aktifkan u
 msgid "Cannot delete action"
 msgstr "Tidak dapat menghapus aksi"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2166,7 +2163,7 @@ msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one
 msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group."
 msgstr[0] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2176,11 +2173,11 @@ msgstr[0] ""
 msgid "Cannot delete host prototypes"
 msgstr ""
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Tidak dapat menghapus peta ikon"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Tidak dapat menghapus gambar"
 
@@ -2205,7 +2202,7 @@ msgstr ""
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Tidak dapat menghapus item"
 
@@ -2233,7 +2230,7 @@ msgid "Cannot delete proxy"
 msgid_plural "Cannot delete proxies"
 msgstr[0] "Tidak dapat menghapus proxy"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2253,7 +2250,7 @@ msgid "Cannot delete script"
 msgid_plural "Cannot delete scripts"
 msgstr[0] "Tidak dapat menghapus script"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Tidak dapat menghapus script. Script %1$s\" sedang digunakan pada operasi aksi \"%2$s\"."
@@ -2268,8 +2265,8 @@ msgid "Cannot delete service"
 msgid_plural "Cannot delete services"
 msgstr[0] "Tidak dapat menghapus service"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2298,7 +2295,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr "Tidak dapat menghapus item template."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Tidak dapat menghapus item template."
 
@@ -2348,7 +2345,7 @@ msgid "Cannot delete user role"
 msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr ""
 
@@ -2378,7 +2375,7 @@ msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
@@ -2405,7 +2402,7 @@ msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -2446,7 +2443,7 @@ msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
@@ -2473,7 +2470,7 @@ msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
@@ -2486,7 +2483,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2520,8 +2517,8 @@ msgstr "Tidak dapat menemukan host \"%1$s\" yang digunakan di peta \"%2$s\"."
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2619,24 +2616,20 @@ msgstr ""
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2648,7 +2641,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr ""
 
@@ -2662,7 +2655,7 @@ msgid "Cannot link template."
 msgstr ""
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2693,17 +2686,17 @@ msgstr ""
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Tidak bisa menghapus pernyataan pada tabel \"%1$s\" tanpa where condition."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Tidak bisa perbarui pernyataan pada tabel \"%1$s\" tanpa nilai."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Tidak bisa perbarui pernyataan pada tabel \"%1$s\" tanpa where condition."
@@ -2730,7 +2723,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Tidak dapat merubah nama guest user."
 
@@ -2749,7 +2742,7 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2789,12 +2782,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2812,7 +2805,7 @@ msgid "Cannot unblock user"
 msgid_plural "Cannot unblock users"
 msgstr[0] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
@@ -2825,7 +2818,7 @@ msgstr "Tidak dapat membatalkan hubungan template"
 msgid "Cannot unlink template."
 msgstr ""
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2878,11 +2871,6 @@ msgstr ""
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr ""
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2892,8 +2880,9 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
@@ -2952,9 +2941,7 @@ msgstr ""
 msgid "Cannot update group"
 msgstr "Tidak dapat perbarui grup"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
@@ -2976,13 +2963,13 @@ msgstr[0] ""
 msgid "Cannot update hosts"
 msgstr "Tidak dapat perbarui host"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "Tidak dapat perbarui icon map"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Tidak dapat perbarui gambar"
 
@@ -3035,12 +3022,12 @@ msgstr "Tidak dapat perbarui peta jaringan"
 msgid "Cannot update proxy"
 msgstr "Tidak dapat perbarui proxy"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3060,17 +3047,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Tidak dapat perbarui script"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3143,7 +3130,7 @@ msgstr[0] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr ""
 
@@ -3243,8 +3230,8 @@ msgid "Character string not included"
 msgstr "Tidak termasuk string karakter"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3359,7 +3346,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr "Pemeriksaan harus unik."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3380,7 +3367,7 @@ msgstr "Referensi melingkar pada template: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "Template linkage melingkar tidak diperbolehkan."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3401,11 +3388,11 @@ msgstr "Bersihkan riwayat dan tren"
 msgid "Clear when unlinking"
 msgstr "Bersihkan ketika membatalkan penautan"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3420,7 +3407,7 @@ msgstr "Jam"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3435,7 +3422,7 @@ msgstr "Jam"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Klon"
 
@@ -3446,8 +3433,8 @@ msgstr "Klon"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Tutup"
 
@@ -3458,13 +3445,13 @@ msgstr "Tutup"
 msgid "Close expression constructor"
 msgstr "Tutup pembangun ekspresi"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
 
@@ -3477,8 +3464,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr ""
 
@@ -3495,7 +3482,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3561,7 +3548,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3572,17 +3559,12 @@ msgstr "Kondisi"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3592,17 +3574,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3618,7 +3595,7 @@ msgstr "Kondisi"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Konfigurasi"
 
@@ -3681,7 +3658,7 @@ msgstr "Konfigurasi host"
 msgid "Configuration of housekeeping"
 msgstr ""
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Konfigurasi pemetaan icon"
@@ -3788,7 +3765,7 @@ msgstr "Teks konfirmasi"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr ""
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3881,7 +3858,7 @@ msgstr "Kontak"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3941,7 +3918,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -3980,8 +3957,8 @@ msgstr "Koordinat"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Salin"
 
@@ -3990,12 +3967,11 @@ msgstr "Salin"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr ""
@@ -4019,16 +3995,6 @@ msgid "Correlation enabled"
 msgid_plural "Correlations enabled"
 msgstr[0] ""
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr ""
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr ""
@@ -4037,14 +4003,10 @@ msgstr ""
 msgid "Correlation updated"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Tidak dapat menyimpan gambar!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Hitung"
 
@@ -4108,11 +4070,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr ""
 
@@ -4229,7 +4191,7 @@ msgstr "Buat peta"
 msgid "Create media type"
 msgstr "Buat tipe media"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr ""
 
@@ -4253,7 +4215,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Buat template"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Buat trigger"
 
@@ -4416,7 +4378,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "Nama DNS"
@@ -4428,11 +4390,11 @@ msgstr "Nama DNS"
 msgid "Daily"
 msgstr "Harian"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4453,8 +4415,8 @@ msgstr ""
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr ""
 
@@ -4476,9 +4438,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr ""
 
@@ -4502,7 +4464,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4530,7 +4492,7 @@ msgstr "Rangkuman data"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4672,7 +4634,7 @@ msgstr "Hari minggu"
 msgid "Days"
 msgstr "Hari"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Debug"
 
@@ -4686,26 +4648,26 @@ msgstr "Mode debug"
 msgid "Dec"
 msgstr "Des"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Desember"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Standar"
 
@@ -4798,7 +4760,7 @@ msgstr "Delay oleh"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4822,8 +4784,8 @@ msgstr "Delay oleh"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Hapus"
 
@@ -4848,11 +4810,11 @@ msgstr "Hapus dan bersihkan template? (Peringatan: semua host yang terhubung aka
 msgid "Delete current action?"
 msgstr "Hapus aksi yang berlaku?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4896,7 +4858,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr "Hapus item?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Hapus tautan antara elemen yang dipilih?"
 
@@ -4952,7 +4914,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "Hapus aturan discovery yang dipilih?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Hapus elemen yang dipilih?"
 
@@ -5057,7 +5019,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5101,7 +5063,7 @@ msgstr "Hapus trigger?"
 msgid "Delete web scenario?"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5146,7 +5108,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Dependensi"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Tergantung"
 
@@ -5154,7 +5116,7 @@ msgstr "Tergantung"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5164,7 +5126,7 @@ msgstr "Tergantung pada"
 msgid "Deployment status"
 msgstr "Status deployment"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5197,7 +5159,7 @@ msgid "Description"
 msgstr "Deskripsi"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5363,10 +5325,10 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5449,7 +5411,7 @@ msgid "Discovery by proxy"
 msgstr "Penemuan berdasarkan proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Periksa penemuan"
 
@@ -5461,7 +5423,7 @@ msgstr "Periksa penemuan"
 msgid "Discovery list"
 msgstr "Daftar penemuan"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Obyek penemuan"
 
@@ -5493,7 +5455,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5501,12 +5463,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Aturan penemuan"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Aturan penemuan \"%1$s\" sudah ada pada \"%2$s\", diwarisi dari template lain."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
@@ -5519,7 +5481,7 @@ msgstr ""
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5558,7 +5520,7 @@ msgstr "Aturan penemuan diperbarui"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5569,7 +5531,7 @@ msgstr "Aturan penemuan"
 msgid "Discovery rules deleted"
 msgstr "Aturan penemuan dihapus"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Status penemuan"
@@ -5606,10 +5568,11 @@ msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Menampilkan %1$s dari %2$s yang ditemukan"
@@ -5619,7 +5582,7 @@ msgstr "Menampilkan %1$s dari %2$s yang ditemukan"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5641,7 +5604,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Apakah Anda ingin mengganti ekspresi kondisional?"
 
@@ -5697,7 +5660,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Mati"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5705,7 +5668,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr ""
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5724,18 +5687,6 @@ msgstr ""
 msgid "Draw style"
 msgstr "Menggambar gaya"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5748,11 +5699,6 @@ msgstr ""
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5804,7 +5750,7 @@ msgstr "Item dinamis"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Setiap URL haru memiliki nama yang unik. Pastikan hanya ada satu URL bernama"
 
@@ -5813,11 +5759,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5831,8 +5777,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Ubah"
 
@@ -5848,11 +5794,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Ubah trigger"
 
@@ -5912,21 +5858,17 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
@@ -5942,25 +5884,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -5970,14 +5906,6 @@ msgstr "Masukan parameter kosong."
 msgid "Empty map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Parameter kosong"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6143,7 +6071,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6154,7 +6082,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6197,7 +6125,7 @@ msgid "English (en_US)"
 msgstr "English (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6213,7 +6141,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6232,12 +6160,12 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Error pada permintaan pencarian untuk label \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6265,7 +6193,7 @@ msgstr "Event ID"
 msgid "Event acknowledged"
 msgstr "Pemberitahuan event"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6273,7 +6201,7 @@ msgid "Event correlation"
 msgstr ""
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr ""
@@ -6308,11 +6236,11 @@ msgstr ""
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6356,15 +6284,10 @@ msgstr "Kecuali"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Jalankan"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "Jalankan error SQL [%1$s] pada [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6402,7 +6325,7 @@ msgstr ""
 msgid "Executed script"
 msgstr "Skrip yang dijalankan"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Konfirmasi eksekusi"
 
@@ -6418,8 +6341,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr ""
 
@@ -6540,7 +6463,7 @@ msgstr "Ekspresi"
 msgid "External check"
 msgstr "Periksa eksternal"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6567,8 +6490,8 @@ msgstr "Gagal"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6579,26 +6502,26 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6606,7 +6529,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6630,7 +6553,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Februari"
 
@@ -6652,10 +6575,9 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6666,13 +6588,6 @@ msgstr ""
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6691,11 +6606,6 @@ msgstr ""
 msgid "Field \"%1$s\" is not string."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6710,10 +6620,6 @@ msgstr ""
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr ""
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6778,7 +6684,8 @@ msgstr "Region diisi"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6803,7 +6710,7 @@ msgstr "Saring"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6855,7 +6762,7 @@ msgstr "Paskan pada peta"
 msgid "Fixed"
 msgstr "Tetap"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6906,12 +6813,12 @@ msgstr "Rumus"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -6924,7 +6831,7 @@ msgstr "French (fr_FR)"
 msgid "Fri"
 msgstr "Jum"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Jumat"
 
@@ -7035,7 +6942,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "Ekspresi yang diberikan bukan sebuah macro"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr ""
@@ -7049,7 +6956,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Lanjut ke"
 
@@ -7087,7 +6994,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7095,7 +7002,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Garis gradasi"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7154,7 +7061,7 @@ msgstr[0] ""
 msgid "Graph deleted"
 msgstr "Grafik dihapus"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7191,8 +7098,8 @@ msgstr ""
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7226,8 +7133,8 @@ msgstr "Tipe grafik"
 msgid "Graph updated"
 msgstr "Grafik diperbarui"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7258,7 +7165,7 @@ msgstr "Grafik dengan nama \"%1$s\" sudah ada dalam grafik atau prototipe grafik
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Grafik"
 
@@ -7279,12 +7186,12 @@ msgstr "Kisi-kisi"
 msgid "Group"
 msgstr "Grup"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr ""
@@ -7458,11 +7365,11 @@ msgstr "Bantuan"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Tersembunyi"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr ""
 
@@ -7489,11 +7396,11 @@ msgstr ""
 msgid "High"
 msgstr "Tinggi"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7514,7 +7421,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Riwayat"
 
@@ -7522,11 +7429,15 @@ msgstr "Riwayat"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Riwayat dibersihkan"
 
@@ -7569,7 +7480,7 @@ msgstr "Horisontal"
 msgid "Horizontal align"
 msgstr "Luruskan horisontal"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7598,7 +7509,7 @@ msgstr "Luruskan horisontal"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7611,7 +7522,7 @@ msgstr[0] "Host"
 msgid "Host \"%1$s\" already exists."
 msgstr "Host \"%1$s\" sudah ada."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7619,7 +7530,7 @@ msgstr "Host \"%1$s\" sudah ada."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7669,7 +7580,7 @@ msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7683,22 +7594,22 @@ msgstr[0] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Host grup"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Host grup \"%1$s\" sudah ada."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7711,10 +7622,10 @@ msgstr "Elemen grup host"
 msgid "Host group label type"
 msgstr "Tipe label grup host"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7730,8 +7641,8 @@ msgstr ""
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7805,7 +7716,7 @@ msgstr "Nama host"
 msgid "Host networks"
 msgstr "Jaringan host"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7884,7 +7795,7 @@ msgstr "Perbarui host gagal."
 msgid "Host updated"
 msgstr "Host diperbarui"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr ""
@@ -7904,7 +7815,7 @@ msgstr ""
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -7917,7 +7828,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -7965,7 +7876,7 @@ msgstr "Host diperbarui"
 msgid "Hours"
 msgstr "Jam"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8005,7 +7916,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "Alamat IP"
@@ -8030,7 +7941,7 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8087,12 +7998,12 @@ msgstr "Ikon sorot"
 msgid "Icon map"
 msgstr "Ikon peta"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Peta ikon \"%1$s\" tidak dapat dihapus. Digunakan pada peta \"%2$s\"."
@@ -8105,18 +8016,18 @@ msgstr "Peta ikon dibuat"
 msgid "Icon map deleted"
 msgstr "Peta ikon dihapus"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Peta ikon diperbarui"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "Pemetaan ikon"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
@@ -8215,23 +8126,20 @@ msgstr "Jika menurut Anda pesan ini salah, mohon hubungi administrator Anda untu
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Gambar"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -8240,7 +8148,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Gambar ditambah"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Gambar dihapus"
 
@@ -8248,18 +8156,12 @@ msgstr "Gambar dihapus"
 msgid "Image label type"
 msgstr "Gambar tipe label"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Gambar diperbarui"
 
@@ -8354,7 +8256,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8365,13 +8267,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr ""
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8415,7 +8317,7 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8583,24 +8485,6 @@ msgstr "Kesalahan aksi operasi grup user. Grup user tidak ada atau Anda tidak me
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Kesalahan aksi operasi user. User tidak ada atau Anda tidak memiliki akses ke user ini."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8655,8 +8539,6 @@ msgstr "Kesalahan aksi operasi user. User tidak ada atau Anda tidak memiliki aks
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Kesalahan pelolosan argumen ke fungsi."
 
@@ -8682,31 +8564,22 @@ msgstr ""
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8735,7 +8608,7 @@ msgstr ""
 msgid "Incorrect eventsource value."
 msgstr ""
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Kesalahan nama field \"%1$s\" atau nilai pada statemen where untuk tabel \"%2$s\"."
@@ -8760,22 +8633,17 @@ msgstr "Kesalahan file upload."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8786,7 +8654,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
@@ -8814,8 +8682,6 @@ msgstr "Kesalahan indeks gambar."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8877,10 +8743,6 @@ msgstr "Kesalahan periode pemeliharaan (minimum 5 menit)"
 msgid "Incorrect map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr ""
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -8938,13 +8800,13 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Kesalahan waktu akhir service."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Kesalahan waktu mulai service."
 
@@ -8997,12 +8859,7 @@ msgstr ""
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
@@ -9048,13 +8905,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9071,60 +8928,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "Kesalahan nilai \"%1$s\" untuk field float \"%2$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "Kesalahan nilai \"%1$s\" untuk field int \"%2$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Kesalahan nilai \"%1$s\" untuk field int yang tidak ditandai \"%2$s\"."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr ""
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9179,14 +9006,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9296,25 +9117,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9325,7 +9128,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9371,16 +9174,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9389,7 +9193,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9477,12 +9281,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Sisipkan"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr ""
 
@@ -9586,7 +9390,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9594,7 +9398,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9605,7 +9409,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Interval"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9628,7 +9432,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9660,7 +9464,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
@@ -9685,27 +9489,29 @@ msgstr ""
 msgid "Invalid method parameters."
 msgstr "Metode parameter tidak sah."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9731,17 +9537,17 @@ msgstr "Metode parameter tidak sah."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9749,8 +9555,8 @@ msgstr "Metode parameter tidak sah."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9764,106 +9570,116 @@ msgstr "Metode parameter tidak sah."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9905,43 +9721,38 @@ msgstr "Kode respon \"%1$s\" tidak sah."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -9962,7 +9773,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Inventaris"
 
@@ -10003,7 +9814,7 @@ msgstr "Tidak memungkinkan untuk mencari dengan password user."
 msgid "Italian (it_IT)"
 msgstr "Italian (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10035,7 +9846,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "Item \"%1$s\" tidak bisa diisi field nomor \"%2$d\" inventori host hilang . Pilihannya : dari 0 (jangan diisi) ke %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10049,7 +9860,7 @@ msgstr "Item ditambah"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] ""
@@ -10062,12 +9873,12 @@ msgstr "Item hitung"
 msgid "Item deleted"
 msgstr "Item dihapus"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -10076,7 +9887,7 @@ msgstr[0] ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr ""
 
@@ -10085,7 +9896,7 @@ msgstr ""
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10121,8 +9932,8 @@ msgid "Item prototype updated"
 msgid_plural "Item prototypes updated"
 msgstr[0] ""
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10148,7 +9959,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10180,8 +9991,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10232,11 +10043,11 @@ msgstr "Item dengan key \"%1$s\" sudah ada pada \"%2$s\"."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Item"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Item dihapus"
 
@@ -10254,7 +10065,7 @@ msgstr "Item diperbarui"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10279,6 +10090,10 @@ msgstr "Interface JMX"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10291,7 +10106,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10309,7 +10124,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Januari"
 
@@ -10331,7 +10146,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Jul"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Juli"
 
@@ -10339,7 +10154,7 @@ msgstr "Juli"
 msgid "Jun"
 msgstr "Jun"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Juni"
 
@@ -10489,22 +10304,6 @@ msgid "Last %1$d year"
 msgid_plural "Last %1$d years"
 msgstr[0] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10516,11 +10315,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Permeriksaan terakhir"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Grafik jam terakhir"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Grafik bulan terakhir"
 
@@ -10558,11 +10357,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Nilai terakhir"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Grafik minggu terakhir"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10571,11 +10370,11 @@ msgstr "Grafik minggu terakhir"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Data terbaru"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr ""
 
@@ -10616,7 +10415,7 @@ msgstr ""
 msgid "Left trim"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -10897,7 +10696,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -10919,7 +10718,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -10930,12 +10729,12 @@ msgid "Macro"
 msgstr "Makro"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Makro \"%1$s\" sudah ada pada \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Makro \"%1$s\" sudah ada."
@@ -10963,7 +10762,7 @@ msgstr "Makro diperbarui"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -10971,7 +10770,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11054,7 +10853,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11076,13 +10875,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Peta"
 
@@ -11151,7 +10950,7 @@ msgstr ""
 msgid "Map update failed."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11183,7 +10982,7 @@ msgstr "Peta"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Maret"
 
@@ -11287,7 +11086,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11300,7 +11099,7 @@ msgstr[0] ""
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Mei"
 
@@ -11315,15 +11114,12 @@ msgstr "Mei"
 msgid "Media"
 msgstr "Media"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Tipe media"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr ""
@@ -11349,11 +11145,6 @@ msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "Tipe media diaktifkan"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr ""
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11383,7 +11174,7 @@ msgstr ""
 msgid "Media types"
 msgstr "Tipe media"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11471,7 +11262,7 @@ msgstr "Pesan"
 msgid "Method not found."
 msgstr "Metode tidak ditemukan."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11533,7 +11324,7 @@ msgid "Minimum severity"
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11591,7 +11382,7 @@ msgstr "Mode"
 msgid "Model"
 msgstr "Model"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11625,7 +11416,7 @@ msgstr[0] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11651,7 +11442,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Sen"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Senin"
 
@@ -11691,11 +11482,11 @@ msgstr "Bulan"
 msgid "Monthly"
 msgstr "Bulanan"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11719,7 +11510,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11732,7 +11523,7 @@ msgstr ""
 msgid "Multiple PROBLEM events"
 msgstr "Beberapa MASALAH event"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Bisu"
 
@@ -11861,11 +11652,11 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12023,19 +11814,21 @@ msgstr "Kondisi baru"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Element baru"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr ""
 
@@ -12047,7 +11840,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Ekspresi reguler baru"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12055,7 +11848,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Waktu service baru"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12064,7 +11857,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12082,7 +11875,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12111,30 +11904,6 @@ msgstr ""
 msgid "No"
 msgstr "Tidak"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr ""
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12150,11 +11919,6 @@ msgstr ""
 msgid "No \"%1$s\" given for map."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12162,7 +11926,7 @@ msgstr ""
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -12172,7 +11936,7 @@ msgstr ""
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -12189,11 +11953,6 @@ msgstr "Tidak ada otentikasi nama user yang spesifik."
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr ""
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12224,7 +11983,7 @@ msgstr "Tidak ada interface standar untuk \"%1$s\" ketik di \"%2$s\"."
 msgid "No details"
 msgstr "Tidak ada detail"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "Tidak ada aturan ID yang diberikan pada discovery."
 
@@ -12260,7 +12019,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Tidak ada ID host yang diberikan."
 
@@ -12290,7 +12049,7 @@ msgstr "Tidak ada gambar"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Tidak ada interface yang ditemukan"
 
@@ -12324,7 +12083,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr ""
 
@@ -12332,17 +12091,46 @@ msgstr ""
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Tidak ada izin untuk akses sistem."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12350,7 +12138,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12378,19 +12166,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12405,16 +12192,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12434,12 +12227,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12460,27 +12251,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12497,14 +12290,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12513,7 +12306,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Tidak ada izin untuk objek yang dirujuk atau objek tidak ada!"
 
@@ -12533,7 +12326,7 @@ msgstr "Tidak file kunci publik yang dispesifikasikan."
 msgid "No recipients for action operation message."
 msgstr "Tidak ada penerima untuk aksi operasi pesan."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr ""
 
@@ -12545,7 +12338,7 @@ msgstr "Tidak ada skrip yang dispesifikasikan untuk aksi operasi perintah."
 msgid "No target selected"
 msgstr "Tidak ada sasaran yang dipilih"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Tidak ada sasaran yang dipilih."
 
@@ -12562,7 +12355,7 @@ msgstr "Tidak ada trigger yang didefinisikan."
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr ""
 
@@ -12632,15 +12425,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Tidak diizinkan menggunakan password untuk user \"guest\"."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12672,7 +12465,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "Tidak didukung"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Catatan"
@@ -12703,7 +12496,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "November"
 
@@ -12890,8 +12683,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -12951,13 +12744,13 @@ msgstr "Okt"
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Oktober"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Mati"
 
@@ -12965,30 +12758,31 @@ msgstr "Mati"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr ""
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "Nyala"
 
@@ -13004,35 +12798,15 @@ msgstr "Sekali"
 msgid "One"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr ""
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Satu kali saja"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Satu-kali downtime"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Hanya Super admin yang bisa membuat grup host."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Hanya Super Admin yang bisa membuat tipe media."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Hanya Super Admin yang bisa menghapus tipe media."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Hanya Super Admin yang bisa mengubah tipe media."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13080,10 +12854,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr ""
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13092,15 +12862,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr ""
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Hanya trigger yang ditugaskan ke host aktif dan tergantung pada item aktif yang dihitung."
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13109,7 +12875,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13118,11 +12884,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Operasi tidak dapat dilakukan karena permintaan yang tidak sah."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Detail operasi"
 
@@ -13144,7 +12910,7 @@ msgstr "Operasi tidak memiliki template untuk beroperasi."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13153,33 +12919,33 @@ msgstr ""
 msgid "Operations"
 msgstr "Operasi"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operator"
 
@@ -13288,7 +13054,7 @@ msgstr "Parameter konfigurasi lainnya"
 msgid "Other parameters"
 msgstr "Parameter lainnya"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Lainnya"
@@ -13302,7 +13068,7 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13331,7 +13097,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13520,7 +13286,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13565,7 +13331,7 @@ msgstr ""
 msgid "PSK identity"
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13588,16 +13354,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parameter"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr ""
@@ -13627,7 +13393,7 @@ msgstr "Item induk"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13644,7 +13410,7 @@ msgstr "Trigger induk"
 msgid "Parent web scenarios"
 msgstr ""
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13656,11 +13422,6 @@ msgstr ""
 msgid "Parse"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "SQL parse error [%1$s] dalam [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Parse error"
@@ -13721,7 +13482,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr ""
 
@@ -13731,15 +13492,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13785,12 +13546,11 @@ msgstr ""
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Periode"
 
@@ -13879,7 +13639,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Silahkan pilih dua elemen"
 
@@ -13919,7 +13679,7 @@ msgstr "Mengisi field inventaris host"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14008,7 +13768,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14139,7 +13899,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Masalah pada"
 
@@ -14152,21 +13912,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14180,9 +13936,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Masalah"
 
@@ -14216,7 +13972,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr ""
 
@@ -14237,13 +13993,13 @@ msgstr ""
 msgid "Proxies"
 msgstr "Proxy"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14251,7 +14007,7 @@ msgstr "Proxy"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14261,12 +14017,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Proxy \"%1$s\"  untuk host \"%2$s\" tidak ada."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Proxy \"%1$s\"  sedang digunakan oleh aturan discovery \"%2$s\"."
@@ -14358,7 +14114,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14435,10 +14191,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Nilai yang diterima"
@@ -14520,7 +14272,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14538,13 +14290,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Ekspresi reguler"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14576,7 +14328,7 @@ msgstr "Ekspresi reguler"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14608,8 +14360,6 @@ msgstr "Perintah jarak jauh"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14630,7 +14380,9 @@ msgstr "Perintah jarak jauh"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14643,7 +14395,7 @@ msgstr "Perintah jarak jauh"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14720,8 +14472,8 @@ msgstr "Perintah jarak jauh"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Hapus"
 
@@ -14761,7 +14513,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14803,7 +14555,7 @@ msgid "Replace dependencies"
 msgstr "Gantikan dependensi"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14858,7 +14610,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -14900,8 +14652,8 @@ msgstr "Dibutuhkan kode status"
 msgid "Required string"
 msgstr "Dibutuhkan string"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Reset"
 
@@ -14934,7 +14686,7 @@ msgstr "Konfirmasi reset"
 msgid "Reset defaults"
 msgstr "Reset standar"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Terselesaikan"
 
@@ -15000,7 +14752,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Hasil "
@@ -15187,12 +14939,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Russian (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15203,8 +14955,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15241,7 +14993,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15337,12 +15089,12 @@ msgstr ""
 msgid "SQL query"
 msgstr ""
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "Eksekusi pernyataan SQL gagal \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Eksekusi pernyataan SQL gagal \"%1$s\"."
@@ -15405,7 +15157,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15417,7 +15169,7 @@ msgstr ""
 msgid "Sat"
 msgstr "Sab"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Sabtu"
 
@@ -15459,7 +15211,7 @@ msgstr "Jadwal"
 msgid "Scheduled check"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15523,7 +15275,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15536,8 +15288,7 @@ msgstr ""
 msgid "Script"
 msgstr "Skrip"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
@@ -15568,12 +15319,6 @@ msgstr "Nama skrip"
 msgid "Script parameters"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr ""
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Skrip profiler"
@@ -15586,7 +15331,7 @@ msgstr "Skrip diperbarui"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Skrip"
 
@@ -15656,8 +15401,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15665,7 +15410,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Pilih"
 
@@ -15701,19 +15446,19 @@ msgstr "Elemen yang dipilih"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr ""
 
@@ -15738,7 +15483,7 @@ msgstr "Hanya kirim ke"
 msgid "Send to"
 msgstr "Kirim ke"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr ""
 
@@ -15771,7 +15516,7 @@ msgstr "Dipisahkan"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "September"
 
@@ -15802,28 +15547,28 @@ msgstr ""
 msgid "Server time"
 msgstr "Waktu server"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Service"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15833,7 +15578,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr ""
 
@@ -15865,16 +15610,16 @@ msgstr "Port service"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "Waktu mulai service harus lebih kecil dari waktu akhir."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -15882,11 +15627,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Waktu service"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Tipe service"
 
@@ -15895,30 +15640,29 @@ msgstr "Tipe service"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Service diperbarui"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Service"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "Form service dependensi melingkar."
 
@@ -15926,7 +15670,7 @@ msgstr "Form service dependensi melingkar."
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -15956,7 +15700,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -15985,7 +15729,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -15994,7 +15738,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16050,7 +15794,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr ""
 
@@ -16192,7 +15936,7 @@ msgstr "Tampilkan peringatan jika server Zabbix mati"
 msgid "Show working time"
 msgstr "Tampilkan waktu kerja"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Ditampilkan"
 
@@ -16301,7 +16045,7 @@ msgstr "Abaikan menyalin grafik \"%1$s\" ke host \"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "Slovak (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Tidur"
 
@@ -16347,7 +16091,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Pengurutan (0->999)"
 
@@ -16421,7 +16165,7 @@ msgstr "Memulai"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16524,15 +16268,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Status"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Status kode"
@@ -16562,7 +16310,7 @@ msgstr "Status saja"
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16610,7 +16358,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16675,7 +16423,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Submap"
 
@@ -16691,7 +16439,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Audit sukses"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16704,7 +16452,7 @@ msgstr ""
 msgid "Sun"
 msgstr "Sen"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Senin"
 
@@ -16796,12 +16544,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16828,17 +16576,17 @@ msgstr "BENAR"
 msgid "Table \"%1$s\" does not exist."
 msgstr "Tabel \"%1$s\" tidak ada."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "Tabel \"%1$s\" tidak memiliki field dengan nama \"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Label"
@@ -16894,7 +16642,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -16954,7 +16702,7 @@ msgstr "Tipe sasaran"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -16975,7 +16723,7 @@ msgstr "Template"
 msgid "Template \"%1$s\" already exists."
 msgstr "Template \"%1$s\" sudah ada."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -16999,7 +16747,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Template tidak dapat dikaitkan dengan template lain lebih dari sekali bahkan melalui template lainnya."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17059,7 +16807,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17231,13 +16979,13 @@ msgstr ""
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17301,7 +17049,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Bulan ini"
 
@@ -17309,7 +17057,7 @@ msgstr "Bulan ini"
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Minggu ini"
 
@@ -17317,7 +17065,7 @@ msgstr "Minggu ini"
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Tahun ini"
 
@@ -17337,7 +17085,7 @@ msgstr ""
 msgid "Thu"
 msgstr "Kam"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Kamis"
 
@@ -17354,7 +17102,7 @@ msgstr "Hingga"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17387,7 +17135,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Periode waktu"
 
@@ -17439,12 +17187,11 @@ msgstr "Timestamp"
 msgid "To"
 msgstr "Ke"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "Untuk mengatur interface host pilih satu tipe item untuk semua item"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Hari ini"
 
@@ -17559,7 +17306,7 @@ msgstr ""
 msgid "Trends"
 msgstr "Tren"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17567,7 +17314,7 @@ msgstr "Tren"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Trigger"
 
@@ -17665,7 +17412,7 @@ msgstr "Nama trigger"
 msgid "Trigger overview"
 msgstr "Rangkuman trigger"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17737,11 +17484,11 @@ msgstr ""
 msgid "Trigger severity"
 msgstr "Trigger keparahan"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17758,7 +17505,7 @@ msgstr "Trigger diperbarui"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17793,7 +17540,7 @@ msgstr ""
 msgid "Tue"
 msgstr "Sel"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Selasa"
 
@@ -17806,7 +17553,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Dua item (\"%1$s\" dan \"%2$s\") tidak dapat mengisi satu field inventori host \"%3$s\", ini akan mengakibatkan konflik."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17822,19 +17569,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -17886,7 +17633,7 @@ msgstr "Tipe informasi"
 msgid "Types"
 msgstr "Tipe"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -17907,7 +17654,7 @@ msgstr "TIDAK DIKENAL"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -17953,12 +17700,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URL"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18043,12 +17790,12 @@ msgstr ""
 msgid "Unblock selected users?"
 msgstr "Membuka blokir user yang dipilih?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18068,21 +17815,23 @@ msgstr "Unit"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Tidak dikenal"
@@ -18100,7 +17849,7 @@ msgid "Unknown error"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Item host yang tidak dikenal, tidak ada item tersebut dalam host yang terpilih"
@@ -18153,7 +17902,7 @@ msgstr "Putuskan dari template"
 msgid "Unlink from templates"
 msgstr "Putuskan dari template"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Nyalakan suara"
 
@@ -18183,7 +17932,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -18193,7 +17942,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -18238,7 +17987,7 @@ msgstr "Nyala"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18251,7 +18000,7 @@ msgstr "Nyala"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18304,7 +18053,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18322,7 +18071,7 @@ msgstr "Unggah"
 msgid "Upper level maps"
 msgstr "Tingkat peta lebih atas"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18357,7 +18106,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "Digunakan dalam aksi"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18372,7 +18121,7 @@ msgstr "Digunakan dalam aksi"
 msgid "User"
 msgstr "User"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
@@ -18424,7 +18173,7 @@ msgstr "User ditambah"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "User tidak dapat menambah dirinya sendiri ke grup non-aktif atau grup dengan akses GUI non-aktif."
@@ -18443,7 +18192,7 @@ msgid "User deleted"
 msgid_plural "Users deleted"
 msgstr[0] "User dihapus"
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18453,27 +18202,27 @@ msgstr[0] "User dihapus"
 msgid "User group"
 msgstr "Grup user"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Grup user \"%1$s\" digunakan dalam skrip \"%2$s\"."
@@ -18505,8 +18254,8 @@ msgstr[0] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18550,14 +18299,14 @@ msgstr "Password user"
 msgid "User profile"
 msgstr "Profil user"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18624,7 +18373,7 @@ msgstr "User diperbarui"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -18940,14 +18689,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -18957,7 +18706,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -18999,7 +18748,7 @@ msgstr ""
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "Nilai \"%1$s\" terlalu panjang untuk field \"%2$s\" - %3$d karakter. Panjang yang diizinkan adalah %4$d karakter."
@@ -19016,7 +18765,7 @@ msgstr ""
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Peta nilai"
 
@@ -19059,11 +18808,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr ""
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19110,7 +18860,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19197,7 +18947,7 @@ msgstr "Nama terlihat tidak boleh kosong jika nama hostnya hilang."
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
@@ -19214,7 +18964,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19223,7 +18973,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Mohon maaf, jumlah maksimum yang mungkin dari unsur-unsur yang perlu diingat telah tercapai."
 
@@ -19239,7 +18989,7 @@ msgstr "Mohon maaf, jumlah maksimum yang mungkin dari unsur-unsur yang perlu dii
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web"
 
@@ -19251,7 +19001,7 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Pemantauan Web"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr ""
 
@@ -19266,25 +19016,25 @@ msgstr ""
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr ""
 
@@ -19306,7 +19056,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Rab"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Rabu"
 
@@ -19317,7 +19067,7 @@ msgstr "Rabu"
 msgid "Weekly"
 msgstr "Mingguan"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19333,12 +19083,12 @@ msgstr ""
 msgid "When active"
 msgstr "Ketidak aktif"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19533,6 +19283,10 @@ msgstr ""
 msgid "Y-m-d H:i:s"
 msgstr "Y-m-d H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr ""
@@ -19594,7 +19348,7 @@ msgstr "Tahunan"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19651,18 +19405,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19674,9 +19422,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Anda tidak memiliki hak untuk melakukan operasi ini."
 
@@ -19792,24 +19537,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr ""
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19818,37 +19567,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr ""
@@ -19869,28 +19618,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr ""
@@ -19938,7 +19688,7 @@ msgstr "semua"
 msgid "all media"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -19946,42 +19696,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -19991,7 +19736,7 @@ msgid "an empty string is expected"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr ""
 
@@ -19999,11 +19744,15 @@ msgstr ""
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20164,14 +19913,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20201,19 +19944,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20233,14 +19968,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20248,7 +19983,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr ""
@@ -20261,7 +19996,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20295,7 +20030,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20313,7 +20048,8 @@ msgid "configure"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20342,7 +20078,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20404,7 +20140,7 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20426,13 +20162,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20458,7 +20194,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20495,6 +20232,10 @@ msgstr ""
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20541,7 +20282,7 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20582,6 +20323,11 @@ msgstr "ikon"
 msgid "image"
 msgstr "gambar"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "dalam"
@@ -20622,15 +20368,19 @@ msgstr ""
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20658,7 +20408,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr ""
 
@@ -20687,27 +20437,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr ""
 
@@ -20735,7 +20485,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr ""
 
@@ -20821,12 +20571,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20885,7 +20635,7 @@ msgstr ""
 msgid "max"
 msgstr "max"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -20925,7 +20675,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr ""
@@ -20952,8 +20702,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -20968,27 +20718,14 @@ msgstr "harus user LDAP yang valid"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr ""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21016,6 +20753,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21026,7 +20771,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr ""
 
@@ -21161,7 +20906,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21196,24 +20941,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21241,11 +20990,11 @@ msgstr ""
 msgid "regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21257,15 +21006,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21313,7 +21062,7 @@ msgstr ""
 msgid "short description"
 msgstr "penjelasan singkat"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21332,15 +21081,15 @@ msgstr "penjelasan singkat"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr ""
 
@@ -21356,31 +21105,31 @@ msgstr "tampilkan pemetaan ikon"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21388,11 +21137,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21408,8 +21157,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21420,7 +21169,7 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21429,13 +21178,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "template ID \"%1$s\" dilewatkan %2$s kali"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21444,20 +21197,20 @@ msgstr "template ID \"%1$s\" dilewatkan %2$s kali"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr ""
@@ -21489,39 +21242,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21535,7 +21288,7 @@ msgstr "trigger"
 msgid "trigger does not allow manual closing"
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21547,26 +21300,26 @@ msgstr ""
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21574,11 +21327,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21595,10 +21348,10 @@ msgstr ""
 msgid "unexpected end of macro"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21608,11 +21361,12 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr ""
@@ -21638,8 +21392,8 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21664,6 +21418,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21679,7 +21437,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21699,11 +21457,11 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "nilai"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21721,76 +21479,83 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr ""
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr ""
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21802,18 +21567,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21822,7 +21585,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21835,11 +21598,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21856,7 +21619,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/it/LC_MESSAGES/frontend.po b/ui/locale/it/LC_MESSAGES/frontend.po
index fbdf9d74892..fcdbec27688 100644
--- a/ui/locale/it/LC_MESSAGES/frontend.po
+++ b/ui/locale/it/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2016-04-20 12:06+0300\n"
 "Last-Translator: quadrata <dimitri.bellini@quadrata.it>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d giorno"
 msgstr[1] "%1$d giorni"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] "%1$s messaggi"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "%1$s di %2$s elemento in problem state"
 msgstr[1] "%1$s di %2$s elementi in problem state"
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -226,14 +226,14 @@ msgstr[1] "%1$s tentativi disponibili"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1s secondo"
 msgstr[1] "%1s secondi"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Severità, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, sola lettura"
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -389,7 +389,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -450,10 +450,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "Accesso negato"
@@ -496,7 +492,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Ack"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Acknowledge"
 
@@ -504,7 +500,7 @@ msgstr "Acknowledge"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Con acknowledge"
@@ -517,7 +513,7 @@ msgstr "Eventi PROBLEMA con acknowledge"
 msgid "Acknowledged RESOLVED events"
 msgstr "Acknowledged RESOLVED events"
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -544,9 +540,9 @@ msgstr "Acknowledged RESOLVED events"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -603,7 +599,7 @@ msgstr "L'azione \"%1$s\" esiste già."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "L'azione \"%1$s\" non ha operazioni definite."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -612,7 +608,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Azione aggiunta"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -661,8 +657,8 @@ msgstr "Azione aggiornata"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Azioni"
@@ -729,7 +725,7 @@ msgstr "Attivo fino a"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -740,7 +736,7 @@ msgstr "Attivo fino a"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -763,9 +759,9 @@ msgstr "Attivo fino a"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -835,7 +831,7 @@ msgstr "Attivo fino a"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Aggiungi"
 
@@ -843,11 +839,11 @@ msgstr "Aggiungi"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "Aggiungi un nuovo widget"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "Aggiungi elemento child"
 
@@ -855,7 +851,7 @@ msgstr "Aggiungi elemento child"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -872,7 +868,7 @@ msgstr "Aggiungi host"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "Aggiungi mappe multiple"
 
@@ -894,7 +890,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -946,12 +942,12 @@ msgstr ""
 msgid "Add widget"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -961,7 +957,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -974,7 +970,7 @@ msgstr "Ammin"
 msgid "Administration"
 msgstr "Amministrazione"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -996,7 +992,7 @@ msgstr "Periodo inferiore a"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1068,7 +1064,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Tutti"
 
@@ -1086,7 +1082,7 @@ msgstr "Tutti i gruppi"
 msgid "All hosts"
 msgstr "Tutti gli host"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Tutti i collegamenti devono avere \"Nome\" e \"URL\" definiti"
 
@@ -1104,7 +1100,7 @@ msgstr "Tutti i problemi"
 msgid "All problems if tag values match"
 msgstr "Tutti i problemi se il valore del tag trova riscontro"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1217,15 +1213,15 @@ msgstr "Errore dell'applicazione."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Applica"
 
@@ -1243,7 +1239,7 @@ msgstr "Prossimo"
 msgid "Apr"
 msgstr "Apr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Aprile"
 
@@ -1271,7 +1267,7 @@ msgstr "Tipo area"
 msgid "Arithmetic"
 msgstr "Aritmetica"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1318,7 +1314,7 @@ msgstr "Alle (ore:minuti)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1327,7 +1323,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1339,6 +1335,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1350,7 +1351,7 @@ msgstr "Creare almeno un intervallo di manutenzione."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1406,7 +1407,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Ago"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Agosto"
 
@@ -1419,7 +1420,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1496,7 +1497,7 @@ msgstr "Auto-logout"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1511,7 +1512,7 @@ msgstr "Mappatura icone automatica"
 msgid "Automatic icon selection"
 msgstr "Selezione automatica icona"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1563,7 +1564,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1626,7 +1627,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Bloccato"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "Blu"
 
@@ -1680,11 +1681,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "In basso"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "Porta avanti"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "Porta in primopiano"
 
@@ -1710,7 +1711,7 @@ msgstr "CERT"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1755,8 +1756,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1765,7 +1766,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Calculated"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1790,7 +1791,7 @@ msgstr "Callback"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1803,8 +1804,8 @@ msgstr "Callback"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -1834,7 +1835,7 @@ msgstr "Impossibile aggiungere l'azione"
 msgid "Cannot add correlation"
 msgstr "Impossibile aggiungere correllazione"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1844,7 +1845,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Impossibile aggiungere dipendenza da un host a un template"
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1875,8 +1876,8 @@ msgid "Cannot add host prototype"
 msgstr "Impossibile aggiungere prototipo host"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Impossibile aggiungere l'immagine"
 
@@ -1968,15 +1969,15 @@ msgstr "Impossibile aggiungere l'utente"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Impossibile aggiungere scenario web"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1996,33 +1997,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Impossibile cancellare storico"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Impossibile clonare prototipi di grafico."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "Impossibile clonare prototipi host."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Impossibile clonare prototipi di item."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Impossibile clonare prototipi di trigger."
 
@@ -2049,7 +2046,7 @@ msgid_plural "Cannot copy graphs"
 msgstr[0] "Non è possibile copiare il grafico"
 msgstr[1] "Non è possibile copiare i grafici"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "Non è possibile copiare l'item"
@@ -2101,8 +2098,8 @@ msgstr "Impossibile creare mappa icone"
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2131,7 +2128,7 @@ msgstr "Impossibile rimuovere utente interno Zabbix \"%1$s\", prova a disabilita
 msgid "Cannot delete action"
 msgstr "Impossibile cancellare l'azione"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2199,7 +2196,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2210,11 +2207,11 @@ msgstr[1] ""
 msgid "Cannot delete host prototypes"
 msgstr "Impossibile rimuovere prototipo host"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Impossibile rimuovere mappa icone"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Impossibile rimuovere l'immagine"
 
@@ -2239,7 +2236,7 @@ msgstr "Non posso cancellare l'item prototipo"
 msgid "Cannot delete item prototypes"
 msgstr "Non posso cancellare l'item prototipo"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Impossibile rimuovere gli item"
 
@@ -2270,7 +2267,7 @@ msgid_plural "Cannot delete proxies"
 msgstr[0] "Impossibile rimuovere il proxy"
 msgstr[1] "Impossibile rimuovere il proxy"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2293,7 +2290,7 @@ msgid_plural "Cannot delete scripts"
 msgstr[0] "Impossibile rimuovere lo script"
 msgstr[1] "Impossibile rimuovere lo script"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Impossibile rimuovere gli script. Lo script \"%1$s\" e' utilizzato nell'operazione \"%2$s\" dell'azione."
@@ -2309,8 +2306,8 @@ msgid_plural "Cannot delete services"
 msgstr[0] "Impossibile rimuovere il servizio"
 msgstr[1] "Impossibile rimuovere il servizio"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2339,7 +2336,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr "Impossibile rimuovere l'item basato su template."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Impossibile rimuovere gli item basati su template."
 
@@ -2392,7 +2389,7 @@ msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Impossibile rimuovere scenario web"
 
@@ -2427,7 +2424,7 @@ msgid_plural "Cannot disable hosts"
 msgstr[0] "Impossibile disabilitare host"
 msgstr[1] "Impossibile disabilitare gli host"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Impossibile disabilitare item"
@@ -2458,7 +2455,7 @@ msgid_plural "Cannot disable triggers"
 msgstr[0] "Impossibile disabilitare trigger"
 msgstr[1] "Impossibile disabilitare i trigger"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Impossibile disabilitare scenario web"
@@ -2505,7 +2502,7 @@ msgid_plural "Cannot enable hosts"
 msgstr[0] "Impossibile abilitare host"
 msgstr[1] "Impossibile abilitare gli host"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Impossibile abilitare item"
@@ -2536,7 +2533,7 @@ msgid_plural "Cannot enable triggers"
 msgstr[0] "Impossibile abilitare trigger"
 msgstr[1] "Impossibile abilitare i trigger"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Impossibile abilitare scenario web"
@@ -2550,7 +2547,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2584,8 +2581,8 @@ msgstr "Impossibile trovare host \"%1$s\" utilizzato nella mappa \"%2$s\"."
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Impossibile trovare gruppo host \"%1$s\" per il prototipo host \"%2$s\" della regola di discovery \"%3$s\" su \"%4$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2683,24 +2680,20 @@ msgstr "Impossibile trovare il valore mappa \"%1$s\" usato per l'elemento \"%2$s
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Impossibile trovare il valore mappa \"%1$s\" utilizzato per il item prototipo \"%2$s\" della regola di discovery \"%3$s\" su \"%4$s\"."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "Impossibile avere il nome template vuoto."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2713,7 +2706,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
 msgstr[0] "Non e' possibile importare il template \"%1$s\", template collegato \"%2$s\" inesistente."
 msgstr[1] "Non e' possibile importare il template \"%1$s\", template collegati \"%2$s\" inesistenti."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "Impossibile inserire espressione trigger"
 
@@ -2727,7 +2720,7 @@ msgid "Cannot link template."
 msgstr "Impossibile collegare template."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2759,17 +2752,17 @@ msgstr "Impossibile aggiornare massivamente nome visibile del template."
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Impossibile eseguire cancellazione statement nella tabella \"%1$s\" senza condizione where."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Impossibile eseguire aggiornament statement nella tabella \"%1$s\" senza valori."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Impossibile eseguire aggiornamento statement nella tabella \"%1$s\" senza condizione where."
@@ -2796,7 +2789,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Impossibile leggere risposta, controlla connessione al server Zabbix \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Impossibile rinominare utente guest."
 
@@ -2815,7 +2808,7 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Impossibile inviare comando, controlla connessione al server Zabbix \"%1$s\"."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2855,12 +2848,12 @@ msgstr "Impossibile impostare campi inventario per un inventario disabilitato."
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2879,7 +2872,7 @@ msgid_plural "Cannot unblock users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Impossibile scollegare e pulire scenari Web."
 
@@ -2892,7 +2885,7 @@ msgstr "Impossibile scollegare template"
 msgid "Cannot unlink template."
 msgstr "Impossibile scollegare template."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2945,11 +2938,6 @@ msgstr "Impossibile aggiornare \"%1$s\" per un item discoverato \"%2$s\"."
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "Impossibile aggiornare \"%1$s\" per un trigger discoverato \"%2$s\"."
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "Impossibile aggiornare \"imagetype\" per l'immagine \"%1$s\"."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2959,9 +2947,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "Impossibile aggiornare un grafico discoverato."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "Impossibile aggionrare un gruppo host discoverato."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3020,9 +3009,7 @@ msgstr "Impossibile aggiornare il grafico prototipo"
 msgid "Cannot update group"
 msgstr "Impossibile aggiornare il gruppo"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Impossibile aggiornare gruppi per l'host discoverato \"%1$s\"."
@@ -3045,13 +3032,13 @@ msgstr[1] "Impossibile aggiornare i prototipi host"
 msgid "Cannot update hosts"
 msgstr "Impossibile aggiornare gli host"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "Impossibile aggiornare la mappa icone"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Impossibile aggiornare immagine"
 
@@ -3105,12 +3092,12 @@ msgstr "Impossibile aggiornare la mappa di rete"
 msgid "Cannot update proxy"
 msgstr "Impossibile aggiornare il proxy"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Impossibile aggiornare proxy per l'host discoverato \"%1$s\"."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3130,17 +3117,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Impossibile aggiornare lo script"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3215,7 +3202,7 @@ msgstr[1] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Impossibile aggiornare scenario web"
 
@@ -3315,8 +3302,8 @@ msgid "Character string not included"
 msgstr "Stringa di caratteri non inclusa"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3431,7 +3418,7 @@ msgstr "Controllo delle prestazioni del servizio UDP. Restituisce 0 - servizio n
 msgid "Checks should be unique."
 msgstr "I controlli devono essere univoci."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3452,7 +3439,7 @@ msgstr "Riferimento circolare nei template: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "Il collegamento circolare di template non è permesso."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3473,11 +3460,11 @@ msgstr "Pulisci storico e trend"
 msgid "Clear when unlinking"
 msgstr "Pulisci duranto lo scollegamento"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3492,7 +3479,7 @@ msgstr "Orologio"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3507,7 +3494,7 @@ msgstr "Orologio"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Clona"
 
@@ -3518,8 +3505,8 @@ msgstr "Clona"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Chiudi"
 
@@ -3530,13 +3517,13 @@ msgstr "Chiudi"
 msgid "Close expression constructor"
 msgstr "Chiudi costruttore di espressioni"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Chiudi nuovo evento"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Chiudi vecchi eventi"
 
@@ -3549,8 +3536,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "Espandi"
 
@@ -3567,7 +3554,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3633,7 +3620,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr "Sessioni concorrenti"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3644,17 +3631,12 @@ msgstr "Condizione"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "Condizione \"%2$s\" non è utilizzata nella formula \"%3$s\" per l'azione \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "Condizione \"%2$s\" non utilizzata nella formula \"%3$s\" per correlazione \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "Condizione \"%2$s\" non è utilizzata nella formula \"%3$s\" per la regola di discovery \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3664,17 +3646,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "Condizione \"%2$s\" non è utilizzata nella formula \"%3$s\" per l'azione \"%1$s\" non  è definita."
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "Condizione \"%2$s\" utilizzata nella formula \"%3$s\" per correlazione \"%1$s\" non è definita."
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "Condizione \"%2$s\" utilizzata nella formula \"%3$s\" per la regola di discovery \"%1$s\" non è definita."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3690,7 +3667,7 @@ msgstr "Condizioni"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Configurazione"
 
@@ -3753,7 +3730,7 @@ msgstr "Configurazione host"
 msgid "Configuration of housekeeping"
 msgstr "Configurazione housekeeping"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Configurazione mappature delle icone"
@@ -3860,7 +3837,7 @@ msgstr "Testo di conferma"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "Complimenti! Hai installato con successo il frontend di Zabbix."
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3953,7 +3930,7 @@ msgstr "Contatto"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4013,7 +3990,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -4052,8 +4029,8 @@ msgstr "Coordinate"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Copia"
 
@@ -4062,12 +4039,11 @@ msgstr "Copia"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "Correlazione"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "Correlazione \"%1$s\" già esistente."
@@ -4095,16 +4071,6 @@ msgid_plural "Correlations enabled"
 msgstr[0] "Correlazione abilitata"
 msgstr[1] "Correlazioni abilitate"
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "Correlazione con parametri mancanti: %1$s"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "Nome correlazione non può essere vuoto."
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr "Regola di Correlazione"
@@ -4113,14 +4079,10 @@ msgstr "Regola di Correlazione"
 msgid "Correlation updated"
 msgstr "Correlazione aggiornata"
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Impossibile salvare l'immagine!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Conteggio"
 
@@ -4184,11 +4146,11 @@ msgstr "Crea correlazione"
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr ""
 
@@ -4305,7 +4267,7 @@ msgstr "Crea mappa"
 msgid "Create media type"
 msgstr "Crea tipo di supporto"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "Crea nuovo"
 
@@ -4329,7 +4291,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Crea template"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Crea trigger"
 
@@ -4492,7 +4454,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "Nome DNS"
@@ -4504,11 +4466,11 @@ msgstr "Nome DNS"
 msgid "Daily"
 msgstr "Per giorni"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "Scuro"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4529,8 +4491,8 @@ msgstr ""
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr ""
 
@@ -4553,9 +4515,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr ""
 
@@ -4579,7 +4541,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4607,7 +4569,7 @@ msgstr "Panoramica dei dati"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4749,7 +4711,7 @@ msgstr "Giorno della settimana"
 msgid "Days"
 msgstr "Giorni"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Debug"
 
@@ -4763,26 +4725,26 @@ msgstr "Modalità debug"
 msgid "Dec"
 msgstr "Dic"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Dicembre"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Default"
 
@@ -4875,7 +4837,7 @@ msgstr "Ritardato di"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4899,8 +4861,8 @@ msgstr "Ritardato di"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Rimuovi"
 
@@ -4925,11 +4887,11 @@ msgstr "Rimuovere e pulire il template? (Attenzione: tutti gli host collegati sa
 msgid "Delete current action?"
 msgstr "Rimuovere azione corrente?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "Cancella attuale correlazione?"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4973,7 +4935,7 @@ msgstr "Cancella item prototipo?"
 msgid "Delete item?"
 msgstr "Rimuovere item?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Rimuovere collegamenti tra gli elementi selezionati?"
 
@@ -5029,7 +4991,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "Rimuovere regole di discovery selezionate?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Rimuovere elementi selezionati?"
 
@@ -5134,7 +5096,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "Elimina forme selezionate?"
 
@@ -5178,7 +5140,7 @@ msgstr "Rimuovere trigger?"
 msgid "Delete web scenario?"
 msgstr "Cancellare scenario web?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5223,7 +5185,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Dipendenze"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Subordinato"
 
@@ -5231,7 +5193,7 @@ msgstr "Subordinato"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5241,7 +5203,7 @@ msgstr "Dipende da"
 msgid "Deployment status"
 msgstr "Stato di deploy"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5274,7 +5236,7 @@ msgid "Description"
 msgstr "Descrizione"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5440,10 +5402,10 @@ msgstr "Disabilitare scenario web selezionato?"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5526,7 +5488,7 @@ msgid "Discovery by proxy"
 msgstr "Discovery per proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Controllo discovery"
 
@@ -5538,7 +5500,7 @@ msgstr "Controlli discovery"
 msgid "Discovery list"
 msgstr "Lista discovery"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Oggetto discovery"
 
@@ -5570,7 +5532,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5578,12 +5540,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Regola di discovery"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "La regola di discovery \"%1$s\" esiste già su \"%2$s\", ereditata da un altro template."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "Regola di discovery \"%1$s\" gia' presente in \"%2$s\"."
@@ -5596,7 +5558,7 @@ msgstr "Regola di discovery \"%1$s\" gia' presente in \"%2$s\"."
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "Regola di discovery \"%1$s\" gia' presente."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5638,7 +5600,7 @@ msgstr "Regola di discovery aggiornata"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5649,7 +5611,7 @@ msgstr "Regole di discovery"
 msgid "Discovery rules deleted"
 msgstr "Regole di discovery rimosse"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Stato discovery"
@@ -5686,10 +5648,11 @@ msgid "Display stacked graph"
 msgstr "Mostra grafico stacked"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Visualizzati %1$s di %2$s trovate"
@@ -5699,7 +5662,7 @@ msgstr "Visualizzati %1$s di %2$s trovate"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "Visualizzati %1$s a %2$s di %3$s trovati"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5721,7 +5684,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Desideri sostituire l'espressione condizionale?"
 
@@ -5777,7 +5740,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Giù"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5785,7 +5748,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr "Scarica il file di configurazione"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5804,18 +5767,6 @@ msgstr ""
 msgid "Draw style"
 msgstr "Stile disegno"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "Duplicato \"%1$s\" valore \"%2$s\" per correlazione \"%3$s\"."
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr "Duplicato \"%1$s\" valore \"%2$s\" for correlazione."
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5828,11 +5779,6 @@ msgstr "Valore \"nome\" duplicato \"%1$s\" per la mappa."
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5884,7 +5830,7 @@ msgstr "Item dinamico"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Ogni URL deve avere un nome univoco. Per favore assicurarsi che ci sia un solo URL con quel nomeOgni URL deve avere un nome univoco. Per favore assicurarsi che ci sia un solo URL con quel nome"
 
@@ -5893,11 +5839,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5911,8 +5857,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Modifica"
 
@@ -5928,11 +5874,11 @@ msgstr "Edita mappa"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Modifica trigger"
 
@@ -5992,21 +5938,17 @@ msgstr "File chiave SSL vuoto per lo scenario web \"%1$s\"."
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "ID correlazione vuoto."
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "Filtro condizione formula ID vuota per l'azione \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Filtro condizione formula ID vuota per la regola di discovery \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "Filtro condizione macro vuoto per la regola di discovery \"%1$s\"."
@@ -6022,25 +5964,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6050,14 +5986,6 @@ msgstr "Parametro di input vuoto."
 msgid "Empty map ID."
 msgstr "ID mappa assente."
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "ID tipo media assente."
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Parametri vuoti"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6223,7 +6151,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6234,7 +6162,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6277,7 +6205,7 @@ msgid "English (en_US)"
 msgstr "Inglese (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6293,7 +6221,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6312,12 +6240,12 @@ msgstr ""
 msgid "Error"
 msgstr "Errore"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Errore nella richiesta di ricerca per la tabella \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6344,7 +6272,7 @@ msgstr "ID evento"
 msgid "Event acknowledged"
 msgstr "Evento preso in carico"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6352,7 +6280,7 @@ msgid "Event correlation"
 msgstr "Correlazione eventi"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "Regole correlazione eventi"
@@ -6388,11 +6316,11 @@ msgid "Event name"
 msgstr ""
 
 # Need to find a better translation
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "Coppia tag eventi"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Tipo evento"
 
@@ -6437,15 +6365,10 @@ msgstr "Escludi"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Esegui"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "Esegui errore SQL [%1$s] in [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6483,7 +6406,7 @@ msgstr "Eseguito"
 msgid "Executed script"
 msgstr "Script eseguito"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Conferma esecuzione"
 
@@ -6499,8 +6422,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "Espandi"
 
@@ -6621,7 +6544,7 @@ msgstr "Espressioni"
 msgid "External check"
 msgstr "External check"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "V"
@@ -6648,8 +6571,8 @@ msgstr "Fallito"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6660,26 +6583,26 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr "Impossibile analizzare l'URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6687,7 +6610,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Aggiornamento template fallito."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6711,7 +6634,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Febbraio"
 
@@ -6733,10 +6656,9 @@ msgstr "Il campo \"%1$s\" non può essere impostato a NULL."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6747,13 +6669,6 @@ msgstr "Il campo \"%1$s\" è obbligatorio."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "Campo \"%1$s\" non ha un valore per la mappa \"%2$s\"."
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "Campo \"%1$s\" non ha un valore per il tipo media \"%2$s\"."
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6772,11 +6687,6 @@ msgstr "Il campo \"%1$s\" non è un intero."
 msgid "Field \"%1$s\" is not string."
 msgstr "Il campo \"%1$s\" non è una stringa."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "Campo \"%1$s\" è richiesto per il tipo media \"%2$s\"."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6791,10 +6701,6 @@ msgstr "Campo \"host\" è richiesto."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Il formato file non è supportato."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6859,7 +6765,8 @@ msgstr "Regione riempita"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6884,7 +6791,7 @@ msgstr "Filtro"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6936,7 +6843,7 @@ msgstr "Adatta alla mappa"
 msgid "Fixed"
 msgstr "Fisso"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6987,12 +6894,12 @@ msgstr "Formula"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7005,7 +6912,7 @@ msgstr "Francese (fr_FR)"
 msgid "Fri"
 msgstr "Ven"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Venerdì"
 
@@ -7116,7 +7023,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "L'espressione fornita non è una macro"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr "Global regular expression \"%1$s\" non esiste."
@@ -7130,7 +7037,7 @@ msgstr "Valore globale"
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Vai a"
 
@@ -7168,7 +7075,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7176,7 +7083,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Linea sfumata"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7236,7 +7143,7 @@ msgstr[1] "Grafici copiati"
 msgid "Graph deleted"
 msgstr "Grafico rimosso"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7273,8 +7180,8 @@ msgstr "Grafico prototipo cancellato"
 msgid "Graph prototype updated"
 msgstr "Grafico prototipo aggiornato"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7308,8 +7215,8 @@ msgstr "Tipo di grafico"
 msgid "Graph updated"
 msgstr "Grafico aggiornato"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7340,7 +7247,7 @@ msgstr "Un grafico con nome \"%1$s\" esiste già tra i grafici o prototipi di gr
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Grafici"
 
@@ -7361,12 +7268,12 @@ msgstr "Griglia"
 msgid "Group"
 msgstr "Gruppo"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Il gruppo \"%1$s\" non può esser rimosso, perchè è utilizzato da un prototipo host."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr "Gruppo \"%1$s\" non può essere cancellato , perché viene utilizzato in una condizione di correlazione ."
@@ -7540,11 +7447,11 @@ msgstr "Aiuto"
 msgid "Hexadecimal to decimal"
 msgstr "Esadecimale a decimale."
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Nascosta"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "Nascondi debug"
 
@@ -7571,11 +7478,11 @@ msgstr ""
 msgid "High"
 msgstr "Alta"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7596,7 +7503,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Storico"
 
@@ -7604,11 +7511,15 @@ msgstr "Storico"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Storico pulito"
 
@@ -7651,7 +7562,7 @@ msgstr "Orizzontale"
 msgid "Horizontal align"
 msgstr "Allinea in orizzontale"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7680,7 +7591,7 @@ msgstr "Allinea in orizzontale"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7694,7 +7605,7 @@ msgstr[1] "Host"
 msgid "Host \"%1$s\" already exists."
 msgstr "L'host \"%1$s\" esiste già."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7702,7 +7613,7 @@ msgstr "L'host \"%1$s\" esiste già."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "Host \"%1$s\" non può esistere senza un gruppo host"
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7754,7 +7665,7 @@ msgid_plural "Hosts enabled"
 msgstr[0] "Host abilitato"
 msgstr[1] "Host abilitati"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7768,22 +7679,22 @@ msgstr[1] "Host abilitati"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Gruppo host"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Il gruppo host \"%1$s\" esiste già."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Il gruppo host \"%1$s\" non può esser rimosso, in quanto è utilizzato in uno script globale."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7796,10 +7707,10 @@ msgstr "Elementi gruppo host"
 msgid "Host group label type"
 msgstr "Tipo etichetta gruppo host"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Host group con ID \"%1$s\" non è disponibile."
@@ -7815,8 +7726,8 @@ msgstr "Host group con ID \"%1$s\" non è disponibile."
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7890,7 +7801,7 @@ msgstr "Nome host"
 msgid "Host networks"
 msgstr "Reti di host"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7970,7 +7881,7 @@ msgstr "Aggiornamento host fallito."
 msgid "Host updated"
 msgstr "Host aggiornato"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr ""
@@ -7990,7 +7901,7 @@ msgstr "Host con nome uguale \"%1$s\" gia' presente."
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Host con nome visibile \"%1$s\" gia' presente."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8003,7 +7914,7 @@ msgstr "Host con nome visibile \"%1$s\" gia' presente."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8051,7 +7962,7 @@ msgstr "Host aggiornati"
 msgid "Hours"
 msgstr "Ore"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8091,7 +8002,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "Indirizzo IP"
@@ -8116,7 +8027,7 @@ msgstr "La gamma IP \"%1$s\" supera il limite di indirizzo \"%2$s\""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8173,12 +8084,12 @@ msgstr "Evidenziazione icone"
 msgid "Icon map"
 msgstr "Mappa icone"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "La mappa icone \"%1$s\" non può esser rimossa. È utilizzata nella mappa \"%2$s\"."
@@ -8191,18 +8102,18 @@ msgstr "Mappa icone creata"
 msgid "Icon map deleted"
 msgstr "Mappa icone rimossa"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Mappa icone aggiornata"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "Mappatura icone"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "L'icona con ID \"%1$s\" non è disponibile."
@@ -8303,23 +8214,20 @@ msgstr "Se pensi che questo messaggio sia sbagliato, per favore contatta il tuo
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Immagine"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "L'immagine \"%1$s\" esiste già."
@@ -8328,7 +8236,7 @@ msgstr "L'immagine \"%1$s\" esiste già."
 msgid "Image added"
 msgstr "Immagine aggiunta"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Immagine rimossa"
 
@@ -8336,18 +8244,12 @@ msgstr "Immagine rimossa"
 msgid "Image label type"
 msgstr "Tipo etichetta immagine"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "Errore caricamento immagine [%1$s] in [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Immagine aggiornata"
 
@@ -8442,7 +8344,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8453,13 +8355,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr ""
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8503,7 +8405,7 @@ msgstr "Includi sottogruppi"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Statistiche di traffico in ingresso sull'interfaccia di rete. Restituice intero"
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8671,24 +8573,6 @@ msgstr "Gruppo utenti errato per l'operazione dell'azione. Il gruppo utenti non
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Utente errato per l'operazione dell'azione. L'utente non esiste o non accesso a questo utente.Utente errato per l'operazione dell'azione. L'utente non esiste o non accesso a questo utente."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8743,8 +8627,6 @@ msgstr "Utente errato per l'operazione dell'azione. L'utente non esiste o non ac
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Argomenti errati passati alla funzione."
 
@@ -8770,31 +8652,22 @@ msgstr "Utilizzati caratteri non corretti per il nome template \"%1$s\"."
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "Condizione non corretta per l'azione \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "Condizioni non corrette per la regola di discovery \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "ID di correlazione non corretta."
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "Espressione personalizzata non corretta \"%2$s\" per l'azione \"%1$s\": %3$s."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "Espressione personalizzata non corretta \"%2$s\"  per la correlazione \"%1$s\": %3$s."
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "Espressione personalizzata non corretta \"%2$s\" per la regola di discovery \"%1$s\": %3$s."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8823,7 +8696,7 @@ msgstr "Valore eventobject errato."
 msgid "Incorrect eventsource value."
 msgstr "Valore eventsource errato."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Nome o valore errato per il campo \"%1$s\" nello statement where per la tabella \"%2$s\"."
@@ -8848,23 +8721,17 @@ msgstr "Caricamento file errato."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "Filtro errato \"condizione ID formula\" per azione \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Filtro errato \"condizione ID formula\" per la regola di discovery \"%1$s\"."
 
-# Not so much clear
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "ID formula per filtro condizione non corretto per la correlazione \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "Filtro non corretto per la macro della regola di discovery \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8875,7 +8742,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "Filtro non corretto per l'operatore condizione sull'azione \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "Filtro non corretto per l'operatore condizione sulla regola di discovery \"%1$s\"."
@@ -8903,8 +8770,6 @@ msgstr "Indice immagine errato."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8966,10 +8831,6 @@ msgstr "Periodo di manutenzione errato (minimo 5 minuti)"
 msgid "Incorrect map ID."
 msgstr "ID mappa errato."
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "ID tipo media errato."
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9027,13 +8888,13 @@ msgstr "Errata regular expression \"%1$s\": \"%2$s\""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Risposta errata ricevuta dal server Zabbix \"%1$s\"."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Ora di fine servizio errata."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Ora di inizio servizio errata."
 
@@ -9086,12 +8947,7 @@ msgstr "Non corretta espressione prototipo trigger. Gli elementi di un prototipo
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "Tipo non corretto di calcolo per l'azione \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "Tipo di calcolo non corretto per la correlazione \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "Tipo non corretto di calcolo per la regola di discovery \"%1$s\"."
@@ -9137,13 +8993,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9160,60 +9016,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Valore \"%1$s\" errato per il campo \"%2$s\": dev'esser contenuto tra %3$s e %4$s."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "Valore \"%1$s\" errato per il campo float \"%2$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "Valore \"%1$s\" errato per il campo int \"%2$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Valore \"%1$s\" errato per il campo int senza segno \"%2$s\"."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "Valore non corretto \"%1$s\" nel campo \"%2$s\" per la correlazione \"%3$s\"."
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "Valore errato \"%1$s\" nel campo \"%2$s\" per il tipo media \"%3$s\"."
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9268,14 +9094,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9385,25 +9205,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9414,7 +9216,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9460,16 +9262,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9478,7 +9281,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "Valore errato per il campo \"%1$s\": %2$s."
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9566,12 +9369,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Inserisci"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "Inserire espressione"
 
@@ -9675,7 +9478,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9683,7 +9486,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9694,7 +9497,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Intervallo"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9717,7 +9520,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr "Action condition non valido: %1$s."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9749,7 +9552,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr "Intervallo errato \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Key invalida \"%1$s\" per la regola di discovery \"%2$s\" su \"%3$s\": %4$s."
@@ -9774,27 +9577,29 @@ msgstr "Key non valida \"%1$s\": %2$s."
 msgid "Invalid method parameters."
 msgstr "Parametri del metodo non validi."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9820,17 +9625,17 @@ msgstr "Parametri del metodo non validi."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9838,8 +9643,8 @@ msgstr "Parametri del metodo non validi."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9853,106 +9658,116 @@ msgstr "Parametri del metodo non validi."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9994,43 +9809,38 @@ msgstr "Codice di risposta \"%1$s\" non valido."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10051,7 +9861,7 @@ msgstr "Periodo di tempo non valido."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Inventario"
 
@@ -10092,7 +9902,7 @@ msgstr "Impossibile cercare per password utente."
 msgid "Italian (it_IT)"
 msgstr "Italiano (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10124,7 +9934,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "L'item \"%1$s\" non può popolare un campo numero \"%2$d\" mancante nell'inventario host. Le scelte sono: da 0 (non popolare) a \"%3$d\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10138,7 +9948,7 @@ msgstr "Item aggiunto"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "Item copiato"
@@ -10152,13 +9962,13 @@ msgstr "Numero item"
 msgid "Item deleted"
 msgstr "Item rimosso"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Item disabilitato"
 msgstr[1] "Item disabilitati"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Item abilitato"
@@ -10168,7 +9978,7 @@ msgstr[1] "Item disabilitato"
 msgid "Item in \"not supported\" state"
 msgstr "Item in stato \"non supportato\""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "Item non selezionato"
 
@@ -10177,7 +9987,7 @@ msgstr "Item non selezionato"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr "Item pre-processing mancanza parametro: %1$s"
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10214,8 +10024,8 @@ msgid_plural "Item prototypes updated"
 msgstr[0] "Prototipo item aggiornato"
 msgstr[1] "Prototipi item aggiornati"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10241,7 +10051,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10273,8 +10083,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10325,11 +10135,11 @@ msgstr "Item con chiave \"%1$s\" esiste già su \"%2$s\"."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Item"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Item rimossi"
 
@@ -10347,7 +10157,7 @@ msgstr "Item aggiornati"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10372,6 +10182,10 @@ msgstr "Interfacce JMX"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10384,7 +10198,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10402,7 +10216,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Gen"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Gennaio"
 
@@ -10424,7 +10238,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Lug"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Luglio"
 
@@ -10432,7 +10246,7 @@ msgstr "Luglio"
 msgid "Jun"
 msgstr "Giu"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Giugno"
 
@@ -10588,22 +10402,6 @@ msgid_plural "Last %1$d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10615,11 +10413,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Ultimo controllo"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Grafico dell'ultima ora"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Grafico ultimo mese"
 
@@ -10657,11 +10455,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Ultimo valore"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Grafico ultima settimana"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10670,11 +10468,11 @@ msgstr "Grafico ultima settimana"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Ultimi dati"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "Ultimi valori"
 
@@ -10715,7 +10513,7 @@ msgstr ""
 msgid "Left trim"
 msgstr "Trim sinistro"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -10996,7 +10794,7 @@ msgstr "Regola discovery di basso livello in stato \"non supportata\"."
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "L"
@@ -11018,7 +10816,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "Checksum MD5 dei file. Restituisce una stringa di caratteri (MD5 hash del file)"
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11029,12 +10827,12 @@ msgid "Macro"
 msgstr "Macro"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "La macro \"%1$s\" esiste già su \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "La macro \"%1$s\" esiste già."
@@ -11062,7 +10860,7 @@ msgstr "Macro aggiornate"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -11070,7 +10868,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11153,7 +10951,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11175,13 +10973,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Mappa"
 
@@ -11250,7 +11048,7 @@ msgstr "Condividi mappa"
 msgid "Map update failed."
 msgstr "Aggiornamento mappa fallito."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11282,7 +11080,7 @@ msgstr "Mappe"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Marzo"
 
@@ -11386,7 +11184,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11400,7 +11198,7 @@ msgstr[1] "Il periodo di tempo massimo da visualizzare è \"%1$s\" giorni."
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Maggio"
 
@@ -11415,15 +11213,12 @@ msgstr "Maggio"
 msgid "Media"
 msgstr "Supporti"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Tipi di supporto"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr "Media type \"%1$s\" già presente."
@@ -11450,11 +11245,6 @@ msgid_plural "Media types enabled"
 msgstr[0] "Tipo di supporto abilitato"
 msgstr[1] "Tipo di supporto abilitato"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr "Parametro tipo media assente: %1$s"
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11484,7 +11274,7 @@ msgstr "Tipo Media con ID \"%1$s\" non e' valido."
 msgid "Media types"
 msgstr "Tipi di supporto"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11572,7 +11362,7 @@ msgstr "Messaggi"
 msgid "Method not found."
 msgstr "Metodo non trovato."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11634,7 +11424,7 @@ msgid "Minimum severity"
 msgstr "Severity minima"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11693,7 +11483,7 @@ msgstr "Modalità"
 msgid "Model"
 msgstr "Modello"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11731,7 +11521,7 @@ msgstr[1] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11757,7 +11547,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Lun"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Lunedì"
 
@@ -11797,11 +11587,11 @@ msgstr "Mese"
 msgid "Monthly"
 msgstr "Per mesi"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "Più corrispondenze trovate..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11825,7 +11615,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11838,7 +11628,7 @@ msgstr "Multiplo"
 msgid "Multiple PROBLEM events"
 msgstr "Eventi PROBLEMA multipli"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Muto"
 
@@ -11967,11 +11757,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12129,19 +11919,21 @@ msgstr "Nuova condizione"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Nuovo elemento"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr "Nuovo evento gruppo host"
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr "Nuovo valore tag evento"
 
@@ -12153,7 +11945,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nuova espressione regolare"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12161,7 +11953,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Nuovo orario di servizio"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12170,7 +11962,7 @@ msgid "New triggers"
 msgstr "Nuovi trigger"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12188,7 +11980,7 @@ msgstr "Prossimo step"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12217,30 +12009,6 @@ msgstr "Prossimo step"
 msgid "No"
 msgstr "No"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "Nessun \"%1$s\" fornito per la correlazione \"%2$s\"."
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "Nessun \"%1$s\" fornito per la correlazione."
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12256,11 +12024,6 @@ msgstr "Nessun \"%1$s\" fornito per il grafico."
 msgid "No \"%1$s\" given for map."
 msgstr "Nessun \"%1$s\" dato per la mappa."
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "Nessun \"%1$s\" dato per il tipo media."
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12268,7 +12031,7 @@ msgstr "Nessun \"%1$s\" dato per il tipo media."
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "Nessun \"%2$s\" dato per la \"condizione filtro\" sull'azione \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "Nessun \"%2$s\" dato per la \"condizione filtro\" sulla regola di discovery \"%1$s\"."
@@ -12278,7 +12041,7 @@ msgstr "Nessun \"%2$s\" dato per la \"condizione filtro\" sulla regola di discov
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "Nessun \"%2$s\" dato per il filtro sull'azione \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "Nessun \"%2$s\" dato per il filtro sulla regola di discovery \"%1$s\"."
@@ -12295,11 +12058,6 @@ msgstr "Nessun nome utente di autenticazione specificato."
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "Nessun tipo di condizione fornita per la correlazione \"%1$s\"."
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12330,7 +12088,7 @@ msgstr "Nessuna interfaccia di default per tipo \"%1$s\" su \"%2$s\"."
 msgid "No details"
 msgstr "Nessun dettaglio"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "Nessun ID regola di discovery fornito."
 
@@ -12366,7 +12124,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "Nessun grafico aggiunto."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Nessun ID host fornito."
 
@@ -12396,7 +12154,7 @@ msgstr "Nessuna immagine"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Nessuna interfaccia trovata"
 
@@ -12430,7 +12188,7 @@ msgstr "Nessuna macro trovata."
 msgid "No maps added."
 msgstr "Nessuna mappa aggiunta."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "Nessuna corrispondenza trovata"
 
@@ -12438,17 +12196,46 @@ msgstr "Nessuna corrispondenza trovata"
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr "Nessun tipo operazione fornita per la correlazione \"%1$s\"."
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Nessun permesso per l'accesso al sistema."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12456,7 +12243,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12484,19 +12271,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12511,16 +12297,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12540,12 +12332,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12566,27 +12356,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12603,14 +12395,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12619,7 +12411,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Nessun permesso all'oggetto riferito o non esiste!"
 
@@ -12639,7 +12431,7 @@ msgstr "Nessun file di chiave pubblica specificato."
 msgid "No recipients for action operation message."
 msgstr "Nessun destinatario per il messaggio dell'operazione azione."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr ""
 
@@ -12651,7 +12443,7 @@ msgstr "Nessuno script specificato per il comando dell'operazione azione."
 msgid "No target selected"
 msgstr "Nessun target selezionato"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Nessun target selezionato."
 
@@ -12668,7 +12460,7 @@ msgstr "Nessun trigger definito."
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr "Flag non booleani sono deprecati."
 
@@ -12738,15 +12530,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Non autorizzato ad impostare la password per l'utente \"guest\"."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12778,7 +12570,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "Non supportato"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Nota"
@@ -12809,7 +12601,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "Novembre"
 
@@ -12996,8 +12788,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13058,13 +12850,13 @@ msgstr "Ott"
 msgid "Octal to decimal"
 msgstr "Ottale a decimale"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Ottobre"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Off"
 
@@ -13072,30 +12864,31 @@ msgstr "Off"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr "Vecchio valore tag evento"
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "On"
 
@@ -13111,35 +12904,15 @@ msgstr "Una volta"
 msgid "One"
 msgstr "Uno"
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "Uno degli oggetti è rimasto senza gruppo host."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Solo una volta"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Inattività una-volta"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Solo i Super Amministratori possono creare gruppi host."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Solo i Super Amministratori possono tipi di supporto."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Solo i Super Amministratori possono rimuovere tipi di supporto."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Solo i Super Amministratori possono modificare i tipi di supporto."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Solo i check Zabbix agent, SNMPv1, SNMPv2 e SNMPv3 possono essere unici."
@@ -13188,10 +12961,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "Solo gli super admin possono creare correlazioni."
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13200,15 +12969,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr "Solo gli super admin possono aggiornare le correlazioni."
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Solo i trigger assegnati agli host abilitati e dipendenti da item abilitati son conteggiatiSolo i trigger assegnati agli host abilitati e dipendenti da item abilitati son conteggiati"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13217,7 +12982,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Informazioni Sistema Operativo. Restituisce stringa"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13226,11 +12991,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "L'operazione non può esser eseguita a causa di richiesta non autorizzata.L'operazione non può esser eseguita a causa di richiesta non autorizzata."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Dettagli dell'operazione"
 
@@ -13252,7 +13017,7 @@ msgstr "L'operazione non ha template per operare."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13261,33 +13026,33 @@ msgstr ""
 msgid "Operations"
 msgstr "Operazioni"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operatore"
 
@@ -13396,7 +13161,7 @@ msgstr "Altri parametri di configurazione"
 msgid "Other parameters"
 msgstr "Altri parametri"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Altri"
@@ -13410,7 +13175,7 @@ msgstr "Statistiche di traffico in uscita su interfaccia di rete. Restituisce in
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13439,7 +13204,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13628,7 +13393,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13673,7 +13438,7 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "PSK identity"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13696,16 +13461,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parametro"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "Parametro \"%1$s\" e' deprecato."
@@ -13735,7 +13500,7 @@ msgstr "Item primari"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13752,7 +13517,7 @@ msgstr "Trigger primario"
 msgid "Parent web scenarios"
 msgstr "Scenari web primari"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13764,11 +13529,6 @@ msgstr ""
 msgid "Parse"
 msgstr "Analizzare"
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "Analizza errore SQL [%1$s] in [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Analizza errore"
@@ -13829,7 +13589,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr "Incolla"
 
@@ -13839,15 +13599,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr "Incolla senza link esterni"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13893,12 +13653,11 @@ msgstr "Esegue una query DNS. Restituisce una stringa di caratteri con le inform
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Periodo"
 
@@ -13987,7 +13746,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Si prega di inserire il nome host o indirizzo IP dell'host e porta del server Zabbix, ed eventuale nome dell'installazione (opzionale)."
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Per favore seleziona due elementi"
 
@@ -14027,7 +13786,7 @@ msgstr "Popola campo inventario host"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14116,7 +13875,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14247,7 +14006,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Problema su"
 
@@ -14260,21 +14019,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14288,9 +14043,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Problemi"
 
@@ -14324,7 +14079,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "Proprietà"
 
@@ -14345,13 +14100,13 @@ msgstr ""
 msgid "Proxies"
 msgstr "Proxy"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14359,7 +14114,7 @@ msgstr "Proxy"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14369,12 +14124,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Il proxy \"%1$s\" per l'host \"%2$s\" non esiste."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Il proxy \"%1$s\" è usato dalla regola di discovery \"%2$s\"."
@@ -14467,7 +14222,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14544,10 +14299,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Valore ricevuto"
@@ -14629,7 +14380,7 @@ msgstr "Rettangolo"
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14647,13 +14398,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Espressione regolare"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14686,7 +14437,7 @@ msgstr "Espressioni regolari"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14718,8 +14469,6 @@ msgstr "Comando remoto"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14740,7 +14489,9 @@ msgstr "Comando remoto"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14753,7 +14504,7 @@ msgstr "Comando remoto"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14830,8 +14581,8 @@ msgstr "Comando remoto"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -14871,7 +14622,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14913,7 +14664,7 @@ msgid "Replace dependencies"
 msgstr "Sostituisci dipendenze"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14968,7 +14719,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -15010,8 +14761,8 @@ msgstr "Status Code atteso"
 msgid "Required string"
 msgstr "Stringa attesa"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Azzera"
 
@@ -15044,7 +14795,7 @@ msgstr "Conferma ripristino"
 msgid "Reset defaults"
 msgstr "Ripristina predefiniti"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Risolto"
 
@@ -15110,7 +14861,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Risultato"
@@ -15297,12 +15048,12 @@ msgstr "Esegui comando specificato sull'host. Restituisce risultati di tipo test
 msgid "Russian (ru_RU)"
 msgstr "Russo (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "D"
@@ -15313,8 +15064,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15351,7 +15102,7 @@ msgstr "SMTP server port"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15447,12 +15198,12 @@ msgstr "SQL totale: %1$s (selezionati: %2$s | eseguiti: %3$s)"
 msgid "SQL query"
 msgstr "Query SQL"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "L'esecuzione dello statement SQL è fallita \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "L'esecuzione dello statement SQL è fallita \"%1$s\"."
@@ -15515,7 +15266,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15527,7 +15278,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Sab"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Sabato"
 
@@ -15569,7 +15320,7 @@ msgstr "Schedulazione"
 msgid "Scheduled check"
 msgstr "Controllo pianificato"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15636,7 +15387,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15649,8 +15400,7 @@ msgstr ""
 msgid "Script"
 msgstr "Script"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Lo script \"%s\" esiste già."
@@ -15682,12 +15432,6 @@ msgstr "Percorso menu Script \"%1$s\" già utilizzato come nome script \"%2$s\".
 msgid "Script parameters"
 msgstr "Parametri script"
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "I parametri degli script \"%1$s\" perdono l'ultima new line feed per il tipo di supporto \"%2$s\"."
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Creatore di profili script"
@@ -15700,7 +15444,7 @@ msgstr "Script aggiornato"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Script"
 
@@ -15770,8 +15514,8 @@ msgid "Security name"
 msgstr "Nome di sicurezza"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15779,7 +15523,7 @@ msgstr "Nome di sicurezza"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Seleziona"
 
@@ -15815,19 +15559,19 @@ msgstr "Elementi selezionati"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr "Manda indietro"
 
@@ -15852,7 +15596,7 @@ msgstr "Invia solo a"
 msgid "Send to"
 msgstr "Invia a"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr "Mandare indietro"
 
@@ -15885,7 +15629,7 @@ msgstr "Separati"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "Settembre"
 
@@ -15916,28 +15660,28 @@ msgstr "Server (proxy)"
 msgid "Server time"
 msgstr "Ora server"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Servizio"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15947,7 +15691,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "Servizio creato"
 
@@ -15980,16 +15724,16 @@ msgstr "Porta servizio"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "L'ora di partenza del servizio deve essere minore dell'ora di fine."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -15997,11 +15741,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Orari servizio"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Tipo servizio"
 
@@ -16010,30 +15754,29 @@ msgstr "Tipo servizio"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Servizio aggiornato"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Servizi"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "I servizi formano una dipendenza circolare."
 
@@ -16041,7 +15784,7 @@ msgstr "I servizi formano una dipendenza circolare."
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16071,7 +15814,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Definisci modalita' inventario per host"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16100,7 +15843,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16109,7 +15852,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16165,7 +15908,7 @@ msgstr "Forma"
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "Condivisioni"
 
@@ -16307,7 +16050,7 @@ msgstr "Mostra avvertimento se Zabbix Server non risponde"
 msgid "Show working time"
 msgstr "Mostra orario di lavoro"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Visibile"
 
@@ -16416,7 +16159,7 @@ msgstr "Saltata copia del grafico \"%1$s\" sull'host \"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "Slovacco (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Posponi"
 
@@ -16462,7 +16205,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Ordina voci per"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Ordinamento (0->999)"
 
@@ -16536,7 +16279,7 @@ msgstr "Inizia in"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16639,15 +16382,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Stato"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Codici di stato"
@@ -16677,7 +16424,7 @@ msgstr "Solo lo stato"
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16725,7 +16472,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16790,7 +16537,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Oggetto"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Sottomappa"
 
@@ -16806,7 +16553,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Riuscita Audit"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16819,7 +16566,7 @@ msgstr "Somma delle statistiche di traffico in entrata ed in uscita su un'interf
 msgid "Sun"
 msgstr "Dom"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Domenica"
 
@@ -16911,12 +16658,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "System uptime in secondi. Restituisce intero"
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "G"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "M"
@@ -16943,17 +16690,17 @@ msgstr "VERO"
 msgid "Table \"%1$s\" does not exist."
 msgstr "La tavola \"%1$s\" non esiste."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "La tavola \"%1$s\" non contiene un campo chiamato \"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Tag"
@@ -17009,7 +16756,7 @@ msgstr "Valore tag"
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17069,7 +16816,7 @@ msgstr "Tipo target"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17090,7 +16837,7 @@ msgstr "Template"
 msgid "Template \"%1$s\" already exists."
 msgstr "Il template \"%1$s\" esiste già."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17114,7 +16861,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Il template non può esser collegato a un altro template più di una volta anche attraverso altri template.Il template non può esser collegato a un altro template più di una volta anche attraverso altri template."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17174,7 +16921,7 @@ msgstr "Template con stesso nome visibile \"%1$s\" gia' presente."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17346,14 +17093,14 @@ msgstr "L'host non è stato più discoverato e sarà rimosso in %1$s (il %2$s al
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "Host non più discoverato, verrà eliminato al successivo ciclo di discovery."
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "L'immagine è utilizzata nella mappa icone %1$s."
 msgstr[1] "L'immagine è utilizzata nelle mappe icone %1$s."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17418,7 +17165,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Questo mese"
 
@@ -17426,7 +17173,7 @@ msgstr "Questo mese"
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Questa settimana"
 
@@ -17434,7 +17181,7 @@ msgstr "Questa settimana"
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Quest'anno"
 
@@ -17454,7 +17201,7 @@ msgstr ""
 msgid "Thu"
 msgstr "Gio"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Giovedì"
 
@@ -17471,7 +17218,7 @@ msgstr "Fino a"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17504,7 +17251,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Periodo di tempo"
 
@@ -17556,12 +17303,11 @@ msgstr "Data e ora"
 msgid "To"
 msgstr "A"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "Per impostare un'interfaccia host seleziona un singolo tipo di item per tutti gli itemPer impostare un'interfaccia host seleziona un singolo tipo di item per tutti gli item"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Oggi"
 
@@ -17676,7 +17422,7 @@ msgstr "Periodo storicizzazione Trend"
 msgid "Trends"
 msgstr "Trend"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17684,7 +17430,7 @@ msgstr "Trend"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Trigger"
 
@@ -17785,7 +17531,7 @@ msgstr "Nome trigger"
 msgid "Trigger overview"
 msgstr "Panoramica Trigger"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17858,11 +17604,11 @@ msgstr "Prototipi Trigger aggiornati"
 msgid "Trigger severity"
 msgstr "Severity trigger"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "Trigger stato \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "Trigger con stato \"Problema\""
 
@@ -17879,7 +17625,7 @@ msgstr "Trigger aggiornato"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17914,7 +17660,7 @@ msgstr "Trim"
 msgid "Tue"
 msgstr "Mar"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Martedì"
 
@@ -17927,7 +17673,7 @@ msgstr "Turco (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Due item (\"%1$s\" e \"%2$s\") non possono popolare un campo dell'inventario host \"%3$s\", questo porterebbe ad un conflitto."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17943,19 +17689,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18007,7 +17753,7 @@ msgstr "Tipo di informazione"
 msgid "Types"
 msgstr "Tipi"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18028,7 +17774,7 @@ msgstr "SCONOSCIUT0"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18074,12 +17820,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "URL deve avere entrambe i campi \"nome\" e \"url\" per la mappa \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URLs"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18164,12 +17910,12 @@ msgstr "Sblocca"
 msgid "Unblock selected users?"
 msgstr "Sbloccare utenti selezionati?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18189,21 +17935,23 @@ msgstr "Unità"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Sconosciuto"
@@ -18221,7 +17969,7 @@ msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Item host sconosciuto, nessun item di questo tipo nell'host selezionato"
@@ -18274,7 +18022,7 @@ msgstr "Scollega dal template"
 msgid "Unlink from templates"
 msgstr "Scollega dai template"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Disattiva muto"
 
@@ -18305,7 +18053,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "Parametro non supportato \"%2$s\" per la \"condizione filtro\" dell'azione \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "Parametro non supportato \"%2$s\" per la \"condizione filtro\" della regola di discovery \"%1$s\"."
@@ -18315,7 +18063,7 @@ msgstr "Parametro non supportato \"%2$s\" per la \"condizione filtro\" della reg
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "Parametro non supportato \"%2$s\" per il filtro dell'azione \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "Parametro non supportato \"%2$s\" per il filtro della regola di discovery \"%1$s\"."
@@ -18360,7 +18108,7 @@ msgstr "Su"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18373,7 +18121,7 @@ msgstr "Su"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18426,7 +18174,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18444,7 +18192,7 @@ msgstr "Carica"
 msgid "Upper level maps"
 msgstr "Mappe al livello superiore"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18479,7 +18227,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "Utilizzato nelle azioni"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18494,7 +18242,7 @@ msgstr "Utilizzato nelle azioni"
 msgid "User"
 msgstr "Utente"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "L'utente \"%1$s\" non può esistere senza un gruppo utenti"
@@ -18546,7 +18294,7 @@ msgstr "Utente aggiunto"
 msgid "User agent string"
 msgstr "Stringa user agent"
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "L'utente non può aggiungere se stesso ad un gruppo disabilitato o ad un gruppo con accesso alla GUI disabilitato.L'utente non può aggiungere se stesso ad un gruppo disabilitato o ad un gruppo con accesso alla GUI disabilitato."
@@ -18566,7 +18314,7 @@ msgid_plural "Users deleted"
 msgstr[0] "Utente rimosso"
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18576,27 +18324,27 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Gruppo utenti"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Gruppo utenti \"%1$s\" gia' presente."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "Gruppo utenti \"%1$s\" viene utilizzato nell'azione \"%2$s\"."
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Gruppo utente \"%1$s\" e' configurato per ricevere le segnalazioni di database down."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Il gruppo utenti \"%1$s\" è utilizzato nello script \"%2$s\"."
@@ -18630,8 +18378,8 @@ msgstr[1] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18675,14 +18423,14 @@ msgstr "Password utente"
 msgid "User profile"
 msgstr "Profilo utente"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18751,7 +18499,7 @@ msgstr "Utente aggiornato"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "L'utente con ID \"%1$s\" non è disponibile."
@@ -19067,14 +18815,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19084,7 +18832,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19126,7 +18874,7 @@ msgstr "Il valore \"%1$s\" non è valido per il parametro \"grid_show\". Le scel
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "Il valore \"%1$s\" non è valido per il parametro \"grid_show\". Le scelte sono: \"%2$s\"."
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "Il valore \"%1$s\" è troppo lungo per il campo \"%2$s\" - %3$d caratteri. La lunghezza consentita è di %4$d caratteri."
@@ -19143,7 +18891,7 @@ msgstr "Statistiche della Value Cahce. Opzioni valide: total, free, pfree, used
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Mappa valori"
 
@@ -19186,11 +18934,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "Valore di qualsiasi Windows performance counter. Restituisce integer, float, string o testo (a seconda della richiesta)"
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19237,7 +18986,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19324,7 +19073,7 @@ msgstr "Il nome visibile non può esser vuoto se il nome host è assente."
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "M"
@@ -19341,7 +19090,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Attenzione"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19350,7 +19099,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Siamo spiacenti, il numero massimo possibile di elementi da conservare è stato raggiunto.Siamo spiacenti, il numero massimo possibile di elementi da conservare è stato raggiunto."
 
@@ -19366,7 +19115,7 @@ msgstr "Siamo spiacenti, il numero massimo possibile di elementi da conservare �
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web"
 
@@ -19378,7 +19127,7 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Monitoraggio web"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr "Scenario web"
 
@@ -19393,27 +19142,27 @@ msgstr "Lo scenario web \"%1$s\" esiste già sull'host \"%2$s\"."
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Lo scenario Web \"%1$s\" esiste già."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "Scenario web aggiunto"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Scenario web rimosso"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Scenario web disabilitato"
 msgstr[1] "Scenario web disabilitato"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Scenario web abilitato"
 msgstr[1] "Scenari web abilitati"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "Scenario web aggiornato"
 
@@ -19435,7 +19184,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Mer"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Mercoledì"
 
@@ -19446,7 +19195,7 @@ msgstr "Mercoledì"
 msgid "Weekly"
 msgstr "Per settimane"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19462,12 +19211,12 @@ msgstr "Benvenuto a"
 msgid "When active"
 msgstr "Quando attivo"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19662,6 +19411,10 @@ msgstr "Y-m-d H:i"
 msgid "Y-m-d H:i:s"
 msgstr "Y-m-d H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr "Y1"
@@ -19723,7 +19476,7 @@ msgstr "Per anni"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19780,18 +19533,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19803,9 +19550,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Non hai i permessi per eseguire questa operazione."
 
@@ -19921,24 +19665,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr "è previsto un booleano"
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "E' prevista una stringa di caratteri"
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19947,37 +19695,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr "è previsto un numero"
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr "un numero è troppo grande"
@@ -19998,28 +19746,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr "è previsto un orario"
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr "è previsto un periodo di tempo"
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr "è prevista un'unità di tempo"
@@ -20067,7 +19816,7 @@ msgstr "tutti"
 msgid "all media"
 msgstr "tutti i supporti"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20075,42 +19824,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "è previsto un array di dati"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20120,7 +19864,7 @@ msgid "an empty string is expected"
 msgstr "è prevista una stringa vuota"
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr "E' previsto un numero pari di caratteri esadecimali"
 
@@ -20128,11 +19872,15 @@ msgstr "E' previsto un numero pari di caratteri esadecimali"
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20293,14 +20041,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20330,19 +20072,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20362,14 +20096,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20377,7 +20111,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "non può essere vuoto"
@@ -20390,7 +20124,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20424,7 +20158,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20442,7 +20176,8 @@ msgid "configure"
 msgstr "configura"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20471,7 +20206,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20533,7 +20268,7 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20555,13 +20290,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20587,7 +20322,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20624,6 +20360,10 @@ msgstr "l'espressione e' vuota"
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20670,7 +20410,7 @@ msgstr "Impostazioni di housekeeping globali"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20711,6 +20451,11 @@ msgstr "icona"
 msgid "image"
 msgstr "immagine"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "in"
@@ -20751,15 +20496,19 @@ msgstr "Conteggio elemento errato"
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "Sintassi non corretta in \"%1$s\""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20787,7 +20536,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr "Intervallo di indirizzi non valido \"%1$s\""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr "Sequenza di byte non valida in UTF-8"
 
@@ -20816,27 +20565,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr "Periodo di storicizzazione History non valido"
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr "regular expression non valida"
 
@@ -20864,7 +20613,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr "non è racchiuso in {} o è malformato"
 
@@ -20950,12 +20699,12 @@ msgstr "regola discovery di basso-livello"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -21014,7 +20763,7 @@ msgstr "corrispondenze"
 msgid "max"
 msgstr "max"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21054,7 +20803,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr "lunghezza carattari minima è %1$s"
@@ -21081,8 +20830,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21097,27 +20846,14 @@ msgstr "deve essere un utente LDAP valido"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "deve essere tra \"%1$s\" e \"%2$s\""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21145,6 +20881,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21155,7 +20899,7 @@ msgstr ""
 msgid "name"
 msgstr "nome"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "nuovo"
 
@@ -21290,7 +21034,7 @@ msgstr "output"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21325,24 +21069,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21370,11 +21118,11 @@ msgstr ""
 msgid "regular expression"
 msgstr "regular expression"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21386,15 +21134,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21442,7 +21190,7 @@ msgstr ""
 msgid "short description"
 msgstr "breve descrizione"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21461,15 +21209,15 @@ msgstr "breve descrizione"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr "dovrebbe essere vuoto"
 
@@ -21485,31 +21233,31 @@ msgstr "mostra mappature icone"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21517,11 +21265,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21537,8 +21285,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21549,7 +21297,7 @@ msgstr ""
 msgid "tag"
 msgstr "tag"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21558,13 +21306,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "L'ID template \"%1$s\" è passato %2$s volte"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21573,20 +21325,20 @@ msgstr "L'ID template \"%1$s\" è passato %2$s volte"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "il parametro \"%1$s\" è mancante"
@@ -21618,39 +21370,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21664,7 +21416,7 @@ msgstr "trigger"
 msgid "trigger does not allow manual closing"
 msgstr "il trigger non permette la chiusura manuale"
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21676,26 +21428,26 @@ msgstr "trigger prototipo non può essere spostato in un altro template o host"
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr "trigger con collegamenti non può essere spostato ad un altro template o host"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "digita qui per cercare"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21703,11 +21455,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21724,10 +21476,10 @@ msgstr "fine della key non prevista"
 msgid "unexpected end of macro"
 msgstr "Fine della macro non valida"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21737,11 +21489,12 @@ msgstr "Fine della macro non valida"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr "parametro inaspettato \"%1$s\""
@@ -21767,8 +21520,8 @@ msgstr "valore testo non previsto \"%1$s\""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21793,6 +21546,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr "numero versione non supportata"
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21808,7 +21565,7 @@ msgstr "numero versione non supportata"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21828,11 +21585,11 @@ msgstr "numero versione non supportata"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "valore"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21850,76 +21607,85 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr "valore %1$s già esistente"
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr "valore troppo lungo"
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21931,18 +21697,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr "il valore deve essere uno di %1$s"
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21951,7 +21715,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21964,11 +21728,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21985,7 +21749,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/ja/LC_MESSAGES/frontend.po b/ui/locale/ja/LC_MESSAGES/frontend.po
index d63a5343701..5e5da154d3a 100644
--- a/ui/locale/ja/LC_MESSAGES/frontend.po
+++ b/ui/locale/ja/LC_MESSAGES/frontend.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
-"PO-Revision-Date: 2021-09-11 16:40+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
+"PO-Revision-Date: 2021-10-17 13:40+0300\n"
 "Last-Translator: Atsushi <a.tanaka77@gmail.com>\n"
 "Language-Team: Zabbix\n"
 "Language: ja\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.5.1.3\n"
 "X-Poedit-Basepath: ../../\n"
-"X-POOTLE-MTIME: 1631371248.000000\n"
+"X-POOTLE-MTIME: 1634470859.000000\n"
 
 #: include/classes/db/MysqlDbBackend.php:70
 #: include/classes/db/OracleDbBackend.php:142
@@ -93,7 +93,7 @@ msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d 日"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -171,7 +171,7 @@ msgstr[0] "メッセージ%1$s件"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -183,7 +183,7 @@ msgid "%1$s of %2$s element in problem state"
 msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "%2$s台中%1$s台の要素で障害発生中"
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -213,13 +213,13 @@ msgstr[0] "リトライ残り%1$s回"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s秒"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "%1$s文字入力可"
@@ -238,13 +238,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$sの深刻度は%2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$sは読み込み専用です"
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -372,7 +372,7 @@ msgstr "APIアクセス"
 msgid "API methods"
 msgstr "APIメソッド"
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr "APIトークン"
 
@@ -430,10 +430,6 @@ msgstr "APIトークン"
 msgid "Abscissa"
 msgstr "横座標"
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr "許容できるSLA"
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "アクセスは拒否されました"
@@ -476,7 +472,7 @@ msgstr "サービスへのアクセス"
 msgid "Ack"
 msgstr "確認済"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "障害確認"
 
@@ -484,7 +480,7 @@ msgstr "障害確認"
 msgid "Acknowledge problems"
 msgstr "障害の確認"
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "確認済"
@@ -497,7 +493,7 @@ msgstr "確認済障害イベント"
 msgid "Acknowledged RESOLVED events"
 msgstr "確認済の解決済イベント"
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -524,9 +520,9 @@ msgstr "確認済の解決済イベント"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -583,7 +579,7 @@ msgstr "アクション\"%1$s\"はすでに存在しています。"
 msgid "Action \"%1$s\" no operations defined."
 msgstr "アクション\"%1$s\"に実行内容が設定されていません。"
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr "アクション\"%2$s\"はユーザーの役割\"%1$s\"に使用てきません。"
@@ -592,7 +588,7 @@ msgstr "アクション\"%2$s\"はユーザーの役割\"%1$s\"に使用てき�
 msgid "Action added"
 msgstr "アクションを追加しました"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr "アクションクラス%1$sは%2$sクラスを拡張してください。"
@@ -639,8 +635,8 @@ msgstr "アクションを更新しました"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "アクション"
@@ -707,7 +703,7 @@ msgstr "設定有効期間の終了日時"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -718,7 +714,7 @@ msgstr "設定有効期間の終了日時"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -741,9 +737,9 @@ msgstr "設定有効期間の終了日時"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -813,7 +809,7 @@ msgstr "設定有効期間の終了日時"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "追加"
 
@@ -821,11 +817,11 @@ msgstr "追加"
 msgid "Add (message type limit reached)"
 msgstr "追加 (メッセージタイプのリミットに到達)"
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "新しいウィジェットを追加"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "子の要素を追加"
 
@@ -833,7 +829,7 @@ msgstr "子の要素を追加"
 msgid "Add child service"
 msgstr "子サービスの追加"
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr "子サービスの追加"
 
@@ -850,7 +846,7 @@ msgstr "ホストを追加"
 msgid "Add missing"
 msgstr "未設定時に追加"
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "複数のマップを追加"
 
@@ -872,7 +868,7 @@ msgstr "新しいオーバーライドの追加"
 msgid "Add page"
 msgstr "ページの追加"
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr "親サービスの追加"
 
@@ -924,12 +920,12 @@ msgstr "ユーザーグループを追加"
 msgid "Add widget"
 msgstr "ウィジェットの追加"
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr "追加しました"
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -939,7 +935,7 @@ msgstr "%1$sを追加しました"
 msgid "Additional rule"
 msgstr "追加のルール"
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr "追加のルール"
 
@@ -952,7 +948,7 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "管理"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr "高度な設定"
 
@@ -974,7 +970,7 @@ msgstr "表示期間"
 msgid "Age less than %1$s"
 msgstr "表示期間 %1$s"
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1046,7 +1042,7 @@ msgstr "グリッドに揃える"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "すべて"
 
@@ -1064,7 +1060,7 @@ msgstr "すべてのグループ"
 msgid "All hosts"
 msgstr "すべてのホスト"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "すべてのリンクに\"名前\"と\"URL\"を設定する必要があります"
 
@@ -1082,7 +1078,7 @@ msgstr "すべての障害"
 msgid "All problems if tag values match"
 msgstr "タグの値が一致したすべての障害"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr "すべてのサービス"
 
@@ -1195,15 +1191,15 @@ msgstr "アプリケーションエラー。"
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "適用"
 
@@ -1221,7 +1217,7 @@ msgstr "メンテナンス待ち"
 msgid "Apr"
 msgstr "4月"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "4月"
 
@@ -1249,9 +1245,9 @@ msgstr "エリアタイプ"
 msgid "Arithmetic"
 msgstr "計算"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
-msgstr ""
+msgstr "そのまま"
 
 #: include/views/monitoring.history.php:102
 msgid "As plain text"
@@ -1296,7 +1292,7 @@ msgstr "開始時刻 (時:分)"
 msgid "At least one UI element must be checked."
 msgstr "少なくとも1つのUI要素をチェックしてください。"
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr "ユーザーの役割\"%1$s\"のために少なくとも1つのUI要素を有効にしてください。"
@@ -1305,7 +1301,7 @@ msgstr "ユーザーの役割\"%1$s\"のために少なくとも1つのUI要素�
 msgid "At least one action is mandatory."
 msgstr "少なくとも1つのアクションが必要です。"
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1317,6 +1313,11 @@ msgstr "少なくとも1人の有効なユーザーを役割\"%1$s\"と共に指
 msgid "At least one host group or host must be selected."
 msgstr "少なくとも1つのホストグループまたはホストが選択されている必要があります。"
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr "少なくとも1つのホストかテンプレートを指定する必要があります。"
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1328,7 +1329,7 @@ msgstr "少なくとも1つ以上のメンテナンス期間を作成する必�
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr "少なくともMySQL、PostgreSQL、Oracleのうち1つ以上をサポートする必要があります。"
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr "少なくとも1つ以上の実行内容が選択されている必要があります。"
 
@@ -1384,7 +1385,7 @@ msgstr "監査設定"
 msgid "Aug"
 msgstr "8月"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "8月"
 
@@ -1397,7 +1398,7 @@ msgstr "認証トークン"
 msgid "AuthN requests"
 msgstr "AuthNリクエスト"
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1474,7 +1475,7 @@ msgstr "自動ログアウト"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1489,7 +1490,7 @@ msgstr "アイコンの自動マッピング"
 msgid "Automatic icon selection"
 msgstr "アイコンの自動選択"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1541,7 +1542,7 @@ msgstr "収集間隔内の仮想ディスクへの未処理の書き込みリク
 msgid "Avoid easy-to-guess passwords"
 msgstr "推測されやすいパスワードの回避"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr "軸"
 
@@ -1604,7 +1605,7 @@ msgstr "ビット単位関数"
 msgid "Blocked"
 msgstr "ブロックしました"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "Blue"
 
@@ -1658,11 +1659,11 @@ msgstr "両方のパスワードが一致している必要があります。"
 msgid "Bottom"
 msgstr "下"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "前面へ"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "最前面へ"
 
@@ -1688,7 +1689,7 @@ msgstr "証明書"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1733,8 +1734,8 @@ msgstr "CRLF"
 msgid "CSV to JSON"
 msgstr "CSVからJSON"
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr "CUIDで指定してください"
 
@@ -1743,7 +1744,7 @@ msgstr "CUIDで指定してください"
 msgid "Calculated"
 msgstr "計算"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr "カレンダー"
 
@@ -1768,7 +1769,7 @@ msgstr "コールバック"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1781,8 +1782,8 @@ msgstr "コールバック"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -1812,7 +1813,7 @@ msgstr "アクションを追加できません"
 msgid "Cannot add correlation"
 msgstr "相関関係を追加できません"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr "ダッシュボードページが追加できません： 最大数%1$dのダッシュボードページが追加されています。"
@@ -1822,7 +1823,7 @@ msgstr "ダッシュボードページが追加できません： 最大数%1$d�
 msgid "Cannot add dependency from a host to a template."
 msgstr "ホストからテンプレートへの依存関係は作成できません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1853,8 +1854,8 @@ msgid "Cannot add host prototype"
 msgstr "ホストのプロトタイプを追加できません"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "イメージを追加できません"
 
@@ -1945,15 +1946,15 @@ msgstr "ユーザーを追加できません"
 msgid "Cannot add user group"
 msgstr "ユーザーグループを追加できません"
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Webシナリオを追加できません"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr "ウィジェットが追加できません: ダッシュボードの空き領域が足りません。"
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr "削除できません"
@@ -1973,33 +1974,29 @@ msgstr "LDAPサーバーにバインドできません。"
 msgid "Cannot build expression tree: %1$s."
 msgstr "条件式ツリーを作成できません： %1$s。"
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr "自身の役割のユーザーの種類を変更できません。"
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "ヒストリを削除できません"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr "ヒストリを削除できません：選択したアイテムの少なくとも1つが監視対象ホストに属していません"
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "グラフのプロトタイプを複製できません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "ホストのプロトタイプを複製できません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "アイテムのプロトタイプを複製できません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "トリガーのプロトタイプを複製できません。"
 
@@ -2025,7 +2022,7 @@ msgid "Cannot copy graph"
 msgid_plural "Cannot copy graphs"
 msgstr[0] "グラフをコピーできません"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "アイテムをコピーできません"
@@ -2075,8 +2072,8 @@ msgstr "アイコンのマッピングを作成できません"
 msgid "Cannot create scheduled report"
 msgstr "定期レポートを作成できません"
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr "サービス\"%1$s\"の作成ができません：%2$s。"
@@ -2104,7 +2101,7 @@ msgstr "Zabbixユーザー\"%1$s\"を削除できません。ユーザーを無�
 msgid "Cannot delete action"
 msgstr "アクションを削除できません"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr "割り当てられたユーザーの役割\"%1$s\"が削除できません。"
@@ -2165,7 +2162,7 @@ msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one
 msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group."
 msgstr[0] "メンテナンス\"%1$s\"は少なくとも1つのホストかホストグループが必要なのでホストを削除できません。"
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2175,11 +2172,11 @@ msgstr[0] "メンテナンス\"%1$s\"は少なくとも1つのホストかホス
 msgid "Cannot delete host prototypes"
 msgstr "ホストのプロトタイプを削除できません"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "アイコンのマッピングを削除できません"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "イメージを削除できません"
 
@@ -2204,7 +2201,7 @@ msgstr "アイテムのプロトタイプを削除できません"
 msgid "Cannot delete item prototypes"
 msgstr "アイテムのプロトタイプを削除できません"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "アイテムを削除できません"
 
@@ -2232,7 +2229,7 @@ msgid "Cannot delete proxy"
 msgid_plural "Cannot delete proxies"
 msgstr[0] "プロキシを削除できません"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr "読み込み専用のユーザーの役割\"%1$s\"を削除できません。"
@@ -2252,7 +2249,7 @@ msgid "Cannot delete script"
 msgid_plural "Cannot delete scripts"
 msgstr[0] "スクリプトを削除できません"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "スクリプトを削除できません。スクリプト\"%1$s\"は実行するアクション\"%2$s\"に使用されています。"
@@ -2266,8 +2263,8 @@ msgid "Cannot delete service"
 msgid_plural "Cannot delete services"
 msgstr[0] "サービスを削除できません"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr "サービス\"%1$s\"の削除ができません：%2$s。"
@@ -2296,7 +2293,7 @@ msgstr "テンプレートのアイテムのプロトタイプを削除できま
 msgid "Cannot delete templated item."
 msgstr "テンプレートのアイテムを削除できません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "テンプレートのアイテムを削除できません。"
 
@@ -2346,7 +2343,7 @@ msgid "Cannot delete user role"
 msgid_plural "Cannot delete user roles"
 msgstr[0] "ユーザーの役割を削除できません"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Webシナリオを削除できません"
 
@@ -2376,7 +2373,7 @@ msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] "ホストを無効にできません"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "アイテムを無効にできません"
@@ -2402,7 +2399,7 @@ msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] "トリガーを無効にできません"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Webシナリオを無効にできません"
@@ -2443,7 +2440,7 @@ msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] "ホストを有効にできません"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "アイテムを有効にできません"
@@ -2469,7 +2466,7 @@ msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] "トリガーを有効にできません"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Webシナリオを有効にできません"
@@ -2482,7 +2479,7 @@ msgstr "条件式を評価できません"
 msgid "Cannot execute script."
 msgstr "スクリプトを実行できません。"
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr "マクロを展開できません。"
 
@@ -2516,8 +2513,8 @@ msgstr "マップ\"%2$s\"で使用されているホスト\"%1$s\"が見つか�
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "\"%4$s\"上のディスカバリルール\"%3$s\"のホストのプロトタイプ\"%2$s\"のためのホストグループ\"%1$s\"が見つかりません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2615,27 +2612,23 @@ msgstr "\"%3$s\"上のアイテム\"%2$s\"で使用されている値のマッ�
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "\"%4$s\"上のディスカバリルール\"%3$s\"のアイテムのプロトタイプ\"%2$s\"で使用されている値のマッピング\"%1$s\"がみつかりません。"
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr "サービスツリーをフォーマットできません。サービスリンク内の論理構造をチェックしてください。"
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "テンプレート表示名に空白は設定できません。"
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
-msgstr ""
+msgstr "ユーザーの役割\"%1$s\"の\"%3$s\"を%4$dに設定している間はデフォルト以外の\"%2$s\"ルールを設定できません。"
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
-msgstr ""
+msgstr "ユーサーの役割\"%1$s\"のルール\"%2$s\"内に空のタグがある間は空ではないタグの値を設定できません。"
 
 #: include/classes/import/importers/CTemplateImporter.php:253
 #: include/classes/import/importers/CTemplateImporter.php:405
@@ -2644,7 +2637,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] "テンプレート\"%1$s\"をインポートできません。リンクされているテンプレート\"%2$s\"が存在しません。"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "トリガー条件式を追加できません"
 
@@ -2658,7 +2651,7 @@ msgid "Cannot link template."
 msgstr "テンプレートをリンクできません。"
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2689,17 +2682,17 @@ msgstr "テンプレートの表示名を一括更新できません。"
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr "テンプレートIDの重複のためリンク%1$sを作成できません。"
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "where句がないため\"%1$s\"テーブルにdelete文を実行できません。"
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "値がないため\"%1$s\"テーブルにupdate文を実行できません。"
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "where句がないため\"%1$s\"テーブルにupdate文を実行できません。"
@@ -2726,7 +2719,7 @@ msgstr "YAML: %1$sが読み込めません。"
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "レスポンスを読めません。Zabbixサーバー\"%1$s\"との接続を確認してください。"
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "ゲストユーザーの名前は変更できません。"
 
@@ -2745,7 +2738,7 @@ msgstr "ウィジェットを保存できません \"%1$s\"。"
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "コマンドを送信できません。Zabbixサーバー\"%1$s\"との接続を確認してください。"
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr "リクエストが送信できません"
 
@@ -2785,12 +2778,12 @@ msgstr "無効の状態のインベントリのフィールドは設定できま
 msgid "Cannot set session cookie."
 msgstr "セッションクッキーを設定できません。"
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
-msgstr ""
+msgstr "サービス\"%1$s\"は\"propagation_value\"パラメータを指定せずに\"propagation_rule\"パラメータを指定できません。"
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr "このデバイスでは音声通知をサポートしません。"
 
@@ -2808,7 +2801,7 @@ msgid "Cannot unblock user"
 msgid_plural "Cannot unblock users"
 msgstr[0] "ユーザーのブロック解除ができません"
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Webシナリオのリンク削除と削除が行えません。"
 
@@ -2821,7 +2814,7 @@ msgstr "テンプレートのリンクを削除できません"
 msgid "Cannot unlink template."
 msgstr "テンプレートのリンクを削除できません。"
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr "トリガー\"%1$s\"のリンクを削除できません。ホストにリンクされたテンプレートのアイテムを使用しています。"
@@ -2874,11 +2867,6 @@ msgstr "ディスカバリされたアイテム\"%1$s\"の\"%2$s\"を更新で�
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "ディスカバリされたトリガー\"%1$s\"の\"%2$s\"を更新できません。"
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "イメージ\"%1$s\"の\"imagetype\"を更新できません。"
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2888,9 +2876,10 @@ msgstr "APIトークンを更新できません"
 msgid "Cannot update a discovered graph."
 msgstr "ディスカバリされたグラフを更新できません。"
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "ディスカバリされたホストグループを更新できません。"
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr "ディスカバリされたホストグループ\"%1$s\"を更新できません。"
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -2948,9 +2937,7 @@ msgstr "グラフのプロトタイプを更新できません"
 msgid "Cannot update group"
 msgstr "グループを更新できません"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "ディスカバリされたホスト\"%1$s\"のグループを更新できません。"
@@ -2972,13 +2959,13 @@ msgstr[0] "ホストのプロトタイプを更新できません"
 msgid "Cannot update hosts"
 msgstr "ホストを更新できません"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "アイコンのマッピングを更新できません"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "イメージを更新できません"
 
@@ -3031,12 +3018,12 @@ msgstr "ネットワークマップを更新できません"
 msgid "Cannot update proxy"
 msgstr "プロキシを更新できません"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "ディスカバリされたホスト\"%1$s\"のプロキシを更新できません。"
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr "読み込み専用のユーザーの役割\"%1$s\"を更新できません。"
@@ -3056,17 +3043,17 @@ msgstr "定期レポートを更新できません"
 msgid "Cannot update script"
 msgstr "スクリプトを更新できません"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr "スクリプトの範囲を更新できません。\"%1$s\"はアクション\"%2$s\"で使用されています。"
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr "サービス\"%1$s\"を更新できません：%2$s。"
@@ -3139,7 +3126,7 @@ msgstr[0] "ユーザーグループを更新できません"
 msgid "Cannot update user role"
 msgstr "ユーザーの役割を更新できません"
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Webシナリオを更新できません"
 
@@ -3239,8 +3226,8 @@ msgid "Character string not included"
 msgstr "文字列が含まれない"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr "文字"
 
@@ -3355,7 +3342,7 @@ msgstr "UDPサービスのパフォーマンスをチェック。サービスが
 msgid "Checks should be unique."
 msgstr "チェックは重複できません"
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr "子サービス"
 
@@ -3376,7 +3363,7 @@ msgstr "テンプレート%1$sに循環参照が存在します。"
 msgid "Circular template linkage is not allowed."
 msgstr "テンプレートの循環リンクは行えません。"
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr "アクション%2$sのためのクラス%1$sが見つかりません。"
@@ -3397,11 +3384,11 @@ msgstr "ヒストリとトレンドを削除"
 msgid "Clear when unlinking"
 msgstr "リンク削除時にクリア"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr "希望のサイズにクリックしてドラッグします。"
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr "クリックして表示または変更"
 
@@ -3416,7 +3403,7 @@ msgstr "時刻"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3431,7 +3418,7 @@ msgstr "時刻"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "複製"
 
@@ -3442,8 +3429,8 @@ msgstr "複製"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "閉じる"
 
@@ -3454,13 +3441,13 @@ msgstr "閉じる"
 msgid "Close expression constructor"
 msgstr "条件式ビルダーを閉じる"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "新しいイベントのクローズ"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "古いイベントのクローズ"
 
@@ -3473,8 +3460,8 @@ msgid "Close problems"
 msgstr "障害のクローズ"
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "縮小"
 
@@ -3491,10 +3478,10 @@ msgstr "サイドバーの縮小"
 msgid "Color"
 msgstr "色"
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
-msgstr ""
+msgstr "色\"%1$s\"の設定が正しくありません: 16進数のカラーコードを指定してください(6桁)。"
 
 #: include/views/js/monitoring.sysmaps.js.php:786
 msgid "Color (OK)"
@@ -3557,7 +3544,7 @@ msgstr "圧縮"
 msgid "Concurrent sessions"
 msgstr "並列実行数"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3568,17 +3555,12 @@ msgstr "トリガー条件式"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "アクション\"%1$s\"の条件\"%2$s\"は式\"%3$s\"内で使用されていません。"
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "相関関係\"%1$s\"の条件\"%2$s\"は式\"%3$s\"内で使用されていません。"
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "ディスカバリルール\"%1$s\"の条件\"%2$s\"は式\"%3$s\"内で使用されていません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr "\"%1$s\"を上書きするための条件\"%2$s\"が式\"%3$s\"内で使用されていません。"
@@ -3588,17 +3570,12 @@ msgstr "\"%1$s\"を上書きするための条件\"%2$s\"が式\"%3$s\"内で使
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "アクション\"%1$s\"の式\"%3$s\"内で使用されている条件\"%2$s\"は設定されていません。"
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "相関関係\"%1$s\"の式\"%3$s\"で使用されている条件\"%2$s\"は設定されていません。"
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "ディスカバリルール\"%1$s\"の式\"%3$s\"内で使用されている条件\"%2$s\"は設定されていません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr "\"%1$s\"を上書きするための式\"%3$s\"内の条件\"%2$s\"は定義されていません。"
@@ -3614,7 +3591,7 @@ msgstr "実行条件"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "設定"
 
@@ -3677,7 +3654,7 @@ msgstr "ホストの設定"
 msgid "Configuration of housekeeping"
 msgstr "データの保存期間設定"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "アイコンのマッピングの設定"
@@ -3784,7 +3761,7 @@ msgstr "確認テキスト"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "おめでとうございます！Webインターフェースのインストールが終了しました。"
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3888,7 +3865,7 @@ msgstr "連絡先"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3948,7 +3925,7 @@ msgstr "含む"
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr "コンテンツコントロール"
 
@@ -3987,8 +3964,8 @@ msgstr "座標"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "コピー"
 
@@ -3997,12 +3974,11 @@ msgstr "コピー"
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "相関関係"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "相関関係\"%1$s\"はすでに存在しています。"
@@ -4026,16 +4002,6 @@ msgid "Correlation enabled"
 msgid_plural "Correlations enabled"
 msgstr[0] "相関関係を有効にしました"
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "相関関係がパラメータに設定されていません: %1$s"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "相関関係名は必須項目です。"
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr "相関関係ルール"
@@ -4044,14 +4010,10 @@ msgstr "相関関係ルール"
 msgid "Correlation updated"
 msgstr "相関関係を更新しました"
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "イメージを保存できませんでした!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "カウント"
 
@@ -4115,11 +4077,11 @@ msgstr "相関関係の作成"
 msgid "Create dashboard"
 msgstr "ダッシュボードの作成"
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr "依存するディスカバリルールの作成"
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr "依存アイテムの作成"
 
@@ -4236,7 +4198,7 @@ msgstr "マップの作成"
 msgid "Create media type"
 msgstr "メディアタイプの作成"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "新規作成"
 
@@ -4260,7 +4222,7 @@ msgstr "サービスの作成"
 msgid "Create template"
 msgstr "テンプレートの作成"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "トリガーの作成"
 
@@ -4423,7 +4385,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "DNS名"
@@ -4435,11 +4397,11 @@ msgstr "DNS名"
 msgid "Daily"
 msgstr "毎日"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "Dark"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4460,8 +4422,8 @@ msgstr "ダッシュボード\"%1$s\"はすでに存在します。"
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr "ダッシュボード\"%1$s\"はレポート\"%2$s\"で使用しています。"
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr "ダッシュボードを作成しました"
 
@@ -4483,9 +4445,9 @@ msgstr "ダッシュボードのプロパティ"
 msgid "Dashboard sharing"
 msgstr "ダッシュボードの共有"
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr "ダッシュボードを更新しました"
 
@@ -4509,7 +4471,7 @@ msgstr "ID\"%1$s\"のダッシュボードは使用できません。"
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr "ダッシュボード"
 
@@ -4537,7 +4499,7 @@ msgstr "データの概要"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr "データセット"
 
@@ -4679,7 +4641,7 @@ msgstr "曜日"
 msgid "Days"
 msgstr "日"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "デバッグ"
 
@@ -4693,26 +4655,26 @@ msgstr "デバッグモード"
 msgid "Dec"
 msgstr "12月"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "12月"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr "小数点以下桁数"
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
-msgstr ""
+msgstr "深刻度を減らす"
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "標準"
 
@@ -4805,7 +4767,7 @@ msgstr "遅延時間"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4829,8 +4791,8 @@ msgstr "遅延時間"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "削除"
 
@@ -4855,11 +4817,11 @@ msgstr "テンプレートとデータを削除しますか？(警告: リンク
 msgid "Delete current action?"
 msgstr "現在のアクションを削除しますか？"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "現在の相関関係を削除しますか？"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr "ダッシュボードを削除しますか？"
 
@@ -4903,7 +4865,7 @@ msgstr "アイテムのプロトタイプを削除しますか？"
 msgid "Delete item?"
 msgstr "アイテムを削除しますか？"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "選択した要素間のリンクを削除しますか？"
 
@@ -4959,7 +4921,7 @@ msgstr "選択したダッシュボードを削除しますか？"
 msgid "Delete selected discovery rules?"
 msgstr "選択したディスカバリルールを削除しますか？"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "選択した要素を削除しますか？"
 
@@ -5064,7 +5026,7 @@ msgstr "選択したサービスを削除しますか？"
 msgid "Delete selected services?"
 msgstr "選択したサービスを削除しますか？"
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "選択した図形を削除しますか？"
 
@@ -5108,7 +5070,7 @@ msgstr "トリガーを削除しますか？"
 msgid "Delete web scenario?"
 msgstr "Webシナリオを削除しますか？"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr "削除しました"
 
@@ -5153,7 +5115,7 @@ msgstr "拒否リスト"
 msgid "Dependencies"
 msgstr "依存関係"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "依存先"
 
@@ -5161,7 +5123,7 @@ msgstr "依存先"
 msgid "Dependent item"
 msgstr "依存アイテム"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5171,7 +5133,7 @@ msgstr "依存先"
 msgid "Deployment status"
 msgstr "配布ステータス"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5204,7 +5166,7 @@ msgid "Description"
 msgstr "説明"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5370,10 +5332,10 @@ msgstr "選択したWebシナリオを無効にしますか？"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5456,7 +5418,7 @@ msgid "Discovery by proxy"
 msgstr "プロキシによるディスカバリ"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "ディスカバリチェック"
 
@@ -5468,7 +5430,7 @@ msgstr "ディスカバリチェック"
 msgid "Discovery list"
 msgstr "ディスカバリリスト"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "ディスカバリオブジェクト"
 
@@ -5500,7 +5462,7 @@ msgstr "VMware仮想マシンのファイルシステムのディスカバリ、
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr "VMware仮想マシンのディスカバリ、<url> - VMwareサービスURL。JSONで返す"
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5508,12 +5470,12 @@ msgstr "VMware仮想マシンのディスカバリ、<url> - VMwareサービスU
 msgid "Discovery rule"
 msgstr "ディスカバリルール"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "ディスカバリルール\"%1$s\"は\"%2$s\"にすでに存在します (他のテンプレートからの継承)。"
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "ディスカバリルール\"%1$s\"は\"%2$s\"にすでに存在します。"
@@ -5526,7 +5488,7 @@ msgstr "ディスカバリルール\"%1$s\"は\"%2$s\"にすでに存在しま�
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "ディスカバリルール\"%1$s\"はすでに存在します。"
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr "ディスカバリルール\"%1$s\"はマスターアイテムがないとコピーできません。"
@@ -5564,7 +5526,7 @@ msgstr "ディスカバリのルールを更新しました"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5575,7 +5537,7 @@ msgstr "ディスカバリルール"
 msgid "Discovery rules deleted"
 msgstr "ディスカバリのルールを削除しました"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "ディスカバリのステータス"
@@ -5612,10 +5574,11 @@ msgid "Display stacked graph"
 msgstr "積算グラフ表示"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "%2$s件のうち%1$s件を表示しています"
@@ -5625,7 +5588,7 @@ msgstr "%2$s件のうち%1$s件を表示しています"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "%3$s件のうち%1$sから%2$s件までを表示しています"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr "表示オプション"
 
@@ -5647,7 +5610,7 @@ msgstr "ヒストリを保存しない"
 msgid "Do not keep trends"
 msgstr "トレンドを保存しない"
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "条件式を置き換えますか？"
 
@@ -5703,7 +5666,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Down"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr "イメージのダウンロード"
 
@@ -5711,7 +5674,7 @@ msgstr "イメージのダウンロード"
 msgid "Download the configuration file"
 msgstr "設定ファイルのダウンロード"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5730,18 +5693,6 @@ msgstr "グラフの形式"
 msgid "Draw style"
 msgstr "グラフの形式"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "相関関係\"%3$s\"の\"%1$s\"の値\"%2$s\"が重複しています。"
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr "相関関係の\"%1$s\"の値\"%2$s\"が重複しています。"
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5752,12 +5703,7 @@ msgstr "マップのための\"name\"の値\"%1$s\"が重複しています。"
 #: include/classes/api/services/CMap.php:1285
 #, c-format
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
+msgstr "マップ\"%2$s\"のユーザーグループ内の\"usrgrpid\" \"%1$s\"が重複しています。"
 
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
@@ -5810,7 +5756,7 @@ msgstr "ダイナミックアイテム"
 msgid "Dynamic items"
 msgstr "ダイナミックアイテム"
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "各URLの名前は重複できません。同じURL名が使用されていないか確認してください"
 
@@ -5819,11 +5765,11 @@ msgid "Each item"
 msgstr "アイテムごと"
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5837,8 +5783,8 @@ msgstr "アイテムごと"
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "変更"
 
@@ -5854,11 +5800,11 @@ msgstr "マップの変更"
 msgid "Edit operation"
 msgstr "実行内容の変更"
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr "ツリー要素の変更"
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "トリガーの変更"
 
@@ -5874,7 +5820,7 @@ msgstr "実効値"
 #: include/classes/api/managers/CHistoryManager.php:1240
 #, c-format
 msgid "Elasticsearch URL is not set for type: %1$s."
-msgstr ""
+msgstr "ElasticsearchのURLが設定されていません。タイプ：%1$s"
 
 #: include/classes/helpers/CElasticsearchHelper.php:86
 #: include/classes/helpers/CElasticsearchHelper.php:185
@@ -5918,21 +5864,17 @@ msgstr "Webシナリオ\"%1$s\"のためのSSL秘密鍵ファイルが空白で�
 msgid "Empty color."
 msgstr "色が指定されていません。"
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "相関関係IDが空白です。"
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "アクション\"%1$s\"のフィルター条件式IDが空白です。"
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "ディスカバリルール\"%1$s\"のフィルター条件式IDが空白です。"
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "ディスカバリルール\"%1$s\"のフィルター条件マクロが空白です。"
@@ -5948,25 +5890,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr "アクション\"%1$s\"のフィルター条件タイプが空白です。"
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -5976,14 +5912,6 @@ msgstr "入力パラメータが空白です"
 msgid "Empty map ID."
 msgstr "マップIDが空白です。"
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "メディアタイプIDが空白です。"
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "パラメータが空白です"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6149,7 +6077,7 @@ msgstr "トラッピングの有効化"
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6160,7 +6088,7 @@ msgstr "トラッピングの有効化"
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6203,7 +6131,7 @@ msgid "English (en_US)"
 msgstr "英語 (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6219,7 +6147,7 @@ msgstr "UUID \\\"%1$s\\\"のエントリはすでに存在します。"
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6238,19 +6166,19 @@ msgstr "等しい"
 msgid "Error"
 msgstr "エラー"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "テーブル\"%1$s\"の検索リクエストに失敗しました。"
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr "エラーメッセージ"
 
 #: include/blocks.inc.php:643
 #, c-format
 msgid "Error! Unable to start Zabbix server due to unsupported %1$s database server version. Must be at least (%2$s)"
-msgstr ""
+msgstr "エラー！サポートされていないデータベースのバージョン%1$sなのでZabbixサーバーを起動できません。(%2$s)以上が必要です"
 
 #: include/classes/screens/CScreenHttpTestDetails.php:111
 #: include/classes/screens/CScreenHttpTestDetails.php:182
@@ -6270,7 +6198,7 @@ msgstr "イベントID"
 msgid "Event acknowledged"
 msgstr "障害確認のステータス"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6278,7 +6206,7 @@ msgid "Event correlation"
 msgstr "イベント相関関係"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "イベント相関関係ルール"
@@ -6313,11 +6241,11 @@ msgstr "イベントログの監視。ログ値を返す。"
 msgid "Event name"
 msgstr "イベント名"
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "イベントタグのペア"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "イベントタイプ"
 
@@ -6361,15 +6289,10 @@ msgstr "含めない"
 msgid "Exclude host groups"
 msgstr "除外するホストグループ"
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "実行"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "SQL実行エラー [%2$s]内の[%1$s]。"
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr "WMIクエリを実行して選択したすべてのオブジェクトをJSONドキュメントで返す"
@@ -6407,7 +6330,7 @@ msgstr "実行"
 msgid "Executed script"
 msgstr "実行するスクリプト"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "実行の確認"
 
@@ -6423,8 +6346,8 @@ msgid "Exists"
 msgstr "存在する"
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "展開"
 
@@ -6545,7 +6468,7 @@ msgstr "条件式"
 msgid "External check"
 msgstr "外部チェック"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6570,10 +6493,10 @@ msgstr "失敗"
 
 #: app/controllers/CControllerAuditLogList.php:192
 msgid "Failed login"
-msgstr ""
+msgstr "ログイン失敗"
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6584,26 +6507,26 @@ msgstr "ダッシュボードの作成に失敗しました"
 msgid "Failed to parse URL."
 msgstr "URLを解析できませんでした。"
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr "ダッシュボードページの貼り付けに失敗しました。"
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr "ウィジェットの貼り付けに失敗しました。"
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr "ダッシュボードの更新に失敗しました"
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr "ダッシュボードページのプロパティの変更に失敗しました。"
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr "ダッシュボードのプロパティの変更に失敗しました。"
 
@@ -6611,7 +6534,7 @@ msgstr "ダッシュボードのプロパティの変更に失敗しました。
 msgid "Failed to update template."
 msgstr "テンプレートの更新の失敗。"
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr "ウィジェットのプロパティの変更に失敗しました。"
 
@@ -6635,7 +6558,7 @@ msgstr "お気に入りのマップ"
 msgid "Feb"
 msgstr "2月"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "2月"
 
@@ -6657,10 +6580,9 @@ msgstr "フィールド\"%1$s\"はNULLに設定できません。"
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6671,13 +6593,6 @@ msgstr "フィールド\"%1$s\"は必須です。"
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "マップ\"%2$s\"のためのフィールド\"%1$s\"が設定されていません。"
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "メディアタイプ\"%2$s\"のためのフィールド\"%1$s\"が設定されていません。"
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6696,11 +6611,6 @@ msgstr "フィールド\"%1$s\"は整数値ではありません。"
 msgid "Field \"%1$s\" is not string."
 msgstr "フィールド\"%1$s\"は文字列ではありません。"
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "メディアタイプ\"%2$s\"のためのフィールド\"%1$s\"を指定してください。"
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6715,10 +6625,6 @@ msgstr "フィールド\"host\"は必須です。"
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr "ファイルのチェックサム計算。UNIXのcksumアルゴリズムで計算する。crc32の整数値かmd5とsha256の文字列値を返す"
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "ファイルフォーマットがサポートされていません。"
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr "ファイルの内容がありません"
@@ -6783,7 +6689,8 @@ msgstr "面"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6808,7 +6715,7 @@ msgstr "フィルター"
 msgid "Filter properties"
 msgstr "フィルターのプロパティ"
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr "フィルター結果"
 
@@ -6860,9 +6767,9 @@ msgstr "マップに合わせる"
 msgid "Fixed"
 msgstr "固定"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
-msgstr ""
+msgstr "固定ステータス"
 
 #: app/views/js/popup.massupdate.tmpl.js.php:81
 #: app/views/popup.lldoperation.php:124
@@ -6890,7 +6797,7 @@ msgstr "フォント"
 
 #: include/views/js/monitoring.sysmaps.js.php:541
 msgid "Font color"
-msgstr "フォントの色"
+msgstr "フォント色"
 
 #: include/views/js/monitoring.sysmaps.js.php:377
 #: include/views/js/monitoring.sysmaps.js.php:535
@@ -6911,12 +6818,12 @@ msgstr "式"
 msgid "Formula missing for action \"%1$s\"."
 msgstr "アクション\"%1$s\"の式が設定されていません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr "ディスカバリルール\"%1$s\"の式が設定されていません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr "上書き\"%1$s\"の式が設定されていません。"
@@ -6929,7 +6836,7 @@ msgstr "フランス語 (fr_FR)"
 msgid "Fri"
 msgstr "金"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "金曜"
 
@@ -7040,7 +6947,7 @@ msgstr "ホストから値を取得"
 msgid "Given expression is not a macro"
 msgstr "設定した条件式はマクロではありません"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr "グローバルな正規表現\"%1$s\"は存在しません。"
@@ -7054,7 +6961,7 @@ msgstr "グローバル値"
 msgid "Go back to %1$s"
 msgstr "%1$sに戻る"
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "次のページへ移動"
 
@@ -7092,7 +6999,7 @@ msgstr "ページ%1$sへ、現在のページです"
 msgid "Go to previous page, %1$s"
 msgstr "前のページ%1$sへ"
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7100,7 +7007,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "グラデーションライン"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7128,7 +7035,7 @@ msgstr "グラフ\"%1$s\"は\"%2$s\"にすでに存在します (アイテムは
 #: include/classes/api/services/CGraphGeneral.php:1135
 #, c-format
 msgid "Graph \"%1$s\" already exists on \"%2$s\" as a graph created from graph prototype."
-msgstr ""
+msgstr "グラフ\"%1$s\"はグラフプロトタイプとして作成されたグラフとして\"%2$s\"上に存在します。"
 
 #: include/classes/api/services/CGraphGeneral.php:1038
 #: include/classes/api/services/CGraphGeneral.php:1246
@@ -7159,7 +7066,7 @@ msgstr[0] "グラフをコピーしました"
 msgid "Graph deleted"
 msgstr "グラフを削除しました"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7196,8 +7103,8 @@ msgstr "グラフのプロトタイプを削除しました"
 msgid "Graph prototype updated"
 msgstr "グラフのプロトタイプを更新しました"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"のグラフのプロトタイプは使用できません。"
@@ -7231,8 +7138,8 @@ msgstr "グラフのタイプ"
 msgid "Graph updated"
 msgstr "グラフを更新しました"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"のグラフは使用できません。"
@@ -7263,7 +7170,7 @@ msgstr "\"%1$s\"の名前を持つグラフはグラフもしくはグラフの�
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "グラフ"
 
@@ -7284,12 +7191,12 @@ msgstr "グリッド"
 msgid "Group"
 msgstr "グループ"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "ホストのプロトタイプで使用されているためグループ\"%1$s\"は削除できません。"
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr "相関関係の条件で使用されているためグループ\"%1$s\"は削除できません。"
@@ -7462,11 +7369,11 @@ msgstr "ヘルプ"
 msgid "Hexadecimal to decimal"
 msgstr "16進数から10進数"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "非表示"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "デバッグを隠す"
 
@@ -7493,11 +7400,11 @@ msgstr "階層"
 msgid "High"
 msgstr "重度の障害"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr "High-contrast dark"
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr "High-contrast light"
 
@@ -7518,7 +7425,7 @@ msgstr "行を強調表示"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "ヒストリ"
 
@@ -7526,11 +7433,15 @@ msgstr "ヒストリ"
 msgid "History and trends compression"
 msgstr "ヒストリとトレンドの圧縮"
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr "圧縮が有効になっているのでヒストリのクリーンアップはサポートされません"
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr "ヒストリ削除"
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "ヒストリを削除しました"
 
@@ -7573,7 +7484,7 @@ msgstr "横"
 msgid "Horizontal align"
 msgstr "横位置"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7602,7 +7513,7 @@ msgstr "横位置"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7615,7 +7526,7 @@ msgstr[0] "ホスト"
 msgid "Host \"%1$s\" already exists."
 msgstr "ホスト\"%1$s\"はすでに存在しています。"
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7623,10 +7534,10 @@ msgstr "ホスト\"%1$s\"はすでに存在しています。"
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "ホスト\"%1$s\"にホストグループを設定してください。"
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
-msgstr ""
+msgstr "ホスト\"%1$s\"はプロキシ\"%2$s\"によって監視されています。"
 
 #: include/actions.inc.php:55
 msgid "Host IP"
@@ -7673,7 +7584,7 @@ msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] "ホストを有効にしました"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7687,25 +7598,25 @@ msgstr[0] "ホストを有効にしました"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "ホストグループ"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "ホストグループ\"%1$s\"はすでに存在しています。"
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "グローバルスクリプトに使用されているためホストグループ\"%1$s\"を削除できません。"
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
-msgstr ""
+msgstr "ホストグループ\"%1$s\"は組み込まれたグループなので削除できません。"
 
 #: include/views/js/monitoring.sysmaps.js.php:103
 msgid "Host group elements"
@@ -7715,10 +7626,10 @@ msgstr "ホストグループ内のホスト"
 msgid "Host group label type"
 msgstr "ホストグループのラベルタイプ"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"のホストグループは使用できません。"
@@ -7734,8 +7645,8 @@ msgstr "ID \"%1$s\"のホストグループは使用できません。"
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7809,7 +7720,7 @@ msgstr "ホスト名"
 msgid "Host networks"
 msgstr "ホストネットワーク"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7888,7 +7799,7 @@ msgstr "ホストの更新に失敗しました"
 msgid "Host updated"
 msgstr "ホストを更新しました"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"のホストは使用できません。"
@@ -7908,7 +7819,7 @@ msgstr "同じホスト名\"%1$s\"を持つホストがすでに存在します�
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "同じホストの表示名\"%1$s\"を持つホストがすでに存在します。"
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -7921,7 +7832,7 @@ msgstr "同じホストの表示名\"%1$s\"を持つホストがすでに存在�
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -7969,7 +7880,7 @@ msgstr "ホストを更新しました"
 msgid "Hours"
 msgstr "時間"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8009,7 +7920,7 @@ msgstr "IPアドレス"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IPアドレス"
@@ -8034,7 +7945,7 @@ msgstr "IPアドレスの範囲\"%1$s\"がアドレスの制限\"%2$s\"を超え
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8091,12 +8002,12 @@ msgstr "アイコンのハイライト"
 msgid "Icon map"
 msgstr "アイコンのマッピング"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr "アイコンのマッピング\"%1$s\"はすでに存在します。"
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "アイコンのマッピング\"%1$s\"を削除できません。マップ\"%2$s\"に使用されています。"
@@ -8109,18 +8020,18 @@ msgstr "アイコンのマッピングを作成しました"
 msgid "Icon map deleted"
 msgstr "アイコンのマッピングを削除しました"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "アイコンのマッピングを更新しました"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "アイコンのマッピング"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"のアイコンは使用できません。"
@@ -8157,18 +8068,18 @@ msgstr "システムの識別文字列。文字列値を返す。"
 #, c-format
 msgid "If at least %2$s child service has %1$s status or above"
 msgid_plural "If at least %2$s child services have %1$s status or above"
-msgstr[0] ""
+msgstr[0] "少なくとも%2$s個の子サービスの状態が%1$s以上"
 
 #: include/classes/helpers/CServiceHelper.php:35
 #, c-format
 msgid "If at least %2$s child services have %1$s status or above"
-msgstr ""
+msgstr "少なくとも%2$s個の子サービスの状態が%1$s以上"
 
 #: include/classes/helpers/CServiceHelper.php:40
 #: include/classes/helpers/CServiceHelper.php:89
 #, c-format
 msgid "If at least %2$s of child services have %1$s status or above"
-msgstr ""
+msgstr "少なくとも子サービスの%2$sの状態が%1$s以上"
 
 #: app/views/popup.lldoverride.php:54
 msgid "If filter matches"
@@ -8178,18 +8089,18 @@ msgstr "フィルターが一致した場合"
 #, c-format
 msgid "If less than %2$s child service has %1$s status or below"
 msgid_plural "If less than %2$s child services have %1$s status or below"
-msgstr[0] ""
+msgstr[0] "%2$s個未満の子サービスのステータスが%1$s以下"
 
 #: include/classes/helpers/CServiceHelper.php:45
 #, c-format
 msgid "If less than %2$s child services have %1$s status or below"
-msgstr ""
+msgstr "%2$s個未満の子サービスのステータスが%1$s以下"
 
 #: include/classes/helpers/CServiceHelper.php:50
 #: include/classes/helpers/CServiceHelper.php:101
 #, c-format
 msgid "If less than %2$s of child services have %1$s status or below"
-msgstr ""
+msgstr "子サービスの%2$s未満のステータスが%1$s以下"
 
 #: include/classes/api/services/CReport.php:348
 msgid "If no user groups are specified, at least one user must be included in the mailing list."
@@ -8201,7 +8112,7 @@ msgstr "ユーザーグループを指定しない場合は、少なくともメ
 #: include/classes/helpers/CServiceHelper.php:110
 #, c-format
 msgid "If weight of child services with %1$s status or above is at least %2$s"
-msgstr ""
+msgstr "ステータスが%1$s以上の子サービスの重みが少なくとも%2$s"
 
 #: include/classes/helpers/CServiceHelper.php:65
 #: include/classes/helpers/CServiceHelper.php:70
@@ -8209,7 +8120,7 @@ msgstr ""
 #: include/classes/helpers/CServiceHelper.php:118
 #, c-format
 msgid "If weight of child services with %1$s status or below is less than %2$s"
-msgstr ""
+msgstr "ステータスが%1$s以下の子サービスの重みが%2$s未満"
 
 #: include/func.inc.php:1516 include/func.inc.php:1536
 msgid "If you think this message is wrong, please consult your administrators about getting the necessary permissions."
@@ -8219,23 +8130,20 @@ msgstr "このメッセージが間違っている場合は、必要な権限を
 msgid "Iframe sandboxing exceptions"
 msgstr "Iframeサンドボックスの例外"
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
-msgstr ""
+msgstr "このサービスを無視"
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "イメージ"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "イメージ\"%1$s\"はすでに存在しています。"
@@ -8244,7 +8152,7 @@ msgstr "イメージ\"%1$s\"はすでに存在しています。"
 msgid "Image added"
 msgstr "イメージを追加しました"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "イメージを削除しました"
 
@@ -8252,18 +8160,12 @@ msgstr "イメージを削除しました"
 msgid "Image label type"
 msgstr "イメージラベルのタイプ"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "[%2$s]内の[%1$s]のイメージの読み込みエラー。"
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr "イメージのサイズは%1$s未満にしてください。"
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "イメージを更新しました"
 
@@ -8358,7 +8260,7 @@ msgstr "アクセスできないアイテムのプロトタイプ"
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8369,13 +8271,13 @@ msgstr "アクセスできないメンテナンス"
 msgid "Inaccessible map"
 msgstr "アクセスできないマップ"
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr "アクセスできないテンプレート"
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr "アクセスできないトリガー"
 
@@ -8419,7 +8321,7 @@ msgstr "サブグループを含める"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "ネットワークインターフェースの受信統計。整数値を返す。"
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8490,7 +8392,7 @@ msgstr "Vaultのトークンが正しくありません。"
 #: include/classes/api/services/CAction.php:3012
 #: include/classes/api/services/CAction.php:3030
 msgid "Incorrect action \"operationid\"."
-msgstr ""
+msgstr "アクションの\"operationid\"が正しくありません。"
 
 #: include/classes/validators/CActionCondValidator.php:122
 msgid "Incorrect action condition discovery check."
@@ -8587,24 +8489,6 @@ msgstr "実行するアクションのユーザーグループの値が正しく
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "実行するアクションのユーザーの値が正しくありません。ユーザーが存在しないか、アクセス権がありません。"
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8659,8 +8543,6 @@ msgstr "実行するアクションのユーザーの値が正しくありませ
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "不正な引数が関数に渡されました。"
 
@@ -8686,31 +8568,22 @@ msgstr "テンプレート名\"%1$s\"に使用されている文字列が正し�
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "アクション\"%1$s\"の条件式が正しくありません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "ディスカバリルール\"%1$s\"の条件式が正しくありません。"
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "相関関係IDが正しくありません。"
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "アクション\"%1$s\"のカスタム条件式\"%2$s\"が正しくありません： %3$s。"
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "相関関係\"%1$s\"のカスタム条件式\"%2$s\"が正しくありません: %3$s。"
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "ディスカバリルール\"%1$s\"のカスタム条件式\"%2$s\"が正しくありません: %3$s。"
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr "\"%1$s\"を上書きするためのカスタム条件式\"%2$s\"が正しくありません: %3$s。"
@@ -8739,7 +8612,7 @@ msgstr "イベントオブジェクトの値が正しくありません。"
 msgid "Incorrect eventsource value."
 msgstr "イベントソースの値が正しくありません。"
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "テーブル\"%2$s\"へのwhereステートメントのフィールド\"%1$s\"の名前または値が正しくありません。"
@@ -8764,22 +8637,17 @@ msgstr "アップロードされたファイルが正しくありません。"
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "アクション\"%1$s\"のフィルター条件式IDが正しくありません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "ディスカバリルール\"%1$s\"のフィルター条件式IDが正しくありません。"
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "相関関係\"%1$s\"のフィルター条件式IDが正しくありません。"
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "ディスカバリルール\"%1$s\"のフィルター条件マクロが正しくありません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr "\"%1$s\"を上書きするためのフィルター条件マクロが正しくありません。"
@@ -8790,7 +8658,7 @@ msgstr "\"%1$s\"を上書きするためのフィルター条件マクロが正�
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "アクション\"%1$s\"のフィルター条件演算子が正しくありません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "ディスカバリルール\"%1$s\"のフィルター条件演算子が正しくありません。"
@@ -8818,8 +8686,6 @@ msgstr "イメージのインデックスが正しくありません。"
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8881,10 +8747,6 @@ msgstr "メンテナンス期間が正しくありません (最小5分)"
 msgid "Incorrect map ID."
 msgstr "マップIDが正しくありません。"
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "メディアタイプIDが正しくありません。"
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -8942,13 +8804,13 @@ msgstr "正規表現\"%1$s\"が正しくありません： \"%2$s\""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Zabbixサーバー\"%1$s\"から正しくない値を受信しました。"
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "サービス終了時刻が正しくありません。"
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "サービス開始時刻が正しくありません。"
 
@@ -9001,19 +8863,14 @@ msgstr "トリガーのプロトタイプの条件式が正しくありません
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "アクション\"%1$s\"の計算のタイプが正しくありません。"
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "相関関係\"%1$s\"の計算タイプが正しくありません。"
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "ディスカバリルール\"%1$s\"の計算のタイプが正しくありません。"
 
 #: include/classes/api/services/CAction.php:3067
 msgid "Incorrect update action \"operationid\"."
-msgstr ""
+msgstr "更新するアクションの\"operationid\"が正しくありません。"
 
 #: include/classes/api/services/CMap.php:764
 #: include/classes/api/services/CMap.php:1232
@@ -9052,13 +8909,13 @@ msgstr "不正なユーザー名やパスワードまたはアカウントは一
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9075,60 +8932,30 @@ msgstr "\"%2$s\"フィールドの値\"%1$s\"が正しくありません：%3$s�
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "\"%2$s\"フィールドの値\"%1$s\"が正しくありません: %3$sから%4$sの間で設定してください。"
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "浮動小数フィールド\"%2$s\"の値\"%1$s\"が正しくありません。"
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "整数フィールド\"%2$s\"の値\"%1$s\"が正しくありません。"
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "符号なし整数フィールド\"%2$s\"の値\"%1$s\"が正しくありません。"
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "相関関係\"%3$s\"のフィールド\"%2$s\"の値\"%1$s\"が正しくありません。"
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "メディアタイプ\"%3$s\"のためのフィールド\"%2$s\"内の値\"%1$s\"が正しくありません。"
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9183,14 +9010,8 @@ msgstr "\"%1$s\"フィールドのための値が正しくありません。"
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9300,25 +9121,7 @@ msgstr "\"%1$s\"フィールドのための値が正しくありません。"
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9329,7 +9132,7 @@ msgstr "\"%1$s\"フィールドのための値が正しくありません。"
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9375,16 +9178,17 @@ msgstr "\"%1$s\"フィールドのための値が正しくありません。"
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9393,9 +9197,9 @@ msgstr "\"%1$s\"フィールドのための値が正しくありません。"
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "フィールド\"%1$s\": %2$sの値が正しくありません。"
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
-msgstr ""
+msgstr "深刻度を増やす"
 
 #: include/locales.inc.php:60
 msgid "Indonesian (id_ID)"
@@ -9437,7 +9241,7 @@ msgstr "情報"
 #: include/classes/items/CHelpItems.php:337
 #: include/classes/items/CHelpItems.php:719
 msgid "Information about a file. Returns JSON"
-msgstr ""
+msgstr "ファイルの情報。JSONで返す"
 
 #: include/classes/items/CHelpItems.php:201
 #: include/classes/items/CHelpItems.php:583
@@ -9481,12 +9285,12 @@ msgstr "継承したタグとトリガータグ"
 msgid "Inherited items"
 msgstr "継承したアイテム"
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "挿入"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "条件式の挿入"
 
@@ -9505,7 +9309,7 @@ msgstr "インストーラ名"
 
 #: include/classes/helpers/CMenuHelper.php:344
 msgid "Integrations"
-msgstr ""
+msgstr "インテグレーション"
 
 #: app/partials/monitoring.host.view.html.php:30
 #: app/views/administration.proxy.edit.php:77 disc_prototypes.php:42
@@ -9590,7 +9394,7 @@ msgstr "内部イベント発生"
 msgid "Internal problem recovery"
 msgstr "内部イベント復旧"
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9598,7 +9402,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9609,10 +9413,10 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "監視間隔"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
-msgstr ""
+msgstr "ユーザーの役割\"%1$s\"のためのAPIメソッド\"%2$s\"が正しくありません。"
 
 #: include/classes/api/services/CHostInterface.php:829
 #, c-format
@@ -9632,7 +9436,7 @@ msgstr "YAMLファイルの内容が正しくありません"
 msgid "Invalid action condition: %1$s."
 msgstr "アクションの実行条件が正しくありません：%1$s。"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr "条件が正しくありません： %1$s。"
@@ -9664,7 +9468,7 @@ msgstr "ID \"%1$s\"のメディアタイプのメールアドレスが正しく�
 msgid "Invalid interval \"%1$s\"."
 msgstr "監視間隔\"%1$s\"が正しくありません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "\"%3$s\": %4$sのディスカバリルール\"%2$s\"のアイテムキー\"%1$s\"が正しくありません。"
@@ -9689,27 +9493,29 @@ msgstr "キー\"%1$s\": %2$sが正しくありません。"
 msgid "Invalid method parameters."
 msgstr "メソッドのパラメータが正しくありません。"
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9735,17 +9541,17 @@ msgstr "メソッドのパラメータが正しくありません。"
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9753,8 +9559,8 @@ msgstr "メソッドのパラメータが正しくありません。"
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9768,106 +9574,116 @@ msgstr "メソッドのパラメータが正しくありません。"
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9881,7 +9697,7 @@ msgstr "パラメータが正しくありません。"
 
 #: include/classes/core/CJsonRpc.php:176
 msgid "Invalid request."
-msgstr ""
+msgstr "リクエストが正しくありません。"
 
 #: include/classes/api/services/CHttpTest.php:786
 #, c-format
@@ -9909,43 +9725,38 @@ msgstr "レスポンスコード\"%1$s\"が正しくありません。"
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -9966,7 +9777,7 @@ msgstr "期間が正しくありません。"
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "インベントリ"
 
@@ -10007,7 +9818,7 @@ msgstr "ユーザーのパスワードによる検索は行えません。"
 msgid "Italian (it_IT)"
 msgstr "イタリア語 (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10039,7 +9850,7 @@ msgstr "アイテム\"%1$s\"はマスターアイテムがないとコピーで�
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "アイテム\"%1$s\"はフィールド番号が存在しないホストインベントリ\"%2$d\"を自動設定することができません。0 (自動設定しない)から%3$dの間で設定してください。"
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10053,7 +9864,7 @@ msgstr "アイテムを追加しました"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr "アイテムは秘密な値を持つユーザー定義マクロを含んでいます。これらのマクロの値は手動で入力する必要があります。"
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "アイテムをコピーしました"
@@ -10066,12 +9877,12 @@ msgstr "アイテム数"
 msgid "Item deleted"
 msgstr "アイテムを削除しました"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "アイテムを無効にしました"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "アイテムを有効にしました"
@@ -10080,7 +9891,7 @@ msgstr[0] "アイテムを有効にしました"
 msgid "Item in \"not supported\" state"
 msgstr "アイテムが\"取得不可\"の状態"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "アイテムが選択されていません"
 
@@ -10089,7 +9900,7 @@ msgstr "アイテムが選択されていません"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr "アイテムの保存前処理の引数が設定されていません：%1$s"
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10125,8 +9936,8 @@ msgid "Item prototype updated"
 msgid_plural "Item prototypes updated"
 msgstr[0] "アイテムのプロトタイプを更新しました"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"のアイテムのプロトタイプは使用できません。"
@@ -10152,7 +9963,7 @@ msgstr "アイテムのプロトタイプを更新しました"
 msgid "Item tags"
 msgstr "アイテムタグ"
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr "アイテムタイプはインターフェースを使用しません"
 
@@ -10184,8 +9995,8 @@ msgstr "アイテムは監視データを取得しません。監視間隔とし
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr "アイテムは監視データを取得しません。監視間隔は1sから1dで設定してください。定期設定や例外設定の監視間隔も利用できます。"
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"のアイテムは使用できません。"
@@ -10236,11 +10047,11 @@ msgstr "キー\"%1$s\"が設定されたアイテムは指定したホスト\"%2
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "アイテム"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "アイテムを削除しました"
 
@@ -10258,7 +10069,7 @@ msgstr "アイテムを更新しました"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10283,6 +10094,10 @@ msgstr "JMXインターフェース"
 msgid "JSON"
 msgstr "JSON"
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr "JSONの配列で指定してください。"
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10295,7 +10110,7 @@ msgstr "JSONデータ"
 msgid "JSON is expected"
 msgstr "JSONで指定してください"
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr "JSON文字列で指定してください"
 
@@ -10313,7 +10128,7 @@ msgstr "JSONPath"
 msgid "Jan"
 msgstr "1月"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "1月"
 
@@ -10335,7 +10150,7 @@ msgstr "JavaScript"
 msgid "Jul"
 msgstr "7月"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "7月"
 
@@ -10343,7 +10158,7 @@ msgstr "7月"
 msgid "Jun"
 msgstr "6月"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "6月"
 
@@ -10493,22 +10308,6 @@ msgid "Last %1$d year"
 msgid_plural "Last %1$d years"
 msgstr[0] "最新の%1$d年間"
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10520,11 +10319,11 @@ msgstr "最終アクセス日時"
 msgid "Last check"
 msgstr "最新のチェック時刻"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "最新1時間のグラフ"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "最新1ヶ月のグラフ"
 
@@ -10562,11 +10361,11 @@ msgstr "最終送信日時"
 msgid "Last value"
 msgstr "最新の値"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "最新1週間のグラフ"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10575,11 +10374,11 @@ msgstr "最新1週間のグラフ"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "最新データ"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "最新の値"
 
@@ -10620,7 +10419,7 @@ msgstr "左側Y軸"
 msgid "Left trim"
 msgstr "先頭文字列削除"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr "凡例"
 
@@ -10649,7 +10448,7 @@ msgstr "線"
 
 #: include/views/js/monitoring.sysmaps.js.php:597
 msgid "Line color"
-msgstr "線の色"
+msgstr "線色"
 
 #: include/views/js/monitoring.sysmaps.js.php:575
 msgid "Line type"
@@ -10901,7 +10700,7 @@ msgstr "ローレベルディスカバリが\"取得不可\"の状態"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -10923,7 +10722,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "ファイルのMD5チェックサム。ファイルのMD5ハッシュ値を文字列値で返す。"
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -10934,12 +10733,12 @@ msgid "Macro"
 msgstr "マクロ"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "マクロ\"%1$s\"は\"%2$s\"にすでに存在します。"
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "マクロ\"%1$s\"はすでに存在します。"
@@ -10967,7 +10766,7 @@ msgstr "マクロを更新しました"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr "メインフィルター"
 
@@ -10975,7 +10774,7 @@ msgstr "メインフィルター"
 msgid "Main navigation"
 msgstr "メインナビゲーション"
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11058,7 +10857,7 @@ msgstr "定期レポートの管理"
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11080,13 +10879,13 @@ msgstr "手動ホスト処理"
 msgid "Manually closed"
 msgstr "手動クローズ済"
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "マップ"
 
@@ -11155,7 +10954,7 @@ msgstr "マップ図形"
 msgid "Map update failed."
 msgstr "マップの更新に失敗しました。"
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"のマップは使用できません。"
@@ -11187,7 +10986,7 @@ msgstr "マップ"
 msgid "Mar"
 msgstr "3月"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "3月"
 
@@ -11291,7 +11090,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr "要求される%1$sデータベースの最大バージョンは%2$sです。"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11304,7 +11103,7 @@ msgstr[0] "表示できる最大の期間は%1$s日です。"
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "ID \"%1$s\"のメディアタイプのメールアドレスが最大長を超えています。"
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "5月"
 
@@ -11319,15 +11118,12 @@ msgstr "5月"
 msgid "Media"
 msgstr "メディア"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "メディアタイプ"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr "メディアタイプ\"%1$s\"はすでに存在しています。"
@@ -11351,11 +11147,6 @@ msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "メディアタイプを有効にしました"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr "メディアタイプがパラメータに設定されていません: %1$s"
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11385,7 +11176,7 @@ msgstr "ID \"%1$s\"のメディアタイプは使用できません。"
 msgid "Media types"
 msgstr "メディアタイプ"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr "メディアタイプはアクション\"%1$s\"に利用されています。"
@@ -11473,7 +11264,7 @@ msgstr "アラート表示"
 msgid "Method not found."
 msgstr "メソッドが見つかりません。"
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr "Microsoft Edge"
 
@@ -11535,7 +11326,7 @@ msgid "Minimum severity"
 msgstr "最小の深刻度"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11593,7 +11384,7 @@ msgstr "モード"
 msgid "Model"
 msgstr "モデル"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr "モジュール"
@@ -11627,7 +11418,7 @@ msgstr[0] "モジュールを有効にしました: %1$s。"
 msgid "Module updated: %1$s."
 msgstr "モジュールを更新しました： %1$s。"
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11653,7 +11444,7 @@ msgstr "モジュールを更新しました"
 msgid "Mon"
 msgstr "月"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "月曜"
 
@@ -11693,11 +11484,11 @@ msgstr "月"
 msgid "Monthly"
 msgstr "毎月"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "条件に一致するデータがさらに存在します..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11715,13 +11506,13 @@ msgstr "ホストに\"%1$s\"の名前を持つグラフが1つ以上存在しま
 
 #: include/classes/helpers/CServiceHelper.php:27
 msgid "Most critical if all children have problems"
-msgstr ""
+msgstr "すべての子が障害であったときにもっとも重要"
 
 #: include/classes/helpers/CServiceHelper.php:26
 msgid "Most critical of child services"
-msgstr ""
+msgstr "子サービスでもっとも重要"
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11734,7 +11525,7 @@ msgstr "複数"
 msgid "Multiple PROBLEM events"
 msgstr "障害イベントを継続して生成"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "ミュート"
 
@@ -11745,14 +11536,14 @@ msgstr "私が作成"
 #: include/classes/helpers/CServiceHelper.php:37
 #: include/classes/helpers/CServiceHelper.php:47
 msgid "N"
-msgstr ""
+msgstr "N"
 
 #: include/classes/helpers/CServiceHelper.php:42
 #: include/classes/helpers/CServiceHelper.php:52
 #: include/classes/helpers/CServiceHelper.php:62
 #: include/classes/helpers/CServiceHelper.php:72
 msgid "N%"
-msgstr ""
+msgstr "N%"
 
 #: include/discovery.inc.php:53
 msgid "NNTP"
@@ -11863,11 +11654,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12012,7 +11803,7 @@ msgstr "未監視"
 
 #: app/views/popup.service.statusrule.edit.php:94
 msgid "New additional rule"
-msgstr ""
+msgstr "新規追加ルール"
 
 #: app/controllers/CControllerPopupConditionActions.php:94
 #: app/controllers/CControllerPopupConditionEventCorr.php:87
@@ -12025,19 +11816,21 @@ msgstr "新規条件"
 msgid "New dashboard"
 msgstr "新規ダッシュボード"
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "新規要素"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr "新しいイベントのホストグループ"
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr "新しいイベントタグ名"
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr "新しいイベントタグの値"
 
@@ -12049,7 +11842,7 @@ msgstr "実行内容の作成"
 msgid "New regular expression"
 msgstr "正規表現の作成"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr "新規サービス"
 
@@ -12057,7 +11850,7 @@ msgstr "新規サービス"
 msgid "New service time"
 msgstr "新規サービスタイム"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr "新しいタグ名"
 
@@ -12066,7 +11859,7 @@ msgid "New triggers"
 msgstr "新規トリガー"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr "次のページ"
 
@@ -12084,7 +11877,7 @@ msgstr "次のステップ"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12113,30 +11906,6 @@ msgstr "次のステップ"
 msgid "No"
 msgstr "いいえ"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "相関関係\"%2$s\"に\"%1$s\"が定義されていません。"
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "相関関係に\"%1$s\"が定義されていません。"
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12152,11 +11921,6 @@ msgstr "グラフに\"%1$s\"が定義されていません。"
 msgid "No \"%1$s\" given for map."
 msgstr "マップに\"%1$s\"が定義されていません。"
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "メディアタイプに\"%1$s\"が定義されていません。"
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12164,7 +11928,7 @@ msgstr "メディアタイプに\"%1$s\"が定義されていません。"
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "アクション\"%1$s\"のフィルター条件の\"%2$s\"が定義されていません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "ディスカバリルール\"%1$s\"のフィルター条件の\"%2$s\"が定義されていません。"
@@ -12174,7 +11938,7 @@ msgstr "ディスカバリルール\"%1$s\"のフィルター条件の\"%2$s\"�
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "アクション\"%1$s\"のフィルターの\"%2$s\"が定義されていません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "ディスカバリルール\"%1$s\"のフィルターの\"%2$s\"が定義されていません。"
@@ -12191,11 +11955,6 @@ msgstr "認証ユーザー名が設定されていません。"
 msgid "No changes."
 msgstr "変更はありません。"
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "相関関係\"%1$s\"に条件のタイプが定義されていません。"
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12226,7 +11985,7 @@ msgstr "\"%2$s\"上の\"%1$s\"タイプのデフォルトインターフェー�
 msgid "No details"
 msgstr "詳細がありません"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "ディスカバリルールIDが設定されていません。"
 
@@ -12256,20 +12015,20 @@ msgstr "ファイルがアップロードされていません。"
 #: include/graphs.inc.php:153
 #, c-format
 msgid "No graph item with graph ID \"%1$s\"."
-msgstr ""
+msgstr "グラフID\"%1$s\"のグラフアイテムが存在しません。"
 
 #: app/views/monitoring.widget.favgraphs.view.php:26
 msgid "No graphs added."
 msgstr "グラフが追加されていません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "ホストIDが存在しません。"
 
 #: include/hosts.inc.php:515
 #, c-format
 msgid "No host groups with group ID \"%1$s\"."
-msgstr ""
+msgstr "グループID\"%1$s\"のホストグループが存在しません。"
 
 #: app/controllers/CControllerWidgetUrlView.php:51
 msgid "No host selected."
@@ -12278,7 +12037,7 @@ msgstr "ホストが選択されていません。"
 #: include/hosts.inc.php:558
 #, c-format
 msgid "No host with host ID \"%1$s\"."
-msgstr ""
+msgstr "ホストID\"%1$s\"のホストが存在しません。"
 
 #: include/classes/api/services/CMapElement.php:176
 #, c-format
@@ -12292,7 +12051,7 @@ msgstr "イメージは存在しません"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "インターフェースが見つかりません。"
 
@@ -12311,7 +12070,7 @@ msgstr "実行するアクションのインベントリモードが設定され
 #: include/items.inc.php:742
 #, c-format
 msgid "No item with item ID \"%1$s\"."
-msgstr ""
+msgstr "アイテムID\"%1$s\"のアイテムが存在しません。"
 
 #: chart3.php:145 chart7.php:56
 msgid "No items defined."
@@ -12326,7 +12085,7 @@ msgstr "マクロが設定されていません。"
 msgid "No maps added."
 msgstr "マップが追加されていません。"
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "条件に一致するデータはありません"
 
@@ -12334,17 +12093,46 @@ msgstr "条件に一致するデータはありません"
 msgid "No new modules discovered"
 msgstr "新しいモジュールは見つかりませんでした"
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr "相関関係\"%1$s\"に実行内容のタイプが定義されていません。"
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "システムへのアクセス権がありません。"
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
@@ -12352,7 +12140,7 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12380,19 +12168,18 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12407,16 +12194,22 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12436,12 +12229,10 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12462,27 +12253,29 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12499,14 +12292,14 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12515,7 +12308,7 @@ msgstr "\"%1$s.%2$s\"を呼び出す権限がありません。"
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "対象が存在しないか、アクセス権がありません！"
 
@@ -12535,7 +12328,7 @@ msgstr "公開鍵ファイルが設定されていません。"
 msgid "No recipients for action operation message."
 msgstr "実行するアクションのメッセージに送信先が設定されていません。"
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr "リフレッシュなし"
 
@@ -12547,14 +12340,14 @@ msgstr "実行するアクションのコマンドにスクリプトが設定さ
 msgid "No target selected"
 msgstr "何も選択されていません"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "何も選択されていません。"
 
 #: include/triggers.inc.php:91
 #, c-format
 msgid "No trigger with trigger ID \"%1$s\"."
-msgstr ""
+msgstr "トリガーID\"%1$s\"のトリガーが存在しません。"
 
 #: chart4.php:42
 msgid "No triggers defined."
@@ -12564,7 +12357,7 @@ msgstr "トリガーが設定されていません。"
 msgid "No value"
 msgstr "値なし"
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr "論理値ではないフラグは廃止予定です。"
 
@@ -12634,15 +12427,15 @@ msgstr "すべての結果が表示されるわけではありません。 よ�
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr "すべてのテンプレートは\"%1$s\"にリンクされていません。"
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr "\"guest\"ユーザーは言語を設定できません。"
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "ゲストユーザーはパスワードを設定できません。"
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr "\"guest\"ユーザーはテーマを設定できません。"
 
@@ -12650,7 +12443,7 @@ msgstr "\"guest\"ユーザーはテーマを設定できません。"
 #: include/classes/api/clients/CLocalApiClient.php:192
 #: include/classes/api/clients/CLocalApiClient.php:218
 msgid "Not authorized."
-msgstr ""
+msgstr "許可されていません。"
 
 #: app/views/monitoring.widget.hostavail.view.php:34
 #: app/views/monitoring.widget.hostavail.view.php:62
@@ -12674,7 +12467,7 @@ msgstr "継承していないアイテム"
 msgid "Not supported"
 msgstr "取得不可"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "説明"
@@ -12705,7 +12498,7 @@ msgstr "障害通知送信済のユーザーすべてにメッセージを送信
 msgid "Nov"
 msgstr "11月"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "11月"
 
@@ -12721,7 +12514,7 @@ msgstr "使用可能なDSパスの数、<url> - VMwareサービスURL、<uuid> -
 #: include/classes/items/CHelpItems.php:89
 #: include/classes/items/CHelpItems.php:451
 msgid "Number of currently open file descriptors. Returns integer"
-msgstr ""
+msgstr "現在開いているファイルディスクリプタの数。整数値を返す"
 
 #: include/classes/items/CHelpItems.php:1209
 msgid "Number of enabled items on the host."
@@ -12892,8 +12685,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -12953,13 +12746,13 @@ msgstr "10月"
 msgid "Octal to decimal"
 msgstr "8進数から10進数"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "10月"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "OFF"
 
@@ -12967,30 +12760,31 @@ msgstr "OFF"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "正常"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr "古いイベントタグ名"
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr "古いイベントタグの値"
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr "古いタグ名"
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "ON"
 
@@ -13006,35 +12800,15 @@ msgstr "一度だけ"
 msgid "One"
 msgstr "1つ"
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "ホストグループが設定されていないオブジェクトが残っています"
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "一度限り"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "一時的なダウンタイム"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "特権管理者のみがホストグループを作成できます。"
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "特権管理者のみがメディアタイプを作成できます。"
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "特権管理者のみがメディアタイプを削除できます。"
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "特権管理者のみがメディアタイプを修正できます。"
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Zabbixエージェント、SNMPv1、SNMPv2、SNMPv3がユニークかどうかだけチェックします。"
@@ -13082,10 +12856,6 @@ msgstr "子サービスのないサービスのみ"
 msgid "Only services without problem tags"
 msgstr "障害タグのないサービスのみ"
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "特権管理者のみが相関関係を作成できます。"
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr "特権管理者のみがダッシュボードのオーナーを設定できます。"
@@ -13094,15 +12864,11 @@ msgstr "特権管理者のみがダッシュボードのオーナーを設定で
 msgid "Only super admins can set report owner."
 msgstr "特権管理者のみがレポートのオーナーを設定できます。"
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr "特権管理者のみが相関関係を更新できます。"
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "有効なホストとアイテムのトリガーのみカウント"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13111,7 +12877,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "OS情報。文字列値を返す。"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr "処理内容"
 
@@ -13120,11 +12886,11 @@ msgstr "処理内容"
 msgid "Operation \"%1$s\" already exists."
 msgstr "実行するアクション\"%1$s\"はすでに存在しています。"
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "認証されていないリクエストのため操作を実行できません。"
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "実行内容の詳細"
 
@@ -13146,7 +12912,7 @@ msgstr "操作対象のテンプレートがありません。"
 msgid "Operational data"
 msgstr "運用データ"
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13155,33 +12921,33 @@ msgstr "運用データ"
 msgid "Operations"
 msgstr "実行内容"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "オペレータ"
 
@@ -13290,7 +13056,7 @@ msgstr "その他の設定パラメータ"
 msgid "Other parameters"
 msgstr "その他のパラメータ"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "その他"
@@ -13304,7 +13070,7 @@ msgstr "ネットワークインターフェースの送信統計。整数値を
 msgid "Output"
 msgstr "出力"
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr "ダッシュボード\"%1$s\"のページ#%2$d上の X:%3$d, Y:%4$d にあるウィジェットと重複しています。"
@@ -13333,7 +13099,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr "\"%1$s\"という名前の上書きはすでに存在します。"
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13522,7 +13288,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13567,7 +13333,7 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "PSKアイデンティティ"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr "ページ %1$d"
@@ -13590,16 +13356,16 @@ msgstr "ページャー"
 msgid "Parameter"
 msgstr "パラメータ"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "パラメータ\"%1$s\"は廃止予定です。"
@@ -13629,7 +13395,7 @@ msgstr "親アイテム"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr "親サービス"
 
@@ -13646,10 +13412,10 @@ msgstr "親トリガー"
 msgid "Parent web scenarios"
 msgstr "親Webシナリオ"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
-msgstr ""
+msgstr "サービス\"%1$s\"と\"%2$s\"の親子関係が衝突しています。"
 
 #: app/views/popup.httpstep.php:58
 #: include/views/configuration.host.discovery.edit.php:86
@@ -13658,11 +13424,6 @@ msgstr ""
 msgid "Parse"
 msgstr "URL解析"
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "SQLパースエラー [%2$s]内の[%1$s]。"
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "パースエラー"
@@ -13723,7 +13484,7 @@ msgstr "パスワードポリシー"
 msgid "Password requirements:"
 msgstr "パスワード要件："
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr "貼り付け"
 
@@ -13733,15 +13494,15 @@ msgid "Paste page"
 msgstr "ページの貼り付け"
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr "ウィジェットの貼り付け"
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr "リンクなしで貼り付け"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr "パターン"
@@ -13787,12 +13548,11 @@ msgstr "DNSクエリの実行。要求した情報のタイプの文字列を返
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "期間"
 
@@ -13881,7 +13641,7 @@ msgstr "\"allow_url_fopen\"ディレクティブを有効にしてください�
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Zabbixサーバーのホスト名かホストのIPアドレスとポート番号をを入力してください。必要に応じて名前も入力してください。"
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "2つの要素を選択してください"
 
@@ -13921,7 +13681,7 @@ msgstr "ホストインベントリフィールドの自動設定"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14010,7 +13770,7 @@ msgid "Previous month"
 msgstr "先月"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr "前のページ"
 
@@ -14141,7 +13901,7 @@ msgstr "メンテナンス期間外"
 msgid "Problem is suppressed"
 msgstr "メンテナンス期間中"
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "障害"
 
@@ -14154,21 +13914,17 @@ msgstr "障害復旧"
 msgid "Problem resolved"
 msgstr "障害解決済"
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr "障害タグ"
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr "障害更新"
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14182,9 +13938,9 @@ msgstr "障害更新"
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "障害"
 
@@ -14218,7 +13974,7 @@ msgid "Prometheus to JSON"
 msgstr "PrometheusからJSON"
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "プロパティ"
 
@@ -14239,13 +13995,13 @@ msgstr "指定されたURL \"%1$s\"は正しくありません。"
 msgid "Proxies"
 msgstr "プロキシ"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14253,7 +14009,7 @@ msgstr "プロキシ"
 msgid "Proxy"
 msgstr "プロキシ"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr "プロキシ\"%1$s\"はすでに存在しています。"
@@ -14263,12 +14019,12 @@ msgstr "プロキシ\"%1$s\"はすでに存在しています。"
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "ホスト\"%2$s\"のプロキシ\"%1$s\"は存在しません。"
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr "プロキシ\"%1$s\"はアクション\"%2$s\"で使用されています。"
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "プロキシ\"%1$s\"はディスカバリルール\"%2$s\"に利用されています。"
@@ -14360,7 +14116,7 @@ msgstr "プロキシごとのキュー概要"
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14404,12 +14160,12 @@ msgstr "表示のみ"
 #: app/views/administration.user.edit.php:552
 #: app/views/administration.userrole.edit.php:180
 msgid "Read-only access to services"
-msgstr ""
+msgstr "サービスの表示のみ"
 
 #: app/views/administration.user.edit.php:561
 #: app/views/administration.userrole.edit.php:204
 msgid "Read-only access to services with tag"
-msgstr ""
+msgstr "タグとサービスの表示のみ"
 
 #: app/partials/administration.usergroup.grouprights.html.php:69
 #: app/views/administration.usergroup.edit.php:132
@@ -14425,22 +14181,18 @@ msgstr "表示/設定"
 #: app/views/administration.user.edit.php:507
 #: app/views/administration.userrole.edit.php:139
 msgid "Read-write access to services"
-msgstr ""
+msgstr "サービスの表示/設定"
 
 #: app/views/administration.user.edit.php:516
 #: app/views/administration.userrole.edit.php:163
 msgid "Read-write access to services with tag"
-msgstr ""
+msgstr "タグとサービスの表示/設定"
 
 #: include/classes/items/CHelpItems.php:93
 #: include/classes/items/CHelpItems.php:471
 msgid "Reads modbus data. Returns various types"
 msgstr "modbusデータを読み込む。様々なデータ型の値を返却"
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr "理由"
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "受信した値"
@@ -14477,7 +14229,7 @@ msgstr "受信者"
 #: app/views/reports.auditlog.list.php:74
 #: app/views/reports.auditlog.list.php:96
 msgid "Recordset ID"
-msgstr ""
+msgstr "記録ID"
 
 #: app/views/administration.user.edit.php:684
 #: include/classes/screens/CScreenProblem.php:1067
@@ -14522,7 +14274,7 @@ msgstr "長方形"
 msgid "Refresh"
 msgstr "リフレッシュ"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr "リフレッシュ間隔"
 
@@ -14540,13 +14292,13 @@ msgstr "選択したAPIトークンを再生成しますか？以前に生成さ
 msgid "Regular"
 msgstr "Regular"
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "正規表現"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr "正規表現\"%1$s\"はすでに存在しています。"
@@ -14578,7 +14330,7 @@ msgstr "正規表現"
 msgid "Related reports"
 msgstr "関連するレポート"
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr "作成したウィジェットを離す。"
 
@@ -14610,8 +14362,6 @@ msgstr "リモートコマンド"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14632,7 +14382,9 @@ msgstr "リモートコマンド"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14645,7 +14397,7 @@ msgstr "リモートコマンド"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14722,8 +14474,8 @@ msgstr "リモートコマンド"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "削除"
 
@@ -14763,7 +14515,7 @@ msgstr "%1$sの削除"
 msgid "Removed"
 msgstr "削除しました"
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14805,7 +14557,7 @@ msgid "Replace dependencies"
 msgstr "依存関係を置換"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr "指定文字列"
 
@@ -14860,7 +14612,7 @@ msgstr "リクエストボディ"
 msgid "Request body type"
 msgstr "リクエストボディのタイプ"
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr "リクエストを送信しました"
 
@@ -14902,8 +14654,8 @@ msgstr "要求ステータスコード"
 msgid "Required string"
 msgstr "要求文字列"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "リセット"
 
@@ -14936,7 +14688,7 @@ msgstr "リセットの確認"
 msgid "Reset defaults"
 msgstr "デフォルトにリセット"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "解決済"
 
@@ -15002,7 +14754,7 @@ msgstr "レスポンスタイプ: 文字列"
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "結果"
@@ -15065,7 +14817,7 @@ msgstr "MBeanオブジェクトの属性の値を返す。"
 #: include/classes/items/CHelpItems.php:349
 #: include/classes/items/CHelpItems.php:731
 msgid "Returns 4-digit string containing octal number with Unix permissions"
-msgstr ""
+msgstr "UNIXのバーミッションを4桁の8進数文字列で返す"
 
 #: include/classes/items/CHelpItems.php:809
 msgid "Returns ICMP ping response time in seconds. Example: 0.02"
@@ -15096,12 +14848,12 @@ msgstr "関連付けられているZabbix Java Gatewayの情報を返す。有�
 #: include/classes/items/CHelpItems.php:145
 #: include/classes/items/CHelpItems.php:527
 msgid "Returns number of TCP sockets that match parameters. Returns integer"
-msgstr ""
+msgstr "パラメータに一致したTCPソケットの数を返す。整数を返す"
 
 #: include/classes/items/CHelpItems.php:161
 #: include/classes/items/CHelpItems.php:543
 msgid "Returns number of UDP sockets that match parameters. Returns integer"
-msgstr ""
+msgstr "パラメータに一致したUDPソケットの数を返す。整数で返す"
 
 #: include/classes/items/CHelpItems.php:805
 msgid "Returns percentage of lost ICMP ping packets."
@@ -15146,7 +14898,7 @@ msgstr "ルーマニア語 (ro_RO)"
 #: app/partials/monitoring.service.list.edit.php:55
 #: app/partials/monitoring.service.list.php:52
 msgid "Root cause"
-msgstr ""
+msgstr "根本原因"
 
 #: include/classes/widgets/forms/CWidgetForm.php:81
 msgid "Rows"
@@ -15163,7 +14915,7 @@ msgstr "ルール"
 #: include/actions.inc.php:635 include/actions.inc.php:813
 #, c-format
 msgid "Run script \"%1$s\" on Zabbix server"
-msgstr ""
+msgstr "Zabbixサーバー上でスクリプト\"%1$s\"を実行"
 
 #: include/actions.inc.php:648 include/actions.inc.php:826
 #, c-format
@@ -15189,12 +14941,12 @@ msgstr "ホスト上で指定したコマンドの実行。コマンドの実行
 msgid "Russian (ru_RU)"
 msgstr "ロシア語 (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15205,8 +14957,8 @@ msgstr "SAML認証の設定"
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15243,7 +14995,7 @@ msgstr "SMTPサーバーポート番号"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15339,12 +15091,12 @@ msgstr "SQL数: %1$s (selects: %2$s | executes: %3$s)"
 msgid "SQL query"
 msgstr "SQLクエリ"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "SQLの実行に失敗しました\"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "SQLの実行に失敗しました\"%1$s\"。"
@@ -15407,7 +15159,7 @@ msgstr "SSOサービスURL"
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15419,7 +15171,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "土"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "土曜"
 
@@ -15461,7 +15213,7 @@ msgstr "スケジュール"
 msgid "Scheduled check"
 msgstr "スケジュールされたチェック時刻"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr "定期レポート"
@@ -15525,7 +15277,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr "範囲"
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15538,8 +15290,7 @@ msgstr "範囲"
 msgid "Script"
 msgstr "スクリプト"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "スクリプト\"%1$s\"はすでに存在します。"
@@ -15570,12 +15321,6 @@ msgstr "スクリプト名"
 msgid "Script parameters"
 msgstr "スクリプトパラメータ"
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "メディアタイプ\"%2$s\"のためのスクリプトパラメータ\"%1$s\"に最後の改行がありません。"
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "スクリプトプロファイラ"
@@ -15588,7 +15333,7 @@ msgstr "スクリプトを更新しました"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "スクリプト"
 
@@ -15658,8 +15403,8 @@ msgid "Security name"
 msgstr "セキュリティ名"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15667,7 +15412,7 @@ msgstr "セキュリティ名"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "選択"
 
@@ -15703,19 +15448,19 @@ msgstr "選択した要素"
 msgid "Selected items only"
 msgstr "選択したアイテムのみ"
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "%3$dの%2$dの位置にある%1$sを選択しました"
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "%3$dの%2$dの位置にある読み込み専用の%1$sを選択しました"
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr "後面へ"
 
@@ -15740,7 +15485,7 @@ msgstr "次のメディアのみ使用"
 msgid "Send to"
 msgstr "送信先"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr "再後面へ"
 
@@ -15773,7 +15518,7 @@ msgstr "障害数と未確認数を表示"
 msgid "Separately"
 msgstr "別々に"
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "9月"
 
@@ -15804,28 +15549,28 @@ msgstr "サーバーまたはプロキシ"
 msgid "Server time"
 msgstr "サーバー時間"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "サービス"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15835,7 +15580,7 @@ msgstr ""
 msgid "Service actions"
 msgstr "サービスアクション"
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "サービスを作成しました"
 
@@ -15844,7 +15589,6 @@ msgid "Service data storage period"
 msgstr "サービスデータの保存期間"
 
 #: app/controllers/CControllerServiceDelete.php:69
-#, fuzzy
 msgid "Service deleted"
 msgid_plural "Services deleted"
 msgstr[0] "サービスを削除しました"
@@ -15867,16 +15611,16 @@ msgstr "サービスのポート"
 msgid "Service recovery"
 msgstr "サービスの復旧"
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "サービス開始時刻は終了時刻よりも前でなければなりません。"
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr "サービスのタグ名"
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr "サービスのタグの値"
 
@@ -15884,11 +15628,11 @@ msgstr "サービスのタグの値"
 msgid "Service time"
 msgstr "サービス時間"
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "サービスタイム"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "サービスのタイプ"
 
@@ -15897,38 +15641,37 @@ msgstr "サービスのタイプ"
 msgid "Service update"
 msgstr "サービスの更新"
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "サービスを更新しました"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "サービス"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "サービスの依存関係が循環設定されています。"
 
 #: app/controllers/CControllerPopupMassupdateService.php:150
 msgid "Services updated"
-msgstr ""
+msgstr "サービスを更新しました"
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr "セッション初期化エラー。"
 
@@ -15958,17 +15701,17 @@ msgstr "有効期限の設定"
 msgid "Set host inventory mode"
 msgstr "インベントリモードの設定"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr "新しい値を設定"
 
 #: app/views/popup.service.statusrule.edit.php:39
 msgid "Set status to"
-msgstr ""
+msgstr "設定するステータス"
 
 #: include/classes/helpers/CServiceHelper.php:28
 msgid "Set status to OK"
-msgstr ""
+msgstr "ステータスを正常に設定"
 
 #: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
 #: include/views/js/item.preprocessing.js.php:67
@@ -15987,7 +15730,7 @@ msgstr "LDAPプロトコルの設定に失敗しました。"
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr "LDAPリフェラルを「オフ」に設定できませんでした。"
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr "設定"
 
@@ -15996,7 +15739,7 @@ msgstr "設定"
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16052,7 +15795,7 @@ msgstr "図形"
 msgid "Shared"
 msgstr "共有済"
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "共有"
 
@@ -16194,7 +15937,7 @@ msgstr "Zabbixサーバー停止時にワーニングを表示"
 msgid "Show working time"
 msgstr "ワーキングタイムの表示"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "表示"
 
@@ -16303,7 +16046,7 @@ msgstr "ホスト\"%2$s\"へのグラフ\"%1$s\"のコピーをスキップし�
 msgid "Slovak (sk_SK)"
 msgstr "スロバキア語 (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "スヌーズ"
 
@@ -16349,7 +16092,7 @@ msgstr "このアイテムのヒストリの一部は圧縮されている可能
 msgid "Sort entries by"
 msgstr "次による項目のソート"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "ソート順(0->999)"
 
@@ -16423,7 +16166,7 @@ msgstr "開始時刻"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr "スライドショーの開始"
 
@@ -16526,14 +16269,18 @@ msgstr "Zabbixの書き込みキャッシュの統計。cacheがvaluesならmode
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "ステータス"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
-msgstr ""
+msgstr "ステータス計算ルール"
+
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr "ステータス計算ルールと追加ルールは子サービスが存在する時のみ適用されます。"
 
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
@@ -16564,9 +16311,9 @@ msgstr "ステータスのみ"
 msgid "Status problem"
 msgstr "障害"
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
-msgstr ""
+msgstr "ステータス伝搬ルール"
 
 #: include/actions.inc.php:1921
 #: include/classes/screens/CScreenHttpTestDetails.php:81
@@ -16612,7 +16359,7 @@ msgstr "処理の停止"
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr "スライドショーの停止"
 
@@ -16677,7 +16424,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "サブジェクト"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "サブマップ"
 
@@ -16693,7 +16440,7 @@ msgstr "配信先"
 msgid "Success Audit"
 msgstr "成功の監査"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr "成功メッセージ"
 
@@ -16706,7 +16453,7 @@ msgstr "ネットワークインターフェースの送受信合計値。整数
 msgid "Sun"
 msgstr "日"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "日曜"
 
@@ -16791,19 +16538,19 @@ msgstr "システム統計値。整数値または浮動小数点値を返す。
 #: include/classes/items/CHelpItems.php:257
 #: include/classes/items/CHelpItems.php:639
 msgid "System time. Returns integer with type as UTC; string - with type as local"
-msgstr ""
+msgstr "システム時刻。utcなら整数値、localなら文字列で返す"
 
 #: include/classes/items/CHelpItems.php:297
 #: include/classes/items/CHelpItems.php:679
 msgid "System uptime in seconds. Returns integer"
 msgstr "システムの稼働秒数。整数値を返す。"
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16830,17 +16577,17 @@ msgstr "真"
 msgid "Table \"%1$s\" does not exist."
 msgstr "テーブル\"%1$s\"は存在しません。"
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "テーブル\"%1$s\"にフィールド名\"%2$s\"が存在しません。"
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "タグ"
@@ -16896,7 +16643,7 @@ msgstr "タグの値"
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -16956,7 +16703,7 @@ msgstr "ターゲットタイプ"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -16977,7 +16724,7 @@ msgstr "テンプレート"
 msgid "Template \"%1$s\" already exists."
 msgstr "テンプレート\"%1$s\"はすでに存在します。"
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17001,7 +16748,7 @@ msgstr "テンプレートにリンクされて継承されているテンプレ
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "他のテンプレートを介しても同じテンプレートを複数回リンクすることはできません。"
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr "テンプレートのダッシュボード"
 
@@ -17061,7 +16808,7 @@ msgstr "同じ表示名\"%1$s\"を持つテンプレートがすでに存在し�
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17233,13 +16980,13 @@ msgstr "ホストがディスカバリされなくなったため%1$sに削除�
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "ディスカバリされたホストが見つかりませんでした。次のディスカバリルールの処理時に削除されます。"
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "イメージはアイコンのマッピング%1$sに使用されています。"
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17266,7 +17013,7 @@ msgstr "ユーザー属性にパラメータ\"%1$s\"がありません。"
 
 #: include/classes/core/CJsonRpc.php:177
 msgid "The received JSON is not a valid JSON-RPC request."
-msgstr ""
+msgstr "受信したJSONは有効なJSON-RPCリクエストではありません。"
 
 #: include/classes/core/CJsonRpc.php:182
 msgid "The requested remote-procedure does not exist / is not available"
@@ -17303,7 +17050,7 @@ msgstr "このフィールドはアイテム\"%1$s\"によって自動的に設�
 msgid "This is the test message from Zabbix"
 msgstr "これはZabbixからのテストメッセージです"
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "今月"
 
@@ -17311,7 +17058,7 @@ msgstr "今月"
 msgid "This month so far"
 msgstr "今月(現在まで)"
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "今週"
 
@@ -17319,7 +17066,7 @@ msgstr "今週"
 msgid "This week so far"
 msgstr "今週(現在まで)"
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "今年"
 
@@ -17339,7 +17086,7 @@ msgstr "絞り込み"
 msgid "Thu"
 msgstr "木"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "木曜"
 
@@ -17356,7 +17103,7 @@ msgstr "終了"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17389,7 +17136,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr "最後にプロキシにアクセスした時間。name - プロキシの名前。有効なparamsの値：lastaccess - UNIXタイムスタンプ、delay - 秒数。"
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "期間"
 
@@ -17441,12 +17188,11 @@ msgstr "タイムスタンプ"
 msgid "To"
 msgstr "終了"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "すべてのアイテムのため1つのホストインターフェースを選択する必要があります"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "今日"
 
@@ -17561,7 +17307,7 @@ msgstr "トレンドの保存期間"
 msgid "Trends"
 msgstr "トレンド"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17569,7 +17315,7 @@ msgstr "トレンド"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "トリガー"
 
@@ -17667,7 +17413,7 @@ msgstr "トリガー名"
 msgid "Trigger overview"
 msgstr "トリガーの概要"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17739,11 +17485,11 @@ msgstr "トリガーのプロトタイプを更新しました"
 msgid "Trigger severity"
 msgstr "トリガーの深刻度"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "トリガーのステータス \"正常\""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "トリガーのステータス \"障害\""
 
@@ -17760,7 +17506,7 @@ msgstr "トリガーを更新しました"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17795,7 +17541,7 @@ msgstr "前後文字列削除"
 msgid "Tue"
 msgstr "火"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "火曜"
 
@@ -17808,7 +17554,7 @@ msgstr "トルコ語 (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "2つのアイテム(\"%1$s\"と\"%2$s\")から1つのホストのインベントリフィールド\"%3$s\"を自動的に設定することはできません。"
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr "2つのマップ要素を選択する必要があります"
 
@@ -17824,19 +17570,19 @@ msgstr "2つのマップ要素を選択する必要があります"
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -17888,10 +17634,10 @@ msgstr "データ型"
 msgid "Types"
 msgstr "タイプ"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
-msgstr ""
+msgstr "ユーザーの役割\"%1$s\"にはUI要素\"%2$s\"は使用できません。"
 
 #: app/views/js/administration.regex.edit.js.php:194
 #: include/translateDefines.inc.php:25
@@ -17909,7 +17655,7 @@ msgstr "不明"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -17955,12 +17701,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "マップ\"%1$s\"のURLには\"name\"と\"url\"の両方のフィールドが必要です。"
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URL"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr "UUIDv4で指定してください"
 
@@ -18045,16 +17791,16 @@ msgstr "ブロックを解除"
 msgid "Unblock selected users?"
 msgstr "選択したユーザーのブロックを解除しますか？"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr "アクション%1$sから想定外の応答を受信しました。"
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
-msgstr ""
+msgstr "想定しないエラーが発生しました。"
 
 #: app/views/popup.massupdate.item.php:165
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:149
@@ -18070,21 +17816,23 @@ msgstr "単位"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "不明"
@@ -18102,7 +17850,7 @@ msgid "Unknown error"
 msgstr "不明なエラー"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "不明なアイテム。選択したホストにそのようなアイテムは存在しません"
@@ -18155,7 +17903,7 @@ msgstr "テンプレートとのリンクを解除"
 msgid "Unlink from templates"
 msgstr "テンプレートとのリンクを解除"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "ミュートを解除"
 
@@ -18185,7 +17933,7 @@ msgstr "サポートされていない実行内容です。"
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "アクション\"%1$s\"のフィルター条件ではパラメータ\"%2$s\"は使用できません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "ディスカバリルール\"%1$s\"のフィルター条件ではパラメータ\"%2$s\"はサポートされていません。"
@@ -18195,7 +17943,7 @@ msgstr "ディスカバリルール\"%1$s\"のフィルター条件ではパラ�
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "アクション\"%1$s\"のフィルターではパラメータ\"%2$s\"は使用できません。"
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "ディスカバリルール\"%1$s\"のフィルターではパラメータ\"%2$s\"はサポートされていません。"
@@ -18240,7 +17988,7 @@ msgstr "Up"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18253,7 +18001,7 @@ msgstr "Up"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18306,7 +18054,7 @@ msgstr "更新時の実行内容"
 msgid "Update problem"
 msgstr "障害更新"
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr "更新しました"
@@ -18324,7 +18072,7 @@ msgstr "アップロード"
 msgid "Upper level maps"
 msgstr "上位レベルのマップ"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18344,7 +18092,7 @@ msgstr "bulkリクエストを使用"
 
 #: app/views/administration.trigdisplay.edit.php:35
 msgid "Use custom event status colors"
-msgstr ""
+msgstr "イベントのステータスの文字色を変更"
 
 #: app/views/administration.user.edit.php:296 app/views/popup.media.php:88
 msgid "Use if severity"
@@ -18359,7 +18107,7 @@ msgstr "iframeサンドボックスを使用する"
 msgid "Used in actions"
 msgstr "アクションで使用"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18374,7 +18122,7 @@ msgstr "アクションで使用"
 msgid "User"
 msgstr "ユーザー"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "ユーザー\"%1$s\"にユーザーグループを設定してください。"
@@ -18412,7 +18160,7 @@ msgstr "ユーザー\"%1$s\"は代わりにレポート\"%2$s\"を作成した�
 #: app/controllers/CControllerUserUnblock.php:61
 #, c-format
 msgid "User \"%1$s\" unblocked."
-msgstr ""
+msgstr "ユーザー\"%1$s\"のブロックを解除しました。"
 
 #: include/actions.inc.php:1976
 msgid "User action"
@@ -18426,7 +18174,7 @@ msgstr "ユーザーを追加しました"
 msgid "User agent string"
 msgstr "ユーザーエージェント文字列"
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "ユーザーは無効のグループやGUIアクセスが無効のグループに自分自身を追加できません。"
@@ -18445,7 +18193,7 @@ msgid "User deleted"
 msgid_plural "Users deleted"
 msgstr[0] "ユーザーを削除しました"
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18455,27 +18203,27 @@ msgstr[0] "ユーザーを削除しました"
 msgid "User group"
 msgstr "ユーザーグループ"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "ユーザーグループ\"%1$s\"はすでに存在します。"
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr "ユーザーグループ\"%1$s\"はレポート\"%2$s\"の受信者です。"
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "ユーザーグループ\"%1$s\"は\"%2$s\"アクション内で使用されています。"
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "ユーザーグループ\"%1$s\"はデータベース停止メッセージの設定に利用されています。"
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "ユーザーグループ\"%1$s\"はスクリプト\"%2$s\"に利用されています。"
@@ -18507,8 +18255,8 @@ msgstr[0] "ユーザーグループを更新しました"
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18552,17 +18300,17 @@ msgstr "ユーザーのパスワード"
 msgid "User profile"
 msgstr "ユーザープロファイル"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr "ユーザーの役割"
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
-msgstr ""
+msgstr "ユーザーの役割\"%1$s\"は既に存在します。"
 
 #: app/controllers/CControllerUserroleCreate.php:141
 msgid "User role created"
@@ -18626,7 +18374,7 @@ msgstr "ユーザーを更新しました"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"のユーザーは使用できません。"
@@ -18942,14 +18690,14 @@ msgstr "バリデーション"
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -18959,7 +18707,7 @@ msgstr "バリデーション"
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19001,7 +18749,7 @@ msgstr "パラメータ\"grid_show\"の値\"%1$s\"が正しくありません。
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "パラメータ\"grid_show\"の値\"%1$s\"が正しくありません。\"%2$s\"を設定してください。"
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "フィールド\"%2$s\"の値\"%1$s\"が長過ぎます - %3$d文字。%4$d文字以内で設定してください。"
@@ -19018,7 +18766,7 @@ msgstr "値キャッシュの統計。有効なパラメータ：total, free, pf
 msgid "Value cannot be empty."
 msgstr "値を設定してください。"
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "値のマッピング"
 
@@ -19061,11 +18809,12 @@ msgstr "英語でWindowsパフォーマンスカウンターの値。数値、�
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "任意のパフォーマンスカウンター値。リクエストに応じて、整数値、浮動小数点値、文字列値、テキスト値を返す。"
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr "新しいイベントタグの値"
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr "古いイベントタグの値"
 
@@ -19112,7 +18861,7 @@ msgstr "VaultのAPIエンドポイント"
 msgid "Vault authentication token"
 msgstr "Vaultの認証トークン"
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr "Vaultへの接続に失敗しました。"
@@ -19197,9 +18946,9 @@ msgstr "ホスト名を設定しない場合、表示名は必須項目です。
 #: include/classes/helpers/CServiceHelper.php:57
 #: include/classes/helpers/CServiceHelper.php:67
 msgid "W"
-msgstr ""
+msgstr "W"
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
@@ -19216,16 +18965,16 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "警告"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr "警告メッセージ"
 
 #: include/blocks.inc.php:649
 #, c-format
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
-msgstr ""
+msgstr "警告！データベースサーバーのバージョン%1$sはサポートされていません。(%2$s)以上が必要です"
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "要素を保存できる最大値に達しました"
 
@@ -19241,7 +18990,7 @@ msgstr "要素を保存できる最大値に達しました"
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web"
 
@@ -19253,7 +19002,7 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Web監視"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr "Webシナリオ"
 
@@ -19268,25 +19017,25 @@ msgstr "Webシナリオ\"%1$s\"はホスト\"%2$s\"にすでに存在します�
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Webシナリオ\"%1$s\"はすでに存在します。"
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "Webシナリオを追加しました"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Webシナリオを削除しました"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Webシナリオを無効にしました"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Webシナリオを有効にしました"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "Webシナリオを更新しました"
 
@@ -19308,7 +19057,7 @@ msgstr "Webhookにはパラメータがありません。"
 msgid "Wed"
 msgstr "水"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "水曜"
 
@@ -19319,9 +19068,9 @@ msgstr "水曜"
 msgid "Weekly"
 msgstr "毎週"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
-msgstr ""
+msgstr "重み"
 
 #: include/classes/setup/CSetupWizard.php:45
 msgid "Welcome"
@@ -19335,12 +19084,12 @@ msgstr "ようこそ"
 msgid "When active"
 msgstr "有効な時間帯"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr "ダッシュボード\"%1$s\"のページ#%2$d上の X:%3$d, Y:%4$d のウィジェットは範囲外です。"
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr "指定された列と行の数に対してウィジェットが小さすぎます。"
 
@@ -19435,7 +19184,7 @@ msgstr "マップリンクの設定が正しくありません。"
 #: include/classes/api/services/CMap.php:977
 #: include/classes/api/services/CMap.php:1452
 msgid "Wrong value for \"url\" field."
-msgstr ""
+msgstr "\"url\"フィールドが正しくありません。"
 
 #: include/views/js/monitoring.sysmaps.js.php:303
 #: include/views/js/monitoring.sysmaps.js.php:436
@@ -19535,6 +19284,10 @@ msgstr "Y/m/d H:i"
 msgid "Y-m-d H:i:s"
 msgstr "Y/m/d H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr "Y-n-d"
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr "Y1"
@@ -19596,7 +19349,7 @@ msgstr "毎年"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19645,7 +19398,7 @@ msgstr "あなたはログインしていません"
 
 #: app/views/popup.generic.php:90
 msgid "You cannot switch hosts for current selection."
-msgstr ""
+msgstr "現在選択しているホストを切り替えることができません。"
 
 #: include/classes/api/services/CAction.php:1808
 #, c-format
@@ -19653,18 +19406,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr "アクションのグローバルスクリプト\"%1$s\"のターゲットが指定されていません。"
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19676,9 +19423,6 @@ msgstr "アクションのグローバルスクリプト\"%1$s\"のターゲッ�
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "操作に対する権限がありません。"
 
@@ -19704,7 +19448,7 @@ msgstr "Zabbix"
 
 #: include/classes/helpers/CMenuHelper.php:347
 msgid "Zabbix Integrations"
-msgstr ""
+msgstr "Zabbixインテグレーション"
 
 #: include/classes/helpers/CMenuHelper.php:340
 msgid "Zabbix Technical Support"
@@ -19749,6 +19493,9 @@ msgid ""
 "1. Incorrect server IP/DNS in the \"zabbix.conf.php\";\n"
 "2. Incorrect network configuration.\n"
 msgstr ""
+"Zabbixサーバー\"%1$s\"へ到達できません。以下の原因が考えられます：\n"
+"1. \"zabbix.conf.php\"に設定されたサーバーのIP/DNSが正しくない。\n"
+"2. ネットワークの設定が正しくない。\n"
 
 #: app/views/administration.script.edit.php:125
 msgid "Zabbix server (proxy)"
@@ -19794,24 +19541,28 @@ msgstr "[日の値が正しくありません: \"%1$s\"]"
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr "[月の値が正しくありません: \"%1$s\"]"
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr "DNS名を指定してください"
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr "論理値で指定してください"
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr "論理値で指定してください"
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "文字列で指定してください"
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr "日付はYYYY-MM-DDフォーマットで指定してください。"
 
@@ -19820,37 +19571,37 @@ msgid "a digit"
 msgstr "数字"
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr "浮動小数点の値で指定してください"
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
-msgstr ""
+msgstr "16進数のカラーコード(6桁)で指定してください"
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr "LLDマクロを指定してください"
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr "数値の小数の桁が多すぎます"
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr "数字で指定してください"
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr "数字が大きすぎます"
@@ -19871,28 +19622,29 @@ msgstr "相対的な時間で指定してください"
 msgid "a special character"
 msgstr "特殊記号"
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr "文字列か数字か空文字列で指定してください"
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr "時間で指定してください"
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr "期間を指定してください"
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr "時間範囲を指定してください"
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr "時間の単位を指定してください"
@@ -19940,7 +19692,7 @@ msgstr "すべて"
 msgid "all media"
 msgstr "すべてのメディア"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr "IPアドレスを指定してください"
 
@@ -19948,42 +19700,37 @@ msgstr "IPアドレスを指定してください"
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "配列で指定してください"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr "配列か文字列で指定してください"
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr "配列かオブジェクトで指定してください"
 
@@ -19993,7 +19740,7 @@ msgid "an empty string is expected"
 msgstr "空の文字列で指定してください"
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr "16進文字列で指定してください"
 
@@ -20001,11 +19748,15 @@ msgstr "16進文字列で指定してください"
 msgid "an explicit time is expected"
 msgstr "具体的な時間を指定してください"
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr "識別子は式で定義されていません"
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr "整数で指定してください"
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr "符号なし整数で指定してください"
 
@@ -20166,14 +19917,8 @@ msgstr "変更できません"
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20203,19 +19948,11 @@ msgstr "変更できません"
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20235,14 +19972,14 @@ msgstr "変更できません"
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20250,7 +19987,7 @@ msgstr "変更できません"
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "空白は指定できません"
@@ -20263,7 +20000,7 @@ msgstr "JSONに変換できません、結果の値が長すぎます"
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr "スクロールAPIリクエストを実行できません。データは切り捨てられます"
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr "テンプレートのディスカバリルールのプロパティを更新できません"
 
@@ -20297,9 +20034,9 @@ msgstr "循環する依存関係は許可されていません"
 msgid "circular item dependency is not allowed"
 msgstr "循環するアイテムの依存関係は許可されていません"
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
-msgstr ""
+msgstr "色"
 
 #: app/partials/monitoring.problem.filter.php:236
 #: include/classes/widgets/views/widget.problems.form.view.php:94
@@ -20315,7 +20052,8 @@ msgid "configure"
 msgstr "グローバルマクロ設定"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr "含む"
@@ -20344,7 +20082,7 @@ msgstr "count() - 期間Tで収集された値V(オペレータOを満たす)の
 msgid "countunique() - The number of unique values"
 msgstr "countunique() - ユニークな値の数"
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20406,7 +20144,7 @@ msgstr "降順"
 msgid "description"
 msgstr "説明"
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr "ディレクトリを指定してください"
 
@@ -20428,13 +20166,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr "ホスト\"%2$s\"上のディスカバリルール\"%1$s\"は監視されていません"
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr "含まない"
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr "等しくない"
@@ -20460,7 +20198,8 @@ msgid "e() - Returns Euler's number"
 msgstr "e() - オイラー数を返す"
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20497,6 +20236,10 @@ msgstr "条件式が指定されていません"
 msgid "failed to parse JSON"
 msgstr "JSONの解析に失敗しました"
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr "ファイル形式はサポートされていません"
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr "find() - 期間TでのパターンV(演算子0を満たす)の発生チェック(1 - 合致する、0 - 合致しない)"
@@ -20543,7 +20286,7 @@ msgstr "データの保存期間設定(全体設定)"
 msgid "graph pattern"
 msgstr "グラフのパターン"
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20584,6 +20327,11 @@ msgstr "アイコン"
 msgid "image"
 msgstr "イメージ"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr "画像サイズは%1$s以下にしてください"
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "期間中"
@@ -20624,15 +20372,19 @@ msgstr "要素の数が正しくありません"
 msgid "incorrect expression starting from \"%1$s\""
 msgstr "\"%1$s\"から始まる条件式が正しくありません"
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr "条件の数が正しくありません"
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "間違った書式が\"%1$s\"付近に見つかりました"
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr "関数\"%1$s\"の使い方が正しくありません"
@@ -20660,7 +20412,7 @@ msgstr "Prometheusパターンが正しくありません"
 msgid "invalid address range \"%1$s\""
 msgstr "アドレスの範囲 \"%1$s\"が正しくありません"
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr "UTF-8のバイトシーケンスが正しくありません"
 
@@ -20689,27 +20441,27 @@ msgstr "関数\"%1$s\"内の4番目のパラメーターが正しくありませ
 msgid "invalid history storage period"
 msgstr "ヒストリの保存期間が正しくありません"
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr "ホストグループ名が正しくありません"
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr "ホスト名が正しくありません"
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr "関数\"%1$s\"内のパラメーターの数が正しくありません"
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr "範囲の条件式が正しくありません"
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr "正規表現が正しくありません"
 
@@ -20737,7 +20489,7 @@ msgstr "以上"
 msgid "is less than or equals"
 msgstr "以下"
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr "{}で括られていないか不正な値です"
 
@@ -20823,12 +20575,12 @@ msgstr "ローレベルディスカバリルール"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr "ltrim() - 文字列の先頭から指定した文字列を削除"
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20887,7 +20639,7 @@ msgstr "一致する"
 msgid "max"
 msgstr "最大"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr "最大期間がデフォルトのフィルタ期間よりも小さいです"
 
@@ -20927,7 +20679,7 @@ msgid "min() - Minimum value for period T"
 msgstr "min() - 期間Tでの最小値"
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr "%1$s文字以上で指定してください"
@@ -20943,19 +20695,19 @@ msgstr "mod() - 割り算の余り"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:783
 msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
-msgstr ""
+msgstr "monodec() - アイテムの値が減少し続けているかチェック (1 - 単調、0 - その他)、モード (strict - 厳密な単調性)"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:790
 msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
-msgstr ""
+msgstr "monoinc() - アイテムの値が増加し続けているかチェック (1 - 単調、0 - その他)、モード (strict - 厳密な単調性)"
 
 #: include/func.inc.php:583
 msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr "%1$s文字の長さにしてください"
@@ -20968,29 +20720,16 @@ msgstr "有効なLDAPユーザーが必要です"
 #: include/classes/validators/CPasswordComplexityValidator.php:74
 #, c-format
 msgid "must be at least %1$d characters long"
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "\"%1$s\"から\"%2$s\"の値で設定してください"
+msgstr "少なくとも%1$d文字以上にしてください"
 
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
-msgstr ""
+msgstr "少なくとも数字を1文字含めるようにしてください"
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr "少なくとも1つのLLDマクロを含めることが必要です"
 
@@ -20998,25 +20737,33 @@ msgstr "少なくとも1つのLLDマクロを含めることが必要です"
 #: app/views/administration.user.edit.php:126
 #: include/classes/validators/CPasswordComplexityValidator.php:81
 msgid "must contain at least one lowercase and one uppercase Latin letter"
-msgstr ""
+msgstr "少なくとも英字の小文字1文字と大文字1文字を含めるようにしてください"
 
 #: app/views/administration.authentication.edit.php:60
 #: app/views/administration.user.edit.php:141
 #: include/classes/validators/CPasswordComplexityValidator.php:95
 msgid "must contain at least one special character"
-msgstr ""
+msgstr "少なくとも特殊記号を1文字含めるようにしてください"
 
 #: app/views/administration.authentication.edit.php:99
 #: app/views/administration.user.edit.php:148
 #: include/classes/validators/CPasswordComplexityValidator.php:108
 msgid "must not be one of common or context-specific passwords"
-msgstr ""
+msgstr "一般的なパスワードやコンテキスト固有のパスワードは使用しないでください"
 
 #: app/views/administration.authentication.edit.php:98
 #: app/views/administration.user.edit.php:147
 #: include/classes/validators/CPasswordComplexityValidator.php:102
 msgid "must not contain user's name, surname or username"
-msgstr ""
+msgstr "アカウント名やユーザーの姓名を含めないようにしてください"
+
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr "n-d"
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr "n-d H:i"
 
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
@@ -21028,7 +20775,7 @@ msgstr ""
 msgid "name"
 msgstr "名前"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "新規"
 
@@ -21163,7 +20910,7 @@ msgstr "出力"
 msgid "path/to/secret"
 msgstr "path/to/secret"
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr "path/to/secret:key"
 
@@ -21198,26 +20945,30 @@ msgstr "radians() - 値を角度からラジアンに変換"
 msgid "rand() - A random integer value"
 msgstr "rand() - ランダムな整数値"
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
-msgstr ""
+msgstr "子サービス\"%1$s\"への表示/設定アクセス権が必要です"
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
-msgstr ""
+msgstr "子サービス\"%1$s\"への表示/設定アクセス権を保持していません"
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
-msgstr ""
+msgstr "サービスへの表示/設定アクセス権が必要です"
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
-msgstr ""
+msgstr "サービスへの表示/設定アクセス権限を保持していません"
 
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:110
 msgid "reference to a non-existent tree element"
@@ -21243,11 +20994,11 @@ msgstr "正規表現"
 msgid "regular expression"
 msgstr "正規表現"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr "replace() - パターンを検索して指定文字列に置き換える"
 
@@ -21259,15 +21010,15 @@ msgstr "置換文字列"
 msgid "right"
 msgstr "右"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr "round() - 小数点以下桁数で四捨五入"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21309,13 +21060,13 @@ msgstr "選択"
 
 #: include/events.inc.php:38 include/events.inc.php:66
 msgid "service"
-msgstr ""
+msgstr "サービス"
 
 #: app/views/popup.service.time.edit.php:128
 msgid "short description"
 msgstr "説明"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21334,15 +21085,15 @@ msgstr "説明"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr "空にしてください"
 
@@ -21358,31 +21109,31 @@ msgstr "アイコンのマッピングを表示"
 msgid "sign in as guest"
 msgstr "ゲストとしてサインイン"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr "sin() - 値のサイン、ラジアンで示された角度の値"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr "sinh() - 値のハイパボリックサイン"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr "skewness() - 確率分布の非対称性を測定"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr "sqrt() - 値の平方根"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr "stddevpop() - 母標準偏差"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr "stddevsamp() - サンプル標準偏差"
 
@@ -21390,11 +21141,11 @@ msgstr "stddevsamp() - サンプル標準偏差"
 msgid "sum"
 msgstr "合計"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr "sum() - 期間Tでの合計値"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr "sumofsquares() - 平方和"
 
@@ -21410,8 +21161,8 @@ msgstr "指定された資格情報はユニークではありません"
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21422,7 +21173,7 @@ msgstr "指定された資格情報はユニークではありません"
 msgid "tag"
 msgstr "タグ"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr "tan() - 値のタンジェント"
 
@@ -21431,13 +21182,17 @@ msgstr "tan() - 値のタンジェント"
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "テンプレートID\"%1$s\"が%2$s回使用されています"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr "最後の改行がありません"
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21446,20 +21201,20 @@ msgstr "テンプレートID\"%1$s\"が%2$s回使用されています"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "パラメータ \"%1$s\"が指定されていません"
@@ -21491,39 +21246,39 @@ msgstr "第3"
 msgid "third parameter is expected"
 msgstr "3番目のパラメータを指定してください"
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr "デフォルトのフィルタ期間が最大期間を超えました"
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr "タイムシフト"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr "time() - 現在時刻"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr "timeleft() - 期間Tに基づく閾値に達するまでの時間"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr "trendavg() - 期間のシフトを含む期間Tでの平均値"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr "trendcount() - 期間Tで正常に取得した値の数"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr "trendmax() - 期間のシフトを含む期間Tでの最大値"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr "trendmin() - 期間のシフトを含む期間Tでの最小値"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr "trendsum() - 期間のシフトを含む期間Tでの合計値"
 
@@ -21537,7 +21292,7 @@ msgstr "トリガー"
 msgid "trigger does not allow manual closing"
 msgstr "トリガーは手動クローズを許可されていません"
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr "トリガー条件式には少なくとも1つの /host/key の参照が必要です"
 
@@ -21549,26 +21304,26 @@ msgstr "トリガーのプロトタイプは他のテンプレートやホスト
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr "リンクのあるトリガーは他のテンプレートやホストに移動できません"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr "trim() - 文字列の先頭から最後までより指定した文字列を削除"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr "truncate() - 小数点以下桁数で切り捨て"
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "検索文字列を入力"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr "アクセスできないURLです"
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21576,11 +21331,11 @@ msgstr "定数 \"%1$s\" が間違っています"
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr "定数値 \"%1$s\" が間違っています"
@@ -21597,10 +21352,10 @@ msgstr "キーの末尾が間違っています"
 msgid "unexpected end of macro"
 msgstr "マクロの末尾が間違っています"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21610,11 +21365,12 @@ msgstr "マクロの末尾が間違っています"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr "パラメータ \"%1$s\"が間違っています"
@@ -21640,8 +21396,8 @@ msgstr "テキスト\"%1$s\"が間違っています"
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21666,6 +21422,10 @@ msgstr "サポートされていない時間の単位です"
 msgid "unsupported version number"
 msgstr "サポートされていないバージョン番号です"
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr "大文字の識別子が必要です"
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21681,7 +21441,7 @@ msgstr "サポートされていないバージョン番号です"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21701,11 +21461,11 @@ msgstr "サポートされていないバージョン番号です"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "値"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr "値\"%1$s\"はすでにあります"
@@ -21723,76 +21483,83 @@ msgstr "値\"%1$s\"が存在しません"
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr "値%1$sはすでにあります"
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr "値が長すぎます"
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
-#, c-format
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
+#, fuzzy, c-format
 msgid "value must be %1$s"
-msgstr "値は%1$sにしてください"
+msgid_plural "value must be one of %1$s"
+msgstr[0] "値は%1$sにしてください"
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr "値は\"%1$s\"から\"%2$s\"までにしてください"
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
-msgstr ""
+msgstr "値は空にしてください"
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr "値は\"%1$s\"以下にしてください"
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr "値は\"%1$s\"以上にしてください"
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21804,27 +21571,25 @@ msgstr "値は\"%1$s\"以上にしてください"
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr "値は%1$sから指定してください"
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
-msgstr ""
+msgstr "値は%1$sの範囲内にしてください"
 
 #: include/classes/api/services/CItemGeneral.php:1560
 msgid "value of first parameter is too long"
 msgstr "最初のパラメータの値が長すぎます"
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr "新しいイベントタグの値"
 
@@ -21837,11 +21602,11 @@ msgstr "2つめのパラメータの値が長すぎます"
 msgid "value of third parameter must be one of %1$s"
 msgstr "3つめのパラメータの値は%1$sから選んでください"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr "varpop() - 母分散"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr "varsamp() - サンプル分散"
 
@@ -21858,7 +21623,7 @@ msgstr "ディスカバリルールのタイプが間違っている"
 msgid "wrong item type"
 msgstr "アイテムのタイプが間違っている"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/ka/LC_MESSAGES/frontend.po b/ui/locale/ka/LC_MESSAGES/frontend.po
index 1ff74acda18..f0bba2d538d 100644
--- a/ui/locale/ka/LC_MESSAGES/frontend.po
+++ b/ui/locale/ka/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2021-03-19 18:13+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: none\n"
@@ -92,7 +92,7 @@ msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d დღე"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -170,7 +170,7 @@ msgstr[0] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -182,7 +182,7 @@ msgid "%1$s of %2$s element in problem state"
 msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -212,13 +212,13 @@ msgstr[0] "დარჩა %1$s მცდელობა"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s წამი"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -237,13 +237,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -372,7 +372,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -430,10 +430,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "წვდომა აკრძალულია"
@@ -477,7 +473,7 @@ msgstr ""
 msgid "Ack"
 msgstr "დადასტ"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "დადასტურება"
 
@@ -485,7 +481,7 @@ msgstr "დადასტურება"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "დადასტურებულია"
@@ -498,7 +494,7 @@ msgstr "დადასტურებული PROBLEM მოვლენებ
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -525,9 +521,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -584,7 +580,7 @@ msgstr "მოქმედება \"%1$s\" უკვე არსებობ�
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -593,7 +589,7 @@ msgstr ""
 msgid "Action added"
 msgstr "მოქმედება დაემატა"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -640,8 +636,8 @@ msgstr "მოქმედება განახლდა"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "მოქმედებები"
@@ -709,7 +705,7 @@ msgstr ""
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -720,7 +716,7 @@ msgstr ""
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -743,9 +739,9 @@ msgstr ""
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -815,7 +811,7 @@ msgstr ""
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "დამატება"
 
@@ -823,11 +819,11 @@ msgstr "დამატება"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr ""
 
@@ -835,7 +831,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -852,7 +848,7 @@ msgstr "ჰოსტის დამატება"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr ""
 
@@ -874,7 +870,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -926,12 +922,12 @@ msgstr ""
 msgid "Add widget"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -941,7 +937,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -954,7 +950,7 @@ msgstr "ადმინისტრატორი"
 msgid "Administration"
 msgstr "ადმინისტრაცია"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -976,7 +972,7 @@ msgstr "ასაკი ნაკლებია ვიდრე"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1048,7 +1044,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "ყველა"
 
@@ -1066,7 +1062,7 @@ msgstr ""
 msgid "All hosts"
 msgstr "ყველა ჰოსტი"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr ""
 
@@ -1084,7 +1080,7 @@ msgstr ""
 msgid "All problems if tag values match"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1197,15 +1193,15 @@ msgstr "პროგრამის შეცდომა."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "გამოყენება"
 
@@ -1223,7 +1219,7 @@ msgstr ""
 msgid "Apr"
 msgstr "აპრ"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "აპრილი"
 
@@ -1251,7 +1247,7 @@ msgstr ""
 msgid "Arithmetic"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1298,7 +1294,7 @@ msgstr ""
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1307,7 +1303,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1319,6 +1315,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1330,7 +1331,7 @@ msgstr ""
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1386,7 +1387,7 @@ msgstr ""
 msgid "Aug"
 msgstr "აგვ"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "აგვისტო"
 
@@ -1399,7 +1400,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1476,7 +1477,7 @@ msgstr ""
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1491,7 +1492,7 @@ msgstr "ხატულების ავტომატური მისა�
 msgid "Automatic icon selection"
 msgstr "ხატულების ავტომატური არჩევა"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1543,7 +1544,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1606,7 +1607,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "დაბლოკილია"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "ლურჯი"
 
@@ -1661,11 +1662,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "ქვედა"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr ""
 
@@ -1692,7 +1693,7 @@ msgstr "CERT"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1739,8 +1740,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1749,7 +1750,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "გამოთვლადი"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1774,7 +1775,7 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1787,8 +1788,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "გაუქმება"
 
@@ -1818,7 +1819,7 @@ msgstr "მოქმედების დამატება ვერ მო
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1828,7 +1829,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "ჰოსტიდან შაბლონში დამოკიდებულების დამატება ვერ მოხერხდა."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1859,8 +1860,8 @@ msgid "Cannot add host prototype"
 msgstr "ჰოსტის პროტოტიპის დამატება ვერ მოხერხდა"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "გამოსახულების დამატება ვერ მოხერხდა"
 
@@ -1951,15 +1952,15 @@ msgstr "მომხმარებლის დამატება ვერ
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "ვებ სცენარის დამატება ვერ მოხერხდა"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1979,33 +1980,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "ისტორიის გაწმენდა ვერ მოხერხდა"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "გრაფიკის პროტოტიპების კლონირება ვერ მოხერხდა."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "ჰოსტის პროტოტიპების კლონირება ვერ მოხერხდა."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "ელემენტის პროტოტიპების კლონირება ვერ მოხერხდა."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "ტრიგერის პროტოტიპების კლონირება ვერ მოხერხდა."
 
@@ -2031,7 +2028,7 @@ msgid "Cannot copy graph"
 msgid_plural "Cannot copy graphs"
 msgstr[0] ""
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] ""
@@ -2081,8 +2078,8 @@ msgstr ""
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2110,7 +2107,7 @@ msgstr "Zabbix-ის შიდა მომხმარებლის \"%1$s\"
 msgid "Cannot delete action"
 msgstr "მოქმედების წაშლა ვერ მოხერხდა"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2171,7 +2168,7 @@ msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one
 msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group."
 msgstr[0] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2181,11 +2178,11 @@ msgstr[0] ""
 msgid "Cannot delete host prototypes"
 msgstr ""
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr ""
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "გამოსახულების წაშლა ვერ მოხერხდა"
 
@@ -2210,7 +2207,7 @@ msgstr "ელემენტის პროტოტიპის წაშლ�
 msgid "Cannot delete item prototypes"
 msgstr "ელემენტის პროტოტიპების წაშლა ვერ მოხერხდა"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "ელემენტების წაშლა ვერ მოხერხდა"
 
@@ -2238,7 +2235,7 @@ msgid "Cannot delete proxy"
 msgid_plural "Cannot delete proxies"
 msgstr[0] ""
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2258,7 +2255,7 @@ msgid "Cannot delete script"
 msgid_plural "Cannot delete scripts"
 msgstr[0] ""
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "სცენარების წაშლა ვერ მოხერხდა. სცენარი \"%1$s\" გამოიყენება მოქმედების ოპერაციაში \"%2$s\"."
@@ -2273,8 +2270,8 @@ msgid "Cannot delete service"
 msgid_plural "Cannot delete services"
 msgstr[0] "სერვისის წაშლა ვერ მოხერხდა"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2303,7 +2300,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr ""
 
@@ -2353,7 +2350,7 @@ msgid "Cannot delete user role"
 msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "ვებ სცენარის წაშლა ვერ მოხერხდა"
 
@@ -2383,7 +2380,7 @@ msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
@@ -2409,7 +2406,7 @@ msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -2450,7 +2447,7 @@ msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
@@ -2476,7 +2473,7 @@ msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
@@ -2489,7 +2486,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2523,8 +2520,8 @@ msgstr ""
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2622,24 +2619,20 @@ msgstr ""
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2651,7 +2644,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr ""
 
@@ -2665,7 +2658,7 @@ msgid "Cannot link template."
 msgstr ""
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2696,17 +2689,17 @@ msgstr ""
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr ""
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr ""
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr ""
@@ -2733,7 +2726,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr ""
 
@@ -2752,7 +2745,7 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2792,12 +2785,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2815,7 +2808,7 @@ msgid "Cannot unblock user"
 msgid_plural "Cannot unblock users"
 msgstr[0] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
@@ -2828,7 +2821,7 @@ msgstr ""
 msgid "Cannot unlink template."
 msgstr ""
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2881,11 +2874,6 @@ msgstr ""
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr ""
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2895,8 +2883,9 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
@@ -2955,9 +2944,7 @@ msgstr ""
 msgid "Cannot update group"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
@@ -2979,13 +2966,13 @@ msgstr[0] ""
 msgid "Cannot update hosts"
 msgstr ""
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr ""
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr ""
 
@@ -3038,12 +3025,12 @@ msgstr ""
 msgid "Cannot update proxy"
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3063,17 +3050,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr ""
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3146,7 +3133,7 @@ msgstr[0] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr ""
 
@@ -3246,8 +3233,8 @@ msgid "Character string not included"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3362,7 +3349,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr ""
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3383,7 +3370,7 @@ msgstr ""
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3404,11 +3391,11 @@ msgstr ""
 msgid "Clear when unlinking"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3423,7 +3410,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3438,7 +3425,7 @@ msgstr ""
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr ""
 
@@ -3449,8 +3436,8 @@ msgstr ""
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr ""
 
@@ -3461,13 +3448,13 @@ msgstr ""
 msgid "Close expression constructor"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
 
@@ -3480,8 +3467,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr ""
 
@@ -3498,7 +3485,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3564,7 +3551,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3575,17 +3562,12 @@ msgstr ""
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3595,17 +3577,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3621,7 +3598,7 @@ msgstr ""
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr ""
 
@@ -3684,7 +3661,7 @@ msgstr ""
 msgid "Configuration of housekeeping"
 msgstr ""
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr ""
@@ -3791,7 +3768,7 @@ msgstr ""
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr ""
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3884,7 +3861,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3944,7 +3921,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -3983,8 +3960,8 @@ msgstr ""
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr ""
 
@@ -3993,12 +3970,11 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr ""
@@ -4022,16 +3998,6 @@ msgid "Correlation enabled"
 msgid_plural "Correlations enabled"
 msgstr[0] ""
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr ""
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr ""
@@ -4040,14 +4006,10 @@ msgstr ""
 msgid "Correlation updated"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr ""
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr ""
 
@@ -4111,11 +4073,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr ""
 
@@ -4232,7 +4194,7 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr ""
 
@@ -4256,7 +4218,7 @@ msgstr ""
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr ""
 
@@ -4419,7 +4381,7 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr ""
@@ -4431,11 +4393,11 @@ msgstr ""
 msgid "Daily"
 msgstr ""
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4456,8 +4418,8 @@ msgstr ""
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr ""
 
@@ -4479,9 +4441,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr ""
 
@@ -4505,7 +4467,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4533,7 +4495,7 @@ msgstr ""
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4675,7 +4637,7 @@ msgstr ""
 msgid "Days"
 msgstr ""
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr ""
 
@@ -4689,26 +4651,26 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr ""
 
@@ -4801,7 +4763,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4825,8 +4787,8 @@ msgstr ""
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr ""
 
@@ -4851,11 +4813,11 @@ msgstr ""
 msgid "Delete current action?"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4899,7 +4861,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -4955,7 +4917,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr ""
 
@@ -5060,7 +5022,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5104,7 +5066,7 @@ msgstr ""
 msgid "Delete web scenario?"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5149,7 +5111,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr ""
 
@@ -5157,7 +5119,7 @@ msgstr ""
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5167,7 +5129,7 @@ msgstr ""
 msgid "Deployment status"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5200,7 +5162,7 @@ msgid "Description"
 msgstr ""
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5366,10 +5328,10 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5452,7 +5414,7 @@ msgid "Discovery by proxy"
 msgstr ""
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr ""
 
@@ -5464,7 +5426,7 @@ msgstr ""
 msgid "Discovery list"
 msgstr ""
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr ""
 
@@ -5496,7 +5458,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5504,12 +5466,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
@@ -5522,7 +5484,7 @@ msgstr ""
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5560,7 +5522,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5571,7 +5533,7 @@ msgstr ""
 msgid "Discovery rules deleted"
 msgstr ""
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr ""
@@ -5608,10 +5570,11 @@ msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
@@ -5621,7 +5584,7 @@ msgstr ""
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5643,7 +5606,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
@@ -5699,7 +5662,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5707,7 +5670,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr ""
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5726,18 +5689,6 @@ msgstr ""
 msgid "Draw style"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5750,11 +5701,6 @@ msgstr ""
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5806,7 +5752,7 @@ msgstr ""
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
@@ -5815,11 +5761,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5833,8 +5779,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr ""
 
@@ -5850,11 +5796,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr ""
 
@@ -5914,21 +5860,17 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
@@ -5944,25 +5886,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -5972,14 +5908,6 @@ msgstr ""
 msgid "Empty map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr ""
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6145,7 +6073,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6156,7 +6084,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6199,7 +6127,7 @@ msgid "English (en_US)"
 msgstr ""
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6215,7 +6143,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6234,12 +6162,12 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6266,7 +6194,7 @@ msgstr ""
 msgid "Event acknowledged"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6274,7 +6202,7 @@ msgid "Event correlation"
 msgstr ""
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr ""
@@ -6309,11 +6237,11 @@ msgstr ""
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6357,15 +6285,10 @@ msgstr ""
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6403,7 +6326,7 @@ msgstr ""
 msgid "Executed script"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr ""
 
@@ -6419,8 +6342,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr ""
 
@@ -6541,7 +6464,7 @@ msgstr ""
 msgid "External check"
 msgstr ""
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
@@ -6568,8 +6491,8 @@ msgstr ""
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6580,26 +6503,26 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6607,7 +6530,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6631,7 +6554,7 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr ""
 
@@ -6653,10 +6576,9 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6667,13 +6589,6 @@ msgstr ""
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6692,11 +6607,6 @@ msgstr ""
 msgid "Field \"%1$s\" is not string."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6711,10 +6621,6 @@ msgstr ""
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr ""
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6779,7 +6685,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6804,7 +6711,7 @@ msgstr ""
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6856,7 +6763,7 @@ msgstr ""
 msgid "Fixed"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6907,12 +6814,12 @@ msgstr ""
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -6925,7 +6832,7 @@ msgstr ""
 msgid "Fri"
 msgstr ""
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr ""
 
@@ -7036,7 +6943,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr ""
@@ -7050,7 +6957,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr ""
 
@@ -7088,7 +6995,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr ""
 
@@ -7096,7 +7003,7 @@ msgstr ""
 msgid "Gradient line"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7155,7 +7062,7 @@ msgstr[0] ""
 msgid "Graph deleted"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7192,8 +7099,8 @@ msgstr ""
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7227,8 +7134,8 @@ msgstr ""
 msgid "Graph updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7259,7 +7166,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr ""
 
@@ -7280,12 +7187,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr ""
@@ -7458,11 +7365,11 @@ msgstr ""
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr ""
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr ""
 
@@ -7489,11 +7396,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7514,7 +7421,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr ""
 
@@ -7522,11 +7429,15 @@ msgstr ""
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr ""
 
@@ -7569,7 +7480,7 @@ msgstr ""
 msgid "Horizontal align"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7598,7 +7509,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7611,7 +7522,7 @@ msgstr[0] ""
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7619,7 +7530,7 @@ msgstr ""
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7669,7 +7580,7 @@ msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7683,22 +7594,22 @@ msgstr[0] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7711,10 +7622,10 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7730,8 +7641,8 @@ msgstr ""
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7805,7 +7716,7 @@ msgstr ""
 msgid "Host networks"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7884,7 +7795,7 @@ msgstr ""
 msgid "Host updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr ""
@@ -7904,7 +7815,7 @@ msgstr ""
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -7917,7 +7828,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -7965,7 +7876,7 @@ msgstr ""
 msgid "Hours"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8005,7 +7916,7 @@ msgstr ""
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr ""
@@ -8030,7 +7941,7 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8087,12 +7998,12 @@ msgstr ""
 msgid "Icon map"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
@@ -8105,18 +8016,18 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
@@ -8215,23 +8126,20 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -8240,7 +8148,7 @@ msgstr ""
 msgid "Image added"
 msgstr ""
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr ""
 
@@ -8248,18 +8156,12 @@ msgstr ""
 msgid "Image label type"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr ""
 
@@ -8354,7 +8256,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8365,13 +8267,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr ""
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8415,7 +8317,7 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8583,24 +8485,6 @@ msgstr ""
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8655,8 +8539,6 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
@@ -8682,31 +8564,22 @@ msgstr ""
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8735,7 +8608,7 @@ msgstr ""
 msgid "Incorrect eventsource value."
 msgstr ""
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
@@ -8760,22 +8633,17 @@ msgstr ""
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8786,7 +8654,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
@@ -8814,8 +8682,6 @@ msgstr ""
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8877,10 +8743,6 @@ msgstr ""
 msgid "Incorrect map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr ""
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -8938,13 +8800,13 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr ""
 
@@ -8997,12 +8859,7 @@ msgstr ""
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
@@ -9048,13 +8905,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9071,60 +8928,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr ""
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr ""
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9179,14 +9006,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9296,25 +9117,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9325,7 +9128,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9371,16 +9174,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9389,7 +9193,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9477,12 +9281,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr ""
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr ""
 
@@ -9586,7 +9390,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr ""
 
@@ -9594,7 +9398,7 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9605,7 +9409,7 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9628,7 +9432,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9660,7 +9464,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
@@ -9685,27 +9489,29 @@ msgstr ""
 msgid "Invalid method parameters."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9731,17 +9537,17 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9749,8 +9555,8 @@ msgstr ""
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9764,106 +9570,116 @@ msgstr ""
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9905,43 +9721,38 @@ msgstr ""
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -9962,7 +9773,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr ""
 
@@ -10003,7 +9814,7 @@ msgstr ""
 msgid "Italian (it_IT)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10035,7 +9846,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10049,7 +9860,7 @@ msgstr ""
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] ""
@@ -10062,12 +9873,12 @@ msgstr ""
 msgid "Item deleted"
 msgstr ""
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -10076,7 +9887,7 @@ msgstr[0] ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr ""
 
@@ -10085,7 +9896,7 @@ msgstr ""
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10121,8 +9932,8 @@ msgid "Item prototype updated"
 msgid_plural "Item prototypes updated"
 msgstr[0] ""
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10148,7 +9959,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10180,8 +9991,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10232,11 +10043,11 @@ msgstr ""
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr ""
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr ""
 
@@ -10254,7 +10065,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10279,6 +10090,10 @@ msgstr ""
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10291,7 +10106,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10309,7 +10124,7 @@ msgstr ""
 msgid "Jan"
 msgstr ""
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr ""
 
@@ -10331,7 +10146,7 @@ msgstr ""
 msgid "Jul"
 msgstr ""
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr ""
 
@@ -10339,7 +10154,7 @@ msgstr ""
 msgid "Jun"
 msgstr ""
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr ""
 
@@ -10489,22 +10304,6 @@ msgid "Last %1$d year"
 msgid_plural "Last %1$d years"
 msgstr[0] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10516,11 +10315,11 @@ msgstr ""
 msgid "Last check"
 msgstr ""
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr ""
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr ""
 
@@ -10558,11 +10357,11 @@ msgstr ""
 msgid "Last value"
 msgstr ""
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr ""
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10571,11 +10370,11 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr ""
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr ""
 
@@ -10616,7 +10415,7 @@ msgstr ""
 msgid "Left trim"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -10897,7 +10696,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
@@ -10919,7 +10718,7 @@ msgstr ""
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -10930,12 +10729,12 @@ msgid "Macro"
 msgstr ""
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
@@ -10963,7 +10762,7 @@ msgstr ""
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -10971,7 +10770,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11054,7 +10853,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11076,13 +10875,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr ""
 
@@ -11151,7 +10950,7 @@ msgstr ""
 msgid "Map update failed."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11183,7 +10982,7 @@ msgstr ""
 msgid "Mar"
 msgstr ""
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr ""
 
@@ -11287,7 +11086,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11300,7 +11099,7 @@ msgstr[0] ""
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr ""
 
@@ -11315,15 +11114,12 @@ msgstr ""
 msgid "Media"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr ""
@@ -11347,11 +11143,6 @@ msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] ""
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr ""
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11381,7 +11172,7 @@ msgstr ""
 msgid "Media types"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11469,7 +11260,7 @@ msgstr ""
 msgid "Method not found."
 msgstr ""
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11531,7 +11322,7 @@ msgid "Minimum severity"
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11589,7 +11380,7 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11623,7 +11414,7 @@ msgstr[0] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11649,7 +11440,7 @@ msgstr ""
 msgid "Mon"
 msgstr ""
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr ""
 
@@ -11689,11 +11480,11 @@ msgstr ""
 msgid "Monthly"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11717,7 +11508,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr ""
 
@@ -11730,7 +11521,7 @@ msgstr ""
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr ""
 
@@ -11859,11 +11650,11 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12021,19 +11812,21 @@ msgstr ""
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr ""
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr ""
 
@@ -12045,7 +11838,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12053,7 +11846,7 @@ msgstr ""
 msgid "New service time"
 msgstr ""
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12062,7 +11855,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12080,7 +11873,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12109,30 +11902,6 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr ""
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12148,11 +11917,6 @@ msgstr ""
 msgid "No \"%1$s\" given for map."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12160,7 +11924,7 @@ msgstr ""
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -12170,7 +11934,7 @@ msgstr ""
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -12187,11 +11951,6 @@ msgstr ""
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr ""
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12222,7 +11981,7 @@ msgstr ""
 msgid "No details"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr ""
 
@@ -12258,7 +12017,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr ""
 
@@ -12288,7 +12047,7 @@ msgstr ""
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr ""
 
@@ -12322,7 +12081,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr ""
 
@@ -12330,17 +12089,46 @@ msgstr ""
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12348,7 +12136,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12376,19 +12164,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12403,16 +12190,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12432,12 +12225,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12458,27 +12249,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12495,14 +12288,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12511,7 +12304,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
@@ -12531,7 +12324,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr ""
 
@@ -12543,7 +12336,7 @@ msgstr ""
 msgid "No target selected"
 msgstr ""
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr ""
 
@@ -12560,7 +12353,7 @@ msgstr ""
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr ""
 
@@ -12630,15 +12423,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12670,7 +12463,7 @@ msgstr ""
 msgid "Not supported"
 msgstr ""
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr ""
@@ -12701,7 +12494,7 @@ msgstr ""
 msgid "Nov"
 msgstr ""
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr ""
 
@@ -12888,8 +12681,8 @@ msgstr ""
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -12949,13 +12742,13 @@ msgstr ""
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr ""
 
@@ -12963,30 +12756,31 @@ msgstr ""
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr ""
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr ""
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr ""
 
@@ -13002,35 +12796,15 @@ msgstr ""
 msgid "One"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr ""
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr ""
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13078,10 +12852,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr ""
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13090,15 +12860,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr ""
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr ""
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr ""
 
@@ -13107,7 +12873,7 @@ msgstr ""
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13116,11 +12882,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr ""
 
@@ -13142,7 +12908,7 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13151,33 +12917,33 @@ msgstr ""
 msgid "Operations"
 msgstr ""
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr ""
 
@@ -13286,7 +13052,7 @@ msgstr ""
 msgid "Other parameters"
 msgstr ""
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr ""
@@ -13300,7 +13066,7 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13329,7 +13095,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13518,7 +13284,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13563,7 +13329,7 @@ msgstr ""
 msgid "PSK identity"
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13586,16 +13352,16 @@ msgstr ""
 msgid "Parameter"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr ""
@@ -13625,7 +13391,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13642,7 +13408,7 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13654,11 +13420,6 @@ msgstr ""
 msgid "Parse"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr ""
@@ -13719,7 +13480,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr ""
 
@@ -13729,15 +13490,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13783,12 +13544,11 @@ msgstr ""
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr ""
 
@@ -13877,7 +13637,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr ""
 
@@ -13917,7 +13677,7 @@ msgstr ""
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14006,7 +13766,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14137,7 +13897,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr ""
 
@@ -14150,21 +13910,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14178,9 +13934,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr ""
 
@@ -14214,7 +13970,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr ""
 
@@ -14235,13 +13991,13 @@ msgstr ""
 msgid "Proxies"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14249,7 +14005,7 @@ msgstr ""
 msgid "Proxy"
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14259,12 +14015,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
@@ -14356,7 +14112,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14433,10 +14189,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr ""
@@ -14518,7 +14270,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14536,13 +14288,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr ""
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14574,7 +14326,7 @@ msgstr ""
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14606,8 +14358,6 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14628,7 +14378,9 @@ msgstr ""
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14641,7 +14393,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14718,8 +14470,8 @@ msgstr ""
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr ""
 
@@ -14759,7 +14511,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14801,7 +14553,7 @@ msgid "Replace dependencies"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14856,7 +14608,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -14898,8 +14650,8 @@ msgstr ""
 msgid "Required string"
 msgstr ""
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr ""
 
@@ -14932,7 +14684,7 @@ msgstr ""
 msgid "Reset defaults"
 msgstr ""
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr ""
 
@@ -14998,7 +14750,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr ""
@@ -15185,12 +14937,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr ""
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15201,8 +14953,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr ""
 
@@ -15239,7 +14991,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15335,12 +15087,12 @@ msgstr ""
 msgid "SQL query"
 msgstr ""
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr ""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
@@ -15403,7 +15155,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr ""
 
@@ -15415,7 +15167,7 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr ""
 
@@ -15457,7 +15209,7 @@ msgstr ""
 msgid "Scheduled check"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15521,7 +15273,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15534,8 +15286,7 @@ msgstr ""
 msgid "Script"
 msgstr ""
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
@@ -15566,12 +15317,6 @@ msgstr ""
 msgid "Script parameters"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr ""
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr ""
@@ -15584,7 +15329,7 @@ msgstr ""
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr ""
 
@@ -15654,8 +15399,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15663,7 +15408,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr ""
 
@@ -15699,19 +15444,19 @@ msgstr ""
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr ""
 
@@ -15736,7 +15481,7 @@ msgstr ""
 msgid "Send to"
 msgstr ""
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr ""
 
@@ -15769,7 +15514,7 @@ msgstr ""
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr ""
 
@@ -15800,28 +15545,28 @@ msgstr ""
 msgid "Server time"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr ""
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15831,7 +15576,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr ""
 
@@ -15862,16 +15607,16 @@ msgstr ""
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -15879,11 +15624,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr ""
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr ""
 
@@ -15892,30 +15637,29 @@ msgstr ""
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -15923,7 +15667,7 @@ msgstr ""
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -15953,7 +15697,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -15982,7 +15726,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -15991,7 +15735,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16047,7 +15791,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr ""
 
@@ -16189,7 +15933,7 @@ msgstr ""
 msgid "Show working time"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr ""
 
@@ -16298,7 +16042,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr ""
 
@@ -16344,7 +16088,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr ""
 
@@ -16418,7 +16162,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16521,15 +16265,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr ""
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr ""
@@ -16559,7 +16307,7 @@ msgstr ""
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16607,7 +16355,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16672,7 +16420,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr ""
 
@@ -16688,7 +16436,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr ""
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16701,7 +16449,7 @@ msgstr ""
 msgid "Sun"
 msgstr ""
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr ""
 
@@ -16793,12 +16541,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16825,17 +16573,17 @@ msgstr ""
 msgid "Table \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr ""
@@ -16891,7 +16639,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -16951,7 +16699,7 @@ msgstr ""
 msgid "Telnet"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -16972,7 +16720,7 @@ msgstr ""
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -16996,7 +16744,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17056,7 +16804,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17228,13 +16976,13 @@ msgstr ""
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17298,7 +17046,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr ""
 
@@ -17306,7 +17054,7 @@ msgstr ""
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr ""
 
@@ -17314,7 +17062,7 @@ msgstr ""
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr ""
 
@@ -17334,7 +17082,7 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr ""
 
@@ -17351,7 +17099,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17384,7 +17132,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr ""
 
@@ -17436,12 +17184,11 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr ""
 
@@ -17556,7 +17303,7 @@ msgstr ""
 msgid "Trends"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17564,7 +17311,7 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr ""
 
@@ -17662,7 +17409,7 @@ msgstr ""
 msgid "Trigger overview"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17734,11 +17481,11 @@ msgstr ""
 msgid "Trigger severity"
 msgstr ""
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17755,7 +17502,7 @@ msgstr ""
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17790,7 +17537,7 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr ""
 
@@ -17803,7 +17550,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17819,19 +17566,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -17883,7 +17630,7 @@ msgstr ""
 msgid "Types"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -17904,7 +17651,7 @@ msgstr ""
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr ""
 
@@ -17950,12 +17697,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18040,12 +17787,12 @@ msgstr ""
 msgid "Unblock selected users?"
 msgstr ""
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18065,21 +17812,23 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr ""
@@ -18097,7 +17846,7 @@ msgid "Unknown error"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
@@ -18150,7 +17899,7 @@ msgstr ""
 msgid "Unlink from templates"
 msgstr ""
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr ""
 
@@ -18180,7 +17929,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -18190,7 +17939,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -18235,7 +17984,7 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18248,7 +17997,7 @@ msgstr ""
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18301,7 +18050,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18319,7 +18068,7 @@ msgstr ""
 msgid "Upper level maps"
 msgstr ""
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18354,7 +18103,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18369,7 +18118,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
@@ -18421,7 +18170,7 @@ msgstr ""
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
@@ -18440,7 +18189,7 @@ msgid "User deleted"
 msgid_plural "Users deleted"
 msgstr[0] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18450,27 +18199,27 @@ msgstr[0] ""
 msgid "User group"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
@@ -18502,8 +18251,8 @@ msgstr[0] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18547,14 +18296,14 @@ msgstr ""
 msgid "User profile"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18621,7 +18370,7 @@ msgstr ""
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -18937,14 +18686,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -18954,7 +18703,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -18996,7 +18745,7 @@ msgstr ""
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr ""
@@ -19013,7 +18762,7 @@ msgstr ""
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr ""
 
@@ -19056,11 +18805,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr ""
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19107,7 +18857,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19194,7 +18944,7 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19211,7 +18961,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19220,7 +18970,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19236,7 +18986,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr ""
 
@@ -19248,7 +18998,7 @@ msgstr ""
 msgid "Web monitoring"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr ""
 
@@ -19263,25 +19013,25 @@ msgstr ""
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr ""
 
@@ -19303,7 +19053,7 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr ""
 
@@ -19314,7 +19064,7 @@ msgstr ""
 msgid "Weekly"
 msgstr ""
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19330,12 +19080,12 @@ msgstr ""
 msgid "When active"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19530,6 +19280,10 @@ msgstr ""
 msgid "Y-m-d H:i:s"
 msgstr ""
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr ""
@@ -19591,7 +19345,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19648,18 +19402,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19671,9 +19419,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
@@ -19789,24 +19534,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr ""
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19815,37 +19564,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr ""
@@ -19866,28 +19615,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr ""
@@ -19935,7 +19685,7 @@ msgstr ""
 msgid "all media"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -19943,42 +19693,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -19988,7 +19733,7 @@ msgid "an empty string is expected"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr ""
 
@@ -19996,11 +19741,15 @@ msgstr ""
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20161,14 +19910,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20198,19 +19941,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20230,14 +19965,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20245,7 +19980,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr ""
@@ -20258,7 +19993,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20292,7 +20027,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20310,7 +20045,8 @@ msgid "configure"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20339,7 +20075,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20401,7 +20137,7 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20423,13 +20159,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20455,7 +20191,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20492,6 +20229,10 @@ msgstr ""
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20538,7 +20279,7 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr ""
@@ -20579,6 +20320,11 @@ msgstr ""
 msgid "image"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr ""
@@ -20619,15 +20365,19 @@ msgstr ""
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20655,7 +20405,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr ""
 
@@ -20684,27 +20434,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr ""
 
@@ -20732,7 +20482,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr ""
 
@@ -20818,12 +20568,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -20882,7 +20632,7 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -20922,7 +20672,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr ""
@@ -20949,8 +20699,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -20965,27 +20715,14 @@ msgstr ""
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr ""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21013,6 +20750,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21023,7 +20768,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr ""
 
@@ -21158,7 +20903,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21193,24 +20938,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21238,11 +20987,11 @@ msgstr ""
 msgid "regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21254,15 +21003,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21310,7 +21059,7 @@ msgstr ""
 msgid "short description"
 msgstr ""
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21329,15 +21078,15 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr ""
 
@@ -21353,31 +21102,31 @@ msgstr ""
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21385,11 +21134,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21405,8 +21154,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21417,7 +21166,7 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21426,13 +21175,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21441,20 +21194,20 @@ msgstr ""
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr ""
@@ -21486,39 +21239,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21532,7 +21285,7 @@ msgstr ""
 msgid "trigger does not allow manual closing"
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21544,26 +21297,26 @@ msgstr ""
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21571,11 +21324,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21592,10 +21345,10 @@ msgstr ""
 msgid "unexpected end of macro"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21605,11 +21358,12 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr ""
@@ -21635,8 +21389,8 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21661,6 +21415,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21676,7 +21434,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21696,11 +21454,11 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21718,76 +21476,83 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr ""
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr ""
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21799,18 +21564,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21819,7 +21582,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21832,11 +21595,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21853,7 +21616,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr ""
diff --git a/ui/locale/ko/LC_MESSAGES/frontend.po b/ui/locale/ko/LC_MESSAGES/frontend.po
index 6fe827ff51a..885e09e5319 100644
--- a/ui/locale/ko/LC_MESSAGES/frontend.po
+++ b/ui/locale/ko/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2016-01-22 16:15+0300\n"
 "Last-Translator: JONGKWON <jkkim.photo@gmail.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -93,7 +93,7 @@ msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d 일"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -171,7 +171,7 @@ msgstr[0] "메세지 %1$s건"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -183,7 +183,7 @@ msgid "%1$s of %2$s element in problem state"
 msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "%2$s대 중 %1$s대의 요소에서 장애발생중"
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -213,13 +213,13 @@ msgstr[0] "%1$s 의 재시도 가능"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s 초"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -238,13 +238,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s의 심각도는, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s는 읽기전용 입니다."
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -372,7 +372,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -430,10 +430,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "엑세스가 거부되었습니다"
@@ -476,7 +472,7 @@ msgstr ""
 msgid "Ack"
 msgstr "인지"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "인지"
 
@@ -484,7 +480,7 @@ msgstr "인지"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "장애대응 완료"
@@ -497,7 +493,7 @@ msgstr "대응 완료 장애 이벤트"
 msgid "Acknowledged RESOLVED events"
 msgstr "대응 완료된 해결 이벤트"
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -524,9 +520,9 @@ msgstr "대응 완료된 해결 이벤트"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -583,7 +579,7 @@ msgstr "액션 \"%1$s\"는 이미 존재합니다."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "액션 \"%1$s\"에 실행내용이 설정되어 있지 않습니다."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -592,7 +588,7 @@ msgstr ""
 msgid "Action added"
 msgstr "액션을 추가하였습니다"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -639,8 +635,8 @@ msgstr "액션을 갱신하였습니다"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "액션"
@@ -707,7 +703,7 @@ msgstr "종료시간"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -718,7 +714,7 @@ msgstr "종료시간"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -741,9 +737,9 @@ msgstr "종료시간"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -813,7 +809,7 @@ msgstr "종료시간"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "추가"
 
@@ -821,11 +817,11 @@ msgstr "추가"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "새로운 위젯을 추가"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "하위 요소 추가"
 
@@ -833,7 +829,7 @@ msgstr "하위 요소 추가"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -850,7 +846,7 @@ msgstr "호스트 추가"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "복수의 맵을 추가"
 
@@ -872,7 +868,7 @@ msgstr "새로운 오버라이드를 추가"
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -924,12 +920,12 @@ msgstr ""
 msgid "Add widget"
 msgstr "위젯을 추가"
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -939,7 +935,7 @@ msgstr "%1$s을 추가했습니다."
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -952,7 +948,7 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "관리"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -974,7 +970,7 @@ msgstr "표시시간"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1046,7 +1042,7 @@ msgstr "그리드에 정렬하기"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "모두"
 
@@ -1064,7 +1060,7 @@ msgstr "모든 그룹"
 msgid "All hosts"
 msgstr "모든 호스트"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "모든 링크는 반드시 \"이름\"과 \"URL\"을 설정할 필요가 있습니다"
 
@@ -1082,7 +1078,7 @@ msgstr "모든 장애"
 msgid "All problems if tag values match"
 msgstr "태그 값이 일치하는 모든 장애"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1195,15 +1191,15 @@ msgstr "어플리케이션 에러."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "적용"
 
@@ -1221,7 +1217,7 @@ msgstr "메인터넌스 중"
 msgid "Apr"
 msgstr "4월"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "4월"
 
@@ -1249,7 +1245,7 @@ msgstr "에리어 타입"
 msgid "Arithmetic"
 msgstr "계산"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1296,7 +1292,7 @@ msgstr "시작시간 (시:분)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1305,7 +1301,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1317,6 +1313,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr "적어도 1개의 호스트 그룹 혹은 호스트가 선택되어 있을 필요가 있습니다."
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1328,7 +1329,7 @@ msgstr "최소 하나 이상의 메인터넌스 기간을 작성할 필요가 �
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1384,7 +1385,7 @@ msgstr ""
 msgid "Aug"
 msgstr "8월"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "8월"
 
@@ -1397,7 +1398,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1474,7 +1475,7 @@ msgstr "자동 로그아웃"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1489,7 +1490,7 @@ msgstr "아이콘의 자동매핑"
 msgid "Automatic icon selection"
 msgstr "아이콘의 자동선택"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1541,7 +1542,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr "축"
 
@@ -1604,7 +1605,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "차단됨"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "Blue"
 
@@ -1658,11 +1659,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "아래쪽"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "앞면으로"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "가장 앞면으로"
 
@@ -1688,7 +1689,7 @@ msgstr "증명서"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1733,8 +1734,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1743,7 +1744,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "자동 계산"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr "달력"
 
@@ -1768,7 +1769,7 @@ msgstr "콜백"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1781,8 +1782,8 @@ msgstr "콜백"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "취소"
 
@@ -1812,7 +1813,7 @@ msgstr "액션을 추가할 수 없습니다"
 msgid "Cannot add correlation"
 msgstr "상관관계를 추가할 수 없습니다"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1822,7 +1823,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "호스트에서 템플릿에 의존관계는 작성할 수 없습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1853,8 +1854,8 @@ msgid "Cannot add host prototype"
 msgstr "호스트 프로토타입을 추가할 수 없습니다"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "이미지를 추가할 수 없습니다"
 
@@ -1945,15 +1946,15 @@ msgstr "사용자를 추가할 수 없습니다"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Web시나리오를 추가할 수 없습니다"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1973,33 +1974,29 @@ msgstr "LDAP서버에 바인드 할 수 없습니다."
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "히스토리를 정리할 수 없습니다"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "그래프 프로토타입을 복제할 수 없습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "호스트 프로토타입을 복제할 수 없습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "아이템 프로토타입을 복제할 수 없습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "트리거 프로토타입을 복제할 수 없습니다."
 
@@ -2025,7 +2022,7 @@ msgid "Cannot copy graph"
 msgid_plural "Cannot copy graphs"
 msgstr[0] "그래프를 복사할 수 없습니다"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "아이템을 복사할 수 없습니다"
@@ -2075,8 +2072,8 @@ msgstr "아이콘 맵을 작성할 수 없습니다"
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2104,7 +2101,7 @@ msgstr "Zabbix 유저 \"%1$s\"를 삭제할 수 없습니다. 유저를 비활�
 msgid "Cannot delete action"
 msgstr "액션을 삭제할 수 없습니다"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2167,7 +2164,7 @@ msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one
 msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group."
 msgstr[0] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2177,11 +2174,11 @@ msgstr[0] ""
 msgid "Cannot delete host prototypes"
 msgstr "호스트 프로토타입을 삭제할 수 없습니다"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "아이콘 맵을 삭제할 수 없습니다"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "이미지를 삭제할 수 없습니다"
 
@@ -2206,7 +2203,7 @@ msgstr "아이템 프로토타입을 삭제할 수 없습니다"
 msgid "Cannot delete item prototypes"
 msgstr "아이템 프로토타입을 삭제할 수 없습니다"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "아이템을 삭제할 수 없습니다"
 
@@ -2234,7 +2231,7 @@ msgid "Cannot delete proxy"
 msgid_plural "Cannot delete proxies"
 msgstr[0] "프록시를 삭제할 수 없습니다"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2254,7 +2251,7 @@ msgid "Cannot delete script"
 msgid_plural "Cannot delete scripts"
 msgstr[0] "스크립트를 삭제할 수 없습니다"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "스크립트를 삭제할 수 없습니다. 스크립트 \"%1$s\"는 실행하는 액션 \"%2$s\"에서 이용되고 있습니다."
@@ -2269,8 +2266,8 @@ msgid "Cannot delete service"
 msgid_plural "Cannot delete services"
 msgstr[0] "서비스를 삭제할 수 없습니다"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2299,7 +2296,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr "템플릿 아이템을 삭제할 수 없습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "템플릿 아이템을 삭제할 수 없습니다."
 
@@ -2349,7 +2346,7 @@ msgid "Cannot delete user role"
 msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Web시나리오를 삭제할 수 없습니다"
 
@@ -2379,7 +2376,7 @@ msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] "호스트를 비활성화 할 수 없습니다."
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "아이템을 비활성화 할 수 없습니다."
@@ -2405,7 +2402,7 @@ msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] "트리거를 비활성화 할 수 없습니다"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Web 시나리오를 비활성화 할 수 없습니다"
@@ -2446,7 +2443,7 @@ msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] "호스트를 활성화 할 수 없습니다."
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "아이템을 활성화 할 수 없습니다."
@@ -2472,7 +2469,7 @@ msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] "트리거를 활성화 할 수 없습니다."
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Web 시나리오를 활성화 할 수 없습니다."
@@ -2485,7 +2482,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr "매크로를 전개할 수 없습니다."
 
@@ -2519,8 +2516,8 @@ msgstr "맵 \"%2$s\"에서 이용되는 호스트 \"%1$s\"를 찾을 수 없습�
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "\"%4$s\"상의 디스커버리 규칙 \"%3$s\"의 호스트 프로토타입 \"%2$s\"를 위한 호스트 그룹 \"%1$s\"를 찾을 수 없습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2618,24 +2615,20 @@ msgstr "\"%3$s\"상의 아이템 \"%2$s\"에서 이용되고 있는 값의 매�
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "\"%4$s\"상의 디스커버리 규칙 \"%3$s\"의 아이템 프로토타입 \"%2$s\"에서 이용되고 있는 값 매핑 \"%1$s\"를 찾을 수 없습니다."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "템플릿 표시명에 공백은 설정할 수 없습니다."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2647,7 +2640,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] "템플릿 \"%1$s\"를 가져올 수 없습니다. 링크되어 있는 템플릿 \"%2$s\"가 존재하지 않습니다."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "트리거 조건식을 추가할 수 없습니다"
 
@@ -2661,7 +2654,7 @@ msgid "Cannot link template."
 msgstr "템플릿을 링크할 수 없습니다."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2692,17 +2685,17 @@ msgstr "템플릿의 표시명을 일괄갱신할 수 없습니다."
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "where가 없기 떄문에 \"%1$s\"테이블에 delete문을 실행할 수 없습니다."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "값이 없기 때문에 \"%1$s\"테이블에 update문을 실행할 수 없습니다."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "where가 없기 때문에 \"%1$s\"테이블에 update문을 실행할 수 없습니다."
@@ -2729,7 +2722,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "응답을 받을 수 없습니다. Zabbix서버 \"%1$s\"의 접속을 확인해 주십시오."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "게스트 사용자의 이름을 변경할 수 없습니다"
 
@@ -2748,7 +2741,7 @@ msgstr "위젯을 보존할 수 없습니다 \"%1$s\"."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "커맨드를 송신할 수 없습니다. Zabbix서버 \"%1$s\"와의 접속을 확인해 주십시오."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr "리퀘스트를 송신할 수 없습니다"
 
@@ -2788,12 +2781,12 @@ msgstr "비활성의 상태의 인벤토리 항목은 설정할 수 없습니다
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2811,7 +2804,7 @@ msgid "Cannot unblock user"
 msgid_plural "Cannot unblock users"
 msgstr[0] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Web시나리오의 링크삭제와 삭제를 할 수 없습니다."
 
@@ -2824,7 +2817,7 @@ msgstr "템플릿의 링크를 삭제할 수 없습니다"
 msgid "Cannot unlink template."
 msgstr "템플릿의 링크를 삭제할 수 없습니다."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2877,11 +2870,6 @@ msgstr "디스커버리 된 아이템 \"%1$s\"의 \"%2$s\"를 갱신할 수 없�
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "디스커버리 된 트리거 \"%1$s\"의 \"%2$s\"를 갱신할 수 없습니다"
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "이미지 \"%1$s\"의 \"imagetype\"를 갱신할 수 없습니다"
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2891,9 +2879,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "발견된 그래프를 갱신할 수 없습니다"
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "발견된 호스트 그룹을 갱신할 수 없습니다"
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -2951,9 +2940,7 @@ msgstr "그래프 프로토타입을 갱신할 수 없습니다"
 msgid "Cannot update group"
 msgstr "그룹을 갱신할 수 없습니다"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "발견된 호스트 \"%1$s\"의 그룹을 갱신할 수 없습니다"
@@ -2975,13 +2962,13 @@ msgstr[0] "호스트 프로토타입을 갱신할 수 없습니다"
 msgid "Cannot update hosts"
 msgstr "호스트를 갱신할 수 없습니다"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "아이콘 매핑을 갱신할 수 없습니다"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "이미지를 갱신할 수 없습니다"
 
@@ -3034,12 +3021,12 @@ msgstr "네트워크 맵을 갱신할 수 없습니다"
 msgid "Cannot update proxy"
 msgstr "프록시를 갱신할 수 없습니다"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "발견된 호스트 \"%1$s\"의 프록시를 갱신할 수 없습니다"
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3059,17 +3046,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "스크립트를 갱신할 수 없습니다"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3142,7 +3129,7 @@ msgstr[0] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Web시나리오를 갱신할 수 없습니다"
 
@@ -3242,8 +3229,8 @@ msgid "Character string not included"
 msgstr "문자열이 포함되지 않음"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3358,7 +3345,7 @@ msgstr "UDP서비스의 퍼포먼스를 체크. 서비스가 다운된 경우엔
 msgid "Checks should be unique."
 msgstr "체크는 중복되지 않습니다."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3379,7 +3366,7 @@ msgstr "템플릿 %1$s에 모순되는 내용이 존재합니다."
 msgid "Circular template linkage is not allowed."
 msgstr "템플릿의 모순된 링크는 할 수 없습니다."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3400,11 +3387,11 @@ msgstr "히스토리와 트렌드를 삭제"
 msgid "Clear when unlinking"
 msgstr "링크 삭제시 클리어"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3419,7 +3406,7 @@ msgstr "시각"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3434,7 +3421,7 @@ msgstr "시각"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "복제"
 
@@ -3445,8 +3432,8 @@ msgstr "복제"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "닫기"
 
@@ -3457,13 +3444,13 @@ msgstr "닫기"
 msgid "Close expression constructor"
 msgstr "조건식 빌더를 닫는다"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "새 이벤트를 닫기"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "오래된 이벤트를 닫기"
 
@@ -3476,8 +3463,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "축소"
 
@@ -3494,7 +3481,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3560,7 +3547,7 @@ msgstr "압축"
 msgid "Concurrent sessions"
 msgstr "동시 세션의 숫자"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3571,17 +3558,12 @@ msgstr "조건"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "액션\"%1$s\"의 조건 \"%2$s\"는 식 \"%3$s\"에서 이용되지 않습니다."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "상관관계 \"%1$s\"의 조건 \"%2$s\"는 조건식 \"%3$s\" 안에서 사용할 수 없습니다."
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "디스커버리 규칙 \"%1$s\"의 조건 \"%2$s\"는 식 \"%3$s\"에서 이용되지 않습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3591,17 +3573,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "액션\"%1$s\"의 식 \"%3$s\"내에서 이용되어 있는 조건 \"%2$s\"는 설정되어 있지 않습니다."
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "상관관계 \"%1$s\"의 조건식 \"%3$s\"에서 사용되고 있는 조건 \"%2$s\"는 설정되어 있지 않습니다."
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "디스커버리 규칙\"%1$s\"의 식 \"%3$s\"내에서 이용되어있는 조건 \"%2$s\"는 설정되어 있지 않습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3617,7 +3594,7 @@ msgstr "조건"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "설정"
 
@@ -3680,7 +3657,7 @@ msgstr "호스트 설정"
 msgid "Configuration of housekeeping"
 msgstr "데이터 보존기간설정"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "아이콘 매핑 설정"
@@ -3787,7 +3764,7 @@ msgstr "확인 텍스트"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "축하합니다! Zabbix frontend 설치가 종료되었습니다."
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3880,7 +3857,7 @@ msgstr "연락처"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3940,7 +3917,7 @@ msgstr "포함"
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr "컨텐츠 컨트롤"
 
@@ -3979,8 +3956,8 @@ msgstr "좌표"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "복사"
 
@@ -3989,12 +3966,11 @@ msgstr "복사"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "상관관계"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "상관관계 \"%1$s\"는 이미 존재합니다."
@@ -4019,16 +3995,6 @@ msgid "Correlation enabled"
 msgid_plural "Correlations enabled"
 msgstr[0] "상관관계를 활성화하였습니다"
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "상관관계가 파라미터에 설정되어있지 않습니다: %1$s"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "상관관계의 이름은 필수입니다."
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr "상관관계 규칙"
@@ -4037,14 +4003,10 @@ msgstr "상관관계 규칙"
 msgid "Correlation updated"
 msgstr "상관관계를 갱신하였습니다"
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "이미지를 보존하지 못했습니다!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "회"
 
@@ -4108,11 +4070,11 @@ msgstr "상관관계의 작성"
 msgid "Create dashboard"
 msgstr "대시보드의 작성"
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr "의존 아이템의 작성"
 
@@ -4229,7 +4191,7 @@ msgstr "맵 작성"
 msgid "Create media type"
 msgstr "연락 방법 작성"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "새 작성"
 
@@ -4253,7 +4215,7 @@ msgstr ""
 msgid "Create template"
 msgstr "템플릿 작성"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "트리거 작성"
 
@@ -4416,7 +4378,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "DNS 이름"
@@ -4428,11 +4390,11 @@ msgstr "DNS 이름"
 msgid "Daily"
 msgstr "일간"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "Dark"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4453,8 +4415,8 @@ msgstr "대시보드 \"%1$s\"는 이미 존재합니다."
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr "대시보드를 작성했습니다"
 
@@ -4476,9 +4438,9 @@ msgstr "대시보드의 설정"
 msgid "Dashboard sharing"
 msgstr "대시보드의 공유"
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr "대시보드를 갱신하였습니다."
 
@@ -4502,7 +4464,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr "대시보드"
 
@@ -4530,7 +4492,7 @@ msgstr "데이터 개요"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr "데이터 셋"
 
@@ -4672,7 +4634,7 @@ msgstr "요일"
 msgid "Days"
 msgstr "일"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "디버그"
 
@@ -4686,26 +4648,26 @@ msgstr "디버그 모드"
 msgid "Dec"
 msgstr "12월"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "12월"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "디폴트"
 
@@ -4798,7 +4760,7 @@ msgstr "연장 시간"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4822,8 +4784,8 @@ msgstr "연장 시간"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "삭제"
 
@@ -4848,11 +4810,11 @@ msgstr "템플릿과 데이터를 삭제하시겠습니까? (경고: 링크되�
 msgid "Delete current action?"
 msgstr "현재 액션을 삭제하시겠습니까?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "현재의 상관관계를 삭제하시겠습니다?"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr "대시보드를 삭제하시겠습니까?"
 
@@ -4896,7 +4858,7 @@ msgstr "아이템 프로토타입을 삭제하시겠습니까?"
 msgid "Delete item?"
 msgstr "아이템를 삭제하시겠습니까?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "선택한 요소간의 링크를 삭제하시겠습니까?"
 
@@ -4952,7 +4914,7 @@ msgstr "선택한 대시보드를 삭제하시겠습니까?"
 msgid "Delete selected discovery rules?"
 msgstr "선택한 디스커버리 규칙를 삭제하시겠습니까?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "선택한 요소를 삭제하시겠습니까?"
 
@@ -5057,7 +5019,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "선택한 도형을 삭제하시겠습니까?"
 
@@ -5101,7 +5063,7 @@ msgstr "트리거를 삭제하시겠습니까?"
 msgid "Delete web scenario?"
 msgstr "Web시나리오를 삭제하시겠습니까?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5146,7 +5108,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "의존관계"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "의존처"
 
@@ -5154,7 +5116,7 @@ msgstr "의존처"
 msgid "Dependent item"
 msgstr "의존 아이템"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5164,7 +5126,7 @@ msgstr "의존 대상"
 msgid "Deployment status"
 msgstr "배포상태"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5197,7 +5159,7 @@ msgid "Description"
 msgstr "이름"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5363,10 +5325,10 @@ msgstr "선택한 Web시나리오를 비활성으로 하시겠습니까?"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5449,7 +5411,7 @@ msgid "Discovery by proxy"
 msgstr "프록시에 의한 디스커버리"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "디스커버리 체크"
 
@@ -5461,7 +5423,7 @@ msgstr "디스커버리 체크"
 msgid "Discovery list"
 msgstr "디스커버리 리스트"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "디스커버리 오브젝트"
 
@@ -5493,7 +5455,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5501,12 +5463,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "디스커버리 규칙"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "디스커버리 규칙\"%1$s\"은 \"%2$s\"에 이미 존재합니다 (다른 템플릿에서의 계승)."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "디스커버리 규칙\"%1$s\"은 \"%2$s\"에 이미 존재합니다."
@@ -5519,7 +5481,7 @@ msgstr "디스커버리 규칙\"%1$s\"은 \"%2$s\"에 이미 존재합니다."
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "디스커버리 규칙\"%1$s\"은 이미 존재합니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5559,7 +5521,7 @@ msgstr "디스커버리 규칙을 갱신하였습니다"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5570,7 +5532,7 @@ msgstr "디스커버리 규칙"
 msgid "Discovery rules deleted"
 msgstr "디스커버리 규칙을 삭제하였습니다"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "디스커버리 상태"
@@ -5607,10 +5569,11 @@ msgid "Display stacked graph"
 msgstr "누계 그래프 표시"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "%2$s 중 %1$s건을 표시하고 있습니다"
@@ -5620,7 +5583,7 @@ msgstr "%2$s 중 %1$s건을 표시하고 있습니다"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "%3$s 건 중 %1$s 에서 %2$s 까지를 표시하고 있습니다"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5642,7 +5605,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "조건식을 치환하시겠습니까?"
 
@@ -5698,7 +5661,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Down"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5706,7 +5669,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr "설정 파일 다운로드"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5725,18 +5688,6 @@ msgstr "그래프 형식"
 msgid "Draw style"
 msgstr "종류"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "상관관계 \"%3$s\"의 \"%1$s\"의 값 \"%2$s\"가 중복됩니다."
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr "상관관계의 \"%1$s\"의 값 \"%2$s\"가 중복되었습니다."
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5749,11 +5700,6 @@ msgstr "맵을 위한 \"name\"의 값 \"%1$s\"이 중복되었습니다."
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5805,7 +5751,7 @@ msgstr "다이내믹 아이템"
 msgid "Dynamic items"
 msgstr "다이나믹 아이템"
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "각URL의 이름은 중복될 수 없습니다. 같은 URL 이름이 이용되지 않는지 확인해 주세요"
 
@@ -5814,11 +5760,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5832,8 +5778,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "편집"
 
@@ -5849,11 +5795,11 @@ msgstr "맵 변경"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr "트리 요소의 변경"
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "트리거의 변경"
 
@@ -5913,21 +5859,17 @@ msgstr "Web시나리오 \"%1$s\"를 위한 SSL비밀키 파일이 공백입니�
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "상관관계ID가 입력되지 않았습니다."
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "액션 \"%1$s\"의 필터조건식ID가 공백입니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "디스커버리 규칙 \"%1$s\"의 필터조건식ID가 공백입니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "디스커버리 규칙\"%1$s\"의 필터조건 매크로가 공백입니다."
@@ -5943,25 +5885,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -5971,14 +5907,6 @@ msgstr "입력 파라미터가 공백입니다"
 msgid "Empty map ID."
 msgstr "맵ID가 공백입니다."
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "미디어 타입ID가 공백입니다."
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "파라미터가 공백입니다."
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6144,7 +6072,7 @@ msgstr "트래핑의 활성화"
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6155,7 +6083,7 @@ msgstr "트래핑의 활성화"
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6198,7 +6126,7 @@ msgid "English (en_US)"
 msgstr "영어 (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6214,7 +6142,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6233,12 +6161,12 @@ msgstr "같음"
 msgid "Error"
 msgstr "에러"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "테이블 \"%1$s\"의 검색 리퀘스트를 실패하였습니다."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr "에러 메세지"
 
@@ -6265,7 +6193,7 @@ msgstr "이벤트ID"
 msgid "Event acknowledged"
 msgstr "장애대응 완료"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6273,7 +6201,7 @@ msgid "Event correlation"
 msgstr "이벤트 상관관계"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "이벤트 상관관계 규칙"
@@ -6308,11 +6236,11 @@ msgstr "이벤트 로그의 감시. 로그 값을 리턴."
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "이벤트 태그의 짝"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "이벤트타입"
 
@@ -6356,15 +6284,10 @@ msgstr "포함하지 않음"
 msgid "Exclude host groups"
 msgstr "제외할 호스트그룹"
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "실행"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "SQL실행 에러 [%2$s] 중 [%1$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6402,7 +6325,7 @@ msgstr "실행"
 msgid "Executed script"
 msgstr "실행 스크립트"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "실행 확인"
 
@@ -6418,8 +6341,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "전개"
 
@@ -6540,7 +6463,7 @@ msgstr "조건식"
 msgid "External check"
 msgstr "외부 검사"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6567,8 +6490,8 @@ msgstr "실패"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6579,26 +6502,26 @@ msgstr "대시보드의 작성에 실패하였습니다."
 msgid "Failed to parse URL."
 msgstr "URL을 해석할 수 없었습니다."
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr "대시보드의 변경에 실패하였습니다"
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6606,7 +6529,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "템플릿의 갱신 실패."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6630,7 +6553,7 @@ msgstr ""
 msgid "Feb"
 msgstr "2월"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "2월"
 
@@ -6652,10 +6575,9 @@ msgstr "항목 \"%1$s\"는 NULL로 설정할 수 없습니다."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6666,13 +6588,6 @@ msgstr "항목 \"%1$s\"는 필수입니다."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "맵 \"%2$s\"를 위한 필드 \"%1$s\"가 설정되어 있지 않습니다."
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "미디어 타입 \"%2$s\"를 위한 필드 \"%1$s\"가 설정되어 있지 않습니다."
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6691,11 +6606,6 @@ msgstr "항목 \"%1$s\"의 정수치가 아닙니다."
 msgid "Field \"%1$s\" is not string."
 msgstr "항목 \"%1$s\"은 문자열이 아닙니다."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "미디어 타입 \"%2$s\"를 위한 필드 \"%1$s\"를 지정해 주십시오."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6710,10 +6620,6 @@ msgstr "항목 \"host\"는 필수입니다."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "파일 포맷이 지원되지 않습니다."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6778,7 +6684,8 @@ msgstr "면"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6803,7 +6710,7 @@ msgstr "필터"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6855,7 +6762,7 @@ msgstr "맵에 맞춘다"
 msgid "Fixed"
 msgstr "고정"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6906,12 +6813,12 @@ msgstr "식"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -6924,7 +6831,7 @@ msgstr "프랑스어 (fr_FR)"
 msgid "Fri"
 msgstr "금"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "금"
 
@@ -7035,7 +6942,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "설정한 조건식은 매크로가 아닙니다"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr "글로벌 정규표현 \"%1$s\" 는 존재하지 않습니다."
@@ -7049,7 +6956,7 @@ msgstr "글로벌 값"
 msgid "Go back to %1$s"
 msgstr "%1$s에 돌아감"
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "다음 페이지로 이동"
 
@@ -7087,7 +6994,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7095,7 +7002,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "그라데이션 라인"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7154,7 +7061,7 @@ msgstr[0] "그래프를 복사하였습니다"
 msgid "Graph deleted"
 msgstr "그래프를 삭제하였습니다"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7191,8 +7098,8 @@ msgstr "그래프 프로토타입을 삭제하였습니다"
 msgid "Graph prototype updated"
 msgstr "그래프 프로토타입을 갱신하였습니다"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"의 그래프의 프로토타입은 사용할 수 없습니다."
@@ -7226,8 +7133,8 @@ msgstr "그래프 종류"
 msgid "Graph updated"
 msgstr "그래프를 갱신하였습니다"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"의 그래프는 사용할 수 없습니다."
@@ -7258,7 +7165,7 @@ msgstr "\"%1$s\"의 이름을 지닌 그래프는 그래프 혹은 그래프 프
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "그래프"
 
@@ -7279,12 +7186,12 @@ msgstr "그리드"
 msgid "Group"
 msgstr "그룹"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "호스트 프로토타입에서 이용되고 있기 때문에 그룹\"%1$s\"은 삭제할 수 없습니다."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr "상관관계의 조건에서 사용되고 있는 그룹 \"%1$s\"은 삭제할 수 없습니다."
@@ -7457,11 +7364,11 @@ msgstr "도움말"
 msgid "Hexadecimal to decimal"
 msgstr "16진수에서 10진수로"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "표시하지 않음"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "디버그를 감추기"
 
@@ -7488,11 +7395,11 @@ msgstr "단계"
 msgid "High"
 msgstr "중증 장애"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr "High-contrast dark"
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr "High-contrast light"
 
@@ -7513,7 +7420,7 @@ msgstr "행을 강조표시"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "이력"
 
@@ -7521,11 +7428,15 @@ msgstr "이력"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "이력이 삭제되었습니다"
 
@@ -7568,7 +7479,7 @@ msgstr "가로"
 msgid "Horizontal align"
 msgstr "가로 위치"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7597,7 +7508,7 @@ msgstr "가로 위치"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7610,7 +7521,7 @@ msgstr[0] "호스트"
 msgid "Host \"%1$s\" already exists."
 msgstr "호스트 \"%1$s\"는 이미 존재합니다."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7618,7 +7529,7 @@ msgstr "호스트 \"%1$s\"는 이미 존재합니다."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "호스트\"%1$s\"에 호스트 그룹을 설정해 주세요."
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7668,7 +7579,7 @@ msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] "호스트를 활성화 하였습니다"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7682,22 +7593,22 @@ msgstr[0] "호스트를 활성화 하였습니다"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "호스트 그룹"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "호스트 그룹\"%1$s\"는 모두 존재합니다."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "글로벌 스크립트에 이용되고 있기 때문에 호스트그룹 \"%1$s\"를 삭제할 수 없습니다."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7710,10 +7621,10 @@ msgstr "호스트 그룹내의 호스트"
 msgid "Host group label type"
 msgstr "호스트 그룹의 라벨타입"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"의 호스트그룹은 사용할 수 없습니다."
@@ -7729,8 +7640,8 @@ msgstr "ID \"%1$s\"의 호스트그룹은 사용할 수 없습니다."
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7804,7 +7715,7 @@ msgstr "호스트 명"
 msgid "Host networks"
 msgstr "호스트 네트워크"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7883,7 +7794,7 @@ msgstr "호스트의 갱신에 실패하였습니다."
 msgid "Host updated"
 msgstr "호스트를 갱신하였습니다"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"의 호스트는 사용할 수 없습니다."
@@ -7903,7 +7814,7 @@ msgstr "같은 호스트 이름\"%1$s\"를 지닌 호스트가 이미 존재합�
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "같은 호스트의 표시 이름 \"%1$s\"를 지닌 호스트가 이미 존재합니다."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -7916,7 +7827,7 @@ msgstr "같은 호스트의 표시 이름 \"%1$s\"를 지닌 호스트가 이미
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -7964,7 +7875,7 @@ msgstr "호스트를 갱신하였습니다"
 msgid "Hours"
 msgstr "시간"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8004,7 +7915,7 @@ msgstr "IP 주소"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IP 주소"
@@ -8029,7 +7940,7 @@ msgstr "IP주소의 범위 \"%1$s\"가 주소제한 \"%2$s\"을 초과합니다.
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8086,12 +7997,12 @@ msgstr "아이콘의 하이라이트"
 msgid "Icon map"
 msgstr "아이콘 매핑"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "아이콘 매핑\"%1$s\"을 삭제할 수 없습니다. 맵\"%2$s\"에 이용되고 있습니다."
@@ -8104,18 +8015,18 @@ msgstr "아이콘 매핑을 작성하였습니다"
 msgid "Icon map deleted"
 msgstr "아이콘 매핑를 삭제하였습니다"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "아이콘 매핑를 갱신하였습니다"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "아이콘 매핑"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"의 아이콘은 사용할 수 없습니다."
@@ -8214,23 +8125,20 @@ msgstr "이 메시지가 잘못된 경우엔, 필요한 권한을 얻기 위하�
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "이미지"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "이미지\"%1$s\"는 이미 존재합니다."
@@ -8239,7 +8147,7 @@ msgstr "이미지\"%1$s\"는 이미 존재합니다."
 msgid "Image added"
 msgstr "이미지를 추가하였습니다"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "이미지를 삭제하였습니다"
 
@@ -8247,18 +8155,12 @@ msgstr "이미지를 삭제하였습니다"
 msgid "Image label type"
 msgstr "이미지라벨 타입"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "[%2$s]내의 [%1$s]의 이미지 읽기에러."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "이미지를 갱신하였습니다"
 
@@ -8353,7 +8255,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8364,13 +8266,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr "접근할 수 없는 맵"
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr "접근할 수 없는 템플릿"
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr "접속이 안되는 트리거"
 
@@ -8414,7 +8316,7 @@ msgstr "서브 그룹을 포함"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "네트워크 인터페이스의 수신통계. integer를 리턴."
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8582,24 +8484,6 @@ msgstr "실행하는 액션의 유저 그룹의 값이 올바르지 않습니다
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "실행하는 액션의 유저 값이 올바르지 않습니다. 사용자가 존재하지 않거나 액세스 권한이 없습니다."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8654,8 +8538,6 @@ msgstr "실행하는 액션의 유저 값이 올바르지 않습니다. 사용�
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "잘못된 인수의 값이 함수에 전달되었습니다."
 
@@ -8681,31 +8563,22 @@ msgstr "템플릿 이름 \"%1$s\"에서 이용되고 있는 문자열이 올바�
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "액션 \"%1$s\"의 조건식이 올바르지 않습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "디스커버리 규칙 \"%1$s\"의 조건식이 올바르지 않습니다."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "상관관계ID가 올바르지 않습니다."
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "액션 \"%1$s\"의 커스텀 조건식 \"%2$s\"이 올바르지 않습니다 ： %3$s."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "상관관계 \"%1$s\"의 커스텀 조건식 \"%2$s\"이 올바르지 않습니다: %3$s."
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "디스커버리 규칙 \"%1$s\"의 커스텀 조건식 \"%2$s\"이 올바르지 않습니다 : %3$s."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8734,7 +8607,7 @@ msgstr "이벤트 오브젝트의 값이 올바르지 않습니다."
 msgid "Incorrect eventsource value."
 msgstr "이벤트 소스의 값이 올바르지 않습니다."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "테이블 \"%2$s\"에 where 스테이트먼트의 필드 \"%1$s\"의 이름 혹은 값이 올바르지 않습니다."
@@ -8759,22 +8632,17 @@ msgstr "업로드된 파일이 올바르지 않습니다."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "액션 \"%1$s\"의 필터조건식ID가 올바르지 않습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "디스커버리 규칙 \"%1$s\"의 필터 조건식ID가 올바르지 않습니다."
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "상관관계 \"%1$s\"의 필터 조건식ID가 올바르지 않습니다."
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "디스커버리 규칙 \"%1$s\"의 필드 조건 매크로가 올바르지 않습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8785,7 +8653,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "액션 \"%1$s\"의 필터 조건연산자가 올바르지 않습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "디스커버리 규칙 \"%1$s\"의 필터조건연산자가 올바르지 않습니다."
@@ -8813,8 +8681,6 @@ msgstr "이미지의 인덱스가 올바르지 않습니다."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8876,10 +8742,6 @@ msgstr "메인터넌스의 기간이 올바르지 않습니다 (최소 5분)"
 msgid "Incorrect map ID."
 msgstr "맵ID가 올바르지 않습니다."
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "미디어 타입 ID가 올바르지 않습니다."
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -8937,13 +8799,13 @@ msgstr "정규표현식 \"%1$s\"이 올바르지 않습니다： \"%2$s\""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Zabbix서버 \"%1$s\"에서 올바르지 않은 값이 수신되었습니다."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "서비스 종료시간이 올바르지 않습니다."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "서비스 시작시간이 올바르지 않습니다."
 
@@ -8996,12 +8858,7 @@ msgstr "트리거 프로토타입 조건식이 올바르지 않습니다. 트리
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "액션\"%1$s\"의 계산 타입이 올바르지 않습니다."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "상관관계 \"%1$s의 계산타입이 올바르지 않습니다."
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "디스커버리 규칙\"%1$s\"의 계산 타입이 올바르지 않습니다."
@@ -9047,13 +8904,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9070,60 +8927,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "\"%2$s\" 항목의 값 \"%1$s\"가 올바르지 않습니다: %3$s에서 %4$s의 사이로 설정해주십시오."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "float 항목\"%2$s\"의 값 \"%1$s\"가 올바르지 않습니다."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "정수 항목\"%2$s\"의 값 \"%1$s\"가 올바르지 않습니다."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "부호없는 정수 항목\"%2$s\"의 값 \"%1$s\"가 올바르지 않습니다."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "상관관계 \"%3$s\"의 필드 \"%2$s\"의 값 \"%1$s\"이 올바르지 않습니다."
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "미디어 타입 \"%3$s\"를 위한 필드 \"%2$s\"내의 값 \"%1$s\"가 올바르지 않습니다."
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9178,14 +9005,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9295,25 +9116,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9324,7 +9127,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9370,16 +9173,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9388,7 +9192,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "필드 \"%1$s\": %2$s의 값이 올바르지 않습니다."
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9476,12 +9280,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "삽입"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "조건식의 삽입"
 
@@ -9585,7 +9389,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9593,7 +9397,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9604,7 +9408,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "갱신 간격"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9627,7 +9431,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr "액션의 실행조건이 올바르지 않습니다 : %1$s."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9659,7 +9463,7 @@ msgstr "ID \"%1$s\"의 미디어 타입의 메일 주소가 올바르지 않습�
 msgid "Invalid interval \"%1$s\"."
 msgstr "갱신간격 \"%1$s\"가 올바르지 않습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "\"%3$s\": %4$s의 디스커버리 규칙 \"%2$s\"의 아이템키 \"%1$s\"가 올바르지 않습니다."
@@ -9684,27 +9488,29 @@ msgstr "키 \"%1$s\": %2$s가 올바르지 않습니다."
 msgid "Invalid method parameters."
 msgstr "메소드의 파라미터가 올바르지 않습니다."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9730,17 +9536,17 @@ msgstr "메소드의 파라미터가 올바르지 않습니다."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9748,8 +9554,8 @@ msgstr "메소드의 파라미터가 올바르지 않습니다."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9763,106 +9569,116 @@ msgstr "메소드의 파라미터가 올바르지 않습니다."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9904,43 +9720,38 @@ msgstr "레스폰스 코드 \"%1$s\"가 올바르지 않습니다."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -9961,7 +9772,7 @@ msgstr "기간이 올바르지 않습니다."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "인벤토리"
 
@@ -10002,7 +9813,7 @@ msgstr "사용자의 패스워드에 따른 검색은 할 수 없습니다."
 msgid "Italian (it_IT)"
 msgstr "이탈리아어 (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10034,7 +9845,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "아이템\"%1$s\"는 항목번호가 존재하지 않는 호스트 인벤토리\"%2$d\"를 자동설정할 수 없습니다. 0 (자동설정안함)에서 %3$d의 사이로 설정해 주십시오."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10048,7 +9859,7 @@ msgstr "아이템을 추가하였습니다"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "아이템을 복사하였습니다"
@@ -10061,12 +9872,12 @@ msgstr "아이템 수"
 msgid "Item deleted"
 msgstr "아이템을 삭제하였습니다"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "아이템을 비활성화 하였습니다"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "아이템을 활성화 하였습니다"
@@ -10075,7 +9886,7 @@ msgstr[0] "아이템을 활성화 하였습니다"
 msgid "Item in \"not supported\" state"
 msgstr "아이템이 \"습득불가\" 상태"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "아이템이 선택되어 있지 않습니다"
 
@@ -10084,7 +9895,7 @@ msgstr "아이템이 선택되어 있지 않습니다"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr "아이템 보존 처리의 파라미터가 설정되어 있지 않습니다 : %1$s"
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10120,8 +9931,8 @@ msgid "Item prototype updated"
 msgid_plural "Item prototypes updated"
 msgstr[0] "아이템 프로토타입을 갱신하였습니다"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"의 아이템의 프로토타입은 사용할 수 없습니다."
@@ -10147,7 +9958,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10179,8 +9990,8 @@ msgstr "아이템은 갱신되지 않습니다. 갱신시간에 최소 하나 �
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr "아이템은 갱신되지 않습니다. 갱신간격은 1s ~ 1d간격으로 지정해야 합니다. 또 정기설정이나 예외설정의 갱신간격도 사용 가능합니다."
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"의 아이템은 사용할 수 없습니다."
@@ -10231,11 +10042,11 @@ msgstr "키\"%1$s\"가 설정된 아이템은 지정한 호스트 \"%2$s\"에 �
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "아이템"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "아이템을 삭제하였습니다"
 
@@ -10253,7 +10064,7 @@ msgstr "아이템을 갱신하였습니다"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10278,6 +10089,10 @@ msgstr "JMX 인터페이스"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10290,7 +10105,7 @@ msgstr "JSON 데이터"
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr "JSON 문자열로 지정해주세요"
 
@@ -10308,7 +10123,7 @@ msgstr ""
 msgid "Jan"
 msgstr "1월"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "1월"
 
@@ -10330,7 +10145,7 @@ msgstr ""
 msgid "Jul"
 msgstr "7월"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "7월"
 
@@ -10338,7 +10153,7 @@ msgstr "7월"
 msgid "Jun"
 msgstr "6월"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "6월"
 
@@ -10488,22 +10303,6 @@ msgid "Last %1$d year"
 msgid_plural "Last %1$d years"
 msgstr[0] "최신 %1$d 년간"
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10515,11 +10314,11 @@ msgstr ""
 msgid "Last check"
 msgstr "최근 검사"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "최근 1시간의 그래프"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "최근 1개월의 그래프"
 
@@ -10557,11 +10356,11 @@ msgstr ""
 msgid "Last value"
 msgstr "최근 값"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "최근 1주일의 그래프"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10570,11 +10369,11 @@ msgstr "최근 1주일의 그래프"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "최근 데이터"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "최근 값"
 
@@ -10615,7 +10414,7 @@ msgstr "좌측 Y"
 msgid "Left trim"
 msgstr "왼쪽 trim"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr "범례"
 
@@ -10896,7 +10695,7 @@ msgstr "Low-level 디스커버리가 \"취득불가\" 상태"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -10918,7 +10717,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "파일의 MD5 체크섬. 파일의 MD5해시 값을 string값으로 리턴."
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -10929,12 +10728,12 @@ msgid "Macro"
 msgstr "매크로"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "매크로 \"%1$s\"는 \"%2$s\"에 이미 존재합니다."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "매크로 \"%1$s\"는 이미 존재합니다."
@@ -10962,7 +10761,7 @@ msgstr "매크로를 갱신하였습니다"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr "메인 필터"
 
@@ -10970,7 +10769,7 @@ msgstr "메인 필터"
 msgid "Main navigation"
 msgstr "메인 네비게이션"
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11053,7 +10852,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11075,13 +10874,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr "수동 클로즈 완료"
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "맵"
 
@@ -11150,7 +10949,7 @@ msgstr "맵 형태"
 msgid "Map update failed."
 msgstr "맵 갱신에 실패하였습니다."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"의 맵은 사용할 수 없습니다."
@@ -11182,7 +10981,7 @@ msgstr "맵"
 msgid "Mar"
 msgstr "3월"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "3월"
 
@@ -11286,7 +11085,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11299,7 +11098,7 @@ msgstr[0] "표시 가능한 최대 기간은 %1$s일 입니다."
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "ID \"%1$s\"의 미디어 타입의 메일주소가 최대 길이를 넘었습니다."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "5월"
 
@@ -11314,15 +11113,12 @@ msgstr "5월"
 msgid "Media"
 msgstr "연락 방법"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "연락 방법"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr "미디어 타입 \"%1$s\"는 이미 존재합니다."
@@ -11346,11 +11142,6 @@ msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "미디어 타입을 활성화 하였습니다"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr "미디어 타입이 파라미터에 설정되어 있지 않습니다: %1$s"
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11380,7 +11171,7 @@ msgstr "ID \"%1$s\"의 미디어 타입은 사용할 수 없습니다."
 msgid "Media types"
 msgstr "미디어 타입"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11468,7 +11259,7 @@ msgstr "알림 표시"
 msgid "Method not found."
 msgstr "메소드를 찾을 수 없습니다."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11530,7 +11321,7 @@ msgid "Minimum severity"
 msgstr "최소 심각도"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11588,7 +11379,7 @@ msgstr "모드"
 msgid "Model"
 msgstr "모델"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11622,7 +11413,7 @@ msgstr[0] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11648,7 +11439,7 @@ msgstr ""
 msgid "Mon"
 msgstr "월"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "월"
 
@@ -11688,11 +11479,11 @@ msgstr "월"
 msgid "Monthly"
 msgstr "월간"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "조건에 일치하는 데이터가 더 존재합니다..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11716,7 +11507,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11729,7 +11520,7 @@ msgstr "복수"
 msgid "Multiple PROBLEM events"
 msgstr "장애이벤트를 계속해서 생성"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "음소거"
 
@@ -11858,11 +11649,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12020,19 +11811,21 @@ msgstr "새 조건"
 msgid "New dashboard"
 msgstr "신규 대시보드"
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "새 요소"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr "새로운 이벤트의 호스트그룹"
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr "새로운 이벤트 태그의 값"
 
@@ -12044,7 +11837,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "정규표현식 작성"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12052,7 +11845,7 @@ msgstr ""
 msgid "New service time"
 msgstr "새 서비스 시간"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12061,7 +11854,7 @@ msgid "New triggers"
 msgstr "신규 트리거"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12079,7 +11872,7 @@ msgstr "다음 스텝"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12108,30 +11901,6 @@ msgstr "다음 스텝"
 msgid "No"
 msgstr "아니오"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "상관관계 \"%2$s\"에 \"%1$s\"가 정의되어 있지 않습니다."
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "상관관계에 \"%1$s\"가 정의되어 있지 않습니다."
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12147,11 +11916,6 @@ msgstr "그래프에 \"%1$s\"가 정의되어 있지 않습니다."
 msgid "No \"%1$s\" given for map."
 msgstr "맵에 \"%1$s\"가 정의되어 있지 않습니다."
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "미디어 타입에 \"%1$s\"이 정의되어 있지 않습니다."
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12159,7 +11923,7 @@ msgstr "미디어 타입에 \"%1$s\"이 정의되어 있지 않습니다."
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "액션\"%1$s\"필터조건의 \"%2$s\"가 정의되어 있지 않습니다"
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "디스커버리 규칙 \"%1$s\" 필터조건의 \"%2$s\"가 정의되어 있지 않습니다."
@@ -12169,7 +11933,7 @@ msgstr "디스커버리 규칙 \"%1$s\" 필터조건의 \"%2$s\"가 정의되어
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "액션\"%1$s\"의 필터의 \"%2$s\"가 정의되어 있지 않습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "디스커버리 규칙 \"%1$s\"의 필터의 \"%2$s\"가 정의되어 있지 않습니다."
@@ -12186,11 +11950,6 @@ msgstr "인증사용자 명이 설정되어 있지 않습니다"
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "상관관계\"%1$s\"에 조건의 타입이 정의되어 있지 않습니다."
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12221,7 +11980,7 @@ msgstr "\"%2$s\"상의 \"%1$s\"타입의 디폴트인터페이스가 설정되�
 msgid "No details"
 msgstr "자세한 내용이 없습니다"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "디스커버리 규칙ID이 설정되어 있지 않습니다"
 
@@ -12257,7 +12016,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "그래프가 추가되어 있지 않습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "호스트ID가 존재하지 않습니다."
 
@@ -12287,7 +12046,7 @@ msgstr "이미지는 존재하지 않습니다"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "인터페이스를 찾을 수 없습니다."
 
@@ -12321,7 +12080,7 @@ msgstr "매크로가 설정되어 있지 않습니다"
 msgid "No maps added."
 msgstr "맵이 추가되어 있지 않습니다."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "조건에 일치하는 데이터가 없습니다"
 
@@ -12329,17 +12088,46 @@ msgstr "조건에 일치하는 데이터가 없습니다"
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr "상관관계 \"%1$s\"에 실행내용 타입이 정의되어 있지 않습니다."
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "시스템 액세스 권한이 없습니다."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12347,7 +12135,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12375,19 +12163,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12402,16 +12189,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12431,12 +12224,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12457,27 +12248,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12494,14 +12287,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12510,7 +12303,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "대상이 존재하지 않거나, 액세스 권한이 없습니다!"
 
@@ -12530,7 +12323,7 @@ msgstr "공개키 파일이 설정되어 있지 않습니다"
 msgid "No recipients for action operation message."
 msgstr "실행하는 액션의 메시지에 송신처가 설정되어 있지 않습니다"
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr "새로고침 없음"
 
@@ -12542,7 +12335,7 @@ msgstr "실행하는 액션 커맨드에 스크립트가 설정되어 있지 않
 msgid "No target selected"
 msgstr "아무 것도 선택되어 있지 않습니다"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "아무 것도 선택되어 있지 않습니다."
 
@@ -12559,7 +12352,7 @@ msgstr "트리거가 설정되어 있지 않습니다"
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr "boolean이 아닌 플래그는 폐지될 예정입니다."
 
@@ -12629,15 +12422,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "\"손님\" 사용자는 패스워드를 설정할 수 없습니다."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12669,7 +12462,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "취득 불가"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "설명"
@@ -12700,7 +12493,7 @@ msgstr "관계자 전원에게 통지"
 msgid "Nov"
 msgstr "11월"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "11월"
 
@@ -12887,8 +12680,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -12948,13 +12741,13 @@ msgstr "10월"
 msgid "Octal to decimal"
 msgstr "8진수에서 10진수로"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "10월"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "OFF"
 
@@ -12962,30 +12755,31 @@ msgstr "OFF"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "OK"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr "오래된 이벤트 태그 값"
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "ON"
 
@@ -13001,35 +12795,15 @@ msgstr "한번"
 msgid "One"
 msgstr "1개"
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "호스트 그룹이 설정되지 않은 오브젝트가 남아있습니다"
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "한번만"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "일시적인 정지 시간"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "최고관리자만 호스트 그룹을 작성할 수 있습니다."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "최고관리자만 미디어 타입을 작성할 수 있습니다."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "최고관리자만 미디어 타입을 삭제할 수 있습니다."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "최고관리자만 미디어 타입을 수정할 수 있습니다."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Zabbix에이전트, SNMPv1, SNMPv2, SNMPv3의 유니크 여부를 체크합니다."
@@ -13077,10 +12851,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "최고관리자만 상관관계를 작성할 수 있습니다."
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr "최고관리자만 대시보드의 권한을 설정할 수 있습니다."
@@ -13089,15 +12859,11 @@ msgstr "최고관리자만 대시보드의 권한을 설정할 수 있습니다.
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr "최고관리자만 상관관계를 갱신할 수 있습니다."
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "활성화된 호스트와 아이템의 트리거만 카운트"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13106,7 +12872,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "OS정보. string값을 리턴"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13115,11 +12881,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "인증되지 않은 리퀘스트이기 때문에 조작을 실행할 수 없습니다."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "실행내용의 상세 정보"
 
@@ -13141,7 +12907,7 @@ msgstr "조작대상의 템플릿이 없습니다."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13150,33 +12916,33 @@ msgstr ""
 msgid "Operations"
 msgstr "오퍼레이션"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "오퍼레이터"
 
@@ -13285,7 +13051,7 @@ msgstr "기타 설정 파라미터"
 msgid "Other parameters"
 msgstr "기타 파라미터"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "기타"
@@ -13299,7 +13065,7 @@ msgstr "네트워크 인터페이스의 송신 통계. integer를 리턴"
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13328,7 +13094,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13517,7 +13283,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13562,7 +13328,7 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "PSK 아이덴티티"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13585,16 +13351,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "파라미터"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "파라미터 \"%1$s\"는 폐지될 예정입니다."
@@ -13624,7 +13390,7 @@ msgstr "상위 아이템"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13641,7 +13407,7 @@ msgstr "상위 트리거"
 msgid "Parent web scenarios"
 msgstr "상위 Web시나리오"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13653,11 +13419,6 @@ msgstr ""
 msgid "Parse"
 msgstr "Parse"
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "Parse SQL 에러 [%1$s] 중 [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Parse 에러"
@@ -13718,7 +13479,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr "붙여넣기"
 
@@ -13728,15 +13489,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr "링크 없이 붙여넣기"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13782,12 +13543,11 @@ msgstr "DNS쿼리를 실행. 요구한 정보 타입의 string을 리턴."
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "기간"
 
@@ -13876,7 +13636,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Zabbix 서버의 호스트명이나 호스트 IP주소와 포트 번호를 입력해주세요. 필요하다면 이름도 입력해주세요 (옵션)."
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "2개의 요소를 선택하여 주십시오"
 
@@ -13916,7 +13676,7 @@ msgstr "호스트 인벤토리 필드의 자동설정"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14005,7 +13765,7 @@ msgid "Previous month"
 msgstr "저번 달"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14136,7 +13896,7 @@ msgstr "장애가 억제되지 않습니다"
 msgid "Problem is suppressed"
 msgstr "장애가 억제되었습니다"
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "장애"
 
@@ -14149,21 +13909,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr "장애 해결됨"
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14177,9 +13933,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "장애"
 
@@ -14213,7 +13969,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "속성"
 
@@ -14234,13 +13990,13 @@ msgstr "설정된URL \"%1$s\"는 올바르지 않습니다."
 msgid "Proxies"
 msgstr "프록시"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14248,7 +14004,7 @@ msgstr "프록시"
 msgid "Proxy"
 msgstr "프록시"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14258,12 +14014,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "호스트 \"%2$s\"의 프록시 \"%1$s\"는 존재하지 앖습니다."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr "프록시 \"%1$s\"는 액션 \"%2$s\"에서 사용되고 있습니다."
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "프록시 \"%1$s\"는 디스커버리 규칙 \"%2$s\"에 이용되어 있습니다."
@@ -14355,7 +14111,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14432,10 +14188,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "수신 값"
@@ -14517,7 +14269,7 @@ msgstr "직사각형"
 msgid "Refresh"
 msgstr "새로고침"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr "새로고침 간격"
 
@@ -14535,13 +14287,13 @@ msgstr ""
 msgid "Regular"
 msgstr "Regular"
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "정규표현식"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14573,7 +14325,7 @@ msgstr "정규표현식"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14605,8 +14357,6 @@ msgstr "원격 명령"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14627,7 +14377,9 @@ msgstr "원격 명령"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14640,7 +14392,7 @@ msgstr "원격 명령"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14717,8 +14469,8 @@ msgstr "원격 명령"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "삭제"
 
@@ -14758,7 +14510,7 @@ msgstr "%1$s의 삭제"
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14800,7 +14552,7 @@ msgid "Replace dependencies"
 msgstr "의존관계를 치환"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14855,7 +14607,7 @@ msgstr "리퀘스트 body"
 msgid "Request body type"
 msgstr "리퀘스트 body 타입"
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr "리퀘스트를 송신을 성공하였습니다"
 
@@ -14897,8 +14649,8 @@ msgstr "요구 스테이터스 코드"
 msgid "Required string"
 msgstr "요구문자열"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "리셋"
 
@@ -14931,7 +14683,7 @@ msgstr "리셋 확인"
 msgid "Reset defaults"
 msgstr "기본값으로 설정"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "해결됨"
 
@@ -14997,7 +14749,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "결과"
@@ -15184,12 +14936,12 @@ msgstr "호스트 상에서 지정한 커맨드를 실행. 커맨드의 실행�
 msgid "Russian (ru_RU)"
 msgstr "러시아어 (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15200,8 +14952,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15238,7 +14990,7 @@ msgstr "SMTP 서버 포트 번호"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15334,12 +15086,12 @@ msgstr "SQL수: %1$s (selects: %2$s | executes: %3$s)"
 msgid "SQL query"
 msgstr "SQL 쿼리"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "SQL의 실행에 실패했습니다 \"%1$s\"."
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "SQL의 실행에 실패하였습니다 \"%1$s\"."
@@ -15402,7 +15154,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15414,7 +15166,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "토"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "토"
 
@@ -15456,7 +15208,7 @@ msgstr "스케쥴"
 msgid "Scheduled check"
 msgstr "스케쥴 체크"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15520,7 +15272,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr "범위"
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15533,8 +15285,7 @@ msgstr "범위"
 msgid "Script"
 msgstr "스크립트"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "스크립트 \"%1$s\"은 이미 존재합니다."
@@ -15565,12 +15316,6 @@ msgstr "스크립트 이름"
 msgid "Script parameters"
 msgstr "스크립트 파라미터"
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "미디어 타입 \"%2$s\"를 위한 스크립트 파라미터 \"%1$s\"에 마지막 개행이 없습니다."
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "스크립트 프로파일러"
@@ -15583,7 +15328,7 @@ msgstr "스크립트를 갱신하였습니다"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "스크립트"
 
@@ -15653,8 +15398,8 @@ msgid "Security name"
 msgstr "보안 이름"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15662,7 +15407,7 @@ msgstr "보안 이름"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "선택"
 
@@ -15698,19 +15443,19 @@ msgstr "선택한 요소"
 msgid "Selected items only"
 msgstr "선택한 아이템만"
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "%3$d의 %2$d위치에 있는 %1$s를 선택하였습니다"
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "%3$d의 %2$d 위치에 있는 읽기 전용 %1$s를 선택하였습니다"
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr "뒤로 보내기"
 
@@ -15735,7 +15480,7 @@ msgstr "다른 미디어만 사용"
 msgid "Send to"
 msgstr "수신처"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr "맨 뒤로 보내기"
 
@@ -15768,7 +15513,7 @@ msgstr "장애와 미대응 보이기"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "9월"
 
@@ -15799,28 +15544,28 @@ msgstr "서버 (프록시)"
 msgid "Server time"
 msgstr "서버 시간"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "서비스"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15830,7 +15575,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "서비스을 작성하였습니다"
 
@@ -15862,16 +15607,16 @@ msgstr "서비스 포트"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "서비스시작시간은 종료시간보다 빠르게 설정해주십시오."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -15879,11 +15624,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "서비스 시간"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "서비스 종류"
 
@@ -15892,30 +15637,29 @@ msgstr "서비스 종류"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "서비스를 갱신하였습니다"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "서비스"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "서비스의 의존관계가 모순되어있습니다."
 
@@ -15923,7 +15667,7 @@ msgstr "서비스의 의존관계가 모순되어있습니다."
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -15953,7 +15697,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "인벤토리 모드의 설정"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -15982,7 +15726,7 @@ msgstr "LDAP 프로토콜의 설정에 실패하였습니다."
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr "LDAP 리페럴을 \"OFF\"로 설정하는데 실패하였습니다."
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -15991,7 +15735,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16047,7 +15791,7 @@ msgstr "도형"
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "공유"
 
@@ -16189,7 +15933,7 @@ msgstr "Zabbix 서버 정지시 경고 보이기"
 msgid "Show working time"
 msgstr "워킹 타임 표시"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "표시"
 
@@ -16298,7 +16042,7 @@ msgstr "호스트\"%2$s\"에 그래프\"%1$s\"의 복사를 스킵하였습니�
 msgid "Slovak (sk_SK)"
 msgstr "슬로바키아어 (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "스누즈"
 
@@ -16344,7 +16088,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "다음에 의한 항목의 정렬"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "정렬 순서(0->999)"
 
@@ -16418,7 +16162,7 @@ msgstr "시작시간"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16521,15 +16265,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "상태"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "상태 코드"
@@ -16559,7 +16307,7 @@ msgstr "상태만"
 msgid "Status problem"
 msgstr "장애"
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16607,7 +16355,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16672,7 +16420,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "서브젝트"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "서브맵"
 
@@ -16688,7 +16436,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "성공 감사"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr "성공 메세지"
 
@@ -16701,7 +16449,7 @@ msgstr "네트워크 인터페이스의 송수신합계치. integer를 리턴."
 msgid "Sun"
 msgstr "일"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "일"
 
@@ -16793,12 +16541,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "시스템 가동 시간(초). integer를 리턴."
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16825,17 +16573,17 @@ msgstr "장애"
 msgid "Table \"%1$s\" does not exist."
 msgstr "테이블\"%1$s\"는 존재하지 않습니다."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "테이블\"%1$s\"에 항목 이름 \"%2$s\"가 존재하지 않습니다."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "태그"
@@ -16891,7 +16639,7 @@ msgstr "태그 값"
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -16951,7 +16699,7 @@ msgstr "대상 종류"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -16972,7 +16720,7 @@ msgstr "템플릿"
 msgid "Template \"%1$s\" already exists."
 msgstr "템플릿\"%1$s\"은 이미 존재합니다."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -16996,7 +16744,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "템플릿은 복수 템플릿과 링크될 수 없습니다 (다른 템플릿을 경유해도 불가)."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17056,7 +16804,7 @@ msgstr "같은 표시 이름\"%1$s\"를 지닌 템플릿이 이미 존재합니�
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17228,13 +16976,13 @@ msgstr "호스트가 발견되지 않게 되었기 때문에 %1$s에 삭제됩�
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "디스커버리된 호스트를 찾을 수 없었습니다. 다음 디스커버리 규칙의 처리시에 삭제됩니다."
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "이미지는 아이콘 맵 %1$s에 사용되고 있습니다."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17298,7 +17046,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "이번 달"
 
@@ -17306,7 +17054,7 @@ msgstr "이번 달"
 msgid "This month so far"
 msgstr "이번 달의 지금까지"
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "이번주"
 
@@ -17314,7 +17062,7 @@ msgstr "이번주"
 msgid "This week so far"
 msgstr "저번주의 지금까지"
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "올해"
 
@@ -17334,7 +17082,7 @@ msgstr ""
 msgid "Thu"
 msgstr "목"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "목"
 
@@ -17351,7 +17099,7 @@ msgstr "종료"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17384,7 +17132,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "기간"
 
@@ -17436,12 +17184,11 @@ msgstr "타임 스탬프"
 msgid "To"
 msgstr "종료"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "모든 아이템은 하나의 호스트 인터페이스를 선택할 필요가 있습니다"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "오늘"
 
@@ -17556,7 +17303,7 @@ msgstr "트랜드 보존기간"
 msgid "Trends"
 msgstr "트렌드"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17564,7 +17311,7 @@ msgstr "트렌드"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "트리거"
 
@@ -17662,7 +17409,7 @@ msgstr "트리거 이름"
 msgid "Trigger overview"
 msgstr "트리거 개요"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17734,11 +17481,11 @@ msgstr "트리거 프로토타입을 갱신하였습니다"
 msgid "Trigger severity"
 msgstr "트리거 심각도"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "트리거의 상태 \"정상\""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "트리거의 상태 \"장애\""
 
@@ -17755,7 +17502,7 @@ msgstr "트리거를 갱신하였습니다"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17790,7 +17537,7 @@ msgstr "Trim"
 msgid "Tue"
 msgstr "화"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "화"
 
@@ -17803,7 +17550,7 @@ msgstr "터키어 (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "2개의 아이템(\"%1$s\"와 \"%2$s\")에서 하나의 호스트의 인벤토리 항목 \"%3$s\"을 자동적으로 설정할 수는 없습니다."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr "2개의 타입요소를 선택할 필요가 있습니다"
 
@@ -17819,19 +17566,19 @@ msgstr "2개의 타입요소를 선택할 필요가 있습니다"
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -17883,7 +17630,7 @@ msgstr "데이터형"
 msgid "Types"
 msgstr "타입"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -17904,7 +17651,7 @@ msgstr "알 수 없음"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -17950,12 +17697,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "맵 \"%1$s\"의 URL에는 \"name\"과 \"url\" 필드가 둘다 필요합니다."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URL"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18040,12 +17787,12 @@ msgstr "블록을 해제"
 msgid "Unblock selected users?"
 msgstr "선택한 사용자의 블록을 해제하시겠습니까?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18065,21 +17812,23 @@ msgstr "단위"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "알 수 없음"
@@ -18097,7 +17846,7 @@ msgid "Unknown error"
 msgstr "알 수 없는 에러"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "알 수 없는 아이템. 선택한 호스트에 그런 아이템은 존재하지 않습니다"
@@ -18150,7 +17899,7 @@ msgstr "템플릿과의 링크 삭제"
 msgid "Unlink from templates"
 msgstr "템플릿과의 링크를 해제"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "음소거 해제"
 
@@ -18180,7 +17929,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "액션 \"%1$s\"의 필터조건에서는 파라미터 \"%2$s\"는 이용할 수 없습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "디스커버리 규칙\"%1$s\"의 필터조건에서는 파라미터\"%2$s\"는 지원하지 않습니다."
@@ -18190,7 +17939,7 @@ msgstr "디스커버리 규칙\"%1$s\"의 필터조건에서는 파라미터\"%2
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "액션\"%1$s\"의 필터에서는 파라미터\"%2$s\"는 이용할 수 없습니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "디스커버리 규칙 \"%1$s\"의 필터에서 파라미터\"%2$s\"는 지원되지 않습니다."
@@ -18235,7 +17984,7 @@ msgstr "Up"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18248,7 +17997,7 @@ msgstr "Up"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18301,7 +18050,7 @@ msgstr "갱신시 실행내용"
 msgid "Update problem"
 msgstr "장애 갱신"
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18319,7 +18068,7 @@ msgstr "업로드"
 msgid "Upper level maps"
 msgstr "상위레벨 맵"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18354,7 +18103,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "액션에서 사용"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18369,7 +18118,7 @@ msgstr "액션에서 사용"
 msgid "User"
 msgstr "유저"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "유저 \"%1$s\"에 유저 그룹을 설정해주세요."
@@ -18421,7 +18170,7 @@ msgstr "사용자를 추가하였습니다"
 msgid "User agent string"
 msgstr "유저 에이전트 문자열"
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "사용자는 비활성의 그룹이나 GUI액세스가 비활성인 그룹에 자기자신을 추가할 수 없습니다."
@@ -18440,7 +18189,7 @@ msgid "User deleted"
 msgid_plural "Users deleted"
 msgstr[0] "사용자를 삭제하였습니다"
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18450,27 +18199,27 @@ msgstr[0] "사용자를 삭제하였습니다"
 msgid "User group"
 msgstr "유저 그룹"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "유저 그룹 \"%1$s\"은 이미 존재합니다."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "유저 그룹 \"%1$s\"는 \"%2$s\"액션 내에서 사용되고 있습니다."
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "유저 그룹 \"%1$s\"는 데이터베이스 정지 메시지의 설정에 이용되고 있습니다."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "유저 그룹 \"%1$s\"는 스크립트\"%2$s\"에 이용되고 있습니다."
@@ -18502,8 +18251,8 @@ msgstr[0] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18547,14 +18296,14 @@ msgstr "유저 패스워드"
 msgid "User profile"
 msgstr "유저 프로파일"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18621,7 +18370,7 @@ msgstr "사용자를 갱신하였습니다"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "ID \"%1$s\"의 유저는 사용할 수 없습니다."
@@ -18937,14 +18686,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -18954,7 +18703,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -18996,7 +18745,7 @@ msgstr "파라미터 \"grid_show\"의 값 \"%1$s\"가 올비르지 않습니다.
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "파라미터 \"grid_show\"의 값 \"%1$s\"가 올바르지 않습니다. \"%2$s\"를 설정하십시오."
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "필드 \"%2$s\"의 값 \"%1$s\"가 너무 깁니다 - %3$d문자. %4$d문자 이내로 설정해주십시오."
@@ -19013,7 +18762,7 @@ msgstr "값의 캐쉬 통계. 유효한 파라미터：total, free, pfree, used,
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "값 매핑"
 
@@ -19056,11 +18805,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "임의 퍼포먼스 카운터 값. 리퀘스트에 따라 integer, float, string 혹은 text를 리턴."
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19107,7 +18857,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19194,7 +18944,7 @@ msgstr "호스트명을 설정하지 않은 경우 표시명은 필수항목입�
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
@@ -19211,7 +18961,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "경고"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19220,7 +18970,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "요소를 보존가능한 최대치에 도달하였습니다."
 
@@ -19236,7 +18986,7 @@ msgstr "요소를 보존가능한 최대치에 도달하였습니다."
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "웹"
 
@@ -19248,7 +18998,7 @@ msgstr "웹"
 msgid "Web monitoring"
 msgstr "웹 감시"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr "Web시나리오"
 
@@ -19263,25 +19013,25 @@ msgstr "Web시나리오 \"%1$s\"는 호스트 \"%2$s\"에 이미 존재합니다
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Web시나리오\"%1$s\"는 이미 존재합니다."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "Web시나리오를 추가했습니다."
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Web시나리오를 삭제했습니다."
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Web시나리오를 비활성화 하였습니다"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Web시나리오를 활성화 하였습니다"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "Web시나리오를 갱신했습니다."
 
@@ -19303,7 +19053,7 @@ msgstr ""
 msgid "Wed"
 msgstr "수"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "수"
 
@@ -19314,7 +19064,7 @@ msgstr "수"
 msgid "Weekly"
 msgstr "주간"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19330,12 +19080,12 @@ msgstr "환영합니다"
 msgid "When active"
 msgstr "연락 허용 시간대"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19530,6 +19280,10 @@ msgstr "Y/m/d H:i"
 msgid "Y-m-d H:i:s"
 msgstr "Y/m/d H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr "Y1"
@@ -19591,7 +19345,7 @@ msgstr "연간"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19648,18 +19402,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19671,9 +19419,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "조작 가능한 권한이 없습니다."
 
@@ -19789,24 +19534,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr "boolean을 지정해주세요"
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "문자열로 지정해 주십시오"
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19815,37 +19564,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr "숫자로 지정해주세요"
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr "숫자가 너무 큽니다"
@@ -19866,28 +19615,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr "시간으로 지정해주세요."
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr "기간을 지정해주세요"
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr "시간범위를 지정해주세요"
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr "시간의 단위를 지정해주세요"
@@ -19935,7 +19685,7 @@ msgstr "전체"
 msgid "all media"
 msgstr "모든 미디어"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -19943,42 +19693,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "배열로 지정해주세요"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr "배열이나 문자열로 지정해주세요"
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -19988,7 +19733,7 @@ msgid "an empty string is expected"
 msgstr "공백문자(empty string)로 지정해 주십시오."
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr "16진수 문자로 입력해주세요"
 
@@ -19996,11 +19741,15 @@ msgstr "16진수 문자로 입력해주세요"
 msgid "an explicit time is expected"
 msgstr "구체적인 시간을 지정해 주십시오"
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20161,14 +19910,8 @@ msgstr "변경할 수 없습니다"
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20198,19 +19941,11 @@ msgstr "변경할 수 없습니다"
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20230,14 +19965,14 @@ msgstr "변경할 수 없습니다"
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20245,7 +19980,7 @@ msgstr "변경할 수 없습니다"
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "공백으로 지정할 수 없습니다"
@@ -20258,7 +19993,7 @@ msgstr "JSON으로 변환할 수 없습니다. 결과가 너무 깁니다"
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr "스크롤 API 리퀘스트를 실행할 수 없습니다. 데이터 뒷부분이 잘립니다."
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20292,7 +20027,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "모순된 아이템의 의존관계는 허가되지 않습니다."
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20311,7 +20046,8 @@ msgid "configure"
 msgstr "설정"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr "포함"
@@ -20340,7 +20076,7 @@ msgstr "count() - 기간 T로 수집된 값 V(오퍼레이터 O를 만족하는)
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20402,7 +20138,7 @@ msgstr "내림차순"
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20424,13 +20160,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr "포함하지 않음"
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr "같지 않음"
@@ -20456,7 +20192,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20493,6 +20230,10 @@ msgstr "조건식이 지정되어있지 않습니다."
 msgid "failed to parse JSON"
 msgstr "JSON의 분석에 실패하였습니다."
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20539,7 +20280,7 @@ msgstr "글로벌 데이터의 보존기간 설정"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20580,6 +20321,11 @@ msgstr "아이콘"
 msgid "image"
 msgstr "이미지"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "범위 내"
@@ -20620,15 +20366,19 @@ msgstr "요소의 수가 올바르지 않습니다"
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "잘못된 서식이 \"%1$s\" 부근에서 발견되었습니다."
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20656,7 +20406,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr "주소 범위 \"%1$s\"가 올바르지 않습니다"
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr "UTF-8의 바이트 시퀀스가 올바르지 않습니다"
 
@@ -20685,27 +20435,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr "히스토리의 보존기간이 올바르지 않습니다"
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr "호스트그룹명이 올바르지 않습니다"
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr "호스트의 이름이 올바르지 않습니다"
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr "정규표현식이 올바르지 않습니다"
 
@@ -20733,7 +20483,7 @@ msgstr "이상"
 msgid "is less than or equals"
 msgstr "이하"
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr "{}로 포함되어 있지 않거나 잘못된 값입니다"
 
@@ -20819,12 +20569,12 @@ msgstr "low-level 디스커버리 룰"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20883,7 +20633,7 @@ msgstr "일치한다"
 msgid "max"
 msgstr "최대"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -20923,7 +20673,7 @@ msgid "min() - Minimum value for period T"
 msgstr "min() - 기간T 안의 최소치"
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr "%1$s 문자 이상 입력해주세요"
@@ -20950,8 +20700,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -20966,27 +20716,14 @@ msgstr "유효한 LDAP서버가 필요합니다."
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "\"%1$s\"에서 \"%2$s\"의 수치로 설정해주세요"
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr "적어도 하나 이상의 LLD 매크로를 포함할 필요가 있습니다."
 
@@ -21014,6 +20751,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21024,7 +20769,7 @@ msgstr ""
 msgid "name"
 msgstr "이름"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "신규"
 
@@ -21159,7 +20904,7 @@ msgstr "출력"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21194,24 +20939,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21239,11 +20988,11 @@ msgstr ""
 msgid "regular expression"
 msgstr "정규 표현"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21255,15 +21004,15 @@ msgstr ""
 msgid "right"
 msgstr "오른쪽"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21311,7 +21060,7 @@ msgstr ""
 msgid "short description"
 msgstr "짧은 설명"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21330,15 +21079,15 @@ msgstr "짧은 설명"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr "비워주십시오"
 
@@ -21354,31 +21103,31 @@ msgstr "아이콘의 매핑을 표시"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21386,11 +21135,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr "sum() - 기간 T안의 합계치"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21406,8 +21155,8 @@ msgstr "지정된 자격 정보는 유니크 값이 아닙니다."
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21418,7 +21167,7 @@ msgstr "지정된 자격 정보는 유니크 값이 아닙니다."
 msgid "tag"
 msgstr "태그"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21427,13 +21176,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "템플릿ID \"%1$s\"가 %2$s번 사용되고 있습니다"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21442,20 +21195,20 @@ msgstr "템플릿ID \"%1$s\"가 %2$s번 사용되고 있습니다"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "파라미터 \"%1$s\" 가 없습니다"
@@ -21487,39 +21240,39 @@ msgstr "제3"
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr "타임시프트"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr "time() - 현재시간"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr "timeleft() - 기간T를 기준으로 하여 지정한 값에 도달하기 까지의 시간"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21533,7 +21286,7 @@ msgstr "트리거"
 msgid "trigger does not allow manual closing"
 msgstr "트리거는 수동 클로즈가 허가되어 있지 않습니다."
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21545,26 +21298,26 @@ msgstr "트리거 프로토타입은 다른 템플릿이나 호스트에 이동�
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr "링크가 있는 트리거는 다른 템플릿이나 호스트로 이동할 수 없습니다"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "검색 문자열을 입력"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21572,11 +21325,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21593,10 +21346,10 @@ msgstr "키의 끝부분이 잘못되어 있습니다"
 msgid "unexpected end of macro"
 msgstr "매크로의 끝부분이 잘못되어 있습니다"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21606,11 +21359,12 @@ msgstr "매크로의 끝부분이 잘못되어 있습니다"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr "파라미터 \"%1$s\" 가 잘못되었습니다"
@@ -21636,8 +21390,8 @@ msgstr "텍스트 \"%1$s\"가 잘못되었습니다."
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21662,6 +21416,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr "지원되지 않는 버전의 번호입니다."
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21677,7 +21435,7 @@ msgstr "지원되지 않는 버전의 번호입니다."
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21697,11 +21455,11 @@ msgstr "지원되지 않는 버전의 번호입니다."
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "값"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21719,76 +21477,83 @@ msgstr "값 \"%1$s\"가 존재하지 않습니다"
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr "값 %1$s는 이미 존재합니다"
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr "값이 너무 깁니다"
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21800,18 +21565,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr "값은 %1$s부터 지정해주세요"
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21820,7 +21583,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21833,11 +21596,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21854,7 +21617,7 @@ msgstr "디스커버리 규칙의 타입이 잘못되었습니다"
 msgid "wrong item type"
 msgstr "아이템의 타입이 잘못되었습니다"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/lt/LC_MESSAGES/frontend.po b/ui/locale/lt/LC_MESSAGES/frontend.po
index 8f55ae5cb53..75bab562ba8 100644
--- a/ui/locale/lt/LC_MESSAGES/frontend.po
+++ b/ui/locale/lt/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2013-10-10 08:29+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -94,7 +94,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -186,7 +186,7 @@ msgstr[2] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -202,7 +202,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -238,7 +238,7 @@ msgstr[2] ""
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -246,7 +246,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -267,13 +267,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -405,7 +405,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -469,10 +469,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr ""
@@ -516,7 +512,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Pripažinimas"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Pripažinimas"
 
@@ -524,7 +520,7 @@ msgstr "Pripažinimas"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Pripažintas"
@@ -537,7 +533,7 @@ msgstr "Pripažinti PROBLEM įvykiai"
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -564,9 +560,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -623,7 +619,7 @@ msgstr ""
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -632,7 +628,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Veiksmas pridėtas"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -683,8 +679,8 @@ msgstr "Veiksmas atnaujintas"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Veiksmai"
@@ -751,7 +747,7 @@ msgstr "Aktyvus iki"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -762,7 +758,7 @@ msgstr "Aktyvus iki"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -785,9 +781,9 @@ msgstr "Aktyvus iki"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -857,7 +853,7 @@ msgstr "Aktyvus iki"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Pridėti"
 
@@ -865,11 +861,11 @@ msgstr "Pridėti"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr ""
 
@@ -877,7 +873,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -894,7 +890,7 @@ msgstr "Pridėti mazgą"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr ""
 
@@ -916,7 +912,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -968,12 +964,12 @@ msgstr ""
 msgid "Add widget"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -983,7 +979,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -996,7 +992,7 @@ msgstr "Adminas"
 msgid "Administration"
 msgstr "Administravimas"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -1018,7 +1014,7 @@ msgstr "Laikotarpis mažesnis už"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1090,7 +1086,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Visi"
 
@@ -1108,7 +1104,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Visos nuorodos turi turėti apibrėžtą \"Pavadinimą\" ir \"URL\""
 
@@ -1126,7 +1122,7 @@ msgstr ""
 msgid "All problems if tag values match"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1239,15 +1235,15 @@ msgstr "Programos klaida."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Taikyti"
 
@@ -1265,7 +1261,7 @@ msgstr "Kreipiantis"
 msgid "Apr"
 msgstr "Bal"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Balandis"
 
@@ -1293,7 +1289,7 @@ msgstr "Srities tipas"
 msgid "Arithmetic"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1340,7 +1336,7 @@ msgstr "Ties (valanda:minutė)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1349,7 +1345,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1361,6 +1357,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1372,7 +1373,7 @@ msgstr "Bent vienas priežiūros periodas turi būti sukurtas."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1428,7 +1429,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Rugpj"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Rugpjūtis"
 
@@ -1441,7 +1442,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1518,7 +1519,7 @@ msgstr ""
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1533,7 +1534,7 @@ msgstr "Automatinis piktogramų išdėstymas"
 msgid "Automatic icon selection"
 msgstr "Automatinis piktogramų pažymėjimas"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1585,7 +1586,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1648,7 +1649,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Užblokuotas"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr ""
 
@@ -1702,11 +1703,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Apačia"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr ""
 
@@ -1732,7 +1733,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1777,8 +1778,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1787,7 +1788,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Apskaičiuotas"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1812,7 +1813,7 @@ msgstr "Atgalinis skambutis"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1825,8 +1826,8 @@ msgstr "Atgalinis skambutis"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Atšaukti"
 
@@ -1856,7 +1857,7 @@ msgstr "Negalima pridėti veiksmo"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1866,7 +1867,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Negalima pridėti priklausomybės iš mazgo į šabloną."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1897,8 +1898,8 @@ msgid "Cannot add host prototype"
 msgstr ""
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Negalima pridėti atvaizdo"
 
@@ -1991,15 +1992,15 @@ msgstr "Negalima pridėti vartotojo"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2019,33 +2020,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Negalima išvalyti istorijos"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Negalima klonuoti grafiko prototipų."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Negalima klonuoti elemento prototipų."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Negalima klonuoti trigerio prototipų."
 
@@ -2073,7 +2070,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] ""
@@ -2127,8 +2124,8 @@ msgstr ""
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2158,7 +2155,7 @@ msgstr ""
 msgid "Cannot delete action"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2229,7 +2226,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2241,11 +2238,11 @@ msgstr[2] ""
 msgid "Cannot delete host prototypes"
 msgstr ""
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr ""
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr ""
 
@@ -2270,7 +2267,7 @@ msgstr ""
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr ""
 
@@ -2304,7 +2301,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2330,7 +2327,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr ""
@@ -2346,8 +2343,8 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2376,7 +2373,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr ""
 
@@ -2432,7 +2429,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr ""
 
@@ -2472,7 +2469,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
@@ -2508,7 +2505,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -2561,7 +2558,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
@@ -2597,7 +2594,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
@@ -2612,7 +2609,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2646,8 +2643,8 @@ msgstr ""
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2745,24 +2742,20 @@ msgstr ""
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2776,7 +2769,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr ""
 
@@ -2790,7 +2783,7 @@ msgid "Cannot link template."
 msgstr ""
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2823,17 +2816,17 @@ msgstr ""
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr ""
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr ""
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr ""
@@ -2860,7 +2853,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr ""
 
@@ -2879,7 +2872,7 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2919,12 +2912,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2944,7 +2937,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
@@ -2957,7 +2950,7 @@ msgstr ""
 msgid "Cannot unlink template."
 msgstr ""
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -3010,11 +3003,6 @@ msgstr ""
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr ""
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -3024,8 +3012,9 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
@@ -3086,9 +3075,7 @@ msgstr ""
 msgid "Cannot update group"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
@@ -3112,13 +3099,13 @@ msgstr[2] ""
 msgid "Cannot update hosts"
 msgstr ""
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr ""
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr ""
 
@@ -3173,12 +3160,12 @@ msgstr ""
 msgid "Cannot update proxy"
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3198,17 +3185,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr ""
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3285,7 +3272,7 @@ msgstr[2] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr ""
 
@@ -3385,8 +3372,8 @@ msgid "Character string not included"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3501,7 +3488,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr ""
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3522,7 +3509,7 @@ msgstr ""
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3543,11 +3530,11 @@ msgstr ""
 msgid "Clear when unlinking"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3562,7 +3549,7 @@ msgstr ""
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3577,7 +3564,7 @@ msgstr ""
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr ""
 
@@ -3588,8 +3575,8 @@ msgstr ""
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr ""
 
@@ -3600,13 +3587,13 @@ msgstr ""
 msgid "Close expression constructor"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
 
@@ -3619,8 +3606,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr ""
 
@@ -3637,7 +3624,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3703,7 +3690,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3714,17 +3701,12 @@ msgstr ""
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3734,17 +3716,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3760,7 +3737,7 @@ msgstr ""
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr ""
 
@@ -3823,7 +3800,7 @@ msgstr ""
 msgid "Configuration of housekeeping"
 msgstr ""
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr ""
@@ -3930,7 +3907,7 @@ msgstr ""
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr ""
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -4023,7 +4000,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4083,7 +4060,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -4122,8 +4099,8 @@ msgstr ""
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr ""
 
@@ -4132,12 +4109,11 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr ""
@@ -4167,16 +4143,6 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr ""
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr ""
@@ -4185,14 +4151,10 @@ msgstr ""
 msgid "Correlation updated"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr ""
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr ""
 
@@ -4256,11 +4218,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr ""
 
@@ -4377,7 +4339,7 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr ""
 
@@ -4401,7 +4363,7 @@ msgstr ""
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr ""
 
@@ -4564,7 +4526,7 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr ""
@@ -4576,11 +4538,11 @@ msgstr ""
 msgid "Daily"
 msgstr ""
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4601,8 +4563,8 @@ msgstr ""
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr ""
 
@@ -4626,9 +4588,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr ""
 
@@ -4652,7 +4614,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4680,7 +4642,7 @@ msgstr ""
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4822,7 +4784,7 @@ msgstr ""
 msgid "Days"
 msgstr ""
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr ""
 
@@ -4836,26 +4798,26 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr ""
 
@@ -4948,7 +4910,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4972,8 +4934,8 @@ msgstr ""
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr ""
 
@@ -4998,11 +4960,11 @@ msgstr ""
 msgid "Delete current action?"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -5046,7 +5008,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -5102,7 +5064,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr ""
 
@@ -5207,7 +5169,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5251,7 +5213,7 @@ msgstr ""
 msgid "Delete web scenario?"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5296,7 +5258,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr ""
 
@@ -5304,7 +5266,7 @@ msgstr ""
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5314,7 +5276,7 @@ msgstr ""
 msgid "Deployment status"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5347,7 +5309,7 @@ msgid "Description"
 msgstr ""
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5513,10 +5475,10 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5599,7 +5561,7 @@ msgid "Discovery by proxy"
 msgstr ""
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr ""
 
@@ -5611,7 +5573,7 @@ msgstr ""
 msgid "Discovery list"
 msgstr ""
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr ""
 
@@ -5643,7 +5605,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5651,12 +5613,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
@@ -5669,7 +5631,7 @@ msgstr ""
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5713,7 +5675,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5724,7 +5686,7 @@ msgstr ""
 msgid "Discovery rules deleted"
 msgstr ""
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr ""
@@ -5761,10 +5723,11 @@ msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
@@ -5774,7 +5737,7 @@ msgstr ""
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5796,7 +5759,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
@@ -5852,7 +5815,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5860,7 +5823,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr ""
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5879,18 +5842,6 @@ msgstr ""
 msgid "Draw style"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5903,11 +5854,6 @@ msgstr ""
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5959,7 +5905,7 @@ msgstr ""
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
@@ -5968,11 +5914,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5986,8 +5932,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr ""
 
@@ -6003,11 +5949,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr ""
 
@@ -6067,21 +6013,17 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
@@ -6097,25 +6039,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6125,14 +6061,6 @@ msgstr ""
 msgid "Empty map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr ""
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6298,7 +6226,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6309,7 +6237,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6352,7 +6280,7 @@ msgid "English (en_US)"
 msgstr ""
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6368,7 +6296,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6387,12 +6315,12 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6419,7 +6347,7 @@ msgstr ""
 msgid "Event acknowledged"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6427,7 +6355,7 @@ msgid "Event correlation"
 msgstr ""
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr ""
@@ -6462,11 +6390,11 @@ msgstr ""
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6512,15 +6440,10 @@ msgstr ""
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6558,7 +6481,7 @@ msgstr ""
 msgid "Executed script"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr ""
 
@@ -6574,8 +6497,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr ""
 
@@ -6696,7 +6619,7 @@ msgstr ""
 msgid "External check"
 msgstr ""
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
@@ -6723,8 +6646,8 @@ msgstr ""
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6735,26 +6658,26 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6762,7 +6685,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6786,7 +6709,7 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr ""
 
@@ -6808,10 +6731,9 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6822,13 +6744,6 @@ msgstr ""
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6847,11 +6762,6 @@ msgstr ""
 msgid "Field \"%1$s\" is not string."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6866,10 +6776,6 @@ msgstr ""
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr ""
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6934,7 +6840,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6959,7 +6866,7 @@ msgstr ""
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -7011,7 +6918,7 @@ msgstr ""
 msgid "Fixed"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -7062,12 +6969,12 @@ msgstr ""
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7080,7 +6987,7 @@ msgstr ""
 msgid "Fri"
 msgstr ""
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr ""
 
@@ -7191,7 +7098,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr ""
@@ -7205,7 +7112,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr ""
 
@@ -7243,7 +7150,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr ""
 
@@ -7251,7 +7158,7 @@ msgstr ""
 msgid "Gradient line"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7312,7 +7219,7 @@ msgstr[2] ""
 msgid "Graph deleted"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7349,8 +7256,8 @@ msgstr ""
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7384,8 +7291,8 @@ msgstr ""
 msgid "Graph updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7416,7 +7323,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr ""
 
@@ -7437,12 +7344,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr ""
@@ -7617,11 +7524,11 @@ msgstr ""
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr ""
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr ""
 
@@ -7648,11 +7555,11 @@ msgstr ""
 msgid "High"
 msgstr ""
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7673,7 +7580,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr ""
 
@@ -7681,11 +7588,15 @@ msgstr ""
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr ""
 
@@ -7728,7 +7639,7 @@ msgstr ""
 msgid "Horizontal align"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7757,7 +7668,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7772,7 +7683,7 @@ msgstr[2] ""
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7780,7 +7691,7 @@ msgstr ""
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7834,7 +7745,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7848,22 +7759,22 @@ msgstr[2] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7876,10 +7787,10 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7895,8 +7806,8 @@ msgstr ""
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7970,7 +7881,7 @@ msgstr ""
 msgid "Host networks"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -8051,7 +7962,7 @@ msgstr ""
 msgid "Host updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr ""
@@ -8071,7 +7982,7 @@ msgstr ""
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8084,7 +7995,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8132,7 +8043,7 @@ msgstr ""
 msgid "Hours"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8172,7 +8083,7 @@ msgstr ""
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr ""
@@ -8197,7 +8108,7 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8254,12 +8165,12 @@ msgstr ""
 msgid "Icon map"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
@@ -8272,18 +8183,18 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
@@ -8386,23 +8297,20 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -8411,7 +8319,7 @@ msgstr ""
 msgid "Image added"
 msgstr ""
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr ""
 
@@ -8419,18 +8327,12 @@ msgstr ""
 msgid "Image label type"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr ""
 
@@ -8525,7 +8427,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8536,13 +8438,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr ""
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8586,7 +8488,7 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8754,24 +8656,6 @@ msgstr ""
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8826,8 +8710,6 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
@@ -8853,31 +8735,22 @@ msgstr ""
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8906,7 +8779,7 @@ msgstr ""
 msgid "Incorrect eventsource value."
 msgstr ""
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
@@ -8931,22 +8804,17 @@ msgstr ""
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8957,7 +8825,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
@@ -8985,8 +8853,6 @@ msgstr ""
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -9048,10 +8914,6 @@ msgstr ""
 msgid "Incorrect map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr ""
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9109,13 +8971,13 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr ""
 
@@ -9168,12 +9030,7 @@ msgstr ""
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
@@ -9219,13 +9076,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9242,60 +9099,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr ""
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr ""
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9350,14 +9177,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9467,25 +9288,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9496,7 +9299,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9542,16 +9345,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9560,7 +9364,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9648,12 +9452,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr ""
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr ""
 
@@ -9757,7 +9561,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr ""
 
@@ -9765,7 +9569,7 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9776,7 +9580,7 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9799,7 +9603,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9831,7 +9635,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
@@ -9856,27 +9660,29 @@ msgstr ""
 msgid "Invalid method parameters."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9902,17 +9708,17 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9920,8 +9726,8 @@ msgstr ""
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9935,106 +9741,116 @@ msgstr ""
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -10076,43 +9892,38 @@ msgstr ""
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10133,7 +9944,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr ""
 
@@ -10174,7 +9985,7 @@ msgstr ""
 msgid "Italian (it_IT)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10206,7 +10017,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10220,7 +10031,7 @@ msgstr ""
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] ""
@@ -10235,14 +10046,14 @@ msgstr ""
 msgid "Item deleted"
 msgstr ""
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -10253,7 +10064,7 @@ msgstr[2] ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr ""
 
@@ -10262,7 +10073,7 @@ msgstr ""
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10300,8 +10111,8 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10327,7 +10138,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10359,8 +10170,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10411,11 +10222,11 @@ msgstr ""
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr ""
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr ""
 
@@ -10433,7 +10244,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10458,6 +10269,10 @@ msgstr ""
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10470,7 +10285,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10488,7 +10303,7 @@ msgstr ""
 msgid "Jan"
 msgstr ""
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr ""
 
@@ -10510,7 +10325,7 @@ msgstr ""
 msgid "Jul"
 msgstr ""
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr ""
 
@@ -10518,7 +10333,7 @@ msgstr ""
 msgid "Jun"
 msgstr ""
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr ""
 
@@ -10680,22 +10495,6 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10707,11 +10506,11 @@ msgstr ""
 msgid "Last check"
 msgstr ""
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr ""
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr ""
 
@@ -10749,11 +10548,11 @@ msgstr ""
 msgid "Last value"
 msgstr ""
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr ""
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10762,11 +10561,11 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr ""
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr ""
 
@@ -10807,7 +10606,7 @@ msgstr ""
 msgid "Left trim"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -11088,7 +10887,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
@@ -11110,7 +10909,7 @@ msgstr ""
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11121,12 +10920,12 @@ msgid "Macro"
 msgstr ""
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
@@ -11154,7 +10953,7 @@ msgstr ""
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -11162,7 +10961,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11245,7 +11044,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11267,13 +11066,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr ""
 
@@ -11342,7 +11141,7 @@ msgstr ""
 msgid "Map update failed."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11374,7 +11173,7 @@ msgstr ""
 msgid "Mar"
 msgstr ""
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr ""
 
@@ -11478,7 +11277,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11493,7 +11292,7 @@ msgstr[2] ""
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr ""
 
@@ -11508,15 +11307,12 @@ msgstr ""
 msgid "Media"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr ""
@@ -11546,11 +11342,6 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr ""
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11580,7 +11371,7 @@ msgstr ""
 msgid "Media types"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11668,7 +11459,7 @@ msgstr ""
 msgid "Method not found."
 msgstr ""
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11730,7 +11521,7 @@ msgid "Minimum severity"
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11790,7 +11581,7 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11832,7 +11623,7 @@ msgstr[2] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11858,7 +11649,7 @@ msgstr ""
 msgid "Mon"
 msgstr ""
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr ""
 
@@ -11898,11 +11689,11 @@ msgstr ""
 msgid "Monthly"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11926,7 +11717,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr ""
 
@@ -11939,7 +11730,7 @@ msgstr ""
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr ""
 
@@ -12068,11 +11859,11 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12230,19 +12021,21 @@ msgstr ""
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr ""
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr ""
 
@@ -12254,7 +12047,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12262,7 +12055,7 @@ msgstr ""
 msgid "New service time"
 msgstr ""
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12271,7 +12064,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12289,7 +12082,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12318,30 +12111,6 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr ""
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12357,11 +12126,6 @@ msgstr ""
 msgid "No \"%1$s\" given for map."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12369,7 +12133,7 @@ msgstr ""
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -12379,7 +12143,7 @@ msgstr ""
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -12396,11 +12160,6 @@ msgstr ""
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr ""
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12431,7 +12190,7 @@ msgstr ""
 msgid "No details"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr ""
 
@@ -12467,7 +12226,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr ""
 
@@ -12497,7 +12256,7 @@ msgstr ""
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr ""
 
@@ -12531,7 +12290,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr ""
 
@@ -12539,17 +12298,46 @@ msgstr ""
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12557,7 +12345,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12585,19 +12373,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12612,16 +12399,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12641,12 +12434,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12667,27 +12458,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12704,14 +12497,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12720,7 +12513,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
@@ -12740,7 +12533,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr ""
 
@@ -12752,7 +12545,7 @@ msgstr ""
 msgid "No target selected"
 msgstr ""
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr ""
 
@@ -12769,7 +12562,7 @@ msgstr ""
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr ""
 
@@ -12839,15 +12632,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12879,7 +12672,7 @@ msgstr ""
 msgid "Not supported"
 msgstr ""
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr ""
@@ -12910,7 +12703,7 @@ msgstr ""
 msgid "Nov"
 msgstr ""
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr ""
 
@@ -13097,8 +12890,8 @@ msgstr ""
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13158,13 +12951,13 @@ msgstr ""
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr ""
 
@@ -13172,30 +12965,31 @@ msgstr ""
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr ""
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr ""
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr ""
 
@@ -13211,35 +13005,15 @@ msgstr ""
 msgid "One"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr ""
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr ""
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13289,10 +13063,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr ""
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13301,15 +13071,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr ""
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr ""
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr ""
 
@@ -13318,7 +13084,7 @@ msgstr ""
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13327,11 +13093,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr ""
 
@@ -13353,7 +13119,7 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13362,33 +13128,33 @@ msgstr ""
 msgid "Operations"
 msgstr ""
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr ""
 
@@ -13497,7 +13263,7 @@ msgstr ""
 msgid "Other parameters"
 msgstr ""
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr ""
@@ -13511,7 +13277,7 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13540,7 +13306,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13729,7 +13495,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13774,7 +13540,7 @@ msgstr ""
 msgid "PSK identity"
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13797,16 +13563,16 @@ msgstr ""
 msgid "Parameter"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr ""
@@ -13836,7 +13602,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13853,7 +13619,7 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13865,11 +13631,6 @@ msgstr ""
 msgid "Parse"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr ""
@@ -13930,7 +13691,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr ""
 
@@ -13940,15 +13701,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13994,12 +13755,11 @@ msgstr ""
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr ""
 
@@ -14088,7 +13848,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr ""
 
@@ -14128,7 +13888,7 @@ msgstr ""
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14217,7 +13977,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14348,7 +14108,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr ""
 
@@ -14361,21 +14121,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14389,9 +14145,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr ""
 
@@ -14425,7 +14181,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr ""
 
@@ -14446,13 +14202,13 @@ msgstr ""
 msgid "Proxies"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14460,7 +14216,7 @@ msgstr ""
 msgid "Proxy"
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14470,12 +14226,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
@@ -14569,7 +14325,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14646,10 +14402,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr ""
@@ -14731,7 +14483,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14749,13 +14501,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr ""
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14789,7 +14541,7 @@ msgstr ""
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14821,8 +14573,6 @@ msgstr ""
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14843,7 +14593,9 @@ msgstr ""
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14856,7 +14608,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14933,8 +14685,8 @@ msgstr ""
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr ""
 
@@ -14974,7 +14726,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -15016,7 +14768,7 @@ msgid "Replace dependencies"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -15071,7 +14823,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -15113,8 +14865,8 @@ msgstr ""
 msgid "Required string"
 msgstr ""
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr ""
 
@@ -15147,7 +14899,7 @@ msgstr ""
 msgid "Reset defaults"
 msgstr ""
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr ""
 
@@ -15213,7 +14965,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr ""
@@ -15400,12 +15152,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr ""
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15416,8 +15168,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr ""
 
@@ -15454,7 +15206,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15550,12 +15302,12 @@ msgstr ""
 msgid "SQL query"
 msgstr ""
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr ""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
@@ -15618,7 +15370,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr ""
 
@@ -15630,7 +15382,7 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr ""
 
@@ -15672,7 +15424,7 @@ msgstr ""
 msgid "Scheduled check"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15742,7 +15494,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15755,8 +15507,7 @@ msgstr ""
 msgid "Script"
 msgstr ""
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
@@ -15789,12 +15540,6 @@ msgstr ""
 msgid "Script parameters"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr ""
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr ""
@@ -15807,7 +15552,7 @@ msgstr ""
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr ""
 
@@ -15877,8 +15622,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15886,7 +15631,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr ""
 
@@ -15922,19 +15667,19 @@ msgstr ""
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr ""
 
@@ -15959,7 +15704,7 @@ msgstr ""
 msgid "Send to"
 msgstr ""
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr ""
 
@@ -15992,7 +15737,7 @@ msgstr ""
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr ""
 
@@ -16023,28 +15768,28 @@ msgstr ""
 msgid "Server time"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr ""
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -16054,7 +15799,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr ""
 
@@ -16087,16 +15832,16 @@ msgstr ""
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -16104,11 +15849,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr ""
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr ""
 
@@ -16117,30 +15862,29 @@ msgstr ""
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -16148,7 +15892,7 @@ msgstr ""
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16178,7 +15922,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16207,7 +15951,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16216,7 +15960,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16272,7 +16016,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr ""
 
@@ -16414,7 +16158,7 @@ msgstr ""
 msgid "Show working time"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr ""
 
@@ -16523,7 +16267,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr ""
 
@@ -16569,7 +16313,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr ""
 
@@ -16643,7 +16387,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16746,15 +16490,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr ""
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr ""
@@ -16784,7 +16532,7 @@ msgstr ""
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16832,7 +16580,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16897,7 +16645,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr ""
 
@@ -16913,7 +16661,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr ""
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16926,7 +16674,7 @@ msgstr ""
 msgid "Sun"
 msgstr ""
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr ""
 
@@ -17018,12 +16766,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -17050,17 +16798,17 @@ msgstr ""
 msgid "Table \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr ""
@@ -17116,7 +16864,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17176,7 +16924,7 @@ msgstr ""
 msgid "Telnet"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17197,7 +16945,7 @@ msgstr ""
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17221,7 +16969,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17281,7 +17029,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17453,7 +17201,7 @@ msgstr ""
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
@@ -17461,7 +17209,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17527,7 +17275,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr ""
 
@@ -17535,7 +17283,7 @@ msgstr ""
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr ""
 
@@ -17543,7 +17291,7 @@ msgstr ""
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr ""
 
@@ -17563,7 +17311,7 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr ""
 
@@ -17580,7 +17328,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17613,7 +17361,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr ""
 
@@ -17665,12 +17413,11 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr ""
 
@@ -17785,7 +17532,7 @@ msgstr ""
 msgid "Trends"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17793,7 +17540,7 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr ""
 
@@ -17897,7 +17644,7 @@ msgstr ""
 msgid "Trigger overview"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17971,11 +17718,11 @@ msgstr ""
 msgid "Trigger severity"
 msgstr ""
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17992,7 +17739,7 @@ msgstr ""
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -18027,7 +17774,7 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr ""
 
@@ -18040,7 +17787,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -18056,19 +17803,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18120,7 +17867,7 @@ msgstr ""
 msgid "Types"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18141,7 +17888,7 @@ msgstr ""
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr ""
 
@@ -18187,12 +17934,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18277,12 +18024,12 @@ msgstr ""
 msgid "Unblock selected users?"
 msgstr ""
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18302,21 +18049,23 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr ""
@@ -18334,7 +18083,7 @@ msgid "Unknown error"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
@@ -18387,7 +18136,7 @@ msgstr ""
 msgid "Unlink from templates"
 msgstr ""
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr ""
 
@@ -18419,7 +18168,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -18429,7 +18178,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -18474,7 +18223,7 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18487,7 +18236,7 @@ msgstr ""
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18540,7 +18289,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18558,7 +18307,7 @@ msgstr ""
 msgid "Upper level maps"
 msgstr ""
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18593,7 +18342,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18608,7 +18357,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
@@ -18660,7 +18409,7 @@ msgstr ""
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
@@ -18681,7 +18430,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18691,27 +18440,27 @@ msgstr[2] ""
 msgid "User group"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
@@ -18747,8 +18496,8 @@ msgstr[2] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18792,14 +18541,14 @@ msgstr ""
 msgid "User profile"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18870,7 +18619,7 @@ msgstr ""
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -19186,14 +18935,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19203,7 +18952,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19245,7 +18994,7 @@ msgstr ""
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr ""
@@ -19262,7 +19011,7 @@ msgstr ""
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr ""
 
@@ -19305,11 +19054,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr ""
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19356,7 +19106,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19443,7 +19193,7 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19460,7 +19210,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19469,7 +19219,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19485,7 +19235,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr ""
 
@@ -19497,7 +19247,7 @@ msgstr ""
 msgid "Web monitoring"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr ""
 
@@ -19512,29 +19262,29 @@ msgstr ""
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr ""
 
@@ -19556,7 +19306,7 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr ""
 
@@ -19567,7 +19317,7 @@ msgstr ""
 msgid "Weekly"
 msgstr ""
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19583,12 +19333,12 @@ msgstr ""
 msgid "When active"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19783,6 +19533,10 @@ msgstr ""
 msgid "Y-m-d H:i:s"
 msgstr ""
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr ""
@@ -19844,7 +19598,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19901,18 +19655,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19924,9 +19672,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
@@ -20042,24 +19787,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr ""
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -20068,37 +19817,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr ""
@@ -20119,28 +19868,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr ""
@@ -20188,7 +19938,7 @@ msgstr ""
 msgid "all media"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20196,42 +19946,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20241,7 +19986,7 @@ msgid "an empty string is expected"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr ""
 
@@ -20249,11 +19994,15 @@ msgstr ""
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20414,14 +20163,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20451,19 +20194,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20483,14 +20218,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20498,7 +20233,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr ""
@@ -20511,7 +20246,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20545,7 +20280,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20563,7 +20298,8 @@ msgid "configure"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20592,7 +20328,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20654,7 +20390,7 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20676,13 +20412,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20708,7 +20444,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20745,6 +20482,10 @@ msgstr ""
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20791,7 +20532,7 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr ""
@@ -20832,6 +20573,11 @@ msgstr ""
 msgid "image"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr ""
@@ -20872,15 +20618,19 @@ msgstr ""
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20908,7 +20658,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr ""
 
@@ -20937,27 +20687,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr ""
 
@@ -20985,7 +20735,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr ""
 
@@ -21071,12 +20821,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -21135,7 +20885,7 @@ msgstr ""
 msgid "max"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21175,7 +20925,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr ""
@@ -21202,8 +20952,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21218,27 +20968,14 @@ msgstr ""
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr ""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21266,6 +21003,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21276,7 +21021,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr ""
 
@@ -21411,7 +21156,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21446,24 +21191,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21491,11 +21240,11 @@ msgstr ""
 msgid "regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21507,15 +21256,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21563,7 +21312,7 @@ msgstr ""
 msgid "short description"
 msgstr ""
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21582,15 +21331,15 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr ""
 
@@ -21606,31 +21355,31 @@ msgstr ""
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21638,11 +21387,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21658,8 +21407,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21670,7 +21419,7 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21679,13 +21428,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21694,20 +21447,20 @@ msgstr ""
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr ""
@@ -21739,39 +21492,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21785,7 +21538,7 @@ msgstr ""
 msgid "trigger does not allow manual closing"
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21797,26 +21550,26 @@ msgstr ""
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21824,11 +21577,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21845,10 +21598,10 @@ msgstr ""
 msgid "unexpected end of macro"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21858,11 +21611,12 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr ""
@@ -21888,8 +21642,8 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21914,6 +21668,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21929,7 +21687,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21949,11 +21707,11 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21971,76 +21729,87 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr ""
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr ""
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -22052,18 +21821,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -22072,7 +21839,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -22085,11 +21852,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -22106,7 +21873,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr ""
diff --git a/ui/locale/lv/LC_MESSAGES/frontend.po b/ui/locale/lv/LC_MESSAGES/frontend.po
index 593b0884252..581ab43b175 100644
--- a/ui/locale/lv/LC_MESSAGES/frontend.po
+++ b/ui/locale/lv/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2013-10-15 07:19+0300\n"
 "Last-Translator: Jaba <janis.jaunbalodis@gmail.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -95,7 +95,7 @@ msgstr[0] "%1$d diena"
 msgstr[1] "%1$d dienas"
 msgstr[2] ""
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -187,7 +187,7 @@ msgstr[2] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -203,7 +203,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -239,7 +239,7 @@ msgstr[2] ""
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -247,7 +247,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -268,13 +268,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -406,7 +406,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -470,10 +470,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr ""
@@ -516,7 +512,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Apst"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Apstiprinājums"
 
@@ -524,7 +520,7 @@ msgstr "Apstiprinājums"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Apstiprināts"
@@ -537,7 +533,7 @@ msgstr ""
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -564,9 +560,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -623,7 +619,7 @@ msgstr ""
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -632,7 +628,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Darbība pievienota"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -683,8 +679,8 @@ msgstr "Darbība atjaunota"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Darbības"
@@ -751,7 +747,7 @@ msgstr "Aktīvs līdz"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -762,7 +758,7 @@ msgstr "Aktīvs līdz"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -785,9 +781,9 @@ msgstr "Aktīvs līdz"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -857,7 +853,7 @@ msgstr "Aktīvs līdz"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Pievienot"
 
@@ -865,11 +861,11 @@ msgstr "Pievienot"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr ""
 
@@ -877,7 +873,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -894,7 +890,7 @@ msgstr "Pievienot mezglu"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr ""
 
@@ -916,7 +912,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -970,12 +966,12 @@ msgstr ""
 msgid "Add widget"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -985,7 +981,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -998,7 +994,7 @@ msgstr "Administrators"
 msgid "Administration"
 msgstr "Administrācija"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -1020,7 +1016,7 @@ msgstr "Vecums mazāks par"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1092,7 +1088,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Viss"
 
@@ -1110,7 +1106,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr ""
 
@@ -1128,7 +1124,7 @@ msgstr ""
 msgid "All problems if tag values match"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1241,15 +1237,15 @@ msgstr "Aplikācijas kļūda."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Pielietot"
 
@@ -1267,7 +1263,7 @@ msgstr ""
 msgid "Apr"
 msgstr "Apr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Aprīlis"
 
@@ -1295,7 +1291,7 @@ msgstr ""
 msgid "Arithmetic"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1342,7 +1338,7 @@ msgstr ""
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1351,7 +1347,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1363,6 +1359,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1374,7 +1375,7 @@ msgstr ""
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1430,7 +1431,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Aug"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Augusts"
 
@@ -1443,7 +1444,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1520,7 +1521,7 @@ msgstr ""
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1535,7 +1536,7 @@ msgstr ""
 msgid "Automatic icon selection"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1587,7 +1588,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1650,7 +1651,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Bloķēts"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr ""
 
@@ -1704,11 +1705,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Apakša"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr ""
 
@@ -1734,7 +1735,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1779,8 +1780,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1789,7 +1790,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Izskaitļots"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1814,7 +1815,7 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1827,8 +1828,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Atcelt"
 
@@ -1858,7 +1859,7 @@ msgstr ""
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1868,7 +1869,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1899,8 +1900,8 @@ msgid "Cannot add host prototype"
 msgstr ""
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Attēlu nevar pievienot"
 
@@ -1993,15 +1994,15 @@ msgstr "Lietotāju nav iespējams pievienot"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2021,33 +2022,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr ""
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr ""
 
@@ -2075,7 +2072,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] ""
@@ -2129,8 +2126,8 @@ msgstr ""
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2160,7 +2157,7 @@ msgstr ""
 msgid "Cannot delete action"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2232,7 +2229,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2244,11 +2241,11 @@ msgstr[2] ""
 msgid "Cannot delete host prototypes"
 msgstr ""
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr ""
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Attēlu nav iespējams izdzēst"
 
@@ -2273,7 +2270,7 @@ msgstr ""
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr ""
 
@@ -2307,7 +2304,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2333,7 +2330,7 @@ msgstr[0] "Skriptu nav iespējams izdzēst"
 msgstr[1] "Skriptu nav iespējams izdzēst"
 msgstr[2] "Skriptu nav iespējams izdzēst"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr ""
@@ -2350,8 +2347,8 @@ msgstr[0] "Servisu nav iespējams izdzēst"
 msgstr[1] "Servisu nav iespējams izdzēst"
 msgstr[2] "Servisu nav iespējams izdzēst"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2380,7 +2377,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr ""
 
@@ -2436,7 +2433,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr ""
 
@@ -2476,7 +2473,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
@@ -2512,7 +2509,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -2565,7 +2562,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
@@ -2601,7 +2598,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
@@ -2616,7 +2613,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2650,8 +2647,8 @@ msgstr ""
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2749,24 +2746,20 @@ msgstr ""
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2780,7 +2773,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr ""
 
@@ -2794,7 +2787,7 @@ msgid "Cannot link template."
 msgstr ""
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2827,17 +2820,17 @@ msgstr ""
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr ""
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr ""
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr ""
@@ -2864,7 +2857,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr ""
 
@@ -2883,7 +2876,7 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2923,12 +2916,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2948,7 +2941,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
@@ -2961,7 +2954,7 @@ msgstr ""
 msgid "Cannot unlink template."
 msgstr ""
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -3014,11 +3007,6 @@ msgstr ""
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr ""
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -3028,8 +3016,9 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
@@ -3090,9 +3079,7 @@ msgstr ""
 msgid "Cannot update group"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
@@ -3116,13 +3103,13 @@ msgstr[2] ""
 msgid "Cannot update hosts"
 msgstr ""
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr ""
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Attēlu nav iespējams atjaunot"
 
@@ -3177,12 +3164,12 @@ msgstr ""
 msgid "Cannot update proxy"
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3202,17 +3189,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Nevar modificēt skriptu"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3289,7 +3276,7 @@ msgstr[2] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr ""
 
@@ -3389,8 +3376,8 @@ msgid "Character string not included"
 msgstr "Simbolu rinda nav iekļauta"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3505,7 +3492,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr ""
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3526,7 +3513,7 @@ msgstr ""
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3547,11 +3534,11 @@ msgstr ""
 msgid "Clear when unlinking"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3566,7 +3553,7 @@ msgstr "Pulkstenis"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3581,7 +3568,7 @@ msgstr "Pulkstenis"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Klonēt"
 
@@ -3592,8 +3579,8 @@ msgstr "Klonēt"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Aizvērt"
 
@@ -3604,13 +3591,13 @@ msgstr "Aizvērt"
 msgid "Close expression constructor"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
 
@@ -3623,8 +3610,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr ""
 
@@ -3641,7 +3628,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3707,7 +3694,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3718,17 +3705,12 @@ msgstr "Nosacījums"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3738,17 +3720,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3764,7 +3741,7 @@ msgstr "Nosacījumi"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Konfigurācija"
 
@@ -3827,7 +3804,7 @@ msgstr ""
 msgid "Configuration of housekeeping"
 msgstr ""
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr ""
@@ -3934,7 +3911,7 @@ msgstr "Apstiprinājuma teksts"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr ""
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -4027,7 +4004,7 @@ msgstr "Kontaktinformācija"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4087,7 +4064,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -4126,8 +4103,8 @@ msgstr "Koordinātes"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Kopēt"
 
@@ -4136,12 +4113,11 @@ msgstr "Kopēt"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr ""
@@ -4171,16 +4147,6 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr ""
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr ""
@@ -4189,14 +4155,10 @@ msgstr ""
 msgid "Correlation updated"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Attēlu nevar saglabāt!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Skaits"
 
@@ -4260,11 +4222,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr ""
 
@@ -4381,7 +4343,7 @@ msgstr "Izveidot karti"
 msgid "Create media type"
 msgstr ""
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr ""
 
@@ -4405,7 +4367,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Izveidot veidni"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Izveidot trigeri"
 
@@ -4568,7 +4530,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "DNS vārds"
@@ -4580,11 +4542,11 @@ msgstr "DNS vārds"
 msgid "Daily"
 msgstr "Ik dienu"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4605,8 +4567,8 @@ msgstr ""
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr ""
 
@@ -4630,9 +4592,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr ""
 
@@ -4656,7 +4618,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4684,7 +4646,7 @@ msgstr "Datu pārskats"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4826,7 +4788,7 @@ msgstr "Nedēļas diena"
 msgid "Days"
 msgstr "Dienas"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Atkļūdošana"
 
@@ -4840,26 +4802,26 @@ msgstr "Atkļūdošanas režīms"
 msgid "Dec"
 msgstr "Dec"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Decembris"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Noklusētais"
 
@@ -4952,7 +4914,7 @@ msgstr "Aizkave pēc"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4976,8 +4938,8 @@ msgstr "Aizkave pēc"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Dzēst"
 
@@ -5002,11 +4964,11 @@ msgstr ""
 msgid "Delete current action?"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -5050,7 +5012,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -5106,7 +5068,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Vai dzēst iezīmētos elementus?"
 
@@ -5211,7 +5173,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5255,7 +5217,7 @@ msgstr "Dzēst trigeri?"
 msgid "Delete web scenario?"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5300,7 +5262,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr ""
 
@@ -5308,7 +5270,7 @@ msgstr ""
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5318,7 +5280,7 @@ msgstr ""
 msgid "Deployment status"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5351,7 +5313,7 @@ msgid "Description"
 msgstr "Apraksts"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5517,10 +5479,10 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5603,7 +5565,7 @@ msgid "Discovery by proxy"
 msgstr ""
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr ""
 
@@ -5615,7 +5577,7 @@ msgstr ""
 msgid "Discovery list"
 msgstr ""
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr ""
 
@@ -5647,7 +5609,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5655,12 +5617,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
@@ -5673,7 +5635,7 @@ msgstr ""
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5717,7 +5679,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5728,7 +5690,7 @@ msgstr ""
 msgid "Discovery rules deleted"
 msgstr ""
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr ""
@@ -5765,10 +5727,11 @@ msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
@@ -5778,7 +5741,7 @@ msgstr ""
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5800,7 +5763,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
@@ -5856,7 +5819,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5864,7 +5827,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr ""
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5883,18 +5846,6 @@ msgstr ""
 msgid "Draw style"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5907,11 +5858,6 @@ msgstr ""
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5963,7 +5909,7 @@ msgstr ""
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
@@ -5972,11 +5918,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5990,8 +5936,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Rediģēt"
 
@@ -6007,11 +5953,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Labot trigeri"
 
@@ -6071,21 +6017,17 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
@@ -6101,25 +6043,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6129,14 +6065,6 @@ msgstr ""
 msgid "Empty map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr ""
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6302,7 +6230,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6313,7 +6241,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6356,7 +6284,7 @@ msgid "English (en_US)"
 msgstr "Angļu (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6372,7 +6300,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6391,12 +6319,12 @@ msgstr ""
 msgid "Error"
 msgstr "Kļūda"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6424,7 +6352,7 @@ msgstr "Notikuma ID"
 msgid "Event acknowledged"
 msgstr "Notikums apstiprināts"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6432,7 +6360,7 @@ msgid "Event correlation"
 msgstr ""
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr ""
@@ -6467,11 +6395,11 @@ msgstr ""
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6517,15 +6445,10 @@ msgstr "Neiekļaut"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Izpildīt"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6563,7 +6486,7 @@ msgstr ""
 msgid "Executed script"
 msgstr "Palaist skriptu"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Izpildes apstiprināšana"
 
@@ -6579,8 +6502,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr ""
 
@@ -6701,7 +6624,7 @@ msgstr "Izteiksmes"
 msgid "External check"
 msgstr "Ārēja pārbaude"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "P"
@@ -6728,8 +6651,8 @@ msgstr ""
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6740,26 +6663,26 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6767,7 +6690,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6791,7 +6714,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Februāris"
 
@@ -6813,10 +6736,9 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6827,13 +6749,6 @@ msgstr ""
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6852,11 +6767,6 @@ msgstr ""
 msgid "Field \"%1$s\" is not string."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6871,10 +6781,6 @@ msgstr ""
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr ""
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6939,7 +6845,8 @@ msgstr "Aizpildīts reģions"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6964,7 +6871,7 @@ msgstr "Filtrs"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -7016,7 +6923,7 @@ msgstr ""
 msgid "Fixed"
 msgstr "Fiksēts"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -7067,12 +6974,12 @@ msgstr "Formula"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7085,7 +6992,7 @@ msgstr "Franču (fr_FR)"
 msgid "Fri"
 msgstr "Pie"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Piektdiena"
 
@@ -7196,7 +7103,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr ""
@@ -7210,7 +7117,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Aiziet uz"
 
@@ -7248,7 +7155,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7256,7 +7163,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7317,7 +7224,7 @@ msgstr[2] ""
 msgid "Graph deleted"
 msgstr "Grafiks izdzēsts"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7354,8 +7261,8 @@ msgstr ""
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7389,8 +7296,8 @@ msgstr "Grafika tips"
 msgid "Graph updated"
 msgstr "Grafiks atjaunots"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7421,7 +7328,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Grafiki"
 
@@ -7442,12 +7349,12 @@ msgstr "Režģis"
 msgid "Group"
 msgstr "Grupa"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr ""
@@ -7623,11 +7530,11 @@ msgstr "Palīdzība"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Slēpts"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr ""
 
@@ -7654,11 +7561,11 @@ msgstr ""
 msgid "High"
 msgstr "Augsts"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7679,7 +7586,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Vēsture"
 
@@ -7687,11 +7594,15 @@ msgstr "Vēsture"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Vēsture nodzēsta"
 
@@ -7734,7 +7645,7 @@ msgstr "Horizontāli"
 msgid "Horizontal align"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7763,7 +7674,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 #, fuzzy
 msgid "Host"
@@ -7779,7 +7690,7 @@ msgstr[2] "Iekārta"
 msgid "Host \"%1$s\" already exists."
 msgstr "Iekārta \"%1$s\" jau eksistē."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7787,7 +7698,7 @@ msgstr "Iekārta \"%1$s\" jau eksistē."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7841,7 +7752,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7855,22 +7766,22 @@ msgstr[2] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Iekārtas grupa"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Iekārtas grupa \"%1$s\" jau eksistē."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7883,10 +7794,10 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7902,8 +7813,8 @@ msgstr ""
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7977,7 +7888,7 @@ msgstr "Iekārtas vārds"
 msgid "Host networks"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -8058,7 +7969,7 @@ msgstr ""
 msgid "Host updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr ""
@@ -8078,7 +7989,7 @@ msgstr ""
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8091,7 +8002,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8139,7 +8050,7 @@ msgstr ""
 msgid "Hours"
 msgstr "Stundas"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8179,7 +8090,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IP adrese"
@@ -8204,7 +8115,7 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8261,12 +8172,12 @@ msgstr ""
 msgid "Icon map"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
@@ -8279,18 +8190,18 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
@@ -8393,23 +8304,20 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Attēls"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -8418,7 +8326,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Attēls pievienots"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Attēls izdzēsts"
 
@@ -8426,18 +8334,12 @@ msgstr "Attēls izdzēsts"
 msgid "Image label type"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Attēls atjaunots"
 
@@ -8532,7 +8434,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8543,13 +8445,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr ""
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8593,7 +8495,7 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8761,24 +8663,6 @@ msgstr ""
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8833,8 +8717,6 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Funkcijai tika padots nepareizs arguments."
 
@@ -8860,31 +8742,22 @@ msgstr ""
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8913,7 +8786,7 @@ msgstr ""
 msgid "Incorrect eventsource value."
 msgstr ""
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
@@ -8938,22 +8811,17 @@ msgstr ""
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8964,7 +8832,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
@@ -8992,8 +8860,6 @@ msgstr ""
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -9055,10 +8921,6 @@ msgstr ""
 msgid "Incorrect map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr ""
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9116,13 +8978,13 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr ""
 
@@ -9175,12 +9037,7 @@ msgstr ""
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
@@ -9226,13 +9083,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9249,60 +9106,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr ""
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr ""
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9357,14 +9184,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9474,25 +9295,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9503,7 +9306,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9549,16 +9352,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9567,7 +9371,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9655,12 +9459,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Ievietot"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr ""
 
@@ -9764,7 +9568,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9772,7 +9576,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9783,7 +9587,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Intervāls"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9806,7 +9610,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9838,7 +9642,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
@@ -9863,27 +9667,29 @@ msgstr ""
 msgid "Invalid method parameters."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9909,17 +9715,17 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9927,8 +9733,8 @@ msgstr ""
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9942,106 +9748,116 @@ msgstr ""
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -10083,43 +9899,38 @@ msgstr ""
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10140,7 +9951,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Uzskaite"
 
@@ -10181,7 +9992,7 @@ msgstr ""
 msgid "Italian (it_IT)"
 msgstr "Itāļu (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10213,7 +10024,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10227,7 +10038,7 @@ msgstr "Rādītājs pievienots"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] ""
@@ -10242,14 +10053,14 @@ msgstr "Rādītāju skaits"
 msgid "Item deleted"
 msgstr "Rādītājs izdzēsts"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -10260,7 +10071,7 @@ msgstr[2] ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr ""
 
@@ -10269,7 +10080,7 @@ msgstr ""
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10307,8 +10118,8 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10334,7 +10145,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10366,8 +10177,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10418,11 +10229,11 @@ msgstr ""
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Rādītāji"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Rādītāji izdzēsti"
 
@@ -10440,7 +10251,7 @@ msgstr "Rādītāji atjaunoti"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10465,6 +10276,10 @@ msgstr "JMX interfeisi"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10477,7 +10292,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10495,7 +10310,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Janvāris"
 
@@ -10517,7 +10332,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Jūl"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Jūlijs"
 
@@ -10525,7 +10340,7 @@ msgstr "Jūlijs"
 msgid "Jun"
 msgstr "Jūn"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Jūnijs"
 
@@ -10687,22 +10502,6 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10714,11 +10513,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Pēdējā pārbaude"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr ""
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr ""
 
@@ -10756,11 +10555,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Pēdējā vērtība"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr ""
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10769,11 +10568,11 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Jaunākā informācija"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr ""
 
@@ -10814,7 +10613,7 @@ msgstr ""
 msgid "Left trim"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -11095,7 +10894,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "P"
@@ -11117,7 +10916,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11128,12 +10927,12 @@ msgid "Macro"
 msgstr "Makro"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
@@ -11161,7 +10960,7 @@ msgstr ""
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -11169,7 +10968,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11252,7 +11051,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11274,13 +11073,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Karte"
 
@@ -11349,7 +11148,7 @@ msgstr ""
 msgid "Map update failed."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11381,7 +11180,7 @@ msgstr "Kartes"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Marts"
 
@@ -11485,7 +11284,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11500,7 +11299,7 @@ msgstr[2] ""
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Mai"
 
@@ -11515,15 +11314,12 @@ msgstr "Mai"
 msgid "Media"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr ""
@@ -11553,11 +11349,6 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr ""
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11587,7 +11378,7 @@ msgstr ""
 msgid "Media types"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11675,7 +11466,7 @@ msgstr ""
 msgid "Method not found."
 msgstr ""
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11737,7 +11528,7 @@ msgid "Minimum severity"
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11797,7 +11588,7 @@ msgstr ""
 msgid "Model"
 msgstr "Modelis"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11839,7 +11630,7 @@ msgstr[2] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11865,7 +11656,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Pir"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Pirmdiena"
 
@@ -11905,11 +11696,11 @@ msgstr "Mēnesis"
 msgid "Monthly"
 msgstr "Mēnesī"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11933,7 +11724,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11946,7 +11737,7 @@ msgstr ""
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Klusums"
 
@@ -12075,11 +11866,11 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12237,19 +12028,21 @@ msgstr "Izveidot jaunu nosacījumu"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Jauns elements"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr ""
 
@@ -12261,7 +12054,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12269,7 +12062,7 @@ msgstr ""
 msgid "New service time"
 msgstr ""
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12278,7 +12071,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12296,7 +12089,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12325,30 +12118,6 @@ msgstr ""
 msgid "No"
 msgstr "Nē"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr ""
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12364,11 +12133,6 @@ msgstr ""
 msgid "No \"%1$s\" given for map."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12376,7 +12140,7 @@ msgstr ""
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -12386,7 +12150,7 @@ msgstr ""
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -12403,11 +12167,6 @@ msgstr ""
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr ""
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12438,7 +12197,7 @@ msgstr ""
 msgid "No details"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr ""
 
@@ -12474,7 +12233,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr ""
 
@@ -12504,7 +12263,7 @@ msgstr "Nav attēla"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr ""
 
@@ -12538,7 +12297,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr ""
 
@@ -12546,17 +12305,46 @@ msgstr ""
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12564,7 +12352,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12592,19 +12380,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12619,16 +12406,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12648,12 +12441,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12674,27 +12465,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12711,14 +12504,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12727,7 +12520,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
@@ -12747,7 +12540,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr ""
 
@@ -12759,7 +12552,7 @@ msgstr ""
 msgid "No target selected"
 msgstr ""
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr ""
 
@@ -12776,7 +12569,7 @@ msgstr ""
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr ""
 
@@ -12846,15 +12639,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12886,7 +12679,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "Netiek atbalstīts"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Piezīme"
@@ -12917,7 +12710,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "Novembris"
 
@@ -13104,8 +12897,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13165,13 +12958,13 @@ msgstr "Okt"
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Oktobris"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr ""
 
@@ -13179,30 +12972,31 @@ msgstr ""
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Apstiprināt"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr ""
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr ""
 
@@ -13218,35 +13012,15 @@ msgstr "Vienreiz"
 msgid "One"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr ""
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr ""
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13296,10 +13070,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr ""
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13308,15 +13078,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr ""
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr ""
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13325,7 +13091,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13334,11 +13100,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Operācijas detaļas"
 
@@ -13360,7 +13126,7 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13369,33 +13135,33 @@ msgstr ""
 msgid "Operations"
 msgstr "Operācija"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operators"
 
@@ -13504,7 +13270,7 @@ msgstr ""
 msgid "Other parameters"
 msgstr "Citi parametri"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Citi"
@@ -13518,7 +13284,7 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13547,7 +13313,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13736,7 +13502,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13781,7 +13547,7 @@ msgstr ""
 msgid "PSK identity"
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13804,16 +13570,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parametrs"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr ""
@@ -13843,7 +13609,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13860,7 +13626,7 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13872,11 +13638,6 @@ msgstr ""
 msgid "Parse"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr ""
@@ -13937,7 +13698,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr ""
 
@@ -13947,15 +13708,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -14001,12 +13762,11 @@ msgstr ""
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Periods"
 
@@ -14095,7 +13855,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr ""
 
@@ -14135,7 +13895,7 @@ msgstr ""
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14224,7 +13984,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14355,7 +14115,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr ""
 
@@ -14368,21 +14128,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14396,9 +14152,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Problēmas"
 
@@ -14432,7 +14188,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr ""
 
@@ -14453,13 +14209,13 @@ msgstr ""
 msgid "Proxies"
 msgstr "Starpniekserveri"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14467,7 +14223,7 @@ msgstr "Starpniekserveri"
 msgid "Proxy"
 msgstr "Starpniekserveris"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14477,12 +14233,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
@@ -14576,7 +14332,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14653,10 +14409,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Saņemtā vērtība"
@@ -14738,7 +14490,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14756,13 +14508,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Regulārā izteiksme"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14796,7 +14548,7 @@ msgstr "Regulārās izteiksmes"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14828,8 +14580,6 @@ msgstr "Attālināta komanda"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14850,7 +14600,9 @@ msgstr "Attālināta komanda"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14863,7 +14615,7 @@ msgstr "Attālināta komanda"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14940,8 +14692,8 @@ msgstr "Attālināta komanda"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Dzēst"
 
@@ -14981,7 +14733,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -15023,7 +14775,7 @@ msgid "Replace dependencies"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -15078,7 +14830,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -15120,8 +14872,8 @@ msgstr ""
 msgid "Required string"
 msgstr ""
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Atiestatīt"
 
@@ -15154,7 +14906,7 @@ msgstr ""
 msgid "Reset defaults"
 msgstr ""
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Atrisināts"
 
@@ -15220,7 +14972,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Rezultāts"
@@ -15407,12 +15159,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Krievu (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15423,8 +15175,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr ""
 
@@ -15461,7 +15213,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15557,12 +15309,12 @@ msgstr ""
 msgid "SQL query"
 msgstr "SQL pieprasījums"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr ""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
@@ -15625,7 +15377,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15637,7 +15389,7 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Sestdiena"
 
@@ -15679,7 +15431,7 @@ msgstr ""
 msgid "Scheduled check"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15749,7 +15501,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15762,8 +15514,7 @@ msgstr ""
 msgid "Script"
 msgstr "Skripts"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Skripts \"%1$s\" jau eksistē."
@@ -15796,12 +15547,6 @@ msgstr "Skripta nosaukums"
 msgid "Script parameters"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr ""
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr ""
@@ -15814,7 +15559,7 @@ msgstr "Skripts modificēts"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Skripts"
 
@@ -15884,8 +15629,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15893,7 +15638,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Atlasīt"
 
@@ -15929,19 +15674,19 @@ msgstr "Atlasītie elementi"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr ""
 
@@ -15966,7 +15711,7 @@ msgstr "Sūtīt tikai"
 msgid "Send to"
 msgstr ""
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr ""
 
@@ -15999,7 +15744,7 @@ msgstr ""
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "Septembris"
 
@@ -16030,28 +15775,28 @@ msgstr ""
 msgid "Server time"
 msgstr "Servera laiks"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Serviss"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -16061,7 +15806,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr ""
 
@@ -16094,16 +15839,16 @@ msgstr "Servisa ports"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -16111,11 +15856,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr ""
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Servisa tips"
 
@@ -16124,30 +15869,29 @@ msgstr "Servisa tips"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Servisi"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -16155,7 +15899,7 @@ msgstr ""
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16185,7 +15929,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16214,7 +15958,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16223,7 +15967,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16279,7 +16023,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr ""
 
@@ -16421,7 +16165,7 @@ msgstr ""
 msgid "Show working time"
 msgstr "Parādīt darba laiku"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Parādīts"
 
@@ -16530,7 +16274,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr "Slovāku (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr ""
 
@@ -16576,7 +16320,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr ""
 
@@ -16650,7 +16394,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16753,15 +16497,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Stāvoklis"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Statusa kodi"
@@ -16791,7 +16539,7 @@ msgstr ""
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16839,7 +16587,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16904,7 +16652,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr ""
 
@@ -16920,7 +16668,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr ""
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16933,7 +16681,7 @@ msgstr ""
 msgid "Sun"
 msgstr "Saule"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Svētdiena"
 
@@ -17025,12 +16773,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "C"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "O"
@@ -17057,17 +16805,17 @@ msgstr "PATIESS"
 msgid "Table \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr ""
@@ -17123,7 +16871,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17183,7 +16931,7 @@ msgstr ""
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17204,7 +16952,7 @@ msgstr "Šablons"
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17228,7 +16976,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17288,7 +17036,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17460,7 +17208,7 @@ msgstr ""
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
@@ -17468,7 +17216,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17534,7 +17282,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Šis mēnesis"
 
@@ -17542,7 +17290,7 @@ msgstr "Šis mēnesis"
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Šī nedēļa"
 
@@ -17550,7 +17298,7 @@ msgstr "Šī nedēļa"
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Šis gads"
 
@@ -17570,7 +17318,7 @@ msgstr ""
 msgid "Thu"
 msgstr "Cet"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Ceturtdiena"
 
@@ -17587,7 +17335,7 @@ msgstr "Līdz"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17620,7 +17368,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Laika periods"
 
@@ -17672,12 +17420,11 @@ msgstr ""
 msgid "To"
 msgstr "Līdz"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Šodiena"
 
@@ -17792,7 +17539,7 @@ msgstr ""
 msgid "Trends"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17800,7 +17547,7 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Trigeris"
 
@@ -17904,7 +17651,7 @@ msgstr "Trigera nosaukums"
 msgid "Trigger overview"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17978,11 +17725,11 @@ msgstr ""
 msgid "Trigger severity"
 msgstr ""
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17999,7 +17746,7 @@ msgstr "Trigeris atjaunots"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -18034,7 +17781,7 @@ msgstr ""
 msgid "Tue"
 msgstr "Otr"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Otrdiena"
 
@@ -18047,7 +17794,7 @@ msgstr "Turku (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -18063,19 +17810,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18127,7 +17874,7 @@ msgstr "Informācijas tips"
 msgid "Types"
 msgstr "Tipi"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18148,7 +17895,7 @@ msgstr "NEZINĀMS"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "Saite"
 
@@ -18194,12 +17941,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18284,12 +18031,12 @@ msgstr ""
 msgid "Unblock selected users?"
 msgstr "Vai atbloķēt iezīmētos lietotājus?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18309,21 +18056,23 @@ msgstr "Vienības"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Nav zināms"
@@ -18341,7 +18090,7 @@ msgid "Unknown error"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
@@ -18394,7 +18143,7 @@ msgstr "Atvienot no šablona"
 msgid "Unlink from templates"
 msgstr "Atvienot no šabloniem"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr ""
 
@@ -18426,7 +18175,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -18436,7 +18185,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -18481,7 +18230,7 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18494,7 +18243,7 @@ msgstr ""
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18547,7 +18296,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18565,7 +18314,7 @@ msgstr "Augšupielādēt"
 msgid "Upper level maps"
 msgstr ""
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18600,7 +18349,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18615,7 +18364,7 @@ msgstr ""
 msgid "User"
 msgstr "Lietotājs"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
@@ -18667,7 +18416,7 @@ msgstr "Lietotājs pievienots"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
@@ -18688,7 +18437,7 @@ msgstr[0] "Lietotājs izdzēsts"
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18698,27 +18447,27 @@ msgstr[2] ""
 msgid "User group"
 msgstr "Lietotāju grupa"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
@@ -18754,8 +18503,8 @@ msgstr[2] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18799,14 +18548,14 @@ msgstr "Lietotāja parole"
 msgid "User profile"
 msgstr "Lietotāja profils"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18877,7 +18626,7 @@ msgstr "Lietotāja dati atjaunoti"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -19193,14 +18942,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19210,7 +18959,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19252,7 +19001,7 @@ msgstr ""
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr ""
@@ -19269,7 +19018,7 @@ msgstr ""
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Vērtību karte"
 
@@ -19312,11 +19061,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr ""
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19363,7 +19113,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19450,7 +19200,7 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "T"
@@ -19467,7 +19217,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19476,7 +19226,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19492,7 +19242,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Tīmeklis"
 
@@ -19504,7 +19254,7 @@ msgstr "Tīmeklis"
 msgid "Web monitoring"
 msgstr "Tīmekļa uzraudzība"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr ""
 
@@ -19519,29 +19269,29 @@ msgstr ""
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Tīmekļa scenārijs \"%1$s\" jau eksistē."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Tīmekļa scenārijs izdzēsts"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr ""
 
@@ -19563,7 +19313,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Tre"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Trešdiena"
 
@@ -19574,7 +19324,7 @@ msgstr "Trešdiena"
 msgid "Weekly"
 msgstr "Nedēļas"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19590,12 +19340,12 @@ msgstr ""
 msgid "When active"
 msgstr "Kad aktīvs"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19790,6 +19540,10 @@ msgstr ""
 msgid "Y-m-d H:i:s"
 msgstr ""
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr ""
@@ -19851,7 +19605,7 @@ msgstr "Ik gadu"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19908,18 +19662,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19931,9 +19679,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
@@ -20049,24 +19794,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr ""
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -20075,37 +19824,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr ""
@@ -20126,28 +19875,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr ""
@@ -20195,7 +19945,7 @@ msgstr "visi"
 msgid "all media"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20203,42 +19953,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20248,7 +19993,7 @@ msgid "an empty string is expected"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr ""
 
@@ -20256,11 +20001,15 @@ msgstr ""
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20421,14 +20170,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20458,19 +20201,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20490,14 +20225,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20505,7 +20240,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr ""
@@ -20518,7 +20253,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20552,7 +20287,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20570,7 +20305,8 @@ msgid "configure"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20599,7 +20335,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20661,7 +20397,7 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20683,13 +20419,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20715,7 +20451,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20752,6 +20489,10 @@ msgstr ""
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20798,7 +20539,7 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "s"
@@ -20839,6 +20580,11 @@ msgstr "ikona"
 msgid "image"
 msgstr "attēls"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "iekšā"
@@ -20879,15 +20625,19 @@ msgstr ""
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20915,7 +20665,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr ""
 
@@ -20944,27 +20694,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr ""
 
@@ -20992,7 +20742,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr ""
 
@@ -21078,12 +20828,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -21142,7 +20892,7 @@ msgstr ""
 msgid "max"
 msgstr "max"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21182,7 +20932,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr ""
@@ -21209,8 +20959,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21225,27 +20975,14 @@ msgstr "nepieciešams derīgs LDAP lietotājs"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr ""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21273,6 +21010,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21283,7 +21028,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "jauns"
 
@@ -21418,7 +21163,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21453,24 +21198,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21498,11 +21247,11 @@ msgstr ""
 msgid "regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21514,15 +21263,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21570,7 +21319,7 @@ msgstr ""
 msgid "short description"
 msgstr "īss apraksts"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21589,15 +21338,15 @@ msgstr "īss apraksts"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr ""
 
@@ -21613,31 +21362,31 @@ msgstr "parādīt ikonu plānojumu"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21645,11 +21394,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21665,8 +21414,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21677,7 +21426,7 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21686,13 +21435,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "veidne ID \"%1$s\" ir nodota %2$s reizes"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21701,20 +21454,20 @@ msgstr "veidne ID \"%1$s\" ir nodota %2$s reizes"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr ""
@@ -21746,39 +21499,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21792,7 +21545,7 @@ msgstr "trigeris"
 msgid "trigger does not allow manual closing"
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21804,26 +21557,26 @@ msgstr ""
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "ieraksti ko meklēt"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21831,11 +21584,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21852,10 +21605,10 @@ msgstr ""
 msgid "unexpected end of macro"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21865,11 +21618,12 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr ""
@@ -21895,8 +21649,8 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21921,6 +21675,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21936,7 +21694,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21956,11 +21714,11 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "vērtība"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21978,76 +21736,87 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr ""
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr ""
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -22059,18 +21828,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -22079,7 +21846,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -22092,11 +21859,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -22113,7 +21880,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "g"
diff --git a/ui/locale/nb/LC_MESSAGES/frontend.po b/ui/locale/nb/LC_MESSAGES/frontend.po
index 8752a5c635c..7f918fc9d33 100644
--- a/ui/locale/nb/LC_MESSAGES/frontend.po
+++ b/ui/locale/nb/LC_MESSAGES/frontend.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2021-03-19 18:13+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: none\n"
@@ -98,7 +98,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d dag"
 msgstr[1] "%1$d dager"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -183,7 +183,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -197,7 +197,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -230,14 +230,14 @@ msgstr[1] "%1$s forsøk gjenstår"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s sekund"
 msgstr[1] "%1$s sekunder"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -257,13 +257,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -393,7 +393,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -454,10 +454,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "Tilgang nektet"
@@ -500,7 +496,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Ack"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Bekrefte"
 
@@ -508,7 +504,7 @@ msgstr "Bekrefte"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Bekreftet"
@@ -521,7 +517,7 @@ msgstr "Bekreftede PROBLEM hendelser"
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -548,9 +544,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -607,7 +603,7 @@ msgstr "Handling \"%1$s\" eksisterer allerede."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Handling \"%1$s\" ingen operasjoner definert."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -616,7 +612,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Handling lagt til"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -665,8 +661,8 @@ msgstr "Handling oppdatert"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Handlinger"
@@ -733,7 +729,7 @@ msgstr "Aktiv til"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -744,7 +740,7 @@ msgstr "Aktiv til"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -767,9 +763,9 @@ msgstr "Aktiv til"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -839,7 +835,7 @@ msgstr "Aktiv til"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Legg til"
 
@@ -847,11 +843,11 @@ msgstr "Legg til"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "Legg til ny widget"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "Legg til barnelement"
 
@@ -859,7 +855,7 @@ msgstr "Legg til barnelement"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -876,7 +872,7 @@ msgstr "Legg til vert"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "Legg til flere kart"
 
@@ -898,7 +894,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -950,12 +946,12 @@ msgstr ""
 msgid "Add widget"
 msgstr "Legg til widget"
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -965,7 +961,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -978,7 +974,7 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administrasjon"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -1000,7 +996,7 @@ msgstr "Alder mindre enn"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1072,7 +1068,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Alle"
 
@@ -1090,7 +1086,7 @@ msgstr "Alle grupper"
 msgid "All hosts"
 msgstr "Alle verter"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Alle koblinger skal ha \"Name\" og \"URL\" angitt"
 
@@ -1108,7 +1104,7 @@ msgstr "Alle problemer"
 msgid "All problems if tag values match"
 msgstr "Alle problemer hvis tagverdier samsvarer"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1221,15 +1217,15 @@ msgstr "Programfeil."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Bruk"
 
@@ -1247,7 +1243,7 @@ msgstr "nærmer"
 msgid "Apr"
 msgstr "Apr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "April"
 
@@ -1275,7 +1271,7 @@ msgstr "Arealtype"
 msgid "Arithmetic"
 msgstr "Aritmetikk"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1322,7 +1318,7 @@ msgstr "På (time: minutt)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1331,7 +1327,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1343,6 +1339,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1354,7 +1355,7 @@ msgstr "Minst en vedlikeholdsperiode må opprettes."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1410,7 +1411,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Aug"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "August"
 
@@ -1423,7 +1424,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1500,7 +1501,7 @@ msgstr "Auto-avlogging"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1515,7 +1516,7 @@ msgstr "Automatisk ikon kartlegging"
 msgid "Automatic icon selection"
 msgstr "Automatisk ikonvalg"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1567,7 +1568,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1630,7 +1631,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Blokkert"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "Blå"
 
@@ -1684,11 +1685,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Bunn"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "Ta med deg fremover"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "Ta med til fronten"
 
@@ -1714,7 +1715,7 @@ msgstr "CERT"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1759,8 +1760,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1769,7 +1770,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Kalkulert"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1794,7 +1795,7 @@ msgstr "Ring tilbake"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1807,8 +1808,8 @@ msgstr "Ring tilbake"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1838,7 +1839,7 @@ msgstr "Kan ikke legge til handling"
 msgid "Cannot add correlation"
 msgstr "Kan ikke legge til korrelasjon"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1848,7 +1849,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Kan ikke legge til avhengighet fra en vert til en mal."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1879,8 +1880,8 @@ msgid "Cannot add host prototype"
 msgstr "Kan ikke legge til vertsprototype"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Kan ikke legge til bilde"
 
@@ -1972,15 +1973,15 @@ msgstr "Kan ikke legge til bruker"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Kan ikke legge til webscenario"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2000,33 +2001,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Kan ikke fjerne historie"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Kan ikke klone grafprototyper."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "Kan ikke klone vertsprototyper."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Kan ikke klone vare prototyper."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Kan ikke klone utløserprototyper."
 
@@ -2053,7 +2050,7 @@ msgid_plural "Cannot copy graphs"
 msgstr[0] "Kan ikke kopiere graf"
 msgstr[1] "Kan ikke kopiere grafer"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "Kan ikke kopiere element"
@@ -2105,8 +2102,8 @@ msgstr "Kan ikke opprette ikonskart"
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2135,7 +2132,7 @@ msgstr "Kan ikke slette Zabbix intern bruker \"%1$s\", prøv å deaktivere bruke
 msgid "Cannot delete action"
 msgstr "Kan ikke slette handling"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2203,7 +2200,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2214,11 +2211,11 @@ msgstr[1] ""
 msgid "Cannot delete host prototypes"
 msgstr "Kan ikke slette vertsprototyper"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Kan ikke slette ikonet kart"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Kan ikke slette bilde"
 
@@ -2243,7 +2240,7 @@ msgstr "Kan ikke slette vareprototype"
 msgid "Cannot delete item prototypes"
 msgstr "Kan ikke slette vareprototyper"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Kan ikke slette elementer"
 
@@ -2274,7 +2271,7 @@ msgid_plural "Cannot delete proxies"
 msgstr[0] "Kan ikke slette proxy"
 msgstr[1] "Kan ikke slette proxyer"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2297,7 +2294,7 @@ msgid_plural "Cannot delete scripts"
 msgstr[0] "Kan ikke slette skript"
 msgstr[1] "Kan ikke slette skriptene"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Kan ikke slette skript. Skriptet \"%1$s\" brukes i handlingsoperasjon \"%2$s\"."
@@ -2313,8 +2310,8 @@ msgid_plural "Cannot delete services"
 msgstr[0] "Kan ikke slette tjenesten"
 msgstr[1] "Kan ikke slette tjenesten"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2343,7 +2340,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr "Kan ikke slette templert element."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Kan ikke slette templerte elementer."
 
@@ -2396,7 +2393,7 @@ msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Kan ikke slette webscenario"
 
@@ -2431,7 +2428,7 @@ msgid_plural "Cannot disable hosts"
 msgstr[0] "Kan ikke deaktivere verten"
 msgstr[1] "Kan ikke deaktivere verter"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Kan ikke deaktivere elementet"
@@ -2462,7 +2459,7 @@ msgid_plural "Cannot disable triggers"
 msgstr[0] "Kan ikke deaktivere utløseren"
 msgstr[1] "Kan ikke deaktivere utløsere"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Kan ikke deaktivere webscenario"
@@ -2509,7 +2506,7 @@ msgid_plural "Cannot enable hosts"
 msgstr[0] "Kan ikke aktivere vert"
 msgstr[1] "Kan ikke aktivere verter"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Kan ikke aktivere elementet"
@@ -2540,7 +2537,7 @@ msgid_plural "Cannot enable triggers"
 msgstr[0] "Kan ikke aktivere utløseren"
 msgstr[1] "Kan ikke aktivere utløsere"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Kan ikke aktivere webscenario"
@@ -2554,7 +2551,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr "Kan ikke utvide makroer."
 
@@ -2588,8 +2585,8 @@ msgstr "Kan ikke finne verten \"%1$s\" brukt i kart \"%2$s\"."
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Kan ikke finne vertsgruppe \"%1$s\" for vertsprototype \"%2$s\" av oppdagelsesregelen \"%3$s\" på \"%4$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2687,24 +2684,20 @@ msgstr "Kan ikke finne verdikart \"%1$s\" brukt for elementet \"%2$s\" på \"%3$
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Kan ikke finne verdikart \"%1$s\" brukt til elementprototype \"%2$s\" av oppdagelsesregelen \"%3$s\" på \"%4$s\"."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "Kan ikke ha tomt synlig malnavn."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2717,7 +2710,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
 msgstr[0] "Kan ikke importere mal \"%1$s\", koblet mal \"%2$s\" eksisterer ikke."
 msgstr[1] "Kan ikke importere mal \"%1$s\", koblete maler \"%2$s\" eksisterer ikke."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "Kan ikke sette inn trigger-uttrykk"
 
@@ -2731,7 +2724,7 @@ msgid "Cannot link template."
 msgstr "Kan ikke koble til mal."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2763,17 +2756,17 @@ msgstr "Kan ikke masse oppdatere synlig malnavn."
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Kan ikke utføre slett setning på tabell \"%1$s\" uten hvor tilstand."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Kan ikke utføre oppdateringsoppsett på tabell \"%1$s\" uten verdier."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Kan ikke utføre oppdateringsoppgave på tabell \"%1$s\" uten hvor tilstand."
@@ -2800,7 +2793,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Kan ikke lese svaret, sjekk forbindelsen med Zabbix-serveren \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Kan ikke gi nytt navn til gjestebruker."
 
@@ -2819,7 +2812,7 @@ msgstr "Kan ikke lagre widget \"%1$s\"."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Kan ikke sende kommando, sjekk tilkobling med Zabbix server \"%1$s\"."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2859,12 +2852,12 @@ msgstr "Kan ikke angi lagerfelt for funksjonshemmede inventar."
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2883,7 +2876,7 @@ msgid_plural "Cannot unblock users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Kan ikke oppheve og slette webscenarier."
 
@@ -2896,7 +2889,7 @@ msgstr "Kan ikke koble fra mal"
 msgid "Cannot unlink template."
 msgstr "Kan ikke koble fra mal."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2949,11 +2942,6 @@ msgstr "Kan ikke oppdatere \"%2$s\" for et oppdaget element \"%1$s\"."
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "Kan ikke oppdatere \"%2$s\" for en oppdaget utløser \"%1$s\"."
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "Kan ikke oppdatere \"imagetype\" for bilde \"%1$s\"."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2963,9 +2951,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "Kan ikke oppdatere en oppdaget graf."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "Kan ikke oppdatere en oppdaget vertsgruppe."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3024,9 +3013,7 @@ msgstr "Kan ikke oppdatere graf prototype"
 msgid "Cannot update group"
 msgstr "Kan ikke oppdatere gruppe"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Kan ikke oppdatere grupper for oppdaget vert \"%1$s\"."
@@ -3049,13 +3036,13 @@ msgstr[1] "Kan ikke oppdatere vertsprototyper"
 msgid "Cannot update hosts"
 msgstr "Kan ikke oppdatere verter"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "Kan ikke oppdatere ikonkart"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Kan ikke oppdatere bildet"
 
@@ -3109,12 +3096,12 @@ msgstr "Kan ikke oppdatere nettverkskart"
 msgid "Cannot update proxy"
 msgstr "Kan ikke oppdatere proxy"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Kan ikke oppdatere proxy for oppdaget vert \"%1$s\"."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3134,17 +3121,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Kan ikke oppdatere skript"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3219,7 +3206,7 @@ msgstr[1] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Kan ikke oppdatere webscenario"
 
@@ -3319,8 +3306,8 @@ msgid "Character string not included"
 msgstr "Tegnstreng er ikke inkludert"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3435,7 +3422,7 @@ msgstr "Kontrollerer ytelsen til UDP-tjenesten. Returnerer 0 - tjenesten er nede
 msgid "Checks should be unique."
 msgstr "Sjekker skal være unike."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3456,7 +3443,7 @@ msgstr "Sirkulær referanse i maler: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "Sirkulær malkobling er ikke tillatt."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3477,11 +3464,11 @@ msgstr "Ryd historie og trender"
 msgid "Clear when unlinking"
 msgstr "Fjern når du kobler fra"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3496,7 +3483,7 @@ msgstr "Klokke"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3511,7 +3498,7 @@ msgstr "Klokke"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Klon"
 
@@ -3522,8 +3509,8 @@ msgstr "Klon"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Lukk"
 
@@ -3534,13 +3521,13 @@ msgstr "Lukk"
 msgid "Close expression constructor"
 msgstr "Lukk uttrykkskonstruksjon"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Lukk ny hendelse"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Lukk gamle arrangementer"
 
@@ -3553,8 +3540,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "Kollaps"
 
@@ -3571,7 +3558,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3637,7 +3624,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr "Samtidige økter"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3648,17 +3635,12 @@ msgstr "Tilstand"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "Tilstand \"%2$s\" brukes ikke i formelen \"%3$s\" for handling \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "Tilstand \"%2$s\" brukes ikke i formelen \"%3$s\" for korrelasjon \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "Tilstand \"%2$s\" brukes ikke i formelen \"%3$s\" for oppdagelsesregel \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3668,17 +3650,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "Tilstand \"%2$s\" brukt i formelen \"%3$s\" for handling \"%1$s\" er ikke definert."
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "Tilstand \"%2$s\" brukt i formelen \"%3$s\" for korrelasjon \"%1$s\" er ikke definert."
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "Tilstand \"%2$s\" brukt i formelen \"%3$s\" for oppdagelsesregel \"%1$s\" er ikke definert."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3694,7 +3671,7 @@ msgstr "Tilstander"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
@@ -3757,7 +3734,7 @@ msgstr "Konfigurasjon av verter"
 msgid "Configuration of housekeeping"
 msgstr "Konfigurasjon av husholdning"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Konfigurering av ikon kartlegging"
@@ -3864,7 +3841,7 @@ msgstr "Bekreftelsestekst"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "Gratulerer! Du har installert Zabbix frontend."
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3957,7 +3934,7 @@ msgstr "Kontakt"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4017,7 +3994,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -4056,8 +4033,8 @@ msgstr "Koordinater"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Kopier"
 
@@ -4066,12 +4043,11 @@ msgstr "Kopier"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "Korrelasjon"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "Korrelasjon \"%1$s\" eksisterer allerede."
@@ -4099,16 +4075,6 @@ msgid_plural "Correlations enabled"
 msgstr[0] "Korrelasjon aktivert"
 msgstr[1] "Korrelasjoner aktivert"
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "Korrelasjon mangler parametere: %1$s"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "Korrelasjonsnavnet kan ikke være tomt."
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr "Korrelasjonsregel"
@@ -4117,14 +4083,10 @@ msgstr "Korrelasjonsregel"
 msgid "Correlation updated"
 msgstr "Korrelasjon oppdatert"
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Kunne ikke lagre bildet!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Teller"
 
@@ -4188,11 +4150,11 @@ msgstr "Lag korrelasjon"
 msgid "Create dashboard"
 msgstr "Opprett dashbord"
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr "Opprett avhengig element"
 
@@ -4309,7 +4271,7 @@ msgstr "Opprett kart"
 msgid "Create media type"
 msgstr "Opprett medietype"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "Lag ny"
 
@@ -4333,7 +4295,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Opprett mal"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Lag utløseren"
 
@@ -4496,7 +4458,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "DNS-navn"
@@ -4508,11 +4470,11 @@ msgstr "DNS-navn"
 msgid "Daily"
 msgstr "Daglig"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "Mørk"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4533,8 +4495,8 @@ msgstr "Dashboard \"%1$s\" eksisterer allerede."
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr "Dashboard opprettet"
 
@@ -4557,9 +4519,9 @@ msgstr "Dashboard egenskaper"
 msgid "Dashboard sharing"
 msgstr "Dashboard deling"
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr "Dashboard oppdatert"
 
@@ -4583,7 +4545,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr "oversikter"
 
@@ -4611,7 +4573,7 @@ msgstr "Dataoversikt"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4753,7 +4715,7 @@ msgstr "Ukedag"
 msgid "Days"
 msgstr "Dager"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Debug"
 
@@ -4767,26 +4729,26 @@ msgstr "Debug modus"
 msgid "Dec"
 msgstr "Des"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Desember"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Forvalg"
 
@@ -4879,7 +4841,7 @@ msgstr "Forsinket av"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4903,8 +4865,8 @@ msgstr "Forsinket av"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Slett"
 
@@ -4929,11 +4891,11 @@ msgstr "Slett og fjern mal? (Advarsel: alle tilknyttede verter blir ryddet!)"
 msgid "Delete current action?"
 msgstr "Slett nåværende handling?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "Slett nåværende korrelasjon?"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr "Slett dashbord?"
 
@@ -4977,7 +4939,7 @@ msgstr "Slett element prototype?"
 msgid "Delete item?"
 msgstr "Slett element?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Slett koblinger mellom utvalgte elementer?"
 
@@ -5033,7 +4995,7 @@ msgstr "Slett valgte dashboards?"
 msgid "Delete selected discovery rules?"
 msgstr "Slett valgte registreringsregler?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Slett valgte elementer?"
 
@@ -5138,7 +5100,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "Slett valgte former?"
 
@@ -5182,7 +5144,7 @@ msgstr "Slett utløseren?"
 msgid "Delete web scenario?"
 msgstr "Slett webscenario?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5227,7 +5189,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "avhengig"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Avhengig"
 
@@ -5235,7 +5197,7 @@ msgstr "Avhengig"
 msgid "Dependent item"
 msgstr "Avhengige gjenstand"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5245,7 +5207,7 @@ msgstr "Kommer an på"
 msgid "Deployment status"
 msgstr "Distribusjonsstatus"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5278,7 +5240,7 @@ msgid "Description"
 msgstr "Beskrivelse"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5444,10 +5406,10 @@ msgstr "Deaktiver valgte webscenarier?"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5530,7 +5492,7 @@ msgid "Discovery by proxy"
 msgstr "Oppdagelse ved fullmakt"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Discovery sjekk"
 
@@ -5542,7 +5504,7 @@ msgstr "Discovery sjekker"
 msgid "Discovery list"
 msgstr "Oppdagelsesliste"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Discovery-objekt"
 
@@ -5574,7 +5536,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5582,12 +5544,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Discovery regel"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Discovery rule \"%1$s\" eksisterer allerede på \"%2$s\", arvet fra en annen mal."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "Oppdagelsesregel \"%1$s\" eksisterer allerede på \"%2$s\"."
@@ -5600,7 +5562,7 @@ msgstr "Oppdagelsesregel \"%1$s\" eksisterer allerede på \"%2$s\"."
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "Discoveryregel \"%1$s\" eksisterer allerede."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5642,7 +5604,7 @@ msgstr "Oppdagelsesregel oppdatert"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5653,7 +5615,7 @@ msgstr "Discovery regler"
 msgid "Discovery rules deleted"
 msgstr "Discovery regler slettet"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Discovery status"
@@ -5690,10 +5652,11 @@ msgid "Display stacked graph"
 msgstr "Vis stablet graf"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Viser %1$s av %2$s funnet"
@@ -5703,7 +5666,7 @@ msgstr "Viser %1$s av %2$s funnet"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "Viser %1$s til %2$s av %3$s funnet"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5725,7 +5688,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Ønsker du å erstatte det betingede uttrykket?"
 
@@ -5781,7 +5744,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Ned"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5789,7 +5752,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr "Last ned konfigurasjonsfilen"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5808,18 +5771,6 @@ msgstr ""
 msgid "Draw style"
 msgstr "Tegn stil"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "Dupliser \"%1$s\" verdi \"%2$s\" for korrelasjon \"%3$s\"."
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr "Dupliser \"%1$s\" verdi \"%2$s\" for korrelasjon."
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5832,11 +5783,6 @@ msgstr "Dupliser \"navn\" verdi \"%1$s\" for kart."
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5888,7 +5834,7 @@ msgstr "Dynamisk element"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Hver nettadresse skal ha et unikt navn. Vennligst kontroller at det bare er en nettadresse som heter"
 
@@ -5897,11 +5843,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5915,8 +5861,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Redigerer"
 
@@ -5932,11 +5878,11 @@ msgstr "Rediger kart"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr "Rediger treelement"
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Rediger utløseren"
 
@@ -5996,21 +5942,17 @@ msgstr "Tøm SSL-nøkkelfil for webscenario \"%1$s\"."
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "Tom korrelasjons-ID."
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "Tøm filterbetingelsesformel ID for handling \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Tøm filterbetingelsesformel ID for oppdagelsesregel \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "Tom makro for filtertilstand for oppdagelsesregel \"%1$s\"."
@@ -6026,25 +5968,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6054,14 +5990,6 @@ msgstr "Tom inngangsparameter."
 msgid "Empty map ID."
 msgstr "Tom kart ID."
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "Tom medietypenavn."
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Tomme parametere"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6227,7 +6155,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6238,7 +6166,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6281,7 +6209,7 @@ msgid "English (en_US)"
 msgstr "Engelsk (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6297,7 +6225,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6316,12 +6244,12 @@ msgstr ""
 msgid "Error"
 msgstr "Feil"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Feil i søkeforespørsel for tabell \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6349,7 +6277,7 @@ msgstr "Hendelses-ID"
 msgid "Event acknowledged"
 msgstr "Hendelse bekreftet"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6357,7 +6285,7 @@ msgid "Event correlation"
 msgstr "Hendelse korrelasjon"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "Hendelse korrelasjonsregler"
@@ -6392,11 +6320,11 @@ msgstr "Hendelsesloggovervåking. Returnerer logg"
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "Event tag par"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Hendelses type"
 
@@ -6441,15 +6369,10 @@ msgstr "Eksluder"
 msgid "Exclude host groups"
 msgstr "Ekskluder vertsgrupper"
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Kj"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "Utfør SQL-feil [%1$s] i [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6487,7 +6410,7 @@ msgstr "utført"
 msgid "Executed script"
 msgstr "Utført script"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Utførelsesbekreftelse"
 
@@ -6503,8 +6426,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "Utvide"
 
@@ -6625,7 +6548,7 @@ msgstr "Uttrykkene"
 msgid "External check"
 msgstr "Ekstern sjekk"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6652,8 +6575,8 @@ msgstr "mislyktes"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6664,26 +6587,26 @@ msgstr "Kunne ikke opprette dashbordet"
 msgid "Failed to parse URL."
 msgstr "Kunne ikke analysere nettadressen."
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr "Kunne ikke oppdatere oversikten"
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6691,7 +6614,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Kunne ikke oppdatere mal."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6715,7 +6638,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Februar"
 
@@ -6737,10 +6660,9 @@ msgstr "Feltet \"%1$s\" kan ikke settes til NULL."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6751,13 +6673,6 @@ msgstr "Felt \"%1$s\" er obligatorisk."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "Felt \"%1$s\" mangler en verdi for kart \"%2$s\"."
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "Felt \"%1$s\" mangler en verdi for medietype \"%2$s\"."
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6776,11 +6691,6 @@ msgstr "Felt \"%1$s\" er ikke heltall."
 msgid "Field \"%1$s\" is not string."
 msgstr "Felt \"%1$s\" er ikke streng."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "Felt \"%1$s\" kreves for medietype \"%2$s\"."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6795,10 +6705,6 @@ msgstr "Felt \"vert\" er obligatorisk."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Filformat støttes ikke."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6863,7 +6769,8 @@ msgstr "Fylt område"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6888,7 +6795,7 @@ msgstr "Filtrer"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6940,7 +6847,7 @@ msgstr "Tilpass til kart"
 msgid "Fixed"
 msgstr "Fikset"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6991,12 +6898,12 @@ msgstr "Formel"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7009,7 +6916,7 @@ msgstr "Fransk (fr_FR)"
 msgid "Fri"
 msgstr "Fre"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Fredag"
 
@@ -7120,7 +7027,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "Gitt uttrykk er ikke en makro"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr "Globalt vanlig uttrykk \"%1$s\" eksisterer ikke."
@@ -7134,7 +7041,7 @@ msgstr "Global verdi"
 msgid "Go back to %1$s"
 msgstr "Gå tilbake til %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Gå til"
 
@@ -7172,7 +7079,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7180,7 +7087,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Gradient linje"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7240,7 +7147,7 @@ msgstr[1] "Grafer kopiert"
 msgid "Graph deleted"
 msgstr "Graf slettet"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7277,8 +7184,8 @@ msgstr "Graf prototype slettet"
 msgid "Graph prototype updated"
 msgstr "Graf prototype oppdatert"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr "Graf prototype med ID \"%1$s\" er ikke tilgjengelig."
@@ -7312,8 +7219,8 @@ msgstr "Graftype"
 msgid "Graph updated"
 msgstr "Graf oppdatert"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr "Graf med ID \"%1$s\" er ikke tilgjengelig."
@@ -7344,7 +7251,7 @@ msgstr "Graf med navn \"%1$s\" finnes allerede i diagrammer eller grafprototyper
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Grafer"
 
@@ -7365,12 +7272,12 @@ msgstr "Rutenett"
 msgid "Group"
 msgstr "Gruppe"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Gruppe \"%1$s\" kan ikke slettes fordi den brukes av en vert prototype."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr "Gruppe \"%1$s\" kan ikke slettes fordi den brukes i en korrelasjonsbetingelse."
@@ -7544,11 +7451,11 @@ msgstr "Hjelp"
 msgid "Hexadecimal to decimal"
 msgstr "Hexadecimal til desimal"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Skjult"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "Skjul feilsøking"
 
@@ -7575,11 +7482,11 @@ msgstr ""
 msgid "High"
 msgstr "Høy"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7600,7 +7507,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Historikk"
 
@@ -7608,11 +7515,15 @@ msgstr "Historikk"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Historikk ryddet"
 
@@ -7655,7 +7566,7 @@ msgstr "Horisontal"
 msgid "Horizontal align"
 msgstr "Horisontal justering"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7684,7 +7595,7 @@ msgstr "Horisontal justering"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7698,7 +7609,7 @@ msgstr[1] "Verter"
 msgid "Host \"%1$s\" already exists."
 msgstr "Verten \"%1$s\" eksisterer allerede."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7706,7 +7617,7 @@ msgstr "Verten \"%1$s\" eksisterer allerede."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "Verten \"%1$s\" kan ikke være uten vertsgruppe."
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7758,7 +7669,7 @@ msgid_plural "Hosts enabled"
 msgstr[0] "Verten aktivert"
 msgstr[1] "Verter aktivert"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7772,22 +7683,22 @@ msgstr[1] "Verter aktivert"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Vertsgruppe"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Vertsgruppen \"%1$s\" eksisterer allerede."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Vertsgruppen \"%1$s\" kan ikke slettes fordi den brukes i et globalt skript."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7800,10 +7711,10 @@ msgstr "Vertsgruppeelementer"
 msgid "Host group label type"
 msgstr "Vertsgruppe etikett type"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Vertsgruppe med ID \"%1$s\" er ikke tilgjengelig."
@@ -7819,8 +7730,8 @@ msgstr "Vertsgruppe med ID \"%1$s\" er ikke tilgjengelig."
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7894,7 +7805,7 @@ msgstr "Vertsnavn"
 msgid "Host networks"
 msgstr "Vertsnettverk"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7974,7 +7885,7 @@ msgstr "Vertsoppdatering mislyktes."
 msgid "Host updated"
 msgstr "Vert oppdatert"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr "Vert med ID \"%1$s\" er ikke tilgjengelig."
@@ -7994,7 +7905,7 @@ msgstr "Vert med samme navn \"%1$s\" eksisterer allerede."
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Vert med samme synlige navn \"%1$s\" eksisterer allerede."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8007,7 +7918,7 @@ msgstr "Vert med samme synlige navn \"%1$s\" eksisterer allerede."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8055,7 +7966,7 @@ msgstr "Verter oppdatert"
 msgid "Hours"
 msgstr "timer"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8095,7 +8006,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IP-adresse"
@@ -8120,7 +8031,7 @@ msgstr "IP-området \"%1$s\" overstiger \"%2$s\" adresse grense"
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8177,12 +8088,12 @@ msgstr "Ikon høydepunkt"
 msgid "Icon map"
 msgstr "Ikon kart"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Ikonkartet \"%1$s\" kan ikke slettes. Brukes i kart \"%2$s\"."
@@ -8195,18 +8106,18 @@ msgstr "Ikonkart opprettet"
 msgid "Icon map deleted"
 msgstr "Ikon kart slettet"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Ikonkart oppdatert"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "Ikon kartlegging"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "Ikon med ID \"%1$s\" er ikke tilgjengelig."
@@ -8307,23 +8218,20 @@ msgstr "Hvis du mener at denne meldingen er feil, vennligst kontakt administrato
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "bilde"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "Bilde \"%1$s\" eksisterer allerede."
@@ -8332,7 +8240,7 @@ msgstr "Bilde \"%1$s\" eksisterer allerede."
 msgid "Image added"
 msgstr "Bilde lagt til"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Bilde slettet"
 
@@ -8340,18 +8248,12 @@ msgstr "Bilde slettet"
 msgid "Image label type"
 msgstr "Bildetiketttype"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "Bildefeilfeil [%1$s] i [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Bilde oppdatert"
 
@@ -8446,7 +8348,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8457,13 +8359,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr "Utilgjengelig kart"
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8507,7 +8409,7 @@ msgstr "Inkluder undergrupper"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Innkommende trafikkstatistikk på nettgrensesnitt. Returnerer heltall"
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8675,24 +8577,6 @@ msgstr "Feil handling operasjon brukergruppe. Brukergruppe eksisterer ikke, elle
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Feil handling operatør bruker. Brukeren eksisterer ikke, eller du har ingen tilgang til denne brukeren."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8747,8 +8631,6 @@ msgstr "Feil handling operatør bruker. Brukeren eksisterer ikke, eller du har i
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Feil argumenter passert for å fungere."
 
@@ -8774,31 +8656,22 @@ msgstr "Feil tegn brukt til malnavn \"%1$s\"."
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "Feil forhold for handling \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "Feil vilkår for oppdagelsesregel \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "Feil korrelasjons-ID."
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "Feil tilpasset uttrykk \"%2$s\" for handling \"%1$s\": %3$s."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "Feil tilpasset uttrykk \"%2$s\" for korrelasjon \"%1$s\": %3$s."
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "Feil tilpasset uttrykk \"%2$s\" for oppdagelsesregel \"%1$s\": %3$s."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8827,7 +8700,7 @@ msgstr "Feil eventobjekt verdi."
 msgid "Incorrect eventsource value."
 msgstr "Feil hendelseskildeverdi."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Feil felt \"%1$s\" navn eller verdi i hvor setning for tabell \"%2$s\"."
@@ -8852,22 +8725,17 @@ msgstr "Feil filopplasting."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "Feil filterbetingelsesformel ID for handling \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Feil filterbetingelsesformel ID for oppdagelsesregel \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "Feil filterbetingelsesformel ID gitt for korrelasjon \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "Feil filtertilstand makro for oppdagelsesregel \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8878,7 +8746,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "Feil filtertilstandsoperatør for handling \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "Feil filtertilstandsoperatør for oppdagelsesregel \"%1$s\"."
@@ -8906,8 +8774,6 @@ msgstr "Feil bildeindeks."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8969,10 +8835,6 @@ msgstr "Feil vedlikeholdsperiode (minimum 5 minutter)"
 msgid "Incorrect map ID."
 msgstr "Feil kart-ID."
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "Feil mediatype ID."
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9030,13 +8892,13 @@ msgstr "Feil regelmessig uttrykk \"%1$s\": \"%2$s\""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Feil respons mottatt fra Zabbix server \"%1$s\"."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Feil tjeneste sluttid."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Feil starttid for tjenesten."
 
@@ -9089,12 +8951,7 @@ msgstr "Feil utløse prototypeuttrykk. Trigger prototype uttrykk elementer bør
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "Feil type beregning for handling \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "Feil type beregning for korrelasjon \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "Feil type beregning for oppdagelsesregel \"%1$s\"."
@@ -9140,13 +8997,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9163,60 +9020,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Feil verdi \"%1$s\" for \"%2$s\" -feltet: må være mellom %3$s og %4$s."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "Feil verdi \"%1$s\" for flytfelt \"%2$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "Feil verdi \"%1$s\" for int felt \"%2$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Feil verdi \"%1$s\" for usignert int felt \"%2$s\"."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "Feil verdi \"%1$s\" i felt \"%2$s\" for korrelasjon \"%3$s\"."
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "Feil verdi \"%1$s\" i felt \"%2$s\" for medietype \"%3$s\"."
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9271,14 +9098,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9388,25 +9209,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9417,7 +9220,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9463,16 +9266,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9481,7 +9285,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "Feil verdi for felt \"%1$s\": %2$s."
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9569,12 +9373,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Sett inn"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "Sett inn uttrykk"
 
@@ -9678,7 +9482,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9686,7 +9490,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9697,7 +9501,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Intervall"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9720,7 +9524,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr "Ugyldig handlingstilstand: %1$s."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9752,7 +9556,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr "Ugyldig intervall \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Ugyldig nøkkel \"%1$s\" for oppdagelsesregel \"%2$s\" på \"%3$s\" : %4$s."
@@ -9777,27 +9581,29 @@ msgstr "Ugyldig nøkkel \"%1$s\" : %2$s."
 msgid "Invalid method parameters."
 msgstr "Ugyldige metodeparametere."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9823,17 +9629,17 @@ msgstr "Ugyldige metodeparametere."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9841,8 +9647,8 @@ msgstr "Ugyldige metodeparametere."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9856,106 +9662,116 @@ msgstr "Ugyldige metodeparametere."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9997,43 +9813,38 @@ msgstr "Ugyldig svarkode \"%1$s\"."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10054,7 +9865,7 @@ msgstr "Ugyldig tidsperiode."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Inventar"
 
@@ -10095,7 +9906,7 @@ msgstr "Det er ikke mulig å søke etter brukerpassord."
 msgid "Italian (it_IT)"
 msgstr "Italiensk (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10127,7 +9938,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "Elementet \"%1$s\" kan ikke fylle ut et manglende vertsinventarfeltnummer \"%2$d\". Valgene er: fra 0 (ikke fylle) til %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10141,7 +9952,7 @@ msgstr "Element lagt til"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "Element kopiert"
@@ -10155,13 +9966,13 @@ msgstr "Varenummer"
 msgid "Item deleted"
 msgstr "Elementet slettet"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Elementet er deaktivert"
 msgstr[1] "Elementer er deaktivert"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Element aktivert"
@@ -10171,7 +9982,7 @@ msgstr[1] "Elementer aktivert"
 msgid "Item in \"not supported\" state"
 msgstr "Element i \"ikke støttet\" tilstand"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "Varen er ikke valgt"
 
@@ -10180,7 +9991,7 @@ msgstr "Varen er ikke valgt"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr "Forhåndsbehandling av varer mangler parametere: %1$s"
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10217,8 +10028,8 @@ msgid_plural "Item prototypes updated"
 msgstr[0] "Element prototype oppdatert"
 msgstr[1] "Element prototyper oppdatert"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr "Element prototype med ID \"%1$s\" er ikke tilgjengelig."
@@ -10244,7 +10055,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10276,8 +10087,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr "Element med ID \"%1$s\" er ikke tilgjengelig."
@@ -10328,11 +10139,11 @@ msgstr "Element med nøkkel \"%1$s\" eksisterer allerede på \"%2$s\"."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "elementer"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Elementer slettet"
 
@@ -10350,7 +10161,7 @@ msgstr "Elementer oppdatert"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10375,6 +10186,10 @@ msgstr "JMX-grensesnitt"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10387,7 +10202,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr "JSON-streng er forventet"
 
@@ -10405,7 +10220,7 @@ msgstr ""
 msgid "Jan"
 msgstr "jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "januar"
 
@@ -10427,7 +10242,7 @@ msgstr ""
 msgid "Jul"
 msgstr "juli"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "juli"
 
@@ -10435,7 +10250,7 @@ msgstr "juli"
 msgid "Jun"
 msgstr "juni"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "juni"
 
@@ -10592,22 +10407,6 @@ msgid_plural "Last %1$d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10619,11 +10418,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Siste sjekk"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Siste timepr"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Forrige måned graf"
 
@@ -10661,11 +10460,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Siste verdi"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Forrige uke graf"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10674,11 +10473,11 @@ msgstr "Forrige uke graf"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Siste data"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "Siste verdier"
 
@@ -10719,7 +10518,7 @@ msgstr ""
 msgid "Left trim"
 msgstr "Venstre trim"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -11001,7 +10800,7 @@ msgstr "Lavnivåregistreringsregel i \"ikke støttet\" tilstand"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -11023,7 +10822,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "MD5 sjekksum for fil. Returnerer tegnstreng (MD5 hash av filen)"
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11034,12 +10833,12 @@ msgid "Macro"
 msgstr "Makro"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Makro \"%1$s\" eksisterer allerede på \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Makro \"%1$s\" eksisterer allerede."
@@ -11067,7 +10866,7 @@ msgstr "Makroer oppdatert"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -11075,7 +10874,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11158,7 +10957,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11180,13 +10979,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Kart"
 
@@ -11255,7 +11054,7 @@ msgstr "Kartform"
 msgid "Map update failed."
 msgstr "Kartoppdatering mislyktes."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr "Kart med ID \"%1$s\" er ikke tilgjengelig."
@@ -11287,7 +11086,7 @@ msgstr "Maps"
 msgid "Mar"
 msgstr "mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Mars"
 
@@ -11391,7 +11190,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11405,7 +11204,7 @@ msgstr[1] "Maksimal tidsperiode å vise er %1$s dager."
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Kan"
 
@@ -11420,15 +11219,12 @@ msgstr "Kan"
 msgid "Media"
 msgstr "Media"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Media type"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr "Medietype \"%1$s\" eksisterer allerede."
@@ -11455,11 +11251,6 @@ msgid_plural "Media types enabled"
 msgstr[0] "Medietype aktivert"
 msgstr[1] "Medietyper aktivert"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr "Medietype mangler parametere: %1$s"
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11489,7 +11280,7 @@ msgstr "Medietype med ID \"%1$s\" er ikke tilgjengelig."
 msgid "Media types"
 msgstr "Medietyper"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11577,7 +11368,7 @@ msgstr "Meldinger"
 msgid "Method not found."
 msgstr "Metode ikke funnet."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11639,7 +11430,7 @@ msgid "Minimum severity"
 msgstr "Minste alvorlighetsgrad"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11698,7 +11489,7 @@ msgstr "Modus"
 msgid "Model"
 msgstr "Modell"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11736,7 +11527,7 @@ msgstr[1] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11762,7 +11553,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Man"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Mandag"
 
@@ -11802,11 +11593,11 @@ msgstr "Måned"
 msgid "Monthly"
 msgstr "Månedlig"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "Flere treff funnet ..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11830,7 +11621,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11843,7 +11634,7 @@ msgstr "Flere"
 msgid "Multiple PROBLEM events"
 msgstr "Flere PROBLEM-hendelser"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Stum"
 
@@ -11972,11 +11763,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12134,19 +11925,21 @@ msgstr "Ny tilstand"
 msgid "New dashboard"
 msgstr "Nytt dashbord"
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Nytt element"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr "Ny hendelsesvertsgruppe"
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr "Ny hendelse merket verdi"
 
@@ -12158,7 +11951,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nytt regulært uttrykk"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12166,7 +11959,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Ny service tid"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12175,7 +11968,7 @@ msgid "New triggers"
 msgstr "Nye utløsere"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12193,7 +11986,7 @@ msgstr "Neste steg"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12222,30 +12015,6 @@ msgstr "Neste steg"
 msgid "No"
 msgstr "Nei"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "Ingen \"%1$s\" gitt for korrelasjon \"%2$s\"."
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "Ingen \"%1$s\" gitt for korrelasjon."
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12261,11 +12030,6 @@ msgstr "Ingen \"%1$s\" gitt for grafen."
 msgid "No \"%1$s\" given for map."
 msgstr "Ingen \"%1$s\" gitt for kart."
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "Ingen \"%1$s\" gitt for medietype."
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12273,7 +12037,7 @@ msgstr "Ingen \"%1$s\" gitt for medietype."
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "Ingen \"%2$s\" gitt for en filtertilstandsbetingelse \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "Ingen \"%2$s\" gitt for en filtertilstand av oppdagelsesregel \"%1$s\"."
@@ -12283,7 +12047,7 @@ msgstr "Ingen \"%2$s\" gitt for en filtertilstand av oppdagelsesregel \"%1$s\"."
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "Ingen \"%2$s\" gitt for filteret for handling \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "Ingen \"%2$s\" gitt for filteret med oppdagelsesregel \"%1$s\"."
@@ -12300,11 +12064,6 @@ msgstr "Ingen godkjennings brukernavn oppgitt."
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "Ingen tilstandstype gitt for korrelasjon \"%1$s\"."
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12335,7 +12094,7 @@ msgstr "Ingen standardgrensesnitt for \"%1$s\" type på \"%2$s\"."
 msgid "No details"
 msgstr "Ingen detaljer"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "Ingen oppdagelsesregel-IDer er gitt."
 
@@ -12371,7 +12130,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "Ingen grafer lagt til."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Ingen verts-IDer oppgitt."
 
@@ -12401,7 +12160,7 @@ msgstr "Ikke noe bilde"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Ingen grensesnitt funnet"
 
@@ -12435,7 +12194,7 @@ msgstr "Ingen makroer funnet."
 msgid "No maps added."
 msgstr "Ingen kart lagt til."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "Ingen treff funnet"
 
@@ -12443,17 +12202,46 @@ msgstr "Ingen treff funnet"
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr "Ingen operasjonstype gitt for korrelasjon \"%1$s\"."
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Ingen tillatelser for systemtilgang."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12461,7 +12249,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12489,19 +12277,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12516,16 +12303,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12545,12 +12338,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12571,27 +12362,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12608,14 +12401,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12624,7 +12417,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Ingen tillatelser til henvist objekt eller det eksisterer ikke!"
 
@@ -12644,7 +12437,7 @@ msgstr "Ingen offentlig nøkkelfil spesifisert."
 msgid "No recipients for action operation message."
 msgstr "Ingen mottakere for meldingshandling."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr "Ingen oppdatering"
 
@@ -12656,7 +12449,7 @@ msgstr "Ingen skript angitt for handlingsoperasjonskommando."
 msgid "No target selected"
 msgstr "Ingen mål valgt"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Ingen mål valgt."
 
@@ -12673,7 +12466,7 @@ msgstr "Ingen utløsere definert."
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr "Ikke-boolske flagg er foreldet."
 
@@ -12743,15 +12536,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Ikke lov til å angi passord for brukerens \"gjest\"."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12783,7 +12576,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "Ikke støttet"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Merk"
@@ -12814,7 +12607,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "November"
 
@@ -13001,8 +12794,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13062,13 +12855,13 @@ msgstr "Okt"
 msgid "Octal to decimal"
 msgstr "Oktal til desimal"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Oktober"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Av"
 
@@ -13076,30 +12869,31 @@ msgstr "Av"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr "Gamle hendelse tag verdi"
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "På"
 
@@ -13115,35 +12909,15 @@ msgstr "En gang"
 msgid "One"
 msgstr "En"
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "En av objektene er igjen uten vertsgruppe."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Kun en gang"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Engangs nedetid"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Bare superadministratorer kan opprette vertsgrupper."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Bare superadministratorer kan opprette medietyper."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Bare Super Admins kan slette medietyper."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Bare Super Admins kan redigere medietyper."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Kun Zabbix-agent, SNMPv1, SNMPv2 og SNMPv3-kontroller kan gjøres unike."
@@ -13192,10 +12966,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "Bare superadministratorer kan skape korrelasjoner."
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13204,15 +12974,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr "Bare superadministratorer kan oppdatere korrelasjoner."
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Bare utløsere som er tilordnet aktiverte verter, og avhengig av aktiverte elementer telles"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13221,7 +12987,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Operativsysteminformasjon. Returnerer streng"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13230,11 +12996,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Drift kan ikke utføres på grunn av uautorisert forespørsel."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Driftsdetaljer"
 
@@ -13256,7 +13022,7 @@ msgstr "Operasjonen har ingen mal å betjene."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13265,33 +13031,33 @@ msgstr ""
 msgid "Operations"
 msgstr "Operasjoner"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operatør"
 
@@ -13400,7 +13166,7 @@ msgstr "Andre konfigurasjonsparametere"
 msgid "Other parameters"
 msgstr "Andre parametere"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Andre"
@@ -13414,7 +13180,7 @@ msgstr "Utgående trafikkstatistikk på nettverksgrensesnitt. Returnerer heltall
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13443,7 +13209,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13632,7 +13398,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13677,7 +13443,7 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "PSK-identitet"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13700,16 +13466,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parameter"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "Parameteret \"%1$s\" er utdatert."
@@ -13739,7 +13505,7 @@ msgstr "Foreldreelementer"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13756,7 +13522,7 @@ msgstr "Foreldre utløser"
 msgid "Parent web scenarios"
 msgstr "Parent web scenarier"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13768,11 +13534,6 @@ msgstr ""
 msgid "Parse"
 msgstr "Tolk"
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "Parsel SQL-feil [%1$s] i [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Parsefeil"
@@ -13833,7 +13594,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr "Lim inn"
 
@@ -13843,15 +13604,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr "Lim inn uten eksterne lenker"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13897,12 +13658,11 @@ msgstr "Utfører en DNS-spørring. Returnerer tegnstreng med nødvendig informas
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Periode"
 
@@ -13991,7 +13751,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Vennligst skriv inn vertsnavnet eller verts IP-adressen og portnummeret til Zabbix-serveren, samt navnet på installasjonen (valgfritt)."
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Vennligst velg to elementer"
 
@@ -14031,7 +13791,7 @@ msgstr "Fyller vertsinvesteringsfelt"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14120,7 +13880,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14251,7 +14011,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Problem på"
 
@@ -14264,21 +14024,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14292,9 +14048,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "problemer"
 
@@ -14328,7 +14084,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "Egenskaper"
 
@@ -14349,13 +14105,13 @@ msgstr ""
 msgid "Proxies"
 msgstr "fullmakter"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14363,7 +14119,7 @@ msgstr "fullmakter"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14373,12 +14129,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Proxy \"%1$s\" for verten \"%2$s\" eksisterer ikke."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Proxy \"%1$s\" brukes av oppdagelsesregelen \"%2$s\"."
@@ -14471,7 +14227,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14548,10 +14304,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Mottatt verdi"
@@ -14633,7 +14385,7 @@ msgstr "Rektangel"
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14651,13 +14403,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Vanlig uttrykk"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14690,7 +14442,7 @@ msgstr "Vanlig uttrykk"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14722,8 +14474,6 @@ msgstr "Fjernkommando"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14744,7 +14494,9 @@ msgstr "Fjernkommando"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14757,7 +14509,7 @@ msgstr "Fjernkommando"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14834,8 +14586,8 @@ msgstr "Fjernkommando"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Fjern"
 
@@ -14875,7 +14627,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14917,7 +14669,7 @@ msgid "Replace dependencies"
 msgstr "Erstatt avhengigheter"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14972,7 +14724,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -15014,8 +14766,8 @@ msgstr "Nødvendige statuskoder"
 msgid "Required string"
 msgstr "Nødvendig streng"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Nullstill"
 
@@ -15048,7 +14800,7 @@ msgstr "Tilbakestill bekreftelse"
 msgid "Reset defaults"
 msgstr "Tilbakestill standardinnstillinger"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Løst"
 
@@ -15114,7 +14866,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Resultat"
@@ -15301,12 +15053,12 @@ msgstr "Kjør angitt kommando på verten. Returnerer tekstresultatet av kommando
 msgid "Russian (ru_RU)"
 msgstr "Russisk (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15317,8 +15069,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15355,7 +15107,7 @@ msgstr "SMTP-serverport"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15451,12 +15203,12 @@ msgstr "SQL-teller: %1$s (velges: %2$s | kjører ut: %3$s)"
 msgid "SQL query"
 msgstr "SQL spørring"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "SQL setningsutførelse har mislyktes \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "SQL setningens utførelse har mislyktes \"%1$s\"."
@@ -15519,7 +15271,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15531,7 +15283,7 @@ msgstr "Sans serif"
 msgid "Sat"
 msgstr "Lør"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Lørdag"
 
@@ -15573,7 +15325,7 @@ msgstr "Rute"
 msgid "Scheduled check"
 msgstr "Planlagt sjekk"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15640,7 +15392,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15653,8 +15405,7 @@ msgstr ""
 msgid "Script"
 msgstr "Skript"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Skriptet \"%1$s\" eksisterer allerede."
@@ -15686,12 +15437,6 @@ msgstr "Skriptnavn"
 msgid "Script parameters"
 msgstr "Skriptparametere"
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "Skriptparametere \"%1$s\" mangler den siste nye linjematen for medietypen \"%2$s\"."
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Skriptprofil"
@@ -15704,7 +15449,7 @@ msgstr "Skript oppdatert"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Skript"
 
@@ -15774,8 +15519,8 @@ msgid "Security name"
 msgstr "Sikkerhetsnavn"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15783,7 +15528,7 @@ msgstr "Sikkerhetsnavn"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Valgt"
 
@@ -15819,19 +15564,19 @@ msgstr "Valgte elementer"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr "Send bakover"
 
@@ -15856,7 +15601,7 @@ msgstr "Send bare til"
 msgid "Send to"
 msgstr "Send til"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr "Plasser i bakgrunnen"
 
@@ -15889,7 +15634,7 @@ msgstr "Separert"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "September"
 
@@ -15920,28 +15665,28 @@ msgstr "Server (proxy)"
 msgid "Server time"
 msgstr "Server tid"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Tjeneste"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15951,7 +15696,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "Service opprettet"
 
@@ -15984,16 +15729,16 @@ msgstr "Serviceport"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "Startstart for service må være mindre enn sluttid."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -16001,11 +15746,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Tjenestetider"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Tjeneste type"
 
@@ -16014,30 +15759,29 @@ msgstr "Tjeneste type"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Tjeneste oppdatert"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Tjenester"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "Tjenester danner en sirkulær avhengighet."
 
@@ -16045,7 +15789,7 @@ msgstr "Tjenester danner en sirkulær avhengighet."
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16075,7 +15819,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Angi vert inventar modus"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16104,7 +15848,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16113,7 +15857,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16169,7 +15913,7 @@ msgstr "Form"
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "Deling"
 
@@ -16311,7 +16055,7 @@ msgstr "Vis advarsel hvis Zabbix-serveren er nede"
 msgid "Show working time"
 msgstr "Vis arbeidstid"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Vist"
 
@@ -16420,7 +16164,7 @@ msgstr "Hoppet over kopiering av grafen \"%1$s\" for å være vert for \"%2$s\".
 msgid "Slovak (sk_SK)"
 msgstr "Slovakisk (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Utsett"
 
@@ -16466,7 +16210,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Sorter oppføringer etter"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Sorteringsrekkefølge (0-> 999)"
 
@@ -16540,7 +16284,7 @@ msgstr "Start i"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16643,15 +16387,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Status"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Status koder"
@@ -16681,7 +16429,7 @@ msgstr "Kun status"
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16729,7 +16477,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16794,7 +16542,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Emne"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Submap"
 
@@ -16810,7 +16558,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Suksess revisjon"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16823,7 +16571,7 @@ msgstr "Summen av innkommende og utgående trafikkstatistikk på nettverksgrense
 msgid "Sun"
 msgstr "Søn"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -16915,12 +16663,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "System oppetid på sekunder. Returnerer heltall"
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16947,17 +16695,17 @@ msgstr "TRUE"
 msgid "Table \"%1$s\" does not exist."
 msgstr "Tabellen \"%1$s\" eksisterer ikke."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "Tabellen \"%1$s\" har ikke et felt som heter \"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Tagg"
@@ -17013,7 +16761,7 @@ msgstr "Merkverdien"
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17073,7 +16821,7 @@ msgstr "Måltype"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17094,7 +16842,7 @@ msgstr "Mal"
 msgid "Template \"%1$s\" already exists."
 msgstr "Mal \"%1$s\" eksisterer allerede."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17118,7 +16866,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Mal kan ikke kobles til en annen mal mer enn en gang, selv gjennom andre maler."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17178,7 +16926,7 @@ msgstr "Mal med det samme synlige navnet \"%1$s\" eksisterer allerede."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17350,14 +17098,14 @@ msgstr "Verten er ikke oppdaget lenger og vil bli slettet i %1$s (på %2$s på %
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "Verten er ikke oppdaget lenger og vil bli slettet neste gang funnregelen blir behandlet."
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "Bildet brukes i ikonkart %1$s."
 msgstr[1] "Bildet brukes i ikonkartene %1$s."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17422,7 +17170,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Denne måneden"
 
@@ -17430,7 +17178,7 @@ msgstr "Denne måneden"
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Denne uken"
 
@@ -17438,7 +17186,7 @@ msgstr "Denne uken"
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Dette året"
 
@@ -17458,7 +17206,7 @@ msgstr ""
 msgid "Thu"
 msgstr "Tor"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -17475,7 +17223,7 @@ msgstr "Inntil"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17508,7 +17256,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Tidsperiode"
 
@@ -17560,12 +17308,11 @@ msgstr "Tidsstempel"
 msgid "To"
 msgstr "Til"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "For å angi et vertsgrensesnitt, velg en enkelt gjenstandstype for alle elementer"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "I dag"
 
@@ -17680,7 +17427,7 @@ msgstr "Trend lagringsperiode"
 msgid "Trends"
 msgstr "Trender"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17688,7 +17435,7 @@ msgstr "Trender"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Utløser"
 
@@ -17789,7 +17536,7 @@ msgstr "Utløser navn"
 msgid "Trigger overview"
 msgstr "Utløser oversikt"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17862,11 +17609,11 @@ msgstr "Trigger prototyper oppdatert"
 msgid "Trigger severity"
 msgstr "Trigger alvorlighet"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "Trigger status \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "Trigger status \"Problem\""
 
@@ -17883,7 +17630,7 @@ msgstr "Utløser oppdatert"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17918,7 +17665,7 @@ msgstr "Trim"
 msgid "Tue"
 msgstr "Tir"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -17931,7 +17678,7 @@ msgstr "Tyrkisk (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "To elementer (\"%1$s\" og \"%2$s\") kan ikke fylle ut et vertsinventarfelt \"%3$s\", dette vil føre til konflikt."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17947,19 +17694,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18011,7 +17758,7 @@ msgstr "Type informasjon"
 msgid "Types"
 msgstr "Typer"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18032,7 +17779,7 @@ msgstr "UKJENT"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18078,12 +17825,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "Nettadressen skal ha både \"navn\" og \"url\" -felt for kart \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "webadresser"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18168,12 +17915,12 @@ msgstr "Unblock"
 msgid "Unblock selected users?"
 msgstr "Fjern blokkering av valgte brukere?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18193,21 +17940,23 @@ msgstr "Enheter"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Ukjent"
@@ -18225,7 +17974,7 @@ msgid "Unknown error"
 msgstr "Ukjent feil"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Ukjent vertsobjekt, ikke noe element i valgt vert"
@@ -18278,7 +18027,7 @@ msgstr "Fjern koblingen fra mal"
 msgid "Unlink from templates"
 msgstr "Fjern kobling fra maler"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Mikrofon"
 
@@ -18309,7 +18058,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "Ustøttet parameter \"%2$s\" for en filtertilstandsbetingelse \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "Ustøttet parameter \"%2$s\" for en filtertilstand av oppdagelsesregel \"%1$s\"."
@@ -18319,7 +18068,7 @@ msgstr "Ustøttet parameter \"%2$s\" for en filtertilstand av oppdagelsesregel \
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "Ikke-støttet parameter \"%2$s\" for filteret av handling \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "Ikke-støttet parameter \"%2$s\" for filteret med funnetregelen \"%1$s\"."
@@ -18364,7 +18113,7 @@ msgstr "Opp"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18377,7 +18126,7 @@ msgstr "Opp"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18430,7 +18179,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18448,7 +18197,7 @@ msgstr "Last opp"
 msgid "Upper level maps"
 msgstr "Øvre nivå kart"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18483,7 +18232,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "Brukes i handlinger"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18498,7 +18247,7 @@ msgstr "Brukes i handlinger"
 msgid "User"
 msgstr "Bruker"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "Bruker \"%1$s\" kan ikke være uten brukergruppe."
@@ -18550,7 +18299,7 @@ msgstr "Bruker lagt til"
 msgid "User agent string"
 msgstr "Brukeragent streng"
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Brukeren kan ikke legge seg til en deaktivert gruppe eller en gruppe med deaktivert GUI-tilgang."
@@ -18570,7 +18319,7 @@ msgid_plural "Users deleted"
 msgstr[0] "Bruker slettet"
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18580,27 +18329,27 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Brukergruppe"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Brukergruppe \"%1$s\" eksisterer allerede."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "Brukergruppe \"%1$s\" brukes i \"%2$s\" handling."
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Brukergruppe \"%1$s\" brukes i konfigurasjon for nedlastingsmeldinger."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Brukergruppe \"%1$s\" brukes i skriptet \"%2$s\"."
@@ -18634,8 +18383,8 @@ msgstr[1] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18679,14 +18428,14 @@ msgstr "Bruker passord"
 msgid "User profile"
 msgstr "Bruker profil"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18755,7 +18504,7 @@ msgstr "Bruker oppdatert"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "Bruker med ID \"%1$s\" er ikke tilgjengelig."
@@ -19071,14 +18820,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19088,7 +18837,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19130,7 +18879,7 @@ msgstr "Verdi \"%1$s\" er ugyldig for parameter \"grid_show\". Valg er: \"%2$s\"
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "Verdi \"%1$s\" er ugyldig for parameter \"grid_show\". Valg er: \"%2$s\"."
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "Verdien \"%1$s\" er for lang for felt \"%2$s\" %3$d tegn. Tillatt lengde er %4$d tegn."
@@ -19147,7 +18896,7 @@ msgstr "Verdi cachestatistikk. Gyldige moduser er: totalt, gratis, pfree, brukt
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Verdikart"
 
@@ -19190,11 +18939,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "Verdi av en hvilken som helst Windows-ytelsesteller. Returnerer heltall, flyt, streng eller tekst (avhengig av forespørselen)"
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19241,7 +18991,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19328,7 +19078,7 @@ msgstr "Synlig navn kan ikke være tomt hvis vertsnavnet mangler."
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "O"
@@ -19345,7 +19095,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Advarsel"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19354,7 +19104,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Vi beklager, det maksimalt antall elementer som skal huskes, er nådd."
 
@@ -19370,7 +19120,7 @@ msgstr "Vi beklager, det maksimalt antall elementer som skal huskes, er nådd."
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web"
 
@@ -19382,7 +19132,7 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Nettovervåking"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr "Nettscenario"
 
@@ -19397,27 +19147,27 @@ msgstr "Nettscenario \"%1$s\" eksisterer allerede på verten \"%2$s\"."
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Nettscenario \"%1$s\" eksisterer allerede."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "Webscenario lagt til"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Web-scenario slettet"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Web-scenario deaktivert"
 msgstr[1] "Web-scenarier deaktivert"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Web-scenario aktivert"
 msgstr[1] "Web-scenarier aktivert"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "Webscenario oppdatert"
 
@@ -19439,7 +19189,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Ons"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -19450,7 +19200,7 @@ msgstr "Onsdag"
 msgid "Weekly"
 msgstr "Ukentlig"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19466,12 +19216,12 @@ msgstr "Velkommen til"
 msgid "When active"
 msgstr "Når aktiv"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19666,6 +19416,10 @@ msgstr "Y-m-d H:i"
 msgid "Y-m-d H:i:s"
 msgstr "Y-m-d H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr "Y1"
@@ -19727,7 +19481,7 @@ msgstr "Årlig"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19784,18 +19538,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19807,9 +19555,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Du har ikke tillatelse til å utføre denne operasjonen."
 
@@ -19925,24 +19670,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr "en boolean verdi forventes"
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "en tegnstreng forventes"
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19951,37 +19700,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr "et nummer er forventet"
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr "et nummer er for stort"
@@ -20002,28 +19751,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr "en tid er forventet"
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr "en tidsperiode er forventet"
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr "en tidsenhet er forventet"
@@ -20071,7 +19821,7 @@ msgstr "alle"
 msgid "all media"
 msgstr "alle medier"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20079,42 +19829,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "en matrise er forventet"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr "en matrise eller en tegnstreng forventes"
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20124,7 +19869,7 @@ msgid "an empty string is expected"
 msgstr "en tom streng forventes"
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr "et jevnt antall heksadesimale tegn forventes"
 
@@ -20132,11 +19877,15 @@ msgstr "et jevnt antall heksadesimale tegn forventes"
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20297,14 +20046,8 @@ msgstr "kan ikke endres"
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20334,19 +20077,11 @@ msgstr "kan ikke endres"
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20366,14 +20101,14 @@ msgstr "kan ikke endres"
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20381,7 +20116,7 @@ msgstr "kan ikke endres"
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "kan ikke være tomt"
@@ -20394,7 +20129,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20428,7 +20163,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "Sirkulær elementavhengighet er ikke tillatt"
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20446,7 +20181,8 @@ msgid "configure"
 msgstr "konfigurer"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20475,7 +20211,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20537,7 +20273,7 @@ msgstr "synkende"
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20559,13 +20295,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20591,7 +20327,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20628,6 +20365,10 @@ msgstr "uttrykket er tomt"
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20674,7 +20415,7 @@ msgstr "globale housekeeping innstillinger"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20715,6 +20456,11 @@ msgstr "ikon"
 msgid "image"
 msgstr "bilde"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 #, fuzzy
 msgid "in"
@@ -20756,15 +20502,19 @@ msgstr "Feil elementtelling"
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "feil syntaks nær \"%1$s\""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20792,7 +20542,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr "ugyldig adressesort \"%1$s\""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr "ugyldig byte-sekvens i UTF-8"
 
@@ -20821,27 +20571,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr "ugyldig historisk lagringsperiode"
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr "ugyldig regulært uttrykk"
 
@@ -20869,7 +20619,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr "er ikke vedlagt {} eller er misdannet"
 
@@ -20955,12 +20705,12 @@ msgstr "lavnivå oppdagelsesregel"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -21019,7 +20769,7 @@ msgstr "fyrstikker"
 msgid "max"
 msgstr "maks"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21059,7 +20809,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr "Minste lengde er %1$s tegn"
@@ -21086,8 +20836,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21102,27 +20852,14 @@ msgstr "må være en gyldig LDAP-bruker"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "må være mellom \"%1$s\" og \"%2$s\""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21150,6 +20887,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21160,7 +20905,7 @@ msgstr ""
 msgid "name"
 msgstr "navn"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "ny"
 
@@ -21295,7 +21040,7 @@ msgstr "produksjon"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21330,24 +21075,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21375,11 +21124,11 @@ msgstr ""
 msgid "regular expression"
 msgstr "vanlig uttrykk"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21391,15 +21140,15 @@ msgstr ""
 msgid "right"
 msgstr "Ikke sant"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21447,7 +21196,7 @@ msgstr ""
 msgid "short description"
 msgstr "Kort beskrivelse"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21466,15 +21215,15 @@ msgstr "Kort beskrivelse"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr "bør være tom"
 
@@ -21490,31 +21239,31 @@ msgstr "vis ikon mappings"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21522,11 +21271,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21542,8 +21291,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21554,7 +21303,7 @@ msgstr ""
 msgid "tag"
 msgstr "tagg"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21563,13 +21312,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "mal ID \"%1$s\" er passert %2$s ganger"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21578,20 +21331,20 @@ msgstr "mal ID \"%1$s\" er passert %2$s ganger"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "parameteren \"%1$s\" mangler"
@@ -21623,39 +21376,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21669,7 +21422,7 @@ msgstr "avtrekker"
 msgid "trigger does not allow manual closing"
 msgstr "utløser tillater ikke manuell lukking"
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21681,26 +21434,26 @@ msgstr "utløser prototype kan ikke flyttes til en annen mal eller vert"
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr "Utløseren med koblinger kan ikke flyttes til en annen mal eller vert"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "skriv her for å søke"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21708,11 +21461,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21729,10 +21482,10 @@ msgstr "uventet slutt på nøkkelen"
 msgid "unexpected end of macro"
 msgstr "uventet slutten av makroen"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21742,11 +21495,12 @@ msgstr "uventet slutten av makroen"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr "uventet parameter \"%1$s\""
@@ -21772,8 +21526,8 @@ msgstr "uventet tekst \"%1$s\""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21798,6 +21552,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr "ikke-støttet versjonsnummer"
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21813,7 +21571,7 @@ msgstr "ikke-støttet versjonsnummer"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21833,11 +21591,11 @@ msgstr "ikke-støttet versjonsnummer"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "verdi"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21855,76 +21613,85 @@ msgstr "verdien \"%1$s\" ble ikke funnet"
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr "verdien %1$s eksisterer allerede"
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr "verdien er for lang"
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21936,18 +21703,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr "verdien må være en av %1$s"
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21956,7 +21721,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21969,11 +21734,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21990,7 +21755,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "å"
diff --git a/ui/locale/nl/LC_MESSAGES/frontend.po b/ui/locale/nl/LC_MESSAGES/frontend.po
index 5ccbe7195a2..b320305eef1 100644
--- a/ui/locale/nl/LC_MESSAGES/frontend.po
+++ b/ui/locale/nl/LC_MESSAGES/frontend.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2013-08-07 16:41+0300\n"
 "Last-Translator: open-future <patrik@open-future.be>\n"
 "Language-Team: NL\n"
@@ -96,7 +96,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d dag"
 msgstr[1] "%1$d dagen"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -181,7 +181,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -195,7 +195,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -228,14 +228,14 @@ msgstr[1] "%1$s pogingen resterend"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s seconde"
 msgstr[1] "%1$s seconden"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -255,13 +255,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -391,7 +391,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -452,10 +452,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr ""
@@ -498,7 +494,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Bvst"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Bevestigen"
 
@@ -506,7 +502,7 @@ msgstr "Bevestigen"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Bevestigd"
@@ -519,7 +515,7 @@ msgstr "Bevestigde gebeurtenissen met status Probleem"
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -546,9 +542,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -605,7 +601,7 @@ msgstr "Actie \"%1$s\" bestaat reeds."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Actie \"%1$s\" geen bewerking gedefinieerd."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -614,7 +610,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Actie toegevoegd"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -663,8 +659,8 @@ msgstr "Actie bijgewerkt"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Acties"
@@ -731,7 +727,7 @@ msgstr "Actief tot"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -742,7 +738,7 @@ msgstr "Actief tot"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -765,9 +761,9 @@ msgstr "Actief tot"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -837,7 +833,7 @@ msgstr "Actief tot"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Toevoegen"
 
@@ -845,11 +841,11 @@ msgstr "Toevoegen"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr ""
 
@@ -857,7 +853,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -874,7 +870,7 @@ msgstr "Host toevoegen"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr ""
 
@@ -896,7 +892,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -948,12 +944,12 @@ msgstr ""
 msgid "Add widget"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -963,7 +959,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -976,7 +972,7 @@ msgstr "Beheerder"
 msgid "Administration"
 msgstr "Beheer"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -998,7 +994,7 @@ msgstr "Leeftijd minder dan"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1070,7 +1066,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Alle"
 
@@ -1088,7 +1084,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Bij alle koppelingen moeten \"Naam\" en \"URL\" gespecificeerd zijn."
 
@@ -1106,7 +1102,7 @@ msgstr ""
 msgid "All problems if tag values match"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1219,15 +1215,15 @@ msgstr "Applicatie fout."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Toepassen"
 
@@ -1245,7 +1241,7 @@ msgstr "Naderen"
 msgid "Apr"
 msgstr "Apr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "April"
 
@@ -1273,7 +1269,7 @@ msgstr "Type van het gebied"
 msgid "Arithmetic"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1320,7 +1316,7 @@ msgstr "Op (hour:minute)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1329,7 +1325,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1341,6 +1337,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1352,7 +1353,7 @@ msgstr "Op zijn minst een onderhoudsperiode moet aangemaakt zijn."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1408,7 +1409,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Aug"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Augustus"
 
@@ -1421,7 +1422,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1498,7 +1499,7 @@ msgstr ""
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1513,7 +1514,7 @@ msgstr "Automatisch iconen koppelen"
 msgid "Automatic icon selection"
 msgstr "Automatisch iconen selecteren"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1565,7 +1566,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1628,7 +1629,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Geblokkeerd"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr ""
 
@@ -1682,11 +1683,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Onderzijde"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr ""
 
@@ -1712,7 +1713,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1757,8 +1758,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1767,7 +1768,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Berekend"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1792,7 +1793,7 @@ msgstr "Terugbellen"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1805,8 +1806,8 @@ msgstr "Terugbellen"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Annuleer"
 
@@ -1836,7 +1837,7 @@ msgstr "kan actie niet toevoegen"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1846,7 +1847,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Kan geen host afhankelijkheid toevoegen aan een template."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1877,8 +1878,8 @@ msgid "Cannot add host prototype"
 msgstr "Kan host-prototype niet toevoegen"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Kan afbeelding niet toevoegen"
 
@@ -1970,15 +1971,15 @@ msgstr "Kan gebruiker niet toevoegen"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Kan web scenario niet toevoegen."
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1998,33 +1999,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Kan geschiedenis niet opschonen"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Kan grafiek prototypes niet klonen"
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "Kan host-prototypen niet dupliceren."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Kan item prototypes niet klonen"
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Kan trigger prototypes niet klonen"
 
@@ -2051,7 +2048,7 @@ msgid_plural "Cannot copy graphs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] ""
@@ -2103,8 +2100,8 @@ msgstr "Kan icoon map niet aanmaken"
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2133,7 +2130,7 @@ msgstr "Kan de Zabbix gebruiker \"%1$s\" niet verwijderen, probeer de gebruiker
 msgid "Cannot delete action"
 msgstr "Kan actie niet verwijderen"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2200,7 +2197,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2211,11 +2208,11 @@ msgstr[1] ""
 msgid "Cannot delete host prototypes"
 msgstr "Kan host-prototypen niet verwijderen"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Kan icoon map niet verwijderen"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Kan afbeelding niet verwijderen"
 
@@ -2240,7 +2237,7 @@ msgstr "Kan item prototype niet verwijderen"
 msgid "Cannot delete item prototypes"
 msgstr "Kan geen Item prototypes verwijderen"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Kan items niet verwijderen"
 
@@ -2271,7 +2268,7 @@ msgid_plural "Cannot delete proxies"
 msgstr[0] "Kan proxy niet verwijderen"
 msgstr[1] "Kan proxy niet verwijderen"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2294,7 +2291,7 @@ msgid_plural "Cannot delete scripts"
 msgstr[0] "Kan script niet verwijderen"
 msgstr[1] "Kan script niet verwijderen"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Kan de scripts niet verwijderen. Het script \"%1$s\" wordt gebruikt in een handeling voor actie \"%2$s\"."
@@ -2310,8 +2307,8 @@ msgid_plural "Cannot delete services"
 msgstr[0] "Kan service niet verwijderen"
 msgstr[1] "Kan service niet verwijderen"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2340,7 +2337,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr "Kan een template item niet verwijderen."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Kan template items niet verwijderen."
 
@@ -2393,7 +2390,7 @@ msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Kan web scenario niet verwijderen"
 
@@ -2428,7 +2425,7 @@ msgid_plural "Cannot disable hosts"
 msgstr[0] "Kan host niet uitschakelen"
 msgstr[1] "Kan hosts niet uitschakelen"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Kan item niet uitschakelen"
@@ -2459,7 +2456,7 @@ msgid_plural "Cannot disable triggers"
 msgstr[0] "Kan trigger niet uitschakelen"
 msgstr[1] "Kan triggers niet uitschakelen"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Kan web scenario niet uitschakelen"
@@ -2506,7 +2503,7 @@ msgid_plural "Cannot enable hosts"
 msgstr[0] "Kan item niet inschakelen"
 msgstr[1] "Kan items niet inschakelen"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Kan item niet inschakelen"
@@ -2537,7 +2534,7 @@ msgid_plural "Cannot enable triggers"
 msgstr[0] "Kan trigger niet inschakelen"
 msgstr[1] "Kan triggers niet inschakelen"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Kan webdraaiboek niet inschakelen"
@@ -2551,7 +2548,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2585,8 +2582,8 @@ msgstr "Kan host \"%1$s\" gebruikt in map \"%2$s\" niet terugvinden."
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Kan gastheer groep \"%1$s\" niet vinden voor host prototype \"%2$s\" van de ontdekking regel \"%3$s\" op \"%4$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2684,24 +2681,20 @@ msgstr ""
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "Weergavenaam van sjabloon mag niet leeg zijn."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2714,7 +2707,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
 msgstr[0] "Kan sjabloon niet importeren \"%1$s\", gekoppeld sjabloon \"%2$s\" bestaat niet."
 msgstr[1] "Kan sjabloon niet importeren \"%1$s\", gekoppelde sjablonen \"%2$s\" bestaan niet."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "Kan trigger-expressie niet invoegen"
 
@@ -2728,7 +2721,7 @@ msgid "Cannot link template."
 msgstr "Kan sjabloon niet koppelen."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2760,17 +2753,17 @@ msgstr "Kan weergavenaam van sjabloon niet in bulk bijwerken."
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Kan het delete statement niet uitvoeren op tabel \"%1$s\" zonder where conditie."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Kan de update statement niet uitvoeren op tabel \"%1$s\" zonder waarden."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Kan de update statement niet uitvoeren op tabel \"%1$s\" zonder where conditie."
@@ -2797,7 +2790,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Kan het antwoord niet lezen. Controleer de verbinding met Zabbix server \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Kan de gastgebruiker niet hernoemen."
 
@@ -2816,7 +2809,7 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Kan commando niet verzenden. Controleer de verbinding met Zabbix server \"%1$s\"."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2856,12 +2849,12 @@ msgstr "Inventory velden kunnen niet ingesteld worden voor uitgeschakelde invent
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2880,7 +2873,7 @@ msgid_plural "Cannot unblock users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Kan Web scenarios niet ontkoppelen en opschonen."
 
@@ -2893,7 +2886,7 @@ msgstr "Kan template niet ontkoppelen"
 msgid "Cannot unlink template."
 msgstr "Kan sjabloon niet ontkoppelen."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2946,11 +2939,6 @@ msgstr ""
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr ""
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2960,9 +2948,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "Kan een ontdekte grafiek niet bijwerken."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "Kan een ontdekte hostgroep niet bijwerken."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3021,9 +3010,7 @@ msgstr "Kan grafiek-prototype niet bijwerken"
 msgid "Cannot update group"
 msgstr "Kan groep niet bijwerken"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Kan geen groepen updaten voor ontdekte host \"%1$s\"."
@@ -3047,13 +3034,13 @@ msgstr[1] "Kan host-prototype niet bijwerken"
 msgid "Cannot update hosts"
 msgstr "Kan hosts niet bijwerken"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "kan icoon map niet bijwerken"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Kan afbeelding niet bijwerken"
 
@@ -3108,12 +3095,12 @@ msgstr "Kan netwerk kaart niet bijwerken"
 msgid "Cannot update proxy"
 msgstr "Kan proxy niet bijwerken"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Kan proxy niet bijwerken voor ontdekte host \"%1$s\"."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3133,17 +3120,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Kan script niet bijwerken"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3219,7 +3206,7 @@ msgstr[1] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Kan web scenario niet bijwerken"
 
@@ -3319,8 +3306,8 @@ msgid "Character string not included"
 msgstr "Chassis info - geeft standaard de volledige informatie"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3435,7 +3422,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr "Controles moeten uniek zijn."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3456,7 +3443,7 @@ msgstr "Circulaire referentie in sjablonen: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "Circulair linken van sjablonen is niet toegestaan."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3477,11 +3464,11 @@ msgstr "Wis geschiedenis en trends"
 msgid "Clear when unlinking"
 msgstr "Wis bij ontkoppelen"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3496,7 +3483,7 @@ msgstr "Klok"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3511,7 +3498,7 @@ msgstr "Klok"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Kloon"
 
@@ -3522,8 +3509,8 @@ msgstr "Kloon"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Sluiten"
 
@@ -3534,13 +3521,13 @@ msgstr "Sluiten"
 msgid "Close expression constructor"
 msgstr "Sluit expressie bouwer"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
 
@@ -3553,8 +3540,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr ""
 
@@ -3571,7 +3558,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3637,7 +3624,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3648,17 +3635,12 @@ msgstr "Condities"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3668,17 +3650,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3694,7 +3671,7 @@ msgstr "Condities"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Configuratie"
 
@@ -3757,7 +3734,7 @@ msgstr "Configuratie van hosts"
 msgid "Configuration of housekeeping"
 msgstr ""
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Configuratie van icon mapping"
@@ -3864,7 +3841,7 @@ msgstr "Bevestigingstekst"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr ""
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3957,7 +3934,7 @@ msgstr "Contact"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4017,7 +3994,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -4056,8 +4033,8 @@ msgstr "Coordinaten"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Kopie"
 
@@ -4066,12 +4043,11 @@ msgstr "Kopie"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr ""
@@ -4098,16 +4074,6 @@ msgid_plural "Correlations enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr ""
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr ""
@@ -4116,14 +4082,10 @@ msgstr ""
 msgid "Correlation updated"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Kan afbeelding niet opslaan!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Telling"
 
@@ -4187,11 +4149,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr ""
 
@@ -4308,7 +4270,7 @@ msgstr "Maak kaart"
 msgid "Create media type"
 msgstr "Maak media type aan"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "Nieuwe aanmaken"
 
@@ -4332,7 +4294,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Maak sjabloon aan"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Maak trigger aan"
 
@@ -4495,7 +4457,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "DNS naam"
@@ -4507,11 +4469,11 @@ msgstr "DNS naam"
 msgid "Daily"
 msgstr "Dagelijks"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4532,8 +4494,8 @@ msgstr ""
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr ""
 
@@ -4556,9 +4518,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr ""
 
@@ -4582,7 +4544,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4610,7 +4572,7 @@ msgstr "Data overzicht"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4752,7 +4714,7 @@ msgstr "Dag van de week"
 msgid "Days"
 msgstr "Dagen"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Debug"
 
@@ -4766,26 +4728,26 @@ msgstr "Debug mode"
 msgid "Dec"
 msgstr "Dec"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "December"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Standaard"
 
@@ -4878,7 +4840,7 @@ msgstr "Vertraagd door"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4902,8 +4864,8 @@ msgstr "Vertraagd door"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Verwijder"
 
@@ -4928,11 +4890,11 @@ msgstr "Sjabloon verwijderen en opschonen? (Aandacht: alle gelinkte host worden
 msgid "Delete current action?"
 msgstr "Huidige actie verwijderen?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4976,7 +4938,7 @@ msgstr "Item-prototype verwijderen?"
 msgid "Delete item?"
 msgstr "Item verwijderen?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Koppeling tussen geselecteerd elementen verwijderen?"
 
@@ -5032,7 +4994,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "Geselecteerde discovery regels verwijderen?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Geselecteerde elementen verwijderen?"
 
@@ -5137,7 +5099,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5181,7 +5143,7 @@ msgstr "Trigger verwijderen?"
 msgid "Delete web scenario?"
 msgstr "Webdraaiboek verwijderen?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5226,7 +5188,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Afhankelijkheden"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Afhankelijk"
 
@@ -5234,7 +5196,7 @@ msgstr "Afhankelijk"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5244,7 +5206,7 @@ msgstr "Afhankelijk van"
 msgid "Deployment status"
 msgstr "Uitrol status"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5277,7 +5239,7 @@ msgid "Description"
 msgstr "Omschrijving"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5443,10 +5405,10 @@ msgstr "Geselecteerde webdraaiboeken uitschakelen?"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5529,7 +5491,7 @@ msgid "Discovery by proxy"
 msgstr "Ontdekt door proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Ontdekking controle"
 
@@ -5541,7 +5503,7 @@ msgstr "Ontdekking controles"
 msgid "Discovery list"
 msgstr "Ontdekking lijst"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Ontdekking object"
 
@@ -5573,7 +5535,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5581,12 +5543,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Ontdekking regel"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Ontdekkingsregel \"%1$s\"  bestaat al op \"%2$s\", geerfd van een ander sjabloon."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
@@ -5599,7 +5561,7 @@ msgstr ""
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5641,7 +5603,7 @@ msgstr "Ontdekkingsregel aangepast"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5652,7 +5614,7 @@ msgstr "Ontdekkingsregels"
 msgid "Discovery rules deleted"
 msgstr "Ontdekkingsregels verwijderd"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Ontdekking status"
@@ -5689,10 +5651,11 @@ msgid "Display stacked graph"
 msgstr "Toon gestapelde grafiek"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Weergave %1$s van %2$s gevonden"
@@ -5702,7 +5665,7 @@ msgstr "Weergave %1$s van %2$s gevonden"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5724,7 +5687,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Wens je de voorwaardelijke expressie te vervangen?"
 
@@ -5780,7 +5743,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Uit"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5788,7 +5751,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr ""
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5807,18 +5770,6 @@ msgstr ""
 msgid "Draw style"
 msgstr "Afbeelding stijl"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5831,11 +5782,6 @@ msgstr ""
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5887,7 +5833,7 @@ msgstr "Dynamisch item"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Elke URL moet een unieke naam hebben, Aub wees zeker dat er maar een URL is met deze naam"
 
@@ -5896,11 +5842,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5914,8 +5860,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Bijwerken"
 
@@ -5931,11 +5877,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Trigger bijwerken"
 
@@ -5995,21 +5941,17 @@ msgstr "SSL-sleutelbestand voor webdraaiboek \"%1$s\" is leeg."
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
@@ -6025,25 +5967,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6053,14 +5989,6 @@ msgstr "Lege invoerparameter"
 msgid "Empty map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Lege parameters"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6226,7 +6154,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6237,7 +6165,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6280,7 +6208,7 @@ msgid "English (en_US)"
 msgstr "Engels (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6296,7 +6224,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6315,12 +6243,12 @@ msgstr ""
 msgid "Error"
 msgstr "Fout"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Fout in opzoek verzoek voor tabel \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6347,7 +6275,7 @@ msgstr "gebeurtenis ID"
 msgid "Event acknowledged"
 msgstr "Event erkend"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6355,7 +6283,7 @@ msgid "Event correlation"
 msgstr ""
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr ""
@@ -6390,11 +6318,11 @@ msgstr ""
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Soort evenement"
 
@@ -6439,15 +6367,10 @@ msgstr "Uitsluiten"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "Uitvoer SQL-fout [%1$s] in [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6485,7 +6408,7 @@ msgstr "Uitgevoerd"
 msgid "Executed script"
 msgstr "Uitgevoerd script"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Uitvoer bevestiging"
 
@@ -6501,8 +6424,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr ""
 
@@ -6623,7 +6546,7 @@ msgstr "Expressies"
 msgid "External check"
 msgstr "Externe controle"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6650,8 +6573,8 @@ msgstr "Mislukt"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6662,26 +6585,26 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6689,7 +6612,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Bijwerken van sjabloon mislukt."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6713,7 +6636,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Februarie"
 
@@ -6735,10 +6658,9 @@ msgstr "Veld \"%1$s\" kan niet worden ingesteld op NULL."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6749,13 +6671,6 @@ msgstr "Veld \"%1$s\" is verplicht."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6774,11 +6689,6 @@ msgstr "Veld \"%1$s\" is geen integer."
 msgid "Field \"%1$s\" is not string."
 msgstr "Veld \"%1$s\" is geen string."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6793,10 +6703,6 @@ msgstr "Veld \"host\" is verplicht."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Bestandsformaat wordt niet ondersteund."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6861,7 +6767,8 @@ msgstr "Ingevulde regio"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6886,7 +6793,7 @@ msgstr "Filter"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6938,7 +6845,7 @@ msgstr "Passend in kaart"
 msgid "Fixed"
 msgstr "Statisch"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6989,12 +6896,12 @@ msgstr "Formule"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7007,7 +6914,7 @@ msgstr "French (fr_FR)"
 msgid "Fri"
 msgstr "Vrij"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Vrijdag"
 
@@ -7118,7 +7025,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "Gegeven uitdrukking is geen macro"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr ""
@@ -7132,7 +7039,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Ga naar"
 
@@ -7170,7 +7077,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7178,7 +7085,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Verlooplijn"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7238,7 +7145,7 @@ msgstr[1] ""
 msgid "Graph deleted"
 msgstr "Grafiek verwijderd"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7275,8 +7182,8 @@ msgstr "Grafiek-prototype verwijderd"
 msgid "Graph prototype updated"
 msgstr "Grafiek-prototype bijgewerkt"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7310,8 +7217,8 @@ msgstr "Grafiek type"
 msgid "Graph updated"
 msgstr "Grafiek bijgewerkt"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7342,7 +7249,7 @@ msgstr "Grafiek met de naam \"%1$s\" bestaat al in grafieken of grafiek prototyp
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Grafieken"
 
@@ -7363,12 +7270,12 @@ msgstr "Raster"
 msgid "Group"
 msgstr "Groep"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Groep \"%1$s\" kan niet worden verwijderd omdat het wordt gebruikt door een host-prototype."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr ""
@@ -7542,11 +7449,11 @@ msgstr "Help"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr ""
 
@@ -7573,11 +7480,11 @@ msgstr ""
 msgid "High"
 msgstr "Hoog"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7598,7 +7505,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Geschiedenis"
 
@@ -7606,11 +7513,15 @@ msgstr "Geschiedenis"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Geschiedenis opgeschoond"
 
@@ -7653,7 +7564,7 @@ msgstr "Horizontaal"
 msgid "Horizontal align"
 msgstr "Horizontale uitlijning"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7682,7 +7593,7 @@ msgstr "Horizontale uitlijning"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7696,7 +7607,7 @@ msgstr[1] "Hosts"
 msgid "Host \"%1$s\" already exists."
 msgstr "Host \"%1$s\" bestaat reeds."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7704,7 +7615,7 @@ msgstr "Host \"%1$s\" bestaat reeds."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7756,7 +7667,7 @@ msgid_plural "Hosts enabled"
 msgstr[0] "Host ingeschakeld"
 msgstr[1] "Hosts ingeschakeld"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7770,22 +7681,22 @@ msgstr[1] "Hosts ingeschakeld"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Hostgroep"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Host groep \"%1$s\" bestaat al."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Host groep \"%1$s\" kan niet worden verwijderd, omdat het wordt gebruikt in een globaal script.Host groep \"%1$s\" kan niet worden verwijderd, omdat het wordt gebruikt in een globaal script.Host groep \"%1$s\" kan niet worden verwijderd, omdat het wordt gebruikt in een globaal script.Host groep \"%1$s\" kan niet worden verwijderd, omdat het wordt gebruikt in een globaal script."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7798,10 +7709,10 @@ msgstr "Host groep elementen"
 msgid "Host group label type"
 msgstr "Hostgroep typeplaatje"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7817,8 +7728,8 @@ msgstr ""
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7892,7 +7803,7 @@ msgstr "Host naam"
 msgid "Host networks"
 msgstr "Host netwerken"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7973,7 +7884,7 @@ msgstr "Host update is mislukt."
 msgid "Host updated"
 msgstr "Host bijgewerkt"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr ""
@@ -7993,7 +7904,7 @@ msgstr "Host met de naam \"%1$s\" bestaat al."
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Host met de weergavenaam \"%1$s\" bestaat al."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8006,7 +7917,7 @@ msgstr "Host met de weergavenaam \"%1$s\" bestaat al."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8054,7 +7965,7 @@ msgstr "Hosts bijgewerkt"
 msgid "Hours"
 msgstr "Uren"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8094,7 +8005,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IP adres"
@@ -8119,7 +8030,7 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8176,12 +8087,12 @@ msgstr "icoon markeren"
 msgid "Icon map"
 msgstr "icoon map"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "icoon map \"%1$s\" kan niet worden verwijderd. Wordt gebruikt in de map \"%2$s\".icoon map \"%1$s\" kan niet worden verwijderd. Wordt gebruikt in de map \"%2$s\".icoon map \"%1$s\" kan niet worden verwijderd. Wordt gebruikt in de map \"%2$s\".icoon map \"%1$s\" kan niet worden verwijderd. Wordt gebruikt in de map \"%2$s\"."
@@ -8194,18 +8105,18 @@ msgstr "Icoon map aangemaakt"
 msgid "Icon map deleted"
 msgstr "Icoon map verwijderd"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Icoon map bijgewerkt"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "Icoon toewijzing"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
@@ -8306,23 +8217,20 @@ msgstr "Als u denkt dat dit bericht foutis, neem dan contact op met uw beheerder
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Afbeelding"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "Afbeelding \"%1$s\" bestaat al."
@@ -8331,7 +8239,7 @@ msgstr "Afbeelding \"%1$s\" bestaat al."
 msgid "Image added"
 msgstr "Afbeelding toegevoegd"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Afbeelding verwijderd"
 
@@ -8339,18 +8247,12 @@ msgstr "Afbeelding verwijderd"
 msgid "Image label type"
 msgstr "Afbeelding typeplaatje"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "Afbeelding load error [%1$s] in [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Afbeelding bijgewerkt"
 
@@ -8445,7 +8347,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8456,13 +8358,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr ""
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8506,7 +8408,7 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8674,24 +8576,6 @@ msgstr "Verkeerde actie bediening gebruikersgroep. Gebruikersgroep bestaat niet
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Verkeerde actie bediening gebruiker. Gebruiker bestaat niet of u heeft geen toegang tot deze gebruiker."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8746,8 +8630,6 @@ msgstr "Verkeerde actie bediening gebruiker. Gebruiker bestaat niet of u heeft g
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Onjuiste argumenten doorgegeven aan de functie."
 
@@ -8773,31 +8655,22 @@ msgstr "Ongeldige karakters gebruikers voor sjabloonnaam \"%1$s\"."
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "Onjuiste condities voor actie \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8826,7 +8699,7 @@ msgstr "Onjuist eventobject waarde."
 msgid "Incorrect eventsource value."
 msgstr "Onjuiste gebeurtenis bron waarde."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Onjuist veld \"%1$s\" naam of waarde in waar statement voor tabel \"%2$s\"."
@@ -8851,22 +8724,17 @@ msgstr "Onjuist bestand opgeladen."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8877,7 +8745,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
@@ -8905,8 +8773,6 @@ msgstr "Verkeerde index voor afbeelding."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8968,10 +8834,6 @@ msgstr "Verkeerde onderhouds periode (minimum 5 minuten)"
 msgid "Incorrect map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr ""
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9029,13 +8891,13 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Verkeerde reactie ontvangen van Zabbix server \"%1$s\"."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Verkeerde dienst eindtijd."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Verkeerde dienst starttijd."
 
@@ -9088,12 +8950,7 @@ msgstr "Onjuiste trigger-prototypeexpressie. Trigger-prototypeexpressies kunnen
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
@@ -9139,13 +8996,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9162,60 +9019,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Onjuiste waarde \"%1$s\" voor \"%2$s\" veld: moet zijn tussen de %3$s en %4$s."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "Onjuiste waarde \"%1$s\" voor float veld \"%2$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "Onjuiste waarde \"%1$s\" voor int veld \"%2$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Onjuiste waarde \"%1$s\" voor unsigned int veld \"%2$s\"."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr ""
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9270,14 +9097,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9387,25 +9208,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9416,7 +9219,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9462,16 +9265,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9480,7 +9284,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9568,12 +9372,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Invoegen"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "Voeg expressie in"
 
@@ -9677,7 +9481,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9685,7 +9489,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9696,7 +9500,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Interval"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9719,7 +9523,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9751,7 +9555,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
@@ -9776,27 +9580,29 @@ msgstr ""
 msgid "Invalid method parameters."
 msgstr "Ongeldige werkwijze parameters."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9822,17 +9628,17 @@ msgstr "Ongeldige werkwijze parameters."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9840,8 +9646,8 @@ msgstr "Ongeldige werkwijze parameters."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9855,106 +9661,116 @@ msgstr "Ongeldige werkwijze parameters."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9996,43 +9812,38 @@ msgstr "Ongeldige respons code \"%1$s\"."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10053,7 +9864,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Inventaris"
 
@@ -10094,7 +9905,7 @@ msgstr "Het is niet mogelijk om te zoeken op gebruikerswachtwoord."
 msgid "Italian (it_IT)"
 msgstr "Italian (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10126,7 +9937,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "Item \"%1$s\" kan een ontbrekende host inventaris veld nummer \"%2$d\" niet invullen. Keuzes zijn: van 0 (niet bevolken) tot %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10140,7 +9951,7 @@ msgstr "Item toegevoegd"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] ""
@@ -10154,13 +9965,13 @@ msgstr "Product aantallen"
 msgid "Item deleted"
 msgstr "Item verwijderd"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Item uitgeschakeld"
 msgstr[1] "Items uitgeschakeld"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Item ingeschakeld"
@@ -10170,7 +9981,7 @@ msgstr[1] "Items ingeschakeld"
 msgid "Item in \"not supported\" state"
 msgstr "Item in \"niet ondersteund\" toestand"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "Item niet geselecteerd"
 
@@ -10179,7 +9990,7 @@ msgstr "Item niet geselecteerd"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10217,8 +10028,8 @@ msgid_plural "Item prototypes updated"
 msgstr[0] "Item-prototype bijgewerkt"
 msgstr[1] "Item-prototype bijgewerkt"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10244,7 +10055,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10276,8 +10087,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10328,11 +10139,11 @@ msgstr "Item met de sleutel \"%1$s\" bestaat reeds op \"%2$s\"."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Items"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Items verwijderd"
 
@@ -10350,7 +10161,7 @@ msgstr "Bijgewerkte artikelen"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10375,6 +10186,10 @@ msgstr "JMX interfaces"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10387,7 +10202,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10405,7 +10220,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Januari"
 
@@ -10427,7 +10242,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Jul"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Juli"
 
@@ -10435,7 +10250,7 @@ msgstr "Juli"
 msgid "Jun"
 msgstr "Jun"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Juni"
 
@@ -10591,22 +10406,6 @@ msgid_plural "Last %1$d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10618,11 +10417,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Laatste controle"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Grafiek voor het laatste uur"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Grafiek voor de laatste maand"
 
@@ -10660,11 +10459,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Laatste waarde"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Grafiek van de laatste week"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10673,11 +10472,11 @@ msgstr "Grafiek van de laatste week"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Laatste data"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "Laatste waarden"
 
@@ -10718,7 +10517,7 @@ msgstr ""
 msgid "Left trim"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -10999,7 +10798,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -11021,7 +10820,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11032,12 +10831,12 @@ msgid "Macro"
 msgstr "Macro"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Macro \"%1$s\"bestaat al op \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Macro \"%1$s\" bestaat al."
@@ -11065,7 +10864,7 @@ msgstr "Macros zijn bijgewerkt"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -11073,7 +10872,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11156,7 +10955,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11178,13 +10977,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Kaart"
 
@@ -11253,7 +11052,7 @@ msgstr ""
 msgid "Map update failed."
 msgstr "Bijwerken van kaart is mislukt."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11285,7 +11084,7 @@ msgstr "Kaarten"
 msgid "Mar"
 msgstr "Mrt"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Maart"
 
@@ -11389,7 +11188,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11403,7 +11202,7 @@ msgstr[1] ""
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Mei"
 
@@ -11418,15 +11217,12 @@ msgstr "Mei"
 msgid "Media"
 msgstr "Media"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Media type"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr ""
@@ -11453,11 +11249,6 @@ msgid_plural "Media types enabled"
 msgstr[0] "Mediatype ingeschakeld"
 msgstr[1] "Mediatypen ingeschakeld"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr ""
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11487,7 +11278,7 @@ msgstr ""
 msgid "Media types"
 msgstr "Media types"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11575,7 +11366,7 @@ msgstr ""
 msgid "Method not found."
 msgstr "Methode niet gevonden."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11637,7 +11428,7 @@ msgid "Minimum severity"
 msgstr "Minimale ernst"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11696,7 +11487,7 @@ msgstr "Modus"
 msgid "Model"
 msgstr "Model"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11734,7 +11525,7 @@ msgstr[1] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11760,7 +11551,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Maa"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Maandag"
 
@@ -11800,11 +11591,11 @@ msgstr "Maand"
 msgid "Monthly"
 msgstr "Maandelijks"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "Meer overeenkomsten gevonden..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11828,7 +11619,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11841,7 +11632,7 @@ msgstr ""
 msgid "Multiple PROBLEM events"
 msgstr "Meerdere PROBLEEM events"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Dempen"
 
@@ -11970,11 +11761,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12132,19 +11923,21 @@ msgstr "Nieuwe voorwaarde"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Nieuw element"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr ""
 
@@ -12156,7 +11949,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nieuwe reguliere expressie"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12164,7 +11957,7 @@ msgstr ""
 msgid "New service time"
 msgstr ""
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12173,7 +11966,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12191,7 +11984,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12220,30 +12013,6 @@ msgstr ""
 msgid "No"
 msgstr "Nee"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr ""
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12259,11 +12028,6 @@ msgstr "Geen \"%1$s\" opgegeven voor grafiek."
 msgid "No \"%1$s\" given for map."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12271,7 +12035,7 @@ msgstr ""
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "Geen \"%2$s\" opgegeven voor filterconditie van actie \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -12281,7 +12045,7 @@ msgstr ""
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "Geen \"%2$s\" opgegeven voor het filter van actie \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -12298,11 +12062,6 @@ msgstr ""
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr ""
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12333,7 +12092,7 @@ msgstr ""
 msgid "No details"
 msgstr "Geen details"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr ""
 
@@ -12369,7 +12128,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Geen host IDs opgegeven."
 
@@ -12399,7 +12158,7 @@ msgstr "Geen afbeelding"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Geen interface gevonden"
 
@@ -12433,7 +12192,7 @@ msgstr "Geen macro's gevonden."
 msgid "No maps added."
 msgstr "Geen kaarten toegevoegd."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "Geen overeenkomsten gevonden."
 
@@ -12441,17 +12200,46 @@ msgstr "Geen overeenkomsten gevonden."
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12459,7 +12247,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12487,19 +12275,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12514,16 +12301,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12543,12 +12336,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12569,27 +12360,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12606,14 +12399,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12622,7 +12415,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
@@ -12642,7 +12435,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr "Geen ontvangers voor bericht van actiehandeling."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr ""
 
@@ -12654,7 +12447,7 @@ msgstr "Geen script gespecificeerd voor commando van actiehandeling."
 msgid "No target selected"
 msgstr "Geen doel geselecteerd"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Geen doel geselecteerd."
 
@@ -12671,7 +12464,7 @@ msgstr ""
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr ""
 
@@ -12741,15 +12534,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Niet toegestaan om het wachtwoord van user \"guest\" in te stellen."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12781,7 +12574,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "Niet ondersteund"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Opmerking"
@@ -12812,7 +12605,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "November"
 
@@ -12999,8 +12792,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13060,13 +12853,13 @@ msgstr ""
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "UIT"
 
@@ -13074,30 +12867,31 @@ msgstr "UIT"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr ""
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "AAN"
 
@@ -13113,35 +12907,15 @@ msgstr ""
 msgid "One"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr ""
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr ""
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Eenmalige onderbreking"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Alleen hoofdbeheerders kunnen hostgroepen aanmaken."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Alleen hoofdbeheerders kunnen mediatypen aanmaken."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Alleen hoofdbeheerders kunnen mediatypen verwijderen."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Alleen hoofdgebruikers kunnen mediatypen wijzigen."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13190,10 +12964,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr ""
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13202,15 +12972,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr ""
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Alleen triggers gekoppeld aan ingeschakelde hosts en afhankelijk van ingeschakelde items worden meegeteld."
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13219,7 +12985,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13228,11 +12994,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr ""
 
@@ -13254,7 +13020,7 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13263,33 +13029,33 @@ msgstr ""
 msgid "Operations"
 msgstr ""
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr ""
 
@@ -13398,7 +13164,7 @@ msgstr ""
 msgid "Other parameters"
 msgstr "Andere parameters"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Overige"
@@ -13412,7 +13178,7 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13441,7 +13207,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13630,7 +13396,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13675,7 +13441,7 @@ msgstr ""
 msgid "PSK identity"
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13698,16 +13464,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parameter"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr ""
@@ -13737,7 +13503,7 @@ msgstr "Bovenliggende items"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13754,7 +13520,7 @@ msgstr "Bovenliggende triggers"
 msgid "Parent web scenarios"
 msgstr "Bovenliggende webdraaiboeken"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13766,11 +13532,6 @@ msgstr ""
 msgid "Parse"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr ""
@@ -13831,7 +13592,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr ""
 
@@ -13841,15 +13602,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13895,12 +13656,11 @@ msgstr ""
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Periode"
 
@@ -13989,7 +13749,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Selecteer twee elementen"
 
@@ -14029,7 +13789,7 @@ msgstr ""
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14118,7 +13878,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14249,7 +14009,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr ""
 
@@ -14262,21 +14022,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14290,9 +14046,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Problemen"
 
@@ -14326,7 +14082,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr ""
 
@@ -14347,13 +14103,13 @@ msgstr ""
 msgid "Proxies"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14361,7 +14117,7 @@ msgstr ""
 msgid "Proxy"
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14371,12 +14127,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
@@ -14469,7 +14225,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14546,10 +14302,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr ""
@@ -14631,7 +14383,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14649,13 +14401,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr ""
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14688,7 +14440,7 @@ msgstr ""
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14720,8 +14472,6 @@ msgstr "Remote commando"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14742,7 +14492,9 @@ msgstr "Remote commando"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14755,7 +14507,7 @@ msgstr "Remote commando"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14832,8 +14584,8 @@ msgstr "Remote commando"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr ""
 
@@ -14873,7 +14625,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14915,7 +14667,7 @@ msgid "Replace dependencies"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14970,7 +14722,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -15012,8 +14764,8 @@ msgstr ""
 msgid "Required string"
 msgstr ""
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr ""
 
@@ -15046,7 +14798,7 @@ msgstr ""
 msgid "Reset defaults"
 msgstr ""
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr ""
 
@@ -15112,7 +14864,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr ""
@@ -15299,12 +15051,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Russian (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15315,8 +15067,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15353,7 +15105,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15449,12 +15201,12 @@ msgstr ""
 msgid "SQL query"
 msgstr ""
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr ""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
@@ -15517,7 +15269,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr ""
 
@@ -15529,7 +15281,7 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr ""
 
@@ -15571,7 +15323,7 @@ msgstr ""
 msgid "Scheduled check"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15638,7 +15390,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15651,8 +15403,7 @@ msgstr ""
 msgid "Script"
 msgstr "Script"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
@@ -15684,12 +15435,6 @@ msgstr "Script naam"
 msgid "Script parameters"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr ""
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr ""
@@ -15702,7 +15447,7 @@ msgstr ""
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr ""
 
@@ -15772,8 +15517,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15781,7 +15526,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Selecteer"
 
@@ -15817,19 +15562,19 @@ msgstr ""
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr ""
 
@@ -15854,7 +15599,7 @@ msgstr ""
 msgid "Send to"
 msgstr "Verzend aan"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr ""
 
@@ -15887,7 +15632,7 @@ msgstr ""
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr ""
 
@@ -15918,28 +15663,28 @@ msgstr ""
 msgid "Server time"
 msgstr "Server time"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Service"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15949,7 +15694,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr ""
 
@@ -15982,16 +15727,16 @@ msgstr ""
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -15999,11 +15744,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr ""
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr ""
 
@@ -16012,30 +15757,29 @@ msgstr ""
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Service bijgewerkt"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -16043,7 +15787,7 @@ msgstr ""
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16073,7 +15817,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16102,7 +15846,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16111,7 +15855,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16167,7 +15911,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr ""
 
@@ -16309,7 +16053,7 @@ msgstr ""
 msgid "Show working time"
 msgstr "Toon werktijd"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr ""
 
@@ -16418,7 +16162,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr ""
 
@@ -16464,7 +16208,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Sorteer orde (0->999)"
 
@@ -16538,7 +16282,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16641,15 +16385,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Status"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr ""
@@ -16679,7 +16427,7 @@ msgstr "Status alleen"
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16727,7 +16475,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16792,7 +16540,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr ""
 
@@ -16808,7 +16556,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr ""
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16821,7 +16569,7 @@ msgstr ""
 msgid "Sun"
 msgstr ""
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr ""
 
@@ -16913,12 +16661,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16945,17 +16693,17 @@ msgstr "WAAR"
 msgid "Table \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Etiket"
@@ -17011,7 +16759,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17071,7 +16819,7 @@ msgstr ""
 msgid "Telnet"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17092,7 +16840,7 @@ msgstr "Template"
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17116,7 +16864,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17176,7 +16924,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17348,14 +17096,14 @@ msgstr ""
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17420,7 +17168,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr ""
 
@@ -17428,7 +17176,7 @@ msgstr ""
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr ""
 
@@ -17436,7 +17184,7 @@ msgstr ""
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr ""
 
@@ -17456,7 +17204,7 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr ""
 
@@ -17473,7 +17221,7 @@ msgstr "Tot"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17506,7 +17254,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Tijd periode"
 
@@ -17558,12 +17306,11 @@ msgstr "Tijdsstempel"
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr ""
 
@@ -17678,7 +17425,7 @@ msgstr ""
 msgid "Trends"
 msgstr "Trends"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17686,7 +17433,7 @@ msgstr "Trends"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Trigger"
 
@@ -17787,7 +17534,7 @@ msgstr ""
 msgid "Trigger overview"
 msgstr "Triggers overzicht"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17860,11 +17607,11 @@ msgstr ""
 msgid "Trigger severity"
 msgstr "Trigger severity"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17881,7 +17628,7 @@ msgstr "trigger bijgewerkt"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17916,7 +17663,7 @@ msgstr ""
 msgid "Tue"
 msgstr "Di"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Dinsdag"
 
@@ -17929,7 +17676,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Twee items (\"%1$s\" en \"%2$s\") kunnen niet beiden het host inventory veld \"%3$s\" vullen, dit zal conflicteren."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17945,19 +17692,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18009,7 +17756,7 @@ msgstr "Type informatie"
 msgid "Types"
 msgstr "Types"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18030,7 +17777,7 @@ msgstr "ONBEKEND"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18076,12 +17823,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URLs"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18166,12 +17913,12 @@ msgstr ""
 msgid "Unblock selected users?"
 msgstr "Deblokeer de geselecteerde gebruikers?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18191,21 +17938,23 @@ msgstr "Eenheden"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Onbekend"
@@ -18223,7 +17972,7 @@ msgid "Unknown error"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Onbekend host item, het item bestaat niet voor de geselecteerde host"
@@ -18276,7 +18025,7 @@ msgstr "Ontkoppel van template"
 msgid "Unlink from templates"
 msgstr "Ontkoppel van templates"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Geluid aan"
 
@@ -18307,7 +18056,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -18317,7 +18066,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -18362,7 +18111,7 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18375,7 +18124,7 @@ msgstr ""
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18428,7 +18177,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18446,7 +18195,7 @@ msgstr "Upload"
 msgid "Upper level maps"
 msgstr "Kaarten op hoger liggend niveau"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18481,7 +18230,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "Gebruikt in acties"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18496,7 +18245,7 @@ msgstr "Gebruikt in acties"
 msgid "User"
 msgstr "Gebruiker"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
@@ -18548,7 +18297,7 @@ msgstr "Gebruikers toegevoegd"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
@@ -18568,7 +18317,7 @@ msgid_plural "Users deleted"
 msgstr[0] "Gebruiker verwijderd"
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18578,27 +18327,27 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Gebruikers groep"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Gebruikers groep \"%1$s\" wordt gebruikt in script \"%2$s\"."
@@ -18632,8 +18381,8 @@ msgstr[1] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18677,14 +18426,14 @@ msgstr "Gebruikerswachtwoord"
 msgid "User profile"
 msgstr "Gebruikersprofiel"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18753,7 +18502,7 @@ msgstr "Gebruiker bijgewerkt"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -19069,14 +18818,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19086,7 +18835,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19128,7 +18877,7 @@ msgstr ""
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr ""
@@ -19145,7 +18894,7 @@ msgstr ""
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Waarde afbeelding"
 
@@ -19188,11 +18937,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr ""
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19239,7 +18989,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19326,7 +19076,7 @@ msgstr "Zichbare naam mag niet leeg zijn als de hostnaam leeg is."
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19343,7 +19093,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19352,7 +19102,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19368,7 +19118,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr ""
 
@@ -19380,7 +19130,7 @@ msgstr ""
 msgid "Web monitoring"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr ""
 
@@ -19395,27 +19145,27 @@ msgstr ""
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr ""
 
@@ -19437,7 +19187,7 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr ""
 
@@ -19448,7 +19198,7 @@ msgstr ""
 msgid "Weekly"
 msgstr "Wekelijks"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19464,12 +19214,12 @@ msgstr ""
 msgid "When active"
 msgstr "Wanneer actief"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19664,6 +19414,10 @@ msgstr ""
 msgid "Y-m-d H:i:s"
 msgstr "Y-m-d H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr ""
@@ -19725,7 +19479,7 @@ msgstr "Jaarlijks"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19782,18 +19536,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19805,9 +19553,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
@@ -19923,24 +19668,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr ""
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19949,37 +19698,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr ""
@@ -20000,28 +19749,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr ""
@@ -20069,7 +19819,7 @@ msgstr "alle"
 msgid "all media"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20077,42 +19827,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20122,7 +19867,7 @@ msgid "an empty string is expected"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr ""
 
@@ -20130,11 +19875,15 @@ msgstr ""
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20295,14 +20044,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20332,19 +20075,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20364,14 +20099,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20379,7 +20114,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr ""
@@ -20392,7 +20127,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20426,7 +20161,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20444,7 +20179,8 @@ msgid "configure"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20473,7 +20209,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20535,7 +20271,7 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20557,13 +20293,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20589,7 +20325,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20626,6 +20363,10 @@ msgstr ""
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20672,7 +20413,7 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr ""
@@ -20713,6 +20454,11 @@ msgstr "icoon"
 msgid "image"
 msgstr "afbeelding"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "in"
@@ -20753,15 +20499,19 @@ msgstr ""
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20789,7 +20539,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr ""
 
@@ -20818,27 +20568,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr ""
 
@@ -20866,7 +20616,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr ""
 
@@ -20952,12 +20702,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -21016,7 +20766,7 @@ msgstr ""
 msgid "max"
 msgstr "max"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21056,7 +20806,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr ""
@@ -21083,8 +20833,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21099,27 +20849,14 @@ msgstr ""
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr ""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21147,6 +20884,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21157,7 +20902,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr ""
 
@@ -21292,7 +21037,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21327,24 +21072,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21372,11 +21121,11 @@ msgstr ""
 msgid "regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21388,15 +21137,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21444,7 +21193,7 @@ msgstr ""
 msgid "short description"
 msgstr "korte beschrijving"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21463,15 +21212,15 @@ msgstr "korte beschrijving"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr ""
 
@@ -21487,31 +21236,31 @@ msgstr "Laat icon mappings zien"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21519,11 +21268,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21539,8 +21288,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21551,7 +21300,7 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21560,13 +21309,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "template ID \"%1$s\" is %2$s keer verwerkt"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21575,20 +21328,20 @@ msgstr "template ID \"%1$s\" is %2$s keer verwerkt"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr ""
@@ -21620,39 +21373,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21666,7 +21419,7 @@ msgstr "trigger"
 msgid "trigger does not allow manual closing"
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21678,26 +21431,26 @@ msgstr ""
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21705,11 +21458,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21726,10 +21479,10 @@ msgstr ""
 msgid "unexpected end of macro"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21739,11 +21492,12 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr ""
@@ -21769,8 +21523,8 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21795,6 +21549,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21810,7 +21568,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21830,11 +21588,11 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "waarde"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21852,76 +21610,85 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr ""
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr ""
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21933,18 +21700,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21953,7 +21718,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21966,11 +21731,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21987,7 +21752,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr ""
diff --git a/ui/locale/pl/LC_MESSAGES/frontend.po b/ui/locale/pl/LC_MESSAGES/frontend.po
index 9926d456920..63734384ead 100644
--- a/ui/locale/pl/LC_MESSAGES/frontend.po
+++ b/ui/locale/pl/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2014-06-04 11:22+0300\n"
 "Last-Translator: Paweł <pawel.seledec@zetosoftware.pl>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -95,7 +95,7 @@ msgstr[0] "%1$d dzień"
 msgstr[1] "%1$d dni"
 msgstr[2] "%1$d dni"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -187,7 +187,7 @@ msgstr[2] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -203,7 +203,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -239,7 +239,7 @@ msgstr[2] "zostało %1$s prób"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -247,7 +247,7 @@ msgstr[0] "%1$s sekunda"
 msgstr[1] "%1$s sekundy"
 msgstr[2] "%1$s sekund"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "%1$s pozostałych symboli"
@@ -268,13 +268,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Poziom, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, tylko do odczytu"
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -407,7 +407,7 @@ msgstr "Dostęp API"
 msgid "API methods"
 msgstr "Metody API"
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -471,10 +471,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "Dostęp zabroniony"
@@ -517,7 +513,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Potwierdzone"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Potwierdzenie"
 
@@ -525,7 +521,7 @@ msgstr "Potwierdzenie"
 msgid "Acknowledge problems"
 msgstr "Potwierdź problemy"
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Potwierdzone"
@@ -538,7 +534,7 @@ msgstr "Potwierdzone zdarzenia w stanie PROBLEM"
 msgid "Acknowledged RESOLVED events"
 msgstr "Oznacz zdarzenia ROZWIĄZANE"
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -565,9 +561,9 @@ msgstr "Oznacz zdarzenia ROZWIĄZANE"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -624,7 +620,7 @@ msgstr "Akcja \"%1$s\" już istnieje."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Akcja \"%1$s\" nie ma zdefiniowanych operacji."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -633,7 +629,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Dodano akcję"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr "Akcja klasy %1$s musi rozszerzyć %2$s klasę."
@@ -684,8 +680,8 @@ msgstr "Zaktualizowano akcję"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Akcje"
@@ -752,7 +748,7 @@ msgstr "Aktywne do"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -763,7 +759,7 @@ msgstr "Aktywne do"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -786,9 +782,9 @@ msgstr "Aktywne do"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -858,7 +854,7 @@ msgstr "Aktywne do"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Dodaj"
 
@@ -866,11 +862,11 @@ msgstr "Dodaj"
 msgid "Add (message type limit reached)"
 msgstr "Dodaj (typ wiadomości osiągnął limit)"
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "Dodaj nowy widżet"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "Dodaj element potomny"
 
@@ -878,7 +874,7 @@ msgstr "Dodaj element potomny"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -895,7 +891,7 @@ msgstr "Dodaj host"
 msgid "Add missing"
 msgstr "Dodaj brakujący"
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "Dodaj wiele map"
 
@@ -917,7 +913,7 @@ msgstr "Dodaj nowe sterowanie"
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -969,12 +965,12 @@ msgstr ""
 msgid "Add widget"
 msgstr "Dodaj widżet"
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -984,7 +980,7 @@ msgstr "Dodaj %1$s"
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -997,7 +993,7 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administracja"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -1019,7 +1015,7 @@ msgstr "Wiek mniej niż"
 msgid "Age less than %1$s"
 msgstr "Wiek mniejszy niż %1$s"
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1091,7 +1087,7 @@ msgstr "Dopasuj elementy map"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Wszystkie"
 
@@ -1109,7 +1105,7 @@ msgstr "Wszystkie grupy"
 msgid "All hosts"
 msgstr "Wszystkie hosty"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Wszystkie połączenia powinny mieć określone pola \"Name\" i \"URL\""
 
@@ -1127,7 +1123,7 @@ msgstr "Wszystkie problemy"
 msgid "All problems if tag values match"
 msgstr "Wszystkie problemy, jeśli wartość tag'a się pasuje"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1240,15 +1236,15 @@ msgstr "Błąd aplikacji."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Zastosuj"
 
@@ -1266,7 +1262,7 @@ msgstr "Nadchodzące"
 msgid "Apr"
 msgstr "Kwi"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Kwiecień"
 
@@ -1294,7 +1290,7 @@ msgstr "Typ obszaru"
 msgid "Arithmetic"
 msgstr "Arytmetyka"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1341,7 +1337,7 @@ msgstr "O (godzina:minuta)"
 msgid "At least one UI element must be checked."
 msgstr "Przynajmniej jeden element UI musi być sprawdzony."
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1350,7 +1346,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr "Przynajmniej jedna akcja jest wymagana."
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1362,6 +1358,11 @@ msgstr "Przynajmniej jeden aktywny użytkownik musi posiadać role \"%1$s\"."
 msgid "At least one host group or host must be selected."
 msgstr "Przynajmniej jedna grupa hosta lub host muszą być wybrane."
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1373,7 +1374,7 @@ msgstr "Przynajmniej jeden okres utrzymania musi być utworzony."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr "Przynajmniej jedna baza MySQL, PostgreSQL lub Oracle powinna być wspierana."
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr "Przynajmniej jedna operacja musi być wybrana."
 
@@ -1429,7 +1430,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Sie"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Sierpień"
 
@@ -1442,7 +1443,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr "Prośba o uwierzytelnienie"
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1519,7 +1520,7 @@ msgstr "Automatyczne wylogowanie"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1534,7 +1535,7 @@ msgstr "Automatyczne mapowanie ikon"
 msgid "Automatic icon selection"
 msgstr "Automatyczny wybór ikon"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1586,7 +1587,7 @@ msgstr "Średnia liczba pozostających zapytań zapisu do dysku wirtualnego podc
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr "Osie"
 
@@ -1649,7 +1650,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Zablokowane"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "Niebieski"
 
@@ -1703,11 +1704,11 @@ msgstr "Podane hasła muszą być takie same."
 msgid "Bottom"
 msgstr "Na dole"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "Przenieś na przód"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "Przenieś na zewnątrz"
 
@@ -1733,7 +1734,7 @@ msgstr "CERTYFIKAT"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1778,8 +1779,8 @@ msgstr "CRLF"
 msgid "CSV to JSON"
 msgstr "CSV do JSON"
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1788,7 +1789,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Obliczone"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr "Kalendarz"
 
@@ -1813,7 +1814,7 @@ msgstr "Oddzwanianie"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1826,8 +1827,8 @@ msgstr "Oddzwanianie"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -1857,7 +1858,7 @@ msgstr "Nie można dodać akcji"
 msgid "Cannot add correlation"
 msgstr "Nie można dodać współzależności"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1867,7 +1868,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Nie można utworzyć zależności szablonu od hosta."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1898,8 +1899,8 @@ msgid "Cannot add host prototype"
 msgstr "Nie można dodać prototypu hosta"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Nie można dodać obrazu"
 
@@ -1992,15 +1993,15 @@ msgstr "Nie można dodać użytkownika"
 msgid "Cannot add user group"
 msgstr "Nie można dodać użytkownika grupy"
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Nie można dodać scenariusza sieci www"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr "Nie można dodać widżetu: za mało miejsca na panelu."
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2020,33 +2021,29 @@ msgstr "Nie można dołączyć do serwera LDAP."
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Nie można wyczyścić historii"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr "Nie można wyczyścić historii: przynajmniej jeden wybrany składnik nie należy do monitorowanego hosta"
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Nie można powielić prototypów wykresów."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "Nie można powielić prototypów hostów."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Nie można powielić prototypów pozycji."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Nie można powielić prototypów wyzwalaczy."
 
@@ -2074,7 +2071,7 @@ msgstr[0] "Nie można skopiować wykresu"
 msgstr[1] "Nie można skopiować wykresów"
 msgstr[2] ""
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "Nie można skopiować elementu"
@@ -2128,8 +2125,8 @@ msgstr "Nie można utworzyć mapy ikon"
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2159,7 +2156,7 @@ msgstr "Nie można usunąć wewnętrznego użytkownika Zabbix \"%1$s\", proszę
 msgid "Cannot delete action"
 msgstr "Nie można usunąć akcji"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2230,7 +2227,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2242,11 +2239,11 @@ msgstr[2] ""
 msgid "Cannot delete host prototypes"
 msgstr "Nie można usunąć prototypów hosta"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Nie można usunąć mapy ikon"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Nie można usunąć obrazu"
 
@@ -2271,7 +2268,7 @@ msgstr "Nie można usunąć prototypu pozycji"
 msgid "Cannot delete item prototypes"
 msgstr "Nie można usunąć prototypów pozycji"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Nie można usunąć pozycji"
 
@@ -2305,7 +2302,7 @@ msgstr[0] "Nie można usunąć proxy"
 msgstr[1] "Nie można usunąć proxy"
 msgstr[2] "Nie można usunąć proxy"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr "Nie można usunąć roli użytkownika, jest ona tylko do odczytu \"%1$s\"."
@@ -2331,7 +2328,7 @@ msgstr[0] "Nie można usunąć skryptu"
 msgstr[1] "Nie można usunąć skryptu"
 msgstr[2] "Nie można usunąć skryptu"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Nie można usunąć skryptu. Skrypt \"%1$s\" jest wykoprzystywany w akcji \"%2$s\"."
@@ -2348,8 +2345,8 @@ msgstr[0] "Nie można usunąć usługi"
 msgstr[1] "Nie można usunąć usługi"
 msgstr[2] "Nie można usunąć usługi"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2378,7 +2375,7 @@ msgstr "Nie można usunąć prototypu elementu szablonowego."
 msgid "Cannot delete templated item."
 msgstr "Nie można usunąć pozycji pochodzącej z szablonu."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Nie można usunąć pozycji pochodzących z szablonu."
 
@@ -2434,7 +2431,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Nie można usunąć scenariusza sieci www"
 
@@ -2474,7 +2471,7 @@ msgstr[0] "Nie można wyłączyć hosta"
 msgstr[1] "Nie można wyłączyć hostów"
 msgstr[2] "Nie można wyłączyć hostów"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Nie można wyłączyć pozycji"
@@ -2510,7 +2507,7 @@ msgstr[0] "Nie można wyłączyć wyzwalacza"
 msgstr[1] "Nie można wyłączyć wyzwalaczy"
 msgstr[2] "Nie można wyłączyć wyzwalaczy"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Nie można wyłączyć scenariusza sieci www"
@@ -2563,7 +2560,7 @@ msgstr[0] "Nie można włączyć hosta"
 msgstr[1] "Nie można włączyć hostów"
 msgstr[2] "Nie można włączyć hostów"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Nie można włączyć pozycji"
@@ -2599,7 +2596,7 @@ msgstr[0] "Nie można włączyć wyzwalacza"
 msgstr[1] "Nie można włączyć wyzwalaczy"
 msgstr[2] "Nie można włączyć wyzwalaczy"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Nie można włączyć scenariusza sieci www"
@@ -2614,7 +2611,7 @@ msgstr "Nie można ocenić wyrażenia"
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr "Nie można rozwinąć makra."
 
@@ -2648,8 +2645,8 @@ msgstr "Nie można znaleźć hosta \"%1$s\" użytego na mapie \"%2$s\"."
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Nie można znaleźć grupy hostów \"%1$s\" dla prototypu hosta \"%2$s\" dla reguły wykrywania \"%3$s\" w \"%4$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2747,24 +2744,20 @@ msgstr "Nie można znaleźć mapy wartości \"%1$s\" użytej dla pozycji \"%2$s\
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Nie można znaleźć mapy wartości \"%1$s\" użytej dla prototypu pozycji \"%2$s\" dla reguły wykrywania \"%3$s\" w \"%4$s\"."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "Widoczna nazwa szablonu nie może być pusta."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2778,7 +2771,7 @@ msgstr[0] "Nie można zaimportować szablonu \"%1$s\", nie istnieje podłączony
 msgstr[1] "Nie można zaimportować szablonu \"%1$s\", nie istnieją podłączone szablony \"%2$s\"."
 msgstr[2] "Nie można zaimportować szablonu \"%1$s\", nie istnieją podłączone szablony \"%2$s\"."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "Nie można dodać wyrażenia wyzwalacza"
 
@@ -2792,7 +2785,7 @@ msgid "Cannot link template."
 msgstr "Nie można połączyć szablonu."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2825,17 +2818,17 @@ msgstr "Nie można masowo zmienić widocznej nazwy szablonu."
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr "Nie można przekazać zduplikowanych identyfikatorów szablonów dla powiązania: %1$s."
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Nie można wykonać zapytania DELETE na tabeli \"%1$s\" bez warunku WHERE."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Nie można wykonać zapytania UPDATE na tabeli \"%1$s\" bez podania wartości."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Nie można wykonać zapytania UPDATE na tabeli \"%1$s\" bez warunku WHERE."
@@ -2862,7 +2855,7 @@ msgstr "Nie można odczytać YAML: %1$s."
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Nie można odczytać odpowiedzi, sprawdź połączenie z serwerem Zabbix'a \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Nie można zmienić nazwy użytkownikowi - gościowi."
 
@@ -2881,7 +2874,7 @@ msgstr "Nie można zapisać widżetu \"%1$s\"."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Nie można wydać polecenia, sprawdź połączenie z serwerem Zabbix'a \"%1$s\"."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr "Nie można wysłać zapytania/żądania"
 
@@ -2921,12 +2914,12 @@ msgstr "Nie można ustawić pól inwentarza dla wyłączonego inwentarza."
 msgid "Cannot set session cookie."
 msgstr "Nie można skonfigurować pliku cookie sesji"
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr "Urządzenie nie wspiera komunikatu głosowego"
 
@@ -2946,7 +2939,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Nie można odłączyć i wyczyścić Scenariuszy sieci www."
 
@@ -2959,7 +2952,7 @@ msgstr "Nie można odłączyć szablonu"
 msgid "Cannot unlink template."
 msgstr "Nie można odłączyć szablonu."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr "Nie można odlinkować wyzwalacza \"%1$s\",  posiada on elementy z szablonu, który pozostaje podlinkowany do hosta"
@@ -3012,11 +3005,6 @@ msgstr "Nie można zaktualizować \"%2$s\" dla wykrytej pozycji \"%1$s\"."
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "Nie można zaktualizować \"%2$s\" dla wykrytego wyzwalacza \"%1$s\"."
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "Nie można zaktualizować \"imagetype\" dla obrazu \"%1$s\"."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -3026,9 +3014,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "Nie można zaktualizować wykrytego wykresu."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "Nie można zaktualizować grupy wykrytych hostów."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3088,9 +3077,7 @@ msgstr "Nie można zaktualizować prototypu wykresu"
 msgid "Cannot update group"
 msgstr "Nie można zaktualizować grupy"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Nie można zaktualizować grup dla wykrytego hosta \"%1$s\"."
@@ -3114,13 +3101,13 @@ msgstr[2] "Nie można zaktualizować prototypów hostów"
 msgid "Cannot update hosts"
 msgstr "Nie można zaktualizować hostów"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "Nie można zaktualizować mapy ikon"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Nie można zaktualizować obrazu"
 
@@ -3175,12 +3162,12 @@ msgstr "Nie można zaktualizować mapy sieci"
 msgid "Cannot update proxy"
 msgstr "Nie można zaktualizować proxy"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Nie można zaktualizować proxy na wykrytym hoście \"%1$s\"."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr "Nie można zaktualizować roli użytkownika jest ona tylko do odczytu \"%1$s\"."
@@ -3200,17 +3187,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Nie można zaktualizować skryptu"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3287,7 +3274,7 @@ msgstr[2] ""
 msgid "Cannot update user role"
 msgstr "Nie można zaktualizować roli użytkownika"
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Nie można zaktualizować scenariusza sieci www"
 
@@ -3387,8 +3374,8 @@ msgid "Character string not included"
 msgstr "Nie zawiera podanego ciągu znaków"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3503,7 +3490,7 @@ msgstr "Sprawdza wydajność usługi UDP. Zwraca 0 - usługa nie działa; liczba
 msgid "Checks should be unique."
 msgstr "Testy powinny być unikalne."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3524,7 +3511,7 @@ msgstr "Cykliczne odwołanie w szablonach: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "Cykliczne połączenia szablonów są zabronione."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr "Klasa %1$s nie znaleziono dla akcji %2$s."
@@ -3545,11 +3532,11 @@ msgstr "Wyczyść historię i trendy"
 msgid "Clear when unlinking"
 msgstr "Wyczyść podczas odłączania"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr "Kliknij i przeciągnij do pożądanego rozmiaru."
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr "Kliknij i przeciągnij do pożądanego rozmiaru"
 
@@ -3564,7 +3551,7 @@ msgstr "Zegar"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3579,7 +3566,7 @@ msgstr "Zegar"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Powiel"
 
@@ -3590,8 +3577,8 @@ msgstr "Powiel"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Zamknij"
 
@@ -3602,13 +3589,13 @@ msgstr "Zamknij"
 msgid "Close expression constructor"
 msgstr "Zamknij generator wyrażeń"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Zamknij nowe zdarzenie"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Zamknij stare zdarzenia"
 
@@ -3621,8 +3608,8 @@ msgid "Close problems"
 msgstr "Zakończ problemy"
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "Zwiń"
 
@@ -3639,7 +3626,7 @@ msgstr "Zwiń pasek boczny"
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3705,7 +3692,7 @@ msgstr "Kompresja"
 msgid "Concurrent sessions"
 msgstr "Sesje bieżące"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3716,17 +3703,12 @@ msgstr "Warunek"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "Warunek \"%2$s\" nie został użyty w formule \"%3$s\" dla akcji \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "Warunek\"%2$s\" nie został użyty w formule \"%3$s\" dla współzależności \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "Warunek \"%2$s\" nie został użyty w formule \"%3$s\" dla reguły wyszukiwania \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr "Warunnek \"%2$s\" nie jest użyty w formule \"%3$s\" dla nadpisania \"%1$s\"."
@@ -3736,17 +3718,12 @@ msgstr "Warunnek \"%2$s\" nie jest użyty w formule \"%3$s\" dla nadpisania \"%1
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "Warunek \"%2$s\" użyty w formule \"%3$s\" dla akcji \"%1$s\" nie został zdefiniowany."
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "Warunek\"%2$s\" użyty we wzorcu \"%3$s\" dla współzależności \"%1$s\" nie jest zdefiniowany."
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "Warunek \"%2$s\" użyty w formule \"%3$s\" dla reguły wyszukiwania \"%1$s\" nie jest zdefiniowany."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr "Warunek \"%2$s\" użyty w formule \"%3$s\" dla nadpisania \"%1$s\" nie jest zdefiniowany."
@@ -3762,7 +3739,7 @@ msgstr "Warunki"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Konfiguracja"
 
@@ -3825,7 +3802,7 @@ msgstr "Konfiguracja hostów"
 msgid "Configuration of housekeeping"
 msgstr "Konfiguracja porządkowania"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Konfiguracja mapowania ikon"
@@ -3932,7 +3909,7 @@ msgstr "Tekst potwierdzenia"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "Gratulacje! Poprawnie zainstalowano interfejs użytkownika Zabbix."
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -4036,7 +4013,7 @@ msgstr "Kontakt"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4096,7 +4073,7 @@ msgstr "Zawiera"
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr "Kontrola zawartości"
 
@@ -4135,8 +4112,8 @@ msgstr "Współrzędne"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Skopiuj"
 
@@ -4145,12 +4122,11 @@ msgstr "Skopiuj"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "Współzależność"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "Współzależność \"%1$s\" już istnieje."
@@ -4180,16 +4156,6 @@ msgstr[0] "Współzależność włączona"
 msgstr[1] "Współzależności włączone"
 msgstr[2] "Współzależności włączonych"
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "We współzależności brakuje parametrów: %1$s"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "Nazwa współzależności nie może być pusta."
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr "Reguła współzależności"
@@ -4198,14 +4164,10 @@ msgstr "Reguła współzależności"
 msgid "Correlation updated"
 msgstr "Współzależność zaktualizowana"
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Nie można zapisać obrazu!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Ilość"
 
@@ -4269,11 +4231,11 @@ msgstr "Utwórz współzależność"
 msgid "Create dashboard"
 msgstr "Tworzenie pulpitu operatora"
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr "Tworzenie niezależnej reguły wykrywania"
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr "Utwórz regułę wyszukiwania zależnego"
 
@@ -4390,7 +4352,7 @@ msgstr "Utwórz mapę"
 msgid "Create media type"
 msgstr "Utwórz typ mediów"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "Utwórz nowy"
 
@@ -4414,7 +4376,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Utwórz szablon"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Utwórz wyzwalacz"
 
@@ -4577,7 +4539,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "Nazwa DNS"
@@ -4589,11 +4551,11 @@ msgstr "Nazwa DNS"
 msgid "Daily"
 msgstr "Dziennie"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "Ciemny"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4614,8 +4576,8 @@ msgstr "Pulpit \"%1$s\" już istnieje."
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr "Utworzono pulpit"
 
@@ -4639,9 +4601,9 @@ msgstr "Właściwości pulpitu"
 msgid "Dashboard sharing"
 msgstr "Udostępnianie pulpitu"
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr "Pulpit zaktualizowany"
 
@@ -4665,7 +4627,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr "Pulpity"
 
@@ -4693,7 +4655,7 @@ msgstr "Przegląd danych"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr "Dane zapisane"
 
@@ -4835,7 +4797,7 @@ msgstr "Dzień tygodnia"
 msgid "Days"
 msgstr "Dni"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Debugowanie"
 
@@ -4849,26 +4811,26 @@ msgstr "Tryb debugowania"
 msgid "Dec"
 msgstr "Gru"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Grudzień"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Domyślnie"
 
@@ -4961,7 +4923,7 @@ msgstr "Opóźniony o"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4985,8 +4947,8 @@ msgstr "Opóźniony o"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Usuń"
 
@@ -5011,11 +4973,11 @@ msgstr "Usunąć i wyczyścić szablon? (Uwaga: wszystkie powiązane hosty zosta
 msgid "Delete current action?"
 msgstr "Usunąć aktualną akcję?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "Usunąć bieżącą współzależność?"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr "Usunąć pulpit?"
 
@@ -5059,7 +5021,7 @@ msgstr "Usunąć prototyp pozycji?"
 msgid "Delete item?"
 msgstr "Usunąć pozycję?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Usunąć powiązania między wybranymi elementami?"
 
@@ -5115,7 +5077,7 @@ msgstr "Usunąć wybrane pulpity?"
 msgid "Delete selected discovery rules?"
 msgstr "Usunąć wybrane reguły wykrywania?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Usunąć wybrane elementy?"
 
@@ -5220,7 +5182,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "Usunąć zaznaczone kształty?"
 
@@ -5264,7 +5226,7 @@ msgstr "Usunąć wyzwalacz?"
 msgid "Delete web scenario?"
 msgstr "Usunąć scenariusz sieci www?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5309,7 +5271,7 @@ msgstr "Lista zabroniona"
 msgid "Dependencies"
 msgstr "Zależności"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Zależny"
 
@@ -5317,7 +5279,7 @@ msgstr "Zależny"
 msgid "Dependent item"
 msgstr "Element zależny"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5327,7 +5289,7 @@ msgstr "Zależy od"
 msgid "Deployment status"
 msgstr "Stan instalacji"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5360,7 +5322,7 @@ msgid "Description"
 msgstr "Opis"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5526,10 +5488,10 @@ msgstr "Wyłączyć wybrane scenariusze sieci www?"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5612,7 +5574,7 @@ msgid "Discovery by proxy"
 msgstr "Wykrywanie przez proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Test wykrywania"
 
@@ -5624,7 +5586,7 @@ msgstr "Testy wykrywania"
 msgid "Discovery list"
 msgstr "Lista reguł wykrywania"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Obiekt wykrywania"
 
@@ -5656,7 +5618,7 @@ msgstr "Wykrywanie systemów plików maszyn wirtualnych VMWare, <url> - URL usł
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr "Wykrywanie wirtualnych maszyn VMWare, <url> - URL usługi VMware. Zwraca JSON"
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5664,12 +5626,12 @@ msgstr "Wykrywanie wirtualnych maszyn VMWare, <url> - URL usługi VMware. Zwraca
 msgid "Discovery rule"
 msgstr "Reguła wykrywania"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Reguła wykrywania \"%1$s\" już istnieje w \"%2$s\", odziedziczona z innego szablonu."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "Reguła wykrywania \"%1$s\" już istnieje w \"%2$s\"."
@@ -5682,7 +5644,7 @@ msgstr "Reguła wykrywania \"%1$s\" już istnieje w \"%2$s\"."
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "Reguła wykrywania \"%1$s\" już istnieje."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr "Reguła wykrywania \"%1$s\" nie może być skopiowana bez elementu nadrzędnego."
@@ -5726,7 +5688,7 @@ msgstr "Zaktualizowano regułę wykrywania"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5737,7 +5699,7 @@ msgstr "Reguły wykrywania"
 msgid "Discovery rules deleted"
 msgstr "Usunięto reguły wykrywania"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Stan wykrywania"
@@ -5774,10 +5736,11 @@ msgid "Display stacked graph"
 msgstr "Wyświetl wykres skumulowany"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Wyświetlanie %1$s z %2$s znalezionych"
@@ -5787,7 +5750,7 @@ msgstr "Wyświetlanie %1$s z %2$s znalezionych"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "Wyświetlone od %1$s do %2$s z %3$s znalezionych"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr "Wyświetlanie opcji"
 
@@ -5809,7 +5772,7 @@ msgstr "Nie przechowuj historii"
 msgid "Do not keep trends"
 msgstr "Nie przechowuj trendów"
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Zastąpić wyrażenie warunkowe?"
 
@@ -5865,7 +5828,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Nie działa"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr "Pobierz obraz"
 
@@ -5873,7 +5836,7 @@ msgstr "Pobierz obraz"
 msgid "Download the configuration file"
 msgstr "Pobranie pliku konfiguracyjnego"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5892,18 +5855,6 @@ msgstr "Rysuj"
 msgid "Draw style"
 msgstr "Styl rysowania"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "Powtórzenie \"%1$s\" wartości \"%2$s\" dla współzależności \"%3$s\"."
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr "Powtórzenie \"%1$s\" wartości \"%2$s\" dla współzależności."
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5916,11 +5867,6 @@ msgstr "Powtórzona wartość \"name\" (nazwa) \"%1$s\" dla mapy."
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5972,7 +5918,7 @@ msgstr "Pozycja dynamiczna"
 msgid "Dynamic items"
 msgstr "Dynamiczne elementy"
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Każdy adres URL powinien mieć unikalną nazwę. Należy się upewnić, że istnieje tylko jeden adres o tej nazwie"
 
@@ -5981,11 +5927,11 @@ msgid "Each item"
 msgstr "Każdy element"
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5999,8 +5945,8 @@ msgstr "Każdy element"
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Edycja"
 
@@ -6016,11 +5962,11 @@ msgstr "Edycja mapy"
 msgid "Edit operation"
 msgstr "Edycja operacji"
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr "Edycja elementu drzewa"
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Edycja wyzwalacza"
 
@@ -6080,21 +6026,17 @@ msgstr "Plik klucza SSL dla scenariusza sieci www \"%1$s\" jest pusty."
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "Puste ID współzależności."
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "ID formuły warunku filtra dla akcji \"%1$s\" jest puste."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "ID formuły warunku filtra dla reguły wykrywania \"%1$s\" jest puste."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "Makro warunku filtra dla reguły wykrywania \"%1$s\" jest puste."
@@ -6110,25 +6052,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr "Typ warunku filtra dla akcji \"%1$s\" jest pusty."
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6138,14 +6074,6 @@ msgstr "Pusty parametr wejściowy."
 msgid "Empty map ID."
 msgstr "Puste ID mapy."
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "Puste ID typu mediów."
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Puste parametry"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6311,7 +6239,7 @@ msgstr "Włącz wyłapywanie"
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6322,7 +6250,7 @@ msgstr "Włącz wyłapywanie"
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6365,7 +6293,7 @@ msgid "English (en_US)"
 msgstr "Angielski (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6381,7 +6309,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6400,12 +6328,12 @@ msgstr "Równe"
 msgid "Error"
 msgstr "Błąd"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Błąd w zapytaniu wyszukiwania dla tabeli \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr "Komunikat błędu"
 
@@ -6432,7 +6360,7 @@ msgstr "ID zdarzenia"
 msgid "Event acknowledged"
 msgstr "Zdarzenie potwierdzone"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6440,7 +6368,7 @@ msgid "Event correlation"
 msgstr "Współzależność zdarzeń"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "Zasady współzależności zdarzeń"
@@ -6475,11 +6403,11 @@ msgstr "Monitorowanie logu zdarzeń. Zwraca log"
 msgid "Event name"
 msgstr "Nazwa zdarzenia"
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "Para znaczników zdarzeń"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Typ zdarzenia"
 
@@ -6525,15 +6453,10 @@ msgstr "Wykluczyć"
 msgid "Exclude host groups"
 msgstr "Wyklucz grupy hostów"
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "Błąd wykonania SQL [%1$s] w [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr "Wykonuje zapytanie WMI i zwraca dokumnet w JSON z wybranych objektów"
@@ -6571,7 +6494,7 @@ msgstr "Wykonano"
 msgid "Executed script"
 msgstr "Wykonywany skrypt"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Potwierdzenie wykonania"
 
@@ -6587,8 +6510,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "Rozwiń"
 
@@ -6709,7 +6632,7 @@ msgstr "Wyrażenia"
 msgid "External check"
 msgstr "Test zewnętrzny"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "P"
@@ -6736,8 +6659,8 @@ msgstr "Niepowodzenie"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6748,26 +6671,26 @@ msgstr "Stworzenie widoku nieudane"
 msgid "Failed to parse URL."
 msgstr "Nie udało się przetworzyć URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr "Nie udało się zaktualizować widoku"
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6775,7 +6698,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Nie udało się zaktualizować szablonu."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6799,7 +6722,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Lut"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Luty"
 
@@ -6821,10 +6744,9 @@ msgstr "Pole \"%1$s\" nie może być ustawione na NULL."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6835,13 +6757,6 @@ msgstr "Pole \"%1$s\" jest wymagane."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "Brak wartości w polu \"%1$s\" dla mapy \"%2$s\"."
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "Brak wartości w polu \"%1$s\" dla typu mediów \"%2$s\"."
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6860,11 +6775,6 @@ msgstr "Pole \"%1$s\" nie zawiera liczby całkowitej."
 msgid "Field \"%1$s\" is not string."
 msgstr "Pole \"%1$s\" nie zawiera ciągu znaków."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "Pole \"%1$s\" jest wymagane dla typu mediów \"%2$s\"."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6879,10 +6789,6 @@ msgstr "Pole \"host\" jest wymagane."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Nieobsługiwany format pliku."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr "Plik jest pusty"
@@ -6947,7 +6853,8 @@ msgstr "Obszar wypełniony"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6972,7 +6879,7 @@ msgstr "Filtr"
 msgid "Filter properties"
 msgstr "Właściwości filtra"
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -7024,7 +6931,7 @@ msgstr "Dopasuj do mapy"
 msgid "Fixed"
 msgstr "Stały"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -7075,12 +6982,12 @@ msgstr "Formuła"
 msgid "Formula missing for action \"%1$s\"."
 msgstr "Brakująca formuła dla akcji \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr "Brakująca formuła dla reguły wykrywania \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr "Brakująca formuła dla przełączania \"%1$s\"."
@@ -7093,7 +7000,7 @@ msgstr "Francuski (fr_FR)"
 msgid "Fri"
 msgstr "Pt"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Piątek"
 
@@ -7204,7 +7111,7 @@ msgstr "Pobiera wartość z hosta"
 msgid "Given expression is not a macro"
 msgstr "Podane wyrażenie nie jest makrem"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr "Globalne wyrażenia regularne \"%1$s\" nie istnieją."
@@ -7218,7 +7125,7 @@ msgstr "Wartość globalna"
 msgid "Go back to %1$s"
 msgstr "Wróć do %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Przejdź do"
 
@@ -7256,7 +7163,7 @@ msgstr "Przejdź do strony %1$s, aktualna strona"
 msgid "Go to previous page, %1$s"
 msgstr "Przejdź do poprzedniej strony, %1$s"
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7264,7 +7171,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Linia gradientu"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7325,7 +7232,7 @@ msgstr[2] "Wykresów skopiowanych"
 msgid "Graph deleted"
 msgstr "Usunięto wykres"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7362,8 +7269,8 @@ msgstr "Usunięto prototyp wykresu"
 msgid "Graph prototype updated"
 msgstr "Zaktualizowano prototyp wykresu"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr "Prototypowy wykres o ID \"%1$s\" jest niedostępny."
@@ -7397,8 +7304,8 @@ msgstr "Typ wykresu"
 msgid "Graph updated"
 msgstr "Zaktualizowano wykres"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr "Wykres o ID \"%1$s\" jest niedostępny."
@@ -7429,7 +7336,7 @@ msgstr "Istnieje już wykres lub prototyp wykresu o nazwie \"%1$s\"."
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Wykresy"
 
@@ -7450,12 +7357,12 @@ msgstr "Siatka"
 msgid "Group"
 msgstr "Grupa"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Nie można usunąć grupy \"%1$s\", jest używana przez prototyp hosta."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr "Grupa\"%1$s\" nie może zostać usunięta, ponieważ jest użyta w warunku współzależności."
@@ -7630,11 +7537,11 @@ msgstr "Pomoc"
 msgid "Hexadecimal to decimal"
 msgstr "Liczba szesnastkowa do dziesiętnej"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Ukryte"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "Ukryj śledzenie"
 
@@ -7661,11 +7568,11 @@ msgstr "Hierarchia"
 msgid "High"
 msgstr "Wysoki"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr "Ciemny mocny kontrast"
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr "Jasny mocny kontrast"
 
@@ -7686,7 +7593,7 @@ msgstr "Podkreśl cały wiersz"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Historia"
 
@@ -7694,11 +7601,15 @@ msgstr "Historia"
 msgid "History and trends compression"
 msgstr "Kompresja historii i zmian"
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr "Czyszczenie historii nie jest wspierane jeśli kompresja jest włączona"
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Wyczyszczono historię"
 
@@ -7741,7 +7652,7 @@ msgstr "Poziome"
 msgid "Horizontal align"
 msgstr "Ułożenie poziome"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7770,7 +7681,7 @@ msgstr "Ułożenie poziome"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7785,7 +7696,7 @@ msgstr[2] "Hosty"
 msgid "Host \"%1$s\" already exists."
 msgstr "Host \"%1$s\" już istnieje."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7793,7 +7704,7 @@ msgstr "Host \"%1$s\" już istnieje."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "Host \"%1$s\" nie może istnieć bez grupy hostów."
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7847,7 +7758,7 @@ msgstr[0] "Włączono host"
 msgstr[1] "Włączono hosty"
 msgstr[2] "Włączono hosty"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7861,22 +7772,22 @@ msgstr[2] "Włączono hosty"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Grupa hostów"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Grupa hostów \"%1$s\" już istnieje."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Nie można usunąć grupy hostów \"%1$s\", jest użyta w skrypcie globalnym."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7889,10 +7800,10 @@ msgstr "Elementy grupy hostów"
 msgid "Host group label type"
 msgstr "Typ etykiety grupy hostów"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Grupa hosta o ID \"%1$s\" jest niedostępna."
@@ -7908,8 +7819,8 @@ msgstr "Grupa hosta o ID \"%1$s\" jest niedostępna."
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7983,7 +7894,7 @@ msgstr "Nazwa hosta"
 msgid "Host networks"
 msgstr "Sieci hosta"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -8064,7 +7975,7 @@ msgstr "Aktualizacja hosta się nie powiodła."
 msgid "Host updated"
 msgstr "Zaktualizowano hosta"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr "Host o ID \"%1$s\" jest niedostęny"
@@ -8084,7 +7995,7 @@ msgstr "Host o takiej samej nazwie \"%1$s\" już istnieje."
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Host o takiej samej widocznej nazwie \"%1$s\" już istnieje."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8097,7 +8008,7 @@ msgstr "Host o takiej samej widocznej nazwie \"%1$s\" już istnieje."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8145,7 +8056,7 @@ msgstr "Zaktualizowano hosty"
 msgid "Hours"
 msgstr "Godziny"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8185,7 +8096,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "Adres IP"
@@ -8210,7 +8121,7 @@ msgstr "Zakres IP \"%1$s\" osiągnął limit adresowy \"%2$s\""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8267,12 +8178,12 @@ msgstr "Podświetlenie ikony"
 msgid "Icon map"
 msgstr "Mapa ikon"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr "Mapa ikon \"%1$s\" już istnieje."
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Mapa ikon \"%1$s\" nie może być usunięta. Jest użyta w mapie \"%2$s\"."
@@ -8285,18 +8196,18 @@ msgstr "Utworzono mapę ikon"
 msgid "Icon map deleted"
 msgstr "Usunięto mapę ikon"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Zaktualizowano mapę ikon"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "Mapowanie ikon"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "Ikona o ID \"%1$s\" jest niedostępna."
@@ -8399,23 +8310,20 @@ msgstr "W przypadku, gdy ten komunikat jest błędny należy skontaktować się
 msgid "Iframe sandboxing exceptions"
 msgstr "Wyjątki piaskownicy iframe"
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Obraz"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "Obraz \"%1$s\" już istnieje."
@@ -8424,7 +8332,7 @@ msgstr "Obraz \"%1$s\" już istnieje."
 msgid "Image added"
 msgstr "Dodano obraz"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Usunięto obraz"
 
@@ -8432,18 +8340,12 @@ msgstr "Usunięto obraz"
 msgid "Image label type"
 msgstr "Typ etykiety obrazu"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "Błąd ładowania obrazu [%1$s] w [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr "Rozmiar obrazu musi być mniejszy niż %1$s."
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Zaktualizowano obraz"
 
@@ -8538,7 +8440,7 @@ msgstr "Nieosiągalny prototyp elementu"
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8549,13 +8451,13 @@ msgstr "Nieosiągalne utrzymanie"
 msgid "Inaccessible map"
 msgstr "Nieosiągalna mapa"
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr "Nieosiągalny szablon"
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr "Nieosiągalny wyzwalacz"
 
@@ -8599,7 +8501,7 @@ msgstr "Dołącz podgrupy"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Statystyka ruchu przychodzącego interfejsu sieciowego. Zwraca liczbę całkowitą"
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8767,24 +8669,6 @@ msgstr "Błędna grupa użytkowników dla operacji akcji. Grupa użytkowników n
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Błędny użytkownik dla operacji akcji. Użytkownik nie istnieje lub brak praw dostępu do niego."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8839,8 +8723,6 @@ msgstr "Błędny użytkownik dla operacji akcji. Użytkownik nie istnieje lub br
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Błędne argumenty przekazane do funkcji."
 
@@ -8866,31 +8748,22 @@ msgstr "Błędne znaki wykorzystane dla nazwy szablonu \"%1$s\"."
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "Błędne warunki dla akcji \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "Błędne warunki dla reguły wykrywania \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "Nieprawidłowe ID współzależności."
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "Błędne wyrażenie użytkownika \"%2$s\" dla akcji \"%1$s\": %3$s."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "Nieprawidłowe własne wyrażenie \"%2$s\" dla współzależności \"%1$s\": %3$s."
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "Błędne wyrażenie użytkownika \"%2$s\" dla reguły wykrywania \"%1$s\": %3$s."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr "Błędne wyrażenie użytkownika \"%2$s\" dla przełączenia \"%1$s\": %3$s."
@@ -8919,7 +8792,7 @@ msgstr "Błędna wartość eventobject."
 msgid "Incorrect eventsource value."
 msgstr "Błędna wartość eventsource."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Błędna nazwa lub wartośc pola \"%1$s\" w warunku WHERE dla tabeli \"%2$s\"."
@@ -8944,22 +8817,17 @@ msgstr "Błędne ładowanie pliku."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "Błędne ID formuły warunku filtra dla akcji \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Błędne ID formuły warunku filtra dla reguły wykrywania \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "Podano błędne ID formuły warunku filtra dla współzależności \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "Błędne makro warunku filtra dla reguły wykrywania \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr "Błędny filtr warunku makro do przełączenia \"%1$s\"."
@@ -8970,7 +8838,7 @@ msgstr "Błędny filtr warunku makro do przełączenia \"%1$s\"."
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "Błędny operator warunku filtra dla akcji \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "Błędny operator warunku filtra dla reguły wykrywania \"%1$s\"."
@@ -8998,8 +8866,6 @@ msgstr "Błędny indeks obrazu."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -9061,10 +8927,6 @@ msgstr "Błędny okres utrzymania (minimalnie 5 minut)"
 msgid "Incorrect map ID."
 msgstr "Błędne ID mapy."
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "Błędne ID typu mediów."
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9122,13 +8984,13 @@ msgstr "Błędne wyrażenie regularne \"%1$s\": \"%2$s\""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Otrzymano błędną odpowiedź z serwera Zabbix \"%1$s\"."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Błędny czas końca usługi."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Błędny czas startu usługi."
 
@@ -9181,12 +9043,7 @@ msgstr "Błędne wyrażenie prototypu wyzwalacza. Elementy wyrażenia prototypu
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "Błędny typ obliczenia dla akcji \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "Nieprawidłowy typ wyliczenia dla współzależności \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "Błędny typ obliczenia dla reguły wykrywania \"%1$s\"."
@@ -9232,13 +9089,13 @@ msgstr "Błędna nazwa użytkownika lub hasło albo konto jest tymczasowo zablok
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9255,60 +9112,30 @@ msgstr "Błędna wartość \"%1$s\" dla pola \"%2$s\": musi być pomiędzy %3$s
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Błędna wartość \"%1$s\" dla pola \"%2$s\": musi być pomiędzy %3$s a %4$s."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "Błędna wartość \"%1$s\" dla pola zmiennoprzecinkowego \"%2$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "Błędna wartość \"%1$s\" dla pola całkowitego \"%2$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Błędna wartość \"%1$s\" dla pola całkowitego bez znaku \"%2$s\"."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "Nieprawidłowa wartość \"%1$s\" w polu \"%2$s\" dla współzależności \"%3$s\"."
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "Błędna wartość \"%1$s\" w polu \"%2$s\" dla typu mediów \"%3$s\"."
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9363,14 +9190,8 @@ msgstr "Błędna wartość dla pola \"%1$s\"."
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9480,25 +9301,7 @@ msgstr "Błędna wartość dla pola \"%1$s\"."
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9509,7 +9312,7 @@ msgstr "Błędna wartość dla pola \"%1$s\"."
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9555,16 +9358,17 @@ msgstr "Błędna wartość dla pola \"%1$s\"."
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9573,7 +9377,7 @@ msgstr "Błędna wartość dla pola \"%1$s\"."
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "Błędna wartość dla pola \"%1$s\": %2$s."
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9661,12 +9465,12 @@ msgstr "Znaczniki dziedziczone i wyzwalacz"
 msgid "Inherited items"
 msgstr "Dziedziczone elementy"
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Wprowadź"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "Wprowadź wyrażenie"
 
@@ -9770,7 +9574,7 @@ msgstr "Problem wewnętrzny"
 msgid "Internal problem recovery"
 msgstr "Odzyskiwanie wewnętrznego problemu"
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9778,7 +9582,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9789,7 +9593,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Interwał"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9812,7 +9616,7 @@ msgstr "Nieprawidłowa treść pliku YAML"
 msgid "Invalid action condition: %1$s."
 msgstr "Nieprawidłowy warunek akcji: %1$s."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9844,7 +9648,7 @@ msgstr "Nieprawidłowy adres email dla rodzaju medium o ID \"%1$s\"."
 msgid "Invalid interval \"%1$s\"."
 msgstr "Nieprawidłowy okres \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Nieprawidłowy klucz \"%1$s\" dla reguły wykrywania \"%2$s\" w \"%3$s\": %4$s."
@@ -9869,27 +9673,29 @@ msgstr "Nieprawidłowy klucz \"%1$s\": %2$s."
 msgid "Invalid method parameters."
 msgstr "Nieprawidłowe parametry metody."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9915,17 +9721,17 @@ msgstr "Nieprawidłowe parametry metody."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9933,8 +9739,8 @@ msgstr "Nieprawidłowe parametry metody."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9948,106 +9754,116 @@ msgstr "Nieprawidłowe parametry metody."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -10089,43 +9905,38 @@ msgstr "Nieprawidłowy kod odpowiedzi \"%1$s\"."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10146,7 +9957,7 @@ msgstr "Nieprawidłowy okres czasu."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Inwentarz"
 
@@ -10187,7 +9998,7 @@ msgstr "Nie można wyszukiwać według hasła użytkownika."
 msgid "Italian (it_IT)"
 msgstr "Włoski (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10219,7 +10030,7 @@ msgstr "Pozycja \"%1$s\" nie może być skopiowana bez jej elementu głównego."
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "Pozycja \"%1$s\" nie może wypełnić brakującego pola inwentarzowego hosta \"%2$d\". Wybór jest pomiędzy 0 (nie wypełniaj pola) do %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10233,7 +10044,7 @@ msgstr "Dodano pozycję"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr "Pozycja zawiera makra użytkownika z sekretnymi wartościami. Wartości takich makr powinny być wpisywane ręcznie."
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "Element skopiowany"
@@ -10248,14 +10059,14 @@ msgstr "Liczba pozycji"
 msgid "Item deleted"
 msgstr "Usunięto pozycję"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Wyłączono pozycję"
 msgstr[1] "Wyłączono pozycje"
 msgstr[2] "Wyłączono pozycje"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Włączono pozycję"
@@ -10266,7 +10077,7 @@ msgstr[2] "Włączono pozycje"
 msgid "Item in \"not supported\" state"
 msgstr "Pozycja w stanie \"niewspierany\"."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "Nie wybrano pozycji"
 
@@ -10275,7 +10086,7 @@ msgstr "Nie wybrano pozycji"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr "Pozycja przed przetwarzaniem nie ma parametru: %1$s"
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10313,8 +10124,8 @@ msgstr[0] "Zaktualizowano prototyp pozycji"
 msgstr[1] "Zaktualizowano prototypy pozycji"
 msgstr[2] "Zaktualizowano prototypów pozycji"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr "Prototyp pozycji o ID \"%1$s\" jest niedostępny."
@@ -10340,7 +10151,7 @@ msgstr "Prototypy pozycji zaktualizowane"
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr "Typ pozycji nie używa interfejsów"
 
@@ -10372,8 +10183,8 @@ msgstr "Pozycja nie będzie odświeżona. Określony przedział aktualizacji wym
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr "Pozycja nie będzie odświeżona. Przedział aktualizacji powinien być pomiędzy ls a ld. także Zaplanowane/Elastyczne przedziały mogą być używane."
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr "Pozycja o ID \"%1$s\" jest niedostępna."
@@ -10424,11 +10235,11 @@ msgstr "Pozycja z kluczem \"%1$s\" już istnieje w \"%2$s\"."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Pozycje"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Usunięto pozycje"
 
@@ -10446,7 +10257,7 @@ msgstr "Zaktualizowano pozycje"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10471,6 +10282,10 @@ msgstr "Interfejsy JMX"
 msgid "JSON"
 msgstr "JSON"
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10483,7 +10298,7 @@ msgstr "Dane JSON"
 msgid "JSON is expected"
 msgstr "JSON jest oczekiwany"
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr "Ciąg znaków JSON jest oczekiwany"
 
@@ -10501,7 +10316,7 @@ msgstr "Ścieżka JSON"
 msgid "Jan"
 msgstr "Sty"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Styczeń"
 
@@ -10523,7 +10338,7 @@ msgstr "JavaScript"
 msgid "Jul"
 msgstr "Lip"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Lipiec"
 
@@ -10531,7 +10346,7 @@ msgstr "Lipiec"
 msgid "Jun"
 msgstr "Cze"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Czerwiec"
 
@@ -10693,22 +10508,6 @@ msgstr[0] "Ostatni %1$d rok"
 msgstr[1] "Ostatnie %1$d lat"
 msgstr[2] "Ostatnich %1$d lat"
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10720,11 +10519,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Ostatnie sprawdzenie"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Wykres z ostatniej godziny"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Wykres z ostatniego miesiąca"
 
@@ -10762,11 +10561,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Ostatnia wartość"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Wykres z ostatniego tygodnia"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10775,11 +10574,11 @@ msgstr "Wykres z ostatniego tygodnia"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Ostatnie dane"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "Ostatnie wartości"
 
@@ -10820,7 +10619,7 @@ msgstr "Y z lewej"
 msgid "Left trim"
 msgstr "Przycięcie z lewej"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr "Legenda"
 
@@ -11101,7 +10900,7 @@ msgstr "Niskopoziomowa reguła wykrywania w stanie \"niewspierany\""
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "P"
@@ -11123,7 +10922,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "Suma kontrolna MD5. Zwraca ciąg znaków (hash MD5 pliku)"
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11134,12 +10933,12 @@ msgid "Macro"
 msgstr "Makro"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Makro \"%1$s\" już istnieje w \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Makro \"%1$s\" już istnieje."
@@ -11167,7 +10966,7 @@ msgstr "Zaktualizowano makra"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr "Główny filtr"
 
@@ -11175,7 +10974,7 @@ msgstr "Główny filtr"
 msgid "Main navigation"
 msgstr "Główna nawigacja"
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11258,7 +11057,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11280,13 +11079,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr "Ręcznie zamknięte"
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Mapa"
 
@@ -11355,7 +11154,7 @@ msgstr "Kształt mapy"
 msgid "Map update failed."
 msgstr "Aktualizacja mapy nieudana."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr "Mapa o ID \"%1$s\" jest niedostępna."
@@ -11387,7 +11186,7 @@ msgstr "Mapy"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Marzec"
 
@@ -11491,7 +11290,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11506,7 +11305,7 @@ msgstr[2] "Maksymalny okres do wyświetlenia to %1$s dni."
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "Maksymalna całkowita długość adresu email osiągnięta dla typu mediów o ID \"%1$s\"."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Maj"
 
@@ -11521,15 +11320,12 @@ msgstr "Maj"
 msgid "Media"
 msgstr "Media"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Typ mediów"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr "Typ mediów \"%1$s\" już istnieje."
@@ -11559,11 +11355,6 @@ msgstr[0] "Włączono typ mediów"
 msgstr[1] "Włączono typy mediów"
 msgstr[2] "Włączono typy mediów"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr "Brakuje parametrów typu mediów: %1$s"
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11593,7 +11384,7 @@ msgstr "Typ mediów o ID \"%1$s\" jest niedostępny."
 msgid "Media types"
 msgstr "Typy mediów"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr "Typy mediów używane przez akcje \"%1$s\"."
@@ -11681,7 +11472,7 @@ msgstr "Komunikaty"
 msgid "Method not found."
 msgstr "Nie znaleziono metody."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr "Microsoft Edge"
 
@@ -11743,7 +11534,7 @@ msgid "Minimum severity"
 msgstr "Minimalny poziom"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11803,7 +11594,7 @@ msgstr "Tryb"
 msgid "Model"
 msgstr "Model"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr "Moduł"
@@ -11845,7 +11636,7 @@ msgstr[2] "Wyłączonych modułów: %1$s."
 msgid "Module updated: %1$s."
 msgstr "Zaktualizowany moduł: %1$s."
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11871,7 +11662,7 @@ msgstr "Zaktualizowane moduły"
 msgid "Mon"
 msgstr "Pn"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Poniedziałek"
 
@@ -11911,11 +11702,11 @@ msgstr "Miesiąc"
 msgid "Monthly"
 msgstr "Miesięcznie"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "Znaleziono więcej dopasowań..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11939,7 +11730,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11952,7 +11743,7 @@ msgstr "Wiele"
 msgid "Multiple PROBLEM events"
 msgstr "Wielokrotne zdarzenia typu PROBLEM"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Wycisz"
 
@@ -12081,11 +11872,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12243,19 +12034,21 @@ msgstr "Nowy warunek"
 msgid "New dashboard"
 msgstr "Nowy panel"
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Nowy element"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr "Nowa grupa hostów zdarzenia"
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr "Nowa nazwa znacznika zdarzenia"
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr "Nowa wartość znacznika zdarzenia"
 
@@ -12267,7 +12060,7 @@ msgstr "Nowa operacja"
 msgid "New regular expression"
 msgstr "Nowe wyrażenie regularne"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12275,7 +12068,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Nowy czas obsługi"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr "Nowa nazwa znacznika"
 
@@ -12284,7 +12077,7 @@ msgid "New triggers"
 msgstr "Nowe wyzwalacze"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr "Następna strona"
 
@@ -12302,7 +12095,7 @@ msgstr "Następny krok"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12331,30 +12124,6 @@ msgstr "Następny krok"
 msgid "No"
 msgstr "Nie"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "Nie podano \"%1$s\" dla współzależności \"%2$s\"."
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "Nie podano \"%1$s\" dla współzależności."
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12370,11 +12139,6 @@ msgstr "Nie podano \"%1$s\" dla wykresu."
 msgid "No \"%1$s\" given for map."
 msgstr "Nie podano \"%1$s\" dla mapy."
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "Nie podano \"%1$s\" dla typu mediów."
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12382,7 +12146,7 @@ msgstr "Nie podano \"%1$s\" dla typu mediów."
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "Nie podano \"%2$s\" dla warunku filtra akcji \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "Nie podano \"%2$s\" dla warunku filtra reguły wykrywania \"%1$s\"."
@@ -12392,7 +12156,7 @@ msgstr "Nie podano \"%2$s\" dla warunku filtra reguły wykrywania \"%1$s\"."
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "Nie podano \"%2$s\" dla filtra akcji \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "Nie podano \"%2$s\" dla filtra reguły wykrywania \"%1$s\"."
@@ -12409,11 +12173,6 @@ msgstr "Nie określono nazwy użytkownika do uwierzytelniania."
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "Nie podano typu warunku dla współzależności \"%1$s\"."
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12444,7 +12203,7 @@ msgstr "Brak domyślnego interfejsu dla typu \"%1$s\" w \"%2$s\"."
 msgid "No details"
 msgstr "Bez szczegółów"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "Nie podano żadnego identifykatora reguł wykrywania."
 
@@ -12480,7 +12239,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "Nie dodano wykresów."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Nie podano identyfikatorów hosta."
 
@@ -12510,7 +12269,7 @@ msgstr "Brak obrazka"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Nie znaleziono interfejsu"
 
@@ -12544,7 +12303,7 @@ msgstr "Nie znaleziono makr."
 msgid "No maps added."
 msgstr "Nie dodano map."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "Nie znaleziono"
 
@@ -12552,17 +12311,46 @@ msgstr "Nie znaleziono"
 msgid "No new modules discovered"
 msgstr "Brak wykrytych nowych modułów"
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr "Nie podano typu operacji dla współzależności \"%1$s\"."
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Brak uprawnień dla dostępu do systemu."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"."
@@ -12570,7 +12358,7 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"."
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12598,19 +12386,18 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"."
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12625,16 +12412,22 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"."
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12654,12 +12447,10 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"."
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12680,27 +12471,29 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"."
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12717,14 +12510,14 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"."
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12733,7 +12526,7 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"."
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Brak uprawnień do tego obiektu lub obiekt nie istnieje!"
 
@@ -12753,7 +12546,7 @@ msgstr "Nie określono pliku klucza publicznego."
 msgid "No recipients for action operation message."
 msgstr "Brak odbiorców dla komunikatu operacji akcji."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr "Nie odświeżono"
 
@@ -12765,7 +12558,7 @@ msgstr "Nie określono skryptu dla komendy operacji akcji."
 msgid "No target selected"
 msgstr "Nie wybrano żadnego celu"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Nie wybrano żadnego celu."
 
@@ -12782,7 +12575,7 @@ msgstr "Nie zdefiniowano żadnych wyzwalaczy."
 msgid "No value"
 msgstr "Brak wartości"
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr "Flagi nieboolowskie są przestarzałe."
 
@@ -12852,15 +12645,15 @@ msgstr "Nie wszystkie wyniki są wyświetlanie. Proszę dostarczyć ściślej ok
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr "Nie wszystkie szablony są podłączone\"%1$s\"."
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr "Nie zezwolono ustawienia języka dla użytkownika \"guest\"."
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Nie można ustawić hasła dla użytkownika \"guest\"."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr "Nie zezwolno ustawienia motywu dla użytkownika \"guest\"."
 
@@ -12892,7 +12685,7 @@ msgstr "Elementy niedziedziczone"
 msgid "Not supported"
 msgstr "Niewspierane"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Notatka"
@@ -12923,7 +12716,7 @@ msgstr "Powiadom wszystkich zaangażowanych"
 msgid "Nov"
 msgstr "Lis"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "Listopad"
 
@@ -13110,8 +12903,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13171,13 +12964,13 @@ msgstr "Paź"
 msgid "Octal to decimal"
 msgstr "System ósekmowy do dziesiętnego"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Październik"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Wyłączone"
 
@@ -13185,30 +12978,31 @@ msgstr "Wyłączone"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr "Stare zdarzenia znacznika nazwy"
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr "Stara wartość znacznika zdarzenia"
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr "Stary znacznik nazwy"
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "Włączone"
 
@@ -13224,35 +13018,15 @@ msgstr "Raz"
 msgid "One"
 msgstr "Jeden"
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "Jeden z obiektów nadal nie ma grupy hostów."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Jednorazowo"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Jednorazowa przerwa w pracy"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Tylko Super Administratorzy mogą tworzyć grupy hostów."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Tylko Super Administratorzy mogą tworzyć typy mediów."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Tylko Super Administratorzy mogą usuwać typy mediów."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Tylko Super Administratorzy mogą zmieniać typy mediów."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Tylko kontrole agenta Zabbix, SNMPv1, SNMPv2 i SNMPv3 mogą być unikalne."
@@ -13302,10 +13076,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "Tylko super administratorzy mogą tworzyć współzależności."
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr "Tylko super administratorzy mogą ustawić właściciela panelu."
@@ -13314,15 +13084,11 @@ msgstr "Tylko super administratorzy mogą ustawić właściciela panelu."
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr "Tylko super administratorzy mogą aktualizować współzależności."
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Liczone są tylko wyzwalacze przypisane do włączonych hostów w zależności od włączonych pozycji"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13331,7 +13097,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Informacje o systemie operacyjnym. Zwraca ciąg znaków"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13340,11 +13106,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr "Operacja \"%1$s\" już istnieje."
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Operacja nie może być wykonana z powodu nieupoważnionego żądania."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Szczegóły operacji"
 
@@ -13366,7 +13132,7 @@ msgstr "Operacja nie ma szablonu, na którym może działać."
 msgid "Operational data"
 msgstr "Dane operacyjne"
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13375,33 +13141,33 @@ msgstr "Dane operacyjne"
 msgid "Operations"
 msgstr "Operacje"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operator"
 
@@ -13510,7 +13276,7 @@ msgstr "Inne parametry konfiguracji"
 msgid "Other parameters"
 msgstr "Inne parametry"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Inni"
@@ -13524,7 +13290,7 @@ msgstr "Statystyka ruchu wychodzącego interfejsu sieciowego. Zwraca liczbę ca�
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13553,7 +13319,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13742,7 +13508,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13787,7 +13553,7 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "Tożsamość PSK"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13810,16 +13576,16 @@ msgstr "Pager"
 msgid "Parameter"
 msgstr "Parametr"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "Parametr \"%1$s\" jest przestarzały."
@@ -13849,7 +13615,7 @@ msgstr "Nadrzędne pozycje"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13866,7 +13632,7 @@ msgstr "Nadrzędne wyzwalacze"
 msgid "Parent web scenarios"
 msgstr "Nadrzędne scenariusze sieci www"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13878,11 +13644,6 @@ msgstr ""
 msgid "Parse"
 msgstr "Składnia"
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "Błąd składni SQL [%1$s] w [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Błąd przetwarzania"
@@ -13943,7 +13704,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr "Wklej"
 
@@ -13953,15 +13714,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr "Wklej widżet"
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr "Wklej bez zewnętrznych łączy"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr "Wzór"
@@ -14007,12 +13768,11 @@ msgstr "Wykonuje zapytanie DNS. Zwraca ciąg znaków z wymaganym typem informacj
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Okres"
 
@@ -14101,7 +13861,7 @@ msgstr "Proszę włącznyć \"allow_url_fopen\" wytyczną."
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Proszę wprowadzić nazwę hosta lub adres IP hosta oraz numer portu serwera Zabbix, oraz (opcjonalnie) nazwę instalacji."
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Proszę wybrać dwa elementy"
 
@@ -14141,7 +13901,7 @@ msgstr "Powielaj pola inwentarza hosta"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14230,7 +13990,7 @@ msgid "Previous month"
 msgstr "Poprzedni miesiąc"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr "Poprzednia strona"
 
@@ -14361,7 +14121,7 @@ msgstr "Problem nie jest wstrzymany"
 msgid "Problem is suppressed"
 msgstr "Prblem jest wstrzymany"
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Problem z"
 
@@ -14374,21 +14134,17 @@ msgstr "Naprawianie problemu"
 msgid "Problem resolved"
 msgstr "Problem rozwiązany"
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr "Problem zaktualizowany"
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14402,9 +14158,9 @@ msgstr "Problem zaktualizowany"
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Problemy"
 
@@ -14438,7 +14194,7 @@ msgid "Prometheus to JSON"
 msgstr "Prometeusz do JSON"
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "Właściwości"
 
@@ -14459,13 +14215,13 @@ msgstr "Podany URL \"%1$s\" jest nieprawidłowy."
 msgid "Proxies"
 msgstr "Serwery proxy"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14473,7 +14229,7 @@ msgstr "Serwery proxy"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr "Proxy \"%1$s\" już istnieje."
@@ -14483,12 +14239,12 @@ msgstr "Proxy \"%1$s\" już istnieje."
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Nie istnieje proxy \"%1$s\" dla hosta \"%2$s\"."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr "Proxy \"%1$s\" jest używane przez akcje \"%2$s\"."
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Proxy \"%1$s\" jest używane przez regułę wyszukiwania \"%2$s\"."
@@ -14582,7 +14338,7 @@ msgstr "Przegląd kolejki przez proxy"
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14659,10 +14415,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr "Odczytuję dane modbus. Zwraca różne typy"
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Otrzymana wartość"
@@ -14744,7 +14496,7 @@ msgstr "Prostokąt"
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr "Przedział odświeżania"
 
@@ -14762,13 +14514,13 @@ msgstr ""
 msgid "Regular"
 msgstr "Regularny"
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Wyrażenie regularne"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr "Wyrażenie regularne \"%1$s\" już istnieje."
@@ -14802,7 +14554,7 @@ msgstr "Wyrażenia regularne"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr "Wyzwól aby stworzyć widżet."
 
@@ -14834,8 +14586,6 @@ msgstr "Zdalne polecenie"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14856,7 +14606,9 @@ msgstr "Zdalne polecenie"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14869,7 +14621,7 @@ msgstr "Zdalne polecenie"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14946,8 +14698,8 @@ msgstr "Zdalne polecenie"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Usuń"
 
@@ -14987,7 +14739,7 @@ msgstr "Usuń, %1$s"
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -15029,7 +14781,7 @@ msgid "Replace dependencies"
 msgstr "Zamień zależności"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -15084,7 +14836,7 @@ msgstr "Żądanie treści"
 msgid "Request body type"
 msgstr "Żądanie typu treści"
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr "Żądanie wysłane z powodzenie"
 
@@ -15126,8 +14878,8 @@ msgstr "Wymagane kody stanu"
 msgid "Required string"
 msgstr "Wymagany ciąg znaków"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Przywróć"
 
@@ -15160,7 +14912,7 @@ msgstr "Potwierdzenie przywracania"
 msgid "Reset defaults"
 msgstr "Przywróć domyślne"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Rozwiązane"
 
@@ -15226,7 +14978,7 @@ msgstr "Typ odpowiedzi: łańcuch znaków"
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Wynik"
@@ -15413,12 +15165,12 @@ msgstr "Uruchamia określone polecenie na hoście. Zwraca tekstowy rezultat pole
 msgid "Russian (ru_RU)"
 msgstr "Rosyjski (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "N"
@@ -15429,8 +15181,8 @@ msgstr "Ustawienia SAML"
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15467,7 +15219,7 @@ msgstr "Port SMTP serwera"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15563,12 +15315,12 @@ msgstr "Licznik SQL: %1$s (select: %2$s | execute: %3$s)"
 msgid "SQL query"
 msgstr "Zapytanie SQL"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "Wykonanie zapytania SQL nie udało się \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Wykonanie zapytania SQL nie udało się \"%1$s\"."
@@ -15631,7 +15383,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15643,7 +15395,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Sob"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -15685,7 +15437,7 @@ msgstr "Harmonogram"
 msgid "Scheduled check"
 msgstr "Zaplanowane sprawdzenia"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15755,7 +15507,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr "Zakres"
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15768,8 +15520,7 @@ msgstr "Zakres"
 msgid "Script"
 msgstr "Skrypt"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Skrypt \"%1$s\" już istnieje."
@@ -15802,12 +15553,6 @@ msgstr "Nazwa skryptu"
 msgid "Script parameters"
 msgstr "Parametry skryptu"
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "W parametrach skryptu \"%1$s\" brakuje ostatniego znaku końca linii dla typu mediów \"%2$s\"."
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Profiler skryptu"
@@ -15820,7 +15565,7 @@ msgstr "Zaktualizowano skrypt"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Skrypty"
 
@@ -15890,8 +15635,8 @@ msgid "Security name"
 msgstr "Nazwa ochrony"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15899,7 +15644,7 @@ msgstr "Nazwa ochrony"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Wybierz"
 
@@ -15935,19 +15680,19 @@ msgstr "Wybrane elementy"
 msgid "Selected items only"
 msgstr "Tylko wybrane elementy"
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "Wybrane, %1$s w pozycji %2$d z %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "Wybrane, %1$s, tylko do odczytu, w pozycji %2$d z %3$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr "Wyślij wstecz"
 
@@ -15972,7 +15717,7 @@ msgstr "Wyślij wyłącznie do"
 msgid "Send to"
 msgstr "Wyślij do"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr "Wyślij do tyłu"
 
@@ -16005,7 +15750,7 @@ msgstr "Rozdzielone"
 msgid "Separately"
 msgstr "Oddzielnie"
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "Wrzesień"
 
@@ -16036,28 +15781,28 @@ msgstr "Serwer (proxy)"
 msgid "Server time"
 msgstr "Czas serwera"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Usługa"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -16067,7 +15812,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "Utworzono usługę"
 
@@ -16101,16 +15846,16 @@ msgstr "Port usługi"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "Czas początkowy usługi musi być mniejszy od czasu końcowego."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -16118,11 +15863,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Czasy usługi"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Typ usługi"
 
@@ -16131,30 +15876,29 @@ msgstr "Typ usługi"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Zaktualizowano usługę"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Usługi"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "Usługi tworzą cykliczną zależność."
 
@@ -16162,7 +15906,7 @@ msgstr "Usługi tworzą cykliczną zależność."
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr "Błąd inicjalizacji sesji."
 
@@ -16192,7 +15936,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Ustaw tryb inwentarza hosta"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr "Ustaw nową wartość"
 
@@ -16221,7 +15965,7 @@ msgstr "Nieudane ustawianie protokołu LDAP."
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr "Nieudane skierowanie LDAP do \"Off\"."
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr "Ustawienia"
 
@@ -16230,7 +15974,7 @@ msgstr "Ustawienia"
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16286,7 +16030,7 @@ msgstr "Kształt"
 msgid "Shared"
 msgstr "Udostępniony"
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "Współdzielenie"
 
@@ -16428,7 +16172,7 @@ msgstr "Pokaż ostrzeżenie jeżeli serwer Zabbixa nie działa"
 msgid "Show working time"
 msgstr "Wyświetl czas pracy"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Wyświetlane"
 
@@ -16537,7 +16281,7 @@ msgstr "Pominięto kopiowanie wykresu \"%1$s\" na hosta \"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "Słowacki (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Drzemka"
 
@@ -16583,7 +16327,7 @@ msgstr "Część historii tego elementu może być skompresowana, usunięcie jes
 msgid "Sort entries by"
 msgstr "Sortuj pozycje wg"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Porządek sortowania (0->999)"
 
@@ -16657,7 +16401,7 @@ msgstr "Uruchom w"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16760,15 +16504,19 @@ msgstr "Statystyki i dostępności zapisu pamięci Zabbix. Pamięć - jedna z wa
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Stan"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Kody stanów"
@@ -16798,7 +16546,7 @@ msgstr "Tylko stan"
 msgid "Status problem"
 msgstr "Status problemu"
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16846,7 +16594,7 @@ msgstr "Zatrzymaj przetwarzanie"
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16911,7 +16659,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Temat"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Podrzędna mapa"
 
@@ -16927,7 +16675,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Audyt udany"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr "Wiadomość z powodzeniem"
 
@@ -16940,7 +16688,7 @@ msgstr "Suma statystyk ruchu przychodzącego i wychodzącego interfejsu sieciowe
 msgid "Sun"
 msgstr "Nie"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Niedziela"
 
@@ -17032,12 +16780,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Czas działania systemu w sekundach. Zwraca liczbę całkowitą"
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "C"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "W"
@@ -17064,17 +16812,17 @@ msgstr "PRAWDA"
 msgid "Table \"%1$s\" does not exist."
 msgstr "Tabela \"%1$s\" nie istnieje."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "Tabela \"%1$s\" nie posiada pola o nazwie \"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Etykieta"
@@ -17130,7 +16878,7 @@ msgstr "Wartość znacznika"
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17190,7 +16938,7 @@ msgstr "Typ celu"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17211,7 +16959,7 @@ msgstr "Szablon"
 msgid "Template \"%1$s\" already exists."
 msgstr "Szablon \"%1$s\" już istnieje."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17235,7 +16983,7 @@ msgstr "Szablon i właściwości hosta, które są dziedziczone przez powiązani
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Szablon nie może być połączony z innym szablonem więcej niż raz nawet poprzez inne szablony."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr "Szablon panelu"
 
@@ -17295,7 +17043,7 @@ msgstr "Szablon o takiej samej widocznej nazwie \"%s\" już istnieje."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17467,7 +17215,7 @@ msgstr "Nie można wykryć hosta i zostanie on wykasowany za %1$s (%2$s o %3$s).
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "Host nie jest już wykrywany i zostanie usunięty przy następnym przetwarzaniu reguły wykrywania."
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
@@ -17475,7 +17223,7 @@ msgstr[0] "Obraz został użyty w mapie ikon %1$s."
 msgstr[1] "Obraz został użyty w mapach ikon %1$s."
 msgstr[2] "Obraz został użyty w mapach ikon %1$s."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17541,7 +17289,7 @@ msgstr "To pole jest automatycznie uzupełniane przez element \"%1$s\"."
 msgid "This is the test message from Zabbix"
 msgstr "To jest testowa wiadomość z Zabbix."
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Bieżący miesiąc"
 
@@ -17549,7 +17297,7 @@ msgstr "Bieżący miesiąc"
 msgid "This month so far"
 msgstr "Ten miesiąc jak dotąd"
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Ten tydzień"
 
@@ -17557,7 +17305,7 @@ msgstr "Ten tydzień"
 msgid "This week so far"
 msgstr "Ten tydzień jak dotąd"
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Ten rok"
 
@@ -17577,7 +17325,7 @@ msgstr "Sterowanie"
 msgid "Thu"
 msgstr "Cz"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Czwartek"
 
@@ -17594,7 +17342,7 @@ msgstr "Do"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17627,7 +17375,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr "Czas ostatniego dostępu do proxy. Nazwa - nazwa proxy. Ważnymi paramtery są: ostatni dostęp - znacznik czasu Unix, opóźnienie - sekundy."
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Okres"
 
@@ -17679,12 +17427,11 @@ msgstr "Odcisk czasowy"
 msgid "To"
 msgstr "Do"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "Aby ustawić interfejs hosta wybierz odpowiedni typ pozycji dla każdej pozycji"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Dziś"
 
@@ -17799,7 +17546,7 @@ msgstr "Okres przechowywania trendu"
 msgid "Trends"
 msgstr "Trendy"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17807,7 +17554,7 @@ msgstr "Trendy"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Wyzwalacz"
 
@@ -17911,7 +17658,7 @@ msgstr "Nazwa wyzwalacza"
 msgid "Trigger overview"
 msgstr "Przegląd wyzwalaczy"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17985,11 +17732,11 @@ msgstr "Zaktualizowano prototypy wyzwalaczy"
 msgid "Trigger severity"
 msgstr "Poziom wyzwalacza"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "Stan wyzwalacza \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "Stan wyzwalacza \"Problem\""
 
@@ -18006,7 +17753,7 @@ msgstr "Zaktualizowano wyzwalacz"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -18041,7 +17788,7 @@ msgstr "Przytnij"
 msgid "Tue"
 msgstr "Wt"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Wtorek"
 
@@ -18054,7 +17801,7 @@ msgstr "Turecki (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Dwie pozycje (\"%1$s\" oraz \"%2$s\") nie mogą dotyczyć jednego pola inwentarzowego \"%3$s\", ponieważ doprowadzi to do konfliktu."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr "Dwa elementy mapy powinny być wybrane"
 
@@ -18070,19 +17817,19 @@ msgstr "Dwa elementy mapy powinny być wybrane"
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18134,7 +17881,7 @@ msgstr "Typ informacji"
 msgid "Types"
 msgstr "Typy"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18155,7 +17902,7 @@ msgstr "NIEZNANE"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18201,12 +17948,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "URL powinien mieć oba pola \"name\" (nazwa) i \"url\" dla mapy \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "Adresy URL"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18291,12 +18038,12 @@ msgstr "Odblokuj"
 msgid "Unblock selected users?"
 msgstr "Odblokować wybranych użytkowników?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr "Nieoczekiwana odpowiedź dla akcji %1$s."
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18316,21 +18063,23 @@ msgstr "Jednostki"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Nieznany"
@@ -18348,7 +18097,7 @@ msgid "Unknown error"
 msgstr "Nieznany błąd"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Nieznana pozycja hosta, taka pozycja nie istnieje na wybranym hoście"
@@ -18401,7 +18150,7 @@ msgstr "Odłącz od szablonu"
 msgid "Unlink from templates"
 msgstr "Odłącz od szablonów"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Włącz głos"
 
@@ -18433,7 +18182,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "Niewspierany parametr \"%2$s\" dla warunku filtra akcji \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "Niewspierany parametr \"%2$s\" dla warunku filtra reguły wykrywania \"%1$s\"."
@@ -18443,7 +18192,7 @@ msgstr "Niewspierany parametr \"%2$s\" dla warunku filtra reguły wykrywania \"%
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "Niewspierany parametr \"%2$s\" dla filtra akcji \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "Niewspierany parametr \"%2$s\" dla filtra reguły wykrywania \"%1$s\"."
@@ -18488,7 +18237,7 @@ msgstr "Działa"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18501,7 +18250,7 @@ msgstr "Działa"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18554,7 +18303,7 @@ msgstr "Aktualizacja operacji"
 msgid "Update problem"
 msgstr "Problem z aktualizacją"
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18572,7 +18321,7 @@ msgstr "Wyślij"
 msgid "Upper level maps"
 msgstr "Mapy wyższego poziomu"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18607,7 +18356,7 @@ msgstr "Użyj piaskownicy iframe"
 msgid "Used in actions"
 msgstr "Wykorzystywane w akcjach"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18622,7 +18371,7 @@ msgstr "Wykorzystywane w akcjach"
 msgid "User"
 msgstr "Użytkownik"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "Użytkownik \"%1$s\" nie może istnieć bez grupy użytkowników."
@@ -18674,7 +18423,7 @@ msgstr "Dodano użytkownika"
 msgid "User agent string"
 msgstr "Ciąg znaków agenta użytkownika"
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Użytkownik nie może dodać samego siebie do wyłączonej grupy lub do grupy z wyłączonym dostępem do interfejsu użytkownika."
@@ -18695,7 +18444,7 @@ msgstr[0] "Usunięto użytkownika"
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18705,27 +18454,27 @@ msgstr[2] ""
 msgid "User group"
 msgstr "Grupa użytkowników"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Grupa użytkowników \"%1$s\" już istnieje."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "Grupa użytkownika \"%1$s\" używa w akcji \"%2$s\"."
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Grupa użytkowników \"%1$s\" została użyta w konfiguracji dla komunikatów zatrzymania bazy danych."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Grupa użytkowników \"%1$s\" jest wykorzystywana w skrypcie \"%2$s\"."
@@ -18761,8 +18510,8 @@ msgstr[2] "Zaktualizowanych grup użytkownika"
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18806,14 +18555,14 @@ msgstr "Hasło użytkownika"
 msgid "User profile"
 msgstr "Profil użytkownika"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr "Rola użytkownika"
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18884,7 +18633,7 @@ msgstr "Zaktualizowano użytkownika"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "Użytkownik o ID \"%1$s\" jest niedostępny."
@@ -19200,14 +18949,14 @@ msgstr "Sprawdzenie"
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19217,7 +18966,7 @@ msgstr "Sprawdzenie"
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19259,7 +19008,7 @@ msgstr "Nieprawidłowa wartość \"%1$s\" dla parametru \"grid_show\". Do wyboru
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "Nieprawidłowa wartość \"%1$s\" dla parametru \"grid_show\". Do wyboru są \"%2$s\"."
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "Wartość \"%1$s\" jest zbyt długa dla pola \"%2$s\" - %3$d znaków. Dozwolona długość to %4$d znaków."
@@ -19276,7 +19025,7 @@ msgstr "Statystyki cache'a wartości. Poprawne tryby to: total, free, pfree, use
 msgid "Value cannot be empty."
 msgstr "Wartość nie może być pusta."
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Mapa wartości"
 
@@ -19319,11 +19068,12 @@ msgstr "Wartość jakichkolwiek liczników wydajności Windows po angielsku. Zwr
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "Wartość dowolnego licznika wydajności Windows. Zwraca liczbę całkowitą, zmiennoprzecinkową, ciąg znaków lub tekst (zależnie od zapytania)"
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr "Wartość nowego zdarzenia znacznika"
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr "Wartość starego zdarzenia znacznika"
 
@@ -19370,7 +19120,7 @@ msgstr "Punkt końcowy sejfu API"
 msgid "Vault authentication token"
 msgstr "Token autentykacyjny sejfu"
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr "Nieudane połączenie sejfu"
@@ -19457,7 +19207,7 @@ msgstr "Widoczna nazwa nie może być pusta jeśli host nie posiada swojej nazwy
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Ś"
@@ -19474,7 +19224,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr "Wiadomość ostrzegająca"
 
@@ -19483,7 +19233,7 @@ msgstr "Wiadomość ostrzegająca"
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Przepraszamy, maksymalna możliwa liczba elementów do zapamiętania została osiągnięta."
 
@@ -19499,7 +19249,7 @@ msgstr "Przepraszamy, maksymalna możliwa liczba elementów do zapamiętania zos
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "WWW"
 
@@ -19511,7 +19261,7 @@ msgstr "WWW"
 msgid "Web monitoring"
 msgstr "Monitorowanie WWW"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr "Scenariusz sieci www"
 
@@ -19526,29 +19276,29 @@ msgstr "Scenariusz sieci www \"%1$s\" już istnieje na hoście \"%2$s\"."
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Scenariusz sieci www \"%1$s\" już istnieje."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "Dodano scenariusz sieci www"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Usunięto scenariusz sieci www"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Wyłączono scenariusz sieci www"
 msgstr[1] "Wyłączono scenariusze sieci www"
 msgstr[2] "Wyłączono scenariusze sieci www"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Włączono scenariusz sieci www"
 msgstr[1] "Włączono scenariusze sieci www"
 msgstr[2] "Włączono scenariusze sieci www"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "Zaktualizowano scenariusz sieci www"
 
@@ -19570,7 +19320,7 @@ msgstr "Wywołanie zwrotne HTTP nie ma parametrów"
 msgid "Wed"
 msgstr "Śr"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Środa"
 
@@ -19581,7 +19331,7 @@ msgstr "Środa"
 msgid "Weekly"
 msgstr "Tygodniowo"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19597,12 +19347,12 @@ msgstr "Witamy w"
 msgid "When active"
 msgstr "Kiedy włączone"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr "Widżet jest za mały dla okreśłonej liczby kolumn i wierszy."
 
@@ -19797,6 +19547,10 @@ msgstr "Y-m-d H:i"
 msgid "Y-m-d H:i:s"
 msgstr "Y-m-d H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr "Y1"
@@ -19858,7 +19612,7 @@ msgstr "Rocznie"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19915,18 +19669,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr "Nie określiłeś celów dla operacji akcji globalnego skryptu \"%1$s\"."
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19938,9 +19686,6 @@ msgstr "Nie określiłeś celów dla operacji akcji globalnego skryptu \"%1$s\".
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Nie masz uprawnień do wykonania tej operacji"
 
@@ -20056,24 +19801,28 @@ msgstr "[Błędna wartość dla dnia: \"%1$s\" ]"
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr "[Błędna wartość dla miesiąca: \"%1$s\" ]"
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr "oczekiwano nazwy DNS"
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr "oczekiwana wartość boolowska"
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "oczekiwano ciągu znaków"
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -20082,37 +19831,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr "oczekiwano zmiennoprzecinkowej wartości punktu"
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr "oczekiwane wykrywanie makra niskiego poziomu"
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr "liczba ma za dużo cyfr po przecinku"
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr "oczekiwano liczby"
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr "oczekiwana liczba jest za duża"
@@ -20133,28 +19882,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr "oczekiwano czasu"
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr "oczekiwano okresu czasu"
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr "oczekiwano zakresu czasu"
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr "oczekiwano jednostki czasu"
@@ -20202,7 +19952,7 @@ msgstr "wszystkie"
 msgid "all media"
 msgstr "wszystkie media"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr "oczeiwano adresu IP"
 
@@ -20210,42 +19960,37 @@ msgstr "oczeiwano adresu IP"
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "oczekiwano tablicy"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr "oczekiwano tablicy lub ciągu znaku"
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20255,7 +20000,7 @@ msgid "an empty string is expected"
 msgstr "oczekiwano pustego ciągu znaków"
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr "oczekiwano parzystej liczby znaków heksadecymalnych"
 
@@ -20263,11 +20008,15 @@ msgstr "oczekiwano parzystej liczby znaków heksadecymalnych"
 msgid "an explicit time is expected"
 msgstr "oczekiwano jawnego czasu"
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr "oczekiwano liczby całkowitej"
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr "oczekiwano liczby całkowitej bez znaku"
 
@@ -20428,14 +20177,8 @@ msgstr "nie może być zmieniony"
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20465,19 +20208,11 @@ msgstr "nie może być zmieniony"
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20497,14 +20232,14 @@ msgstr "nie może być zmieniony"
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20512,7 +20247,7 @@ msgstr "nie może być zmieniony"
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "nie może być puste"
@@ -20525,7 +20260,7 @@ msgstr "nie można przekonwertować JSON, wynik wartości za długi"
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr "nie można wykonać prośby o Scroll API, dane nie mogą być skrócone"
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr "nie można zaktualizować własności dla zasady wykrywania"
 
@@ -20559,7 +20294,7 @@ msgstr "okrągła zależność nie jest dozwolona"
 msgid "circular item dependency is not allowed"
 msgstr "okrągła zależność elementy nie jest dozwolona"
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20577,7 +20312,8 @@ msgid "configure"
 msgstr "konfiguracja"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr "zawiera"
@@ -20606,7 +20342,7 @@ msgstr "count() - Liczba udanych pobrań wartości Y (które uzupełnia operator
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20668,7 +20404,7 @@ msgstr "malejąco"
 msgid "description"
 msgstr "opis"
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20690,13 +20426,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr "nie zawiera"
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr "nie równa się"
@@ -20722,7 +20458,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20759,6 +20496,10 @@ msgstr "wyrażenie jest puste"
 msgid "failed to parse JSON"
 msgstr "nieudane przetwarzanie JSON"
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20805,7 +20546,7 @@ msgstr "globalne ustawienia porządkowania"
 msgid "graph pattern"
 msgstr "wzór wykresu"
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20846,6 +20587,11 @@ msgstr "ikona"
 msgid "image"
 msgstr "obraz"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "w"
@@ -20886,15 +20632,19 @@ msgstr "nieprawidłowa liczność elementu"
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "niepoprawna składnia przy \"%1$s\""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20922,7 +20672,7 @@ msgstr "niepoprawny wzór Prometeusza"
 msgid "invalid address range \"%1$s\""
 msgstr "niepoprawny zakres adresu \"%1$s\""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr "niepoprawna sekwencja bajtów w UTF-8"
 
@@ -20951,27 +20701,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr "niepoprawny okres przechowywania historii"
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr "niepoprawna nazwa grupy hosta"
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr "niepoprawna nazwa hosta"
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr "niepoprawne wyrażenie regularne"
 
@@ -20999,7 +20749,7 @@ msgstr "jest większe niż lub równe"
 msgid "is less than or equals"
 msgstr "jest mniejsze niż lub równe"
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr "nie jest zamknięty w () albo jest zniekształcony"
 
@@ -21085,12 +20835,12 @@ msgstr "niskopoziomowa reguła wykrywania"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -21149,7 +20899,7 @@ msgstr "pasuje do"
 msgid "max"
 msgstr "maks"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr "maksymalny okres jest mniejszy niż filtr czasu domyślnego okresu"
 
@@ -21189,7 +20939,7 @@ msgid "min() - Minimum value for period T"
 msgstr "min() - Minimalna wartość dla okresu T"
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr "minimalna ilość znaków: %1$s"
@@ -21216,8 +20966,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21232,27 +20982,14 @@ msgstr "musi być poprawnym użytkownikiem LDAP"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "musi być pomiędzy \"%1$s\" a \"%2$s\""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr "musi zawierać co najmniej jedno makro wykrywania niskiego poziomu"
 
@@ -21280,6 +21017,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21290,7 +21035,7 @@ msgstr ""
 msgid "name"
 msgstr "nazwa"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "nowy"
 
@@ -21425,7 +21170,7 @@ msgstr "dane wyjściowe"
 msgid "path/to/secret"
 msgstr "ścieżka/do/tajny"
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr "ścieżka/do/tajny:klucz"
 
@@ -21460,24 +21205,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21505,11 +21254,11 @@ msgstr ""
 msgid "regular expression"
 msgstr "wyrażenie regularne"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21521,15 +21270,15 @@ msgstr "wymiana"
 msgid "right"
 msgstr "prawidłowy"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21577,7 +21326,7 @@ msgstr ""
 msgid "short description"
 msgstr "krótki opis"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21596,15 +21345,15 @@ msgstr "krótki opis"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr "powinno być puste"
 
@@ -21620,31 +21369,31 @@ msgstr "pokaż mapowanie ikon"
 msgid "sign in as guest"
 msgstr "zaloguj się jako gość"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21652,11 +21401,11 @@ msgstr ""
 msgid "sum"
 msgstr "suma"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr "sum() - Suma wartości okresu T"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21672,8 +21421,8 @@ msgstr "dostarczone dane logowania nie są unikalne"
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21684,7 +21433,7 @@ msgstr "dostarczone dane logowania nie są unikalne"
 msgid "tag"
 msgstr "znacznik"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21693,13 +21442,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "szablon o ID \"%1$s\" został przekazany %2$s razy"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21708,20 +21461,20 @@ msgstr "szablon o ID \"%1$s\" został przekazany %2$s razy"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "brakujący parametr \"%1$s\""
@@ -21753,39 +21506,39 @@ msgstr "trzeci"
 msgid "third parameter is expected"
 msgstr "oczekiwano trzeciego parametru"
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr "czas domyślnego okresu filtra osiągnął maksymalny okres"
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr "przesunięcie czasu"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr "time() - Aktualny czas"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr "timeleft() - Czas do osiągnięcia progu oszacowanego na podstawie okresu T"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr "trendavg() - Średnia wartość okresu T z dokładnym przesunięciem okresu"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr "trendmax() - Maksymalna wartość okresu T z dokładnym przesunięciem okresu"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr "trendmin() - Minimalna wartość okresu T z dokładnym przesunięciem okresu"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr "trendsum() - Suma wartości okresu T z dokładnym przesunięciem okresu"
 
@@ -21799,7 +21552,7 @@ msgstr "wyzwalacz"
 msgid "trigger does not allow manual closing"
 msgstr "wyzwalacz nie zezwala na ręczne zamknięcie"
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21811,26 +21564,26 @@ msgstr "prototyp wyzwalacza nie może zostać przeniesiony do innego szablonu lu
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr "wyzwalacz z odsyłaczami nie może być przesuwany do innego szablonu lub hosta"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "wpisz tekst do wyszukania"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr "nieakceptowalny URL"
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21838,11 +21591,11 @@ msgstr "nieoczekiwana stała \"%1$s\""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr "nieoczekiwana wartość stałej \"%1$s\""
@@ -21859,10 +21612,10 @@ msgstr "niespodziewany koniec klucza"
 msgid "unexpected end of macro"
 msgstr "nieoczekiwany koniec makra"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21872,11 +21625,12 @@ msgstr "nieoczekiwany koniec makra"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr "nieoczekiwany parametr \"%1$s\""
@@ -21902,8 +21656,8 @@ msgstr "nieoczekiwany tekst \"%1$s\""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21928,6 +21682,10 @@ msgstr "niewspierany przyrostek czasu"
 msgid "unsupported version number"
 msgstr "niewspierany numer wersji"
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21943,7 +21701,7 @@ msgstr "niewspierany numer wersji"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21963,11 +21721,11 @@ msgstr "niewspierany numer wersji"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "wartość"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr "wartość \"%1$s\" już isrnieje"
@@ -21985,76 +21743,87 @@ msgstr "nie znaleziono wartości \"%1$s\""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr "watość %1$s już istnieje"
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr "wartość jest za długa"
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr "wartość musi być nie większa niż \"%1$s\""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr "wartość musi być nie mniejsza niż \"%1$s\""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -22066,18 +21835,16 @@ msgstr "wartość musi być nie mniejsza niż \"%1$s\""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr "wartośc musi być jedna z %1$s"
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -22086,7 +21853,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr "wartośc pierwszego parametru jest za długa"
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr "wartość nowego znacznika zdarzenia"
 
@@ -22099,11 +21866,11 @@ msgstr "wartość drugiego paramteru jest za długa"
 msgid "value of third parameter must be one of %1$s"
 msgstr "wartość trzecigo paramteru mysu być jedną z %1$s"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -22120,7 +21887,7 @@ msgstr "nieprawidłowy typ reguły wykrywania"
 msgid "wrong item type"
 msgstr "nieprawidłowy typ elementu"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/pt_BR/LC_MESSAGES/frontend.po b/ui/locale/pt_BR/LC_MESSAGES/frontend.po
index d67573e95bb..a741ea2d51f 100644
--- a/ui/locale/pt_BR/LC_MESSAGES/frontend.po
+++ b/ui/locale/pt_BR/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2021-01-25 11:38+0300\n"
 "Last-Translator: Marlon <Marlon@outlook.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d dia"
 msgstr[1] "%1$d dias"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] "%1$s mensagens"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "%1$s de %2$s elemento em estado de incidente"
 msgstr[1] "%1$s de %2$s elementos em estado de incidente"
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -226,14 +226,14 @@ msgstr[1] "%1$s tentavas faltando"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s segundo"
 msgstr[1] "%1$s segundos"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "%1$s símbolos restantes"
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Severidade, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, apenas leitura"
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -389,7 +389,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -450,10 +450,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "Acesso negado"
@@ -496,7 +492,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Reconhecido"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Reconhecer"
 
@@ -504,7 +500,7 @@ msgstr "Reconhecer"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Reconhecido"
@@ -517,7 +513,7 @@ msgstr "Eventos de INCIDENTE reconhecidos"
 msgid "Acknowledged RESOLVED events"
 msgstr "Eventos confirmados RESOLVIDOS"
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -544,9 +540,9 @@ msgstr "Eventos confirmados RESOLVIDOS"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -603,7 +599,7 @@ msgstr "A ação \"%1$s\" já existe."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "A ação \"%1$s\" não possui operadores definidos."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -612,7 +608,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Ação incluída"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -661,8 +657,8 @@ msgstr "Ação atualizada"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Ações"
@@ -729,7 +725,7 @@ msgstr "Ativo até"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -740,7 +736,7 @@ msgstr "Ativo até"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -763,9 +759,9 @@ msgstr "Ativo até"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -835,7 +831,7 @@ msgstr "Ativo até"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Adicionar"
 
@@ -843,11 +839,11 @@ msgstr "Adicionar"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "Adicionar um novo widget"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "Adicionar elemento filho"
 
@@ -855,7 +851,7 @@ msgstr "Adicionar elemento filho"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -872,7 +868,7 @@ msgstr "Adicionar host"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "Adicionar múltiplos mapas"
 
@@ -894,7 +890,7 @@ msgstr "Adicionar nova sobreposição"
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -946,12 +942,12 @@ msgstr ""
 msgid "Add widget"
 msgstr "Adicionar widget"
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -961,7 +957,7 @@ msgstr "Adicionado, %1$s"
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -974,7 +970,7 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administração"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -997,7 +993,7 @@ msgstr "Idade menor que"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1069,7 +1065,7 @@ msgstr "Alinha elementos do mapa"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Todos"
 
@@ -1087,7 +1083,7 @@ msgstr "Todos os grupos"
 msgid "All hosts"
 msgstr "Todos os hosts"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Todos os links devem ter \"Nome\" e \"URL\" definidos"
 
@@ -1105,7 +1101,7 @@ msgstr "Todos os incidentes"
 msgid "All problems if tag values match"
 msgstr "Todos os incidentes que o valor da etiqueta combine"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1218,15 +1214,15 @@ msgstr "Erro na aplicação."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1244,7 +1240,7 @@ msgstr "Aproximando"
 msgid "Apr"
 msgstr "Abr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Abril"
 
@@ -1272,7 +1268,7 @@ msgstr "Tipo de área"
 msgid "Arithmetic"
 msgstr "Aritimética"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1321,7 +1317,7 @@ msgstr "Às (horas:minutos)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1330,7 +1326,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1342,6 +1338,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr "Ao menos um grupo de host ou host deve ser selecionado."
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1353,7 +1354,7 @@ msgstr "No mínimo um período de manutenção deve ser definido."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1409,7 +1410,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Ago"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Agosto"
 
@@ -1422,7 +1423,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1499,7 +1500,7 @@ msgstr "Logout automático"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1514,7 +1515,7 @@ msgstr "Mapeamento automático de icone"
 msgid "Automatic icon selection"
 msgstr "Seleção automática de ícone"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1566,7 +1567,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr "Eixos"
 
@@ -1629,7 +1630,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "Azul"
 
@@ -1683,11 +1684,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Abaixo"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "Trazer para frente"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "Levar para tráz"
 
@@ -1713,7 +1714,7 @@ msgstr "CERTIFICADO"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1758,8 +1759,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1768,7 +1769,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Calculado"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr "Calendário"
 
@@ -1793,7 +1794,7 @@ msgstr "Retorno"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1806,8 +1807,8 @@ msgstr "Retorno"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1837,7 +1838,7 @@ msgstr "Ação não foi adicionada"
 msgid "Cannot add correlation"
 msgstr "Não foi possível adicionar o correlacionamento"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1847,7 +1848,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Não é possível adicionar dependência de um host para um template."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1878,8 +1879,8 @@ msgid "Cannot add host prototype"
 msgstr "Não foi possível adicionar o protótipo de host"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Imagem não foi incluída"
 
@@ -1971,15 +1972,15 @@ msgstr "Usuário não foi incluído"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Não foi possível adicionar a apresentação de telas"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1999,33 +2000,29 @@ msgstr "Não foi possível se conectar ao servidor LDAP."
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Histórico não foi limpado"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Não foi possível clonar o protótipo de gráfico."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "Não é possível clonar protótipos de host."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Não foi possível clonar protótipos do item."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Não foi possível clonar protótipos da trigger."
 
@@ -2052,7 +2049,7 @@ msgid_plural "Cannot copy graphs"
 msgstr[0] "Não foi possível copiar o gráfico"
 msgstr[1] "Não foi possível copiar os gráficos"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "Não foi possível copiar o item"
@@ -2104,8 +2101,8 @@ msgstr "Não foi possível criar o ícone no mapa"
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2134,7 +2131,7 @@ msgstr "Não é possível excluir o usuário interno do Zabbix \"%1$s\", tente d
 msgid "Cannot delete action"
 msgstr "Ação não foi excluída"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2202,7 +2199,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2213,11 +2210,11 @@ msgstr[1] ""
 msgid "Cannot delete host prototypes"
 msgstr "Não é possível excluir protótipos de hosts"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Não foi possível excluir icone do mapa"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "A imagem não foi excluída"
 
@@ -2242,7 +2239,7 @@ msgstr "Protótipo de item não excluído"
 msgid "Cannot delete item prototypes"
 msgstr "Protótipos de item não excluídos"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Itens não foram removidos"
 
@@ -2273,7 +2270,7 @@ msgid_plural "Cannot delete proxies"
 msgstr[0] "Não foi possível excluir proxy"
 msgstr[1] "Não foi possível excluir proxy"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2296,7 +2293,7 @@ msgid_plural "Cannot delete scripts"
 msgstr[0] "Não foi possível excluir script"
 msgstr[1] "Não foi possível excluir script"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Não foi possível excluir os scripts. Script \"%1$s\" é usado na operação de ação \"%2$s\"."
@@ -2312,8 +2309,8 @@ msgid_plural "Cannot delete services"
 msgstr[0] "Serviço não foi removido"
 msgstr[1] "Serviço não foi removido"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2342,7 +2339,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr "Não é possível excluir item do template."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Não é possível excluir itens do template."
 
@@ -2395,7 +2392,7 @@ msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Não foi possível excluir o cenário web"
 
@@ -2430,7 +2427,7 @@ msgid_plural "Cannot disable hosts"
 msgstr[0] "Não foi possível desativar o host"
 msgstr[1] "Não foi possível desativar os hosts"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Não foi possível desativar o item"
@@ -2461,7 +2458,7 @@ msgid_plural "Cannot disable triggers"
 msgstr[0] "Não foi possível desativar a trigger"
 msgstr[1] "Não foi possível desativar as triggers"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Não foi possível desativar o cenário web"
@@ -2508,7 +2505,7 @@ msgid_plural "Cannot enable hosts"
 msgstr[0] "Não foi possível ativar o host"
 msgstr[1] "Não foi possível ativar os hosts"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Não foi possível ativar o item"
@@ -2539,7 +2536,7 @@ msgid_plural "Cannot enable triggers"
 msgstr[0] "Não foi possível ativar a trigger"
 msgstr[1] "Não foi possível ativar as triggers"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Não foi possível ativar o cenário web"
@@ -2553,7 +2550,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr "Não foi possível expandir as macros."
 
@@ -2587,8 +2584,8 @@ msgstr "Não foi encontrado o host \"%1$s\" usado no mapa \"%2$s\"."
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Não foi possível localizar o grupo de host \"%1$s\" para o protótipo de host \"%2$s\" da autobusca \"%3$s\" em \"%4$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2686,24 +2683,20 @@ msgstr "Não foi possível localizar o mapeamento de valores \"%1$s\" utilizado
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Não foi possível localizar o mapeamento de valores \"%1$s\" utilizado para o protótipo de item \"%2$s\" da autobusca \"%3$s\" em \"%4$s\"."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "Não é possível ter um template sem nome visível."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2716,7 +2709,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
 msgstr[0] "Não foi possível importar o template \"%1$s\", vinculado com o template \"%2$s\" que não existe."
 msgstr[1] "Não foi possível importar o template \"%1$s\", vinculado com os templates \"%2$s\" que não existem."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "Não foi possível incluir a expressão de trigger"
 
@@ -2730,7 +2723,7 @@ msgid "Cannot link template."
 msgstr "Não foi possível vincular ao template."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2762,17 +2755,17 @@ msgstr "Não é possível atualizar em massa o nome visível do template."
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Não é possível executar comando de exclusão na tabela \"%1$s\" sem uma condição."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Não é possível executar comando de atualização na tabela \"%1$s\" sem valores."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Não é possível executar comando de atualização na tabela \"%1$s\" sem uma condição."
@@ -2799,7 +2792,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Não é possível receber a resposta, verifique a comunicação com o servidor Zabbix \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Não é possível renomear o usuário convidado."
 
@@ -2818,7 +2811,7 @@ msgstr "Não foi possível salvar o widget \"%1$s\"."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Não foi possível enviar o comando, verifique a comunicação com o servidor Zabbix \"%1$s\"."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr "Não é possível enviar a requisição"
 
@@ -2858,12 +2851,12 @@ msgstr "Não é possível configurar campos do inventário com o inventário des
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2882,7 +2875,7 @@ msgid_plural "Cannot unblock users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Não foi possível desvincular e limpar os cenários web."
 
@@ -2895,7 +2888,7 @@ msgstr "Falha na desassociação do template"
 msgid "Cannot unlink template."
 msgstr "Não foi possível desvincular ao template."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2948,11 +2941,6 @@ msgstr "Não foi possível atualizar \"%2$s\" para o item descoberto \"%1$s\"."
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "Não foi possível atualizar \"%2$s\" para a trigger descoberta \"%1$s\"."
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "Não foi possível atualizar o \"imagetype\" para a imagem \"%1$s\"."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2962,9 +2950,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "Não é possível atualizar um gráfico descoberto."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "Não é possível atualizar um grupo de hosts descoberto."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3023,9 +3012,7 @@ msgstr "Não foi possível atualizar o protótipo de gráfico"
 msgid "Cannot update group"
 msgstr "Grupo não foi atualizado"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Não é possível atualizar os grupos para o host descoberto \"%1$s\"."
@@ -3048,13 +3035,13 @@ msgstr[1] "Não foi possível atualizar os protótipos de host"
 msgid "Cannot update hosts"
 msgstr "Hosts não foram atualizados"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "Ícones do mapa não foram atualizados"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Imagem não foi atualizada"
 
@@ -3108,12 +3095,12 @@ msgstr "Não foi possível atualizar mapa de rede"
 msgid "Cannot update proxy"
 msgstr "Não foi possível atualizar proxy"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Não é possível atualizar o proxy para o host descoberto \"%1$s\"."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3133,17 +3120,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Não foi possível atualizar script"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3218,7 +3205,7 @@ msgstr[1] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Não foi possível atualizar o cenário web"
 
@@ -3318,8 +3305,8 @@ msgid "Character string not included"
 msgstr "Sequência de caracteres não incluídos"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3434,7 +3421,7 @@ msgstr "Verifica a performance de um serviço UDP. Retornos possíveis: 0 - serv
 msgid "Checks should be unique."
 msgstr "As verificações devem ser unicas."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3455,7 +3442,7 @@ msgstr "Referência cruzada nos templates: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "Referências cruzadas entre templates não são permitidas."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3476,11 +3463,11 @@ msgstr "Limpar histórico e estatísticas (médias)"
 msgid "Clear when unlinking"
 msgstr "Limpar ao desassociar"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3495,7 +3482,7 @@ msgstr "Relógio"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3510,7 +3497,7 @@ msgstr "Relógio"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Clonar"
 
@@ -3521,8 +3508,8 @@ msgstr "Clonar"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Fechar"
 
@@ -3533,13 +3520,13 @@ msgstr "Fechar"
 msgid "Close expression constructor"
 msgstr "Fechar construtor de expressão"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Fechar novo evento"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Fechar eventos antigos"
 
@@ -3552,8 +3539,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "Recolher"
 
@@ -3570,7 +3557,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3636,7 +3623,7 @@ msgstr "Compressão"
 msgid "Concurrent sessions"
 msgstr "Sessões concorrentes"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3647,17 +3634,12 @@ msgstr "Condição"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "A condição \"%2$s\" não é utilizada na fórmula \"%3$s\" da ação \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "A condição \"%2$s\" não é utilizada na fórmula \"%3$s\" para o correlacionamento \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "A condição \"%2$s\" não é utilizada pela fórmula \"%3$s\" da regra de descoberta \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3667,17 +3649,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "A condição \"%2$s\" utilizada na fórmula \"%3$s\" para a ação \"%1$s\" não foi definida."
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "A condição \"%2$s\" utilizada na fórmula \"%3$s\" para o correlacionamento \"%1$s\" não foi definida."
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "A condição \"%2$s\" utilizada na fórmula \"%3$s\" da regra de descoberta \"%1$s\" não está definida."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3693,7 +3670,7 @@ msgstr "Condições"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Configuração"
 
@@ -3756,7 +3733,7 @@ msgstr "Configuração dos hosts"
 msgid "Configuration of housekeeping"
 msgstr "Configuração de limpeza de dados"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Configuração do mapeamento de ícones"
@@ -3863,7 +3840,7 @@ msgstr "Mensagem de confirmação"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "Parabéns! Você instalou com sucesso a interface web do Zabbix."
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3956,7 +3933,7 @@ msgstr "Contato"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4016,7 +3993,7 @@ msgstr "Contêm"
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr "Controles de conteúdo"
 
@@ -4055,8 +4032,8 @@ msgstr "Coordenadas"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Copiar"
 
@@ -4065,12 +4042,11 @@ msgstr "Copiar"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "Correlacionamento"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "O correlacionamento \"%1$s\" já existe."
@@ -4098,16 +4074,6 @@ msgid_plural "Correlations enabled"
 msgstr[0] "Correlacionamento ativado"
 msgstr[1] "Correlacionamentos ativados"
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "Correlacionamento com parâmetro ausente: %1$s"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "O nome do correlacionamento não pode ser vazio."
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr "Regra de correlação"
@@ -4116,14 +4082,10 @@ msgstr "Regra de correlação"
 msgid "Correlation updated"
 msgstr "Correlacionamento atualizado"
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Impossível salvar imagem!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Contador"
 
@@ -4187,11 +4149,11 @@ msgstr "Criar correlacionamento"
 msgid "Create dashboard"
 msgstr "Criar dashboard"
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr "Criar item dependente"
 
@@ -4308,7 +4270,7 @@ msgstr "Criar mapa"
 msgid "Create media type"
 msgstr "Criar tipo de mídia"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "Criar novo"
 
@@ -4332,7 +4294,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Criar template"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Criar trigger"
 
@@ -4495,7 +4457,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "Nome DNS"
@@ -4507,11 +4469,11 @@ msgstr "Nome DNS"
 msgid "Daily"
 msgstr "Diário"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "Escuro"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4532,8 +4494,8 @@ msgstr "O dashboard \"%1$s\" já existe."
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr "Dashboard criado"
 
@@ -4556,9 +4518,9 @@ msgstr "Propriedades do dashboard"
 msgid "Dashboard sharing"
 msgstr "Compartilhamento de dashboard"
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr "Dashboard atualizado"
 
@@ -4582,7 +4544,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr "Dashboards"
 
@@ -4610,7 +4572,7 @@ msgstr "Visão geral dados"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr "Conjunto de dados"
 
@@ -4752,7 +4714,7 @@ msgstr "Dia da semana"
 msgid "Days"
 msgstr "Dias"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Depuração"
 
@@ -4766,26 +4728,26 @@ msgstr "Modo de depuração"
 msgid "Dec"
 msgstr "Dez"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Dezembro"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Padrão"
 
@@ -4878,7 +4840,7 @@ msgstr "Atrasado por"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4902,8 +4864,8 @@ msgstr "Atrasado por"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Excluir"
 
@@ -4928,11 +4890,11 @@ msgstr "Excluir e limpar template? (Aviso: todos os hosts associados terão as e
 msgid "Delete current action?"
 msgstr "Excluir a ação atual?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "Excluir o correlacionamento atual?"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr "Excluir o dashboard?"
 
@@ -4976,7 +4938,7 @@ msgstr "Excluir o protótipo de item?"
 msgid "Delete item?"
 msgstr "Excluir o item?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Excluir vínculos entre os elementos selecionados?"
 
@@ -5032,7 +4994,7 @@ msgstr "Excluir os dashboards selecionados?"
 msgid "Delete selected discovery rules?"
 msgstr "Excluir regras de descoberta selecionadas?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Excluir elementos selecionados?"
 
@@ -5138,7 +5100,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "Excluir as formas seleciondas?"
 
@@ -5182,7 +5144,7 @@ msgstr "Excluir trigger?"
 msgid "Delete web scenario?"
 msgstr "Excluir cenário web?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5227,7 +5189,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Dependências"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Dependente"
 
@@ -5235,7 +5197,7 @@ msgstr "Dependente"
 msgid "Dependent item"
 msgstr "Item dependente"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5245,7 +5207,7 @@ msgstr "Depende de"
 msgid "Deployment status"
 msgstr "Status de desenvolvimento"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5278,7 +5240,7 @@ msgid "Description"
 msgstr "Descrição"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5444,10 +5406,10 @@ msgstr "Desativar os cenários web selecionados?"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5530,7 +5492,7 @@ msgid "Discovery by proxy"
 msgstr "Descoberta por proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Verificação de descoberta"
 
@@ -5542,7 +5504,7 @@ msgstr "Verificações de descoberta"
 msgid "Discovery list"
 msgstr "Lista de descoberta"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Objeto de descoberta"
 
@@ -5574,7 +5536,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5582,12 +5544,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Regra de descoberta"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "A regra de descoberta \"%1$s\" já existe em \"%2$s\", importada de outro template."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "A regra de descoberta \"%1$s\" já existe em \"%2$s\"."
@@ -5600,7 +5562,7 @@ msgstr "A regra de descoberta \"%1$s\" já existe em \"%2$s\"."
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "A regra de descoberta \"%1$s\" já existe."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5642,7 +5604,7 @@ msgstr "Regra de autobusca atualizada"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5653,7 +5615,7 @@ msgstr "Regras de descoberta"
 msgid "Discovery rules deleted"
 msgstr "A regra de descoberta foi excluída"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Status da descoberta de rede"
@@ -5691,10 +5653,11 @@ msgid "Display stacked graph"
 msgstr "Exibir gráfico empilhado"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Exibindo %1$s de %2$s encontrados"
@@ -5704,7 +5667,7 @@ msgstr "Exibindo %1$s de %2$s encontrados"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "Apresentando %1$s até %2$s de %3$s encontrados"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5726,7 +5689,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "A expressão condicional foi substituída?"
 
@@ -5782,7 +5745,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Fora"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5790,7 +5753,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr "Receber a configuração"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5809,19 +5772,6 @@ msgstr "Desenhar"
 msgid "Draw style"
 msgstr "Estilo"
 
-# Need more information about this... to translate.
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "Valor \"%1$s\" duplicado \"%2$s\" para a correlação \"%3$s\"."
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr "Valor \"%1$s\" duplicado \"%2$s\" naa correlaçã."
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5834,11 +5784,6 @@ msgstr "O valor informado para o \"nome\" do mapa \"%1$s\" está duplicado."
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5890,7 +5835,7 @@ msgstr "Item dinâmico"
 msgid "Dynamic items"
 msgstr "Itens dinâmicos"
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Cada URL deverá possuir um nome único. Certifique-se que existe um nome único para cada URL"
 
@@ -5899,11 +5844,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5917,8 +5862,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Editar"
 
@@ -5934,11 +5879,11 @@ msgstr "Editar mapa"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr "Editar árvore de elementos"
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Editar trigger"
 
@@ -5998,21 +5943,17 @@ msgstr "Arquivo de chave SSL ausente para o cenário web \"%1$s\"."
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "ID de correlação vazio."
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "Condição de filtro vazia na fórmula ID da ação \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "O ID da condição de filtro está vazio na regra de descoberta \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "A condição da regra de descoberta \"%1$s\" está com filtro vazio."
@@ -6028,25 +5969,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6056,14 +5991,6 @@ msgstr "Parâmetro de entrada vazio."
 msgid "Empty map ID."
 msgstr "ID de mapa vazio."
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "O ID do tipo de mídia está ausente."
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Parâmetros vazios"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6229,7 +6156,7 @@ msgstr "Ativar traps"
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6240,7 +6167,7 @@ msgstr "Ativar traps"
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6283,7 +6210,7 @@ msgid "English (en_US)"
 msgstr "Inglês (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6299,7 +6226,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6318,12 +6245,12 @@ msgstr "Igual"
 msgid "Error"
 msgstr "Erro"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Erro na requisição de pesquisa pela tabela \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr "Mensagem de erro"
 
@@ -6350,7 +6277,7 @@ msgstr "Evento ID"
 msgid "Event acknowledged"
 msgstr "Evento reconhecido"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6358,7 +6285,7 @@ msgid "Event correlation"
 msgstr "Correlacionamento de eventos"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "Regras de correlacionamento de eventos"
@@ -6393,11 +6320,11 @@ msgstr "Monitoração do log de eventos. Retorna: log"
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "Conjunto de etiqueta de evento"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Tipo do evento"
 
@@ -6442,15 +6369,10 @@ msgstr "Excluir"
 msgid "Exclude host groups"
 msgstr "Excluir grupos de hosts"
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Executar"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "Erro de execução de SQL: [%1$s] em [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6488,7 +6410,7 @@ msgstr "Executado"
 msgid "Executed script"
 msgstr "Script executado"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Confirmação de execução"
 
@@ -6504,8 +6426,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "Expandir"
 
@@ -6626,7 +6548,7 @@ msgstr "Expressões"
 msgid "External check"
 msgstr "Monitoramento externo"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "S"
@@ -6653,8 +6575,8 @@ msgstr "Falhou"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6665,26 +6587,26 @@ msgstr "Falha ao criar o dashboard"
 msgid "Failed to parse URL."
 msgstr "Falha ao processar a URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr "Falha ao atualizar o dashboard"
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6692,7 +6614,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Falha ao atualizar o template."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6716,7 +6638,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Fev"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Fevereiro"
 
@@ -6738,10 +6660,9 @@ msgstr "O campo \"%1$s\" não pode ser definido como NULO."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6752,13 +6673,6 @@ msgstr "O campo \"%1$s\" é obrigatório."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "No mapa \"%2$s\" o campo \"%1$s\" está com valor ausente."
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "O campo \"%1$s\" está ausente para um valor do tipo de mídia \"%2$s\"."
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6777,11 +6691,6 @@ msgstr "O campo \"%1$s\" não é um inteiro."
 msgid "Field \"%1$s\" is not string."
 msgstr "O campo \"%1$s\" não é um texto."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "O campo \"%1$s\" é necessário no tipo de mídia \"%2$s\"."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6796,10 +6705,6 @@ msgstr "O campo \"host\" é obrigatório."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "O formato do arquivo não é suportado."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6864,7 +6769,8 @@ msgstr "Região preenchida"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6889,7 +6795,7 @@ msgstr "Filtrar"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6941,7 +6847,7 @@ msgstr "Ajustar ao mapa"
 msgid "Fixed"
 msgstr "Fixo"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6992,12 +6898,12 @@ msgstr "Fórmula"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7010,7 +6916,7 @@ msgstr "Francês (fr_FR)"
 msgid "Fri"
 msgstr "Sex"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Sexta-feira"
 
@@ -7121,7 +7027,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "Expressão informada não é uma macro"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr "A expressão regular \"%1$s\" não existe."
@@ -7135,7 +7041,7 @@ msgstr "Valor global"
 msgid "Go back to %1$s"
 msgstr "Voltar para %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Ir para"
 
@@ -7173,7 +7079,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7181,7 +7087,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Área gradiente"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7241,7 +7147,7 @@ msgstr[1] "Gráficos copiados"
 msgid "Graph deleted"
 msgstr "Gráfico removido"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7278,8 +7184,8 @@ msgstr "Protótipo de gráfico excluído"
 msgid "Graph prototype updated"
 msgstr "Protótipo de gráfico atualizado"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr "O protótipo de gráfico com o ID \"%1$s\" não está disponível."
@@ -7313,8 +7219,8 @@ msgstr "Tipo do gráfico"
 msgid "Graph updated"
 msgstr "Gráfico atualizado"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr "O gráfico com o ID \"%1$s\" não está disponível."
@@ -7345,7 +7251,7 @@ msgstr "Gráfico com o nome \"%1$s\" já existe em gráficos ou protótipos de g
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Gráficos"
 
@@ -7366,12 +7272,12 @@ msgstr "Grade"
 msgid "Group"
 msgstr "Grupo"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "O grupo \"%1$s\" não pode ser excluído por ser utilizado em um protótipo de host."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr "O grupo \"%1$s\" não pode ser excluído, pois é utilizado em condição de correlacionamento."
@@ -7545,11 +7451,11 @@ msgstr "Ajuda"
 msgid "Hexadecimal to decimal"
 msgstr "Hexadecimal para decimal"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Escondido"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "Ocultar depuração"
 
@@ -7576,11 +7482,11 @@ msgstr "Hierarquicamente"
 msgid "High"
 msgstr "Alta"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr "Escuro em alto contraste"
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr "Claro em alto contraste"
 
@@ -7601,7 +7507,7 @@ msgstr "Ressaltar linha inteira"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Histórico"
 
@@ -7609,11 +7515,15 @@ msgstr "Histórico"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Histórico zerado"
 
@@ -7656,7 +7566,7 @@ msgstr "Horizontal"
 msgid "Horizontal align"
 msgstr "Alinhamento horizontal"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7685,7 +7595,7 @@ msgstr "Alinhamento horizontal"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7699,7 +7609,7 @@ msgstr[1] "Hosts"
 msgid "Host \"%1$s\" already exists."
 msgstr "O host \"%1$s\" já existe."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7707,7 +7617,7 @@ msgstr "O host \"%1$s\" já existe."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "O host \"%1$s\" não pode ficar sem grupo."
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7759,7 +7669,7 @@ msgid_plural "Hosts enabled"
 msgstr[0] "Host ativado"
 msgstr[1] "Hosts ativados"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7773,22 +7683,22 @@ msgstr[1] "Hosts ativados"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Grupo de hosts"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "O grupo de hosts \"%1$s\" já existe."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "O grupo de hosts \"%1$s\" não pode ser excluído pois é utilizado por um script global."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7801,10 +7711,10 @@ msgstr "Elementos do grupo de hosts"
 msgid "Host group label type"
 msgstr "Tipo de rótulo do grupo de hosts"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "O grupo de hosts com o ID \"%1$s\" não está disponível."
@@ -7820,8 +7730,8 @@ msgstr "O grupo de hosts com o ID \"%1$s\" não está disponível."
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7895,7 +7805,7 @@ msgstr "Nome do host"
 msgid "Host networks"
 msgstr "Redes do host"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7975,7 +7885,7 @@ msgstr "A atualização do host falhou."
 msgid "Host updated"
 msgstr "Host atualizado"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr "O host com o ID \"%1$s\" não está disponível."
@@ -7995,7 +7905,7 @@ msgstr "Já existe um host com o nome \"%1$s\"."
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Já existe um host com o nome visível \"%1$s\"."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8008,7 +7918,7 @@ msgstr "Já existe um host com o nome visível \"%1$s\"."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8056,7 +7966,7 @@ msgstr "Hosts atualizados"
 msgid "Hours"
 msgstr "Horas"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8096,7 +8006,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "Endereço IP"
@@ -8121,7 +8031,7 @@ msgstr "O range de IP \"%1$s\" excede o limite de endereços \"%2$s\""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8178,12 +8088,12 @@ msgstr "Realce de ícone"
 msgid "Icon map"
 msgstr "Mapeamento de ícone"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "O mapeamento de ícones \"%1$s\" não pode ser excluído. Ele é usado no mapa \"%2$s\"."
@@ -8196,18 +8106,18 @@ msgstr "Mapeamento de ícone criado"
 msgid "Icon map deleted"
 msgstr "Mapeamento de ícone excluído"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Mapeamento de ícone atualizado"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "Mapeamento de ícones"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "O ícone com o ID \"%1$s\" não está disponível."
@@ -8308,23 +8218,20 @@ msgstr "Se você entende que esta mensagem está errada, por favor consulte os a
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Imagem"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "A imagem \"%1$s\" já existe."
@@ -8333,7 +8240,7 @@ msgstr "A imagem \"%1$s\" já existe."
 msgid "Image added"
 msgstr "Imagem incluída"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Imagem excluída"
 
@@ -8341,18 +8248,12 @@ msgstr "Imagem excluída"
 msgid "Image label type"
 msgstr "Tipo do rótulo da imagem"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "Erro ao carregar a imagem: [%1$s] em [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Imagem atualizada"
 
@@ -8447,7 +8348,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8458,13 +8359,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr "Mapa inacessível"
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr "Template inacessível"
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr "Trigger inacessível"
 
@@ -8508,7 +8409,7 @@ msgstr "Incluir subgrupos"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Retorna estatísticas de tráfego de uma interface. Retorna: número inteiro"
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8676,24 +8577,6 @@ msgstr "Ação com operação de grupo de usuário inválido. O grupo de usuári
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Ação com operação de usuário inválido. O usuário não existe ou você não possui acesso a este usuário."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8748,8 +8631,6 @@ msgstr "Ação com operação de usuário inválido. O usuário não existe ou v
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Foram informados argumentos incorretos para a função."
 
@@ -8775,31 +8656,22 @@ msgstr "Caracteres inválidos no nome do template: \"%1$s\"."
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "Condição inválida para a ação \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "Condições incorretas para a regra de descoberta \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "ID de correlacionamento inválido."
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "A expressão personalizada \"%2$s\" é inválida para a ação \"%1$s\": %3$s."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "A expressão customizada \"%2$s\" é inválida para o correlacionamento \"%1$s\": \"%3$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "A expressão personalizada \"%2$s\" é inválida para a regra de descoberta \"%1$s\": %3$s."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8828,7 +8700,7 @@ msgstr "Valor inválido para o objeto do evento."
 msgid "Incorrect eventsource value."
 msgstr "Valor inválido para a origem do evento."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "O nome ou o valor do campo \"%1$s\" é inválido para a cláusula \"where\" da tabela \"%2$s\"."
@@ -8853,22 +8725,17 @@ msgstr "Upload de arquivo inválido."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "A condição de filtro no ID da fórmula é inválida a ação \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "O ID de condição da formula utilizada pela regra de descoberta \"%1$s\" está incorreto."
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "A condição de filtro possui ID de fórmula incorreto para o correlacionamento \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "O filtro de condição de macro utilizado pela regra de descoberta \"%1$s\" está incorreto."
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8879,7 +8746,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "O operador da condição de filtro é inválido para a ação \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "O operador do filtro de condição utilizado pela regra de descoberta \"%1$s\" está incorreto."
@@ -8907,8 +8774,6 @@ msgstr "Índice de imagem inválido."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8970,10 +8835,6 @@ msgstr "Período de manutenção inválido (o mínimo é de 5 minutos)"
 msgid "Incorrect map ID."
 msgstr "ID de mapa inválido."
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "ID inválido para o tipo de mídia."
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9031,13 +8892,13 @@ msgstr "A expressão regular \"%1$s\": \"%2$s\" é inválida"
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Foi recebida uma resposta inválida do servidor Zabbix \"%1$s\"."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Foi informado um horário de fim inválido para o serviço."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Horário de início inválido para o serviço."
 
@@ -9090,12 +8951,7 @@ msgstr "O protótipo de trigger possui expressão inválida. A expressão não p
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "O tipo de calculo é inválido para a ação \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "Tipo inválido de cálculo para o correlacionamento \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "Tipo de cálculo incorreto para a regra de descoberta \"%1$s\"."
@@ -9141,13 +8997,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9164,60 +9020,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "O valor \"%1$s\" não é válido para o campo \"%2$s\": seu valor deve estar entre %3$s e %4$s."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "O valor \"%1$s\" é inválido para o campo \"%2$s\" - espera-se um número real."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "O valor \"%1$s\" é inválido para o campo \"%2$s\" - espera-se um número inteiro."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "O valor \"%1$s\" é inválido para o campo \"%2$s\" - espera-se um número inteiro positivo."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "O valor \"%1$s\" no campo \"%2$s\" é inválido para o correlacionamento \"%3$s\"."
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "Foi informado um valor inválido (%1$s) no campo \"%2$s\" do tipo de mídia \"%3$s\"."
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9272,14 +9098,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9389,25 +9209,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9418,7 +9220,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9464,16 +9266,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9482,7 +9285,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "Valor inválido para o campo \"%1$s\": %2$s."
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9570,12 +9373,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Inserir"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "Insira a expressão"
 
@@ -9680,7 +9483,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9688,7 +9491,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9699,7 +9502,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Intervalo"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9722,7 +9525,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr "Condição inválida na ação: %1$s."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9754,7 +9557,7 @@ msgstr "Endereço de e-mail inválido para o tipo de mídia com o ID \"%1$s\"."
 msgid "Invalid interval \"%1$s\"."
 msgstr "Intervalo inválido \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "A chave \"%1$s\" é inválida para a regra de descoberta \"%2$s\" em \"%3$s\": %4$s."
@@ -9779,27 +9582,29 @@ msgstr "Chave inválida \"%1$s\": %2$s."
 msgid "Invalid method parameters."
 msgstr "Os parâmetros do método são inválidos."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9825,17 +9630,17 @@ msgstr "Os parâmetros do método são inválidos."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9843,8 +9648,8 @@ msgstr "Os parâmetros do método são inválidos."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9858,106 +9663,116 @@ msgstr "Os parâmetros do método são inválidos."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9999,43 +9814,38 @@ msgstr "Código de resposta inválido \"%1$s\"."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10056,7 +9866,7 @@ msgstr "Período de tempo inválido."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Inventário"
 
@@ -10097,7 +9907,7 @@ msgstr "Não é possível pesquisar pela senha de usuário."
 msgid "Italian (it_IT)"
 msgstr "Italiano (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10131,7 +9941,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "O item \"%1$s\" não pode preencher um campo inexistente do inventário \"%2$d\". As opções são: de 0 (não popular) a %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10145,7 +9955,7 @@ msgstr "Item incluído"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "Item copiado"
@@ -10159,13 +9969,13 @@ msgstr "Contagem de itens"
 msgid "Item deleted"
 msgstr "Item removido"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Item desativado"
 msgstr[1] "Itens desativados"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Item ativado"
@@ -10175,7 +9985,7 @@ msgstr[1] "Itens ativados"
 msgid "Item in \"not supported\" state"
 msgstr "O item está como \"não suportado\""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "Item não selecionado"
 
@@ -10184,7 +9994,7 @@ msgstr "Item não selecionado"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr "O pré-processamento do item tem parâmetros ausentes: %1$s"
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10221,8 +10031,8 @@ msgid_plural "Item prototypes updated"
 msgstr[0] "O protótipo de item foi atualizado"
 msgstr[1] "Os protótipos de itens foram atualizados"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr "O protótipo de itens com o ID \"%1$s\" não está disponível."
@@ -10248,7 +10058,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10280,8 +10090,8 @@ msgstr "O item não será atualizado. O intervalo de atualização informado pre
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr "O item não será atualizado. O intervalo de atualização deverá ser entre 1s e 1d. Intervalos flexíveis e agendamento também podem ser utilizados."
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr "O item com o ID \"%1$s\" não está disponível."
@@ -10332,11 +10142,11 @@ msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\"."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Itens"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Itens removidos"
 
@@ -10354,7 +10164,7 @@ msgstr "Itens atualizados"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10379,6 +10189,10 @@ msgstr "Interfaces JMX"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10391,7 +10205,7 @@ msgstr "Dado JSON"
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr "É aguardado uma string JSON"
 
@@ -10409,7 +10223,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Janeiro"
 
@@ -10431,7 +10245,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Jul"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Julho"
 
@@ -10439,7 +10253,7 @@ msgstr "Julho"
 msgid "Jun"
 msgstr "Jun"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Junho"
 
@@ -10595,22 +10409,6 @@ msgid_plural "Last %1$d years"
 msgstr[0] "Último %1$d ano"
 msgstr[1] "Últimos %1$d anos"
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10622,11 +10420,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Última checagem"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Gráfico última hora"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Gráfico último mês"
 
@@ -10664,11 +10462,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Último valor"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Gráfico última semana"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10677,11 +10475,11 @@ msgstr "Gráfico última semana"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Dados recentes"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "Últimos valores"
 
@@ -10722,7 +10520,7 @@ msgstr "Esquerda Y"
 msgid "Left trim"
 msgstr "Remover espaços à esquerda"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr "Legenda"
 
@@ -11003,7 +10801,7 @@ msgstr "A regra de autobusca (LLD) está em estado \"não suportado\""
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "S"
@@ -11025,7 +10823,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "Verificação checksum MD5. Retorna: texto (hash MD5 do arquivo)"
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11036,12 +10834,12 @@ msgid "Macro"
 msgstr "Macro"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "A macro \"%1$s\" já existe em \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "A macro \"%1$s\" já existe."
@@ -11069,7 +10867,7 @@ msgstr "Macros atualizadas"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr "Filtro principal"
 
@@ -11077,7 +10875,7 @@ msgstr "Filtro principal"
 msgid "Main navigation"
 msgstr "Navegação principal"
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11160,7 +10958,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11182,13 +10980,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr "Fechado manualmente"
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Mapa"
 
@@ -11257,7 +11055,7 @@ msgstr "Forma do mapa"
 msgid "Map update failed."
 msgstr "A atualização do mapa falhou."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr "O mapa com o ID \"%1$s\" não está disponível."
@@ -11289,7 +11087,7 @@ msgstr "Mapas"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Março"
 
@@ -11393,7 +11191,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11407,7 +11205,7 @@ msgstr[1] "O período máximo a ser exibido é de %1$s dias."
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "O tamanho máximo do endereço de e-mail foi excedito para o tipo de mídia com o ID \"%1$s\"."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Maio"
 
@@ -11422,15 +11220,12 @@ msgstr "Maio"
 msgid "Media"
 msgstr "Mídia"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Tipo de mídia"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr "O tipo de mídia \"%1$s\" já existe."
@@ -11457,11 +11252,6 @@ msgid_plural "Media types enabled"
 msgstr[0] "Tipo de mídia ativado"
 msgstr[1] "Tipos de mídia ativados"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr "O tipo de mídia tem parâmetros ausentes: %1$s"
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11491,7 +11281,7 @@ msgstr "O tipo de mídia com o ID \"%1$s\" não está disponível."
 msgid "Media types"
 msgstr "Tipos de mídias"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11579,7 +11369,7 @@ msgstr "Mensagens"
 msgid "Method not found."
 msgstr "Método não encontrado."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11641,7 +11431,7 @@ msgid "Minimum severity"
 msgstr "Severidade mínima"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11700,7 +11490,7 @@ msgstr "Modo"
 msgid "Model"
 msgstr "Modelo"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11738,7 +11528,7 @@ msgstr[1] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11764,7 +11554,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Seg"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Segunda-feira"
 
@@ -11804,11 +11594,11 @@ msgstr "Mês"
 msgid "Monthly"
 msgstr "Mensal"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "Mais correspondentes encontrados..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11832,7 +11622,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11845,7 +11635,7 @@ msgstr "Múltiplo"
 msgid "Multiple PROBLEM events"
 msgstr "Multiplos eventos de INCIDENTE"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Sem som"
 
@@ -11974,11 +11764,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12136,19 +11926,21 @@ msgstr "Nova condição"
 msgid "New dashboard"
 msgstr "Novo dashboard"
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Novo elemento"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr "Novo evento no grupo de hosts"
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr "Novo valor para a etiqueta de eventos"
 
@@ -12160,7 +11952,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nova expressão regular"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12168,7 +11960,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Novo horário de serviço"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12177,7 +11969,7 @@ msgid "New triggers"
 msgstr "Novas triggers"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12195,7 +11987,7 @@ msgstr "Próximo passo"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12224,30 +12016,6 @@ msgstr "Próximo passo"
 msgid "No"
 msgstr "Não"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "Não foi encontrado \"%1$s\" para o correlacionamento \"%2$s\"."
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "Não foi encontrado \"%1$s\" para o correlacionamento."
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12263,11 +12031,6 @@ msgstr "Falta o dado \"%1$s\" para o gráfico."
 msgid "No \"%1$s\" given for map."
 msgstr "Não foi encontrado \"%1$s\" para o mapa."
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "Nenhum \"%1$s\" informado para o tipo de mídia."
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12275,7 +12038,7 @@ msgstr "Nenhum \"%1$s\" informado para o tipo de mídia."
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "Não foi encontrado \"%2$s\" para a condição de filtro da ação \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "Sem \"%2$s\" localizado para uma condição de filtro da regra de descoberta \"%1$s\"."
@@ -12285,7 +12048,7 @@ msgstr "Sem \"%2$s\" localizado para uma condição de filtro da regra de descob
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "Não foi informado \"%2$s\" para o filtro da ação \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "Sem \"%2$s\" localizado para o filtro da regra de descoberta \"%1$s\"."
@@ -12302,11 +12065,6 @@ msgstr "Não foi especificado o nome de usuário."
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "Sem tipo de condição para o correlacionamento \"%1$s\"."
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12337,7 +12095,7 @@ msgstr "Não foi definida a interface padrão para o tipo \"%1$s\" em \"%2$s\"."
 msgid "No details"
 msgstr "Sem detalhes"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "Não foram informados os IDs de regra de descoberta."
 
@@ -12373,7 +12131,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "Nenhum gráfico adicionado."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Não foram informados IDs de host."
 
@@ -12403,7 +12161,7 @@ msgstr "Sem imagem"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Nenhuma interface encontrada"
 
@@ -12439,7 +12197,7 @@ msgstr "Nenhuma macro encontrada."
 msgid "No maps added."
 msgstr "Nenhum mapa adicionado."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "Nenhuma correspondência encontrada"
 
@@ -12447,17 +12205,46 @@ msgstr "Nenhuma correspondência encontrada"
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr "Sem tipo de operação para o correlacionamento \"%1$s\"."
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Sem permissão de acesso ao sistema."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12465,7 +12252,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12493,19 +12280,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12520,16 +12306,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12549,12 +12341,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12575,27 +12365,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12612,14 +12404,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12628,7 +12420,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Sem permissão para o objeto referenciado ou ele não existe!"
 
@@ -12648,7 +12440,7 @@ msgstr "Não foi informado o arquivo de chave pública."
 msgid "No recipients for action operation message."
 msgstr "Sem destinatários para a operação de mensagem da ação."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr "Não atualizar"
 
@@ -12660,7 +12452,7 @@ msgstr "Nenhum script definido para a ação de comando."
 msgid "No target selected"
 msgstr "Nenhum alvo selecionado"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Nenhum alvo selecionado."
 
@@ -12677,7 +12469,7 @@ msgstr "Nenhuma trigger definida."
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr "Marcadores não booleanos serão descontinuados."
 
@@ -12747,15 +12539,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Não autorizado para definir a senha do usuário \"guest\"."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12787,7 +12579,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "Não suportado"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Nota"
@@ -12818,7 +12610,7 @@ msgstr "Notificar todos os envolvidos"
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "Novembro"
 
@@ -13005,8 +12797,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13066,13 +12858,13 @@ msgstr "Out"
 msgid "Octal to decimal"
 msgstr "Octal para decimal"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Outubro"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Inativo"
 
@@ -13080,30 +12872,31 @@ msgstr "Inativo"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr "Valor antigo da etiqueta de evento"
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "Ativo"
 
@@ -13119,35 +12912,15 @@ msgstr "Uma vez"
 msgid "One"
 msgstr "Um"
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "Um dos objetos está sem um grupo de hosts."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Apenas uma vez"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Downtime único"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Apenas os super administradores podem criar grupos de hosts."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Apenas os super administradores podem criar tipos de mídia."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Apenas os super administradores podem apagar tipos de mídia."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Apenas os super administradores podem editar tipos de mídia."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Apenas através de verificações com o agente Zabbix, SNMPv1, SNMPv2 e SNMPv3 pode ser feita a verificação de unicidade."
@@ -13196,10 +12969,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "Apenas super administradores podem criar correlacionamentos."
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr "Apenas super administradores podem definir um proprietario de dashboard."
@@ -13208,15 +12977,11 @@ msgstr "Apenas super administradores podem definir um proprietario de dashboard.
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr "Apenas super administradores podem atualizar correlacionamentos."
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Somente triggers de hosts ativados e dependentes de itens ativados são contadas"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Ópera"
 
@@ -13225,7 +12990,7 @@ msgstr "Ópera"
 msgid "Operating system information. Returns string"
 msgstr "Informação sobre o sistema operacional. Retorna: texto"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13234,11 +12999,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "A operação não pode ser executada devido a requisição não autorizada."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Detalhes da operação"
 
@@ -13260,7 +13025,7 @@ msgstr "A operação não possui template para operar."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13269,33 +13034,33 @@ msgstr ""
 msgid "Operations"
 msgstr "Operações"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operador"
 
@@ -13404,7 +13169,7 @@ msgstr "Outros parâmetros de configuração"
 msgid "Other parameters"
 msgstr "Outros parâmetros"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Outros"
@@ -13418,7 +13183,7 @@ msgstr "Estatísticas de saída de tráfego na interface de rede. Retorna: núme
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13447,7 +13212,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13636,7 +13401,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13681,7 +13446,7 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "Identidade PSK"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13704,16 +13469,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parâmetro"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "O parâmetro \"%1$s\" será descontinuado."
@@ -13743,7 +13508,7 @@ msgstr "Itens herdados"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13760,7 +13525,7 @@ msgstr "Triggers herdadas"
 msgid "Parent web scenarios"
 msgstr "Cenários web herdados"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13772,11 +13537,6 @@ msgstr ""
 msgid "Parse"
 msgstr "Processar"
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "Erro de análise SQL [%1$s] em [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Erro de análise"
@@ -13837,7 +13597,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr "Colar"
 
@@ -13847,15 +13607,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr "Colar sem os links externos"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13901,12 +13661,11 @@ msgstr "Executa uma consulta DNS. Retorna: texto com o tipo de informação requ
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Período"
 
@@ -13995,7 +13754,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Por favor informe o nome ou IP e a porta do servidor Zabbix, assim como um nome para esta instalação (opcional)."
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Favor selecionar dois elementos"
 
@@ -14035,7 +13794,7 @@ msgstr "Preencha o campo do inventário do host"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14124,7 +13883,7 @@ msgid "Previous month"
 msgstr "Mês anterior"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14255,7 +14014,7 @@ msgstr "Incidente não suprimido"
 msgid "Problem is suppressed"
 msgstr "Incidente suprimido"
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Incidente em"
 
@@ -14268,21 +14027,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr "Problema resolvido"
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14296,9 +14051,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Incidentes"
 
@@ -14332,7 +14087,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "Propriedades"
 
@@ -14353,13 +14108,13 @@ msgstr "A URL fornecida \"%1$s\" é inválida."
 msgid "Proxies"
 msgstr "Proxies"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14367,7 +14122,7 @@ msgstr "Proxies"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14377,12 +14132,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "O proxy \"%1$s\" para o host \"%2$s\" não existe."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr "O proxy \"%1$s\" é utilizado pela ação \"%2$s\"."
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "O proxy \"%1$s\" é utilizado pela regra de descoberta \"%2$s\"."
@@ -14475,7 +14230,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14552,10 +14307,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Valor recebido"
@@ -14637,7 +14388,7 @@ msgstr "Retângulo"
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr "Intervalo de atualização"
 
@@ -14655,13 +14406,13 @@ msgstr ""
 msgid "Regular"
 msgstr "Comum"
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Expressão regular"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14694,7 +14445,7 @@ msgstr "Expressões regulares"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14726,8 +14477,6 @@ msgstr "Comando remoto"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14748,7 +14497,9 @@ msgstr "Comando remoto"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14761,7 +14512,7 @@ msgstr "Comando remoto"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14838,8 +14589,8 @@ msgstr "Comando remoto"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Remover"
 
@@ -14879,7 +14630,7 @@ msgstr "Remover, %1$s"
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14921,7 +14672,7 @@ msgid "Replace dependencies"
 msgstr "Substituir dependências"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14976,7 +14727,7 @@ msgstr "Requisitar corpo"
 msgid "Request body type"
 msgstr "Solicitar tipo de corpo"
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr "Requisição enviada com sucesso"
 
@@ -15018,8 +14769,8 @@ msgstr "Código de status requerido"
 msgid "Required string"
 msgstr "Texto requerido"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Limpar"
 
@@ -15052,7 +14803,7 @@ msgstr "Confirmação de restauração"
 msgid "Reset defaults"
 msgstr "Restaurar padrões"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Resolvido"
 
@@ -15118,7 +14869,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Resultado"
@@ -15305,12 +15056,12 @@ msgstr "Executa o comando em no host. Retorna o texto retornado pelo comando; 1
 msgid "Russian (ru_RU)"
 msgstr "Russo (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "D"
@@ -15321,8 +15072,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15359,7 +15110,7 @@ msgstr "Porta do servidor SMTP"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15455,12 +15206,12 @@ msgstr "Total de SQL: %1$s (seleções: %2$s | execuções: %3$s)"
 msgid "SQL query"
 msgstr "Pesquisa SQL"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "A execução do comando SQL falhou \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "A execução do comando SQL falhou \"%1$s\"."
@@ -15523,7 +15274,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15535,7 +15286,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Sab"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -15577,7 +15328,7 @@ msgstr "Agendamento"
 msgid "Scheduled check"
 msgstr "Verificação agendada"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15644,7 +15395,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr "Escopo"
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15657,8 +15408,7 @@ msgstr "Escopo"
 msgid "Script"
 msgstr "Script"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "O scritp \"%1$s\" já existe."
@@ -15690,12 +15440,6 @@ msgstr "Nome script"
 msgid "Script parameters"
 msgstr "Parâmetros do script"
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "Está ausente o avanço de linha nos parâmetros do script \"%1$s\" para o tipo de mídia \"%2$s\"."
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Perfil do script"
@@ -15708,7 +15452,7 @@ msgstr "Script atualizado"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Scripts"
 
@@ -15778,8 +15522,8 @@ msgid "Security name"
 msgstr "Nome de segurança"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15787,7 +15531,7 @@ msgstr "Nome de segurança"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Selecionar"
 
@@ -15823,19 +15567,19 @@ msgstr "Elementos selecionados"
 msgid "Selected items only"
 msgstr "Itens selecionados somente"
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "Selecionado, %1$s na posição %2$d de %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "Selecionado, %1$s, apenas leitura, na posição %2$d de %3$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr "Enviar para trás"
 
@@ -15860,7 +15604,7 @@ msgstr "Enviar apenas para"
 msgid "Send to"
 msgstr "Enviar para"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr "Enviar para trás"
 
@@ -15893,7 +15637,7 @@ msgstr "Separados"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "Setembro"
 
@@ -15924,28 +15668,28 @@ msgstr "Servidor (proxy)"
 msgid "Server time"
 msgstr "Hora do servidor"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Serviços"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15955,7 +15699,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "Serviço criado"
 
@@ -15988,16 +15732,16 @@ msgstr "Porta"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "O horário de início do serviço deve ser menor que o horário de fim."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -16005,11 +15749,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Horário de serviço"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Tipo de serviço"
 
@@ -16018,30 +15762,29 @@ msgstr "Tipo de serviço"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Serviços atualizados"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Serviços"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "Os serviços formam uma dependência circular."
 
@@ -16049,7 +15792,7 @@ msgstr "Os serviços formam uma dependência circular."
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16079,7 +15822,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Defina o modo de inventário de host"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16108,7 +15851,7 @@ msgstr "Falha ao configurar o protocolo LDAP."
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr "A configuração de referências \"Off\" para o LDAP falhou."
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16117,7 +15860,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16173,7 +15916,7 @@ msgstr "Forma"
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "Compartilhamento"
 
@@ -16315,7 +16058,7 @@ msgstr "Exibir um alerta se o servidor Zabbix estiver fora do ar"
 msgid "Show working time"
 msgstr "Mostrar horário comercial"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Mostrar"
 
@@ -16424,7 +16167,7 @@ msgstr "Foi ignorada a cópia do gráfico \"%1$s\" para o host \"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "Eslovaco (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Soneca"
 
@@ -16470,7 +16213,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Ordenar entradas por"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Posicionar em (0->999)"
 
@@ -16544,7 +16287,7 @@ msgstr "Iniciar em"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16647,15 +16390,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Status"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Códigos de status"
@@ -16685,7 +16432,7 @@ msgstr "Somente status"
 msgid "Status problem"
 msgstr "Status de incidente"
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16733,7 +16480,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16798,7 +16545,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Segurado"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Submapa"
 
@@ -16814,7 +16561,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Sucesso na Auditoria"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr "Mensagem de sucesso"
 
@@ -16827,7 +16574,7 @@ msgstr "Sumarização das estatísticas de entrada e saída da interface de rede
 msgid "Sun"
 msgstr "Dom"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -16919,12 +16666,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Tempo desde a carga do sistema. Retorna: número inteiro"
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Q"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16951,17 +16698,17 @@ msgstr "VERDADEIRO"
 msgid "Table \"%1$s\" does not exist."
 msgstr "A tabela \"%1$s\" não existe."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "A tabela \"%1$s\" não possui um campo chamado \"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Plaqueta"
@@ -17017,7 +16764,7 @@ msgstr "Valor da etiqueta"
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17077,7 +16824,7 @@ msgstr "Tipo do destino"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17098,7 +16845,7 @@ msgstr "Template"
 msgid "Template \"%1$s\" already exists."
 msgstr "O template \"%1$s\" já existe."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17122,7 +16869,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "O template não pode ser vinculado a outro template mais de uma vez, mesmo que através de outros templates."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17182,7 +16929,7 @@ msgstr "Já existe template com o nome visível \"%1$s\"."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17354,14 +17101,14 @@ msgstr "O host não foi mais descoberto e será excluído em %1$s (às %2$s de %
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "O host não foi mais descoberto e será excluído na próxima vez que a autobusca for processada."
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "A imagem é utilizada no mapeamento de ícones %1$s."
 msgstr[1] "A imagem é utilizada no mapeamento de ícones %1$s."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17426,7 +17173,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Este mês"
 
@@ -17434,7 +17181,7 @@ msgstr "Este mês"
 msgid "This month so far"
 msgstr "Até agora neste mês"
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Esta semana"
 
@@ -17442,7 +17189,7 @@ msgstr "Esta semana"
 msgid "This week so far"
 msgstr "Até agora nesta semana"
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Este ano"
 
@@ -17462,7 +17209,7 @@ msgstr ""
 msgid "Thu"
 msgstr "Qui"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Quinta-feira"
 
@@ -17479,7 +17226,7 @@ msgstr "Até"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17512,7 +17259,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Intervalo"
 
@@ -17564,12 +17311,11 @@ msgstr "Hora"
 msgid "To"
 msgstr "Para"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "Para configurar a interface do host selecione somente itens do mesmo tipo"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Hoje"
 
@@ -17684,7 +17430,7 @@ msgstr "Período de retenção das estatísticas"
 msgid "Trends"
 msgstr "Estatísticas"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17692,7 +17438,7 @@ msgstr "Estatísticas"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Trigger"
 
@@ -17793,7 +17539,7 @@ msgstr "Nome da trigger"
 msgid "Trigger overview"
 msgstr "Visão geral triggers"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17866,11 +17612,11 @@ msgstr "Protótipos de trigger atualizados"
 msgid "Trigger severity"
 msgstr "Severidade da trigger"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "Status da trigger \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "Status da trigger \"Incidente\""
 
@@ -17887,7 +17633,7 @@ msgstr "Trigger atualizada"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17922,7 +17668,7 @@ msgstr "Remover espaços"
 msgid "Tue"
 msgstr "Ter"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Terça-feira"
 
@@ -17935,7 +17681,7 @@ msgstr "Turco (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Dois itens (\"%1$s\" e \"%2$s\") não podem popular um mesmo campo \"%3$s\" no inventário, isto pode gerar um conflito."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr "Dois elementos do mapa devem ser serlecionados"
 
@@ -17951,19 +17697,19 @@ msgstr "Dois elementos do mapa devem ser serlecionados"
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18015,7 +17761,7 @@ msgstr "Tipo de informação"
 msgid "Types"
 msgstr "Tipos"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18036,7 +17782,7 @@ msgstr "DESCONHECIDO"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18082,12 +17828,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "A URL deverá possuir os campos \"name\" e \"url\" no mapa \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URLs"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18172,12 +17918,12 @@ msgstr "Desbloquear"
 msgid "Unblock selected users?"
 msgstr "Desbloquear usuários selecionados?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18197,21 +17943,23 @@ msgstr "Unidades"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Desconhecido"
@@ -18229,7 +17977,7 @@ msgid "Unknown error"
 msgstr "Erro desconhecido"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Item de host desconhecido; não existe este item no host selecionado"
@@ -18282,7 +18030,7 @@ msgstr "Desassociar da template"
 msgid "Unlink from templates"
 msgstr "Desvincular dos templates"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Som"
 
@@ -18313,7 +18061,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "Parâmetro não suportado \"%2$s\" para uma condição de filtro na ação \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "O parâmetro \"%2$s\" não é suportado para condição de filtro na regra de descoberta \"%1$s\"."
@@ -18323,7 +18071,7 @@ msgstr "O parâmetro \"%2$s\" não é suportado para condição de filtro na reg
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "O parâmetro \"%2$s\" não é suportado para o filtro da ação \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "O parâmetro \"%2$s\" não é suportado para o filtro na regra de descoberta \"%1$s\"."
@@ -18368,7 +18116,7 @@ msgstr "Ligado"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18381,7 +18129,7 @@ msgstr "Ligado"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18434,7 +18182,7 @@ msgstr "Operações de atualização"
 msgid "Update problem"
 msgstr "Problema de atualização"
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18452,7 +18200,7 @@ msgstr "Enviar"
 msgid "Upper level maps"
 msgstr "Mapas de nível superior"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18487,7 +18235,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "Usado nas ações"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18502,7 +18250,7 @@ msgstr "Usado nas ações"
 msgid "User"
 msgstr "Usuário"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "O usuário \"%1$s\" não pode ficar sem grupo."
@@ -18554,7 +18302,7 @@ msgstr "Usuário incluído"
 msgid "User agent string"
 msgstr "Mensagem do agente de usuário"
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Um usuário não pode se adicionar em um grupo desativado ou em um grupo com acesso à interface web desativado."
@@ -18574,7 +18322,7 @@ msgid_plural "Users deleted"
 msgstr[0] "Usuário removido"
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18584,27 +18332,27 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Grupo de usuários"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "O grupo \"%1$s\" já existe."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "O grupo de usuários \"%1$s\" é utilizado na ação \"%2$s\"."
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "O grupo de usuários \"%1$s\" está configurado para alerta de quedas de banco de dados."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "O grupo de usuários \"%1$s\" é utilizado pelo script \"%2$s\"."
@@ -18638,8 +18386,8 @@ msgstr[1] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18683,14 +18431,14 @@ msgstr "Senha do usuário"
 msgid "User profile"
 msgstr "Dados personalizados do usuário"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18759,7 +18507,7 @@ msgstr "Usuário atualizado"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "O usuário com o ID \"%1$s\" não está disponível."
@@ -19075,14 +18823,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19092,7 +18840,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19134,7 +18882,7 @@ msgstr "O valor \"%1$s\" é inválido para o parâmetro \"grid_show\". As opçõ
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "O valor \"%1$s\" é inválido para o parâmetro \"grid_show\". As opções são: \"%2$s\"."
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "O valor \"%1$s\" é muito grande para o campo \"%2$s\" - %3$d caracteres. O máximo permitido é de %4$d caracteres."
@@ -19151,7 +18899,7 @@ msgstr "Estatísticas do cache de valores. Modos válidos: total, free, pfree, u
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Valores"
 
@@ -19194,11 +18942,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "Valor de um contador de performance do Windows. Retorna: inteiro, número fracionário ou texto (dependendo da requisição)"
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19245,7 +18994,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19332,7 +19081,7 @@ msgstr "O nome visível não pode ser vazio se o nome do host não for informado
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Q"
@@ -19349,7 +19098,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Aviso"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19358,7 +19107,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Desculpe, mas o número máximo de elementos a recordar foi atingido."
 
@@ -19374,7 +19123,7 @@ msgstr "Desculpe, mas o número máximo de elementos a recordar foi atingido."
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web"
 
@@ -19386,7 +19135,7 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Monitoramento web"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr "Cenário web"
 
@@ -19401,27 +19150,27 @@ msgstr "Já existe o cenário web \"%1$s\" no host \"%2$s\"."
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "O cenário web \"%1$s\" já existe."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "Cenário web adicionado"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Cenário web excluído"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Cenário web desativado"
 msgstr[1] "Cenários web desativados"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Cenário web ativado"
 msgstr[1] "Cenários web ativados"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "Cenário web atualizado"
 
@@ -19443,7 +19192,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Qua"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
@@ -19454,7 +19203,7 @@ msgstr "Quarta-feira"
 msgid "Weekly"
 msgstr "Semanal"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19470,12 +19219,12 @@ msgstr "Bem vindo a"
 msgid "When active"
 msgstr "Ativo quando"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19670,6 +19419,10 @@ msgstr "d/m/Y H:i"
 msgid "Y-m-d H:i:s"
 msgstr "d-m-Y H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr "Y1"
@@ -19731,7 +19484,7 @@ msgstr "Anual"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19788,18 +19541,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19811,9 +19558,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Você não tem permissão para executar esta operação."
 
@@ -19929,24 +19673,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr "é aguardado um valor booleano"
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "um texto é esperado"
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19955,37 +19703,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr "é aguardado um valor numérico"
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr "número muito grande"
@@ -20006,28 +19754,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr "um horário é aguardado"
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr "é aguardado um período de tempo"
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr "um período de tempo é aguardado"
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr "uma unidade de tempo é aguardada"
@@ -20075,7 +19824,7 @@ msgstr "todos"
 msgid "all media"
 msgstr "todas as mídias"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20083,42 +19832,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "um array é aguardado"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr "é esperado um array ou sequência de caracteres"
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20128,7 +19872,7 @@ msgid "an empty string is expected"
 msgstr "um texto vazio é esperado"
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr "é aguardado um par de caracteres hexadecimais"
 
@@ -20136,11 +19880,15 @@ msgstr "é aguardado um par de caracteres hexadecimais"
 msgid "an explicit time is expected"
 msgstr "um horário explícito é esperado"
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20301,14 +20049,8 @@ msgstr "não pode ser modificado"
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20338,19 +20080,11 @@ msgstr "não pode ser modificado"
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20370,14 +20104,14 @@ msgstr "não pode ser modificado"
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20385,7 +20119,7 @@ msgstr "não pode ser modificado"
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "não pode ser vazio"
@@ -20398,7 +20132,7 @@ msgstr "não é possível converter para JSON, o valor resultante é muito longo
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr "não foi possível executar a solicitação de rolagem de API, os dados podem estar truncados"
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20432,7 +20166,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "dependência circular entre itens não é permitida"
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20450,7 +20184,8 @@ msgid "configure"
 msgstr "configurar"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr "contêm"
@@ -20479,7 +20214,7 @@ msgstr "count() - Quantidade de valores V recuperados com sucesso (que correspon
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20541,7 +20276,7 @@ msgstr "descedente"
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20563,13 +20298,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr "não contêm"
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr "não é igual"
@@ -20595,7 +20330,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20632,6 +20368,10 @@ msgstr "a expressão está vazia"
 msgid "failed to parse JSON"
 msgstr "falha ao analisar o JSON"
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20678,7 +20418,7 @@ msgstr "configurações globais de limpeza de dados"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20719,6 +20459,11 @@ msgstr "ícone"
 msgid "image"
 msgstr "imagem"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "em"
@@ -20759,15 +20504,19 @@ msgstr "contagem de elementos incorreta"
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "sintaxe incorreta próximo de \"%1$s\""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20796,7 +20545,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr "intervalo de endereços inválido \"%1$s\""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr "sequência de bytes inválida no UTF-8"
 
@@ -20825,27 +20574,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr "período inválido para a retenção de histórico"
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr "nome inválido de grupo de hosts"
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr "nome inválido de host"
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr "expressão regular inválida"
 
@@ -20873,7 +20622,7 @@ msgstr "é maior ou igual"
 msgid "is less than or equals"
 msgstr "é menor ou igual"
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr "não está entre {} ou está mal formado"
 
@@ -20959,12 +20708,12 @@ msgstr "regra de autobusca (LLD)"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -21023,7 +20772,7 @@ msgstr "correspondências"
 msgid "max"
 msgstr "máx"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21063,7 +20812,7 @@ msgid "min() - Minimum value for period T"
 msgstr "min() - Valor mínimo em um período T"
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr "o tamanho mínimo é %1$s caracteres"
@@ -21090,8 +20839,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21106,27 +20855,14 @@ msgstr "necessário um usuário LDAP válido"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "precisa estar entre \"%1$s\" e \"%2$s\""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr "precisa conter ao menos uma macro de descoberta"
 
@@ -21154,6 +20890,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21164,7 +20908,7 @@ msgstr ""
 msgid "name"
 msgstr "nome"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "novo"
 
@@ -21299,7 +21043,7 @@ msgstr "saída"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21334,24 +21078,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21379,11 +21127,11 @@ msgstr ""
 msgid "regular expression"
 msgstr "expressão regular"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21395,15 +21143,15 @@ msgstr ""
 msgid "right"
 msgstr "direita"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21451,7 +21199,7 @@ msgstr ""
 msgid "short description"
 msgstr "descrição curta"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21470,15 +21218,15 @@ msgstr "descrição curta"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr "deve estar vazio"
 
@@ -21494,31 +21242,31 @@ msgstr "mostrar mapeamento de ícones"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21526,11 +21274,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr "sum() - Total de valores em um período T"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21546,8 +21294,8 @@ msgstr "as credenciais informadas não são únicas"
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21558,7 +21306,7 @@ msgstr "as credenciais informadas não são únicas"
 msgid "tag"
 msgstr "etiqueta"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21567,13 +21315,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "template ID \"%1$s\" foi definido %2$s vezes"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21582,20 +21334,20 @@ msgstr "template ID \"%1$s\" foi definido %2$s vezes"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "o parâmetro \"%1$s\" está ausente"
@@ -21627,39 +21379,39 @@ msgstr "terceiro"
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr "mudança de horário"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr "time() - Hora atual"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr "timeleft() - Tempo para alcançar o limite estimado com base no período T"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21673,7 +21425,7 @@ msgstr "trigger"
 msgid "trigger does not allow manual closing"
 msgstr "a trigger não permite fechamento manual"
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21685,26 +21437,26 @@ msgstr "um protótipo de trigger não pode ser movido para outro template ou hos
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr "uma trigger com associações não pode ser movida para outro template ou host"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "informe aqui o argumento para pesquisa"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21712,11 +21464,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21733,10 +21485,10 @@ msgstr "final inesperado da chave"
 msgid "unexpected end of macro"
 msgstr "fim inesperado da macro"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21746,11 +21498,12 @@ msgstr "fim inesperado da macro"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr "parâmetro não aguardado: %1$s"
@@ -21776,8 +21529,8 @@ msgstr "texto inesperado \"%1$s\""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21802,6 +21555,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr "número de versão não suportado"
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21817,7 +21574,7 @@ msgstr "número de versão não suportado"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21837,11 +21594,11 @@ msgstr "número de versão não suportado"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "valor"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21859,76 +21616,85 @@ msgstr "o valor \"%1$s\" não foi encontrado"
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr "o valor %1$s já existe"
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr "o valor é muito grande"
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21940,18 +21706,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr "o valor precisa ser um de %1$s"
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21960,7 +21724,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21973,11 +21737,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21995,7 +21759,7 @@ msgstr "tipo errado de regra de descoberta"
 msgid "wrong item type"
 msgstr "tipo errado de item"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "a"
diff --git a/ui/locale/pt_PT/LC_MESSAGES/frontend.po b/ui/locale/pt_PT/LC_MESSAGES/frontend.po
index eeda8e5a838..c5df636a29a 100644
--- a/ui/locale/pt_PT/LC_MESSAGES/frontend.po
+++ b/ui/locale/pt_PT/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2013-10-10 08:35+0300\n"
 "Last-Translator: richlv <richlv@nakts.net>\n"
 "Language-Team: none\n"
@@ -93,7 +93,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d dia"
 msgstr[1] "%1$d dias"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -178,7 +178,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -192,7 +192,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -225,14 +225,14 @@ msgstr[1] "restam %1$s tentativas"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s segundo"
 msgstr[1] "%1$s segundos"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -252,13 +252,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -388,7 +388,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -449,10 +449,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "Acesso negado"
@@ -495,7 +491,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Reconhecido"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Reconhecer"
 
@@ -503,7 +499,7 @@ msgstr "Reconhecer"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Reconhecido"
@@ -516,7 +512,7 @@ msgstr "Eventos PROBLEMA reconhecidos"
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -543,9 +539,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -602,7 +598,7 @@ msgstr "Acção \"%1$s\" já existe."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Acção \"%1$s\" sem operações definidas."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -611,7 +607,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Acção adicionada"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -660,8 +656,8 @@ msgstr "Acção actualizada"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Acções"
@@ -728,7 +724,7 @@ msgstr "Activo até"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -739,7 +735,7 @@ msgstr "Activo até"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -762,9 +758,9 @@ msgstr "Activo até"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -834,7 +830,7 @@ msgstr "Activo até"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Adicionar"
 
@@ -842,11 +838,11 @@ msgstr "Adicionar"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "Adicionar novo widget"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "Adicionar elemento filho"
 
@@ -854,7 +850,7 @@ msgstr "Adicionar elemento filho"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -871,7 +867,7 @@ msgstr "Adicionar host"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "Adicionar multiplos mapas"
 
@@ -893,7 +889,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -945,12 +941,12 @@ msgstr ""
 msgid "Add widget"
 msgstr "Adicionar widget"
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -960,7 +956,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -973,7 +969,7 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administração"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -995,7 +991,7 @@ msgstr "Idade menor que"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1067,7 +1063,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Tudo"
 
@@ -1085,7 +1081,7 @@ msgstr "Todos os grupos"
 msgid "All hosts"
 msgstr "Todos os hosts"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Todos os links devem ter \"Nome\" e \"URL\" definidos"
 
@@ -1103,7 +1099,7 @@ msgstr "Todos os problemas"
 msgid "All problems if tag values match"
 msgstr "Todos os problemas em que o valor da etiqueta seja igual"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1216,15 +1212,15 @@ msgstr "Erro na aplicação."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1242,7 +1238,7 @@ msgstr "Aproximando"
 msgid "Apr"
 msgstr "Abr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Abril"
 
@@ -1270,7 +1266,7 @@ msgstr "Tipo de área"
 msgid "Arithmetic"
 msgstr "Aritimética"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1317,7 +1313,7 @@ msgstr "Às (horas:minutos)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1326,7 +1322,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1338,6 +1334,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1349,7 +1350,7 @@ msgstr "Tem de ser criado pelo menos um período de manutenção."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1405,7 +1406,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Ago"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Agosto"
 
@@ -1418,7 +1419,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1495,7 +1496,7 @@ msgstr "Logout automático"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1510,7 +1511,7 @@ msgstr "Mapeamento automático de icones"
 msgid "Automatic icon selection"
 msgstr "Selecção automática de ícones"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1562,7 +1563,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1625,7 +1626,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "Azul"
 
@@ -1679,11 +1680,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Abaixo"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "Trazer para frente"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "Levar para tráz"
 
@@ -1709,7 +1710,7 @@ msgstr "CERTIFICADO"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1754,8 +1755,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1764,7 +1765,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Calculado"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1789,7 +1790,7 @@ msgstr "Callback"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1802,8 +1803,8 @@ msgstr "Callback"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1833,7 +1834,7 @@ msgstr "Não foi possível adicionar acção"
 msgid "Cannot add correlation"
 msgstr "Não foi possível adicionar correlação"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1843,7 +1844,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Não foi possível adicionar dependência de um host para um template."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1874,8 +1875,8 @@ msgid "Cannot add host prototype"
 msgstr "Não foi possível adicionar o protótipo de host"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Não foi possível adicionar imagem"
 
@@ -1967,15 +1968,15 @@ msgstr "Não foi possível adicionar utilizador"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Não foi possível adicionar a apresentação de ecrãs"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1995,33 +1996,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Não foi possível limpar o histórico"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Não foi possível clonar protótipos do gráfico."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "Não é possível clonar protótipos de host."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Não foi possível clonar protótipos do item."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Não foi possível clonar protótipos do trigger."
 
@@ -2048,7 +2045,7 @@ msgid_plural "Cannot copy graphs"
 msgstr[0] "Não foi possível copiar o gráfico"
 msgstr[1] "Não foi possível copiar os gráficos"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "Não foi possível copiar o item"
@@ -2100,8 +2097,8 @@ msgstr "Não foi possível criar o mapa de ícones"
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2130,7 +2127,7 @@ msgstr "Não é possível eliminar o utilizador interno do Zabbix \"%1$s\", tent
 msgid "Cannot delete action"
 msgstr "Não foi possível eliminar acção"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2198,7 +2195,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2209,11 +2206,11 @@ msgstr[1] ""
 msgid "Cannot delete host prototypes"
 msgstr "Não é possível eliminar protótipos de hosts"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Não foi possível eliminar mapa de ícones"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Não foi possível eliminar imagem"
 
@@ -2238,7 +2235,7 @@ msgstr "Protótipo de item não eliminado"
 msgid "Cannot delete item prototypes"
 msgstr "Protótipos de item não eliminado"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Não foi possível eliminar itens"
 
@@ -2269,7 +2266,7 @@ msgid_plural "Cannot delete proxies"
 msgstr[0] "Não foi possível eliminar proxy"
 msgstr[1] "Não foi possível eliminar proxy"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2292,7 +2289,7 @@ msgid_plural "Cannot delete scripts"
 msgstr[0] "Não foi possível eliminar script"
 msgstr[1] "Não foi possível eliminar script"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Não foi possível eliminar scripts. Script \"%1$s\" está a ser utilizado na acção \"%2$s\"."
@@ -2308,8 +2305,8 @@ msgid_plural "Cannot delete services"
 msgstr[0] "Não foi possível eliminar serviço"
 msgstr[1] "Não foi possível eliminar serviço"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2338,7 +2335,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr "Não foi possível eliminar item do template."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Não foi possível eliminar itens do template."
 
@@ -2391,7 +2388,7 @@ msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Não foi possível eliminar o cenário web"
 
@@ -2426,7 +2423,7 @@ msgid_plural "Cannot disable hosts"
 msgstr[0] "Não foi possível desactivar o host"
 msgstr[1] "Não foi possível desactivar os hosts"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Não foi possível desactivar o item"
@@ -2457,7 +2454,7 @@ msgid_plural "Cannot disable triggers"
 msgstr[0] "Não foi possível desactivar o trigger"
 msgstr[1] "Não foi possível desactivar os triggers"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Não foi possível desactivar o cenário web"
@@ -2504,7 +2501,7 @@ msgid_plural "Cannot enable hosts"
 msgstr[0] "Não foi possível activar o host"
 msgstr[1] "Não foi possível activar os hosts"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Não foi possível activar o item"
@@ -2535,7 +2532,7 @@ msgid_plural "Cannot enable triggers"
 msgstr[0] "Não foi possível activar a trigger"
 msgstr[1] "Não foi possível activar as triggers"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Não foi possível activar o cenário web"
@@ -2549,7 +2546,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr "Não foi possível expandir as macros."
 
@@ -2583,8 +2580,8 @@ msgstr "Não foi possível encontrar host \"%1$s\" utilizado no mapa \"%2$s\"."
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Não foi possível localizar o grupo de host \"%1$s\" para o protótipo de host \"%2$s\" da autodescoberta \"%3$s\" em \"%4$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2682,24 +2679,20 @@ msgstr "Não foi possível localizar o mapeamento de valores \"%1$s\" utilizado
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Não foi possível localizar o mapeamento de valores \"%1$s\" utilizado para o protótipo de item \"%2$s\" da autodescoberta \"%3$s\" em \"%4$s\"."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "Não é possível ter um template sem nome visível."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2712,7 +2705,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
 msgstr[0] "Não foi possível importar o template \"%1$s\", vinculado com o template \"%2$s\" que não existe."
 msgstr[1] "Não foi possível importar o template \"%1$s\", vinculado com os templates \"%2$s\" que não existem."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "Não foi possível incluir a expressão de trigger"
 
@@ -2726,7 +2719,7 @@ msgid "Cannot link template."
 msgstr "Não foi possível vincular ao template."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2758,17 +2751,17 @@ msgstr "Não é possível actualizar em massa o nome visível do template."
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Não é possível executar uma operação DELETE na tabela \"%1$s\" sem uma condição WHERE."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Não é possível executar uma operação UPDATE na tabela \"%1$s\" sem valores."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Não é possível executar uma operação UPDATE na tabela \"%1$s\" sem uma condição WHERE."
@@ -2795,7 +2788,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Não é possível receber a resposta, verifique a comunicação com o servidor Zabbix \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Não é possível renomear o utilizador convidado."
 
@@ -2814,7 +2807,7 @@ msgstr "Não foi possível salvar o widget \"%1$s\"."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Não foi possível enviar o comando, verifique a comunicação com o servidor Zabbix \"%1$s\"."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2854,12 +2847,12 @@ msgstr "Não é possível configurar campos do inventário com o inventário des
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2878,7 +2871,7 @@ msgid_plural "Cannot unblock users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Não foi possível desvincular e limpar os cenários web."
 
@@ -2891,7 +2884,7 @@ msgstr "Não foi possível desvincular o template"
 msgid "Cannot unlink template."
 msgstr "Não foi possível desvincular ao template."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2944,11 +2937,6 @@ msgstr "Não foi possível actualizar \"%2$s\" para o item descoberto \"%1$s\"."
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "Não foi possível actualizar \"%2$s\" para o trigger descoberta \"%1$s\"."
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "Não foi possível actualizar o \"imagetype\" para a imagem \"%1$s\"."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2958,9 +2946,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "Não é possível actualizar um gráfico descoberto."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "Não é possível actualizar um grupo de hosts descoberto."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3019,9 +3008,7 @@ msgstr "Não foi possível actualizar o protótipo de gráfico"
 msgid "Cannot update group"
 msgstr "Não foi possível actualizar o grupo"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Não é possível actualizar os grupos para o host descoberto \"%1$s\"."
@@ -3044,13 +3031,13 @@ msgstr[1] "Não foi possível actualizar os protótipos de host"
 msgid "Cannot update hosts"
 msgstr "Não foi possível actualizar os hosts"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "Não foi possível actualizar o mapeamento de ícones"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Não foi possível actualizar a imagem"
 
@@ -3104,12 +3091,12 @@ msgstr "Não foi possível actualizar o mapa de rede"
 msgid "Cannot update proxy"
 msgstr "Não foi possível actualizar o proxy"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Não é possível actualizar o proxy para o host descoberto \"%1$s\"."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3129,17 +3116,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Não foi possível actualizar o script"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3214,7 +3201,7 @@ msgstr[1] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Não foi possível actualizar o cenário web"
 
@@ -3314,8 +3301,8 @@ msgid "Character string not included"
 msgstr "Sequência de caracteres não incluídos"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3430,7 +3417,7 @@ msgstr "Verifica a performance de um serviço UDP. Retornos possíveis: 0 - serv
 msgid "Checks should be unique."
 msgstr "As verificações devem ser únicas."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3451,7 +3438,7 @@ msgstr "Existe uma referência circular nos templates: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "Não é possível criar link circular entre templates."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3472,11 +3459,11 @@ msgstr "Limpar histórico e tendências"
 msgid "Clear when unlinking"
 msgstr "Limpar ao desvincular"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3491,7 +3478,7 @@ msgstr "Relógio"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3506,7 +3493,7 @@ msgstr "Relógio"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Clonar"
 
@@ -3517,8 +3504,8 @@ msgstr "Clonar"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Fechar"
 
@@ -3529,13 +3516,13 @@ msgstr "Fechar"
 msgid "Close expression constructor"
 msgstr "Fechar o construtor de expressões"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Fechar novo evento"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Fechar eventos antigos"
 
@@ -3548,8 +3535,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "Recolher"
 
@@ -3566,7 +3553,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3632,7 +3619,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr "Sessões concorrentes"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3643,17 +3630,12 @@ msgstr "Condição"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "A condição \"%2$s\" não é utilizada na fórmula \"%3$s\" da acção \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "A condição \"%2$s\" não é utilizada na fórmula \"%3$s\" para o correlacionamento \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "A condição \"%2$s\" não é utilizada pela fórmula \"%3$s\" da regra de descoberta \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3663,17 +3645,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "A condição \"%2$s\" utilizada na fórmula \"%3$s\" para a acção \"%1$s\" não foi definida."
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "A condição \"%2$s\" utilizada na fórmula \"%3$s\" para o correlacionamento \"%1$s\" não foi definida."
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "A condição \"%2$s\" utilizada na fórmula \"%3$s\" da regra de descoberta \"%1$s\" não está definida."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3689,7 +3666,7 @@ msgstr "Condições"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Configuração"
 
@@ -3752,7 +3729,7 @@ msgstr "Configuração de hosts"
 msgid "Configuration of housekeeping"
 msgstr "Configuração de limpeza de dados"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Configuração de mapeamento de ícones"
@@ -3859,7 +3836,7 @@ msgstr "Texto de confirmação"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "Parabéns! Instalou com sucesso a interface web do Zabbix."
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3952,7 +3929,7 @@ msgstr "Contacto"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4012,7 +3989,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -4051,8 +4028,8 @@ msgstr "Coordenadas"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Copiar"
 
@@ -4061,12 +4038,11 @@ msgstr "Copiar"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "Correlacionamento"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "O correlacionamento \"%1$s\" já existe."
@@ -4094,16 +4070,6 @@ msgid_plural "Correlations enabled"
 msgstr[0] "Correlacionamento activado"
 msgstr[1] "Correlacionamentos activados"
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "Correlacionamento com parâmetro ausente: %1$s"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "O nome do correlacionamento não pode ser vazio."
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr "Regra de correlação"
@@ -4112,14 +4078,10 @@ msgstr "Regra de correlação"
 msgid "Correlation updated"
 msgstr "Correlacionamento actualizado"
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Não foi possível guardar a imagem!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Contador"
 
@@ -4183,11 +4145,11 @@ msgstr "Criar correlacionamento"
 msgid "Create dashboard"
 msgstr "Criar dashboard"
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr "Criar item dependente"
 
@@ -4304,7 +4266,7 @@ msgstr "Criar mapa"
 msgid "Create media type"
 msgstr "Criar tipo de média"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "Criar novo"
 
@@ -4328,7 +4290,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Criar template"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Criar trigger"
 
@@ -4491,7 +4453,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "Nome DNS"
@@ -4503,11 +4465,11 @@ msgstr "Nome DNS"
 msgid "Daily"
 msgstr "Diário"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "Escuro"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4528,8 +4490,8 @@ msgstr "O dashboard \"%1$s\" já existe."
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr "Dashboard criado"
 
@@ -4552,9 +4514,9 @@ msgstr "Propriedades do dashboard"
 msgid "Dashboard sharing"
 msgstr "Partilha de dashboard"
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr "Dashboard actualizado"
 
@@ -4578,7 +4540,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr "Dashboards"
 
@@ -4606,7 +4568,7 @@ msgstr "Vista geral de dados"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4748,7 +4710,7 @@ msgstr "Dia da semana"
 msgid "Days"
 msgstr "Dias"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Debug"
 
@@ -4762,26 +4724,26 @@ msgstr "Modo de debug"
 msgid "Dec"
 msgstr "Dez"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Dezembro"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Por omissão"
 
@@ -4874,7 +4836,7 @@ msgstr "Atrasado em"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4898,8 +4860,8 @@ msgstr "Atrasado em"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -4924,11 +4886,11 @@ msgstr "Eliminar e limpar template? (Atenção: todos os hosts associados serão
 msgid "Delete current action?"
 msgstr "Eliminar acção actual?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "Eliminar o correlacionamento atual?"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr "Eliminar o dashboard?"
 
@@ -4972,7 +4934,7 @@ msgstr "Eliminar o protótipo de item?"
 msgid "Delete item?"
 msgstr "Eliminar item?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Eliminar associações entre os elementos seleccionados?"
 
@@ -5028,7 +4990,7 @@ msgstr "Eliminar os dashboards selecionados?"
 msgid "Delete selected discovery rules?"
 msgstr "Eliminar regras de descoberta seleccionadas?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Eliminar elementos seleccionados?"
 
@@ -5134,7 +5096,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "Eliminar as formas seleciondas?"
 
@@ -5178,7 +5140,7 @@ msgstr "Eliminar trigger?"
 msgid "Delete web scenario?"
 msgstr "Eliminar cenário web?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5223,7 +5185,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Dependências"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Dependente"
 
@@ -5231,7 +5193,7 @@ msgstr "Dependente"
 msgid "Dependent item"
 msgstr "Item dependente"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5241,7 +5203,7 @@ msgstr "Depende de"
 msgid "Deployment status"
 msgstr "Estado de deployment"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5274,7 +5236,7 @@ msgid "Description"
 msgstr "Descrição"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5440,10 +5402,10 @@ msgstr "Desactivar os cenários web selecionados?"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5526,7 +5488,7 @@ msgid "Discovery by proxy"
 msgstr "Descoberta por proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Verificação de descoberta"
 
@@ -5538,7 +5500,7 @@ msgstr "Verificações de descoberta"
 msgid "Discovery list"
 msgstr "Lista de descobertas"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Objecto de descoberta"
 
@@ -5570,7 +5532,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5578,12 +5540,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Regra de descoberta"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Regra de descoberta \"%1$s\" já existe em \"%2$s\", herdada de outro template."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "A regra de descoberta \"%1$s\" já existe em \"%2$s\"."
@@ -5596,7 +5558,7 @@ msgstr "A regra de descoberta \"%1$s\" já existe em \"%2$s\"."
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "A regra de descoberta \"%1$s\" já existe."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5638,7 +5600,7 @@ msgstr "Regra de descoberta actualizada"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5649,7 +5611,7 @@ msgstr "Regras de descoberta"
 msgid "Discovery rules deleted"
 msgstr "Regras de descoberta eliminadas"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Estado da descoberta"
@@ -5686,10 +5648,11 @@ msgid "Display stacked graph"
 msgstr "Mostrar gráfico empilhado"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "A mostrar %1$s de %2$s encontrados"
@@ -5699,7 +5662,7 @@ msgstr "A mostrar %1$s de %2$s encontrados"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "Apresentando %1$s até %2$s de %3$s encontrados"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5721,7 +5684,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Deseja substituir a expressão condicional?"
 
@@ -5777,7 +5740,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Descer"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5785,7 +5748,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr "Transferir a configuração"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5804,18 +5767,6 @@ msgstr ""
 msgid "Draw style"
 msgstr "Estilo de desenho"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "Valor \"%1$s\" duplicado \"%2$s\" para a correlação \"%3$s\"."
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr "Valor \"%1$s\" duplicado \"%2$s\" na correlaçã."
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5828,11 +5779,6 @@ msgstr "O valor fornecido para o \"nome\" do mapa \"%1$s\" está duplicado."
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5884,7 +5830,7 @@ msgstr "Item dinâmico"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Cada URL deve ter um nome único. Certifique-se que existe apenas um URL com esse nome"
 
@@ -5893,11 +5839,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5911,8 +5857,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Editar"
 
@@ -5928,11 +5874,11 @@ msgstr "Editar mapa"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr "Editar árvore de elementos"
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Editar trigger"
 
@@ -5992,21 +5938,17 @@ msgstr "Arquivo de chave SSL ausente para o cenário web \"%1$s\"."
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "ID de correlação vazio."
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "Condição de filtro vazia na fórmula ID da acção \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "O ID da condição de filtro está vazio na regra de descoberta \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "A condição da regra de descoberta \"%1$s\" está com filtro vazio."
@@ -6022,25 +5964,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6050,14 +5986,6 @@ msgstr "Parâmetro de entrada vazio."
 msgid "Empty map ID."
 msgstr "ID de mapa vazio."
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "O ID do tipo de mídia está ausente."
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Parâmetros vazios"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6223,7 +6151,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6234,7 +6162,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6277,7 +6205,7 @@ msgid "English (en_US)"
 msgstr "Inglês (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6293,7 +6221,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6312,12 +6240,12 @@ msgstr ""
 msgid "Error"
 msgstr "Erro"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Erro no pedido de pesquisa para a tabela \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6345,7 +6273,7 @@ msgstr "ID do evento"
 msgid "Event acknowledged"
 msgstr "Evento reconhecido"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6353,7 +6281,7 @@ msgid "Event correlation"
 msgstr "Correlacionamento de eventos"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "Regras de correlacionamento de eventos"
@@ -6388,11 +6316,11 @@ msgstr "Monitoração do log de eventos. Retorna: log"
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "Conjunto de etiqueta de evento"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Tipo do evento"
 
@@ -6437,15 +6365,10 @@ msgstr "Eliminar"
 msgid "Exclude host groups"
 msgstr "Eliminar grupos de hosts"
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Executar"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "Erro de execução SQL [%1$s] em [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6483,7 +6406,7 @@ msgstr "Executado"
 msgid "Executed script"
 msgstr "Script executado"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Confirmação de execução"
 
@@ -6499,8 +6422,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "Expandir"
 
@@ -6621,7 +6544,7 @@ msgstr "Expressões"
 msgid "External check"
 msgstr "Verificação externa"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "S"
@@ -6648,8 +6571,8 @@ msgstr "Falhou"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6660,26 +6583,26 @@ msgstr "Falha ao criar o dashboard"
 msgid "Failed to parse URL."
 msgstr "Falha ao processar a URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr "Falha ao atualizar o dashboard"
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6687,7 +6610,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Falha ao atualizar o template."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6711,7 +6634,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Fev"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Fevereiro"
 
@@ -6733,10 +6656,9 @@ msgstr "O campo \"%1$s\" não pode ser definido como NULO."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6747,13 +6669,6 @@ msgstr "O campo \"%1$s\" é obrigatório."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "No mapa \"%2$s\" o campo \"%1$s\" está com valor ausente."
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "O campo \"%1$s\" está ausente para um valor do tipo de mídia \"%2$s\"."
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6772,11 +6687,6 @@ msgstr "O campo \"%1$s\" não é um inteiro."
 msgid "Field \"%1$s\" is not string."
 msgstr "O campo \"%1$s\" não é um texto."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "O campo \"%1$s\" é necessário no tipo de mídia \"%2$s\"."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6791,10 +6701,6 @@ msgstr "O campo \"host\" é obrigatório."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "O formato do ficheiro não é suportado."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6859,7 +6765,8 @@ msgstr "Região preenchida"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6884,7 +6791,7 @@ msgstr "Filtro"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6936,7 +6843,7 @@ msgstr "Ajustar ao mapa"
 msgid "Fixed"
 msgstr "Fixo"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6987,12 +6894,12 @@ msgstr "Fórmula"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7005,7 +6912,7 @@ msgstr "Francês (fr_FR)"
 msgid "Fri"
 msgstr "Sex"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Sexta-feira"
 
@@ -7116,7 +7023,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "A expressão fornecida não é uma macro"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr "A expressão regular \"%1$s\" não existe."
@@ -7130,7 +7037,7 @@ msgstr "Valor global"
 msgid "Go back to %1$s"
 msgstr "Voltar para %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Ir para"
 
@@ -7168,7 +7075,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7176,7 +7083,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Linha de gradiente"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7236,7 +7143,7 @@ msgstr[1] "Gráficos copiados"
 msgid "Graph deleted"
 msgstr "Gráfico eliminado"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7273,8 +7180,8 @@ msgstr "Protótipo de gráfico eliminado"
 msgid "Graph prototype updated"
 msgstr "Protótipo de gráfico actualizado"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr "O protótipo de gráfico com o ID \"%1$s\" não está disponível."
@@ -7308,8 +7215,8 @@ msgstr "Tipo de gráfico"
 msgid "Graph updated"
 msgstr "Gráfico actualizado"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr "O gráfico com o ID \"%1$s\" não está disponível."
@@ -7340,7 +7247,7 @@ msgstr "Já existe um gráfico com o nome \"%1$s\" em gráficos ou protótipos d
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Gráficos"
 
@@ -7361,12 +7268,12 @@ msgstr "Grelha"
 msgid "Group"
 msgstr "Grupo"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "O grupo \"%1$s\" não pode ser eliminado por ser utilizado em um protótipo de host."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr "O grupo \"%1$s\" não pode ser eliminado, pois é utilizado em condição de correlacionamento."
@@ -7540,11 +7447,11 @@ msgstr "Ajuda"
 msgid "Hexadecimal to decimal"
 msgstr "Hexadecimal para decimal"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Oculto"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "Ocultar depuração"
 
@@ -7571,11 +7478,11 @@ msgstr ""
 msgid "High"
 msgstr "Alta"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7596,7 +7503,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Histórico"
 
@@ -7604,11 +7511,15 @@ msgstr "Histórico"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Histórico eliminado"
 
@@ -7651,7 +7562,7 @@ msgstr "Horizontal"
 msgid "Horizontal align"
 msgstr "Alinhamento horizontal"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7680,7 +7591,7 @@ msgstr "Alinhamento horizontal"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7694,7 +7605,7 @@ msgstr[1] "Host"
 msgid "Host \"%1$s\" already exists."
 msgstr "O host \"%1$s\" já existe."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7702,7 +7613,7 @@ msgstr "O host \"%1$s\" já existe."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "O host \"%1$s\" não pode ficar sem grupo."
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7754,7 +7665,7 @@ msgid_plural "Hosts enabled"
 msgstr[0] "Host activado"
 msgstr[1] "Hosts activados"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7768,22 +7679,22 @@ msgstr[1] "Hosts activados"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Grupo de hosts"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Grupo de hosts \"%1$s\" já existe."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "O grupo de hosts \"%1$s\" não pode ser eliminado pois é utilizado por um script global."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7796,10 +7707,10 @@ msgstr "Elementos do grupo de hosts"
 msgid "Host group label type"
 msgstr "Tipo de etiqueta do grupo de hosts"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "O grupo de hosts com o ID \"%1$s\" não está disponível."
@@ -7815,8 +7726,8 @@ msgstr "O grupo de hosts com o ID \"%1$s\" não está disponível."
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7890,7 +7801,7 @@ msgstr "Nome do host"
 msgid "Host networks"
 msgstr "Redes do host"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7970,7 +7881,7 @@ msgstr "Não foi possível actualizar o host."
 msgid "Host updated"
 msgstr "Host actualizado"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr "O host com o ID \"%1$s\" não está disponível."
@@ -7990,7 +7901,7 @@ msgstr "Já existe um host com o nome \"%1$s\"."
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Já existe um host com o nome visível \"%1$s\"."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8003,7 +7914,7 @@ msgstr "Já existe um host com o nome visível \"%1$s\"."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8051,7 +7962,7 @@ msgstr "Hosts actualizados"
 msgid "Hours"
 msgstr "Horas"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8091,7 +8002,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "Endereço IP"
@@ -8116,7 +8027,7 @@ msgstr "O range de IP \"%1$s\" excede o limite de endereços \"%2$s\""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8173,12 +8084,12 @@ msgstr "Realce do ícone"
 msgid "Icon map"
 msgstr "Mapeamento de ícone"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "O mapeamento de ícone \"%1$s\" não pode ser eliminado. Está a ser utilizado no mapa \"%2$s\"."
@@ -8191,18 +8102,18 @@ msgstr "O mapeamento de ícone criado"
 msgid "Icon map deleted"
 msgstr "O mapeamento de ícone eliminado"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "O mapeamento de ícone actualizado"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "O mapeamento de ícone"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "O ícone com o ID \"%1$s\" não está disponível."
@@ -8303,23 +8214,20 @@ msgstr "Se acha que esta mensagem está errada, por favor consulte os administra
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Imagem"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "A imagem \"%1$s\" já existe."
@@ -8328,7 +8236,7 @@ msgstr "A imagem \"%1$s\" já existe."
 msgid "Image added"
 msgstr "Imagem adicionada"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Imagem eliminada"
 
@@ -8336,18 +8244,12 @@ msgstr "Imagem eliminada"
 msgid "Image label type"
 msgstr "Tipo de etiqueta da imagem"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "Erro ao carregar a imagem [%1$s] em [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Imagem actualizada"
 
@@ -8442,7 +8344,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8453,13 +8355,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr "Mapa inacessível"
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8503,7 +8405,7 @@ msgstr "Incluir subgrupos"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Retorna estatísticas de tráfego de uma interface. Retorna: número inteiro"
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8671,24 +8573,6 @@ msgstr "A acção tem uma operação com grupo de utilizadores inválido. O grup
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "A acção tem uma operação com utilizador inválido. O utilizador não existe ou o utilizador não tem acesso a ele."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8743,8 +8627,6 @@ msgstr "A acção tem uma operação com utilizador inválido. O utilizador não
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Argumentos incorrectos passados para a função."
 
@@ -8770,31 +8652,22 @@ msgstr "Caracteres inválidos no nome do template: \"%1$s\"."
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "Condição inválida para a acção \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "Condições incorrectas para a regra de descoberta \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "ID de correlacionamento inválido."
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "A expressão personalizada \"%2$s\" é inválida para a acção \"%1$s\": %3$s."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "A expressão personalizada \"%2$s\" é inválida para o correlacionamento \"%1$s\": \"%3$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "A expressão personalizada \"%2$s\" é inválida para a regra de descoberta \"%1$s\": %3$s."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8823,7 +8696,7 @@ msgstr "Valor inválido para o objeto do evento."
 msgid "Incorrect eventsource value."
 msgstr "Valor inválido para a origem do evento."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "O nome para o campo \"%1$s\" é inválido ou o valor é incorrecto para a tabela \"%2$s\"."
@@ -8848,22 +8721,17 @@ msgstr "Ficheiro de upload inválido."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "A condição de filtro no ID da fórmula é inválida a acção \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "O ID de condição da formula utilizada pela regra de descoberta \"%1$s\" está incorrecto."
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "A condição de filtro possui ID de fórmula incorrecto para o correlacionamento \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "O filtro de condição de macro utilizado pela regra de descoberta \"%1$s\" está incorrecto."
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8874,7 +8742,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "O operador da condição de filtro é inválido para a acção \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "O operador do filtro de condição utilizado pela regra de descoberta \"%1$s\" está incorrecto."
@@ -8902,8 +8770,6 @@ msgstr "Índice de imagem inválido."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8965,10 +8831,6 @@ msgstr "Período de manutenção inválido (o mínimo é de 5 minutos)"
 msgid "Incorrect map ID."
 msgstr "ID de mapa inválido."
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "ID inválido para o tipo de mídia."
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9026,13 +8888,13 @@ msgstr "A expressão regular \"%1$s\": \"%2$s\" é inválida"
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Foi recebida uma resposta inválida do servidor Zabbix \"%1$s\"."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "O horário final do serviço é inválido."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "O horário inicial do serviço é inválido."
 
@@ -9085,12 +8947,7 @@ msgstr "O protótipo de trigger possui expressão inválida. A expressão não p
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "O tipo de calculo é inválido para a acção \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "Tipo inválido de cálculo para o correlacionamento \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "Tipo de cálculo incorrecto para a regra de descoberta \"%1$s\"."
@@ -9136,13 +8993,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9159,60 +9016,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "O valor \"%1$s\" não é válido para o campo \"%2$s\": seu valor deve estar entre %3$s e %4$s."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "O valor \"%1$s\" é inválido para o campo float \"%2$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "O valor \"%1$s\" é inválido para o campo int \"%2$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "O valor \"%1$s\" é inválido para o campo unsigned int \"%2$s\"."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "O valor \"%1$s\" no campo \"%2$s\" é inválido para o correlacionamento \"%3$s\"."
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "Foi fornecido um valor inválido (%1$s) no campo \"%2$s\" do tipo de mídia \"%3$s\"."
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9267,14 +9094,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9384,25 +9205,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9413,7 +9216,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9459,16 +9262,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9477,7 +9281,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "Valor inválido para o campo \"%1$s\": %2$s."
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9565,12 +9369,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Inserir"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "Insira a expressão"
 
@@ -9675,7 +9479,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9683,7 +9487,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9694,7 +9498,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Intervalo"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9717,7 +9521,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr "Condição inválida na acção: %1$s."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9749,7 +9553,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr "Intervalo inválido \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "A chave \"%1$s\" é inválida para a regra de descoberta \"%2$s\" em \"%3$s\": %4$s."
@@ -9774,27 +9578,29 @@ msgstr "Chave inválida \"%1$s\": %2$s."
 msgid "Invalid method parameters."
 msgstr "Parâmetros inválidos para o método."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9820,17 +9626,17 @@ msgstr "Parâmetros inválidos para o método."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9838,8 +9644,8 @@ msgstr "Parâmetros inválidos para o método."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9853,106 +9659,116 @@ msgstr "Parâmetros inválidos para o método."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9994,43 +9810,38 @@ msgstr "Código de resposta inválido \"%1$s\"."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10051,7 +9862,7 @@ msgstr "Período de tempo inválido."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Inventário"
 
@@ -10092,7 +9903,7 @@ msgstr "Não é possível pesquisar pela senha do utilizador."
 msgid "Italian (it_IT)"
 msgstr "Italiano (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10124,7 +9935,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "O item \"%1$s\" não pode popular um campo em falta num host \"%2$d\". As opções são: de 0 (não popular) até %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10138,7 +9949,7 @@ msgstr "Item adicionado"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "Item copiado"
@@ -10152,13 +9963,13 @@ msgstr "Contagem de itens"
 msgid "Item deleted"
 msgstr "Item eliminado"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Item desactivado"
 msgstr[1] "Itens desativados"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Item activado"
@@ -10168,7 +9979,7 @@ msgstr[1] "Itens activados"
 msgid "Item in \"not supported\" state"
 msgstr "O item está como \"não suportado\""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "Item não seleccionado"
 
@@ -10177,7 +9988,7 @@ msgstr "Item não seleccionado"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr "O pré-processamento do item tem parâmetros ausentes: %1$s"
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10214,8 +10025,8 @@ msgid_plural "Item prototypes updated"
 msgstr[0] "O protótipo de item foi actualizado"
 msgstr[1] "Os protótipos de itens foram actualizados"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr "O protótipo de itens com o ID \"%1$s\" não está disponível."
@@ -10241,7 +10052,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10273,8 +10084,8 @@ msgstr "O item não será actualizado. O intervalo de atualização especificado
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr "O item não será actualizado. O intervalo de actualização deve estar entre 1s e 1d. Também intervalos agendados / flexíveis podem ser usados."
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr "O item com o ID \"%1$s\" não está disponível."
@@ -10325,11 +10136,11 @@ msgstr "Já existe um item com a chave \"%1$s\" em \"%2$s\"."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Itens"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Itens eliminados"
 
@@ -10347,7 +10158,7 @@ msgstr "Itens actualizados"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10372,6 +10183,10 @@ msgstr "Interfaces JMX"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10384,7 +10199,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr "É esperada uma string JSON"
 
@@ -10402,7 +10217,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Janeiro"
 
@@ -10424,7 +10239,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Jul"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Julho"
 
@@ -10432,7 +10247,7 @@ msgstr "Julho"
 msgid "Jun"
 msgstr "Jun"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Junho"
 
@@ -10588,22 +10403,6 @@ msgid_plural "Last %1$d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10615,11 +10414,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Última verificação"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Gráfico da última hora"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Gráfico do último mês"
 
@@ -10657,11 +10456,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Último valor"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Gráfico da última semana"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10670,11 +10469,11 @@ msgstr "Gráfico da última semana"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Dados recentes"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "Últimos valores"
 
@@ -10715,7 +10514,7 @@ msgstr ""
 msgid "Left trim"
 msgstr "Remover espaços à esquerda"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -10996,7 +10795,7 @@ msgstr "A regra de autodescoberta (LLD) está em estado \"não suportado\""
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -11018,7 +10817,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "Verificação checksum MD5. Retorna: texto (hash MD5 do arquivo)"
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11029,12 +10828,12 @@ msgid "Macro"
 msgstr "Macro"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "A macro \"%1$s\" já existe em \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "A macro \"%1$s\" já existe."
@@ -11062,7 +10861,7 @@ msgstr "Macros actualizadas"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -11070,7 +10869,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11153,7 +10952,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11175,13 +10974,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Mapa"
 
@@ -11250,7 +11049,7 @@ msgstr "Forma do mapa"
 msgid "Map update failed."
 msgstr "A atualização do mapa falhou."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr "O mapa com o ID \"%1$s\" não está disponível."
@@ -11282,7 +11081,7 @@ msgstr "Mapas"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Março"
 
@@ -11386,7 +11185,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11400,7 +11199,7 @@ msgstr[1] "O período máximo a ser exibido é de %1$s dias."
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Mai"
 
@@ -11415,15 +11214,12 @@ msgstr "Maio"
 msgid "Media"
 msgstr "Média"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Tipo de média"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr "O tipo de mídia \"%1$s\" já existe."
@@ -11450,11 +11246,6 @@ msgid_plural "Media types enabled"
 msgstr[0] "Tipo de média activado"
 msgstr[1] "Tipo de média activado"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr "O tipo de mídia tem parâmetros em falta: %1$s"
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11484,7 +11275,7 @@ msgstr "O tipo de mídia com o ID \"%1$s\" não está disponível."
 msgid "Media types"
 msgstr "Tipos de média"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11572,7 +11363,7 @@ msgstr "Mensagens"
 msgid "Method not found."
 msgstr "Método não encontrado."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11634,7 +11425,7 @@ msgid "Minimum severity"
 msgstr "Severidade mínima"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11693,7 +11484,7 @@ msgstr "Modo"
 msgid "Model"
 msgstr "Modelo"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11731,7 +11522,7 @@ msgstr[1] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11757,7 +11548,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Seg"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Segunda-feira"
 
@@ -11797,11 +11588,11 @@ msgstr "Mês"
 msgid "Monthly"
 msgstr "Mensal"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "Mais correspondentes encontrados..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11825,7 +11616,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11838,7 +11629,7 @@ msgstr "Múltiplo"
 msgid "Multiple PROBLEM events"
 msgstr "Múltiplos eventos de PROBLEMA"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Silenciar"
 
@@ -11967,11 +11758,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12129,19 +11920,21 @@ msgstr "Nova condição"
 msgid "New dashboard"
 msgstr "Novo dashboard"
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Novo elemento"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr "Novo evento no grupo de hosts"
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr "Novo valor para a etiqueta de eventos"
 
@@ -12153,7 +11946,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nova expressão regular"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12161,7 +11954,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Novo horário de serviço"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12170,7 +11963,7 @@ msgid "New triggers"
 msgstr "Novos triggers"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12188,7 +11981,7 @@ msgstr "Próximo passo"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12217,30 +12010,6 @@ msgstr "Próximo passo"
 msgid "No"
 msgstr "Não"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "Não foi encontrado \"%1$s\" para o correlacionamento \"%2$s\"."
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "Não foi encontrado \"%1$s\" para o correlacionamento."
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12256,11 +12025,6 @@ msgstr "Falta o dado \"%1$s\" para o gráfico."
 msgid "No \"%1$s\" given for map."
 msgstr "Não foi encontrado \"%1$s\" para o mapa."
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "Não foi mencionado nenhum \"%1$s\" para o tipo de mídia."
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12268,7 +12032,7 @@ msgstr "Não foi mencionado nenhum \"%1$s\" para o tipo de mídia."
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "Não foi mencionado \"%2$s\" para a condição de filtro da acção \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "Sem \"%2$s\" localizado para uma condição de filtro da regra de descoberta \"%1$s\"."
@@ -12278,7 +12042,7 @@ msgstr "Sem \"%2$s\" localizado para uma condição de filtro da regra de descob
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "Não foi mencionado \"%2$s\" para o filtro da acção \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "Sem \"%2$s\" localizado para o filtro da regra de descoberta \"%1$s\"."
@@ -12295,11 +12059,6 @@ msgstr "Não foi definido um nome de utilizador para autenticação."
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "Sem tipo de condição para o correlacionamento \"%1$s\"."
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12330,7 +12089,7 @@ msgstr "Não existe interface padrão para o tipo \"%1$s\" em \"%2$s\"."
 msgid "No details"
 msgstr "Sem detalhes"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "Não foram fornecidos IDs de regras de descoberta."
 
@@ -12366,7 +12125,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "Nenhum gráfico adicionado."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Não foram fornecidos host IDs."
 
@@ -12396,7 +12155,7 @@ msgstr "Sem imagem"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Interface não encontrado"
 
@@ -12430,7 +12189,7 @@ msgstr "Nenhuma macro encontrada."
 msgid "No maps added."
 msgstr "Nenhum mapa adicionado."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "Nenhuma correspondência encontrada"
 
@@ -12438,17 +12197,46 @@ msgstr "Nenhuma correspondência encontrada"
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr "Sem tipo de operação para o correlacionamento \"%1$s\"."
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Sem permissões para acesso ao sistema."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12456,7 +12244,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12484,19 +12272,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12511,16 +12298,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12540,12 +12333,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12566,27 +12357,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12603,14 +12396,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12619,7 +12412,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Sem permissões para o objecto referenciado ou o objecto não existe!"
 
@@ -12639,7 +12432,7 @@ msgstr "Não foi especificado o ficheiro de chave pública."
 msgid "No recipients for action operation message."
 msgstr "Não existem destinos para a operação mensagem da acção."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr "Não atualizar"
 
@@ -12651,7 +12444,7 @@ msgstr "Não foi especificado nenhum script para a operação comando da acção
 msgid "No target selected"
 msgstr "Não foi seleccionado nenhum destino"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Não foi seleccionado nenhum destino."
 
@@ -12668,7 +12461,7 @@ msgstr "Não existem triggers definidos."
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr "Marcadores não booleanos serão descontinuados."
 
@@ -12738,15 +12531,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Não é possível definir uma senha para o utilizador \"guest\"."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12778,7 +12571,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "Não suportado"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Nota"
@@ -12809,7 +12602,7 @@ msgstr "Notificar todos os envolvidos"
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "Novembro"
 
@@ -12996,8 +12789,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13057,13 +12850,13 @@ msgstr "Out"
 msgid "Octal to decimal"
 msgstr "Octal para decimal"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Outubro"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Inactivo"
 
@@ -13071,30 +12864,31 @@ msgstr "Inactivo"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr "Valor antigo da etiqueta de evento"
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "Activo"
 
@@ -13110,35 +12904,15 @@ msgstr "Uma vez"
 msgid "One"
 msgstr "Um"
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "Um dos objetos está sem um grupo de hosts."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Apenas uma vez"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Downtime único"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Apenas os Super Admins podem criar grupos de hosts."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Apenas os Super Admins podem criar tipos de média."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Apenas os Super Admins podem eliminar tipos de média."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Apenas os Super Admins podem editar tipos de média."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Apenas através de verificações com o agente Zabbix, SNMPv1, SNMPv2 e SNMPv3 pode ser feita a verificação de unicidade."
@@ -13187,10 +12961,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "Apenas super administradores podem criar correlacionamentos."
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr "Apenas super administradores podem definir o proprietário do dashboard."
@@ -13199,15 +12969,11 @@ msgstr "Apenas super administradores podem definir o proprietário do dashboard.
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr "Apenas super administradores podem atualizar correlacionamentos."
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Apenas são contabilizados triggers associados a hosts activos e que dependam de items activos"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13216,7 +12982,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Informação sobre o sistema operativo. Retorna: texto"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13225,11 +12991,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Não foi possível realizar a operação devido a um pedido não autorizado."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Detalhes da operação"
 
@@ -13251,7 +13017,7 @@ msgstr "A operação não tem nenhum template para operar."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13260,33 +13026,33 @@ msgstr ""
 msgid "Operations"
 msgstr "Operações"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operador"
 
@@ -13395,7 +13161,7 @@ msgstr "Outros parâmetros de configuração"
 msgid "Other parameters"
 msgstr "Outros parâmetros"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Outros"
@@ -13409,7 +13175,7 @@ msgstr "Estatísticas de saída de tráfego na interface de rede. Retorna: núme
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13438,7 +13204,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13627,7 +13393,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13672,7 +13438,7 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "Identidade PSK"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13695,16 +13461,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parâmetro"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "O parâmetro \"%1$s\" será descontinuado."
@@ -13734,7 +13500,7 @@ msgstr "Itens pai"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13751,7 +13517,7 @@ msgstr "Triggers pai"
 msgid "Parent web scenarios"
 msgstr "Cenários web herdados"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13763,11 +13529,6 @@ msgstr ""
 msgid "Parse"
 msgstr "Processar"
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "Erro ao processar SQL [%1$s] em [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Erro de processamento"
@@ -13828,7 +13589,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr "Colar"
 
@@ -13838,15 +13599,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr "Colar sem os links externos"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13892,12 +13653,11 @@ msgstr "Executa uma consulta DNS. Retorna: texto com o tipo de informação requ
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Período"
 
@@ -13986,7 +13746,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Por favor informe o nome ou IP e a porta do servidor Zabbix, assim como um nome para esta instalação (opcional)."
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Por favor seleccione dois elementos"
 
@@ -14026,7 +13786,7 @@ msgstr "Preenche o campo inventário do host"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14115,7 +13875,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14246,7 +14006,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Problema em"
 
@@ -14259,21 +14019,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14287,9 +14043,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Problemas"
 
@@ -14323,7 +14079,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "Propriedades"
 
@@ -14344,13 +14100,13 @@ msgstr "A URL fornecida \"%1$s\" é inválida."
 msgid "Proxies"
 msgstr "Proxies"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14358,7 +14114,7 @@ msgstr "Proxies"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14368,12 +14124,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "O proxy \"%1$s\" para o host \"%2$s\" não existe."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "O proxy \"%1$s\" está a ser utilizado pela regra de descoberta \"%2$s\"."
@@ -14466,7 +14222,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14543,10 +14299,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Valor recebido"
@@ -14628,7 +14380,7 @@ msgstr "Retângulo"
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr "Intervalo de atualização"
 
@@ -14646,13 +14398,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Expressão regular"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14685,7 +14437,7 @@ msgstr "Expressões regulares"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14717,8 +14469,6 @@ msgstr "Comando remoto"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14739,7 +14489,9 @@ msgstr "Comando remoto"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14752,7 +14504,7 @@ msgstr "Comando remoto"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14829,8 +14581,8 @@ msgstr "Comando remoto"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -14870,7 +14622,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14912,7 +14664,7 @@ msgid "Replace dependencies"
 msgstr "Substituir dependências"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14967,7 +14719,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -15009,8 +14761,8 @@ msgstr "Códigos de estado necessários"
 msgid "Required string"
 msgstr "String obrigatória"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Reinicializar"
 
@@ -15043,7 +14795,7 @@ msgstr "Confirmação de reinicialização"
 msgid "Reset defaults"
 msgstr "Reinicializar para valores por omissão"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Resolvido"
 
@@ -15109,7 +14861,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Resultado"
@@ -15296,12 +15048,12 @@ msgstr "Executa o comando em no host. Retorna o texto retornado pelo comando; 1
 msgid "Russian (ru_RU)"
 msgstr "Russo (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "D"
@@ -15312,8 +15064,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15350,7 +15102,7 @@ msgstr "Porta do servidor SMTP"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15446,12 +15198,12 @@ msgstr "Total de SQL: %1$s (selecções: %2$s | execuções: %3$s)"
 msgid "SQL query"
 msgstr "Pesquisa SQL"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "Falha na execução do statement SQL \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Falha na execução do statement SQL \"%1$s\"."
@@ -15514,7 +15266,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15526,7 +15278,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Sáb"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -15568,7 +15320,7 @@ msgstr "Agendar"
 msgid "Scheduled check"
 msgstr "Verificação agendada"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15635,7 +15387,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15648,8 +15400,7 @@ msgstr ""
 msgid "Script"
 msgstr "Script"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "O scritp \"%1$s\" já existe."
@@ -15681,12 +15432,6 @@ msgstr "Nome do script"
 msgid "Script parameters"
 msgstr "Parâmetros do script"
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "Não foi encontrado o avanço de linha nos parâmetros do script \"%1$s\" para o tipo de mídia \"%2$s\"."
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Script profiler"
@@ -15699,7 +15444,7 @@ msgstr "Script actualizado"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Scripts"
 
@@ -15769,8 +15514,8 @@ msgid "Security name"
 msgstr "Nome de segurança"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15778,7 +15523,7 @@ msgstr "Nome de segurança"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Seleccionar"
 
@@ -15814,19 +15559,19 @@ msgstr "Elementos seleccionados"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr "Enviar para trás"
 
@@ -15851,7 +15596,7 @@ msgstr "Enviar apenas para"
 msgid "Send to"
 msgstr "Enviar para"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr "Enviar para trás"
 
@@ -15884,7 +15629,7 @@ msgstr "Separado"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "Setembro"
 
@@ -15915,28 +15660,28 @@ msgstr "Servidor (proxy)"
 msgid "Server time"
 msgstr "Hora do servidor"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Serviço"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15946,7 +15691,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "Serviço criado"
 
@@ -15979,16 +15724,16 @@ msgstr "Porto do serviço"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "A hora de início do serviço tem de ser inferior à hora de fim."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -15996,11 +15741,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Tempos do serviço"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Tipo de serviço"
 
@@ -16009,30 +15754,29 @@ msgstr "Tipo de serviço"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Serviço actualizado"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Serviços"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "Os serviços formam uma dependência circular."
 
@@ -16040,7 +15784,7 @@ msgstr "Os serviços formam uma dependência circular."
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16070,7 +15814,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Defina o modo de inventário de host"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16099,7 +15843,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16108,7 +15852,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16164,7 +15908,7 @@ msgstr "Forma"
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "Partilha"
 
@@ -16306,7 +16050,7 @@ msgstr "Mostrar aviso se o Zabbix Server estiver offline"
 msgid "Show working time"
 msgstr "Mostrar horário de trabalho"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Exibido"
 
@@ -16415,7 +16159,7 @@ msgstr "Ignorada a cópia do gráfico \"%1$s\" para o host \"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "Eslovaco (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Adiar"
 
@@ -16461,7 +16205,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Ordenar entradas por"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Sequência de ordenação (0->999)"
 
@@ -16535,7 +16279,7 @@ msgstr "Começar em"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16638,15 +16382,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Estado"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Códigos de estado"
@@ -16676,7 +16424,7 @@ msgstr "Apenas o estado"
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16724,7 +16472,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16789,7 +16537,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Segurado"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Submapa"
 
@@ -16805,7 +16553,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Auditoria de sucesso"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16818,7 +16566,7 @@ msgstr "Sumarização das estatísticas de entrada e saída da interface de rede
 msgid "Sun"
 msgstr "Dom"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -16910,12 +16658,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Tempo desde a carga do sistema. Retorna: número inteiro"
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Q"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16942,17 +16690,17 @@ msgstr "VERDADEIRO"
 msgid "Table \"%1$s\" does not exist."
 msgstr "A tabela \"%1$s\" não existe."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "A tabela \"%1$s\" não tem nenhum campo com nome \"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Etiqueta"
@@ -17008,7 +16756,7 @@ msgstr "Valor da etiqueta"
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17068,7 +16816,7 @@ msgstr "Tipo de destino"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17089,7 +16837,7 @@ msgstr "Template"
 msgid "Template \"%1$s\" already exists."
 msgstr "O template \"%1$s\" já existe."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17113,7 +16861,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Um template não pode ser associado a outro template mais do que uma vez mesmo que através de outros templates."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17173,7 +16921,7 @@ msgstr "Já existe template com o nome visível \"%1$s\"."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17345,14 +17093,14 @@ msgstr "O host não será novamente descoberto e será eliminado em %1$s (às %2
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "O host não será novamente descoberto e será eliminado na próxima vez que a autodescoberta for processada."
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "A imagem é utilizada no mapeamento de ícones %1$s."
 msgstr[1] "A imagem é utilizada no mapeamento de ícones %1$s."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17417,7 +17165,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Este mês"
 
@@ -17425,7 +17173,7 @@ msgstr "Este mês"
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Esta semana"
 
@@ -17433,7 +17181,7 @@ msgstr "Esta semana"
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Este ano"
 
@@ -17453,7 +17201,7 @@ msgstr ""
 msgid "Thu"
 msgstr "Qui"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Quinta-feira"
 
@@ -17470,7 +17218,7 @@ msgstr "Até"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17503,7 +17251,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Período de tempo"
 
@@ -17555,12 +17303,11 @@ msgstr "Timestamp"
 msgid "To"
 msgstr "Para"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "Para definir uma interface do host seleccionar um tipo de item único para todos os itens"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Hoje"
 
@@ -17675,7 +17422,7 @@ msgstr "Período de armazenamento das estatísticas"
 msgid "Trends"
 msgstr "Tendências"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17683,7 +17430,7 @@ msgstr "Tendências"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Trigger"
 
@@ -17784,7 +17531,7 @@ msgstr "Nome do trigger"
 msgid "Trigger overview"
 msgstr "Vista geral de triggers"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17857,11 +17604,11 @@ msgstr "Protótipos de trigger actualizados"
 msgid "Trigger severity"
 msgstr "Severidade do trigger"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "Status do trigger \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "Status do trigger \"Problema\""
 
@@ -17878,7 +17625,7 @@ msgstr "Trigger actualizado"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17913,7 +17660,7 @@ msgstr "Remover espaços"
 msgid "Tue"
 msgstr "Ter"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Terça-feira"
 
@@ -17926,7 +17673,7 @@ msgstr "Turco (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Dois itens (\"%1$s\" e \"%2$s\") não podem preencher o campo de inventário \"%3$s\" de um host, isto levaria a um conflito."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17942,19 +17689,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18006,7 +17753,7 @@ msgstr "Tipo de informação"
 msgid "Types"
 msgstr "Tipos"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18027,7 +17774,7 @@ msgstr "DESCONHECIDO"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18073,12 +17820,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "A URL deverá possuir os campos \"name\" e \"url\" no mapa \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URLs"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18163,12 +17910,12 @@ msgstr "Desbloquear"
 msgid "Unblock selected users?"
 msgstr "Desbloquear utilizadores seleccionados?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18188,21 +17935,23 @@ msgstr "Unidades"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Desconhecido"
@@ -18220,7 +17969,7 @@ msgid "Unknown error"
 msgstr "Erro desconhecido"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Item do host desconhecido, não existe esse item no host seleccionado"
@@ -18273,7 +18022,7 @@ msgstr "Desassociar do template"
 msgid "Unlink from templates"
 msgstr "Desassociar dos templates"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Reactivar"
 
@@ -18304,7 +18053,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "Parâmetro não suportado \"%2$s\" para uma condição de filtro na acção \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "O parâmetro \"%2$s\" não é suportado para condição de filtro na regra de descoberta \"%1$s\"."
@@ -18314,7 +18063,7 @@ msgstr "O parâmetro \"%2$s\" não é suportado para condição de filtro na reg
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "O parâmetro \"%2$s\" não é suportado para o filtro da acção \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "O parâmetro \"%2$s\" não é suportado para o filtro na regra de descoberta \"%1$s\"."
@@ -18359,7 +18108,7 @@ msgstr "Ligado"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18372,7 +18121,7 @@ msgstr "Ligado"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18425,7 +18174,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18443,7 +18192,7 @@ msgstr "Carregar"
 msgid "Upper level maps"
 msgstr "Mapas de nível superior"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18478,7 +18227,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "Utilizado nas acções"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18493,7 +18242,7 @@ msgstr "Utilizado nas acções"
 msgid "User"
 msgstr "Utilizador"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "O utilizador \"%1$s\" não pode ficar sem grupo."
@@ -18545,7 +18294,7 @@ msgstr "Utilizador adicionado"
 msgid "User agent string"
 msgstr "Mensagem do agente de utilizador"
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Um utilizador não pode adicionar-se a si próprio a um grupo desactivado ou a um grupo com acesso à GUI desactivado."
@@ -18565,7 +18314,7 @@ msgid_plural "Users deleted"
 msgstr[0] "Utilizador eliminado"
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18575,27 +18324,27 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Grupo de utilizadores"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "O grupo \"%1$s\" já existe."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "O grupo de utilizadores \"%1$s\" é utilizado na acção \"%2$s\"."
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "O grupo de utilizadores \"%1$s\" está configurado para alerta de quedas de base de dados."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "O grupo de utilizadores \"%1$s\" está a ser utilizado no script \"%2$s\"."
@@ -18629,8 +18378,8 @@ msgstr[1] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18674,14 +18423,14 @@ msgstr "Senha do utilizador"
 msgid "User profile"
 msgstr "Perfil do utilizador"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18750,7 +18499,7 @@ msgstr "Utilizador actualizado"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "O utilizador com o ID \"%1$s\" não está disponível."
@@ -19066,14 +18815,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19083,7 +18832,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19125,7 +18874,7 @@ msgstr "O valor \"%1$s\" é inválido para o parâmetro \"grid_show\". As opçõ
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "O valor \"%1$s\" é inválido para o parâmetro \"grid_show\". As opções são: \"%2$s\"."
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "O valor \"%1$s\" é demasiado longo para o parâmetro \"%2$s\" - %3$d caracteres. O tamanho máximo permitido é de %4$d caracteres."
@@ -19142,7 +18891,7 @@ msgstr "Estatísticas do cache de valores. Modos válidos: total, free, pfree, u
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Mapa de valores"
 
@@ -19185,11 +18934,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "Valor de um contador de performance do Windows. Retorna: inteiro, número fracionário ou texto (dependendo da requisição)"
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19236,7 +18986,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19323,7 +19073,7 @@ msgstr "O nome visível não pode estar vazio se não estiver definido o nome do
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Q"
@@ -19340,7 +19090,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Aviso"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19349,7 +19099,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Pedimos desculpa, foi atingido o número máximo possível de elementos."
 
@@ -19365,7 +19115,7 @@ msgstr "Pedimos desculpa, foi atingido o número máximo possível de elementos.
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web"
 
@@ -19377,7 +19127,7 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Monitoria web"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr "Cenário web"
 
@@ -19392,27 +19142,27 @@ msgstr "Já existe o cenário web \"%1$s\" no host \"%2$s\"."
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "O cenário web \"%1$s\" já existe."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "Cenário web adicionado"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Cenário web eliminado"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Cenário web desactivado"
 msgstr[1] "Cenários web desativados"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Cenário web activado"
 msgstr[1] "Cenários web activados"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "Cenário web actualizado"
 
@@ -19434,7 +19184,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Qua"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
@@ -19445,7 +19195,7 @@ msgstr "Quarta-feira"
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19461,12 +19211,12 @@ msgstr "Bem vindo a"
 msgid "When active"
 msgstr "Quando activado"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19661,6 +19411,10 @@ msgstr "d/m/Y H:i"
 msgid "Y-m-d H:i:s"
 msgstr "d-m-Y H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr "Y1"
@@ -19722,7 +19476,7 @@ msgstr "Anualmente"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19779,18 +19533,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19802,9 +19550,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "O utilizador actual não tem permissões para realizar esta operação."
 
@@ -19920,24 +19665,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr "é esperado um valor booleano"
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "um texto é esperado"
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19946,37 +19695,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr "é esperado um valor numérico"
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr "número muito grande"
@@ -19997,28 +19746,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr "um horário é esperado"
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr "é esperado um período de tempo"
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr "uma unidade de tempo é esperada"
@@ -20066,7 +19816,7 @@ msgstr "tudo"
 msgid "all media"
 msgstr "todas as mídias"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20074,42 +19824,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "é esperado um array"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr "é esperado um array ou sequência de caracteres"
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20119,7 +19864,7 @@ msgid "an empty string is expected"
 msgstr "é esperado um texto vazio"
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr "é esperado um par de caracteres hexadecimais"
 
@@ -20127,11 +19872,15 @@ msgstr "é esperado um par de caracteres hexadecimais"
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20292,14 +20041,8 @@ msgstr "não pode ser modificado"
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20329,19 +20072,11 @@ msgstr "não pode ser modificado"
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20361,14 +20096,14 @@ msgstr "não pode ser modificado"
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20376,7 +20111,7 @@ msgstr "não pode ser modificado"
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "não pode ser vazio"
@@ -20389,7 +20124,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr "não foi possível executar a rotação da requisição de API, os dados podem estar protegidos"
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20423,7 +20158,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "dependência circular entre itens não é permitida"
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20441,7 +20176,8 @@ msgid "configure"
 msgstr "configurar"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20470,7 +20206,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20532,7 +20268,7 @@ msgstr "descedente"
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20554,13 +20290,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20586,7 +20322,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20623,6 +20360,10 @@ msgstr "a expressão está vazia"
 msgid "failed to parse JSON"
 msgstr "falha ao analisar o JSON"
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20669,7 +20410,7 @@ msgstr "configurações globais de limpeza de dados"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20710,6 +20451,11 @@ msgstr "ícone"
 msgid "image"
 msgstr "imagem"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "contido em"
@@ -20750,15 +20496,19 @@ msgstr "contagem de elementos incorrecta"
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "sintaxe incorrecta próximo de \"%1$s\""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20787,7 +20537,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr "intervalo de endereços inválido \"%1$s\""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr "sequência de bytes inválida no UTF-8"
 
@@ -20816,27 +20566,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr "período inválido para a armazenamento de histórico"
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr "expressão regular inválida"
 
@@ -20864,7 +20614,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr "não está entre {} ou está mal formado"
 
@@ -20950,12 +20700,12 @@ msgstr "regra de autodescoberta (LLD)"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -21014,7 +20764,7 @@ msgstr "correspondências"
 msgid "max"
 msgstr "máx"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21054,7 +20804,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr "o tamanho mínimo é %1$s caracteres"
@@ -21081,8 +20831,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21097,27 +20847,14 @@ msgstr "tem de ser um utilizador LDAP válido"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "precisa estar entre \"%1$s\" e \"%2$s\""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21145,6 +20882,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21155,7 +20900,7 @@ msgstr ""
 msgid "name"
 msgstr "nome"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "novo"
 
@@ -21290,7 +21035,7 @@ msgstr "saída"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21325,24 +21070,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21370,11 +21119,11 @@ msgstr ""
 msgid "regular expression"
 msgstr "expressão regular"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21386,15 +21135,15 @@ msgstr ""
 msgid "right"
 msgstr "direita"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21442,7 +21191,7 @@ msgstr ""
 msgid "short description"
 msgstr "descrição sumária"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21461,15 +21210,15 @@ msgstr "descrição sumária"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr "deve estar vazio"
 
@@ -21485,31 +21234,31 @@ msgstr "mostrar mapeamento de ícones"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21517,11 +21266,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21537,8 +21286,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21549,7 +21298,7 @@ msgstr ""
 msgid "tag"
 msgstr "etiqueta"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21558,13 +21307,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "o ID de template \"%1$s\" é passado %2$s vezes"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21573,20 +21326,20 @@ msgstr "o ID de template \"%1$s\" é passado %2$s vezes"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "o parâmetro \"%1$s\" está ausente"
@@ -21618,39 +21371,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21664,7 +21417,7 @@ msgstr "trigger"
 msgid "trigger does not allow manual closing"
 msgstr "o trigger não permite encerramento manual"
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21676,26 +21429,26 @@ msgstr "um protótipo de trigger não pode ser movido para outro template ou hos
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr "um trigger com associações não pode ser movido para outro template ou host"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "digite aqui para pesquisar"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21703,11 +21456,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21724,10 +21477,10 @@ msgstr "final inesperado da chave"
 msgid "unexpected end of macro"
 msgstr "fim inesperado da macro"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21737,11 +21490,12 @@ msgstr "fim inesperado da macro"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr "parâmetro não esperado: %1$s"
@@ -21767,8 +21521,8 @@ msgstr "texto inesperado \"%1$s\""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21793,6 +21547,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr "número de versão não suportado"
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21808,7 +21566,7 @@ msgstr "número de versão não suportado"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21828,11 +21586,11 @@ msgstr "número de versão não suportado"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "valor"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21850,76 +21608,85 @@ msgstr "o valor \"%1$s\" não foi encontrado"
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr "o valor %1$s já existe"
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr "o valor é muito grande"
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21931,18 +21698,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr "o valor precisa ser um de %1$s"
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21951,7 +21716,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21964,11 +21729,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21985,7 +21750,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "a"
diff --git a/ui/locale/ro/LC_MESSAGES/frontend.po b/ui/locale/ro/LC_MESSAGES/frontend.po
index df962e42c98..8dd4495ae3c 100644
--- a/ui/locale/ro/LC_MESSAGES/frontend.po
+++ b/ui/locale/ro/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2013-09-08 17:57+0300\n"
 "Last-Translator: altmir <rmircea@birotec.ro>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -95,7 +95,7 @@ msgstr[0] "%1$d zi"
 msgstr[1] "%1$d zile"
 msgstr[2] "%1$d zile"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -187,7 +187,7 @@ msgstr[2] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -203,7 +203,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -239,7 +239,7 @@ msgstr[2] ""
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -247,7 +247,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -268,13 +268,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -406,7 +406,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -470,10 +470,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr ""
@@ -516,7 +512,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Cnf"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Confirmare"
 
@@ -524,7 +520,7 @@ msgstr "Confirmare"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Confirmat"
@@ -537,7 +533,7 @@ msgstr "Evenimente PROBLEMA confirmate"
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -564,9 +560,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -623,7 +619,7 @@ msgstr "Acțiunea \"%1$s\" există deja."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Acțiunea \"%1$s\" nu are operațiuni definite."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -632,7 +628,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Acțiune adăugată"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -683,8 +679,8 @@ msgstr "Acțiune actualizată"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Acțiuni"
@@ -751,7 +747,7 @@ msgstr "Activ până la"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -762,7 +758,7 @@ msgstr "Activ până la"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -785,9 +781,9 @@ msgstr "Activ până la"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -857,7 +853,7 @@ msgstr "Activ până la"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Adaugă"
 
@@ -865,11 +861,11 @@ msgstr "Adaugă"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr ""
 
@@ -877,7 +873,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -894,7 +890,7 @@ msgstr "Adaugă server"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr ""
 
@@ -916,7 +912,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -968,12 +964,12 @@ msgstr ""
 msgid "Add widget"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -983,7 +979,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -996,7 +992,7 @@ msgstr "Admin"
 msgid "Administration"
 msgstr "Administrare"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -1018,7 +1014,7 @@ msgstr "Vechime mai mică decât"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1090,7 +1086,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Tot"
 
@@ -1108,7 +1104,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Toate linkurile trebuie sa aibă \"Nume\" și \"URL\" specificat"
 
@@ -1126,7 +1122,7 @@ msgstr ""
 msgid "All problems if tag values match"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1239,15 +1235,15 @@ msgstr "Eroare aplicație."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Aplică"
 
@@ -1265,7 +1261,7 @@ msgstr "Abordare"
 msgid "Apr"
 msgstr "Apr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Aprilie"
 
@@ -1293,7 +1289,7 @@ msgstr "Tipul suprafeței"
 msgid "Arithmetic"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1340,7 +1336,7 @@ msgstr "La (oră:minut)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1349,7 +1345,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1361,6 +1357,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1372,7 +1373,7 @@ msgstr "Cel puțin o perioadă de mentenanță trebuie creată."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1428,7 +1429,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Aug"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "August"
 
@@ -1441,7 +1442,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1518,7 +1519,7 @@ msgstr ""
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1533,7 +1534,7 @@ msgstr "Maparea icon automată"
 msgid "Automatic icon selection"
 msgstr "Selectarea automată icon"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1585,7 +1586,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1648,7 +1649,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Blocat"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr ""
 
@@ -1702,11 +1703,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Jos"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr ""
 
@@ -1732,7 +1733,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1777,8 +1778,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1787,7 +1788,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Calculat"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1812,7 +1813,7 @@ msgstr "Apelare inversă"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1825,8 +1826,8 @@ msgstr "Apelare inversă"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Anulează"
 
@@ -1856,7 +1857,7 @@ msgstr "Nu se poate adăuga acțiunea"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1866,7 +1867,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Nu se poate adăuga dependința server - șablon."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1897,8 +1898,8 @@ msgid "Cannot add host prototype"
 msgstr "Nu se poate adăuga prototipul serverului"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Nu se poate adăuga imaginea"
 
@@ -1991,15 +1992,15 @@ msgstr "Nu se poate adăuga utilizatorul"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Nu se pate adăuga scenariul web"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2019,33 +2020,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Nu se poate șterge istoricul"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Nu se pot clona prototipurile de grafic."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "Nu se pot clona prototipurile de server."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Nu se pot clona prototipurile de element."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Nu se pot clona prototipurile de trigger."
 
@@ -2073,7 +2070,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] ""
@@ -2127,8 +2124,8 @@ msgstr "Nu se poate crea icon hartă"
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2158,7 +2155,7 @@ msgstr "Nu se poate șterge utilizatorul intern Zabbix \"%1$s\", încercați să
 msgid "Cannot delete action"
 msgstr "Nu se poate șterge acțiunea"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2231,7 +2228,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2243,11 +2240,11 @@ msgstr[2] ""
 msgid "Cannot delete host prototypes"
 msgstr "Nu se pot șterge prototipurile de server"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Nu se poate șterge maparea icon-ului"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Nu se poate șterge imaginea"
 
@@ -2272,7 +2269,7 @@ msgstr "Nu se poate șterge prototipul itemului"
 msgid "Cannot delete item prototypes"
 msgstr "Nu se pot şterge prototipurile de element"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Nu se pot șterge elementele"
 
@@ -2308,7 +2305,7 @@ msgstr[0] "Nu se poate șterge proxy-ul"
 msgstr[1] "Nu se poate șterge proxy-ul"
 msgstr[2] "Nu se poate șterge proxy-ul"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2335,7 +2332,7 @@ msgstr[0] "Nu se poate șterge scriptul"
 msgstr[1] "Nu se poate șterge scriptul"
 msgstr[2] "Nu se poate șterge scriptul"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Nu se pot șterge scripturile. Scriptul \"%1$s\" este folosit in acțiunea \"%2$s\"."
@@ -2352,8 +2349,8 @@ msgstr[0] "Nu se poate șterge serviciul"
 msgstr[1] "Nu se poate șterge serviciul"
 msgstr[2] "Nu se poate șterge serviciul"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2382,7 +2379,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr "Nu se pote șterge un element bazat pe un șablon."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Nu se pot șterge elementele bazate pe șabloane."
 
@@ -2438,7 +2435,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Nu se poate șterge scenariul web"
 
@@ -2478,7 +2475,7 @@ msgstr[0] "Nu se poate dezactiva serverul"
 msgstr[1] "Nu se pot dezactiva servererele"
 msgstr[2] "Nu se pot dezactiva servererele"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Nu se poate dezactiva elementul"
@@ -2514,7 +2511,7 @@ msgstr[0] "Nu se poate dezactiva triggerul"
 msgstr[1] "Nu se pot dezactiva triggerii"
 msgstr[2] "Nu se pot dezactiva triggerii"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Nu se poate dezactiva scenariul web"
@@ -2567,7 +2564,7 @@ msgstr[0] "Nu se poate activa srverul"
 msgstr[1] "Nu se pot activa serverele"
 msgstr[2] "Nu se pot activa serverele"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Nu se poate activa elementul"
@@ -2603,7 +2600,7 @@ msgstr[0] "Nu se poate activa trigger-ul"
 msgstr[1] "Nu se pot activa trigerii"
 msgstr[2] "Nu se pot activa trigerii"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Nu se poate activa scenariul web"
@@ -2618,7 +2615,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2652,8 +2649,8 @@ msgstr "Nu se poate găsi serverul \"%1$s\" folosit în harta \"%2$s\"."
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Nu se poate gasi grupul server \"%1$s\" pentru serverul prototip \"%2$s\" a regulii de detecție \"%3$s\" pe \"%4$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2751,24 +2748,20 @@ msgstr "Nu se poate găsi harta valorilor \"%1$s\" folosită pentru elementul \"
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Nu se poate gasi harta valorilor \"%1$s\" folosită pentru prototipul item  \"%2$s\" a regulii de detecție \"%3$s\" pe \"%4$s\"."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2782,7 +2775,7 @@ msgstr[0] "Nu se poate importa template-ul \"%1$s\", șablonul corelat \"%2$s\"
 msgstr[1] "Nu se poate importa template-ul \"%1$s\", șabloanele corelate \"%2$s\" nu există."
 msgstr[2] "Nu se poate importa template-ul \"%1$s\", șabloanele corelate \"%2$s\" nu există."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "Nu se poate introduce expresia trigger"
 
@@ -2796,7 +2789,7 @@ msgid "Cannot link template."
 msgstr ""
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2829,17 +2822,17 @@ msgstr ""
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Nu se poate efectua instrucțiunea de ștergere în tabela \"%1$s\" fără condiția where."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Nu se poate efectua instrucțiunea de actualizare în tabela \"%1$s\" fără valori."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Nu se poate efectua instrucțiunea de actualizare în tabela \"%1$s\" fără condiția where."
@@ -2866,7 +2859,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Nu se poate citi răspunsul, verificați conexiunea cu serverul Zabbix \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Nu se poate redenumi utilizatorul guest."
 
@@ -2885,7 +2878,7 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Nu se poate trimite comanda, verificați conexiunea cu serverul Zabbix \"%1$s\"."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2925,12 +2918,12 @@ msgstr "Nu se pot seta câmpurile inventarului pentru un inventar dezactivat."
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2950,7 +2943,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Nu se pot deconecta și șterge scenariile Web."
 
@@ -2963,7 +2956,7 @@ msgstr "Nu se poate deconecta șablonul"
 msgid "Cannot unlink template."
 msgstr ""
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -3016,11 +3009,6 @@ msgstr ""
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr ""
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -3030,9 +3018,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "Nu se poate actualiza un grafic bazat pe detecție."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "Nu se poate actualiza un grup de servere bazat pe detecție."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3092,9 +3081,7 @@ msgstr "Nu se poate actualiza prototipul grafic"
 msgid "Cannot update group"
 msgstr "Nu se poate actualiza grupul"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Nu se pot actualiza grupurile pentru serverul detectat \"%1$s\"."
@@ -3119,13 +3106,13 @@ msgstr[2] "Nu se poate actualiza prototipul de server"
 msgid "Cannot update hosts"
 msgstr "Nu se pot actualiza serverele"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "Nu se poate actualiza maparea icon-ului"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Nu se poate actualiza imaginea"
 
@@ -3181,12 +3168,12 @@ msgstr "Nu se poate actualiza harta rețea"
 msgid "Cannot update proxy"
 msgstr "Nu se poate actualiza proxy-ul"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Nu se poate actualiza proxy-ul pentru serverul detectat \"%1$s\"."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3206,17 +3193,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Nu se poate actualiza scriptul"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3294,7 +3281,7 @@ msgstr[2] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Nu se poate actualiza scenariul web"
 
@@ -3394,8 +3381,8 @@ msgid "Character string not included"
 msgstr "Șir de caractere neinclus"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3510,7 +3497,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr "Verificările trebuie să fie unice."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3531,7 +3518,7 @@ msgstr "Refefință circulară în șabloanele: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "Legătura circulară în șabloane nu este permisă."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3552,11 +3539,11 @@ msgstr "Șterge istoric și tendințe"
 msgid "Clear when unlinking"
 msgstr "Șterge la deconectare"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3571,7 +3558,7 @@ msgstr "Ceas"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3586,7 +3573,7 @@ msgstr "Ceas"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Clonă"
 
@@ -3597,8 +3584,8 @@ msgstr "Clonă"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Închide"
 
@@ -3609,13 +3596,13 @@ msgstr "Închide"
 msgid "Close expression constructor"
 msgstr "Închide constructorul de expresii"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
 
@@ -3628,8 +3615,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr ""
 
@@ -3646,7 +3633,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3712,7 +3699,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3723,17 +3710,12 @@ msgstr "Condiție"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3743,17 +3725,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3769,7 +3746,7 @@ msgstr "Condiții"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Configurare"
 
@@ -3832,7 +3809,7 @@ msgstr "Configurare servere"
 msgid "Configuration of housekeeping"
 msgstr "Configurare housekeeping"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Configurare mapare icon"
@@ -3939,7 +3916,7 @@ msgstr "Text de confirmare"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr ""
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -4032,7 +4009,7 @@ msgstr "Contact"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4092,7 +4069,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -4131,8 +4108,8 @@ msgstr "Coordonate"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Copiază"
 
@@ -4141,12 +4118,11 @@ msgstr "Copiază"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr ""
@@ -4176,16 +4152,6 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr ""
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr ""
@@ -4194,14 +4160,10 @@ msgstr ""
 msgid "Correlation updated"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Nu s-a putut salva imaginea!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Număr"
 
@@ -4265,11 +4227,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr ""
 
@@ -4386,7 +4348,7 @@ msgstr "Creează hartă"
 msgid "Create media type"
 msgstr "Creează tip media"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr ""
 
@@ -4410,7 +4372,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Creează șablon"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Creează trigger"
 
@@ -4573,7 +4535,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "Nume DNS"
@@ -4585,11 +4547,11 @@ msgstr "Nume DNS"
 msgid "Daily"
 msgstr "Zilnic"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4610,8 +4572,8 @@ msgstr ""
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr ""
 
@@ -4635,9 +4597,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr ""
 
@@ -4661,7 +4623,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4689,7 +4651,7 @@ msgstr "Verificare date"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4831,7 +4793,7 @@ msgstr "Ziua săptămânii"
 msgid "Days"
 msgstr "Zile"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Depanare"
 
@@ -4845,26 +4807,26 @@ msgstr "Mod depanare"
 msgid "Dec"
 msgstr "Dec"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Decembrie"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Implicit"
 
@@ -4957,7 +4919,7 @@ msgstr "Întârziat de către"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4981,8 +4943,8 @@ msgstr "Întârziat de către"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Șterge"
 
@@ -5007,11 +4969,11 @@ msgstr "Ștergere si curățare șablon? (Avertizare: toate serverele conectate
 msgid "Delete current action?"
 msgstr "Ștergere acțiune curentă?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -5055,7 +5017,7 @@ msgstr "Ștergere prototip de element?"
 msgid "Delete item?"
 msgstr "Ștergere element?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Ștergere legătura între elementele selectate?"
 
@@ -5111,7 +5073,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "Ștergere regulă de detecție selectată?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Ștergere elemente selectate?"
 
@@ -5216,7 +5178,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5260,7 +5222,7 @@ msgstr "Ștergere trigger?"
 msgid "Delete web scenario?"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5305,7 +5267,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Dependențe"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Dependenţă"
 
@@ -5313,7 +5275,7 @@ msgstr "Dependenţă"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5323,7 +5285,7 @@ msgstr "Depinde de"
 msgid "Deployment status"
 msgstr "Stare de implementare"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5356,7 +5318,7 @@ msgid "Description"
 msgstr "Descriere"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5522,10 +5484,10 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5608,7 +5570,7 @@ msgid "Discovery by proxy"
 msgstr "Detectat de către proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Verificare de detectare"
 
@@ -5620,7 +5582,7 @@ msgstr "Verificări de detectare"
 msgid "Discovery list"
 msgstr "Listă de detecție"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Obiect detectat"
 
@@ -5652,7 +5614,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5660,12 +5622,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Regulă de detecție"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Regula de detecție \"%1$s\" există deja pe \"%2$s\", moștenită de la alt șablon."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "Regula de detecție \"%1$s\" există deja pe \"%2$s\"."
@@ -5678,7 +5640,7 @@ msgstr "Regula de detecție \"%1$s\" există deja pe \"%2$s\"."
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5723,7 +5685,7 @@ msgstr "Regulă de detecție actualizată"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5734,7 +5696,7 @@ msgstr "Reguli de detecție"
 msgid "Discovery rules deleted"
 msgstr "Reguli de detecție șterse"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Stare detecție"
@@ -5771,10 +5733,11 @@ msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Afișare %1$s din %2$s gasită"
@@ -5784,7 +5747,7 @@ msgstr "Afișare %1$s din %2$s gasită"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5806,7 +5769,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Doreşti să înlocuiești expresia condițională?"
 
@@ -5862,7 +5825,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Oprit"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5870,7 +5833,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr ""
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5889,18 +5852,6 @@ msgstr ""
 msgid "Draw style"
 msgstr "Stil de desen"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5913,11 +5864,6 @@ msgstr ""
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5969,7 +5915,7 @@ msgstr "Item dinamic"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Fiecare URL trebuie să aibă un nume unic. Vă rugăm să vă asigurați că există un singur URL cu numele"
 
@@ -5978,11 +5924,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5996,8 +5942,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Editare"
 
@@ -6013,11 +5959,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Editare trigger"
 
@@ -6077,21 +6023,17 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
@@ -6107,25 +6049,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6135,14 +6071,6 @@ msgstr "Golire parametru de intrare."
 msgid "Empty map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Golire parametri"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6308,7 +6236,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6319,7 +6247,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6362,7 +6290,7 @@ msgid "English (en_US)"
 msgstr "Engleză (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6378,7 +6306,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6397,12 +6325,12 @@ msgstr ""
 msgid "Error"
 msgstr "Eroare"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Eroare in cererea de căutare pentru tabelul \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6430,7 +6358,7 @@ msgstr "Eveniment ID"
 msgid "Event acknowledged"
 msgstr "Eveniment confirmat"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6438,7 +6366,7 @@ msgid "Event correlation"
 msgstr ""
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr ""
@@ -6473,11 +6401,11 @@ msgstr ""
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Tip eveniment"
 
@@ -6523,15 +6451,10 @@ msgstr "Exclude"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Execută"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "Execută eroare SQL [%1$s] în [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6569,7 +6492,7 @@ msgstr ""
 msgid "Executed script"
 msgstr "Script executat"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Confirmare de executare"
 
@@ -6585,8 +6508,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr ""
 
@@ -6707,7 +6630,7 @@ msgstr "Expresii"
 msgid "External check"
 msgstr "Verificare externă"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6734,8 +6657,8 @@ msgstr "Eșec"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6746,26 +6669,26 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6773,7 +6696,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6797,7 +6720,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Februarie"
 
@@ -6819,10 +6742,9 @@ msgstr "Câmpul \"%1$s\" nu poate fi pus NULL."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6833,13 +6755,6 @@ msgstr "Câmpul \"%1$s\" este opțional. "
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6858,11 +6773,6 @@ msgstr "Câmpul \"%1$s\" nu este număr întreg."
 msgid "Field \"%1$s\" is not string."
 msgstr "Câmpul \"%1$s\" nu este șir."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6877,10 +6787,6 @@ msgstr ""
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Formatul fișierului nu este suportat."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6945,7 +6851,8 @@ msgstr "Zone pline"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6970,7 +6877,7 @@ msgstr "Filtru"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -7022,7 +6929,7 @@ msgstr "Încadrează în hartă"
 msgid "Fixed"
 msgstr "Remediat"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -7073,12 +6980,12 @@ msgstr "Formulă"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7091,7 +6998,7 @@ msgstr "Franceză (fr_FR)"
 msgid "Fri"
 msgstr "Fri"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Vineri"
 
@@ -7202,7 +7109,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "Expresia dată nu este macro"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr ""
@@ -7216,7 +7123,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Mergi la"
 
@@ -7254,7 +7161,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7262,7 +7169,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Gradient linie"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7323,7 +7230,7 @@ msgstr[2] ""
 msgid "Graph deleted"
 msgstr "Grafic șters"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7360,8 +7267,8 @@ msgstr "Prototip grafic șters"
 msgid "Graph prototype updated"
 msgstr "Prototip grafic adăugat"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7395,8 +7302,8 @@ msgstr "Tip grafic"
 msgid "Graph updated"
 msgstr "Grafic actualizat"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7427,7 +7334,7 @@ msgstr "Graficul cu numele \"%1$s\" există deja în grafic sau în prototipuril
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Grafice"
 
@@ -7448,12 +7355,12 @@ msgstr "Grilă"
 msgid "Group"
 msgstr "Grup"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Grupul \"%1$s\" nu poate fi șters, pentru că este utilizat de un server prototip "
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr ""
@@ -7629,11 +7536,11 @@ msgstr "Ajutor"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Ascuns"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr ""
 
@@ -7660,11 +7567,11 @@ msgstr ""
 msgid "High"
 msgstr "Ridicat"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7685,7 +7592,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Istoric"
 
@@ -7693,11 +7600,15 @@ msgstr "Istoric"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Istoric șters"
 
@@ -7740,7 +7651,7 @@ msgstr "Orizontal"
 msgid "Horizontal align"
 msgstr "Aliniere orizontală"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7769,7 +7680,7 @@ msgstr "Aliniere orizontală"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 #, fuzzy
 msgid "Host"
@@ -7785,7 +7696,7 @@ msgstr[2] "Server"
 msgid "Host \"%1$s\" already exists."
 msgstr "Serverul \"%1$s\" există deja."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7793,7 +7704,7 @@ msgstr "Serverul \"%1$s\" există deja."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7847,7 +7758,7 @@ msgstr[0] "Server activat"
 msgstr[1] "Servere activate"
 msgstr[2] "Servere activate"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7861,22 +7772,22 @@ msgstr[2] "Servere activate"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Grup server"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Grupul server \"%1$s\" există deja."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Grupul server \"%1$s\" nu poate fi șters, pentru că este utilizat într-un script global."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7889,10 +7800,10 @@ msgstr "Elementele grupului de servere"
 msgid "Host group label type"
 msgstr "Tipul etichetei grupului de servere"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7908,8 +7819,8 @@ msgstr ""
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7983,7 +7894,7 @@ msgstr "Nume server"
 msgid "Host networks"
 msgstr "Rețele server"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -8065,7 +7976,7 @@ msgstr "Actualizare server nereușită."
 msgid "Host updated"
 msgstr "Server actualizat"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr ""
@@ -8085,7 +7996,7 @@ msgstr "Server cu același nume \"%1$s\" există deja."
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Server cu același nume vizibil \"%1$s\" există deja."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8098,7 +8009,7 @@ msgstr "Server cu același nume vizibil \"%1$s\" există deja."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8146,7 +8057,7 @@ msgstr "Servere actualizate"
 msgid "Hours"
 msgstr "Ore"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8186,7 +8097,7 @@ msgstr "IP Internet Protocol"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "Adresă IP"
@@ -8211,7 +8122,7 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8268,12 +8179,12 @@ msgstr "Iconiță selectată"
 msgid "Icon map"
 msgstr "Icon hartă"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Icon hartă \"%1$s\" nu poate fi ștearsă. Este folosită în harta \"%2$s\"."
@@ -8286,18 +8197,18 @@ msgstr "Icon hartă creat"
 msgid "Icon map deleted"
 msgstr "Icon hartă șters"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Icon hartă actualizat"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "mapare icon"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
@@ -8400,23 +8311,20 @@ msgstr "Dacă crezi ca acest mesaj este greșit, te rog să consulți administra
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Imagine"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "Imaginea \"%1$s\" există deja."
@@ -8425,7 +8333,7 @@ msgstr "Imaginea \"%1$s\" există deja."
 msgid "Image added"
 msgstr "Imagine adăugată"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Imagine ștearsă"
 
@@ -8433,18 +8341,12 @@ msgstr "Imagine ștearsă"
 msgid "Image label type"
 msgstr "Tipul etichetei imaginii"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "Eroare de încărcare imagine [%1$s] în [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Imagine actualizată"
 
@@ -8539,7 +8441,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8550,13 +8452,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr ""
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8600,7 +8502,7 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8768,24 +8670,6 @@ msgstr "Operațiune de acțiune incorectă grup server. Grupul server nu există
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Utilizator acțiune incorectă a operațiunii. Utilizatorul nu există sau nu ai acces la acest utilizator."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8840,8 +8724,6 @@ msgstr "Utilizator acțiune incorectă a operațiunii. Utilizatorul nu există s
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Argumente incorecte trimise funcției."
 
@@ -8867,31 +8749,22 @@ msgstr "Caractere incorecte folosite pentru șablonul nume \"%1$s\"."
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8920,7 +8793,7 @@ msgstr "Valoare obiect eveniment incorectă."
 msgid "Incorrect eventsource value."
 msgstr "Valoare sursă eveniment incorectă."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Nume sau valoare câmp \"%1$s\" incorecte în care afirmația pentru tabelul \"%2$s\"."
@@ -8945,22 +8818,17 @@ msgstr "Încărcare fișier incorectă. "
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8971,7 +8839,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
@@ -8999,8 +8867,6 @@ msgstr "Index imagine incorect."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -9062,10 +8928,6 @@ msgstr "Perioadă a mentenanței incorectă (minim 5 minute)"
 msgid "Incorrect map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr ""
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9123,13 +8985,13 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Răspuns incorect primit de la serverul Zabbix \"%1$s\"."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Timp de încetare serviciu incorect."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Timp de pornire serviciu incorect."
 
@@ -9182,12 +9044,7 @@ msgstr ""
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
@@ -9233,13 +9090,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9256,60 +9113,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Valoare incorectă \"%1$s\" pentru câmpul \"%2$s\": trebuie să fie între %3$s și %4$s."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "Valoare incorectă \"%1$s\" pentru câmpul flotant \"%2$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "Valoare incorectă \"%1$s\" pentru câmpul int \"%2$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Valoare incorectă \"%1$s\" pentru câmpul int nesemnat \"%2$s\"."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr ""
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9364,14 +9191,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9481,25 +9302,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9510,7 +9313,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9556,16 +9359,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9574,7 +9378,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9662,12 +9466,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Inserează"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr ""
 
@@ -9771,7 +9575,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9779,7 +9583,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9790,7 +9594,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Interval"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9813,7 +9617,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9845,7 +9649,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Cheie invalidă \"%1$s\" pentru regula de detecție \"%2$s\" pe \"%3$s\": %4$s."
@@ -9870,27 +9674,29 @@ msgstr "Cheie invalidă \"%1$s\": %2$s."
 msgid "Invalid method parameters."
 msgstr "Parametrii metodei invalizi. "
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9916,17 +9722,17 @@ msgstr "Parametrii metodei invalizi. "
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9934,8 +9740,8 @@ msgstr "Parametrii metodei invalizi. "
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9949,106 +9755,116 @@ msgstr "Parametrii metodei invalizi. "
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -10090,43 +9906,38 @@ msgstr "Cod de răspuns invalid \"%1$s\"."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10147,7 +9958,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Inventar"
 
@@ -10188,7 +9999,7 @@ msgstr "Nu este posibilă căutarea după parola utilizatorului."
 msgid "Italian (it_IT)"
 msgstr "Italiană (it)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10220,7 +10031,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "Itemul \"%1$s\" nu poate popula un server lipsă cu număr câmp inventar \"%2$d\". Opțiunile suntȘ de la 0 (nu popula) la %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10234,7 +10045,7 @@ msgstr "Item adăugat"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] ""
@@ -10249,14 +10060,14 @@ msgstr "Numărătoare item"
 msgid "Item deleted"
 msgstr "Item șters"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Element dezactivat"
 msgstr[1] "Elemente dezactivate"
 msgstr[2] "Elemente dezactivate"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Item activat"
@@ -10267,7 +10078,7 @@ msgstr[2] "Itemi activați"
 msgid "Item in \"not supported\" state"
 msgstr "Item în stare \"nesuportată\""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "Item neselectat"
 
@@ -10276,7 +10087,7 @@ msgstr "Item neselectat"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10315,8 +10126,8 @@ msgstr[0] "Prototip item actualizat"
 msgstr[1] "Prototip item actualizat"
 msgstr[2] "Prototip item actualizat"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10342,7 +10153,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10374,8 +10185,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10426,11 +10237,11 @@ msgstr "Item cu cheia \"%1$s\" deja există pe \"%2$s\"."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Itemi"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Itemi ștersi"
 
@@ -10448,7 +10259,7 @@ msgstr "Itemi actualizați"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10473,6 +10284,10 @@ msgstr "Interfață JMX"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10485,7 +10300,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10503,7 +10318,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Ian"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Ianuarie"
 
@@ -10525,7 +10340,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Iul"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Iulie"
 
@@ -10533,7 +10348,7 @@ msgstr "Iulie"
 msgid "Jun"
 msgstr "Iun"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Iunie"
 
@@ -10695,22 +10510,6 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10722,11 +10521,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Ultima verificare"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Graficul ultimei ore"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Graficul ultimei luni"
 
@@ -10764,11 +10563,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Ultima valoare"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Graficul ultimei săptămâni"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10777,11 +10576,11 @@ msgstr "Graficul ultimei săptămâni"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Cele mai recente date"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "Cele mai recente valori"
 
@@ -10822,7 +10621,7 @@ msgstr ""
 msgid "Left trim"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -11103,7 +10902,7 @@ msgstr "Nivel scăzut al regulii de detecție în stare \"nu este acceptată\""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -11125,7 +10924,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11136,12 +10935,12 @@ msgid "Macro"
 msgstr "Macro"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Macro-ul \"%1$s\" există deja pe \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Macro-ul \"%1$s\" există deja."
@@ -11169,7 +10968,7 @@ msgstr "Macro-uri actualizate"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -11177,7 +10976,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11260,7 +11059,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11282,13 +11081,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Hartă"
 
@@ -11357,7 +11156,7 @@ msgstr ""
 msgid "Map update failed."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11389,7 +11188,7 @@ msgstr "Hărți"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Martie"
 
@@ -11493,7 +11292,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11508,7 +11307,7 @@ msgstr[2] "Perioada maximă de timp pentru afișare este %1$s zile."
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Mai"
 
@@ -11523,15 +11322,12 @@ msgstr "Mai"
 msgid "Media"
 msgstr "Media"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Tipul media"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr ""
@@ -11562,11 +11358,6 @@ msgstr[0] "Tipul media activat"
 msgstr[1] "Tipurile media activate"
 msgstr[2] "Tipurile media activate"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr ""
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11596,7 +11387,7 @@ msgstr ""
 msgid "Media types"
 msgstr "Tipuri media"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11684,7 +11475,7 @@ msgstr "Trimitere mesaje"
 msgid "Method not found."
 msgstr "Metoda nu a fost găsită."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11746,7 +11537,7 @@ msgid "Minimum severity"
 msgstr "Severitate minimă"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11806,7 +11597,7 @@ msgstr "Mod"
 msgid "Model"
 msgstr "Model"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11848,7 +11639,7 @@ msgstr[2] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11874,7 +11665,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Lun"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Luni"
 
@@ -11914,11 +11705,11 @@ msgstr "Lună"
 msgid "Monthly"
 msgstr "Lunar"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "Mai multe potriviri găsite..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11942,7 +11733,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11955,7 +11746,7 @@ msgstr ""
 msgid "Multiple PROBLEM events"
 msgstr "Evenimente PROBLEME multiple"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Mut"
 
@@ -12084,11 +11875,11 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12246,19 +12037,21 @@ msgstr "Condiție nouă"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Element nou"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr ""
 
@@ -12270,7 +12063,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Exoresie uzuală nouă"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12278,7 +12071,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Timp service nou"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12287,7 +12080,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12305,7 +12098,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12334,30 +12127,6 @@ msgstr ""
 msgid "No"
 msgstr "Nu"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr ""
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12373,11 +12142,6 @@ msgstr "Niciun \"%1$s\" dat pentru grafic."
 msgid "No \"%1$s\" given for map."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12385,7 +12149,7 @@ msgstr ""
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -12395,7 +12159,7 @@ msgstr ""
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -12412,11 +12176,6 @@ msgstr "Niciun nume de utilizator specificat."
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr ""
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12447,7 +12206,7 @@ msgstr "Nicio interfață implicită pentru tipul \"%1$s\" pe \"%2$s\"."
 msgid "No details"
 msgstr "Niciun detaliu"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "Nicio regulă de detecție IDs dată."
 
@@ -12483,7 +12242,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "Niciun grafic adăugat."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Niciun IDs server dat."
 
@@ -12513,7 +12272,7 @@ msgstr "Nicio imagine"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Nicio interfață găsită"
 
@@ -12547,7 +12306,7 @@ msgstr "Niciun macro găsit."
 msgid "No maps added."
 msgstr "Nicio hartă adaugată."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "Nicio potrivire găsită"
 
@@ -12555,17 +12314,46 @@ msgstr "Nicio potrivire găsită"
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Nicio permisiune de acces la sistem."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12573,7 +12361,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12601,19 +12389,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12628,16 +12415,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12657,12 +12450,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12683,27 +12474,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12720,14 +12513,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12736,7 +12529,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Nicio permisiune la obiectul menționat sau acesta nu există!"
 
@@ -12756,7 +12549,7 @@ msgstr "Nu a fost specificat nici un fișier cu cheie publică."
 msgid "No recipients for action operation message."
 msgstr "Niciun destinatar pentru mesajul de acțiune a operațiunii."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr ""
 
@@ -12768,7 +12561,7 @@ msgstr "Nu a fost specificat niciun script pentru comanda de acțiune a operați
 msgid "No target selected"
 msgstr "Nu a fost selectată nicio țintă"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Nu a fost selectată nicio țintă."
 
@@ -12785,7 +12578,7 @@ msgstr "Niciun trigger definit."
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr ""
 
@@ -12855,15 +12648,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Nu este permisă setarea parolei pentru utilizatorul \"guest\"."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12895,7 +12688,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "Nesuportat"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Notă"
@@ -12926,7 +12719,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Noi"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "Noiembrie"
 
@@ -13113,8 +12906,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13174,13 +12967,13 @@ msgstr "Oct"
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Octombrie"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Oprit"
 
@@ -13188,30 +12981,31 @@ msgstr "Oprit"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr ""
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "Pornit"
 
@@ -13227,35 +13021,15 @@ msgstr "Odată"
 msgid "One"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "Unul dintre obiecte este lăsat fără grup servere."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "O singură dată"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Întrerupere unică"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Numai super administratorii pot crea grupuri de servere."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Doar Superadministratorii pot crea tipuri de media."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Doar Superadministratorii pot șterge tipuri de media."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Doar Superadministratorii pot edita tipuri de media."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13305,10 +13079,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr ""
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13317,15 +13087,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr ""
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Numai triggerii atribuiți să activeze servere și care depind de itemi activați sunt contorizați"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13334,7 +13100,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13343,11 +13109,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Operațiunea nu poate fi executată datorită unei cereri neautorizate."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Detalii operațiunii"
 
@@ -13369,7 +13135,7 @@ msgstr "Operațiunea nu are șablon de operare."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13378,33 +13144,33 @@ msgstr ""
 msgid "Operations"
 msgstr "Operațiuni"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operator"
 
@@ -13513,7 +13279,7 @@ msgstr "Alți parametri de configurare"
 msgid "Other parameters"
 msgstr "Alți parametri"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Alții"
@@ -13527,7 +13293,7 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13556,7 +13322,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13745,7 +13511,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13790,7 +13556,7 @@ msgstr ""
 msgid "PSK identity"
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13813,16 +13579,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parametru"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr ""
@@ -13852,7 +13618,7 @@ msgstr "Itemi părinte"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13869,7 +13635,7 @@ msgstr "Triggeri părinte"
 msgid "Parent web scenarios"
 msgstr "Scenarii web părinte"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13881,11 +13647,6 @@ msgstr ""
 msgid "Parse"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "Analizează eroarea SQL [%1$s] în [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Eroare de analizare"
@@ -13946,7 +13707,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr ""
 
@@ -13956,15 +13717,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -14010,12 +13771,11 @@ msgstr ""
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Perioadă"
 
@@ -14104,7 +13864,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Va rog selectați două elemente"
 
@@ -14144,7 +13904,7 @@ msgstr "Populare câmp server inventar"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14233,7 +13993,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14364,7 +14124,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Problemă pe"
 
@@ -14377,21 +14137,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14405,9 +14161,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Probleme"
 
@@ -14441,7 +14197,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr ""
 
@@ -14462,13 +14218,13 @@ msgstr ""
 msgid "Proxies"
 msgstr "Proxy-uri"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14476,7 +14232,7 @@ msgstr "Proxy-uri"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14486,12 +14242,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Proxy \"%1$s\" pentru serverul \"%2$s\" nu există."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Proxy \"%1$s\" este utilizat de regula de detecție \"%2$s\"."
@@ -14586,7 +14342,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14663,10 +14419,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Valoare primită"
@@ -14748,7 +14500,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14766,13 +14518,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Expresie uzuală"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14806,7 +14558,7 @@ msgstr "Expresii uzuale"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14838,8 +14590,6 @@ msgstr "Comandă de la distanță"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14860,7 +14610,9 @@ msgstr "Comandă de la distanță"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14873,7 +14625,7 @@ msgstr "Comandă de la distanță"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14950,8 +14702,8 @@ msgstr "Comandă de la distanță"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Șterge"
 
@@ -14991,7 +14743,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -15033,7 +14785,7 @@ msgid "Replace dependencies"
 msgstr "Înlocuiește dependențele"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -15088,7 +14840,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -15130,8 +14882,8 @@ msgstr "Coduri de stare necesare"
 msgid "Required string"
 msgstr "Șir necesar"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Resetează"
 
@@ -15164,7 +14916,7 @@ msgstr "Confirmare de resetare"
 msgid "Reset defaults"
 msgstr "Resetează implicite"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Rezolvat"
 
@@ -15230,7 +14982,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Rezultat"
@@ -15417,12 +15169,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Rusă (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15433,8 +15185,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15471,7 +15223,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15567,12 +15319,12 @@ msgstr ""
 msgid "SQL query"
 msgstr "Cerere SQL"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "Execuție declarație SQL eșuată \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Execuție declarație SQL eșuată \"%1$s\"."
@@ -15635,7 +15387,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15647,7 +15399,7 @@ msgstr ""
 msgid "Sat"
 msgstr "Sâm"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Sâmbătă"
 
@@ -15689,7 +15441,7 @@ msgstr "Programare"
 msgid "Scheduled check"
 msgstr "Verificare programare"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15759,7 +15511,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15772,8 +15524,7 @@ msgstr ""
 msgid "Script"
 msgstr "Script"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Scriptul \"%1$s\" există deja."
@@ -15807,12 +15558,6 @@ msgstr "Nume script"
 msgid "Script parameters"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr ""
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Script profiler"
@@ -15825,7 +15570,7 @@ msgstr "Script actualizat"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Scripturi"
 
@@ -15895,8 +15640,8 @@ msgid "Security name"
 msgstr "Nume securitate"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15904,7 +15649,7 @@ msgstr "Nume securitate"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Selectează"
 
@@ -15940,19 +15685,19 @@ msgstr "Elementele selectate"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr ""
 
@@ -15977,7 +15722,7 @@ msgstr "Trimite doar la"
 msgid "Send to"
 msgstr "Trimite la"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr ""
 
@@ -16010,7 +15755,7 @@ msgstr "Depărțit"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "Septembrie"
 
@@ -16041,28 +15786,28 @@ msgstr ""
 msgid "Server time"
 msgstr "Timp server"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Serviciu"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -16072,7 +15817,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "Serviciu creat"
 
@@ -16106,16 +15851,16 @@ msgstr "Port serviciu"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "Timpul de pornire al serviciului trebuie sa fie mai puțin decât serviciul de sfârșit."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -16123,11 +15868,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Timpuri de serviciu"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Tip de serviciu"
 
@@ -16136,30 +15881,29 @@ msgstr "Tip de serviciu"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Serviciu actualizat"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Servicii"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "Servicii formează o dependență circulară."
 
@@ -16167,7 +15911,7 @@ msgstr "Servicii formează o dependență circulară."
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16197,7 +15941,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16226,7 +15970,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16235,7 +15979,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16291,7 +16035,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr ""
 
@@ -16433,7 +16177,7 @@ msgstr "Arată avertizare dacă serverul Zabbix este căzut"
 msgid "Show working time"
 msgstr "Arată timpul de lucru"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Afișat"
 
@@ -16542,7 +16286,7 @@ msgstr "Copiere sărită a graficului \"%1$s\" la server \"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "Slovacă (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Amânare"
 
@@ -16588,7 +16332,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Ordinea sortării package list (0->999)"
 
@@ -16662,7 +16406,7 @@ msgstr "Începe la"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16765,15 +16509,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Stare"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Coduri stare"
@@ -16803,7 +16551,7 @@ msgstr "Doar stare"
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16851,7 +16599,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16916,7 +16664,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Subhartă"
 
@@ -16932,7 +16680,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Verificare reușită"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16945,7 +16693,7 @@ msgstr ""
 msgid "Sun"
 msgstr "Dum"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Duminică"
 
@@ -17037,12 +16785,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -17069,17 +16817,17 @@ msgstr "ADEVĂRAT"
 msgid "Table \"%1$s\" does not exist."
 msgstr "Tabelul \"%1$s\" nu există."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "Tabelul \"%1$s\" nu are un câmp numit \"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Etichetă"
@@ -17135,7 +16883,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17195,7 +16943,7 @@ msgstr "Tip țintă"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17216,7 +16964,7 @@ msgstr "Șablon"
 msgid "Template \"%1$s\" already exists."
 msgstr "Șablonul \"%1$s\" există deja."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17240,7 +16988,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Șablonul nu poate fi legat de alt șablon mai mult de o dată chiar și prin alte șabloane."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17300,7 +17048,7 @@ msgstr "Șablon cu același nume vizibil \"%1$s\" există deja."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17472,7 +17220,7 @@ msgstr "Serverul nu mai este detectat și va fi șters în %1$s (pe %2$s la %3$s
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
@@ -17480,7 +17228,7 @@ msgstr[0] "Imaginea este folosită în harta iconiței %1$s."
 msgstr[1] "Imaginea este folosită în harta iconițelor %1$s."
 msgstr[2] "Imaginea este folosită în harta iconițelor %1$s."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17546,7 +17294,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Luna aceasta"
 
@@ -17554,7 +17302,7 @@ msgstr "Luna aceasta"
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Această săptămână"
 
@@ -17562,7 +17310,7 @@ msgstr "Această săptămână"
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Anul acesta"
 
@@ -17582,7 +17330,7 @@ msgstr ""
 msgid "Thu"
 msgstr "Joi"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Joi"
 
@@ -17599,7 +17347,7 @@ msgstr "Până când"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17632,7 +17380,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Perioadă de timp"
 
@@ -17684,12 +17432,11 @@ msgstr "Dată"
 msgid "To"
 msgstr "Către"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "Pentru setarea unei interfețe server selectează un singur tip de item pentru toți itemii"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Astăzi"
 
@@ -17804,7 +17551,7 @@ msgstr "Perioadă trend a stocării"
 msgid "Trends"
 msgstr "Tendințe"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17812,7 +17559,7 @@ msgstr "Tendințe"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Trigger"
 
@@ -17916,7 +17663,7 @@ msgstr "Nume trigger"
 msgid "Trigger overview"
 msgstr "Prezentare triggeri"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17991,11 +17738,11 @@ msgstr "Prototipi trigger actualizat"
 msgid "Trigger severity"
 msgstr "Severitate trigger"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -18012,7 +17759,7 @@ msgstr "Trigger actualizat"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -18047,7 +17794,7 @@ msgstr ""
 msgid "Tue"
 msgstr "Mar"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Marți"
 
@@ -18060,7 +17807,7 @@ msgstr "Turcă (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Doi itemi (\"%1$s\" și \"%2$s\") nu pot popula un câmp inventar al unui server \"%3$s\", aceasta ar duce la un conflict. "
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -18076,19 +17823,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18140,7 +17887,7 @@ msgstr "Tip de informație"
 msgid "Types"
 msgstr "Tipuri"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18161,7 +17908,7 @@ msgstr "NECUNOSCUT"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18207,12 +17954,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URL-uri"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18297,12 +18044,12 @@ msgstr ""
 msgid "Unblock selected users?"
 msgstr "Deblocare utilizatori selectați?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18322,21 +18069,23 @@ msgstr "Unități"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Necunoscut"
@@ -18354,7 +18103,7 @@ msgid "Unknown error"
 msgstr "Eroare necunoscută"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Item server necunoscut, nu există asemenea item în serverul selectat"
@@ -18407,7 +18156,7 @@ msgstr "Dezleagă de șablon"
 msgid "Unlink from templates"
 msgstr "Dezleagă de șabloane"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Pornire sunet"
 
@@ -18439,7 +18188,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -18449,7 +18198,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -18494,7 +18243,7 @@ msgstr "Sus"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18507,7 +18256,7 @@ msgstr "Sus"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18560,7 +18309,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18578,7 +18327,7 @@ msgstr "Încarcă"
 msgid "Upper level maps"
 msgstr "Hărți de nivel superior"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18613,7 +18362,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "Utilizat în acțiuni"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18628,7 +18377,7 @@ msgstr "Utilizat în acțiuni"
 msgid "User"
 msgstr "Utilizator"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
@@ -18680,7 +18429,7 @@ msgstr "Utilizator adăugat"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Utilizatorul nu poate să se adauge unui grup dezactivat sau  unui grup cu acces GUI dezactivat."
@@ -18701,7 +18450,7 @@ msgstr[0] "Utilizator șters"
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18711,27 +18460,27 @@ msgstr[2] ""
 msgid "User group"
 msgstr "Grup utilizator"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Grup utilizator \"%1$s\" este utilizat în configurația pentru mesaje de cădere a bazei de date."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Grup utilizator \"%1$s\" folosit în script \"%2$s\"."
@@ -18767,8 +18516,8 @@ msgstr[2] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18812,14 +18561,14 @@ msgstr "Parolă utilizator"
 msgid "User profile"
 msgstr "Profil utilizator"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18890,7 +18639,7 @@ msgstr "Utilizator actualizat"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -19206,14 +18955,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19223,7 +18972,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19265,7 +19014,7 @@ msgstr "Valoarea \"%1$s\" nu este validă pentru parametrul \"grid_show\". Alege
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "Valoarea \"%1$s\" nu este validă pentru parametrul \"grid_show\". Alegerile sunt: \"%2$s\"."
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "Valoarea \"%1$s\" este prea mare pentru caracterele câmpului \"%2$s\" - %3$d. Lungimea permisă este %4$d caractere."
@@ -19282,7 +19031,7 @@ msgstr "Statistici valori cache. Moduri valide sunt: total, free, pfree, used an
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Valoare hartă"
 
@@ -19325,11 +19074,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr ""
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19376,7 +19126,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19463,7 +19213,7 @@ msgstr "Numele vizibil nu poate fi gol dacă lipsește numele serverului."
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "M"
@@ -19480,7 +19230,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Avertisment"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19489,7 +19239,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Ne pare rău, a fost atins numărul maxim posibil de elemente de amintit. "
 
@@ -19505,7 +19255,7 @@ msgstr "Ne pare rău, a fost atins numărul maxim posibil de elemente de amintit
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web"
 
@@ -19517,7 +19267,7 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Monitorizare web"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr ""
 
@@ -19532,29 +19282,29 @@ msgstr "Scenariul web \"%1$s\" deja există pe serverul \"%2$s\"."
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Scenariul web \"%1$s\" există deja."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Scenariul web șters"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Scenariul web dezactivat"
 msgstr[1] "Scenariile web dezactivate"
 msgstr[2] "Scenariile web dezactivate"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Scenariul web activat"
 msgstr[1] "Scenariile web activate"
 msgstr[2] "Scenariile web activate"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr ""
 
@@ -19576,7 +19326,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Mie"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Miercuri"
 
@@ -19587,7 +19337,7 @@ msgstr "Miercuri"
 msgid "Weekly"
 msgstr "Săptămânal"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19603,12 +19353,12 @@ msgstr ""
 msgid "When active"
 msgstr "Când e activ"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19803,6 +19553,10 @@ msgstr ""
 msgid "Y-m-d H:i:s"
 msgstr "A-L-Z H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr ""
@@ -19864,7 +19618,7 @@ msgstr "Anual"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19921,18 +19675,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19944,9 +19692,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Nu vă este permis să efectuați această operație."
 
@@ -20062,24 +19807,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr ""
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -20088,37 +19837,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr ""
@@ -20139,28 +19888,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr ""
@@ -20208,7 +19958,7 @@ msgstr "toți"
 msgid "all media"
 msgstr "toata media"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20216,42 +19966,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20261,7 +20006,7 @@ msgid "an empty string is expected"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr ""
 
@@ -20269,11 +20014,15 @@ msgstr ""
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20434,14 +20183,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20471,19 +20214,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20503,14 +20238,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20518,7 +20253,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr ""
@@ -20531,7 +20266,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20565,7 +20300,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20583,7 +20318,8 @@ msgid "configure"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20612,7 +20348,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "z"
@@ -20674,7 +20410,7 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20696,13 +20432,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20728,7 +20464,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20765,6 +20502,10 @@ msgstr ""
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20811,7 +20552,7 @@ msgstr "setări interne globale"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20852,6 +20593,11 @@ msgstr "iconiță"
 msgid "image"
 msgstr "imagine"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "în"
@@ -20892,15 +20638,19 @@ msgstr ""
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "sintaxă incorectă lângă \"%1$s\""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20928,7 +20678,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr ""
 
@@ -20957,27 +20707,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr ""
 
@@ -21005,7 +20755,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr ""
 
@@ -21091,12 +20841,12 @@ msgstr "regulă de detecție de nivel inferior"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "l"
@@ -21155,7 +20905,7 @@ msgstr ""
 msgid "max"
 msgstr "max"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21195,7 +20945,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr ""
@@ -21222,8 +20972,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21238,27 +20988,14 @@ msgstr "trebuie să fie un utilizator valid LDAP"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr ""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21286,6 +21023,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21296,7 +21041,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "nou"
 
@@ -21431,7 +21176,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21466,24 +21211,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21511,11 +21260,11 @@ msgstr ""
 msgid "regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21527,15 +21276,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21583,7 +21332,7 @@ msgstr ""
 msgid "short description"
 msgstr "descriere scurtă"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21602,15 +21351,15 @@ msgstr "descriere scurtă"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr ""
 
@@ -21626,31 +21375,31 @@ msgstr "arată mapări iconițe"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21658,11 +21407,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21678,8 +21427,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21690,7 +21439,7 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21699,13 +21448,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "ID șablon \"%1$s\" este trecut %2$s ori"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21714,20 +21467,20 @@ msgstr "ID șablon \"%1$s\" este trecut %2$s ori"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr ""
@@ -21759,39 +21512,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21805,7 +21558,7 @@ msgstr "trigger"
 msgid "trigger does not allow manual closing"
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21817,26 +21570,26 @@ msgstr ""
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "scrie aici pentru căutare"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21844,11 +21597,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21865,10 +21618,10 @@ msgstr "sfîrșit neașteptat de cheie"
 msgid "unexpected end of macro"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21878,11 +21631,12 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr ""
@@ -21908,8 +21662,8 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21934,6 +21688,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21949,7 +21707,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21969,11 +21727,11 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "valoare"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21991,76 +21749,87 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr ""
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr ""
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -22072,18 +21841,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -22092,7 +21859,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -22105,11 +21872,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -22126,7 +21893,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "a"
diff --git a/ui/locale/ru/LC_MESSAGES/frontend.po b/ui/locale/ru/LC_MESSAGES/frontend.po
index 56954659906..91c48f5db7c 100644
--- a/ui/locale/ru/LC_MESSAGES/frontend.po
+++ b/ui/locale/ru/LC_MESSAGES/frontend.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
-"PO-Revision-Date: 2021-06-17 14:02+0300\n"
-"Last-Translator: Alexey <dotneft@gmail.com>\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
+"PO-Revision-Date: 2021-09-20 09:03+0300\n"
+"Last-Translator: Yurii <jurijs.klopovskis@zabbix.com>\n"
 "Language-Team: Zabbix translation team\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.5.1.3\n"
 "X-Poedit-Basepath: ../../\n"
-"X-POOTLE-MTIME: 1623931352.000000\n"
+"X-POOTLE-MTIME: 1632121438.000000\n"
 
 #: include/classes/db/MysqlDbBackend.php:70
 #: include/classes/db/OracleDbBackend.php:142
@@ -95,7 +95,7 @@ msgstr[0] "%1$d день"
 msgstr[1] "%1$d дня"
 msgstr[2] "%1$d дней"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -187,7 +187,7 @@ msgstr[2] "%1$s сообщений"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -203,7 +203,7 @@ msgstr[0] "%1$s из %2$s элемента в состоянии проблем�
 msgstr[1] "%1$s из %2$s элементов в состоянии проблемы"
 msgstr[2] "%1$s из %2$s элементов в состоянии проблемы"
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -239,7 +239,7 @@ msgstr[2] "%1$s попыток осталось"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -247,7 +247,7 @@ msgstr[0] "%1$s секунда"
 msgstr[1] "%1$s секунды"
 msgstr[2] "%1$s секунд"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "осталось %1$s символов"
@@ -268,13 +268,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Важность, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, только чтение"
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -406,7 +406,7 @@ msgstr "Доступ к API"
 msgid "API methods"
 msgstr "API методы"
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr "API токен"
 
@@ -470,10 +470,6 @@ msgstr "API токены"
 msgid "Abscissa"
 msgstr "Ось абсцисс"
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "Доступ запрещен"
@@ -516,7 +512,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Подтверждено"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Подтвердить"
 
@@ -524,7 +520,7 @@ msgstr "Подтвердить"
 msgid "Acknowledge problems"
 msgstr "Подтверждение проблем"
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Подтверждено"
@@ -537,7 +533,7 @@ msgstr "Подтвержденные события ПРОБЛЕМА"
 msgid "Acknowledged RESOLVED events"
 msgstr "Подтвержденные РЕШЕННЫЕ события"
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -564,9 +560,9 @@ msgstr "Подтвержденные РЕШЕННЫЕ события"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -623,7 +619,7 @@ msgstr "Действие \"%1$s\" уже существует."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "В действии \"%1$s\" нет заданных операций."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -632,7 +628,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Действие добавлено"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr "Класс действия %1$s должен расширять %2$s класс."
@@ -683,8 +679,8 @@ msgstr "Действие обновлено"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Действия"
@@ -751,7 +747,7 @@ msgstr "Активно до"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -762,7 +758,7 @@ msgstr "Активно до"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -785,9 +781,9 @@ msgstr "Активно до"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -857,7 +853,7 @@ msgstr "Активно до"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Добавить"
 
@@ -865,11 +861,11 @@ msgstr "Добавить"
 msgid "Add (message type limit reached)"
 msgstr "Добавить (достигнуто максимальное количество типов сообщений)"
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "Добавить новый виджет"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "Добавить элемент потомка"
 
@@ -877,7 +873,7 @@ msgstr "Добавить элемент потомка"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -894,7 +890,7 @@ msgstr "Добавить узел сети"
 msgid "Add missing"
 msgstr "Добавить отсутствующее"
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "Добавить несколько карт"
 
@@ -916,7 +912,7 @@ msgstr "Добавить новое замещение"
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -968,12 +964,12 @@ msgstr "Добавить группу пользователей"
 msgid "Add widget"
 msgstr "Добавить виджет"
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr "Добавлено"
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -983,7 +979,7 @@ msgstr "Добавлено, %1$s"
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -996,7 +992,7 @@ msgstr "Администратор"
 msgid "Administration"
 msgstr "Администрирование"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -1018,7 +1014,7 @@ msgstr "Возраст менее чем"
 msgid "Age less than %1$s"
 msgstr "Возраст меньше чем %1$s"
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1090,7 +1086,7 @@ msgstr "Выровнять элементы карты"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Все"
 
@@ -1108,7 +1104,7 @@ msgstr "Все группы"
 msgid "All hosts"
 msgstr "Все узлы сети"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "У всех ссылок должны быть указаны \"Имя\" и \"URL\""
 
@@ -1126,7 +1122,7 @@ msgstr "Все проблемы"
 msgid "All problems if tag values match"
 msgstr "Все проблемы если значения тегов совпадают"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1239,15 +1235,15 @@ msgstr "Ошибка приложения."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Применить"
 
@@ -1265,7 +1261,7 @@ msgstr "Близится"
 msgid "Apr"
 msgstr "Апр."
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Апрель"
 
@@ -1293,7 +1289,7 @@ msgstr "Тип области"
 msgid "Arithmetic"
 msgstr "Арифметические"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1344,7 +1340,7 @@ msgstr "В (час:минута)"
 msgid "At least one UI element must be checked."
 msgstr "Необходимо выбрать по крайней мере один элемент интерфейса пользователей."
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1353,7 +1349,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr "По крайней мере одно действие обязательно."
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1365,6 +1361,11 @@ msgstr "Должен существовать, по крайней мере, о�
 msgid "At least one host group or host must be selected."
 msgstr "Должна быть выбрана по крайней мере одна группа узлов сети или узел сети."
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1376,7 +1377,7 @@ msgstr "Должен быть создан по крайней мере один
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr "Должна поддерживаться по крайней мере одна база данных из MySQL, PostgreSQL или Oracle."
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr "Должна быть выбрана по крайней мере одна операция."
 
@@ -1432,7 +1433,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Авг"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Август"
 
@@ -1445,7 +1446,7 @@ msgstr "Токен аутентификации"
 msgid "AuthN requests"
 msgstr "Запросы AuthN"
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1522,7 +1523,7 @@ msgstr "Авто-выход"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1537,7 +1538,7 @@ msgstr "Автоматическое соответствие иконок"
 msgid "Automatic icon selection"
 msgstr "Автоматический выбор иконки"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1589,7 +1590,7 @@ msgstr "Среднее количество ожидающих запросов
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr "Оси"
 
@@ -1652,7 +1653,7 @@ msgstr "Битовые функции"
 msgid "Blocked"
 msgstr "Заблокирован"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "Голубая"
 
@@ -1706,11 +1707,11 @@ msgstr "Оба пароля должны совпадать."
 msgid "Bottom"
 msgstr "По нижнему краю"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "Переместить вперёд"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "На передний план"
 
@@ -1736,7 +1737,7 @@ msgstr "CERT"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1781,8 +1782,8 @@ msgstr "CRLF"
 msgid "CSV to JSON"
 msgstr "CSV в JSON"
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1791,7 +1792,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Вычисляемое"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr "Календарь"
 
@@ -1816,7 +1817,7 @@ msgstr "Callback"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1829,8 +1830,8 @@ msgstr "Callback"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -1860,7 +1861,7 @@ msgstr "Не удалось добавить действие"
 msgid "Cannot add correlation"
 msgstr "Не удалось добавить корреляцию"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr "Не удалось добавить страницу панели: уже добавлено максимальное количество %1$d страниц панелей"
@@ -1870,7 +1871,7 @@ msgstr "Не удалось добавить страницу панели: уж
 msgid "Cannot add dependency from a host to a template."
 msgstr "Не удалось добавить зависимость от узла сети к шаблону."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1901,8 +1902,8 @@ msgid "Cannot add host prototype"
 msgstr "Не удалось добавить прототип узлов сети"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Не удалось добавить изображение"
 
@@ -1995,15 +1996,15 @@ msgstr "Не удалось добавить пользователя"
 msgid "Cannot add user group"
 msgstr "Не удалось добавить группу пользователей"
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Не удалось добавить веб-сценарий"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr "Не удалось добавить виджет: не хватает свободного места на ПАНЕЛИ."
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2023,33 +2024,29 @@ msgstr "Не удалось привязать к LDAP серверу."
 msgid "Cannot build expression tree: %1$s."
 msgstr "Не удалось построить дерево выражения: %1$s."
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Не удалось очистить историю"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr "Не удалось очистить историю: по крайней мере один из выбранных элементов данных не принадлежит к какому либо узлу сети под наблюдением"
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Не удалось клонировать прототипы графиков."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "Не удалось клонировать прототипы узлов сети."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Не удалось клонировать прототипы элементов данных."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Не удалось клонировать прототипы триггеров."
 
@@ -2077,7 +2074,7 @@ msgstr[0] "Не удалось скопировать график"
 msgstr[1] "Не удалось скопировать графики"
 msgstr[2] "Не удалось скопировать графики"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "Не удалось скопировать элемент даных"
@@ -2131,8 +2128,8 @@ msgstr "Не удалось создать соответствие иконок
 msgid "Cannot create scheduled report"
 msgstr "Не удалось создать регулярный отчет"
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2162,7 +2159,7 @@ msgstr "Невозможно удалить внутреннего пользо�
 msgid "Cannot delete action"
 msgstr "Не удалось удалить действие"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2233,7 +2230,7 @@ msgstr[0] "Не удалось удалить узел сети так как о
 msgstr[1] "Не удалось удалить выбранные узлы сети так как обслуживание \"%1$s\" должно содержать по крайней мере один узел сети или группу узлов сети."
 msgstr[2] "Не удалось удалить выбранные узлы сети так как обслуживание \"%1$s\" должно содержать по крайней мере один узел сети или группу узлов сети."
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2245,11 +2242,11 @@ msgstr[2] "Не удалось удалить групп узлов сети т�
 msgid "Cannot delete host prototypes"
 msgstr "Не удалось удалить прототипы узлов сети"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Не удалось удалить соответствие иконок"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Не удалось удалить изображение"
 
@@ -2274,7 +2271,7 @@ msgstr "Не удалось удалить прототип элементов �
 msgid "Cannot delete item prototypes"
 msgstr "Не удалось удалить прототипы элементов данных"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Не удалось удалить элементы данных"
 
@@ -2308,7 +2305,7 @@ msgstr[0] "Не удалось удалить прокси"
 msgstr[1] "Не удалось удалить прокси"
 msgstr[2] "Не удалось удалить прокси"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr "Не удалось удалить роль пользователя \"%1$s\" только для чтения."
@@ -2334,7 +2331,7 @@ msgstr[0] "Не удалось удалить скрипт"
 msgstr[1] "Не удалось удалить скрипты"
 msgstr[2] "Не удалось удалить скрипты"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Не удалось удалить скрипты. Скрипт \"%1$s\" используется в операции действия \"%2$s\"."
@@ -2351,8 +2348,8 @@ msgstr[0] "Не удалось удалить услугу"
 msgstr[1] "Не удалось удалить услугу"
 msgstr[2] "Не удалось удалить услугу"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2381,7 +2378,7 @@ msgstr "Не удалось удалить прототип элементов �
 msgid "Cannot delete templated item."
 msgstr "Невозможно удалить элемент данных унаследованный из шаблона."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Невозможно удалить элементы данных унаследованные из шаблонов."
 
@@ -2437,7 +2434,7 @@ msgstr[0] "Не удалось удалить роль пользователя"
 msgstr[1] "Не удалось удалить роли пользователей"
 msgstr[2] "Не удалось удалить роли пользователей"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Не удалось удалить веб-сценарий"
 
@@ -2477,7 +2474,7 @@ msgstr[0] "Не удалось деактивировать узел сети"
 msgstr[1] "Не удалось деактивировать узлы сети"
 msgstr[2] "Не удалось деактивировать узлы сети"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Не удалось деактивировать элемент данных"
@@ -2513,7 +2510,7 @@ msgstr[0] "Не удалось деактивировать триггер"
 msgstr[1] "Не удалось деактивировать триггеры"
 msgstr[2] "Не удалось деактивировать триггеры"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Не удалось деактивировать веб-сценарий"
@@ -2566,7 +2563,7 @@ msgstr[0] "Не удалось активировать узел сети"
 msgstr[1] "Не удалось активировать узлы сети"
 msgstr[2] "Не удалось активировать узлы сети"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Не удалось активировать элемент данных"
@@ -2602,7 +2599,7 @@ msgstr[0] "Не удалось активировать триггер"
 msgstr[1] "Не удалось активировать триггеры"
 msgstr[2] "Не удалось активировать триггеры"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Не удалось активировать веб-сценарий"
@@ -2617,7 +2614,7 @@ msgstr "Не удалось раскрыть выражение"
 msgid "Cannot execute script."
 msgstr "Не удалось выполнить скрипт."
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr "Не удалось раскрыть макросы."
 
@@ -2651,8 +2648,8 @@ msgstr "Не удалось найти узел сети \"%1$s\" использ
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Не удалось найти группу узлов сети \"%1$s\" для прототипа узлов сети \"%2$s\" правила обнаружения \"%3$s\" на \"%4$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2750,24 +2747,20 @@ msgstr "Не удалось найти преобразование значен
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Не удалось найти преобразование значений \"%1$s\" используемое в прототипу элементов данных \"%2$s\" в правиле обнаружения \"%3$s\" на \"%4$s\"."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "Видимое имя шаблона не может быть пустым."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2781,7 +2774,7 @@ msgstr[0] "Не удалось импортировать шаблон \"%1$s\",
 msgstr[1] "Не удалось импортировать шаблон \"%1$s\", соединенные шаблоны \"%2$s\" не существуют."
 msgstr[2] "Не удалось импортировать шаблон \"%1$s\", соединенные шаблоны \"%2$s\" не существуют."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "Не удалось вставить выражение триггера"
 
@@ -2795,7 +2788,7 @@ msgid "Cannot link template."
 msgstr "Не удалось присоединить шаблон."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2828,17 +2821,17 @@ msgstr "Невозможно обновить массово видимое им
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr "Невозможно передать дубликаты ID шаблонов для соединения: %1$s."
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Невозможно выполнить запрос удаления из таблицы \"%1$s\" без выражения where."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Невозможно выполнить запрос обновления таблицы \"%1$s\" без значений."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Невозможно выполнить запрос обновления таблицы \"%1$s\" без выражения where."
@@ -2865,7 +2858,7 @@ msgstr "Не удалось прочитать YAML: %1$s."
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Не удалось прочитать ответ, проверьте соединение с Zabbix сервером \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Невозможно переименовать гостевого пользователя."
 
@@ -2884,7 +2877,7 @@ msgstr "Не удалось сохранить виджет \"%1$s\"."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Не удалось отправить команду, проверьте соединение с Zabbix сервером \"%1$s\"."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr "Не удалось отправить запрос"
 
@@ -2924,12 +2917,12 @@ msgstr "Невозможно задать поля инвентарных дан
 msgid "Cannot set session cookie."
 msgstr "Не удалось установить cookie сессии."
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr "Поддержка аудио оповещений отсутствует для этого устройства."
 
@@ -2949,7 +2942,7 @@ msgstr[0] "Не удалось разблокировать пользовате
 msgstr[1] "Не удалось разблокировать пользователей"
 msgstr[2] "Не удалось разблокировать пользователей"
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Не удалось отсоединить и очистить веб-сценарии."
 
@@ -2962,7 +2955,7 @@ msgstr "Не удалось отсоединить шаблон"
 msgid "Cannot unlink template."
 msgstr "Не удалось отсоединить шаблон."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr "Не удалось отсоединить триггер \"%1$s\", у него имеются элементы данных с шаблона, который остается присоединённым к узлу сети."
@@ -3015,11 +3008,6 @@ msgstr "Не удалось обновить \"%1$s\" у обнаруженно�
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "Не удалось обновить \"%2$s\" у обнаруженного триггера \"%1$s\"."
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "Не удалось обновить \"imagetype\" для изображения \"%1$s\"."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -3029,9 +3017,10 @@ msgstr "Не удалось обновить API токен"
 msgid "Cannot update a discovered graph."
 msgstr "Невозможно обновить обнаруженный график."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "Невозможно обновить обнаруженную группу узлов сети."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3091,9 +3080,7 @@ msgstr "Не удалось обновить прототип графиков"
 msgid "Cannot update group"
 msgstr "Не удалось обновить группу"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Не удалось обновить группы для обнаруженного узла сети \"%1$s\"."
@@ -3117,13 +3104,13 @@ msgstr[2] "Не удалось обновить прототипы узлов с
 msgid "Cannot update hosts"
 msgstr "Не удалось обновить узлы сети"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "Не удалось обновить соответствие иконок"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Не удалось обновить изображение"
 
@@ -3178,12 +3165,12 @@ msgstr "Не удалось обновить карту сети"
 msgid "Cannot update proxy"
 msgstr "Не удалось обновить прокси"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Не удалось обновить прокси для обнаруженного узла сети \"%1$s\"."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr "Не удалось обновить роль пользователя \"%1$s\" только на чтение."
@@ -3203,17 +3190,17 @@ msgstr "Не удалось обновить регулярный отчет"
 msgid "Cannot update script"
 msgstr "Не удалось обновить скрипт"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr "Не удалось обновить область использования скрипта. Скрипт \"%1$s\" используется в действии \"%2$s\"."
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3290,7 +3277,7 @@ msgstr[2] "Не удалось обновить группы пользоват�
 msgid "Cannot update user role"
 msgstr "Не удалось обновить роль пользователя"
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Не удалось обновить веб-сценарий"
 
@@ -3390,8 +3377,8 @@ msgid "Character string not included"
 msgstr "Строка символов не включена"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr "Символы"
 
@@ -3506,7 +3493,7 @@ msgstr "Проверяется производительность UDP серв
 msgid "Checks should be unique."
 msgstr "Проверки должны быть уникальными."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3527,7 +3514,7 @@ msgstr "Закольцованная ссылка в шаблонах: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "Закольцованное соединение шаблонов не допускается."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr "Класс %1$s не найден для действия %2$s."
@@ -3548,11 +3535,11 @@ msgstr "Очистить историю и динамику изменений"
 msgid "Clear when unlinking"
 msgstr "Очистить при отсоединении"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr "Нажмите и переместите до желаемого размера."
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr "Нажмите для просмотра или изменения"
 
@@ -3567,7 +3554,7 @@ msgstr "Часы"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3582,7 +3569,7 @@ msgstr "Часы"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Клонировать"
 
@@ -3593,8 +3580,8 @@ msgstr "Клонировать"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Закрыть"
 
@@ -3605,13 +3592,13 @@ msgstr "Закрыть"
 msgid "Close expression constructor"
 msgstr "Закрыть конструктор выражения"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Закрыть новое событие"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Закрыть старые события"
 
@@ -3624,8 +3611,8 @@ msgid "Close problems"
 msgstr "Закрытие проблем"
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "Свернуть"
 
@@ -3642,7 +3629,7 @@ msgstr "Свернуть боковую панель"
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3708,7 +3695,7 @@ msgstr "Сжатие"
 msgid "Concurrent sessions"
 msgstr "Одновременные сессии"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3719,17 +3706,12 @@ msgstr "Условие"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "Условие \"%2$s\" не используется в формуле \"%3$s\" действия \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "Условие \"%2$s\" не используется в формуле \"%3$s\" для корреляции \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "Условие \"%2$s\" не используется в формуле \"%3$s\" правила обнаружения \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr "Условие \"%2$s\" не используется в \"%3$s\" формуле замещением \"%1$s\"."
@@ -3739,17 +3721,12 @@ msgstr "Условие \"%2$s\" не используется в \"%3$s\" фор
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "Условие \"%2$s\" используемое в формуле \"%3$s\" действия \"%1$s\" не определено."
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "Условие \"%2$s\" используемое в формуле \"%3$s\" для корреляции \"%1$s\" не определено."
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "Условие \"%2$s\" используемое в формуле \"%3$s\" правила обнаружения \"%1$s\" не определено."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr "Условие \"%2$s\" используемое в формуле \"%3$s\" замещением \"%1$s\" не задано."
@@ -3765,7 +3742,7 @@ msgstr "Условия"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Настройка"
 
@@ -3828,7 +3805,7 @@ msgstr "Настройка узлов сети"
 msgid "Configuration of housekeeping"
 msgstr "Настройка очистки истории"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Настройка соответствий иконок"
@@ -3935,7 +3912,7 @@ msgstr "Текст подтверждения"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "Поздравляем! Вы успешно установили Zabbix веб-интерфейс."
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -4039,7 +4016,7 @@ msgstr "Контактная информация"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4099,7 +4076,7 @@ msgstr "Содержит"
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr "Управление содержимым"
 
@@ -4138,8 +4115,8 @@ msgstr "Координаты"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Копировать"
 
@@ -4148,12 +4125,11 @@ msgstr "Копировать"
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер обмена"
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "Корреляция"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "Корреляция \"%1$s\" уже существует."
@@ -4183,16 +4159,6 @@ msgstr[0] "Корреляция активирована"
 msgstr[1] "Корреляции активированы"
 msgstr[2] "Корреляций активированы"
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "У корреляции отсутствуют параметры: %1$s"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "Имя корреляции не может быть пустым."
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr "Правило корреляции"
@@ -4201,14 +4167,10 @@ msgstr "Правило корреляции"
 msgid "Correlation updated"
 msgstr "Корреляция обновлена"
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Не удалось сохранить изображение!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Количество"
 
@@ -4272,11 +4234,11 @@ msgstr "Создать корреляцию"
 msgid "Create dashboard"
 msgstr "Создать панель"
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr "Создать зависимое правило обнаружения"
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr "Создать зависимый элемент данных"
 
@@ -4393,7 +4355,7 @@ msgstr "Создать карту сети"
 msgid "Create media type"
 msgstr "Создать способ оповещения"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "Создать новое"
 
@@ -4417,7 +4379,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Создать шаблон"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Создать триггер"
 
@@ -4580,7 +4542,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "DNS имя"
@@ -4592,11 +4554,11 @@ msgstr "DNS имя"
 msgid "Daily"
 msgstr "Ежедневно"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "Темная"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4617,8 +4579,8 @@ msgstr "Панель \"%1$s\" уже существует."
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr "Панель \"%1$s\" используется в \"%2$s\" отчете."
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr "Панель создана"
 
@@ -4642,9 +4604,9 @@ msgstr "Свойства панели"
 msgid "Dashboard sharing"
 msgstr "Общий доступ к панели"
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr "Панель обновлена"
 
@@ -4668,7 +4630,7 @@ msgstr "Панель с ID \"%1$s\" недоступна."
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr "Панели"
 
@@ -4696,7 +4658,7 @@ msgstr "Обзор данных"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr "Набор данных"
 
@@ -4838,7 +4800,7 @@ msgstr "День недели"
 msgid "Days"
 msgstr "Дни"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Отладка"
 
@@ -4852,26 +4814,26 @@ msgstr "Режим отладки"
 msgid "Dec"
 msgstr "Дек."
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Декабрь"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr "Число десятичных знаков"
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -4964,7 +4926,7 @@ msgstr "Задерживается на"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4988,8 +4950,8 @@ msgstr "Задерживается на"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Удалить"
 
@@ -5014,11 +4976,11 @@ msgstr "Удалить и очистить шаблон? (Внимание: вс
 msgid "Delete current action?"
 msgstr "Удалить текущее действие?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "Удалить текущую корреляцию?"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr "Удалить панель?"
 
@@ -5062,7 +5024,7 @@ msgstr "Удалить прототип элементов данных?"
 msgid "Delete item?"
 msgstr "Удалить элемент данных?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Удалить связи между выбранными элементами?"
 
@@ -5118,7 +5080,7 @@ msgstr "Удалить выбранные панели?"
 msgid "Delete selected discovery rules?"
 msgstr "Удалить выбранные правила обнаружения?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Удалить выбранные элементы?"
 
@@ -5223,7 +5185,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "Удалить выбранные фигуры?"
 
@@ -5267,7 +5229,7 @@ msgstr "Удалить триггер?"
 msgid "Delete web scenario?"
 msgstr "Удалить веб-сценарий?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5312,7 +5274,7 @@ msgstr "Список запретов"
 msgid "Dependencies"
 msgstr "Зависимости"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Зависимость"
 
@@ -5320,7 +5282,7 @@ msgstr "Зависимость"
 msgid "Dependent item"
 msgstr "Зависимый элемент данных"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5330,7 +5292,7 @@ msgstr "Зависит от"
 msgid "Deployment status"
 msgstr "Состояние развертывания"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5363,7 +5325,7 @@ msgid "Description"
 msgstr "Описание"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5529,10 +5491,10 @@ msgstr "Деактивировать выбранные веб-сценарии?
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5615,7 +5577,7 @@ msgid "Discovery by proxy"
 msgstr "Обнаружение через прокси"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Проверка обнаружения"
 
@@ -5627,7 +5589,7 @@ msgstr "Проверки обнаружения"
 msgid "Discovery list"
 msgstr "Список обнаружений"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Объект обнаружения"
 
@@ -5659,7 +5621,7 @@ msgstr "Обнаружение файловых систем виртуальн�
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr "Обнаружение виртуальных машин VMware, <url> - URL службы VMware. Возвращает JSON"
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5667,12 +5629,12 @@ msgstr "Обнаружение виртуальных машин VMware, <url> -
 msgid "Discovery rule"
 msgstr "Правило обнаружения"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Правило обнаружения \"%1$s\" уже существует у \"%2$s\", наследуется из другого шаблона."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "Правило обнаружения \"%1$s\" уже существует у \"%2$s\"."
@@ -5685,7 +5647,7 @@ msgstr "Правило обнаружения \"%1$s\" уже существуе
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "Правило обнаружения \"%1$s\" уже существует."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr "Правило обнаружения \"%1$s\" нельзя скопировать без его мастер элемента данных."
@@ -5729,7 +5691,7 @@ msgstr "Правило обнаружения обновлено"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5740,7 +5702,7 @@ msgstr "Правила обнаружения"
 msgid "Discovery rules deleted"
 msgstr "Правила обнаружения удалены"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Состояние обнаружения"
@@ -5777,10 +5739,11 @@ msgid "Display stacked graph"
 msgstr "Показать стэкируемый график"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Отображено %1$s из %2$s найденных"
@@ -5790,7 +5753,7 @@ msgstr "Отображено %1$s из %2$s найденных"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "Отображено с %1$s до %2$s из %3$s найденных"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr "Опции отображения"
 
@@ -5812,7 +5775,7 @@ msgstr "Не хранить историю"
 msgid "Do not keep trends"
 msgstr "Не хранить динамику изменений"
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Вы хотите заменить условие выражения?"
 
@@ -5868,7 +5831,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Недоступен"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr "Загрузить изображение"
 
@@ -5876,7 +5839,7 @@ msgstr "Загрузить изображение"
 msgid "Download the configuration file"
 msgstr "Загрузить конфигурационный файл"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5895,18 +5858,6 @@ msgstr "Отрисовка"
 msgid "Draw style"
 msgstr "Стиль отрисовки"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "Дубликат \"%1$s\" значения \"%2$s\" у корреляции \"%3$s\"."
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr "Дубликат \"%1$s\" значения \"%2$s\" у корреляции."
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5919,11 +5870,6 @@ msgstr "Дубликат значения \"имя\" \"%1$s\" у карты се
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5975,7 +5921,7 @@ msgstr "Динамический элемент"
 msgid "Dynamic items"
 msgstr "Динамические элементы данных"
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "У каждого URL должно быть уникальное имя. Пожалуйста, удостоверьтесь, что есть только один URL с этим именем"
 
@@ -5984,11 +5930,11 @@ msgid "Each item"
 msgstr "Каждый элемент данных"
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -6002,8 +5948,8 @@ msgstr "Каждый элемент данных"
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Изменить"
 
@@ -6019,11 +5965,11 @@ msgstr "Изменить карту сети"
 msgid "Edit operation"
 msgstr "Изменить операцию"
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr "Изменит элемент дерева"
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Изменить триггер"
 
@@ -6083,21 +6029,17 @@ msgstr "Пустой файл SSL ключа у веб-сценария \"%1$s\"
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "Пустой ID корреляции."
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "Пустой ID формулы условия фильтра для действия \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Пустой ID формулы условия фильтра для правила обнаружения \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "Пустой макрос условия фильтра для правила обнаружения \"%1$s\"."
@@ -6113,25 +6055,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr "Пустой тип условия фильтрации для действия \"%1$s\"."
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6141,14 +6077,6 @@ msgstr "Пустой входной параметр."
 msgid "Empty map ID."
 msgstr "Пустой ID карты сети."
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "Пустой ID типа оповещений."
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Пустые параметры"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6314,7 +6242,7 @@ msgstr "Активировать трапы"
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6325,7 +6253,7 @@ msgstr "Активировать трапы"
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6368,7 +6296,7 @@ msgid "English (en_US)"
 msgstr "Английский (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6384,7 +6312,7 @@ msgstr "Запись с UUID \"%1$s\" уже существует."
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6403,19 +6331,19 @@ msgstr "Равно"
 msgid "Error"
 msgstr "Ошибка"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Ошибка в запросе поиска в таблицу \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr "Сообщение об ошибке"
 
 #: include/blocks.inc.php:643
 #, c-format
 msgid "Error! Unable to start Zabbix server due to unsupported %1$s database server version. Must be at least (%2$s)"
-msgstr ""
+msgstr "Ошибка! Zabbix сервер не может стартовать из-за слишком старой версии сервера базы данных (%1$s). Минимальная разрешённая версия %2$s"
 
 #: include/classes/screens/CScreenHttpTestDetails.php:111
 #: include/classes/screens/CScreenHttpTestDetails.php:182
@@ -6435,7 +6363,7 @@ msgstr "ID события"
 msgid "Event acknowledged"
 msgstr "Событие подтверждено"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6443,7 +6371,7 @@ msgid "Event correlation"
 msgstr "Корреляция событий"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "Правила корреляции событий"
@@ -6478,11 +6406,11 @@ msgstr "Мониторинг журнала событий. Возвращает
 msgid "Event name"
 msgstr "Имя события"
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "Пара тегов событий"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Тип события"
 
@@ -6528,15 +6456,10 @@ msgstr "Исключить"
 msgid "Exclude host groups"
 msgstr "Исключить группы узлов сети"
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Выполнить"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "Ошибка выполнения SQL [%1$s] в [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr "Выполнение запроса WMI и получение JSON документа со всеми выбранными объектами"
@@ -6574,7 +6497,7 @@ msgstr "Выполнено"
 msgid "Executed script"
 msgstr "Выполняемый скрипт"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Подтверждение выполнения"
 
@@ -6590,8 +6513,8 @@ msgid "Exists"
 msgstr "Существует"
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "Раскрыть"
 
@@ -6712,7 +6635,7 @@ msgstr "Выражения"
 msgid "External check"
 msgstr "Внешняя проверка"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "Пт"
@@ -6739,8 +6662,8 @@ msgstr "Неудачно"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6751,26 +6674,26 @@ msgstr "Ошибка при создании панели"
 msgid "Failed to parse URL."
 msgstr "Ошибка при разборе URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr "Ошибка при вставке страницы панели."
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr "Ошибка при вставке виджета."
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr "Ошибка при обновлении панели"
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr "Ошибка при обновлении свойств страницы панели."
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr "Ошибка при обновлении свойств панели."
 
@@ -6778,7 +6701,7 @@ msgstr "Ошибка при обновлении свойств панели."
 msgid "Failed to update template."
 msgstr "Ошибка при обновлении шаблона."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr "Ошибка при обновлении свойств виджета."
 
@@ -6802,7 +6725,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Фев."
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Февраль"
 
@@ -6824,10 +6747,9 @@ msgstr "Поле \"%1$s\" не может быть NULL."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6838,13 +6760,6 @@ msgstr "Поле \"%1$s\" обязательно."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "В поле \"%1$s\" пропущено значение у карты сети \"%2$s\"."
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "В поле \"%1$s\" пропущено значение типа оповещений \"%2$s\"."
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6863,11 +6778,6 @@ msgstr "Поле \"%1$s\" не целое число."
 msgid "Field \"%1$s\" is not string."
 msgstr "Поле \"%1$s\" не строка."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "Поле \"%1$s\" обязательно у типа оповещений \"%2$s\"."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6882,10 +6792,6 @@ msgstr "Поле \"host\" является обязательным."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Формат файла не поддерживается."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr "Файл пустой"
@@ -6950,7 +6856,8 @@ msgstr "Заполнение"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6975,7 +6882,7 @@ msgstr "Фильтр"
 msgid "Filter properties"
 msgstr "Свойства фильтра"
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -7027,7 +6934,7 @@ msgstr "Вписать в карту сети"
 msgid "Fixed"
 msgstr "Фиксированное"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -7078,12 +6985,12 @@ msgstr "Формула"
 msgid "Formula missing for action \"%1$s\"."
 msgstr "Отсутствует формула у \"%1$s\" действия."
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr "Отсутствует формула у \"%1$s\" правила обнаружения."
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr "Отсутствует формула у \"%1$s\" замещения."
@@ -7096,7 +7003,7 @@ msgstr "Французский (fr_FR)"
 msgid "Fri"
 msgstr "Пт"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Пятница"
 
@@ -7207,7 +7114,7 @@ msgstr "Получить значение с узла сети"
 msgid "Given expression is not a macro"
 msgstr "Заданное выражение не является макросом"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr "Глобальное регулярное выражение \"%1$s\" не существует."
@@ -7221,7 +7128,7 @@ msgstr "Глобальное значение"
 msgid "Go back to %1$s"
 msgstr "Вернуться к %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Перейти к"
 
@@ -7259,7 +7166,7 @@ msgstr "Перейти на страницу %1$s, текущую страниц
 msgid "Go to previous page, %1$s"
 msgstr "Перейти на пред. страницу, %1$s"
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7267,7 +7174,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Градиентная линия"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7328,7 +7235,7 @@ msgstr[2] "Графики скопированы"
 msgid "Graph deleted"
 msgstr "График удален"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7365,8 +7272,8 @@ msgstr "Прототип графиков удален"
 msgid "Graph prototype updated"
 msgstr "Прототип графиков обновлен"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr "Прототип графиков с ID \"%1$s\" недоступен."
@@ -7400,8 +7307,8 @@ msgstr "Тип графика"
 msgid "Graph updated"
 msgstr "График обновлен"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr "График с ID \"%1$s\" недоступен."
@@ -7432,7 +7339,7 @@ msgstr "График с именем \"%1$s\" уже существует в г�
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Графики"
 
@@ -7453,12 +7360,12 @@ msgstr "Сетка"
 msgid "Group"
 msgstr "Группа"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Группа \"%1$s\" не может быть удалена, так как используется прототипом узлов сети."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr "Группа узлов сети \"%1$s\" не может быть удалена, так как она используется в условии корреляции."
@@ -7633,11 +7540,11 @@ msgstr "Помощь"
 msgid "Hexadecimal to decimal"
 msgstr "Шестнадцатеричное в десятичное"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Скрыта"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "Скрыть отладку"
 
@@ -7664,11 +7571,11 @@ msgstr "Иерархия"
 msgid "High"
 msgstr "Высокая"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr "Высококонтрастная тёмная"
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr "Высококонтрастная светлая"
 
@@ -7689,7 +7596,7 @@ msgstr "Подсвечивать всю строку"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "История"
 
@@ -7697,11 +7604,15 @@ msgstr "История"
 msgid "History and trends compression"
 msgstr "Сжатие истории и динамики изменений"
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr "При включенном сжатии очистка истории не поддерживается "
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "История очищена"
 
@@ -7744,7 +7655,7 @@ msgstr "Горизонтальный"
 msgid "Horizontal align"
 msgstr "Выравнивание по горизонтали"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7773,7 +7684,7 @@ msgstr "Выравнивание по горизонтали"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7788,7 +7699,7 @@ msgstr[2] "Узлы сети"
 msgid "Host \"%1$s\" already exists."
 msgstr "Узел сети \"%1$s\" уже существует."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7796,7 +7707,7 @@ msgstr "Узел сети \"%1$s\" уже существует."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "Узел сети \"%1$s\" не может быть без группы узлов сети."
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7850,7 +7761,7 @@ msgstr[0] "Узел сети активирован"
 msgstr[1] "Узлы сети активированы"
 msgstr[2] "Узлы сети активированы"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7864,22 +7775,22 @@ msgstr[2] "Узлы сети активированы"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Группа узлов сети"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Группа узлов сети \"%1$s\" уже существует."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Группа узлов сети \"%1$s\" не может быть удалена, так как используется в глобальном скрипте."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7892,10 +7803,10 @@ msgstr "Элементы группы узлов сети"
 msgid "Host group label type"
 msgstr "Тип подписи к группе узлов сети"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Группа узлов сети с ID \"%1$s\" недоступна."
@@ -7911,8 +7822,8 @@ msgstr "Группа узлов сети с ID \"%1$s\" недоступна."
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7986,7 +7897,7 @@ msgstr "Имя узла сети"
 msgid "Host networks"
 msgstr "Сети узла сети"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -8067,7 +7978,7 @@ msgstr "Ошибка при обновлении узла сети."
 msgid "Host updated"
 msgstr "Узел сети обновлен"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr "Узел сети с ID \"%1$s\" недоступен."
@@ -8087,7 +7998,7 @@ msgstr "Узел сети с таким же именем \"%1$s\" уже сущ
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Узел сети с таким же видимым именем \"%1$s\" уже существует."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8100,7 +8011,7 @@ msgstr "Узел сети с таким же видимым именем \"%1$s\
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8148,7 +8059,7 @@ msgstr "Узлы сети обновлены"
 msgid "Hours"
 msgstr "Часы"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8188,7 +8099,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IP адрес"
@@ -8213,7 +8124,7 @@ msgstr "Диапазон IP \"%1$s\" превышает допустимый л�
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8270,12 +8181,12 @@ msgstr "Подсветка иконок"
 msgid "Icon map"
 msgstr "Соответствие иконок"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr "Соответствие иконок \"%1$s\" уже существует."
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Соответствие иконок \"%1$s\" не может быть удалено. Используется в карте сети \"%2$s\"."
@@ -8288,18 +8199,18 @@ msgstr "Соответствие иконок создано"
 msgid "Icon map deleted"
 msgstr "Соответствие иконок удалено"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Соответствие иконок обновлено"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "Соответствия иконок"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "Иконка с ID \"%1$s\" недоступна."
@@ -8402,23 +8313,20 @@ msgstr "Если вы считаете это сообщение ошибкой,
 msgid "Iframe sandboxing exceptions"
 msgstr "Исключения для атрибута sandbox в iframe"
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Изображение"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "Изображение \"%1$s\" уже существует."
@@ -8427,7 +8335,7 @@ msgstr "Изображение \"%1$s\" уже существует."
 msgid "Image added"
 msgstr "Изображение добавлено"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Изображение удалено"
 
@@ -8435,18 +8343,12 @@ msgstr "Изображение удалено"
 msgid "Image label type"
 msgstr "Тип подписи к изображению"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "Ошибка при загрузке изображения [%1$s] в [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr "Размер изображения должен быть менее %1$s."
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Изображение обновлено"
 
@@ -8541,7 +8443,7 @@ msgstr "Недоступный прототип элементов данных"
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8552,13 +8454,13 @@ msgstr "Недоступное обслуживание"
 msgid "Inaccessible map"
 msgstr "Недоступная карта сети"
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr "Недоступный шаблон"
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr "Недоступный триггер"
 
@@ -8602,7 +8504,7 @@ msgstr "Включая подгруппы"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Статистика входящего трафика сетевого интерфейса. Возвращает целое число"
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8770,24 +8672,6 @@ msgstr "Некорректная группа пользователей для
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Некорректный пользователь для операции действия. Пользователь не существует или у вас нет к нему доступа."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8842,8 +8726,6 @@ msgstr "Некорректный пользователь для операци�
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "В функцию переданы некорректные аргументы."
 
@@ -8869,31 +8751,22 @@ msgstr "Использованы некорректные символы в им
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "Некорректные условия в действии \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "Некорректные условия в правиле обнаружения \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "Некорректный ID корреляции."
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "Некорректное пользовательское выражение \"%2$s\" для действия \"%1$s\": %3$s."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "Некорректное пользовательское выражение \"%2$s\" для корреляции \"%1$s\": %3$s."
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "Некорректное пользовательское выражение \"%2$s\" для правила обнаружения \"%1$s\": %3$s."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr "Некорректное пользовательское выражение \"%2$s\" для замещения \"%1$s\": %3$s."
@@ -8922,7 +8795,7 @@ msgstr "Некорректное значение eventobject."
 msgid "Incorrect eventsource value."
 msgstr "Некорректное значение eventsource."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Некорректное имя поля \"%1$s\" или значение в выражении where для таблицы \"%2$s\"."
@@ -8947,22 +8820,17 @@ msgstr "Некорректный загружаемый файл."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "Некорректный ID формулы условия фильтра для действия \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Некорректный ID формулы условия фильтра для правила обнаружения \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "Задан некорректный ID формулы условия фильтра для корреляции \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "Некорректный макрос условия фильтра для правила обнаружения \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr "Некорректный макрос условия фильтра для замещения \"%1$s\"."
@@ -8973,7 +8841,7 @@ msgstr "Некорректный макрос условия фильтра дл
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "Некорректный оператор условия фильтра для действия \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "Некорректный оператор условия фильтра для правила обнаружения \"%1$s\"."
@@ -9001,8 +8869,6 @@ msgstr "Некорректный индекс изображения."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -9064,10 +8930,6 @@ msgstr "Некорректный период обслуживания (мини
 msgid "Incorrect map ID."
 msgstr "Некорректный ID карты сети."
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "Некорректный ID типа оповещений."
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9125,13 +8987,13 @@ msgstr "Некорректное регулярное выражение \"%1$s\
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Получен некорректный ответ от Zabbix сервера \"%1$s\"."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Некорректное время завершения услуги."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Некорректное время начала услуги."
 
@@ -9184,12 +9046,7 @@ msgstr "Некорректное выражение прототипа триг�
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "Некорректный тип вычисления для действия \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "Некорректный тип вычисления для корреляции \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "Некорректный тип вычисления для правила обнаружения \"%1$s\"."
@@ -9235,13 +9092,13 @@ msgstr "Некорректные имя пользователя или паро
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9258,60 +9115,30 @@ msgstr "Некорректное значение \"%1$s\" для \"%2$s\" по�
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Некорректное значение \"%1$s\" для \"%2$s\" поля: должно быть между %3$s и %4$s."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "Некорректное значение \"%1$s\" для поля с плавающей точкой \"%2$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "Некорректное значение \"%1$s\" для поля целого числа \"%2$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Некорректное значение \"%1$s\" для поля целого положительного числа \"%2$s\"."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "Некорректное значение \"%1$s\" в поле \"%2$s\" у корреляции \"%3$s\"."
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "Некорректное значение \"%1$s\" в поле \"%2$s\" у типа оповещений \"%3$s\"."
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9366,14 +9193,8 @@ msgstr "Некорректное значение для \"%1$s\" поля."
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9483,25 +9304,7 @@ msgstr "Некорректное значение для \"%1$s\" поля."
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9512,7 +9315,7 @@ msgstr "Некорректное значение для \"%1$s\" поля."
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9558,16 +9361,17 @@ msgstr "Некорректное значение для \"%1$s\" поля."
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9576,7 +9380,7 @@ msgstr "Некорректное значение для \"%1$s\" поля."
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "Некорректное значение для поля \"%1$s\": %2$s."
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9664,12 +9468,12 @@ msgstr "Унаследованные и собственные теги"
 msgid "Inherited items"
 msgstr "Унаследованные элементы данных"
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Вставить"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "Вставить выражение"
 
@@ -9773,7 +9577,7 @@ msgstr "Внутренняя проблема"
 msgid "Internal problem recovery"
 msgstr "Восстановление внутренней проблемы"
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9781,7 +9585,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9792,7 +9596,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Интервал"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9815,7 +9619,7 @@ msgstr "Ошибочное содержимое YAML файла."
 msgid "Invalid action condition: %1$s."
 msgstr "Ошибочное условие действия: %1$s."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr "Ошибочное условие: %1$s."
@@ -9847,7 +9651,7 @@ msgstr "Ошибочный email адрес у способа оповещени
 msgid "Invalid interval \"%1$s\"."
 msgstr "Некорректный интервал \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Ошибочный ключ \"%1$s\" для правила обнаружения \"%2$s\" у \"%3$s\": %4$s."
@@ -9872,27 +9676,29 @@ msgstr "Ошибочный ключ \"%1$s\": %2$s."
 msgid "Invalid method parameters."
 msgstr "Ошибочные параметры метода."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9918,17 +9724,17 @@ msgstr "Ошибочные параметры метода."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9936,8 +9742,8 @@ msgstr "Ошибочные параметры метода."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9951,106 +9757,116 @@ msgstr "Ошибочные параметры метода."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -10092,43 +9908,38 @@ msgstr "Ошибочный код ответа \"%1$s\"."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10149,7 +9960,7 @@ msgstr "Ошибочный период времени."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Инвентаризация"
 
@@ -10190,7 +10001,7 @@ msgstr "Невозможно выполнить поиск по паролям �
 msgid "Italian (it_IT)"
 msgstr "Итальянский (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10222,7 +10033,7 @@ msgstr "Нельзя скопировать элемент данных \"%1$s\"
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "Элемент данных \"%1$s\" не может заполнять отсутствующее поле под номером \"%2$d\" инвентарных данных узла сети. Выберите из: от 0 (не заполнять) до %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10236,7 +10047,7 @@ msgstr "Элемент данных добавлен"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr "Элемент данных содержит пользовательский макрос со скрытыми значениями. Значения таких макросов необходимо ввести вручную."
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "Элемент даных скопирован"
@@ -10251,14 +10062,14 @@ msgstr "Количество элементов данных"
 msgid "Item deleted"
 msgstr "Элемент данных удален"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Элемент данных деактивирован"
 msgstr[1] "Элементы данных деактивированы"
 msgstr[2] "Элементы данных деактивированы"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Элемент данных активирован"
@@ -10269,7 +10080,7 @@ msgstr[2] "Элементы данных активированы"
 msgid "Item in \"not supported\" state"
 msgstr "Элемент данных в \"неподдерживаемом\" состоянии"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "Элемент данных не выбран"
 
@@ -10278,7 +10089,7 @@ msgstr "Элемент данных не выбран"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr "Отсутствуют параметры у предобработки элемента данных: %1$s"
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10316,8 +10127,8 @@ msgstr[0] "Прототип элементов данных обновлен"
 msgstr[1] "Прототипы элементов данных обновлены"
 msgstr[2] "Прототипы элементов данных обновлены"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr "Прототип элементов данных с ID \"%1$s\" недоступен."
@@ -10343,7 +10154,7 @@ msgstr "Прототипы элементов данных обновлены"
 msgid "Item tags"
 msgstr "Теги элемента данных"
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr "Тип элемента данных не использует интерфейс"
 
@@ -10375,8 +10186,8 @@ msgstr "Элемент данных не будет обновляться. За
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr "Элемент данных не будет обновляться. Интервал обновления должен быть между 1s и 1d. Также можно использовать интервалы по расписанию/гибкие."
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr "Элемент данных с ID \"%1$s\" недоступен."
@@ -10427,11 +10238,11 @@ msgstr "Элемент данных с ключом \"%1$s\" уже сущест
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Элементы данных"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Элементы данных удалены"
 
@@ -10449,7 +10260,7 @@ msgstr "Элементы данных обновлены"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10474,6 +10285,10 @@ msgstr "Интерфейсы JMX"
 msgid "JSON"
 msgstr "JSON"
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10486,7 +10301,7 @@ msgstr "JSON данные"
 msgid "JSON is expected"
 msgstr "ожидался JSON"
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr "ожидалась JSON строка"
 
@@ -10504,7 +10319,7 @@ msgstr "JSONPath"
 msgid "Jan"
 msgstr "Янв"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Январь"
 
@@ -10526,7 +10341,7 @@ msgstr "JavaScript"
 msgid "Jul"
 msgstr "Июл"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Июль"
 
@@ -10534,7 +10349,7 @@ msgstr "Июль"
 msgid "Jun"
 msgstr "Июн"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Июнь"
 
@@ -10696,22 +10511,6 @@ msgstr[0] "Последний %1$d год"
 msgstr[1] "Последние %1$d года"
 msgstr[2] "Последний %1$d лет"
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10723,11 +10522,11 @@ msgstr "Время последнего использования"
 msgid "Last check"
 msgstr "Последняя проверка"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "График за последний час"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "График за последний месяц"
 
@@ -10765,11 +10564,11 @@ msgstr "Последняя отправка"
 msgid "Last value"
 msgstr "Последнее значение"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "График за последнюю неделю"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10778,11 +10577,11 @@ msgstr "График за последнюю неделю"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Последние данные"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "Последние значения"
 
@@ -10823,7 +10622,7 @@ msgstr "Ось Y слева"
 msgid "Left trim"
 msgstr "Обрезать слева"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr "Легенда"
 
@@ -11104,7 +10903,7 @@ msgstr "Правило низкоуровневого обнаружения в
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "Пн"
@@ -11126,7 +10925,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "Сумма MD5 файла. Возвращает символьную строку (MD5 хеш файла)"
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11137,12 +10936,12 @@ msgid "Macro"
 msgstr "Макрос"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Макрос \"%1$s\" уже существует у \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Макрос \"%1$s\" уже существует."
@@ -11170,7 +10969,7 @@ msgstr "Макросы обновлены"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr "Основной фильтр"
 
@@ -11178,7 +10977,7 @@ msgstr "Основной фильтр"
 msgid "Main navigation"
 msgstr "Основная навигация"
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11261,7 +11060,7 @@ msgstr "Управление регулярными отчетами"
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11283,13 +11082,13 @@ msgstr "Действие вручную над узлом сети"
 msgid "Manually closed"
 msgstr "Закрыт вручную"
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Карта сети"
 
@@ -11358,7 +11157,7 @@ msgstr "Фигура карты сети"
 msgid "Map update failed."
 msgstr "Ошибка при обновлении карты сети."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr "Карта сети с ID \"%1$s\" недоступна."
@@ -11390,7 +11189,7 @@ msgstr "Карты сетей"
 msgid "Mar"
 msgstr "Мрт."
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Март"
 
@@ -11494,7 +11293,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11509,7 +11308,7 @@ msgstr[2] "Максимальный период времени отображе
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "Превышена максимальная длина email адреса у способа оповещения с ID \"%1$s\"."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Май"
 
@@ -11524,15 +11323,12 @@ msgstr "Май"
 msgid "Media"
 msgstr "Оповещения"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Способ оповещений"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr "Тип медиа \"%1$s\" уже существует."
@@ -11562,11 +11358,6 @@ msgstr[0] "Способ оповещения активирован"
 msgstr[1] "Способы оповещения активированы"
 msgstr[2] "Способы оповещения активированы"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr "В типе оповещений пропущены параметры: %1$s"
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11596,7 +11387,7 @@ msgstr "Способ оповещения с ID \"%1$s\" недоступен."
 msgid "Media types"
 msgstr "Способы оповещений"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr "Способы оповещения используются действием \"%1$s\"."
@@ -11684,7 +11475,7 @@ msgstr "Сообщения"
 msgid "Method not found."
 msgstr "Метод не найден."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr "Microsoft Edge"
 
@@ -11746,7 +11537,7 @@ msgid "Minimum severity"
 msgstr "Минимальная важность"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11806,7 +11597,7 @@ msgstr "Режим"
 msgid "Model"
 msgstr "Модель"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr "Модуль"
@@ -11848,7 +11639,7 @@ msgstr[2] "Модулей активировано: %1$s."
 msgid "Module updated: %1$s."
 msgstr "Модуль обновлен: %1$s."
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11874,7 +11665,7 @@ msgstr "Модули обновлены"
 msgid "Mon"
 msgstr "Пн"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Понедельник"
 
@@ -11914,11 +11705,11 @@ msgstr "Месяц"
 msgid "Monthly"
 msgstr "Ежемесячно"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "Найдено больше совпадений..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11942,7 +11733,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11955,7 +11746,7 @@ msgstr "Множественный"
 msgid "Multiple PROBLEM events"
 msgstr "Множественные события ПРОБЛЕМА"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Отключить звук"
 
@@ -12084,11 +11875,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12246,19 +12037,21 @@ msgstr "Новое условие"
 msgid "New dashboard"
 msgstr "Новая панель"
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Новый элемент"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr "Группа узлов нового события"
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr "Имя тега нового события"
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr "Значение тега нового события"
 
@@ -12270,7 +12063,7 @@ msgstr "Новая операция"
 msgid "New regular expression"
 msgstr "Новое регулярное выражение"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12278,7 +12071,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Новый интервал времени услуги"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr "Имя нового тега"
 
@@ -12287,7 +12080,7 @@ msgid "New triggers"
 msgstr "Новые триггера"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr "Следующая страница"
 
@@ -12305,7 +12098,7 @@ msgstr "Далее"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12334,30 +12127,6 @@ msgstr "Далее"
 msgid "No"
 msgstr "Нет"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "\"%1$s\" не задан для корреляции \"%2$s\"."
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "\"%1$s\" не задан для корреляции."
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12373,11 +12142,6 @@ msgstr "Не задано \"%1$s\" для графика."
 msgid "No \"%1$s\" given for map."
 msgstr "Не указан \"%1$s\" у карты сети."
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "Не указан \"%1$s\" у типа оповещений."
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12385,7 +12149,7 @@ msgstr "Не указан \"%1$s\" у типа оповещений."
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "Не указано \"%2$s\" для условия фильтра действия \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "Не указано \"%2$s\" для условия фильтра правила обнаружения \"%1$s\"."
@@ -12395,7 +12159,7 @@ msgstr "Не указано \"%2$s\" для условия фильтра пра
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "Не указан \"%2$s\" для фильтра в действии \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "Не указано \"%2$s\" для фильтра в правиле обнаружения \"%1$s\"."
@@ -12412,11 +12176,6 @@ msgstr "Для аутентификации не указано имя поль�
 msgid "No changes."
 msgstr "Без изменений."
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "Для корреляции \"%1$s\" не задан тип условия."
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12447,7 +12206,7 @@ msgstr "Нет интерфейса по умолчанию для \"%1$s\" ти
 msgid "No details"
 msgstr "Без деталей"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "ID правил обнаружения не указаны."
 
@@ -12483,7 +12242,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "Графики не добавлены."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Не указаны ID узлов сети."
 
@@ -12513,7 +12272,7 @@ msgstr "Нет изображения"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Интерфейс не найден"
 
@@ -12547,7 +12306,7 @@ msgstr "Макросы не найдены."
 msgid "No maps added."
 msgstr "Карты сети не добавлены."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "Совпадения не найдены"
 
@@ -12555,17 +12314,46 @@ msgstr "Совпадения не найдены"
 msgid "No new modules discovered"
 msgstr "Новые модули не обнаружены"
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr "Тип операции не задан для корреляции \"%1$s\"."
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Нет прав доступа в систему."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"."
@@ -12573,7 +12361,7 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"."
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12601,19 +12389,18 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"."
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12628,16 +12415,22 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"."
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12657,12 +12450,10 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"."
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12683,27 +12474,29 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"."
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12720,14 +12513,14 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"."
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12736,7 +12529,7 @@ msgstr "Нет прав доступа на вызов \"%1$s.%2$s\"."
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Нет прав доступа к запрашиваемому объекту или он не существует!"
 
@@ -12756,7 +12549,7 @@ msgstr "Файл публичного ключа не указан."
 msgid "No recipients for action operation message."
 msgstr "Нет получателей сообщения в операции действия."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr "Не обновлять"
 
@@ -12768,7 +12561,7 @@ msgstr "Не указан скрипт для команды в операции
 msgid "No target selected"
 msgstr "Цель не выбрана"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Цель не выбрана."
 
@@ -12785,7 +12578,7 @@ msgstr "Триггеры не заданы."
 msgid "No value"
 msgstr "Значение отсутствует"
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr "Не-логические флаги устарели."
 
@@ -12855,15 +12648,15 @@ msgstr "Отображены не все результаты. Пожалуйс�
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr "Не все шаблоны присоединены к \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr "Нет прав доступа, чтобы задать язык пользователю \"guest\"."
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Не разрешено устанавливать пароль для пользователя \"guest\"."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr "Нет прав доступа, чтобы задать тему пользователю \"guest\"."
 
@@ -12895,7 +12688,7 @@ msgstr "Без унаследованных элементов данных"
 msgid "Not supported"
 msgstr "Не поддерживается"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Заметка"
@@ -12926,7 +12719,7 @@ msgstr "Оповещать всех участников"
 msgid "Nov"
 msgstr "Нбр."
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "Ноябрь"
 
@@ -13113,8 +12906,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13174,13 +12967,13 @@ msgstr "Окт"
 msgid "Octal to decimal"
 msgstr "Восьмеричное в десятичное"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Октябрь"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Выкл"
 
@@ -13188,30 +12981,31 @@ msgstr "Выкл"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr "Имя тега старого события"
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr "Значение тега старого события"
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr "Имя старого тега"
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "Вкл"
 
@@ -13227,35 +13021,15 @@ msgstr "Один раз"
 msgid "One"
 msgstr "Одна"
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "Один из объектов остался без группы узлов сети."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Единовременно"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Однократная недоступность"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Только Супер Администраторы могут создавать группы узлов сети."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Только Супер Администраторы могут создавать способы оповещения."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Только Супер Администраторы могут удалять способы оповещения."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Только Супер Администраторы могут менять способы оповещения."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Только Zabbix агент, SNMPv1, SNMPv2 и SNMPv3 проверки могут быть сделаны уникальными."
@@ -13305,10 +13079,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "Только супер администраторы могут создавать корреляции."
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr "Только супер администраторы могут задавать владельца ПАНЕЛИ."
@@ -13317,15 +13087,11 @@ msgstr "Только супер администраторы могут зада
 msgid "Only super admins can set report owner."
 msgstr "Только супер администраторы могут задавать владельца отчета."
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr "Только супер администраторы могут обновлять корреляции."
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Подсчитываются только триггеры у активированных узлов сети и которые зависят от активных элементов данных"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13334,7 +13100,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Информация об операционной системе. Возвращает строку"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr "Операция"
 
@@ -13343,11 +13109,11 @@ msgstr "Операция"
 msgid "Operation \"%1$s\" already exists."
 msgstr "Операция \"%1$s\" уже существует."
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Операция не может быть выполнена из-за несанкционированного запроса."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Детали операции"
 
@@ -13369,7 +13135,7 @@ msgstr "Операция не имеет шаблон для функциони�
 msgid "Operational data"
 msgstr "Оперативные данные"
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13378,33 +13144,33 @@ msgstr "Оперативные данные"
 msgid "Operations"
 msgstr "Операции"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Оператор"
 
@@ -13513,7 +13279,7 @@ msgstr "Другие параметры настроек"
 msgid "Other parameters"
 msgstr "Прочие параметры"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Другие"
@@ -13527,7 +13293,7 @@ msgstr "Статистика исходящего трафика на сетев
 msgid "Output"
 msgstr "Вывод"
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr "Наложение виджетов на X:%3$d, Y:%4$d на странице #%2$d панели \"%1$s\"."
@@ -13556,7 +13322,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr "Замещение с \"%1$s\" именем уже существует."
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13745,7 +13511,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13790,7 +13556,7 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "Идентификатор PSK"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr "Страница %1$d"
@@ -13813,16 +13579,16 @@ msgstr "Навигатор"
 msgid "Parameter"
 msgstr "Параметр"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "Параметр \"%1$s\" устарел."
@@ -13852,7 +13618,7 @@ msgstr "Родительские элементы данных"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13869,7 +13635,7 @@ msgstr "Родительские триггеры"
 msgid "Parent web scenarios"
 msgstr "Родительские веб-сценарии"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13881,11 +13647,6 @@ msgstr ""
 msgid "Parse"
 msgstr "Анализ"
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "Ошибка разбора SQL [%1$s] в [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Ошибка разбора"
@@ -13946,7 +13707,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr "Вставить"
 
@@ -13956,15 +13717,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr "Вставить виджет"
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr "Вставить без внешних связей"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr "Шаблон"
@@ -14010,12 +13771,11 @@ msgstr "Выполнение DNS запроса. Возвращает строк
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Период"
 
@@ -14104,7 +13864,7 @@ msgstr "Пожалуйста, включите \"allow_url_fopen\" директ�
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Пожалуйста, укажите имя хоста или IP адрес хоста и номер порта Zabbix сервера, а так же имя инсталляции (опционально)."
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Пожалуйста, выберите два элемента"
 
@@ -14144,7 +13904,7 @@ msgstr "Заполнение поля инвентаря узла сети"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14233,7 +13993,7 @@ msgid "Previous month"
 msgstr "Предыдущий месяц"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
@@ -14364,7 +14124,7 @@ msgstr "Проблема не подавлена"
 msgid "Problem is suppressed"
 msgstr "Проблема подавлена"
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Проблема с"
 
@@ -14377,21 +14137,17 @@ msgstr "Восстановление проблемы"
 msgid "Problem resolved"
 msgstr "Проблема решена"
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr "Обновление проблемы"
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14405,9 +14161,9 @@ msgstr "Обновление проблемы"
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Проблемы"
 
@@ -14441,7 +14197,7 @@ msgid "Prometheus to JSON"
 msgstr "Prometheus в JSON"
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "Свойства"
 
@@ -14462,13 +14218,13 @@ msgstr "Указанный URL \"%1$s\" ошибочен."
 msgid "Proxies"
 msgstr "Прокси"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14476,7 +14232,7 @@ msgstr "Прокси"
 msgid "Proxy"
 msgstr "Прокси"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr "Прокси \"%1$s\" уже существует."
@@ -14486,12 +14242,12 @@ msgstr "Прокси \"%1$s\" уже существует."
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Прокси \"%1$s\" для узла сети \"%2$s\" не существует."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr "Прокси \"%1$s\" используется действием \"%2$s\"."
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Прокси \"%1$s\" используется правилом обнаружения \"%2$s\"."
@@ -14585,7 +14341,7 @@ msgstr "Обзор очереди по прокси"
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14662,10 +14418,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr "Чтение данных modbus. Возвращает разные типы"
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Полученное значение"
@@ -14747,7 +14499,7 @@ msgstr "Прямоугольник"
 msgid "Refresh"
 msgstr "Обновить"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr "Интервал обновления"
 
@@ -14765,13 +14517,13 @@ msgstr "Сгенерировать заново выбранный API токе�
 msgid "Regular"
 msgstr "Обычные"
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Регулярное выражение"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr "Регулярное выражение \"%1$s\" уже существует."
@@ -14805,7 +14557,7 @@ msgstr "Регулярные выражения"
 msgid "Related reports"
 msgstr "Связанные отчеты"
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr "Отпустите, чтобы создать виджет."
 
@@ -14837,8 +14589,6 @@ msgstr "Удаленная команда"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14859,7 +14609,9 @@ msgstr "Удаленная команда"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14872,7 +14624,7 @@ msgstr "Удаленная команда"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14949,8 +14701,8 @@ msgstr "Удаленная команда"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Удалить"
 
@@ -14990,7 +14742,7 @@ msgstr "Удаление, %1$s"
 msgid "Removed"
 msgstr "Удалено"
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -15032,7 +14784,7 @@ msgid "Replace dependencies"
 msgstr "Заменить зависимости"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr "Замена"
 
@@ -15087,7 +14839,7 @@ msgstr "Запрос тела"
 msgid "Request body type"
 msgstr "Типа запроса тела"
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr "Запрос успешно отправлен"
 
@@ -15129,8 +14881,8 @@ msgstr "Требуемые коды состояния"
 msgid "Required string"
 msgstr "Требуемая строка"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Сбросить"
 
@@ -15163,7 +14915,7 @@ msgstr "Сбросить подтверждение"
 msgid "Reset defaults"
 msgstr "Сбросить по умолчанию"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Решено"
 
@@ -15229,7 +14981,7 @@ msgstr "Тип ответа: Строка"
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Результат"
@@ -15416,12 +15168,12 @@ msgstr "Выполнение заданной команды на узле се�
 msgid "Russian (ru_RU)"
 msgstr "Русский (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "Сб"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Вс"
@@ -15432,8 +15184,8 @@ msgstr "Настройки SAML"
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15470,7 +15222,7 @@ msgstr "Порт SMTP сервера"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15566,12 +15318,12 @@ msgstr "SQL запросов: %1$s (selects: %2$s | executes: %3$s)"
 msgid "SQL query"
 msgstr "SQL запрос"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "Ошибка при выполнении SQL запроса \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Ошибка при выполнении SQL запроса \"%1$s\"."
@@ -15634,7 +15386,7 @@ msgstr "URL единого входа"
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15646,7 +15398,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Сб"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Суббота"
 
@@ -15688,7 +15440,7 @@ msgstr "Запланировано"
 msgid "Scheduled check"
 msgstr "Запланированная проверка"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr "Регулярный отчет"
@@ -15758,7 +15510,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr "Границы"
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15771,8 +15523,7 @@ msgstr "Границы"
 msgid "Script"
 msgstr "Скрипт"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Скрипт \"%1$s\" уже существует."
@@ -15805,12 +15556,6 @@ msgstr "Имя скрипта"
 msgid "Script parameters"
 msgstr "Параметры скрипта"
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "Пропущен символ новой строки в параметрах скрипта \"%1$s\" для типа оповещений \"%2$s\"."
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Профилировщик сценария"
@@ -15823,7 +15568,7 @@ msgstr "Скрипт обновлен"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Скрипты"
 
@@ -15893,8 +15638,8 @@ msgid "Security name"
 msgstr "Имя безопасности"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15902,7 +15647,7 @@ msgstr "Имя безопасности"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Выбрать"
 
@@ -15938,19 +15683,19 @@ msgstr "Выбранные элементы"
 msgid "Selected items only"
 msgstr "Только выбранные элементы данных"
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "Выбран, %1$s в позиции %2$d из %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "Выбран, %1$s, только чтение, в позиции %2$d из %3$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr "Переместить назад"
 
@@ -15975,7 +15720,7 @@ msgstr "Отправка только через"
 msgid "Send to"
 msgstr "Отправлять на"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr "На задний план"
 
@@ -16008,7 +15753,7 @@ msgstr "Раздельно"
 msgid "Separately"
 msgstr "Раздельно"
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "Сентябрь"
 
@@ -16039,28 +15784,28 @@ msgstr "Сервер (прокси)"
 msgid "Server time"
 msgstr "Время на сервере"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Услуга"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -16070,7 +15815,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "Услуга создана"
 
@@ -16104,16 +15849,16 @@ msgstr "Порт сервиса"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "Время начала должно быть меньше чем время окончания."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -16121,11 +15866,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Интервалы времени услуги"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Тип сервиса"
 
@@ -16134,30 +15879,29 @@ msgstr "Тип сервиса"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Услуга обновлена"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Услуги"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "Услуги образуют круговую зависимость."
 
@@ -16165,7 +15909,7 @@ msgstr "Услуги образуют круговую зависимость."
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr "Ошибка инициализации сессии."
 
@@ -16195,7 +15939,7 @@ msgstr "Задать дату и время срока действия"
 msgid "Set host inventory mode"
 msgstr "Задать режим инвентарных данных узлов сети"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr "Задать новое значение"
 
@@ -16224,7 +15968,7 @@ msgstr "Не удалось задать LDAP протокол."
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr "Не удалось задать LDAP referral значением \"Off\"."
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr "Настройки"
 
@@ -16233,7 +15977,7 @@ msgstr "Настройки"
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16289,7 +16033,7 @@ msgstr "Фигура"
 msgid "Shared"
 msgstr "Общий доступ"
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "Общий доступ"
 
@@ -16431,7 +16175,7 @@ msgstr "Показывать предупреждение, если Zabbix се�
 msgid "Show working time"
 msgstr "Отображать рабочее время"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Отображено"
 
@@ -16540,7 +16284,7 @@ msgstr "Пропущено копирование графика \"%1$s\" в у�
 msgid "Slovak (sk_SK)"
 msgstr "Slovak (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Заснуть"
 
@@ -16586,7 +16330,7 @@ msgstr "Некоторые данные истории этого элемент
 msgid "Sort entries by"
 msgstr "Сортировка записей по"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Порядок сортировки (0->999)"
 
@@ -16660,7 +16404,7 @@ msgstr "Начинать в"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr "Начать слайд-шоу"
 
@@ -16763,15 +16507,19 @@ msgstr "Статистика и доступность кэша записи в
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Состояние"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Коды состояний"
@@ -16801,7 +16549,7 @@ msgstr "Только состояние"
 msgid "Status problem"
 msgstr "Состояние проблемы"
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16849,7 +16597,7 @@ msgstr "Остановка обработки"
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr "Остановить слайд-шоу"
 
@@ -16914,7 +16662,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Субъект"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Подкарта"
 
@@ -16930,7 +16678,7 @@ msgstr "Подписки"
 msgid "Success Audit"
 msgstr "Аудит успеха"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr "Сообщение об успехе"
 
@@ -16943,7 +16691,7 @@ msgstr "Суммарная статистика входящего и исход
 msgid "Sun"
 msgstr "Вс"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Воскресенье"
 
@@ -17035,12 +16783,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Системное время в секундах. Возвращает число"
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Чт"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Вт"
@@ -17067,17 +16815,17 @@ msgstr "ИСТИНА"
 msgid "Table \"%1$s\" does not exist."
 msgstr "Таблица \"%1$s\" не существует."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "У таблицы \"%1$s\" нет поля с названием \"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Этикетка"
@@ -17133,7 +16881,7 @@ msgstr "Значение тега"
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17193,7 +16941,7 @@ msgstr "Тип цели"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17214,7 +16962,7 @@ msgstr "Шаблон"
 msgid "Template \"%1$s\" already exists."
 msgstr "Шаблон \"%1$s\" уже существует."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17238,7 +16986,7 @@ msgstr "Свойства шаблона и узла сети, которые н�
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Шаблон не может быть соединен с другим шаблоном несколько раз, даже через другие шаблоны."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr "Шаблон панели"
 
@@ -17298,7 +17046,7 @@ msgstr "Шаблон с таким же видимым именем \"%1$s\" у�
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17470,7 +17218,7 @@ msgstr "Узел сети более не обнаруживается и буд
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "Узел сети более не обнаруживается и будет удален при следующем выполнении правила обнаружения."
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
@@ -17478,7 +17226,7 @@ msgstr[0] "Изображение используется в соответст
 msgstr[1] "Изображение используется в соответствиях иконок %1$s."
 msgstr[2] "Изображение используется в соответствиях иконок %1$s."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17544,7 +17292,7 @@ msgstr "Это поле автоматически заполняется \"%1$s
 msgid "This is the test message from Zabbix"
 msgstr "Это тестовое сообщение от Zabbix"
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Этот месяц"
 
@@ -17552,7 +17300,7 @@ msgstr "Этот месяц"
 msgid "This month so far"
 msgstr "В этом месяце"
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Эта неделя"
 
@@ -17560,7 +17308,7 @@ msgstr "Эта неделя"
 msgid "This week so far"
 msgstr "На этой неделе"
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Этот год"
 
@@ -17580,7 +17328,7 @@ msgstr "Троттлинг"
 msgid "Thu"
 msgstr "Чт"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Четверг"
 
@@ -17597,7 +17345,7 @@ msgstr "До"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17630,7 +17378,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr "Время последнего обращения прокси. Имя - имя прокси. Допустимые параметры: lastaccess - штамп времени в Unix формате, задержка - секунды."
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Период времени"
 
@@ -17682,12 +17430,11 @@ msgstr "Отметка времени"
 msgid "To"
 msgstr "К"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "Чтобы задать интерфейс узла сети выберите один тип элемента данных из всех элементов данных"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Сегодня"
 
@@ -17802,7 +17549,7 @@ msgstr "Период хранения динамики изменений"
 msgid "Trends"
 msgstr "Динамика изменений"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17810,7 +17557,7 @@ msgstr "Динамика изменений"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Триггер"
 
@@ -17914,7 +17661,7 @@ msgstr "Имя триггера"
 msgid "Trigger overview"
 msgstr "Обзор триггеров"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17988,11 +17735,11 @@ msgstr "Прототипы триггеров обновлены"
 msgid "Trigger severity"
 msgstr "Важность триггеров"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "Состояние триггера \"ОК\""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "Состояние триггера \"Проблема\""
 
@@ -18009,7 +17756,7 @@ msgstr "Триггер обновлен"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -18044,7 +17791,7 @@ msgstr "Обрезать"
 msgid "Tue"
 msgstr "Вт"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Вторник"
 
@@ -18057,7 +17804,7 @@ msgstr "Турецкий (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Два элемента данных (\"%1$s\" и \"%2$s\") не могут заполнять одно поле \"%3$s\" инвентарных данных узла сети, это может привести к конфликту."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr "Необходимо выбрать два элемента карты"
 
@@ -18073,19 +17820,19 @@ msgstr "Необходимо выбрать два элемента карты"
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18137,7 +17884,7 @@ msgstr "Тип информации"
 msgid "Types"
 msgstr "Типы"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18158,7 +17905,7 @@ msgstr "НЕИЗВЕСТНО"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18204,12 +17951,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "URL должно быть с обоими полями \"name\" и \"url\" у карты сети \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URLы"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr "Ожидается UUIDv4"
 
@@ -18294,12 +18041,12 @@ msgstr "Разблокировать"
 msgid "Unblock selected users?"
 msgstr "Разблокировать выбранных пользователей?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr "Неожиданный ответ для действия %1$s."
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18319,21 +18066,23 @@ msgstr "Ед. измерения"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Неизвестно"
@@ -18351,7 +18100,7 @@ msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Неизвестный элемент данных узла сети, такого элемента данных нет у выбранного узла сети"
@@ -18404,7 +18153,7 @@ msgstr "Отсоединить от шаблона"
 msgid "Unlink from templates"
 msgstr "Отсоединить от шаблонов"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Включить звук"
 
@@ -18436,7 +18185,7 @@ msgstr "Неподдерживаемая операция."
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "Неподдерживаемый параметр \"%2$s\" для действия условия фильтра \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "Неподдерживаемый параметр \"%2$s\" для правила обнаружения условия фильтра \"%1$s\"."
@@ -18446,7 +18195,7 @@ msgstr "Неподдерживаемый параметр \"%2$s\" для пра
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "Неподдерживаемый параметр \"%2$s\" для фильтра в действии \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "Неподдерживаемый параметр \"%2$s\" для фильтра в правиле обнаружения \"%1$s\"."
@@ -18491,7 +18240,7 @@ msgstr "Доступен"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18504,7 +18253,7 @@ msgstr "Доступен"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18557,7 +18306,7 @@ msgstr "Операции обновления"
 msgid "Update problem"
 msgstr "Обновление проблемы"
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr "Обновлено"
@@ -18575,7 +18324,7 @@ msgstr "Загрузить"
 msgid "Upper level maps"
 msgstr "Карты верхнего уровня"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18610,7 +18359,7 @@ msgstr "Использовать sandbox атрибут в iframe"
 msgid "Used in actions"
 msgstr "Использование в действиях"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18625,7 +18374,7 @@ msgstr "Использование в действиях"
 msgid "User"
 msgstr "Пользователь"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "Пользователь \"%1$s\" не может быть без группы пользователей."
@@ -18677,7 +18426,7 @@ msgstr "Пользователь добавлен"
 msgid "User agent string"
 msgstr "Строка user agent"
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Пользователь не может добавить себя в отключенную группу или в группу с отключенным доступом к Веб-интерфейсу."
@@ -18698,7 +18447,7 @@ msgstr[0] "Пользователь удален"
 msgstr[1] "Пользователи удалены"
 msgstr[2] "Пользователи удалены"
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18708,27 +18457,27 @@ msgstr[2] "Пользователи удалены"
 msgid "User group"
 msgstr "Группа пользователей"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Группа пользователей \"%1$s\" уже существует."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr "Группа пользователей \"%1$s\" является получателем \"%2$s\" отчета."
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "Группа пользователей \"%1$s\" используется в \"%2$s\" действии."
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Группа пользователей \"%1$s\" используется в настройках отправки сообщений о недоступности базы данных."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Группа пользователей \"%1$s\" используется в скрипте \"%2$s\"."
@@ -18764,8 +18513,8 @@ msgstr[2] "Группы пользователей обновлены"
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18809,14 +18558,14 @@ msgstr "Пароль пользователя"
 msgid "User profile"
 msgstr "Профиль пользователя"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr "Роль пользователя"
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18887,7 +18636,7 @@ msgstr "Пользователь обновлен"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "Пользователь с ID \"%1$s\" недоступен."
@@ -19203,14 +18952,14 @@ msgstr "Валидация"
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19220,7 +18969,7 @@ msgstr "Валидация"
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19262,7 +19011,7 @@ msgstr "Значение \"%1$s\" является недопустимым дл
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "Значение \"%1$s\" является недопустимым для параметра \"grid_show\". Варианты: \"%2$s\"."
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "Значение \"%1$s\" является слишком длинным для поля \"%2$s\" - %3$d символов. Допустимая длина %4$d символов."
@@ -19279,7 +19028,7 @@ msgstr "Статистика кэша значений. Допустимые з�
 msgid "Value cannot be empty."
 msgstr "Значение не может быть пустым"
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Преобразование значений"
 
@@ -19322,11 +19071,12 @@ msgstr "Значение любого счетчика производител�
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "Значение любого счетчика производительности Windows. Возвращает целое число, дробное число, строку или текст (в зависимости от запроса)"
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr "Значение тега нового события"
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr "Значение тега старого события"
 
@@ -19373,7 +19123,7 @@ msgstr "API endpoint Хранилища"
 msgid "Vault authentication token"
 msgstr "Токен аутентификации Хранилища"
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr "Ошибка подключения к Хранилищу."
@@ -19460,7 +19210,7 @@ msgstr "Видимое имя не может быть пустым, если и
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Ср"
@@ -19477,16 +19227,16 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr "Предупреждающее сообщение"
 
 #: include/blocks.inc.php:649
 #, c-format
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
-msgstr ""
+msgstr "Внимание! Ваш сервер базы данных версии %1$s слишком старый. Необходима как минимум версия %2$s"
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Приносим свои извинения, достигнуто максимально возможное количество элементов."
 
@@ -19502,7 +19252,7 @@ msgstr "Приносим свои извинения, достигнуто ма�
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Веб"
 
@@ -19514,7 +19264,7 @@ msgstr "Веб"
 msgid "Web monitoring"
 msgstr "Веб-мониторинг"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr "Веб-сценарий"
 
@@ -19529,29 +19279,29 @@ msgstr "Веб-сценарий \"%1$s\" уже существует у узла
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Веб-сценарий \"%1$s\" уже существует."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "Веб-сценарий добавлен"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Веб-сценарий удален"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Веб-сценарий деактивирован"
 msgstr[1] "Веб-сценарии деактивированы"
 msgstr[2] "Веб-сценарии деактивированы"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Веб-сценарий активирован"
 msgstr[1] "Веб-сценарии активированы"
 msgstr[2] "Веб-сценарии активированы"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "Веб-сценарий обновлен"
 
@@ -19573,7 +19323,7 @@ msgstr "Webhook не содержит параметров."
 msgid "Wed"
 msgstr "Ср"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Среда"
 
@@ -19584,7 +19334,7 @@ msgstr "Среда"
 msgid "Weekly"
 msgstr "Еженедельно"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19600,12 +19350,12 @@ msgstr "Добро пожаловать в"
 msgid "When active"
 msgstr "Когда активен"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr "Виджет по X:%3$d, Y:%4$d на странице #%2$d панели \"%1$s\" выходит за границы."
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr "Виджет слишком маленький для указанного количества колонок и строк."
 
@@ -19800,6 +19550,10 @@ msgstr "d.m.Y H:i"
 msgid "Y-m-d H:i:s"
 msgstr "d.m.Y H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr "Y1"
@@ -19861,7 +19615,7 @@ msgstr "Ежегодно"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19918,18 +19672,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr "Вы не указали цели для глобального скрипта \"%1$s\" операции действия."
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19941,9 +19689,6 @@ msgstr "Вы не указали цели для глобального скри
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "У вас нет полномочий для выполнения этой операции."
 
@@ -20059,24 +19804,28 @@ msgstr "[Ошибочное значение для дня: \"%1$s\" ]"
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr "[Ошибочное значение для месяца: \"%1$s\" ]"
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr "ожидается DNS имя"
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr "ожидается логическое"
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "ожидается строка символов"
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr "ожидается дата в ГГГГ-ММ-ДД формате"
 
@@ -20085,37 +19834,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr "ожидается значение с плавающей точкой"
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr "ожидается макрос низкоуровневого обнаружения"
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr "у числа слишком много десятичных точек"
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr "ожидается число"
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr "число слишком большое"
@@ -20136,28 +19885,29 @@ msgstr "ожидается относительное время"
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr "ожидается строка, число или отсутствие значения"
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr "ожидается время"
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr "ожидается период времени"
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr "ожидался период времени"
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr "ожидается единица времени"
@@ -20205,7 +19955,7 @@ msgstr "все"
 msgid "all media"
 msgstr "все способы оповещения"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr "ожидается IP адрес"
 
@@ -20213,42 +19963,37 @@ msgstr "ожидается IP адрес"
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "ожидается массив"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr "ожидается массив или строка символов"
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr "ожидается массив или объект"
 
@@ -20258,7 +20003,7 @@ msgid "an empty string is expected"
 msgstr "ожидается пустая строка"
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr "ожидается четное количество шестнадцатеричных символов"
 
@@ -20266,11 +20011,15 @@ msgstr "ожидается четное количество шестнадца�
 msgid "an explicit time is expected"
 msgstr "ожидается время указанное явно"
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr "ожидается целое число"
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr "ожидается целое положительное число"
 
@@ -20431,14 +20180,8 @@ msgstr "нельзя изменить"
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20468,19 +20211,11 @@ msgstr "нельзя изменить"
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20500,14 +20235,14 @@ msgstr "нельзя изменить"
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20515,7 +20250,7 @@ msgstr "нельзя изменить"
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "не может быть пустым"
@@ -20528,7 +20263,7 @@ msgstr "не удалось сконвертировать в JSON, значен
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr "не удалось выполнить Scroll API запрос, данные могут быть обрезаны"
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr "не удалось обновить свойство у правила обнаружения из шаблона"
 
@@ -20562,7 +20297,7 @@ msgstr "закольцованная зависимость не разреше�
 msgid "circular item dependency is not allowed"
 msgstr "закольцованная зависимость элементов данных не разрешена"
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20580,7 +20315,8 @@ msgid "configure"
 msgstr "настройка"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr "содержит"
@@ -20609,7 +20345,7 @@ msgstr "count() - Количество успешно полученных зн�
 msgid "countunique() - The number of unique values"
 msgstr "countunique() - Количество уникальных значений"
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "д"
@@ -20671,7 +20407,7 @@ msgstr "по убыванию"
 msgid "description"
 msgstr "описание"
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr "папка не может быть пустой"
 
@@ -20693,13 +20429,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr "правило обнаружения \"%1$s\" на узле сети \"%2$s\" не наблюдается"
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr "не содержит"
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr "не равно"
@@ -20725,7 +20461,8 @@ msgid "e() - Returns Euler's number"
 msgstr "e() - Возвращает число Эйлера"
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20762,6 +20499,10 @@ msgstr "пустое выражение"
 msgid "failed to parse JSON"
 msgstr "ошибка при разборе JSON"
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr "find() - Проверка наличия шаблона V (который удволетворяет оператору O) за период T (1 - соответствует, 0 - не соответствует)"
@@ -20808,7 +20549,7 @@ msgstr "глобальные настройки очистки истории"
 msgid "graph pattern"
 msgstr "шаблон графиков"
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "ч"
@@ -20849,6 +20590,11 @@ msgstr "иконка"
 msgid "image"
 msgstr "изображение"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "в"
@@ -20889,15 +20635,19 @@ msgstr "некорректное количество элементов"
 msgid "incorrect expression starting from \"%1$s\""
 msgstr "некорректное выражение начиная с \"%1$s\""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "некорректный синтаксис около \"%1$s\""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr "некорректное использование функции \"%1$s\""
@@ -20925,7 +20675,7 @@ msgstr "ошибочный шаблон Prometheus"
 msgid "invalid address range \"%1$s\""
 msgstr "ошибочный диапазон адресов \"%1$s\""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr "ошибочная последовательность байт в UTF-8"
 
@@ -20954,27 +20704,27 @@ msgstr "недопустимый четвертый параметр в функ
 msgid "invalid history storage period"
 msgstr "недопустимый период хранения истории"
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr "ошибочное имя группы узлов сети"
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr "ошибочное имя узла сети"
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr "недопустимое количество параметров в функции \"%1$s\""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr "недопустимое выражение диапазона"
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr "ошибочное регулярное выражение"
 
@@ -21002,7 +20752,7 @@ msgstr "больше чем или равно"
 msgid "is less than or equals"
 msgstr "меньше чем или равно"
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr "не заключено в {} или ошибочно"
 
@@ -21088,12 +20838,12 @@ msgstr "правило низкоуровневого обнаружения"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr "ltrim() - Удаление указанных символов с начала строки"
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "м"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "м"
@@ -21152,7 +20902,7 @@ msgstr "совпадает"
 msgid "max"
 msgstr "макс"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr "макс. период меньше чем период фильтра времени по умолчанию"
 
@@ -21192,7 +20942,7 @@ msgid "min() - Minimum value for period T"
 msgstr "min() - Минимальное значение за период Т"
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr "минимальная длина %1$s символов"
@@ -21219,8 +20969,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "мс"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr "должно быть %1$s символа"
@@ -21235,27 +20985,14 @@ msgstr "должен быть действительным пользовате�
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "должно быть между \"%1$s\" и \"%2$s\""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr "должно содержать по крайней мере один макрос низкоуровневого обнаружения"
 
@@ -21283,6 +21020,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21293,7 +21038,7 @@ msgstr ""
 msgid "name"
 msgstr "название"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "новый"
 
@@ -21428,7 +21173,7 @@ msgstr "вывод"
 msgid "path/to/secret"
 msgstr "путь/к/секрету"
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr "путь/к/секрету:ключ"
 
@@ -21463,24 +21208,28 @@ msgstr "radians() - Конвертация значения из градусо�
 msgid "rand() - A random integer value"
 msgstr "rand() - Случайное целое число"
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21508,11 +21257,11 @@ msgstr "регулярное выражение"
 msgid "regular expression"
 msgstr "регулярное выражение"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr "repeat() - Возвращает строку состоящую из значений, которые повторяются указанное количество раз"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr "replace() - Поиск шаблона, входящего в значение, и замена на заменитель"
 
@@ -21524,15 +21273,15 @@ msgstr "замена"
 msgid "right"
 msgstr "справа"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr "right() - Возвращает количество самых правых символов"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr "round() - Округление значение до десятичных знаков"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr "rtrim() - Удаление указанных символов с конца строки"
 
@@ -21580,7 +21329,7 @@ msgstr ""
 msgid "short description"
 msgstr "краткое описание"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21599,15 +21348,15 @@ msgstr "краткое описание"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr "должно быть пустым"
 
@@ -21623,31 +21372,31 @@ msgstr "показать соответствия иконок"
 msgid "sign in as guest"
 msgstr "войти как гость"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr "signum() - Возвращает -1 - если значение отрицательное, 0 - если значение ноль, 1 - если значение положительное"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr "sin() - Синус значения, где само значение представляет собой угол, в радианах."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr "sinh() - Гиперболический синус значения"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr "skewness() - Измерение асимметрии распределения вероятностей"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr "sqrt() - Квадратный корень значения"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr "stddevpop() - Среднеквадратическое отклонение"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr "stddevsamp() - Выборочное среднеквадратическое отклонение"
 
@@ -21655,11 +21404,11 @@ msgstr "stddevsamp() - Выборочное среднеквадратическ
 msgid "sum"
 msgstr "сумма"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr "sum() - Сумма значений за период Т"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr "sumofsquares() - Сумма квадратов"
 
@@ -21675,8 +21424,8 @@ msgstr "заданная учётная запись не уникальна"
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21687,7 +21436,7 @@ msgstr "заданная учётная запись не уникальна"
 msgid "tag"
 msgstr "тег"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr "tan() - Тангенс значения"
 
@@ -21696,13 +21445,17 @@ msgstr "tan() - Тангенс значения"
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "шаблон с ID \"%1$s\" был встречен %2$s раз"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21711,20 +21464,20 @@ msgstr "шаблон с ID \"%1$s\" был встречен %2$s раз"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "параметр \"%1$s\" отсутствует"
@@ -21756,39 +21509,39 @@ msgstr "третий"
 msgid "third parameter is expected"
 msgstr "ожидается третий параметр"
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr "период времени фильтра по умолчанию превышает максимальный период"
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr "сдвиг времени"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr "time() - Текущее время"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr "timeleft() - Время достижения порога вычисленное на основе периода Т"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr "trendavg() - Среднее значение за период Т с точным сдвигом периода"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr "trendcount() - Количество успешно полученных значений за период Т"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr "trendmax() - Максимальное значение за период Т с точным сдвигом периода"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr "trendmin() - Минимальное значение за период Т с точным сдвигом периода"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr "trendsum() - Сумма значений за период Т с точным сдвигом периода"
 
@@ -21802,7 +21555,7 @@ msgstr "триггер"
 msgid "trigger does not allow manual closing"
 msgstr "триггер не позволяет ручное закрытие"
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr "выражение триггера должно содержать по крайней мере одну ссылку /узел сети/ключ"
 
@@ -21814,26 +21567,26 @@ msgstr "прототип триггера нельзя переместить в
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr "триггер со связями нельзя переместить в другой шаблон или узел сети"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr "trim() - Удаление указанных символов с начала и конца строки"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr "truncate() - Усечение значения до десятичных знаков"
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "начните печатать для поиска"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr "неприемлемый URL"
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21841,11 +21594,11 @@ msgstr "неожиданная константа \"%1$s\""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr "неожиданное значение константы \"%1$s\""
@@ -21862,10 +21615,10 @@ msgstr "неожиданный конец ключа"
 msgid "unexpected end of macro"
 msgstr "неожиданное завершение макроса"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21875,11 +21628,12 @@ msgstr "неожиданное завершение макроса"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr "неожиданный параметр \"%1$s\""
@@ -21905,8 +21659,8 @@ msgstr "неожиданный текст \"%1$s\""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21931,6 +21685,10 @@ msgstr "неподдерживаемый суффикс времени"
 msgid "unsupported version number"
 msgstr "неподдерживаемый номер версии"
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21946,7 +21704,7 @@ msgstr "неподдерживаемый номер версии"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21966,11 +21724,11 @@ msgstr "неподдерживаемый номер версии"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "значение"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr "значение \"%1$s\" уже существует"
@@ -21988,76 +21746,87 @@ msgstr "значение \"%1$s\" не найдено"
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr "значение %1$s уже существует"
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr "значение слишком длинное"
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
-#, c-format
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
+#, fuzzy, c-format
 msgid "value must be %1$s"
-msgstr "значение должно быть %1$s"
+msgid_plural "value must be one of %1$s"
+msgstr[0] "значение должно быть %1$s"
+msgstr[1] "значение должно быть %1$s"
+msgstr[2] "значение должно быть %1$s"
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr "значение должно быть между \"%1$s\" и \"%2$s\""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr "значение должно быть не больше чем \"%1$s\""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr "значение должно быть не меньше чем \"%1$s\""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -22069,18 +21838,16 @@ msgstr "значение должно быть не меньше чем \"%1$s\"
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr "значение должно быть одно из %1$s"
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -22089,7 +21856,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr "значение первого параметра слишком длинное"
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr "значение тега нового события"
 
@@ -22102,11 +21869,11 @@ msgstr "значение второго параметра слишком дли
 msgid "value of third parameter must be one of %1$s"
 msgstr "значением третьего параметра должно быть %1$s"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr "varpop() - Дисперсия генеральной совокупности"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr "varsamp() - Выборочная дисперсия"
 
@@ -22123,7 +21890,7 @@ msgstr "ошибочный тип правила обнаружения"
 msgid "wrong item type"
 msgstr "ошибочный тип элемента данных"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "г"
diff --git a/ui/locale/sk/LC_MESSAGES/frontend.po b/ui/locale/sk/LC_MESSAGES/frontend.po
index 6105e7fda31..4acb58a60b9 100644
--- a/ui/locale/sk/LC_MESSAGES/frontend.po
+++ b/ui/locale/sk/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2013-08-25 22:42+0300\n"
 "Last-Translator: Jan <jan.garaj@gmail.com>\n"
 "Language-Team: Zabbix translation team\n"
@@ -96,7 +96,7 @@ msgstr[0] "%1$d dni"
 msgstr[1] "%1$d dní"
 msgstr[2] "%1$d dní"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -188,7 +188,7 @@ msgstr[2] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -204,7 +204,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -240,7 +240,7 @@ msgstr[2] "ostáva %1$s pokusov"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -248,7 +248,7 @@ msgstr[0] "%1$s sekunda"
 msgstr[1] "%1$s sekundy"
 msgstr[2] "%1$s sekúnd"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -269,13 +269,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -407,7 +407,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -471,10 +471,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "Prístup zamietnutý"
@@ -517,7 +513,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Potvrdenie"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Potvrdiť"
 
@@ -525,7 +521,7 @@ msgstr "Potvrdiť"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Potvrdenie"
@@ -538,7 +534,7 @@ msgstr "Potvrdené PROBLÉMOVÉ udalosti"
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -565,9 +561,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -624,7 +620,7 @@ msgstr "Akcia \"%1$s\" už existuje."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Pre akciu \"%1$s\" nie je definovaná operácia."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -633,7 +629,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Akcia bola pridaná"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -684,8 +680,8 @@ msgstr "Akcia aktualizovaná"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Akcie"
@@ -752,7 +748,7 @@ msgstr "Aktívny do"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -763,7 +759,7 @@ msgstr "Aktívny do"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -786,9 +782,9 @@ msgstr "Aktívny do"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -858,7 +854,7 @@ msgstr "Aktívny do"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Pridať"
 
@@ -866,11 +862,11 @@ msgstr "Pridať"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr ""
 
@@ -878,7 +874,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -895,7 +891,7 @@ msgstr "Pridať hosta"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr ""
 
@@ -917,7 +913,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -969,12 +965,12 @@ msgstr ""
 msgid "Add widget"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -984,7 +980,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -997,7 +993,7 @@ msgstr "Administrátor"
 msgid "Administration"
 msgstr "Administrácia"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -1019,7 +1015,7 @@ msgstr "Trvanie menšie ako"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1091,7 +1087,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Všetky"
 
@@ -1109,7 +1105,7 @@ msgstr ""
 msgid "All hosts"
 msgstr "Všetky hosty"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Všetky linky by mali mať zadefinované \"Meno\" a \"URL\""
 
@@ -1127,7 +1123,7 @@ msgstr ""
 msgid "All problems if tag values match"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1240,15 +1236,15 @@ msgstr "Chyba aplikácie."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Použiť"
 
@@ -1266,7 +1262,7 @@ msgstr "Budúca"
 msgid "Apr"
 msgstr "Apr"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Apríl"
 
@@ -1294,7 +1290,7 @@ msgstr "Typ plochy"
 msgid "Arithmetic"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1341,7 +1337,7 @@ msgstr "O (hodina:minúta)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1350,7 +1346,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1362,6 +1358,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1373,7 +1374,7 @@ msgstr "Minimálne jedna plánovaná odstávka musí byť vytvorená."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1429,7 +1430,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Aug"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "August"
 
@@ -1442,7 +1443,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1519,7 +1520,7 @@ msgstr ""
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1534,7 +1535,7 @@ msgstr "Automatické mapovanie ikoniek"
 msgid "Automatic icon selection"
 msgstr "Automatický výber ikoniek"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1586,7 +1587,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1649,7 +1650,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Blokovaný"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "Modrá"
 
@@ -1703,11 +1704,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Dole"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr ""
 
@@ -1733,7 +1734,7 @@ msgstr "CERT"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1778,8 +1779,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1788,7 +1789,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Vypočítaná"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1813,7 +1814,7 @@ msgstr "Callback úroveň"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1826,8 +1827,8 @@ msgstr "Callback úroveň"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -1857,7 +1858,7 @@ msgstr "Nie je možné pridať akciu"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1867,7 +1868,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Šablóna nemôže závisieť na hostovi."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1898,8 +1899,8 @@ msgid "Cannot add host prototype"
 msgstr "Nie je možné pridať prototyp hosta"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Nie je možné pridať obrázok"
 
@@ -1992,15 +1993,15 @@ msgstr "Nie je možné pridať používateľa"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Nie je možné pridať scenár"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2020,33 +2021,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Nie je možné zmazať históriu"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Nie je možné klonovať prototypy grafov."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "Nie je možné klonovať prototypy hostov."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Nie je možné klonovať prototypy položiek."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Nie je možné klonovať prototypy spúšťačov."
 
@@ -2074,7 +2071,7 @@ msgstr[0] "Nie je možné skopírovať graf"
 msgstr[1] "Nie je možné skopírovať grafy"
 msgstr[2] "Nie je možné skopírovať grafy"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "Nie je možné skopírovat položku"
@@ -2128,8 +2125,8 @@ msgstr "Nie je možné vytvoriť mapu ikon"
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2159,7 +2156,7 @@ msgstr "Nie je možné zmazať interného Zabbix používateľa \"%1$s\", skúst
 msgid "Cannot delete action"
 msgstr "Nie je možné zmazať akciu"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2231,7 +2228,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2243,11 +2240,11 @@ msgstr[2] ""
 msgid "Cannot delete host prototypes"
 msgstr "Nie je možné zmazať prototypy hosta"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Nie je možné zmazať mapu ikon"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Nie je možné zmazať obrázok"
 
@@ -2272,7 +2269,7 @@ msgstr "Nie je možné zmazať prototyp položky"
 msgid "Cannot delete item prototypes"
 msgstr "Nie je možné zmazať prototypy položiek"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Nie je možné zmazať položky"
 
@@ -2306,7 +2303,7 @@ msgstr[0] "Nie je možné zmazať proxy"
 msgstr[1] "Nie je možné zmazať proxy"
 msgstr[2] "Nie je možné zmazať proxy"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2332,7 +2329,7 @@ msgstr[0] "Nie je možné zmazať skript"
 msgstr[1] "Nie je možné zmazať skript"
 msgstr[2] "Nie je možné zmazať skript"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Nie je možné zmazať skripty. Skript \"%1$s\" sa používa v operácii akcie \"%2$s\"."
@@ -2349,8 +2346,8 @@ msgstr[0] "Nie je možné zmazať službu"
 msgstr[1] "Nie je možné zmazať službu"
 msgstr[2] "Nie je možné zmazať službu"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2379,7 +2376,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr "Nie je možné zmazať položku patriacu šablóne."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Nie je možné zmazať položky patriace šablóne."
 
@@ -2435,7 +2432,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Nie je možné zmazať web scenár"
 
@@ -2475,7 +2472,7 @@ msgstr[0] "Nie je možné vypnúť hosta"
 msgstr[1] "Nie je možné vypnúť hostov"
 msgstr[2] "Nie je možné vypnúť hostov"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Nie je možné vypnúť položku"
@@ -2511,7 +2508,7 @@ msgstr[0] "Nie je možné vypnúť spúšťač"
 msgstr[1] "Nie je možné vypnúť spúšťače"
 msgstr[2] "Nie je možné vypnúť spúšťače"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Nie je možné zakázať web scenár"
@@ -2564,7 +2561,7 @@ msgstr[0] "Nie je možné povoliť hosta"
 msgstr[1] "Nie je možné povoliť hostov"
 msgstr[2] "Nie je možné povoliť hostov"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Nie je možné povoliť položku"
@@ -2600,7 +2597,7 @@ msgstr[0] "Nie je možné povoliť spúšťač"
 msgstr[1] "Nie je možné povoliť spúšťače"
 msgstr[2] "Nie je možné povoliť spúšťače"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Nie je možné povoliť scenár"
@@ -2615,7 +2612,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2649,8 +2646,8 @@ msgstr "Host \"%1$s\" použitý v mape \"%2$s\" nebol nájdený."
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Nemôžem nájsť skupinu \"%1$s\" pre prototyp hosta \"%2$s\" zisťovacieho pravidla \"%3$s\" na \"%4$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2748,24 +2745,20 @@ msgstr "Nemôžem nájsť mapu hodnôt \"%1$s\" použitú pre položku \"%2$s\"
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Nemôžem nájsť mapu hodnôt \"%1$s\" použitú pre prototyp položky \"%2$s\" zisťovacieho pravidla \"%3$s\" na \"%4$s\"."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "Nie je možné mať prázdne zobrazované meno šablóny."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2779,7 +2772,7 @@ msgstr[0] "Nie je možné importovať šablónu \"%1$s\", prepojená šablóna \
 msgstr[1] "Nie je možné importovať šablónu \"%1$s\", prepojené šablóny \"%2$s\" neexistujú."
 msgstr[2] "Nie je možné importovať šablónu \"%1$s\", prepojené šablóny \"%2$s\" neexistujú."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "Nie je možné vložiť výraz spúšťača"
 
@@ -2793,7 +2786,7 @@ msgid "Cannot link template."
 msgstr "Nie je možné nalinkovať šablónu."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2826,17 +2819,17 @@ msgstr "Nie je možné hromadne aktualizovať zobrazované meno šablóny."
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Nie je možné vykonať delete príkaz nad tabuľkou \"%1$s\" bez where podmienky."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Nie je možné vykonať update príkaz nad tabuľkou \"%1$s\" bez hodnôt."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Nie je možné vykonať update príkaz nad tabuľkou \"%1$s\" bez where podmienky."
@@ -2863,7 +2856,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Nie je možné čítať odpoveď, skontrolujte spojenie so Zabbix serverom \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Nie je možné premenovať používateľa guest."
 
@@ -2882,7 +2875,7 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Nie je možné poslať príkaz, skontrolujte spojenie so Zabbix serverom \"%1$s\"."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2922,12 +2915,12 @@ msgstr "Nie je možné nastaviť inventárne polia pre zakázaný inventár."
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2947,7 +2940,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Nie je možné zrušiť prepojenie a zmazať web scenár."
 
@@ -2960,7 +2953,7 @@ msgstr "Nie je možné zrušiť prepojenie šablóny"
 msgid "Cannot unlink template."
 msgstr "Nie je možné zrušiť prepojenie šablóny."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -3013,11 +3006,6 @@ msgstr "Nie je možné aktualizovať \"%2$s\" pre zistenú položku \"%1$s\"."
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "Nie je možné aktualizovať \"%2$s\" pre zistený spúštač \"%1$s\"."
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "Nie je možné aktualizovať \"imagetype\" pre obrázok \"%1$s\"."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -3027,9 +3015,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "Nie je možné aktualizovať zistený graf."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "Nie je možné aktualizovať zistenú skupinu hostov."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3089,9 +3078,7 @@ msgstr "Nie je možné aktualizovať prototyp grafu"
 msgid "Cannot update group"
 msgstr "Nie je možné aktualizovať skupinu"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Nie je možné aktualizovať skupiny pre zisteného hosta \"%1$s\"."
@@ -3116,13 +3103,13 @@ msgstr[2] "Nie je možné aktualizovať prototyp hosta"
 msgid "Cannot update hosts"
 msgstr "Nie je možné aktualizovať hostov"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "Nie je možné aktualizovať mapu ikon"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Nie je možné aktualizovať obrázok"
 
@@ -3178,12 +3165,12 @@ msgstr "Nie je možné aktualizovať mapu siete"
 msgid "Cannot update proxy"
 msgstr "Nie je možné aktualizovať proxy"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Nie je možné aktualizovať proxy pre zisteného hosta \"%1$s\"."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3203,17 +3190,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Nie je možné aktualizovať skript"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3291,7 +3278,7 @@ msgstr[2] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Nie je možné aktualizovať web scenár"
 
@@ -3391,8 +3378,8 @@ msgid "Character string not included"
 msgstr "Neobsahuje reťazec"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3507,7 +3494,7 @@ msgstr "Kontroly výkonnosti UDP služby. Vráti 0 - služba je nedostupná, sek
 msgid "Checks should be unique."
 msgstr "Kontroly musia byť jedinečné."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3528,7 +3515,7 @@ msgstr "Kruhový odkaz v šablónach: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "Kruhové odkazovanie šablón nie je povolené."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3549,11 +3536,11 @@ msgstr "Vyčistiť históriu a trendy"
 msgid "Clear when unlinking"
 msgstr "Vyčistiť pri odpojení"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3568,7 +3555,7 @@ msgstr "Hodiny"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3583,7 +3570,7 @@ msgstr "Hodiny"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Klonovať"
 
@@ -3594,8 +3581,8 @@ msgstr "Klonovať"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Zatvoriť"
 
@@ -3606,13 +3593,13 @@ msgstr "Zatvoriť"
 msgid "Close expression constructor"
 msgstr "Zavrieť konštruktéra výrazu"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
 
@@ -3625,8 +3612,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "Zavrieť"
 
@@ -3643,7 +3630,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3709,7 +3696,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3720,17 +3707,12 @@ msgstr "Podmienka"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "Podmienka \"%2$s\" nie je použitá vo formule \"%3$s\" pre akciu \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "Podmienka \"%2$s\" použitá vo formule \"%3$s\" pre akciu \"%1$s\" nie je definovaná."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3740,17 +3722,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "Podmienka \"%2$s\" použitá vo formule \"%3$s\" pre akciu \"%1$s\" nie je definovaná."
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "Podmienka \"%2$s\" použitá vo formule \"%3$s\" pre zisťovacie pravidlo \"%1$s\" nie je definovaná."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3766,7 +3743,7 @@ msgstr "Podmienky"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Nastavenie"
 
@@ -3829,7 +3806,7 @@ msgstr "Nastavenie hostov"
 msgid "Configuration of housekeeping"
 msgstr "Nastavenie údržby"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Nastavenie mapovania ikon"
@@ -3936,7 +3913,7 @@ msgstr "Potvrdzujúci text"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "Gratulácia! Práve ste úspešne nainštalovali Zabbix frontend."
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -4029,7 +4006,7 @@ msgstr "Kontakt"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4089,7 +4066,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -4128,8 +4105,8 @@ msgstr "Poloha"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Kopírovať"
 
@@ -4138,12 +4115,11 @@ msgstr "Kopírovať"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr ""
@@ -4173,16 +4149,6 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr ""
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr ""
@@ -4191,14 +4157,10 @@ msgstr ""
 msgid "Correlation updated"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Nie je možné uložiť obrázok!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Počet"
 
@@ -4262,11 +4224,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr ""
 
@@ -4383,7 +4345,7 @@ msgstr "Vytvoriť mapu"
 msgid "Create media type"
 msgstr "Vytvoriť typ média"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "Vytvoriť nové"
 
@@ -4407,7 +4369,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Vytvoriť šablónu"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Vytvoriť spúšťač"
 
@@ -4570,7 +4532,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "DNS meno"
@@ -4582,11 +4544,11 @@ msgstr "DNS meno"
 msgid "Daily"
 msgstr "Denne"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "Tmavá"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4607,8 +4569,8 @@ msgstr ""
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr ""
 
@@ -4632,9 +4594,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr ""
 
@@ -4658,7 +4620,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4686,7 +4648,7 @@ msgstr "Prehľad dát"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4828,7 +4790,7 @@ msgstr "Deň v týždni"
 msgid "Days"
 msgstr "dní"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Ladenie"
 
@@ -4842,26 +4804,26 @@ msgstr "Ladiaci režim"
 msgid "Dec"
 msgstr "Dec"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "December"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Predvolený"
 
@@ -4954,7 +4916,7 @@ msgstr "Oneskorené o"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4978,8 +4940,8 @@ msgstr "Oneskorené o"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Zmazať"
 
@@ -5004,11 +4966,11 @@ msgstr "Zmazať a vyčistiť šablónu? (Pozor: všetky prepojené hosty budú t
 msgid "Delete current action?"
 msgstr "Zmazať aktuálnu akciu?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -5052,7 +5014,7 @@ msgstr "Zmazať prototyp položky?"
 msgid "Delete item?"
 msgstr "Zmazať položku?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Zmazať prepojenia medzi označenými elementmi?"
 
@@ -5108,7 +5070,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "Zmazať označené zisťovacie pravidlá?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Zmazať označené elementy?"
 
@@ -5213,7 +5175,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5257,7 +5219,7 @@ msgstr "Zmazať spúšťač?"
 msgid "Delete web scenario?"
 msgstr "Zmazať web scenár?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5302,7 +5264,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Závislosti"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Podradená závislosť (tento ovplyvňuje)"
 
@@ -5310,7 +5272,7 @@ msgstr "Podradená závislosť (tento ovplyvňuje)"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5320,7 +5282,7 @@ msgstr "Nadradená závislosť (tento je ovplyvnený)"
 msgid "Deployment status"
 msgstr "Stav nasadenia"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5353,7 +5315,7 @@ msgid "Description"
 msgstr "Poznámka"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5519,10 +5481,10 @@ msgstr "Zakázať označené scenáre?"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5605,7 +5567,7 @@ msgid "Discovery by proxy"
 msgstr "Zisťovanie cez proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Kontrola zisťovania"
 
@@ -5617,7 +5579,7 @@ msgstr "Kontroly zisťovania"
 msgid "Discovery list"
 msgstr "Zisťovací zoznam"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Objekt zisťovania"
 
@@ -5649,7 +5611,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5657,12 +5619,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Pravidlá zisťovania"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Zisťovacie pravidlo \"%1$s\" už existuje na \"%2$s\", zdedené z inej šablóny."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "Zisťovacie pravidlo \"%1$s\" už existuje na \"%2$s\"."
@@ -5675,7 +5637,7 @@ msgstr "Zisťovacie pravidlo \"%1$s\" už existuje na \"%2$s\"."
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "Zisťovacie pravidlo \"%1$s\" už existuje."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5720,7 +5682,7 @@ msgstr "Zisťovacie pravidlo aktualizované"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5731,7 +5693,7 @@ msgstr "Zisťovacie pravidlá"
 msgid "Discovery rules deleted"
 msgstr "Zisťovacie pravidlá vymazané"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Stav zisťovania"
@@ -5768,10 +5730,11 @@ msgid "Display stacked graph"
 msgstr "Zobraziť skladaný graf"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Zobrazujem %1$s z %2$s nájdených"
@@ -5781,7 +5744,7 @@ msgstr "Zobrazujem %1$s z %2$s nájdených"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "Zobrazujem %1$s do %2$s z %3$s nájdených"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5803,7 +5766,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Prajete si zameniť podmienkový výraz?"
 
@@ -5859,7 +5822,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Nedostupné"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5867,7 +5830,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr "Stiahnuť konfiguračný súbor"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5886,18 +5849,6 @@ msgstr ""
 msgid "Draw style"
 msgstr "Štýl vykreslenia"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5910,11 +5861,6 @@ msgstr "Duplicitné \"meno\" hodnoty \"%1$s\" pre mapu."
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5966,7 +5912,7 @@ msgstr "Dynamická položka"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Každá URL by mala mať jedinečné meno. Prosim uistite sa, že existuje len jedna URL s takýmto menom"
 
@@ -5975,11 +5921,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5993,8 +5939,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Aktualizovať"
 
@@ -6010,11 +5956,11 @@ msgstr "Aktualizovať mapu"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Aktualizovať spúštač"
 
@@ -6074,21 +6020,17 @@ msgstr "Prázdny súbor SSL kľúča pre web scenár \"%1$s\"."
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "Prázdna filtrovacia podmienka ID vzorca pre akciu \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Prázdna filtrovacia podmienka ID vzorca pre zisťovacie pravidlo \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "Prázdna filtrovacia podmienka makra pre zisťovacie pravidlo \"%1$s\"."
@@ -6104,25 +6046,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6132,14 +6068,6 @@ msgstr "Prázdny vstupný parameter."
 msgid "Empty map ID."
 msgstr "Prázdne ID mapy."
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "Prázdne ID typu média."
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Prázdne parametre"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6305,7 +6233,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6316,7 +6244,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6359,7 +6287,7 @@ msgid "English (en_US)"
 msgstr "Anglicky (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6375,7 +6303,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6394,12 +6322,12 @@ msgstr ""
 msgid "Error"
 msgstr "Chyba"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Chyba vo vyhľadávacej požiadavke nad tabuľkou \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6426,7 +6354,7 @@ msgstr "ID udalosti"
 msgid "Event acknowledged"
 msgstr "Udalosť potvrdená"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6434,7 +6362,7 @@ msgid "Event correlation"
 msgstr ""
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr ""
@@ -6469,11 +6397,11 @@ msgstr "Monitoring logu udalostí. Vráti log"
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Typ udalosti"
 
@@ -6519,15 +6447,10 @@ msgstr "Vylúčiť"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Vykonať"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "SQL chyba pri spustení [%1$s] v [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6565,7 +6488,7 @@ msgstr "Vykonané"
 msgid "Executed script"
 msgstr "Vykonaný skript"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Potvrdenie vykonania"
 
@@ -6581,8 +6504,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "Rozbaliť"
 
@@ -6703,7 +6626,7 @@ msgstr "Výrazy"
 msgid "External check"
 msgstr "Externá kontrola"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "Pi"
@@ -6730,8 +6653,8 @@ msgstr "Zlyhanie"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6742,26 +6665,26 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6769,7 +6692,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Zlyhanie aktualizácie šablóny."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6793,7 +6716,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Feb"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Február"
 
@@ -6815,10 +6738,9 @@ msgstr "Pole \"%1$s\" nemôže byť nastavené na NULL."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6829,13 +6751,6 @@ msgstr "Pole \"%1$s\" je povinné."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "Chýbajúca hodnota pola \"%1$s\" pre mapu \"%2$s\"."
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "Chýbajúca hodnota pola \"%1$s\" pre typ média \"%2$s\"."
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6854,11 +6769,6 @@ msgstr "Pole \"%1$s\" nie je desiatkové číslo."
 msgid "Field \"%1$s\" is not string."
 msgstr "Pole \"%1$s\" nie je reťazec."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "Pole \"%1$s\" je vyžadované pre typ média \"%2$s\"."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6873,10 +6783,6 @@ msgstr "Pole \"host\" je vyžadované."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Formát súboru nie je podporovaný."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6941,7 +6847,8 @@ msgstr "Oblasť výplne"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6966,7 +6873,7 @@ msgstr "Filtrovať"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -7018,7 +6925,7 @@ msgstr "Prispôsobiť mape"
 msgid "Fixed"
 msgstr "Pevná"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -7069,12 +6976,12 @@ msgstr "Vzorec"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7087,7 +6994,7 @@ msgstr "Francúzsky (fr_FR)"
 msgid "Fri"
 msgstr "Pi"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Piatok"
 
@@ -7198,7 +7105,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "Zadaný výraz nie je makro"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr ""
@@ -7212,7 +7119,7 @@ msgstr "Globálna hodnota"
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Choď na"
 
@@ -7250,7 +7157,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7258,7 +7165,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Gradientová čiara"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7319,7 +7226,7 @@ msgstr[2] "Grafy skopírované"
 msgid "Graph deleted"
 msgstr "Graf zmazaný"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7356,8 +7263,8 @@ msgstr "Prototyp grafu zmazaný"
 msgid "Graph prototype updated"
 msgstr "Prototyp grafu aktualizovaný"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7391,8 +7298,8 @@ msgstr "Typ grafu"
 msgid "Graph updated"
 msgstr "Graf aktualizovaný"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7423,7 +7330,7 @@ msgstr "Graf s menom \"%1$s\" už existuje v grafoch alebo prototypoch grafov."
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Grafy"
 
@@ -7444,12 +7351,12 @@ msgstr "Mriežka"
 msgid "Group"
 msgstr "Skupina"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Skupinu \"%1$s\" nie je možné zmazať, pretože je používaná prototypom hosta."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr ""
@@ -7624,11 +7531,11 @@ msgstr "Pomoc"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Skrytý"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "Skryť debug"
 
@@ -7655,11 +7562,11 @@ msgstr ""
 msgid "High"
 msgstr "Kritická"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7680,7 +7587,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "História"
 
@@ -7688,11 +7595,15 @@ msgstr "História"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "História vyčistená"
 
@@ -7735,7 +7646,7 @@ msgstr "Vodorovný"
 msgid "Horizontal align"
 msgstr "Vodorovné zarovnanie"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7764,7 +7675,7 @@ msgstr "Vodorovné zarovnanie"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7779,7 +7690,7 @@ msgstr[2] "Hostov"
 msgid "Host \"%1$s\" already exists."
 msgstr "Host \"%1$s\" už existuje."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7787,7 +7698,7 @@ msgstr "Host \"%1$s\" už existuje."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7841,7 +7752,7 @@ msgstr[0] "Host povolený"
 msgstr[1] "Hosty povolené"
 msgstr[2] "Hosty povolené"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7855,22 +7766,22 @@ msgstr[2] "Hosty povolené"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Skupina hostov"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Skupina hostov \"%1$s\" už existuje."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Skupinu hostov \"%1$s\" nie je možné zmazať, pretože je použitá v globálnom skripte."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7883,10 +7794,10 @@ msgstr "Elementy skupiny hostov"
 msgid "Host group label type"
 msgstr "Typ popisku skupiny"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7902,8 +7813,8 @@ msgstr ""
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7977,7 +7888,7 @@ msgstr "Meno hosta"
 msgid "Host networks"
 msgstr "Siete hosta"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -8059,7 +7970,7 @@ msgstr "Aktualizácia hosta zlyhala."
 msgid "Host updated"
 msgstr "Host aktualizovaný"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr ""
@@ -8079,7 +7990,7 @@ msgstr "Host s rovnakým menom\"%1$s\" už existuje."
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Host s rovnakým zobrazovaným menom \"%1$s\" už existuje."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8092,7 +8003,7 @@ msgstr "Host s rovnakým zobrazovaným menom \"%1$s\" už existuje."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8140,7 +8051,7 @@ msgstr "Hosty aktualizované"
 msgid "Hours"
 msgstr "hodín"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8180,7 +8091,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IP adresa"
@@ -8205,7 +8116,7 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8262,12 +8173,12 @@ msgstr "Zvýraznenie ikony"
 msgid "Icon map"
 msgstr "Mapová ikona"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Mapová ikona \"%1$s\" nemôže byť zmazaná. Je použitá v mape \"%2$s\"."
@@ -8280,18 +8191,18 @@ msgstr "Mapová ikona vytvorená"
 msgid "Icon map deleted"
 msgstr "Mapová ikona zmazaná"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Mapová ikona aktualizovaná"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "Mapovanie ikon"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
@@ -8394,23 +8305,20 @@ msgstr "Pokiaľ si myslíte, že táto správa je nesprávna, prosím kontaktuje
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Obrázok"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "Obrázok \"%1$s\" už existuje."
@@ -8419,7 +8327,7 @@ msgstr "Obrázok \"%1$s\" už existuje."
 msgid "Image added"
 msgstr "Obrázok pridaný"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Obrázok zmazaný"
 
@@ -8427,18 +8335,12 @@ msgstr "Obrázok zmazaný"
 msgid "Image label type"
 msgstr "Typ popisku obrázka"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "Chyba načítania obrázku [%1$s] v [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Obrázok aktualizovaný"
 
@@ -8533,7 +8435,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8544,13 +8446,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr ""
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8594,7 +8496,7 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Štatistika príchodzej prevádzky na sieťovom rozhraní. Vráti celé číslo"
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8762,24 +8664,6 @@ msgstr "Neplatná prevádzková akcia používateľskej skupiny. Skupina neexist
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Neplatná prevádzková akcia používateľa. Používateľ neexistuje alebo nemáte k nemu prístup."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8834,8 +8718,6 @@ msgstr "Neplatná prevádzková akcia používateľa. Používateľ neexistuje a
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Funkcii boli predané neplatné argumenty."
 
@@ -8861,31 +8743,22 @@ msgstr "Nesprávne podmienky pre zisťovacie pravidlo \"%1$s\"."
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "Nesprávne podmienky pre akciu \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "Nesprávne podmienky pre zisťovacie pravidlo \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "Nesprávny vlastný výraz \"%2$s\" pre akciu \"%1$s\": %3$s."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "Nesprávny vlastný výraz \"%2$s\" pre zisťovacie pravidlo \"%1$s\": %3$s."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8914,7 +8787,7 @@ msgstr "Neplatná hodnota eventobject."
 msgid "Incorrect eventsource value."
 msgstr "Neplatná hodnota eventsource."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Neplatné pole \"%1$s\" meno alebo hodnota vo where podmienke pre tabuľku \"%2$s\"."
@@ -8939,22 +8812,17 @@ msgstr "Nahraný neplatný súbor."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "Nesprávna filtrovacia podmienka ID vzorca pre akciu \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Nesprávna filtrovacia podmienka ID vzorca pre zisťovacie pravidlo \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "Nesprávna filtrovacia podmienka makra pre zisťovacie pravidlo \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8965,7 +8833,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "Nesprávna filtrovacia podmienka operátora pre akciu \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "Nesprávna filtrovacia podmienka operátora pre zisťovacie pravidlo \"%1$s\"."
@@ -8993,8 +8861,6 @@ msgstr "Neplatný obrázkový index."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -9056,10 +8922,6 @@ msgstr "Neplatná perióda údržby (minimálne 5 minút)"
 msgid "Incorrect map ID."
 msgstr "Neplatné ID mapy."
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "Nesprávny typ média ID."
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9117,13 +8979,13 @@ msgstr "Nesprávny regulárny výraz \"%1$s\": \"%2$s\""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Neplatná odpoveď prijatá od Zabbix servera \"%1$s\"."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Neplatný čas ukončenia služby."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Neplatný čas začiatku služby."
 
@@ -9176,12 +9038,7 @@ msgstr "Neplatný výraz prototypu spúšťača. Elementy výrazu prototypu spú
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "Nesprávny typ kalkulácie pre akciu \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "Nesprávny typ výpočtu pre zisťovacie pravidlo \"%1$s\"."
@@ -9227,13 +9084,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9250,60 +9107,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Neplatná hodnota \"%1$s\" pre \"%2$s\" pole: musí byť medzi %3$s a %4$s."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "Neplatná hodnota \"%1$s\" pre float pole \"%2$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "Neplatná hodnota \"%1$s\" pre int pole \"%2$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Neplatná hodnota \"%1$s\" pre unsigned int pole \"%2$s\"."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "Nesprávna hodnota \"%1$s\" v poli \"%2$s\" pre typ média \"%3$s\"."
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9358,14 +9185,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9475,25 +9296,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9504,7 +9307,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9550,16 +9353,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9568,7 +9372,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "Neplatná hodnota pre pole \"%1$s\": %2$s."
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9656,12 +9460,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Vložiť"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "Vložiť výraz"
 
@@ -9765,7 +9569,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9773,7 +9577,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9784,7 +9588,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Interval"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9807,7 +9611,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9839,7 +9643,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr "Neplatný interval \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Neplatný kľúč \"%1$s\" pre zisťovacie pravidlo \"%2$s\" na \"%3$s\": %4$s."
@@ -9864,27 +9668,29 @@ msgstr "Neplatný kľúč \"%1$s\": %2$s."
 msgid "Invalid method parameters."
 msgstr "Neplatné parametre metódy."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9910,17 +9716,17 @@ msgstr "Neplatné parametre metódy."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9928,8 +9734,8 @@ msgstr "Neplatné parametre metódy."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9943,106 +9749,116 @@ msgstr "Neplatné parametre metódy."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -10084,43 +9900,38 @@ msgstr "Neplatný návratový kód \"%1$s\"."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10141,7 +9952,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Inventár"
 
@@ -10182,7 +9993,7 @@ msgstr "Nie je možné nájsť používateľské heslo."
 msgid "Italian (it_IT)"
 msgstr "Taliansky (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10214,7 +10025,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "Položka \"%1$s\" nemôže byť naplnená chýbajúcim inventárnym polom číslo \"%2$d\". Možnosti: od 0 (nenapĺňať) do %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10228,7 +10039,7 @@ msgstr "Položka pridaná"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "Položka skopírovaná"
@@ -10243,14 +10054,14 @@ msgstr "Počet položiek"
 msgid "Item deleted"
 msgstr "Položka zmazaná"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Položka vypnutá"
 msgstr[1] "Položky vypnuté"
 msgstr[2] "Položky vypnuté"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Položka povolená"
@@ -10261,7 +10072,7 @@ msgstr[2] "Položky povolené"
 msgid "Item in \"not supported\" state"
 msgstr "Položka je v \"not supported\" stave"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "Položka nie je označená"
 
@@ -10270,7 +10081,7 @@ msgstr "Položka nie je označená"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10309,8 +10120,8 @@ msgstr[0] "Prototyp položky aktualizovaný"
 msgstr[1] "Prototyp položky aktualizovaný"
 msgstr[2] "Prototyp položky aktualizovaný"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10336,7 +10147,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10368,8 +10179,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10420,11 +10231,11 @@ msgstr "Položka s kľúčom \"%1$s\" už existuje na \"%2$s\"."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Položky"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Položky zmazané"
 
@@ -10442,7 +10253,7 @@ msgstr "Položky aktualizované"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10467,6 +10278,10 @@ msgstr "JMX rozhrania"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10479,7 +10294,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10497,7 +10312,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Jan"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Január"
 
@@ -10519,7 +10334,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Júl"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Júl"
 
@@ -10527,7 +10342,7 @@ msgstr "Júl"
 msgid "Jun"
 msgstr "Jún"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Jún"
 
@@ -10689,22 +10504,6 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10716,11 +10515,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Posledná kontrola"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Graf poslednej hodiny"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Graf posledného mesiaca"
 
@@ -10758,11 +10557,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Posledná hodnota"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Graf posledného týždňa"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10771,11 +10570,11 @@ msgstr "Graf posledného týždňa"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Posledné údaje"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "Posledné hodnoty"
 
@@ -10816,7 +10615,7 @@ msgstr ""
 msgid "Left trim"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -11097,7 +10896,7 @@ msgstr "Nízko úrovňové zisťovacie pravidlo v \"not supported\" stave"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "Po"
@@ -11119,7 +10918,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "MD5 kontrolný súčet súboru. Vráti reťazec (MD5 hash súboru)"
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11130,12 +10929,12 @@ msgid "Macro"
 msgstr "Makro"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Makro \"%1$s\" už existuje na \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Makro \"%1$s\" už existuje."
@@ -11163,7 +10962,7 @@ msgstr "Makrá aktualizované"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -11171,7 +10970,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11254,7 +11053,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11276,13 +11075,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Mapa"
 
@@ -11351,7 +11150,7 @@ msgstr ""
 msgid "Map update failed."
 msgstr "Aktulizácia mapy zlyhala."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11383,7 +11182,7 @@ msgstr "Mapy"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Marec"
 
@@ -11487,7 +11286,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11502,7 +11301,7 @@ msgstr[2] "Maximálna časová perióda na zobrazenie je %1$s dní."
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Máj"
 
@@ -11517,15 +11316,12 @@ msgstr "Máj"
 msgid "Media"
 msgstr "Médiá"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Typ média"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr "Typ média \"%1$s\" už existuje."
@@ -11555,11 +11351,6 @@ msgstr[0] "Typ média povolený"
 msgstr[1] "Typ média povolený"
 msgstr[2] "Typ média povolený"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr "Chýbajúci parameter typ média: %1$s"
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11589,7 +11380,7 @@ msgstr ""
 msgid "Media types"
 msgstr "Typy médií"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11677,7 +11468,7 @@ msgstr "Správy"
 msgid "Method not found."
 msgstr "Metóda nenájdená."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11739,7 +11530,7 @@ msgid "Minimum severity"
 msgstr "Minimálna závažnosť"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11799,7 +11590,7 @@ msgstr "Režim"
 msgid "Model"
 msgstr "Model"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11841,7 +11632,7 @@ msgstr[2] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11867,7 +11658,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Po"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Pondelok"
 
@@ -11907,11 +11698,11 @@ msgstr "Mesiac"
 msgid "Monthly"
 msgstr "Mesačne"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "Viacero výberov bolo nájdených..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11935,7 +11726,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11948,7 +11739,7 @@ msgstr ""
 msgid "Multiple PROBLEM events"
 msgstr "Viacnásobné PROBLÉMOVÉ udalosti"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Stlmiť"
 
@@ -12077,11 +11868,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12239,19 +12030,21 @@ msgstr "Nová podmienka"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Nový element"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr ""
 
@@ -12263,7 +12056,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Nový regulárny výraz"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12271,7 +12064,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Nový čas služby"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12280,7 +12073,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12298,7 +12091,7 @@ msgstr "Ďalší krok"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12327,30 +12120,6 @@ msgstr "Ďalší krok"
 msgid "No"
 msgstr "Nie"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr ""
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12366,11 +12135,6 @@ msgstr "Žiadne \"%1$s\" dané pre graf."
 msgid "No \"%1$s\" given for map."
 msgstr "Žiadne \"%1$s\" dané pre mapu."
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "Žiadne \"%1$s\" dané pre typ média."
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12378,7 +12142,7 @@ msgstr "Žiadne \"%1$s\" dané pre typ média."
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "Žiadne \"%2$s\" dané pre filtrovaciu podmienku akcie \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "Žiadne \"%2$s\" dané pre filtrovaciu podmienku zisťovacieho pravidla \"%1$s\"."
@@ -12388,7 +12152,7 @@ msgstr "Žiadne \"%2$s\" dané pre filtrovaciu podmienku zisťovacieho pravidla
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "Žiadne \"%2$s\" dané pre filter akcie \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "Žiadne \"%2$s\" dané pre filter zisťovacieho pravidla \"%1$s\"."
@@ -12405,11 +12169,6 @@ msgstr "Nie je špecifikované používateľské meno autentifikácie."
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr ""
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12440,7 +12199,7 @@ msgstr "Žiadne predvolené rozhranie pre \"%1$s\" typu na \"%2$s\"."
 msgid "No details"
 msgstr "Bez podrobností"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "Žiadne stanovené ID zisťovacích pravidiel."
 
@@ -12476,7 +12235,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "Žiadne grafy neboli pridané."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Žiadne neposkytnuté IDčka hostov."
 
@@ -12506,7 +12265,7 @@ msgstr "Žiadny obrázok"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Nenájdené žiadne rozhranie"
 
@@ -12540,7 +12299,7 @@ msgstr "Nenájdené žiadne makrá."
 msgid "No maps added."
 msgstr "Žiadne mapy neboli pridané."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "Žiadne výbery nenájdené"
 
@@ -12548,17 +12307,46 @@ msgstr "Žiadne výbery nenájdené"
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Žiadne oprávnenia pre prístup do systému."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12566,7 +12354,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12594,19 +12382,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12621,16 +12408,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12650,12 +12443,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12676,27 +12467,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12713,14 +12506,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12729,7 +12522,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Žiadne oprávnenia k odkazovanému objektu alebo objekt neexistuje!"
 
@@ -12749,7 +12542,7 @@ msgstr "Žiadny špecifikovaný súbor s verejným kľúčom."
 msgid "No recipients for action operation message."
 msgstr "Žiadny príjemcovia pre operáciu odoslania správy."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr ""
 
@@ -12761,7 +12554,7 @@ msgstr "Nie je špecifikovany skript pre akciu príkazu."
 msgid "No target selected"
 msgstr "Nie je vybraný cieľ"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Nie je vybraný cieľ."
 
@@ -12778,7 +12571,7 @@ msgstr "Žiadne definované spúšťače."
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr ""
 
@@ -12848,15 +12641,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Nie je povolené nastavenie hesla pre používateľa \"guest\"."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12888,7 +12681,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "Nepodporované"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Poznámka"
@@ -12919,7 +12712,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Nov"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "November"
 
@@ -13106,8 +12899,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13167,13 +12960,13 @@ msgstr "Okt"
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Október"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Vypnuté"
 
@@ -13181,30 +12974,31 @@ msgstr "Vypnuté"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr ""
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "Zapnuté"
 
@@ -13220,35 +13014,15 @@ msgstr "Raz"
 msgid "One"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "Jeden z objekov je bez skupiny hostov."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Jednorázovo"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Jednorázový prestoj"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Len super administrátori môžu vytvoriť skupiny."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Len super administrátori môžu vytvoriť typy médií."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Len super administrátori môžu zmazať typy médií."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Len super administrátori môžu upravovať typy médií."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Len kontroly typu Zabbix agent, SNMPv1, SNMPv2 alebo SNMPv3 môžu byť unikátne."
@@ -13298,10 +13072,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr ""
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13310,15 +13080,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr ""
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Len spúšťače priradené k monitorovaným hostom alebo závislé na monitorovaných položkách sú započítané"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13327,7 +13093,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Informácie o operačnom systéme. Vráti reťazec"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13336,11 +13102,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Operácia nemôže byť vykonaná vzhľadom k neoprávnenej požiadavke."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Podrobnosti operácie"
 
@@ -13362,7 +13128,7 @@ msgstr "Operácia nemá šablónu na vykonanie."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13371,33 +13137,33 @@ msgstr ""
 msgid "Operations"
 msgstr "Operácie"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Operátor"
 
@@ -13506,7 +13272,7 @@ msgstr "Ďalšie konfiguračné parametre"
 msgid "Other parameters"
 msgstr "Ďalšie parametre"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Ďalšie"
@@ -13520,7 +13286,7 @@ msgstr "Štatistika odchodzej prevádzky na sieťovom rozhraní. Vráti celé č
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13549,7 +13315,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13738,7 +13504,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13783,7 +13549,7 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "PSK identita"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13806,16 +13572,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parameter"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr ""
@@ -13845,7 +13611,7 @@ msgstr "Nadradená položka"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13862,7 +13628,7 @@ msgstr "Nadradené spúšťače"
 msgid "Parent web scenarios"
 msgstr "Nadradené web scenáre"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13874,11 +13640,6 @@ msgstr ""
 msgid "Parse"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "Parsovacia SQL chyba [%1$s] v [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Parsovacia chyba"
@@ -13939,7 +13700,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr ""
 
@@ -13949,15 +13710,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -14003,12 +13764,11 @@ msgstr "Vykonať DNS dotaz. Vráti reťazec s požadovaným typom informácie"
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Perióda"
 
@@ -14097,7 +13857,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Prosím zadajte meno Zabbix hosta alebo jeho IP adresu a číslo portu Zabbix servera. Meno inštalácie je nepovinné."
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Označte prosím dva elementy"
 
@@ -14137,7 +13897,7 @@ msgstr "Vypĺňa polia hostovho inventára"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14226,7 +13986,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14357,7 +14117,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Problém na"
 
@@ -14370,21 +14130,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14398,9 +14154,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Problémy"
 
@@ -14434,7 +14190,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "Vlastnosti"
 
@@ -14455,13 +14211,13 @@ msgstr ""
 msgid "Proxies"
 msgstr "Proxy"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14469,7 +14225,7 @@ msgstr "Proxy"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14479,12 +14235,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Proxy \"%1$s\" pre host \"%2$s\" neexistuje."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Proxy \"%1$s\" je použitá zisťovacím pravidlom \"%2$s\"."
@@ -14578,7 +14334,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14655,10 +14411,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Prijatá hodnota"
@@ -14740,7 +14492,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14758,13 +14510,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Regulárny výraz"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14798,7 +14550,7 @@ msgstr "Regulárne výrazy"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14830,8 +14582,6 @@ msgstr "Vzdialený príkaz"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14852,7 +14602,9 @@ msgstr "Vzdialený príkaz"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14865,7 +14617,7 @@ msgstr "Vzdialený príkaz"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14942,8 +14694,8 @@ msgstr "Vzdialený príkaz"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Zmazať"
 
@@ -14983,7 +14735,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -15025,7 +14777,7 @@ msgid "Replace dependencies"
 msgstr "Nahradiť závislosti"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -15080,7 +14832,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -15122,8 +14874,8 @@ msgstr "Požadovaný stavový kód"
 msgid "Required string"
 msgstr "Požadovaný reťazec"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Reset"
 
@@ -15156,7 +14908,7 @@ msgstr "Potvrdenie obnovenia"
 msgid "Reset defaults"
 msgstr "Obnoviť pôvodné hodnoty"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Vyriešené"
 
@@ -15222,7 +14974,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Výsledok"
@@ -15409,12 +15161,12 @@ msgstr "Spustí špecifikovaný príkaz na hostovi. Vráti text ako výsledok sp
 msgid "Russian (ru_RU)"
 msgstr "Rusky (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "So"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Ne"
@@ -15425,8 +15177,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15463,7 +15215,7 @@ msgstr "SMTP server port"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15559,12 +15311,12 @@ msgstr "SQL počty: %1$s (selects: %2$s | executes: %3$s)"
 msgid "SQL query"
 msgstr "SQL dotaz"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "Vykonanie SQL dotazu zlyhalo \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Vykonanie SQL dotazu zlyhalo \"%1$s\"."
@@ -15627,7 +15379,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15639,7 +15391,7 @@ msgstr ""
 msgid "Sat"
 msgstr "So"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -15681,7 +15433,7 @@ msgstr "Termín"
 msgid "Scheduled check"
 msgstr "Naplánovaná kontrola"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15751,7 +15503,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15764,8 +15516,7 @@ msgstr ""
 msgid "Script"
 msgstr "Skript"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Skript \"%1$s\" už existuje."
@@ -15798,12 +15549,6 @@ msgstr "Meno skriptu"
 msgid "Script parameters"
 msgstr "Parametre skriptu"
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "Parametre skriptu \"%1$s\" chýbajú the last new line feed pre typ média \"%2$s\"."
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Profiler skriptov"
@@ -15816,7 +15561,7 @@ msgstr "Skript aktualizovaný"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Skripty"
 
@@ -15886,8 +15631,8 @@ msgid "Security name"
 msgstr "Bezpečnostné meno"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15895,7 +15640,7 @@ msgstr "Bezpečnostné meno"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Vybrať"
 
@@ -15931,19 +15676,19 @@ msgstr "Označené elementy"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr ""
 
@@ -15968,7 +15713,7 @@ msgstr "Poslať len na"
 msgid "Send to"
 msgstr "Posielať na"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr ""
 
@@ -16001,7 +15746,7 @@ msgstr "Oddelene"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "September"
 
@@ -16032,28 +15777,28 @@ msgstr ""
 msgid "Server time"
 msgstr "Čas na servery"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Služba"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -16063,7 +15808,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "Služba vytvorená"
 
@@ -16097,16 +15842,16 @@ msgstr "Port služby"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "Čas štartu služby musi byť menší ako jej koniec."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -16114,11 +15859,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Časy služby"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Typ služby"
 
@@ -16127,30 +15872,29 @@ msgstr "Typ služby"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Služba aktualizovaná"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Služby"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "Služby tvoria kruhovú závislosť."
 
@@ -16158,7 +15902,7 @@ msgstr "Služby tvoria kruhovú závislosť."
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16188,7 +15932,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Nastaviť hostov mód inventára"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16217,7 +15961,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16226,7 +15970,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16282,7 +16026,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "Zdieľanie"
 
@@ -16424,7 +16168,7 @@ msgstr "Zobraziť varovanie ak je Zabbix server vypnutý"
 msgid "Show working time"
 msgstr "Zobraziť pracovný čas"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Zobraz"
 
@@ -16533,7 +16277,7 @@ msgstr "Preskočené kopírovanie grafu \"%1$s\" na host \"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "Slovensky (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Odložiť"
 
@@ -16579,7 +16323,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Zoradiť záznamy podľa"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Radenie (0->999)"
 
@@ -16653,7 +16397,7 @@ msgstr "Začiatok v"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16756,15 +16500,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Stav"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Stavové kódy"
@@ -16794,7 +16542,7 @@ msgstr "Len stav"
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16842,7 +16590,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16907,7 +16655,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Subjekt"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Podmapa"
 
@@ -16923,7 +16671,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Audit úspešný"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16936,7 +16684,7 @@ msgstr "Suma príchodzej a odchodzej prevádzky na sieťovom rozhraní. Vráti c
 msgid "Sun"
 msgstr "Ne"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Nedeľa"
 
@@ -17028,12 +16776,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Doba prevádzky v sekundách. Vráti celé číslo"
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Št"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Št"
@@ -17060,17 +16808,17 @@ msgstr "PRAVDA"
 msgid "Table \"%1$s\" does not exist."
 msgstr "Tabuľka \"%1$s\" neexistuje."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "Tabuľka \"%1$s\" neobsahuje pole s menom \"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Označenie"
@@ -17126,7 +16874,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17186,7 +16934,7 @@ msgstr "Typ cieľa"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17207,7 +16955,7 @@ msgstr "Šablóna"
 msgid "Template \"%1$s\" already exists."
 msgstr "Šablóna \"%1$s\" už existuje."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17231,7 +16979,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Šablóna nemôže byť pripojená k inej šablóne viac ako raz, vrátanie prepojenia cez iné šablóny."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17291,7 +17039,7 @@ msgstr "Šablóna s rovnakým viditeľným menom \"%1$s\" už existuje."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17463,7 +17211,7 @@ msgstr "Host už nie je zisťovaný a bude zmazaný %1$s (na %2$s v %3$s)."
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "Host už nie je zisťovaný a bude zmazaný počas ďalšieho spustenia zisťovania."
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
@@ -17471,7 +17219,7 @@ msgstr[0] "Obrázok je použitý v mape ikon %1$s."
 msgstr[1] "Obrázok je použitý v mapách ikon %1$s."
 msgstr[2] "Obrázok je použitý v mapách ikon %1$s."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17537,7 +17285,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Tento mesiac"
 
@@ -17545,7 +17293,7 @@ msgstr "Tento mesiac"
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Tento týždeň"
 
@@ -17553,7 +17301,7 @@ msgstr "Tento týždeň"
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Tento rok"
 
@@ -17573,7 +17321,7 @@ msgstr ""
 msgid "Thu"
 msgstr "Št"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Štvrtok"
 
@@ -17590,7 +17338,7 @@ msgstr "Do"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17623,7 +17371,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Časová perióda"
 
@@ -17675,12 +17423,11 @@ msgstr "Časová značka"
 msgid "To"
 msgstr "Do"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "Na nastavenie rozhrania hosta označte jeden typ položky pre všetky položky"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Dnes"
 
@@ -17795,7 +17542,7 @@ msgstr "Perióda uloženia trendov"
 msgid "Trends"
 msgstr "Trendy"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17803,7 +17550,7 @@ msgstr "Trendy"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Spúšťač"
 
@@ -17907,7 +17654,7 @@ msgstr "Meno spúšťača"
 msgid "Trigger overview"
 msgstr "Prehľad spúšťačov"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17982,11 +17729,11 @@ msgstr "Prototypy spúšťačov aktualizované"
 msgid "Trigger severity"
 msgstr "Závažnosť spúšťača"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "\"OK\" status spúšťača"
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "\"Problém\" status spúšťača"
 
@@ -18003,7 +17750,7 @@ msgstr "Spúšťač aktualizovaný"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -18038,7 +17785,7 @@ msgstr ""
 msgid "Tue"
 msgstr "Ut"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Utorok"
 
@@ -18051,7 +17798,7 @@ msgstr "Turecky (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Dve položky (\"%1$s\" and \"%2$s\") nie je možné naplniť jedným inventárnym polom \"%3$s\", viedlo by to ku sporu."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -18067,19 +17814,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18131,7 +17878,7 @@ msgstr "Typ informácií"
 msgid "Types"
 msgstr "Typy"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18152,7 +17899,7 @@ msgstr "NEZNÁMY"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18198,12 +17945,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "URL musí mať \"meno\" a \"url\" v mape \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URLky"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18288,12 +18035,12 @@ msgstr "Odblokovať"
 msgid "Unblock selected users?"
 msgstr "Odblokovať označených používateľov?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18313,21 +18060,23 @@ msgstr "Jednotky"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Neznámy"
@@ -18345,7 +18094,7 @@ msgid "Unknown error"
 msgstr "Neznáma chyba"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Neznáme položky hosta, nenájdené položky na označenom hostovi"
@@ -18398,7 +18147,7 @@ msgstr "Odpojiť od šablóny"
 msgid "Unlink from templates"
 msgstr "Odpojiť od šablón"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Povoliť zvuky"
 
@@ -18430,7 +18179,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "Nepodporovaný parameter \"%2$s\" pre filtrovaciu podmienku akcie \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "Nepodporovaný parameter \"%2$s\" pre filtrovaciu podmienku zisťovacieho pravidla \"%1$s\"."
@@ -18440,7 +18189,7 @@ msgstr "Nepodporovaný parameter \"%2$s\" pre filtrovaciu podmienku zisťovacieh
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "Nepodporovaný parameter \"%2$s\" pre filter akcie \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "Nepodporovaný parameter \"%2$s\" pre filter akcie \"%1$s\"."
@@ -18485,7 +18234,7 @@ msgstr "Dostupný"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18498,7 +18247,7 @@ msgstr "Dostupný"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18551,7 +18300,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18569,7 +18318,7 @@ msgstr "Nahrať"
 msgid "Upper level maps"
 msgstr "Mapa najvyššej úrovne"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18604,7 +18353,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "Používané v akciách"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18619,7 +18368,7 @@ msgstr "Používané v akciách"
 msgid "User"
 msgstr "Používateľ"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
@@ -18671,7 +18420,7 @@ msgstr "Používateľ pridaný"
 msgid "User agent string"
 msgstr "User agent reťazec"
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Používateľ nemôže sám seba pridať do vypnutej skupiny alebo do skupiny s vypnutým GUI prístupom."
@@ -18692,7 +18441,7 @@ msgstr[0] "Používateľ zmazaný"
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18702,27 +18451,27 @@ msgstr[2] ""
 msgid "User group"
 msgstr "Používateľská skupina"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Používateľská skupina \"%1$s\" už existuje."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Skupina \"%1$s\" je použitá v nastavení skupiny pre správu o nefunčnej databáze."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Používateľská skupina \"%1$s\" je použitá v skripte \"%2$s\"."
@@ -18758,8 +18507,8 @@ msgstr[2] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18803,14 +18552,14 @@ msgstr "Heslo používateľa"
 msgid "User profile"
 msgstr "Profil používateľa"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18881,7 +18630,7 @@ msgstr "Používateľ aktualizovaný"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -19197,14 +18946,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19214,7 +18963,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19256,7 +19005,7 @@ msgstr "Hodnota \"%1$s\" je neplatná pre parameter \"grid_show\". Možnosti: \"
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "Hodnota \"%1$s\" je neplatná pre parameter \"grid_show\". Možnosti: \"%2$s\"."
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "Hodnota \"%1$s\" je príliš dlhá pre pole \"%2$s\" - %3$d znakov. Povolená dĺžka je do %4$d znakov."
@@ -19273,7 +19022,7 @@ msgstr "Štatistiky cache hodnôt. Platné módy sú: total, free, pfree, used a
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Mapa hodnôt"
 
@@ -19316,11 +19065,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "Hodnota Windows čítača výkonu. Vráti celé, desatinné číslo, reťazec alebo text (závisí na dotaze)"
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19367,7 +19117,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19454,7 +19204,7 @@ msgstr "Zobrazované meno nemôže byť prázdne ak meno hostu chýba."
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "St"
@@ -19471,7 +19221,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Varovanie"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19480,7 +19230,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Je nám ľúto, maximálný počet elementov na zapamätanie bol už dosiahnutý."
 
@@ -19496,7 +19246,7 @@ msgstr "Je nám ľúto, maximálný počet elementov na zapamätanie bol už dos
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web"
 
@@ -19508,7 +19258,7 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Monitorovanie webov"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr "Web scenár"
 
@@ -19523,29 +19273,29 @@ msgstr "Web scenár \"%1$s\" už existuje na hoste \"%2$s\"."
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Web scenár \"%1$s\" už existuje."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "Web scenár pridaný"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Web scenár zmazaný"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Web scenár zakázaný"
 msgstr[1] "Web scenár zakázaný"
 msgstr[2] "Web scenár zakázaný"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Scenár povolený"
 msgstr[1] "Scenáre povolené"
 msgstr[2] "Scenáre povolené"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "Web scenár aktualizovaný"
 
@@ -19567,7 +19317,7 @@ msgstr ""
 msgid "Wed"
 msgstr "St"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Streda"
 
@@ -19578,7 +19328,7 @@ msgstr "Streda"
 msgid "Weekly"
 msgstr "Týždenne"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19594,12 +19344,12 @@ msgstr "Vitajte"
 msgid "When active"
 msgstr "Iba v dňoch/časoch"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19794,6 +19544,10 @@ msgstr "d.m.Y H:i"
 msgid "Y-m-d H:i:s"
 msgstr "d.m.Y H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr ""
@@ -19855,7 +19609,7 @@ msgstr "Ročne"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19912,18 +19666,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19935,9 +19683,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Nemáte oprávnenie na vykonanie tejto operácie."
 
@@ -20053,24 +19798,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr ""
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "reťazec znakov je očakávaný"
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -20079,37 +19828,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr ""
@@ -20130,28 +19879,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr ""
@@ -20199,7 +19949,7 @@ msgstr "všetky"
 msgid "all media"
 msgstr "všetky médiá"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20207,42 +19957,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "pole je očakávané"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20252,7 +19997,7 @@ msgid "an empty string is expected"
 msgstr "prázdny reťazec je očakávaný"
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr ""
 
@@ -20260,11 +20005,15 @@ msgstr ""
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20425,14 +20174,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20462,19 +20205,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20494,14 +20229,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20509,7 +20244,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "nemôže byť prázdny"
@@ -20522,7 +20257,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20556,7 +20291,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20574,7 +20309,8 @@ msgid "configure"
 msgstr "nastaviť"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20603,7 +20339,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20665,7 +20401,7 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20687,13 +20423,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20719,7 +20455,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20756,6 +20493,10 @@ msgstr "výraz je prázdny"
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20802,7 +20543,7 @@ msgstr "globálne nastavenia údržby"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20843,6 +20584,11 @@ msgstr "ikonka"
 msgid "image"
 msgstr "obrázok"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "v"
@@ -20883,15 +20629,19 @@ msgstr ""
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "nesprávna syntax pri \"%1$s\""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20919,7 +20669,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr ""
 
@@ -20948,27 +20698,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr ""
 
@@ -20996,7 +20746,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr ""
 
@@ -21082,12 +20832,12 @@ msgstr "nízko úrovňové zisťovacie pravidlo"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -21146,7 +20896,7 @@ msgstr "zhody"
 msgid "max"
 msgstr "max"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21186,7 +20936,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr ""
@@ -21213,8 +20963,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21229,27 +20979,14 @@ msgstr "musí byť platný LDAP používateľ"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "musí byť medzi \"%1$s\" a \"%2$s\""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21277,6 +21014,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21287,7 +21032,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "nový"
 
@@ -21422,7 +21167,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21457,24 +21202,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21502,11 +21251,11 @@ msgstr ""
 msgid "regular expression"
 msgstr "regulárny výraz"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21518,15 +21267,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21574,7 +21323,7 @@ msgstr ""
 msgid "short description"
 msgstr "krátky popis"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21593,15 +21342,15 @@ msgstr "krátky popis"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr ""
 
@@ -21617,31 +21366,31 @@ msgstr "zobraziť mapovanie ikon"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21649,11 +21398,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21669,8 +21418,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21681,7 +21430,7 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21690,13 +21439,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "šablóna ID \"%1$s\" je použitá %2$s krát"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21705,20 +21458,20 @@ msgstr "šablóna ID \"%1$s\" je použitá %2$s krát"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr ""
@@ -21750,39 +21503,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21796,7 +21549,7 @@ msgstr "spúšťač"
 msgid "trigger does not allow manual closing"
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21808,26 +21561,26 @@ msgstr ""
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "Vyhľadávanie"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21835,11 +21588,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21856,10 +21609,10 @@ msgstr "neočakávaný koniec kľúča"
 msgid "unexpected end of macro"
 msgstr "neočakávaný koniec makra"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21869,11 +21622,12 @@ msgstr "neočakávaný koniec makra"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr ""
@@ -21899,8 +21653,8 @@ msgstr "neočakávaný text \"%1$s\""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21925,6 +21679,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr "nepodporované číslo verzie"
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21940,7 +21698,7 @@ msgstr "nepodporované číslo verzie"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21960,11 +21718,11 @@ msgstr "nepodporované číslo verzie"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "hodnota"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21982,76 +21740,87 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr ""
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr ""
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -22063,18 +21832,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -22083,7 +21850,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -22096,11 +21863,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -22117,7 +21884,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "r"
diff --git a/ui/locale/sv/LC_MESSAGES/frontend.po b/ui/locale/sv/LC_MESSAGES/frontend.po
index 6814baaea8b..04b302a9748 100644
--- a/ui/locale/sv/LC_MESSAGES/frontend.po
+++ b/ui/locale/sv/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2021-03-19 18:15+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -226,14 +226,14 @@ msgstr[1] ""
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -389,7 +389,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -450,10 +450,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr ""
@@ -496,7 +492,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Bekräfta"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Bekräfta"
 
@@ -504,7 +500,7 @@ msgstr "Bekräfta"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Bekräftade"
@@ -517,7 +513,7 @@ msgstr ""
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -544,9 +540,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -603,7 +599,7 @@ msgstr ""
 msgid "Action \"%1$s\" no operations defined."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -612,7 +608,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Åtgärd lades till"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -661,8 +657,8 @@ msgstr "Åtgärd uppdaterad"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Åtgärder"
@@ -729,7 +725,7 @@ msgstr ""
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -740,7 +736,7 @@ msgstr ""
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -763,9 +759,9 @@ msgstr ""
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -835,7 +831,7 @@ msgstr ""
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Lägg till"
 
@@ -843,11 +839,11 @@ msgstr "Lägg till"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr ""
 
@@ -855,7 +851,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -872,7 +868,7 @@ msgstr ""
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr ""
 
@@ -894,7 +890,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -946,12 +942,12 @@ msgstr ""
 msgid "Add widget"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -961,7 +957,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -974,7 +970,7 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -996,7 +992,7 @@ msgstr ""
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1068,7 +1064,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr ""
 
@@ -1086,7 +1082,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr ""
 
@@ -1104,7 +1100,7 @@ msgstr ""
 msgid "All problems if tag values match"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1217,15 +1213,15 @@ msgstr ""
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr ""
 
@@ -1243,7 +1239,7 @@ msgstr ""
 msgid "Apr"
 msgstr ""
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr ""
 
@@ -1271,7 +1267,7 @@ msgstr ""
 msgid "Arithmetic"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1318,7 +1314,7 @@ msgstr ""
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1327,7 +1323,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1339,6 +1335,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1350,7 +1351,7 @@ msgstr ""
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1406,7 +1407,7 @@ msgstr ""
 msgid "Aug"
 msgstr ""
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr ""
 
@@ -1419,7 +1420,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1496,7 +1497,7 @@ msgstr ""
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1511,7 +1512,7 @@ msgstr ""
 msgid "Automatic icon selection"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1563,7 +1564,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1626,7 +1627,7 @@ msgstr ""
 msgid "Blocked"
 msgstr ""
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr ""
 
@@ -1680,11 +1681,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Nederkant"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr ""
 
@@ -1710,7 +1711,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1755,8 +1756,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1765,7 +1766,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Beräknade"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1790,7 +1791,7 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1803,8 +1804,8 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1834,7 +1835,7 @@ msgstr "Kan inte lägga till åtgärd"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1844,7 +1845,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1875,8 +1876,8 @@ msgid "Cannot add host prototype"
 msgstr ""
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Kan inte lägga till bild"
 
@@ -1968,15 +1969,15 @@ msgstr "Kan inte lägga till användare"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr ""
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1996,33 +1997,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Kan inte rensa historik"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr ""
 
@@ -2049,7 +2046,7 @@ msgid_plural "Cannot copy graphs"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] ""
@@ -2101,8 +2098,8 @@ msgstr ""
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2131,7 +2128,7 @@ msgstr ""
 msgid "Cannot delete action"
 msgstr "Kan inte ta bort åtgärd"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2198,7 +2195,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2209,11 +2206,11 @@ msgstr[1] ""
 msgid "Cannot delete host prototypes"
 msgstr ""
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr ""
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Kan inte ta bort bild"
 
@@ -2238,7 +2235,7 @@ msgstr ""
 msgid "Cannot delete item prototypes"
 msgstr ""
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Kan inte ta bort objekt"
 
@@ -2269,7 +2266,7 @@ msgid_plural "Cannot delete proxies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2292,7 +2289,7 @@ msgid_plural "Cannot delete scripts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr ""
@@ -2308,8 +2305,8 @@ msgid_plural "Cannot delete services"
 msgstr[0] "Kan inte ta bort tjänst"
 msgstr[1] "Kan inte ta bort tjänst"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2338,7 +2335,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr ""
 
@@ -2391,7 +2388,7 @@ msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr ""
 
@@ -2426,7 +2423,7 @@ msgid_plural "Cannot disable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] ""
@@ -2457,7 +2454,7 @@ msgid_plural "Cannot disable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] ""
@@ -2504,7 +2501,7 @@ msgid_plural "Cannot enable hosts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] ""
@@ -2535,7 +2532,7 @@ msgid_plural "Cannot enable triggers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] ""
@@ -2549,7 +2546,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2583,8 +2580,8 @@ msgstr ""
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2682,24 +2679,20 @@ msgstr ""
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2712,7 +2705,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr ""
 
@@ -2726,7 +2719,7 @@ msgid "Cannot link template."
 msgstr ""
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2758,17 +2751,17 @@ msgstr ""
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr ""
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr ""
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr ""
@@ -2795,7 +2788,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr ""
 
@@ -2814,7 +2807,7 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2854,12 +2847,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2878,7 +2871,7 @@ msgid_plural "Cannot unblock users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
@@ -2891,7 +2884,7 @@ msgstr ""
 msgid "Cannot unlink template."
 msgstr ""
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2944,11 +2937,6 @@ msgstr ""
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr ""
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2958,8 +2946,9 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
@@ -3019,9 +3008,7 @@ msgstr ""
 msgid "Cannot update group"
 msgstr "Kan inte uppdatera grupp"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
@@ -3044,13 +3031,13 @@ msgstr[1] ""
 msgid "Cannot update hosts"
 msgstr ""
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr ""
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Kan inte uppdatera bild"
 
@@ -3104,12 +3091,12 @@ msgstr ""
 msgid "Cannot update proxy"
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3129,17 +3116,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr ""
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3214,7 +3201,7 @@ msgstr[1] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr ""
 
@@ -3314,8 +3301,8 @@ msgid "Character string not included"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3430,7 +3417,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr ""
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3451,7 +3438,7 @@ msgstr ""
 msgid "Circular template linkage is not allowed."
 msgstr ""
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3472,11 +3459,11 @@ msgstr ""
 msgid "Clear when unlinking"
 msgstr ""
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3491,7 +3478,7 @@ msgstr "Klocka"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3506,7 +3493,7 @@ msgstr "Klocka"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr ""
 
@@ -3517,8 +3504,8 @@ msgstr ""
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr ""
 
@@ -3529,13 +3516,13 @@ msgstr ""
 msgid "Close expression constructor"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
 
@@ -3548,8 +3535,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr ""
 
@@ -3566,7 +3553,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3632,7 +3619,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3643,17 +3630,12 @@ msgstr "Villkor"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3663,17 +3645,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3689,7 +3666,7 @@ msgstr "Villkor"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -3752,7 +3729,7 @@ msgstr ""
 msgid "Configuration of housekeeping"
 msgstr ""
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr ""
@@ -3859,7 +3836,7 @@ msgstr ""
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr ""
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3952,7 +3929,7 @@ msgstr "Kontakt"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4012,7 +3989,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -4051,8 +4028,8 @@ msgstr ""
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr ""
 
@@ -4061,12 +4038,11 @@ msgstr ""
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr ""
@@ -4093,16 +4069,6 @@ msgid_plural "Correlations enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr ""
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr ""
@@ -4111,14 +4077,10 @@ msgstr ""
 msgid "Correlation updated"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr ""
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Antal"
 
@@ -4182,11 +4144,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr ""
 
@@ -4303,7 +4265,7 @@ msgstr ""
 msgid "Create media type"
 msgstr ""
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr ""
 
@@ -4327,7 +4289,7 @@ msgstr ""
 msgid "Create template"
 msgstr ""
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr ""
 
@@ -4490,7 +4452,7 @@ msgstr ""
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr ""
@@ -4502,11 +4464,11 @@ msgstr ""
 msgid "Daily"
 msgstr "Dagligen"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4527,8 +4489,8 @@ msgstr ""
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr ""
 
@@ -4551,9 +4513,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr ""
 
@@ -4577,7 +4539,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4605,7 +4567,7 @@ msgstr "Översikt över data"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4747,7 +4709,7 @@ msgstr ""
 msgid "Days"
 msgstr ""
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr ""
 
@@ -4761,26 +4723,26 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Standard"
 
@@ -4873,7 +4835,7 @@ msgstr ""
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4897,8 +4859,8 @@ msgstr ""
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -4923,11 +4885,11 @@ msgstr ""
 msgid "Delete current action?"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4971,7 +4933,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr ""
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr ""
 
@@ -5027,7 +4989,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr ""
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr ""
 
@@ -5132,7 +5094,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5176,7 +5138,7 @@ msgstr ""
 msgid "Delete web scenario?"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5221,7 +5183,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr ""
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr ""
 
@@ -5229,7 +5191,7 @@ msgstr ""
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5239,7 +5201,7 @@ msgstr "Beroende av"
 msgid "Deployment status"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5272,7 +5234,7 @@ msgid "Description"
 msgstr "Beskrivning"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5438,10 +5400,10 @@ msgstr ""
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5524,7 +5486,7 @@ msgid "Discovery by proxy"
 msgstr ""
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr ""
 
@@ -5536,7 +5498,7 @@ msgstr ""
 msgid "Discovery list"
 msgstr ""
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr ""
 
@@ -5568,7 +5530,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5576,12 +5538,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
@@ -5594,7 +5556,7 @@ msgstr ""
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5635,7 +5597,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5646,7 +5608,7 @@ msgstr ""
 msgid "Discovery rules deleted"
 msgstr ""
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr ""
@@ -5683,10 +5645,11 @@ msgid "Display stacked graph"
 msgstr ""
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr ""
@@ -5696,7 +5659,7 @@ msgstr ""
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5718,7 +5681,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr ""
 
@@ -5774,7 +5737,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr ""
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5782,7 +5745,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr ""
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5801,18 +5764,6 @@ msgstr ""
 msgid "Draw style"
 msgstr "Ritstil"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5825,11 +5776,6 @@ msgstr ""
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5881,7 +5827,7 @@ msgstr ""
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr ""
 
@@ -5890,11 +5836,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5908,8 +5854,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Redigera"
 
@@ -5925,11 +5871,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr ""
 
@@ -5989,21 +5935,17 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
@@ -6019,25 +5961,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6047,14 +5983,6 @@ msgstr ""
 msgid "Empty map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr ""
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6220,7 +6148,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6231,7 +6159,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6274,7 +6202,7 @@ msgid "English (en_US)"
 msgstr ""
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6290,7 +6218,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6309,12 +6237,12 @@ msgstr ""
 msgid "Error"
 msgstr "Fel"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6341,7 +6269,7 @@ msgstr ""
 msgid "Event acknowledged"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6349,7 +6277,7 @@ msgid "Event correlation"
 msgstr ""
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr ""
@@ -6384,11 +6312,11 @@ msgstr ""
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6433,15 +6361,10 @@ msgstr ""
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6479,7 +6402,7 @@ msgstr ""
 msgid "Executed script"
 msgstr ""
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr ""
 
@@ -6495,8 +6418,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr ""
 
@@ -6617,7 +6540,7 @@ msgstr ""
 msgid "External check"
 msgstr ""
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr ""
@@ -6644,8 +6567,8 @@ msgstr ""
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6656,26 +6579,26 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6683,7 +6606,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6707,7 +6630,7 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr ""
 
@@ -6729,10 +6652,9 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6743,13 +6665,6 @@ msgstr ""
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6768,11 +6683,6 @@ msgstr ""
 msgid "Field \"%1$s\" is not string."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6787,10 +6697,6 @@ msgstr ""
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr ""
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6855,7 +6761,8 @@ msgstr ""
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6880,7 +6787,7 @@ msgstr "Filter"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6932,7 +6839,7 @@ msgstr ""
 msgid "Fixed"
 msgstr "Fast"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6983,12 +6890,12 @@ msgstr ""
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7001,7 +6908,7 @@ msgstr "Franska (fr_FR)"
 msgid "Fri"
 msgstr ""
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr ""
 
@@ -7112,7 +7019,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr ""
@@ -7126,7 +7033,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr ""
 
@@ -7164,7 +7071,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr ""
 
@@ -7172,7 +7079,7 @@ msgstr ""
 msgid "Gradient line"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7232,7 +7139,7 @@ msgstr[1] ""
 msgid "Graph deleted"
 msgstr "Diagram togs bort"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7269,8 +7176,8 @@ msgstr ""
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7304,8 +7211,8 @@ msgstr ""
 msgid "Graph updated"
 msgstr "Diagram uppdaterades"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7336,7 +7243,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Diagram"
 
@@ -7357,12 +7264,12 @@ msgstr ""
 msgid "Group"
 msgstr "Grupp"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr ""
@@ -7537,11 +7444,11 @@ msgstr "Hjälp"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr ""
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr ""
 
@@ -7568,11 +7475,11 @@ msgstr ""
 msgid "High"
 msgstr "Hög"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7593,7 +7500,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Historik"
 
@@ -7601,11 +7508,15 @@ msgstr "Historik"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Historik rensad"
 
@@ -7648,7 +7559,7 @@ msgstr "Horisontell"
 msgid "Horizontal align"
 msgstr "Horisontell justering"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7677,7 +7588,7 @@ msgstr "Horisontell justering"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7691,7 +7602,7 @@ msgstr[1] "Värd"
 msgid "Host \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7699,7 +7610,7 @@ msgstr ""
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7751,7 +7662,7 @@ msgid_plural "Hosts enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7765,22 +7676,22 @@ msgstr[1] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Värdgrupp"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7793,10 +7704,10 @@ msgstr ""
 msgid "Host group label type"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7812,8 +7723,8 @@ msgstr ""
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7887,7 +7798,7 @@ msgstr ""
 msgid "Host networks"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7967,7 +7878,7 @@ msgstr ""
 msgid "Host updated"
 msgstr "Värd uppdaterades"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr ""
@@ -7987,7 +7898,7 @@ msgstr ""
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8000,7 +7911,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8048,7 +7959,7 @@ msgstr ""
 msgid "Hours"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8088,7 +7999,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IP-adress"
@@ -8113,7 +8024,7 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8170,12 +8081,12 @@ msgstr ""
 msgid "Icon map"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr ""
@@ -8188,18 +8099,18 @@ msgstr ""
 msgid "Icon map deleted"
 msgstr ""
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
@@ -8300,23 +8211,20 @@ msgstr ""
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Bild"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -8325,7 +8233,7 @@ msgstr ""
 msgid "Image added"
 msgstr "Bild lades till"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Bild togs bort"
 
@@ -8333,18 +8241,12 @@ msgstr "Bild togs bort"
 msgid "Image label type"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Bild uppdaterades"
 
@@ -8439,7 +8341,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8450,13 +8352,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr ""
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8500,7 +8402,7 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8668,24 +8570,6 @@ msgstr ""
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8740,8 +8624,6 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr ""
 
@@ -8767,31 +8649,22 @@ msgstr ""
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8820,7 +8693,7 @@ msgstr ""
 msgid "Incorrect eventsource value."
 msgstr ""
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr ""
@@ -8845,22 +8718,17 @@ msgstr ""
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8871,7 +8739,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
@@ -8899,8 +8767,6 @@ msgstr ""
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8962,10 +8828,6 @@ msgstr ""
 msgid "Incorrect map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr ""
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9023,13 +8885,13 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr ""
 
@@ -9082,12 +8944,7 @@ msgstr ""
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
@@ -9133,13 +8990,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9156,60 +9013,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr ""
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr ""
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9264,14 +9091,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9381,25 +9202,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9410,7 +9213,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9456,16 +9259,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9474,7 +9278,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9562,12 +9366,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr ""
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr ""
 
@@ -9671,7 +9475,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr ""
 
@@ -9679,7 +9483,7 @@ msgstr ""
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9690,7 +9494,7 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9713,7 +9517,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9745,7 +9549,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
@@ -9770,27 +9574,29 @@ msgstr ""
 msgid "Invalid method parameters."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9816,17 +9622,17 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9834,8 +9640,8 @@ msgstr ""
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9849,106 +9655,116 @@ msgstr ""
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9990,43 +9806,38 @@ msgstr ""
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10047,7 +9858,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Inventarier"
 
@@ -10088,7 +9899,7 @@ msgstr ""
 msgid "Italian (it_IT)"
 msgstr "Italienska (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10120,7 +9931,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10134,7 +9945,7 @@ msgstr "Objekt lades till"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] ""
@@ -10148,13 +9959,13 @@ msgstr ""
 msgid "Item deleted"
 msgstr "Objekt togs bort"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -10164,7 +9975,7 @@ msgstr[1] ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr ""
 
@@ -10173,7 +9984,7 @@ msgstr ""
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10210,8 +10021,8 @@ msgid_plural "Item prototypes updated"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10237,7 +10048,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10269,8 +10080,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10321,11 +10132,11 @@ msgstr ""
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Objekt"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Objekt borttagna"
 
@@ -10343,7 +10154,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10368,6 +10179,10 @@ msgstr ""
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10380,7 +10195,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10398,7 +10213,7 @@ msgstr ""
 msgid "Jan"
 msgstr ""
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr ""
 
@@ -10420,7 +10235,7 @@ msgstr ""
 msgid "Jul"
 msgstr ""
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr ""
 
@@ -10428,7 +10243,7 @@ msgstr ""
 msgid "Jun"
 msgstr ""
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr ""
 
@@ -10584,22 +10399,6 @@ msgid_plural "Last %1$d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10611,11 +10410,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Senaste kontroll"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Diagram för senaste timmen"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr ""
 
@@ -10653,11 +10452,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Senaste värde"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr ""
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10666,11 +10465,11 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Senaste data"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr ""
 
@@ -10711,7 +10510,7 @@ msgstr ""
 msgid "Left trim"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -10992,7 +10791,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr ""
@@ -11014,7 +10813,7 @@ msgstr ""
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11025,12 +10824,12 @@ msgid "Macro"
 msgstr ""
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr ""
@@ -11058,7 +10857,7 @@ msgstr ""
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -11066,7 +10865,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11149,7 +10948,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11171,13 +10970,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Karta"
 
@@ -11246,7 +11045,7 @@ msgstr ""
 msgid "Map update failed."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11278,7 +11077,7 @@ msgstr "Kartor"
 msgid "Mar"
 msgstr ""
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr ""
 
@@ -11382,7 +11181,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11396,7 +11195,7 @@ msgstr[1] ""
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr ""
 
@@ -11411,15 +11210,12 @@ msgstr ""
 msgid "Media"
 msgstr "Media"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Mediatyp"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr ""
@@ -11446,11 +11242,6 @@ msgid_plural "Media types enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr ""
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11480,7 +11271,7 @@ msgstr ""
 msgid "Media types"
 msgstr "Mediatyper"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11568,7 +11359,7 @@ msgstr ""
 msgid "Method not found."
 msgstr ""
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11630,7 +11421,7 @@ msgid "Minimum severity"
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11689,7 +11480,7 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11727,7 +11518,7 @@ msgstr[1] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11753,7 +11544,7 @@ msgstr ""
 msgid "Mon"
 msgstr ""
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr ""
 
@@ -11793,11 +11584,11 @@ msgstr "Månad"
 msgid "Monthly"
 msgstr "Månatligen"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11821,7 +11612,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr ""
 
@@ -11834,7 +11625,7 @@ msgstr ""
 msgid "Multiple PROBLEM events"
 msgstr ""
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr ""
 
@@ -11963,11 +11754,11 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12125,19 +11916,21 @@ msgstr ""
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr ""
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr ""
 
@@ -12149,7 +11942,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12157,7 +11950,7 @@ msgstr ""
 msgid "New service time"
 msgstr ""
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12166,7 +11959,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12184,7 +11977,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12213,30 +12006,6 @@ msgstr ""
 msgid "No"
 msgstr "Nej"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr ""
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12252,11 +12021,6 @@ msgstr ""
 msgid "No \"%1$s\" given for map."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12264,7 +12028,7 @@ msgstr ""
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -12274,7 +12038,7 @@ msgstr ""
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -12291,11 +12055,6 @@ msgstr ""
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr ""
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12326,7 +12085,7 @@ msgstr ""
 msgid "No details"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr ""
 
@@ -12362,7 +12121,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr ""
 
@@ -12392,7 +12151,7 @@ msgstr ""
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr ""
 
@@ -12426,7 +12185,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr ""
 
@@ -12434,17 +12193,46 @@ msgstr ""
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr ""
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12452,7 +12240,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12480,19 +12268,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12507,16 +12294,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12536,12 +12329,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12562,27 +12353,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12599,14 +12392,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12615,7 +12408,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr ""
 
@@ -12635,7 +12428,7 @@ msgstr ""
 msgid "No recipients for action operation message."
 msgstr ""
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr ""
 
@@ -12647,7 +12440,7 @@ msgstr ""
 msgid "No target selected"
 msgstr ""
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr ""
 
@@ -12664,7 +12457,7 @@ msgstr ""
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr ""
 
@@ -12734,15 +12527,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12774,7 +12567,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "Stöds inte"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr ""
@@ -12805,7 +12598,7 @@ msgstr ""
 msgid "Nov"
 msgstr ""
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr ""
 
@@ -12992,8 +12785,8 @@ msgstr ""
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13053,13 +12846,13 @@ msgstr ""
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "AV"
 
@@ -13067,30 +12860,31 @@ msgstr "AV"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr ""
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "P"
 
@@ -13106,35 +12900,15 @@ msgstr ""
 msgid "One"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr ""
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr ""
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr ""
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13183,10 +12957,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr ""
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13195,15 +12965,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr ""
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr ""
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr ""
 
@@ -13212,7 +12978,7 @@ msgstr ""
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13221,11 +12987,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr ""
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr ""
 
@@ -13247,7 +13013,7 @@ msgstr ""
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13256,33 +13022,33 @@ msgstr ""
 msgid "Operations"
 msgstr ""
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr ""
 
@@ -13391,7 +13157,7 @@ msgstr ""
 msgid "Other parameters"
 msgstr "Övriga parametrar"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr ""
@@ -13405,7 +13171,7 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13434,7 +13200,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13623,7 +13389,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13668,7 +13434,7 @@ msgstr ""
 msgid "PSK identity"
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13691,16 +13457,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parameter"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr ""
@@ -13730,7 +13496,7 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13747,7 +13513,7 @@ msgstr ""
 msgid "Parent web scenarios"
 msgstr ""
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13759,11 +13525,6 @@ msgstr ""
 msgid "Parse"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr ""
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr ""
@@ -13824,7 +13585,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr ""
 
@@ -13834,15 +13595,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13888,12 +13649,11 @@ msgstr ""
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Period"
 
@@ -13982,7 +13742,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr ""
 
@@ -14022,7 +13782,7 @@ msgstr ""
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14111,7 +13871,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14242,7 +14002,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr ""
 
@@ -14255,21 +14015,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14283,9 +14039,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Problem"
 
@@ -14319,7 +14075,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr ""
 
@@ -14340,13 +14096,13 @@ msgstr ""
 msgid "Proxies"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14354,7 +14110,7 @@ msgstr ""
 msgid "Proxy"
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14364,12 +14120,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr ""
@@ -14462,7 +14218,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14539,10 +14295,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr ""
@@ -14624,7 +14376,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14642,13 +14394,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr ""
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14681,7 +14433,7 @@ msgstr ""
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14713,8 +14465,6 @@ msgstr "Fjärrkommando"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14735,7 +14485,9 @@ msgstr "Fjärrkommando"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14748,7 +14500,7 @@ msgstr "Fjärrkommando"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14825,8 +14577,8 @@ msgstr "Fjärrkommando"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr ""
 
@@ -14866,7 +14618,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14908,7 +14660,7 @@ msgid "Replace dependencies"
 msgstr ""
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14963,7 +14715,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -15005,8 +14757,8 @@ msgstr ""
 msgid "Required string"
 msgstr ""
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr ""
 
@@ -15039,7 +14791,7 @@ msgstr ""
 msgid "Reset defaults"
 msgstr ""
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr ""
 
@@ -15105,7 +14857,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr ""
@@ -15292,12 +15044,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "Ryska (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr ""
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr ""
@@ -15308,8 +15060,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15346,7 +15098,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15442,12 +15194,12 @@ msgstr ""
 msgid "SQL query"
 msgstr ""
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr ""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr ""
@@ -15510,7 +15262,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr ""
 
@@ -15522,7 +15274,7 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr ""
 
@@ -15564,7 +15316,7 @@ msgstr ""
 msgid "Scheduled check"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15631,7 +15383,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15644,8 +15396,7 @@ msgstr ""
 msgid "Script"
 msgstr "Skript"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
@@ -15677,12 +15428,6 @@ msgstr "Skriptnamn"
 msgid "Script parameters"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr ""
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr ""
@@ -15695,7 +15440,7 @@ msgstr ""
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr ""
 
@@ -15765,8 +15510,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15774,7 +15519,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Välj"
 
@@ -15810,19 +15555,19 @@ msgstr ""
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr ""
 
@@ -15847,7 +15592,7 @@ msgstr ""
 msgid "Send to"
 msgstr "Skicka till"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr ""
 
@@ -15880,7 +15625,7 @@ msgstr ""
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr ""
 
@@ -15911,28 +15656,28 @@ msgstr ""
 msgid "Server time"
 msgstr "Servertid"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Tjänst"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15942,7 +15687,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr ""
 
@@ -15975,16 +15720,16 @@ msgstr ""
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr ""
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -15992,11 +15737,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr ""
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr ""
 
@@ -16005,30 +15750,29 @@ msgstr ""
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Tjänst uppdaterad"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr ""
 
@@ -16036,7 +15780,7 @@ msgstr ""
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16066,7 +15810,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16095,7 +15839,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16104,7 +15848,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16160,7 +15904,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr ""
 
@@ -16302,7 +16046,7 @@ msgstr ""
 msgid "Show working time"
 msgstr "Visa arbetstid"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr ""
 
@@ -16411,7 +16155,7 @@ msgstr ""
 msgid "Slovak (sk_SK)"
 msgstr ""
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr ""
 
@@ -16457,7 +16201,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Sorteringsordning (0->999)"
 
@@ -16531,7 +16275,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16634,15 +16378,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Status"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr ""
@@ -16672,7 +16420,7 @@ msgstr "Endast status"
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16720,7 +16468,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16785,7 +16533,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr ""
 
@@ -16801,7 +16549,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr ""
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16814,7 +16562,7 @@ msgstr ""
 msgid "Sun"
 msgstr ""
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr ""
 
@@ -16906,12 +16654,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr ""
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr ""
@@ -16938,17 +16686,17 @@ msgstr "SANT"
 msgid "Table \"%1$s\" does not exist."
 msgstr ""
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr ""
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Tagg"
@@ -17004,7 +16752,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17064,7 +16812,7 @@ msgstr ""
 msgid "Telnet"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17085,7 +16833,7 @@ msgstr "Mall"
 msgid "Template \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17109,7 +16857,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17169,7 +16917,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17341,14 +17089,14 @@ msgstr ""
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17413,7 +17161,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr ""
 
@@ -17421,7 +17169,7 @@ msgstr ""
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr ""
 
@@ -17429,7 +17177,7 @@ msgstr ""
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr ""
 
@@ -17449,7 +17197,7 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr ""
 
@@ -17466,7 +17214,7 @@ msgstr "Till"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17499,7 +17247,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Tidsperiod"
 
@@ -17551,12 +17299,11 @@ msgstr "Tidsstämpel"
 msgid "To"
 msgstr ""
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr ""
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr ""
 
@@ -17671,7 +17418,7 @@ msgstr ""
 msgid "Trends"
 msgstr "Trender"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17679,7 +17426,7 @@ msgstr "Trender"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Utlösare"
 
@@ -17780,7 +17527,7 @@ msgstr ""
 msgid "Trigger overview"
 msgstr "Översikt över utlösare"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17853,11 +17600,11 @@ msgstr ""
 msgid "Trigger severity"
 msgstr "Allvarlighetsgrad för utlösare"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17874,7 +17621,7 @@ msgstr "Utlösare uppdaterades"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17909,7 +17656,7 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr ""
 
@@ -17922,7 +17669,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr ""
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17938,19 +17685,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18002,7 +17749,7 @@ msgstr "Typ av information"
 msgid "Types"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18023,7 +17770,7 @@ msgstr "OKÄNT"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18069,12 +17816,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18159,12 +17906,12 @@ msgstr ""
 msgid "Unblock selected users?"
 msgstr ""
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18184,21 +17931,23 @@ msgstr "Enheter"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Okänd"
@@ -18216,7 +17965,7 @@ msgid "Unknown error"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr ""
@@ -18269,7 +18018,7 @@ msgstr ""
 msgid "Unlink from templates"
 msgstr ""
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr ""
 
@@ -18300,7 +18049,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -18310,7 +18059,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -18355,7 +18104,7 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18368,7 +18117,7 @@ msgstr ""
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18421,7 +18170,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18439,7 +18188,7 @@ msgstr "Skicka upp"
 msgid "Upper level maps"
 msgstr ""
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18474,7 +18223,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18489,7 +18238,7 @@ msgstr ""
 msgid "User"
 msgstr "Användare"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
@@ -18541,7 +18290,7 @@ msgstr "Användare lades till"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr ""
@@ -18561,7 +18310,7 @@ msgid_plural "Users deleted"
 msgstr[0] "Användare togs bort"
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18571,27 +18320,27 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Användargrupp"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr ""
@@ -18625,8 +18374,8 @@ msgstr[1] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18670,14 +18419,14 @@ msgstr ""
 msgid "User profile"
 msgstr "Användarprofil"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18746,7 +18495,7 @@ msgstr "Användare uppdaterades"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -19062,14 +18811,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19079,7 +18828,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19121,7 +18870,7 @@ msgstr ""
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr ""
@@ -19138,7 +18887,7 @@ msgstr ""
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Värdeskarta"
 
@@ -19181,11 +18930,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr ""
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19232,7 +18982,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19319,7 +19069,7 @@ msgstr ""
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr ""
@@ -19336,7 +19086,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr ""
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19345,7 +19095,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr ""
 
@@ -19361,7 +19111,7 @@ msgstr ""
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr ""
 
@@ -19373,7 +19123,7 @@ msgstr ""
 msgid "Web monitoring"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr ""
 
@@ -19388,27 +19138,27 @@ msgstr ""
 msgid "Web scenario \"%1$s\" already exists."
 msgstr ""
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr ""
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr ""
 
@@ -19430,7 +19180,7 @@ msgstr ""
 msgid "Wed"
 msgstr ""
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr ""
 
@@ -19441,7 +19191,7 @@ msgstr ""
 msgid "Weekly"
 msgstr "Veckovis"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19457,12 +19207,12 @@ msgstr ""
 msgid "When active"
 msgstr "När aktiv"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19657,6 +19407,10 @@ msgstr ""
 msgid "Y-m-d H:i:s"
 msgstr ""
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr ""
@@ -19718,7 +19472,7 @@ msgstr "Årligen"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19775,18 +19529,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19798,9 +19546,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr ""
 
@@ -19916,24 +19661,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr ""
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19942,37 +19691,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr ""
@@ -19993,28 +19742,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr ""
@@ -20062,7 +19812,7 @@ msgstr "alla"
 msgid "all media"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20070,42 +19820,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20115,7 +19860,7 @@ msgid "an empty string is expected"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr ""
 
@@ -20123,11 +19868,15 @@ msgstr ""
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20288,14 +20037,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20325,19 +20068,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20357,14 +20092,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20372,7 +20107,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr ""
@@ -20385,7 +20120,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20419,7 +20154,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20437,7 +20172,8 @@ msgid "configure"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20466,7 +20202,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr ""
@@ -20528,7 +20264,7 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20550,13 +20286,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20582,7 +20318,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20619,6 +20356,10 @@ msgstr ""
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20665,7 +20406,7 @@ msgstr ""
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr ""
@@ -20706,6 +20447,11 @@ msgstr ""
 msgid "image"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr ""
@@ -20746,15 +20492,19 @@ msgstr ""
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20782,7 +20532,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr ""
 
@@ -20811,27 +20561,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr ""
 
@@ -20859,7 +20609,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr ""
 
@@ -20945,12 +20695,12 @@ msgstr ""
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr ""
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr ""
@@ -21009,7 +20759,7 @@ msgstr ""
 msgid "max"
 msgstr "max"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21049,7 +20799,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr ""
@@ -21076,8 +20826,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21092,27 +20842,14 @@ msgstr ""
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr ""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21140,6 +20877,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21150,7 +20895,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr ""
 
@@ -21285,7 +21030,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21320,24 +21065,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21365,11 +21114,11 @@ msgstr ""
 msgid "regular expression"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21381,15 +21130,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21437,7 +21186,7 @@ msgstr ""
 msgid "short description"
 msgstr ""
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21456,15 +21205,15 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr ""
 
@@ -21480,31 +21229,31 @@ msgstr ""
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21512,11 +21261,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21532,8 +21281,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21544,7 +21293,7 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21553,13 +21302,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21568,20 +21321,20 @@ msgstr ""
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr ""
@@ -21613,39 +21366,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21659,7 +21412,7 @@ msgstr ""
 msgid "trigger does not allow manual closing"
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21671,26 +21424,26 @@ msgstr ""
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21698,11 +21451,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21719,10 +21472,10 @@ msgstr ""
 msgid "unexpected end of macro"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21732,11 +21485,12 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr ""
@@ -21762,8 +21516,8 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21788,6 +21542,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21803,7 +21561,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21823,11 +21581,11 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21845,76 +21603,85 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr ""
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr ""
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21926,18 +21693,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21946,7 +21711,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21959,11 +21724,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21980,7 +21745,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr ""
diff --git a/ui/locale/tr/LC_MESSAGES/frontend.po b/ui/locale/tr/LC_MESSAGES/frontend.po
index f4a1e3220f2..4cc96311c66 100644
--- a/ui/locale/tr/LC_MESSAGES/frontend.po
+++ b/ui/locale/tr/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2021-03-19 18:15+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: Zabbix translation team\n"
@@ -94,7 +94,7 @@ msgid_plural "%1$d days"
 msgstr[0] "%1$d gün"
 msgstr[1] "%1$d gün"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -179,7 +179,7 @@ msgstr[1] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -193,7 +193,7 @@ msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -226,14 +226,14 @@ msgstr[1] "Kalan deneme sayısı %1$s"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s saniye"
 msgstr[1] "%1$s saniye"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -253,13 +253,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -391,7 +391,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -452,10 +452,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "Erişim reddedildi"
@@ -498,7 +494,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Onay"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Onay"
 
@@ -506,7 +502,7 @@ msgstr "Onay"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Onaylandı"
@@ -519,7 +515,7 @@ msgstr "Onaylanmış PROBLEM olayları"
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -546,9 +542,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -605,7 +601,7 @@ msgstr "\"%1$s\" eylemi halihazırda var."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Eylem \"%1$s\" hiçbir işlem tanımlanmadı."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -614,7 +610,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Eylem eklendi"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -663,8 +659,8 @@ msgstr "Eylem güncellendi"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Eylemler"
@@ -731,7 +727,7 @@ msgstr "Şu zamana kadar aktif"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -742,7 +738,7 @@ msgstr "Şu zamana kadar aktif"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -765,9 +761,9 @@ msgstr "Şu zamana kadar aktif"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -837,7 +833,7 @@ msgstr "Şu zamana kadar aktif"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Ekle"
 
@@ -845,11 +841,11 @@ msgstr "Ekle"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "Yeni bir parçacık ekle"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "Alt öğe ekle"
 
@@ -857,7 +853,7 @@ msgstr "Alt öğe ekle"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -874,7 +870,7 @@ msgstr "Ana makine ekle"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "Birden çok harita ekle"
 
@@ -896,7 +892,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -948,12 +944,12 @@ msgstr ""
 msgid "Add widget"
 msgstr "Parçacık ekle"
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -963,7 +959,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -976,7 +972,7 @@ msgstr "Yönetici"
 msgid "Administration"
 msgstr "Yönetim"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -998,7 +994,7 @@ msgstr "Şu yaştan küçük"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1070,7 +1066,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Tümü"
 
@@ -1088,7 +1084,7 @@ msgstr "Tüm gruplar"
 msgid "All hosts"
 msgstr "Tüm ana makineler"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Tüm bağlantılarda \"Name\" ve \"URL\" tanımlanmış olmalıdır"
 
@@ -1106,7 +1102,7 @@ msgstr "Tüm problemler"
 msgid "All problems if tag values match"
 msgstr "Etiket değerleri eşleşiyorsa tüm problemler"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1219,15 +1215,15 @@ msgstr "Uygulama hatası."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Uygula"
 
@@ -1245,7 +1241,7 @@ msgstr "Yaklaşma"
 msgid "Apr"
 msgstr "Nis"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Nisan"
 
@@ -1273,7 +1269,7 @@ msgstr "Alan tipi"
 msgid "Arithmetic"
 msgstr "Aritmetik"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1320,7 +1316,7 @@ msgstr "Zamanında (saat:dakika)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1329,7 +1325,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1341,6 +1337,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1352,7 +1353,7 @@ msgstr "En azından bir tane bakım periyodu yaratılmalı."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1408,7 +1409,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Ağu"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Ağustos"
 
@@ -1421,7 +1422,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1498,7 +1499,7 @@ msgstr "Otomatik çıkış"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1513,7 +1514,7 @@ msgstr "Otomatik simge haritası"
 msgid "Automatic icon selection"
 msgstr "Otomatik simge seçimi"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1565,7 +1566,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1628,7 +1629,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Bloklu"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "Mavi"
 
@@ -1682,11 +1683,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Alt"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "Öne getir"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "Öne getir"
 
@@ -1713,7 +1714,7 @@ msgstr "SERT"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1758,8 +1759,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1768,7 +1769,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Hesaplanmış"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1793,7 +1794,7 @@ msgstr "Geri çağırma"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1806,8 +1807,8 @@ msgstr "Geri çağırma"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "İptal"
 
@@ -1837,7 +1838,7 @@ msgstr "Eylem eklenemiyor"
 msgid "Cannot add correlation"
 msgstr "Korelasyon eklenemez"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1847,7 +1848,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Bir ana makineden bir şablona bağımlılık eklenemiyor."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1878,8 +1879,8 @@ msgid "Cannot add host prototype"
 msgstr "Ana makine prototipi eklenemiyor"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Resim eklenemiyor"
 
@@ -1971,15 +1972,15 @@ msgstr "Kullanıcı eklenemiyor"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Web senaryosu eklenemiyor"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1999,33 +2000,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Geçmiş temizlenemiyor"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Grafik prototipleri klonlanamıyor."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "Ana makine prototipleri klonlanamıyor."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Öğe prototipleri klonlanamıyor."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Tetikleyici prototipleri klonlanamıyor."
 
@@ -2052,7 +2049,7 @@ msgid_plural "Cannot copy graphs"
 msgstr[0] "Grafik kopyalanamıyor"
 msgstr[1] "Grafikler kopyalanamıyor"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "Öğe kopyalanamıyor"
@@ -2104,8 +2101,8 @@ msgstr "Simge haritası oluşturulamıyor"
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2134,7 +2131,7 @@ msgstr "\"%1$s\" Zabbix dahili kullanıcısı silinemiyor, bu kullanıcıyı dev
 msgid "Cannot delete action"
 msgstr "Eylem silinemiyor"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2202,7 +2199,7 @@ msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must con
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2213,11 +2210,11 @@ msgstr[1] ""
 msgid "Cannot delete host prototypes"
 msgstr "Ana makine prototipleri silinemez"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Simge eşlemesi silinemiyor"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Resim silinemiyor"
 
@@ -2242,7 +2239,7 @@ msgstr "Öğe prototipi silinemiyor"
 msgid "Cannot delete item prototypes"
 msgstr "Öğe prototipleri silinemez"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Öğeler silinemiyor"
 
@@ -2273,7 +2270,7 @@ msgid_plural "Cannot delete proxies"
 msgstr[0] "Vekil sunucu silinemiyor"
 msgstr[1] "Vekil sunucular silinemiyor"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2296,7 +2293,7 @@ msgid_plural "Cannot delete scripts"
 msgstr[0] "Betik silinemiyor"
 msgstr[1] "Betikler silinemiyor"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Betikler silinemiyor. \"%1$s\" betiği \"%2$s\" eylem işleminde kullanılıyor."
@@ -2312,8 +2309,8 @@ msgid_plural "Cannot delete services"
 msgstr[0] "Servis silinemiyor"
 msgstr[1] "Servis silinemiyor"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2342,7 +2339,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr "Şablonlanmış öğe silinemiyor."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Şablonlanmış öğeler silinemiyor."
 
@@ -2395,7 +2392,7 @@ msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 msgstr[1] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Web senaryosu silinemiyor"
 
@@ -2430,7 +2427,7 @@ msgid_plural "Cannot disable hosts"
 msgstr[0] "Ana makine devre dışı bırakılamıyor"
 msgstr[1] "Ana makine devre dışı bırakılamıyor"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Öğe devre dışı bırakılamıyor"
@@ -2461,7 +2458,7 @@ msgid_plural "Cannot disable triggers"
 msgstr[0] "Tetikleyici devre dışı bırakılamıyor"
 msgstr[1] "Tetikleyiciler devre dışı bırakılamıyor"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Web senaryosu devre dışı bırakılamıyor"
@@ -2508,7 +2505,7 @@ msgid_plural "Cannot enable hosts"
 msgstr[0] "Ana makine etkinleştirilemiyor"
 msgstr[1] "Ana makineler etkinleştirilemiyor"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Öğe etkinleştirilemiyor"
@@ -2539,7 +2536,7 @@ msgid_plural "Cannot enable triggers"
 msgstr[0] "Tetikleyici etkinleştirilemiyor"
 msgstr[1] "Tetikleyiciler etkinleştirilemiyor"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Web senaryosu etkinleştirilemiyor"
@@ -2553,7 +2550,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr "Makrolar genişletilemiyor."
 
@@ -2587,8 +2584,8 @@ msgstr "\"%2$s\" haritasında kullanılan \"%1$s\" ana makinesi bulunamıyor."
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "\"%4$s\" üzerindeki \"%3$s\" keşif kuralının ana makine prototipi \"%2$s\" için ana makine grubu \"%1$s\" bulunamadı."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2686,24 +2683,20 @@ msgstr "\"%3$s\" üzerindeki \"%2$s\" öğesi için değer haritası \"%1$s\" bu
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "\"%4$s\" üzerindeki \"%3$s\" keşif kuralının öğe prototipi \"%2$s\" için kullanılan \"%1$s\" değer haritası bulunamıyor."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "Görünür şablon adı boş olamaz."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2716,7 +2709,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
 msgstr[0] "\"%1$s\" şablonu içe aktarılamıyor, \"%2$s\" bağlantılı şablonu mevcut değil."
 msgstr[1] "\"%1$s\" şablonu içe aktarılamıyor, \"%2$s\" bağlantılı şablonları mevcut değil."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "Tetikleyici ifadesi eklenemiyor"
 
@@ -2730,7 +2723,7 @@ msgid "Cannot link template."
 msgstr "Şablon bağlantısı yapılamıyor."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2762,17 +2755,17 @@ msgstr "Görünür şablon adına toplu güncelleme yapılamıyor."
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "\"%1$s\" tablosunda, where koşulu olmadan delete ifadesi gerçekleştirilemez."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Değerler olmadan \"%1$s\" tablosunda update ifadesi gerçekleştirilemez."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "\"%1$s\" tablosunda, where koşulu olmadan update ifadesi gerçekleştirilemez."
@@ -2799,7 +2792,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Yanıt okunamıyor, Zabbix sunucusu \"%1$s\" ile bağlantıyı kontrol edin."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Misafir kullanıcısı yeniden adlandırılamıyor."
 
@@ -2818,7 +2811,7 @@ msgstr "\"%1$s\" parçacığı kaydedilemiyor."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Komut gönderilemiyor, Zabbix sunucusu \"%1$s\" ile bağlantıyı kontrol edin."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2858,12 +2851,12 @@ msgstr "Devre dışı envanter için envanter alanları tanımlanamaz."
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2882,7 +2875,7 @@ msgid_plural "Cannot unblock users"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Web senaryolarının bağlantısı kaldırılıp temizlenemiyor."
 
@@ -2895,7 +2888,7 @@ msgstr "Şablonun bağlantısı kaldırılamadı"
 msgid "Cannot unlink template."
 msgstr "Şablonun bağlantısı kaldırılamıyor."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2948,11 +2941,6 @@ msgstr "Keşfedilmiş öğe \"%1$s\" için \"%2$s\" güncellenemiyor."
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "Keşfedilmiş tetikleyici \"%1$s\" için \"%2$s\" güncellenemiyor."
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "\"%1$s\" resmi için \"imagetype\" güncellenemiyor."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2962,9 +2950,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "Keşfedilmiş bir grafik güncellenemiyor."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "Keşfedilmiş bir ana makine grubu güncellenemiyor."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3023,9 +3012,7 @@ msgstr "Grafik prototipi güncellenemiyor"
 msgid "Cannot update group"
 msgstr "Grup güncellenemiyor"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Keşfedilen ana makine \"%1$s\" için gruplar güncellenemiyor."
@@ -3048,13 +3035,13 @@ msgstr[1] "Ana makine prototipleri güncellenemiyor"
 msgid "Cannot update hosts"
 msgstr "Ana makineler güncellenemiyor"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "Simge eşlemesi güncellenemiyor"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Resim güncellenemiyor"
 
@@ -3108,12 +3095,12 @@ msgstr "Ağ haritası güncellenemiyor"
 msgid "Cannot update proxy"
 msgstr "Vekil sunucu güncellenemiyor"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Keşfedilen ana makine \"%1$s\" için vekil sunucu güncellenemiyor."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3133,17 +3120,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Betik güncellenemiyor"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3218,7 +3205,7 @@ msgstr[1] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Web senaryosu güncellenemiyor"
 
@@ -3318,8 +3305,8 @@ msgid "Character string not included"
 msgstr "Karakter dizgisi içerilmiyor"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3434,7 +3421,7 @@ msgstr "UDP hizmetinin performansını denetler. Servis kesintideyse 0 döner; d
 msgid "Checks should be unique."
 msgstr "Kontroller benzersiz olmalıdır."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3455,7 +3442,7 @@ msgstr "Şablonlarda çevrimsel referans: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "Çevrimsel şablon bağlantısına izin verilmiyor."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3476,11 +3463,11 @@ msgstr "Geçmişi ve eğilimleri temizle"
 msgid "Clear when unlinking"
 msgstr "Bağlantı kaldırılırken temizle"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3495,7 +3482,7 @@ msgstr "Saat"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3510,7 +3497,7 @@ msgstr "Saat"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Klonla"
 
@@ -3521,8 +3508,8 @@ msgstr "Klonla"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Kapat"
 
@@ -3533,13 +3520,13 @@ msgstr "Kapat"
 msgid "Close expression constructor"
 msgstr "İfade düzenleyicisini kapat"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Yeni olayı kapat"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Eski olayları kapat"
 
@@ -3552,8 +3539,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "Daralt"
 
@@ -3570,7 +3557,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3636,7 +3623,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr "Eşzamanlı oturumlar"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3647,17 +3634,12 @@ msgstr "Koşul"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "\"%1$s\" eylemi için \"%3$s\" formülünde \"%2$s\" koşulu kullanılmıyor."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "\"%1$s\" korelasyonu için \"%3$s\" formülünde \"%2$s\" durumu kullanılmıyor."
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "\"%1$s\" keşif kuralı için \"%3$s\" formülünde \"%2$s\" durumu kullanılmıyor."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3667,17 +3649,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "\"%1$s\" eylemi için \"%3$s\" formülünde kullanılan \"%2$s\" durumu tanımlanmadı."
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "\"%1$s\" korelasyonu için \"%3$s\" formülünde kullanılan \"%2$s\" durumu tanımlanmadı."
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "\"%1$s\" keşif kuralı için \"%3$s\" formülünde kullanılan \"%2$s\" durumu tanımlanmadı."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3693,7 +3670,7 @@ msgstr "Koşullar"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Yapılandırma"
 
@@ -3756,7 +3733,7 @@ msgstr "Ana makinelerin yapılandırması"
 msgid "Configuration of housekeeping"
 msgstr "Temizlik hizmetinin yapılandırması"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Simge eşlemelerinin yapılandırması"
@@ -3863,7 +3840,7 @@ msgstr "Onaylama metni"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "Tebrikler! Zabbix önyüzünü başarıyla kurdunuz."
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3956,7 +3933,7 @@ msgstr "Kontak"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4016,7 +3993,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -4055,8 +4032,8 @@ msgstr "Koordinatlar"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Kopyala"
 
@@ -4065,12 +4042,11 @@ msgstr "Kopyala"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "Korelasyon"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "Korelasyon \"%1$s\" halihazırda mevcut."
@@ -4098,16 +4074,6 @@ msgid_plural "Correlations enabled"
 msgstr[0] "Korelasyon etkinleştirildi"
 msgstr[1] "Korelasyonlar etkinleştirildi"
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "Korelasyonda eksik parametreler var: %1$s"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "Korelasyon adı boş olamaz."
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr "Korelasyon kuralı"
@@ -4116,14 +4082,10 @@ msgstr "Korelasyon kuralı"
 msgid "Correlation updated"
 msgstr "Korelasyon güncellendi"
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Resim kaydedilemedi!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Sayı"
 
@@ -4187,11 +4149,11 @@ msgstr "Korelasyon oluştur"
 msgid "Create dashboard"
 msgstr "Pano oluştur"
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr "Bağımlı öğe oluştur"
 
@@ -4308,7 +4270,7 @@ msgstr "Harita oluştur"
 msgid "Create media type"
 msgstr "Medya türü oluştur"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "Yeni oluştur"
 
@@ -4332,7 +4294,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Şablon oluştur"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Tetikleyici oluştur"
 
@@ -4495,7 +4457,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "DNS adı"
@@ -4507,11 +4469,11 @@ msgstr "DNS adı"
 msgid "Daily"
 msgstr "Günlük"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "Karanlık"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4532,8 +4494,8 @@ msgstr "\"%1$s\" panosu halihazırda mevcut."
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr "Pano oluşturuldu"
 
@@ -4556,9 +4518,9 @@ msgstr "Pano özellikleri"
 msgid "Dashboard sharing"
 msgstr "Pano paylaşımı"
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr "Pano güncellendi"
 
@@ -4582,7 +4544,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr "Panolar"
 
@@ -4610,7 +4572,7 @@ msgstr "Verilere genel bakış"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4752,7 +4714,7 @@ msgstr "Haftanın günü"
 msgid "Days"
 msgstr "Günler"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Hata Ayıklama"
 
@@ -4766,26 +4728,26 @@ msgstr "Hata ayıklama kipi"
 msgid "Dec"
 msgstr "Ara"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Aralık"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Öntanımlı"
 
@@ -4878,7 +4840,7 @@ msgstr "Gecikmenin yapıldığı"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4902,8 +4864,8 @@ msgstr "Gecikmenin yapıldığı"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Sil"
 
@@ -4928,11 +4890,11 @@ msgstr "Şablon silinsin ve temizlensin mi? (Uyarı: bütün bağlantılı ana m
 msgid "Delete current action?"
 msgstr "Şu anki eylem silinsin mi?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "Mevcut korelasyon silinsin mi?"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr "Pano silinsin mi?"
 
@@ -4976,7 +4938,7 @@ msgstr "Öğe prototipi silinsin mi?"
 msgid "Delete item?"
 msgstr "Öğe silinsin mi?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Seçili elemanlar arasındaki bağlar silinsin mi?"
 
@@ -5032,7 +4994,7 @@ msgstr "Seçilen panolar silinsin mi?"
 msgid "Delete selected discovery rules?"
 msgstr "Seçilen keşif kuralları silinsin mi?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Seçilen elemanlar silinsin mi?"
 
@@ -5137,7 +5099,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "Seçilen şekiller silinsin mi?"
 
@@ -5181,7 +5143,7 @@ msgstr "Tetikleyici silinsin mi?"
 msgid "Delete web scenario?"
 msgstr "Web senaryosu silinsin mi?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5226,7 +5188,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Bağımlılıklar"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Bağımlı"
 
@@ -5234,7 +5196,7 @@ msgstr "Bağımlı"
 msgid "Dependent item"
 msgstr "Bağımlı öğe"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5244,7 +5206,7 @@ msgstr "Bağımlılığın olduğu"
 msgid "Deployment status"
 msgstr "Dağıtım durumu"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5277,7 +5239,7 @@ msgid "Description"
 msgstr "Açıklama"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5443,10 +5405,10 @@ msgstr "Seçilen web senaryoları devre dışı bırakılsın mı?"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5529,7 +5491,7 @@ msgid "Discovery by proxy"
 msgstr "Vekil sunucu aracılığıyla keşif"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Keşif kontrolü"
 
@@ -5541,7 +5503,7 @@ msgstr "Keşif kontrolleri"
 msgid "Discovery list"
 msgstr "Keşif listesi"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Keşif objesi"
 
@@ -5573,7 +5535,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5581,12 +5543,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Keşif kuralı"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "\"%2$s\" üzerinde \"%1$s\" keşif kuralı zaten var, başka bir şablondan miras kalmış."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "\"%2$s\" üzerinde \"%1$s\" keşif kuralı zaten var."
@@ -5599,7 +5561,7 @@ msgstr "\"%2$s\" üzerinde \"%1$s\" keşif kuralı zaten var."
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "\"%1$s\" keşif kuralı zaten var."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5641,7 +5603,7 @@ msgstr "Keşif kuralı güncellendi"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5652,7 +5614,7 @@ msgstr "Keşif kuralları"
 msgid "Discovery rules deleted"
 msgstr "Keşif kuralları silindi"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Keşif durumu"
@@ -5689,10 +5651,11 @@ msgid "Display stacked graph"
 msgstr "Yığılmış grafik göster"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "%2$s bulunandan %1$s kadarı gösteriliyor"
@@ -5702,7 +5665,7 @@ msgstr "%2$s bulunandan %1$s kadarı gösteriliyor"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "%3$s bulunandan %1$s - %2$s arası gösteriliyor"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5724,7 +5687,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Koşulsal ifadeyi değiştirmek ister misiniz?"
 
@@ -5780,7 +5743,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Kapalı"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5788,7 +5751,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr "Yapılandırma dosyasını indir"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5807,18 +5770,6 @@ msgstr ""
 msgid "Draw style"
 msgstr "Çizim stili"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "\"%3$s\" korelasyonu için \"%2$s\" \"%1$s\" değeri mükerrer."
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr "Korelasyon için \"%2$s\" \"%1$s\" değeri mükerrer."
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5831,11 +5782,6 @@ msgstr "Harita için \"%1$s\" \"name\" değeri mükerrer."
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5887,7 +5833,7 @@ msgstr "Dinamik öğe"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Her URL tekil bir isme sahip olmalıdır. Lütfen URL'in yalnızca bir isme sahip olduğundan emin olun"
 
@@ -5896,11 +5842,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5914,8 +5860,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Düzenle"
 
@@ -5931,11 +5877,11 @@ msgstr "Haritayı düzenle"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr "Ağaç öğesini düzenle"
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Tetikleyiciyi düzenle"
 
@@ -5995,21 +5941,17 @@ msgstr "Web senaryosu \"%1$s\" için boş SSL anahtar dosyası."
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "Boş korelasyon ID'si."
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "\"%1$s\" eylemi için boş filtre koşulu formül ID'si."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "\"%1$s\" keşif kuralı için boş filtre koşulu formül ID'si."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "\"%1$s\" keşif kuralı için boş filtre koşul makrosu."
@@ -6025,25 +5967,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6053,14 +5989,6 @@ msgstr "Boş giriş parametresi."
 msgid "Empty map ID."
 msgstr "Boş harita ID'si."
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "Boş medya türü ID'si."
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Boş parametreler"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6226,7 +6154,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6237,7 +6165,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6280,7 +6208,7 @@ msgid "English (en_US)"
 msgstr "Amerikan İngilizcesi (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6296,7 +6224,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6315,12 +6243,12 @@ msgstr ""
 msgid "Error"
 msgstr "Hata"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "\"%1$s\" tablosu için arama isteği hatası."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6347,7 +6275,7 @@ msgstr "Olay ID"
 msgid "Event acknowledged"
 msgstr "Olay onaylandı"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6355,7 +6283,7 @@ msgid "Event correlation"
 msgstr "Olay korelasyonu"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "Olay korelasyon kuralları"
@@ -6390,11 +6318,11 @@ msgstr "Olay günlüğü izlemesi. Sistem günlüğü döndürür"
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "Olay etiket çifti"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Olay tipi"
 
@@ -6439,15 +6367,10 @@ msgstr "Dahil etme"
 msgid "Exclude host groups"
 msgstr "Ana makine gruplarını hariç tut"
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Çalıştır"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "[%2$s] içinde [%1$s] SQL çalıştırma hatası."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6485,7 +6408,7 @@ msgstr "Çalıştırılmış"
 msgid "Executed script"
 msgstr "Çalıştırılmış betik"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Çalıştırma onayı"
 
@@ -6501,8 +6424,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "Genişlet"
 
@@ -6623,7 +6546,7 @@ msgstr "İfadeler"
 msgid "External check"
 msgstr "Harici kontrol"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "Cum"
@@ -6650,8 +6573,8 @@ msgstr "Başarısız"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6662,26 +6585,26 @@ msgstr "Pano oluşturma başarısız"
 msgid "Failed to parse URL."
 msgstr "URL ayrıştırılamadı."
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr "Pano güncelleme başarısız"
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6689,7 +6612,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Şablon güncellenemedi."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6713,7 +6636,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Şub"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Şubat"
 
@@ -6735,10 +6658,9 @@ msgstr "\"%1$s\" alanı NULL olarak ayarlanamıyor."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6749,13 +6671,6 @@ msgstr "\"%1$s\" alanı zorunlu."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "\"%2$s\" haritası için \"%1$s\" alanında bir değer eksik."
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "\"%2$s\" medya türü için \"%1$s\" alanında bir değer eksik."
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6774,11 +6689,6 @@ msgstr "\"%1$s\" alanı tam sayı değil."
 msgid "Field \"%1$s\" is not string."
 msgstr "\"%1$s\" alanı string değil."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "\"%2$s\" medya türü için \"%1$s\" alanı gerekiyor."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6793,10 +6703,6 @@ msgstr "\"Ana makine\" alanı zorunludur."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Dosya biçimi desteklenmiyor."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6861,7 +6767,8 @@ msgstr "Dolu bölge"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6886,7 +6793,7 @@ msgstr "Filtre"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6938,7 +6845,7 @@ msgstr "Haritaya sığdır"
 msgid "Fixed"
 msgstr "Sabit"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6989,12 +6896,12 @@ msgstr "Formül"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7007,7 +6914,7 @@ msgstr "Fransızca (fr_FR)"
 msgid "Fri"
 msgstr "Cum"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Cuma"
 
@@ -7118,7 +7025,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "Verilen ifade bir makro değil"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr "\"%1$s\" genel düzenli ifadesi mevcut değil."
@@ -7132,7 +7039,7 @@ msgstr "Genel değer"
 msgid "Go back to %1$s"
 msgstr "Dönüş yap: %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Buraya git"
 
@@ -7170,7 +7077,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7178,7 +7085,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Gradyan çizgi"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7238,7 +7145,7 @@ msgstr[1] "Grafikler kopyalandı"
 msgid "Graph deleted"
 msgstr "Grafik silindi"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7275,8 +7182,8 @@ msgstr "Grafik prototipi silindi"
 msgid "Graph prototype updated"
 msgstr "Grafik prototipi güncellendi"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr "\"%1$s\" ID'li grafik prototipi mevcut değil."
@@ -7310,8 +7217,8 @@ msgstr "Grafik türü"
 msgid "Graph updated"
 msgstr "Grafik güncellendi"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr "\"%1$s\" ID'li grafik mevcut değil."
@@ -7342,7 +7249,7 @@ msgstr "\"%1$s\" adlı grafik, grafikler veya grafik prototipleri içinde haliha
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Grafikler"
 
@@ -7363,12 +7270,12 @@ msgstr "Izgara"
 msgid "Group"
 msgstr "Grup"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "\"%1$s\" grubu, bir ana makine prototipi tarafından kullanıldığı için silinemez."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr "\"%1$s\" grubu, bir korelasyon koşulunda kullanıldığından silinemiyor."
@@ -7542,11 +7449,11 @@ msgstr "Yardım"
 msgid "Hexadecimal to decimal"
 msgstr "Onaltılıktan ondalığa"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Gizli"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "Hata ayıklamayı gizle"
 
@@ -7573,11 +7480,11 @@ msgstr ""
 msgid "High"
 msgstr "Yüksek"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7598,7 +7505,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Geçmiş"
 
@@ -7606,11 +7513,15 @@ msgstr "Geçmiş"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Geçmiş temizlendi"
 
@@ -7653,7 +7564,7 @@ msgstr "Yatay"
 msgid "Horizontal align"
 msgstr "Yatay hizalama"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7682,7 +7593,7 @@ msgstr "Yatay hizalama"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7696,7 +7607,7 @@ msgstr[1] "Ana makineler"
 msgid "Host \"%1$s\" already exists."
 msgstr "\"%1$s\" ana makinesi zaten var."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7704,7 +7615,7 @@ msgstr "\"%1$s\" ana makinesi zaten var."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "\"%1$s\" ana makinesi, ana makine grubu olmadan bulunamaz."
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7756,7 +7667,7 @@ msgid_plural "Hosts enabled"
 msgstr[0] "Ana makine etkin"
 msgstr[1] "Ana makineler etkin"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7770,22 +7681,22 @@ msgstr[1] "Ana makineler etkin"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Ana makine grubu"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "\"%1$s\" ana makine grubu zaten var."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "\"%1$s\" adlı ana makine grubu, genel bir komut dizisinde kullanıldığından silinemiyor."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7798,10 +7709,10 @@ msgstr "Ana makine grubu öğeleri"
 msgid "Host group label type"
 msgstr "Ana makine grubu etiket türü"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "\"%1$s\" ID'li ana makine grubu mevcut değil."
@@ -7817,8 +7728,8 @@ msgstr "\"%1$s\" ID'li ana makine grubu mevcut değil."
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7892,7 +7803,7 @@ msgstr "Ana makine adı"
 msgid "Host networks"
 msgstr "Ana makine ağları"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7972,7 +7883,7 @@ msgstr "Ana makine güncelleme başarısız."
 msgid "Host updated"
 msgstr "Ana makine güncellendi"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr "\"%1$s\" ID'li ana makine mevcut değil."
@@ -7992,7 +7903,7 @@ msgstr "\"%1$s\" adında bir ana makine halihazırda mevcut."
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "\"%1$s\" görünür adlı bir ana makine halihazırda mevcut."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8005,7 +7916,7 @@ msgstr "\"%1$s\" görünür adlı bir ana makine halihazırda mevcut."
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8053,7 +7964,7 @@ msgstr "Ana makineler güncellendi"
 msgid "Hours"
 msgstr "Saat"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8093,7 +8004,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IP adresi"
@@ -8118,7 +8029,7 @@ msgstr "\"%1$s\" IP aralığı, \"%2$s\" adres sınırını aşıyor"
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8175,12 +8086,12 @@ msgstr "Simge aydınlatma"
 msgid "Icon map"
 msgstr "Simge haritası"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Simge haritası \"%1$s\" silinemiyor. \"%2$s\" haritasında kullanılıyor."
@@ -8193,18 +8104,18 @@ msgstr "Simge haritası oluşturuldu"
 msgid "Icon map deleted"
 msgstr "Simge haritası silindi"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Simge haritası güncellendi"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "Simge eşleştirme"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "\"%1$s\" ID'li simge mevcut değil."
@@ -8305,23 +8216,20 @@ msgstr "Eğer bu mesajın yanlış olduğunu düşünüyorsanız gerekli izinler
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Resim"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "\"%1$s\" resmi zaten var."
@@ -8330,7 +8238,7 @@ msgstr "\"%1$s\" resmi zaten var."
 msgid "Image added"
 msgstr "Resim eklendi"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Resim silindi"
 
@@ -8338,18 +8246,12 @@ msgstr "Resim silindi"
 msgid "Image label type"
 msgstr "Resim etiket türü"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "[%2$s] içinde [%1$s] resim yükleme hatası."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Resim güncellendi"
 
@@ -8444,7 +8346,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8455,13 +8357,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr "Erişilemeyen harita"
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8505,7 +8407,7 @@ msgstr "Alt grupları içer"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Ağ arayüzündeki gelen trafik istatistikleri. Tam sayı döndürür"
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8673,24 +8575,6 @@ msgstr "Yanlış eylem işlem kullanıcı grubu. Kullanıcı grubu mevcut değil
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Yanlış eylem işlem kullanıcısı. Kullanıcı mevcut değil veta sizin bu kullanıcıya erişiminiz yok."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8745,8 +8629,6 @@ msgstr "Yanlış eylem işlem kullanıcısı. Kullanıcı mevcut değil veta siz
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Fonksiyona yanlış argümanlar geçildi."
 
@@ -8772,31 +8654,22 @@ msgstr "\"%1$s\" şablon adı için yanlış karakterler kullanıldı."
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "\"%1$s\" eylemi için yanlış koşullar."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "Keşif kuralı \"%1$s\" için yanlış koşullar."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "Yanlış korelasyon ID'si."
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "\"%1$s\" eylemi için yanlış özel ifade \"%2$s\": %3$s."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "\"%1$s\" korelasyonu için yanlış özel ifade \"%2$s\": %3$s."
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "\"%1$s\" keşif kuralı için yanlış özel ifade \"%2$s\": %3$s."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8825,7 +8698,7 @@ msgstr "Yanlış eventobject değeri."
 msgid "Incorrect eventsource value."
 msgstr "Yanlış eventsource değeri."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "\"%2$s\" tablosu için where komutunda yanlış alan adı \"%1$s\" veya değeri."
@@ -8850,22 +8723,17 @@ msgstr "Yanlış dosya yüklemesi."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "\"%1$s\" eylemi için yanlış süzgeç koşul formülü ID'si."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "\"%1$s\" keşif kuralı için yanlış süzgeç koşul formülü ID'si."
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "\"%1$s\" korelasyonu için yanlış süzgeç koşul formülü ID'si verildi."
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "\"%1$s\" keşif kuralı için yanlış süzgeç koşul makrosu."
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8876,7 +8744,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "\"%1$s\" eylemi için yanlış süzgeç koşul operatörü."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "\"%1$s\" keşif kuralı için yanlış süzgeç koşul operatörü."
@@ -8904,8 +8772,6 @@ msgstr "Yanlış resim indeksi."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8967,10 +8833,6 @@ msgstr "Yanlış bakım süresi (minimum 5 dakika)"
 msgid "Incorrect map ID."
 msgstr "Yanlış harita ID'si."
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "Yanlış medya türü ID'si."
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9028,13 +8890,13 @@ msgstr "Yanlış düzenli ifade \"%1$s\": \"%2$s\""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "\"%1$s\" Zabbix sunucusundan yanlış yanıt alındı."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Yanlış servis bitiş zamanı."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Yanlış servis başlangıç zamanı."
 
@@ -9087,12 +8949,7 @@ msgstr "Yanlış tetikleyici prototipi ifadesi. Tetikleyici prototipi ifade elem
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "\"%1$s\" eylemi için yanlış hesaplama türü."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "\"%1$s\" korelasyonu için yanlış hesaplama türü."
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "\"%1$s\" keşif kuralı için yanlış hesaplama türü."
@@ -9138,13 +8995,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9161,60 +9018,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "\"%2$s\" alanı için \"%1$s\" yanlış değeri: %3$s ve %4$s arasında olmalı."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "\"%2$s\" kayan nokta alanı için yanlış değer \"%1$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "\"%2$s\" tamsayı alanı için yanlış değer \"%1$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "\"%2$s\" işaretsiz tamsayı alanı için yanlış değer \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "\"%3$s\" korelasyonu için \"%2$s\" alanında yanlış değer \"%1$s\"."
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "\"%3$s\" medya türü için \"%2$s\" alanında yanlış değer \"%1$s\"."
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9269,14 +9096,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9386,25 +9207,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9415,7 +9218,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9461,16 +9264,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9479,7 +9283,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "\"%1$s\" alanı için yanlış değer: %2$s."
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9567,12 +9371,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Ekle"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "İfade ekle"
 
@@ -9676,7 +9480,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9684,7 +9488,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9695,7 +9499,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Zaman aralığı"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9718,7 +9522,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr "Geçersiz eylem koşulu: %1$s."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9750,7 +9554,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr "Geçersiz zaman aralığı \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "\"%3$s\" üzerindeki \"%2$s\" keşif kuralı için geçersiz anahtar %1$s\": %4$s."
@@ -9775,27 +9579,29 @@ msgstr "Geçersiz anahtar \"%1$s\": %2$s."
 msgid "Invalid method parameters."
 msgstr "Geçersiz yöntem parametreleri."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9821,17 +9627,17 @@ msgstr "Geçersiz yöntem parametreleri."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9839,8 +9645,8 @@ msgstr "Geçersiz yöntem parametreleri."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9854,106 +9660,116 @@ msgstr "Geçersiz yöntem parametreleri."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9995,43 +9811,38 @@ msgstr "Geçersiz yanıt kodu \"%1$s\"."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10052,7 +9863,7 @@ msgstr "Geçersiz zaman periyodu."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Envanter"
 
@@ -10093,7 +9904,7 @@ msgstr "Kullanıcı parolasına göre arama yapmak mümkün değildir."
 msgid "Italian (it_IT)"
 msgstr "İtalyanca (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10125,7 +9936,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "\"%1$s\" öğesi, \"%2$d\" eksik ana makine envanter alanı numarasını dolduramıyor. Seçenekler şunlardır: 0 (doldurma) ve %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10139,7 +9950,7 @@ msgstr "Öğe eklendi"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "Öğe kopyalandı"
@@ -10153,13 +9964,13 @@ msgstr "Öğe sayısı"
 msgid "Item deleted"
 msgstr "Öğe silindi"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Öğe devre dışı"
 msgstr[1] "Öğeler devre dışı"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Öğe etkin"
@@ -10169,7 +9980,7 @@ msgstr[1] "Öğeler etkin"
 msgid "Item in \"not supported\" state"
 msgstr "\"Desteklenmeyen\" durumundaki öğe"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "Öğe seçilmedi"
 
@@ -10178,7 +9989,7 @@ msgstr "Öğe seçilmedi"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr "Öğe ön işlemesinde eksik parametreler: %1$s"
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10215,8 +10026,8 @@ msgid_plural "Item prototypes updated"
 msgstr[0] "Öğe prototipi güncellendi"
 msgstr[1] "Öğe prototipleri güncellendi"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr "\"%1$s\" ID'li öğe prototipi mevcut değil."
@@ -10242,7 +10053,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10274,8 +10085,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr "\"%1$s\" ID'li öğe mevcut değil."
@@ -10326,11 +10137,11 @@ msgstr "\"%1$s\" anahtarlı öğe \"%2$s\" üzerinde halihazırda var."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Öğeler"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Öğeler silindi"
 
@@ -10348,7 +10159,7 @@ msgstr "Öğeler güncellendi"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10373,6 +10184,10 @@ msgstr "JMX arabirimleri"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10385,7 +10200,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr "JSON stringi bekleniyor"
 
@@ -10403,7 +10218,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Oca"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Ocak"
 
@@ -10425,7 +10240,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Tem"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Temmuz"
 
@@ -10433,7 +10248,7 @@ msgstr "Temmuz"
 msgid "Jun"
 msgstr "Haz"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Haziran"
 
@@ -10589,22 +10404,6 @@ msgid_plural "Last %1$d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10616,11 +10415,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Son kontrol"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Son saat grafiği"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Son ayın grafiği"
 
@@ -10658,11 +10457,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Son değer"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Son haftanın grafiği"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10671,11 +10470,11 @@ msgstr "Son haftanın grafiği"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "En Son Veriler"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "En son değerler"
 
@@ -10716,7 +10515,7 @@ msgstr ""
 msgid "Left trim"
 msgstr "Sol kırpma"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -10997,7 +10796,7 @@ msgstr "\"Desteklenmiyor\" durumundaki düşük seviye keşif kuralı"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "Pzt"
@@ -11019,7 +10818,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "Dosyanın MD5 özeti. Karakter stringi döndürür (dosyanın MD5 sağlamasını)"
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11030,12 +10829,12 @@ msgid "Macro"
 msgstr "Makro"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "\"%2$s\" üzerinde \"%1$s\" makrosu zaten var."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "\"%1$s\" makrosu halihazırda mevcut."
@@ -11063,7 +10862,7 @@ msgstr "Makrolar güncellendi"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -11071,7 +10870,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11154,7 +10953,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11176,13 +10975,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Harita"
 
@@ -11251,7 +11050,7 @@ msgstr "Harita şekli"
 msgid "Map update failed."
 msgstr "Harita güncelleme başarısız."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr "\"%1$s\" ID'li harita mevcut değil."
@@ -11283,7 +11082,7 @@ msgstr "Haritalar"
 msgid "Mar"
 msgstr "Mar"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Mart"
 
@@ -11387,7 +11186,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11401,7 +11200,7 @@ msgstr[1] "Görüntülenecek maksimum süre %1$s gün."
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Mayıs"
 
@@ -11416,15 +11215,12 @@ msgstr "May"
 msgid "Media"
 msgstr "Medya"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Medya türü"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr "Medya türü \"%1$s\" halihazırda mevcut."
@@ -11451,11 +11247,6 @@ msgid_plural "Media types enabled"
 msgstr[0] "Medya türü etkin"
 msgstr[1] "Medya türleri etkin"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr "Medya türü parametreleri eksik: %1$s"
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11485,7 +11276,7 @@ msgstr "\"%1$s\" ID'li medya türü mevcut değil."
 msgid "Media types"
 msgstr "Medya türleri"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11573,7 +11364,7 @@ msgstr "Mesajlaşma"
 msgid "Method not found."
 msgstr "Yöntem bulunamadı."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11635,7 +11426,7 @@ msgid "Minimum severity"
 msgstr "Minimum önem derecesi"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11694,7 +11485,7 @@ msgstr "Kip"
 msgid "Model"
 msgstr "Model"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11732,7 +11523,7 @@ msgstr[1] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11758,7 +11549,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Pzt"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Pazartesi"
 
@@ -11798,11 +11589,11 @@ msgstr "Ay"
 msgid "Monthly"
 msgstr "Aylık"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "Daha çok eşleşen bulundu..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11826,7 +11617,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11839,7 +11630,7 @@ msgstr "Çoklu"
 msgid "Multiple PROBLEM events"
 msgstr "Birden çok PROBLEM olayı"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Sesi Kapat"
 
@@ -11968,11 +11759,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12130,19 +11921,21 @@ msgstr "Yeni koşul"
 msgid "New dashboard"
 msgstr "Yeni pano"
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Yeni eleman"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr "Yeni olay ana makine grubu"
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr "Yeni olay etiket değeri"
 
@@ -12154,7 +11947,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Yeni düzenli ifade"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12162,7 +11955,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Yeni servis zamanı"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12171,7 +11964,7 @@ msgid "New triggers"
 msgstr "Yeni tetikleyiciler"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12189,7 +11982,7 @@ msgstr "Sonraki adım"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12218,30 +12011,6 @@ msgstr "Sonraki adım"
 msgid "No"
 msgstr "Hayır"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "\"%2$s\" korelasyonu için hiçbir \"%1$s\" verilmedi."
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "Korelasyon için hiçbir \"%1$s\" verilmedi."
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12257,11 +12026,6 @@ msgstr "Grafik için hiçbir \"%1$s\" verilmemiş."
 msgid "No \"%1$s\" given for map."
 msgstr "Harita için hiçbir \"%1$s\" verilmedi."
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "Medya türü için hiçbir \"%1$s\" verilmedi."
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12269,7 +12033,7 @@ msgstr "Medya türü için hiçbir \"%1$s\" verilmedi."
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "\"%1$s\" eyleminin bir filtre koşulu için hiçbir \"%2$s\" verilmedi."
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "\"%1$s\" keşif kuralının bir filtre koşulu için hiçbir \"%2$s\" verilmedi."
@@ -12279,7 +12043,7 @@ msgstr "\"%1$s\" keşif kuralının bir filtre koşulu için hiçbir \"%2$s\" ve
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "\"%1$s\" eylem süzgeci için hiç \"%2$s\" verilmedi."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "\"%1$s\" keşif kuralı süzgeci için hiç \"%2$s\" verilmedi."
@@ -12296,11 +12060,6 @@ msgstr "Hiçbir kimlik doğrulama kullanıcı adı belirtilmedi."
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "\"%1$s\" korelasyonu için hiçbir koşul türü belirtilmedi."
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12331,7 +12090,7 @@ msgstr "\"%2$s\" üzerinde \"%1$s\" türü için hiçbir öntanımlı arayüz yo
 msgid "No details"
 msgstr "Hiçbir detay yok"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "Hiçbir keşif kuralı ID'si verilmedi."
 
@@ -12367,7 +12126,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "Hiçbir grafik eklenmemiş."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Hiçbir ana makine ID'si verilmemiş."
 
@@ -12397,7 +12156,7 @@ msgstr "Resim yok"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Hiçbir arabirim bulunamadı"
 
@@ -12431,7 +12190,7 @@ msgstr "Hiçbir makro bulunmadı."
 msgid "No maps added."
 msgstr "Hiçbir harita eklenmemiş."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "Hiçbir eşleşen bulunmadı"
 
@@ -12439,17 +12198,46 @@ msgstr "Hiçbir eşleşen bulunmadı"
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr "\"%1$s\" korelasyonu için verilen herhangi bir işlem türü yok."
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Sistem erişimi için izin yok."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12457,7 +12245,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12485,19 +12273,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12512,16 +12299,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12541,12 +12334,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12567,27 +12358,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12604,14 +12397,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12620,7 +12413,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Başvurulan nesne için izin yok veya nesne mevcut değil!"
 
@@ -12640,7 +12433,7 @@ msgstr "Hiçbir açık anahtar dosyası belirtilmemiş."
 msgid "No recipients for action operation message."
 msgstr "Eylem işlem mesajı için hiçbir alıcı yok."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr "Tazeleme yok"
 
@@ -12652,7 +12445,7 @@ msgstr "Eylem işlem komutu için hiçbir betik belirtilmemiş."
 msgid "No target selected"
 msgstr "Hiçbir hedef seçilmemiş"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Hiçbir hedef seçilmemiş."
 
@@ -12669,7 +12462,7 @@ msgstr "Hiçbir tetik tanımlanmamış."
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr "Boole-dışı bayraklar kullanımdan kaldırıldı."
 
@@ -12739,15 +12532,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "\"guest\" kullanıcısı için parola konulmasına izin yok."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12779,7 +12572,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "Desteklenmiyor"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Not"
@@ -12810,7 +12603,7 @@ msgstr ""
 msgid "Nov"
 msgstr "Kas"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "Kasım"
 
@@ -12997,8 +12790,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13058,13 +12851,13 @@ msgstr "Eki"
 msgid "Octal to decimal"
 msgstr "Sekizlikten ondalığa"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Ekim"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Kapalı"
 
@@ -13072,30 +12865,31 @@ msgstr "Kapalı"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Tamam"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr "Eski olay etiketi değeri"
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "Açık"
 
@@ -13111,35 +12905,15 @@ msgstr "Bir kere"
 msgid "One"
 msgstr "Bir"
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "Nesnelerden biri, ana makine grubu olmadan bırakıldı."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Yalnızca bir kere"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Bir kerelik aksama süresi"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Yalnızca Süper Yöneticiler ana makine grupları oluşturabilir."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Yalnızca Süper Yöneticiler medya türü oluşturabilir."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Yalnızca Süper Yöneticiler medya türlerini silebilir."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Yalnızca Süper Yöneticiler medya türlerini düzenleyebilir."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Yalnızca Zabbix aracısı, SNMPv1, SNMPv2 ve SNMPv3 kontrolleri benzersiz yapılabilir."
@@ -13188,10 +12962,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "Yalnızca süper yöneticiler korelasyon oluşturabilir."
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13200,15 +12970,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr "Yalnızca süper yöneticiler korelasyonları güncelleyebilir."
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Yalnızca etkin ana makinelere atanmış ve etkin öğelere bağımlılığı olan tetikler sayıldı"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13217,7 +12983,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "İşletim sistemi bilgileri. String döndürür"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13226,11 +12992,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Yetkisiz istek nedeniyle operasyon gerçekleştirilemiyor."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "İşlem detayları"
 
@@ -13252,7 +13018,7 @@ msgstr "İşlem, işlem yapacak şablona sahip değil."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13261,33 +13027,33 @@ msgstr ""
 msgid "Operations"
 msgstr "İşlemler"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "İşlemci"
 
@@ -13396,7 +13162,7 @@ msgstr "Diğer yapılandırma parametreleri"
 msgid "Other parameters"
 msgstr "Diğer parametreler"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Diğerleri"
@@ -13410,7 +13176,7 @@ msgstr "Ağ arayüzünde giden trafik istatistikleri. Tam sayı döndürür"
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13439,7 +13205,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13628,7 +13394,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13673,7 +13439,7 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "PSK kimliği"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13696,16 +13462,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Parametre"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "\"%1$s\" parametresi kullanımdan kaldırıldı."
@@ -13735,7 +13501,7 @@ msgstr "Üst öğeler"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13752,7 +13518,7 @@ msgstr "Üst tetikleyiciler"
 msgid "Parent web scenarios"
 msgstr "Üst web senaryoları"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13764,11 +13530,6 @@ msgstr ""
 msgid "Parse"
 msgstr "Ayrıştır"
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "[%2$s] içinde [%1$s] SQL ayrıştırma hatası."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Ayrıştırma hatası"
@@ -13829,7 +13590,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr "Yapıştır"
 
@@ -13839,15 +13600,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr "Harici bağlantılar olmadan yapıştır"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13893,12 +13654,11 @@ msgstr "Bir DNS sorgusu gerçekleştirir. Gerekli bilgi türünü içeren karakt
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Dönem"
 
@@ -13987,7 +13747,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Lütfen, (isteğe bağlı) kurulum adının yanı sıra Zabbix sunucusunun ana makine adını veya ana makine IP adresini ve bağlantı noktası numarasını girin."
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Lütfen iki eleman seçiniz"
 
@@ -14027,7 +13787,7 @@ msgstr "Ana makine envanter alanını doldurur"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14116,7 +13876,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14247,7 +14007,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Üzerinde problem"
 
@@ -14260,21 +14020,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14288,9 +14044,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Problemler"
 
@@ -14324,7 +14080,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "Özellikler"
 
@@ -14345,13 +14101,13 @@ msgstr ""
 msgid "Proxies"
 msgstr "Vekil sunucular"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14359,7 +14115,7 @@ msgstr "Vekil sunucular"
 msgid "Proxy"
 msgstr "Vekil sunucu"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14369,12 +14125,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "\"%2$s\" ana bilgisayarı için \"%1$s\" vekil sunucusu mevcut değil."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Vekil sunucu \"%1$s\", bulma kuralı \"%2$s\" tarafından kullanılıyor."
@@ -14467,7 +14223,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14544,10 +14300,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Alınan değer"
@@ -14629,7 +14381,7 @@ msgstr "Dikdörtgen"
 msgid "Refresh"
 msgstr "Tazele"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14647,13 +14399,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Düzenli ifade"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14686,7 +14438,7 @@ msgstr "Düzenli ifadeler"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14718,8 +14470,6 @@ msgstr "Uzak komut"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14740,7 +14490,9 @@ msgstr "Uzak komut"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14753,7 +14505,7 @@ msgstr "Uzak komut"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14830,8 +14582,8 @@ msgstr "Uzak komut"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Kaldır"
 
@@ -14871,7 +14623,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14913,7 +14665,7 @@ msgid "Replace dependencies"
 msgstr "Bağımlılıkları değiştir"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14968,7 +14720,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -15010,8 +14762,8 @@ msgstr "Gerekli durum kodları"
 msgid "Required string"
 msgstr "Gerekli string"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Sıfırla"
 
@@ -15044,7 +14796,7 @@ msgstr "Sıfırlama onayı"
 msgid "Reset defaults"
 msgstr "Öntanımlılara sıfırla"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Çözüldü"
 
@@ -15110,7 +14862,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Sonuç"
@@ -15297,12 +15049,12 @@ msgstr "Ana makinede belirtilen komutu çalıştırır. Komutun metin sonucunu d
 msgid "Russian (ru_RU)"
 msgstr "Rusça (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "Cmt"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Pzr"
@@ -15313,8 +15065,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15351,7 +15103,7 @@ msgstr "SMTP sunucu bağlantı noktası"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15447,12 +15199,12 @@ msgstr "SQL sayısı: %1$s (seçer: %2$s | çalıştırır: %3$s)"
 msgid "SQL query"
 msgstr "SQL sorgusu"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "SQL cümlesi yürütme başarısız oldu \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "SQL cümlesi yürütme başarısız oldu \"%1$s\"."
@@ -15515,7 +15267,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15527,7 +15279,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Cts"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Cumartesi"
 
@@ -15569,7 +15321,7 @@ msgstr "Çizelge"
 msgid "Scheduled check"
 msgstr "Zamanlanmış kontrol"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15636,7 +15388,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15649,8 +15401,7 @@ msgstr ""
 msgid "Script"
 msgstr "Betik"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "\"%1$s\" betiği zaten var."
@@ -15682,12 +15433,6 @@ msgstr "Betik adı"
 msgid "Script parameters"
 msgstr "Betik parametreleri"
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "\"%2$s\" medya türü için son yeni satır beslemesi betik parametreleri \"%1$s\" eksik."
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Betik profilcisi"
@@ -15700,7 +15445,7 @@ msgstr "Betik güncellendi"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Betikler"
 
@@ -15770,8 +15515,8 @@ msgid "Security name"
 msgstr "Güvenlik adı"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15779,7 +15524,7 @@ msgstr "Güvenlik adı"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Seç"
 
@@ -15815,19 +15560,19 @@ msgstr "Seçilen öğeler"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr "Geriye gönder"
 
@@ -15852,7 +15597,7 @@ msgstr "Yalnızca şuna gönder"
 msgid "Send to"
 msgstr "Şuna gönder"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr "Geriye gönder"
 
@@ -15885,7 +15630,7 @@ msgstr "Ayrılmış"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "Eylül"
 
@@ -15916,28 +15661,28 @@ msgstr "Sunucu (vekil sunucu)"
 msgid "Server time"
 msgstr "Sunucu zamanı"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Servis"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15947,7 +15692,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "Servis oluşturuldu"
 
@@ -15980,16 +15725,16 @@ msgstr "Servis portu"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "Servis başlangıç zamanı, bitiş zamanında daha önce olmalıdır."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -15997,11 +15742,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Servis zamanları"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Servis türü"
 
@@ -16010,30 +15755,29 @@ msgstr "Servis türü"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Servis güncellendi"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Servisler"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "Servisler bir çevrimsel bağımlılık oluşturuyor."
 
@@ -16041,7 +15785,7 @@ msgstr "Servisler bir çevrimsel bağımlılık oluşturuyor."
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16071,7 +15815,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Ana makine envanter kipini ayarla"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16100,7 +15844,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16109,7 +15853,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16165,7 +15909,7 @@ msgstr "Şekil"
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "Paylaşım"
 
@@ -16307,7 +16051,7 @@ msgstr "Eğer Zabbix sunucusu erişilemezse uyarı göster"
 msgid "Show working time"
 msgstr "Çalışma zamanlarını göster"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Gösterilen"
 
@@ -16417,7 +16161,7 @@ msgstr "\"%2$s\" ana makinesine \"%1$s\" grafiğinin kopyalanması atlandı."
 msgid "Slovak (sk_SK)"
 msgstr "Slovakça (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Ertele"
 
@@ -16463,7 +16207,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Girişleri şuna göre sırala"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Sıralama düzeni (0->999)"
 
@@ -16537,7 +16281,7 @@ msgstr "Başlama yeri"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16640,15 +16384,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Durum"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Durum kodları"
@@ -16678,7 +16426,7 @@ msgstr "Yalnızca durum"
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16726,7 +16474,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16791,7 +16539,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Konu"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Altharita"
 
@@ -16807,7 +16555,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Başarı denetimi"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16820,7 +16568,7 @@ msgstr "Ağ arayüzündeki gelen ve giden trafik istatistiklerinin toplamı. Tam
 msgid "Sun"
 msgstr "Paz"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Pazar"
 
@@ -16912,12 +16660,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Saniye olarak sistem çalışma süresi. Tam sayı döndürür"
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Per"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Sal"
@@ -16944,17 +16692,17 @@ msgstr "DOĞRU"
 msgid "Table \"%1$s\" does not exist."
 msgstr "\"%1$s\" tablosu mevcut değil."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "\"%1$s\" tablosunda \"%2$s\" adlı alan yok."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Etiket"
@@ -17010,7 +16758,7 @@ msgstr "Etiket değeri"
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17070,7 +16818,7 @@ msgstr "Hedef tipi"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17091,7 +16839,7 @@ msgstr "Şablon"
 msgid "Template \"%1$s\" already exists."
 msgstr "\"%1$s\" şablonu zaten var."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17115,7 +16863,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Şablon, başka şablonlarla, diğer şablonlar üzerinden bile olsa birden çok kez bağlanamaz."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17175,7 +16923,7 @@ msgstr "\"%1$s\" ile aynı görünür adlı şablon halihazırda mevcut."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17347,14 +17095,14 @@ msgstr "Ana makine artık keşfedilemiyor ve %1$s gün içinde (%2$s günü, %3$
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "Ana makine artık keşfedilemiyor ve bir sonraki sefer keşif kuralı işlendiğinde silinecek."
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "Resim, %1$s simge haritasında kullanılıyor."
 msgstr[1] "Resim, %1$s simge haritalarında kullanılıyor."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17419,7 +17167,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Bu ay"
 
@@ -17427,7 +17175,7 @@ msgstr "Bu ay"
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Bu hafta"
 
@@ -17435,7 +17183,7 @@ msgstr "Bu hafta"
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Bu sene"
 
@@ -17455,7 +17203,7 @@ msgstr ""
 msgid "Thu"
 msgstr "Per"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Perşembe"
 
@@ -17472,7 +17220,7 @@ msgstr "Kadar"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17505,7 +17253,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Zaman dönemi"
 
@@ -17557,12 +17305,11 @@ msgstr "Zaman damgası"
 msgid "To"
 msgstr "Kime"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "Ana makine arayüzü ayarlamak için tüm öğeler için tek bir öğe türü seçin"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Bugün"
 
@@ -17677,7 +17424,7 @@ msgstr "Eğilim depolama süresi"
 msgid "Trends"
 msgstr "Yönelimler"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17685,7 +17432,7 @@ msgstr "Yönelimler"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Tetikleyici"
 
@@ -17786,7 +17533,7 @@ msgstr "Tetikleyici adı"
 msgid "Trigger overview"
 msgstr "Tetikleyicilere genel bakış"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17859,11 +17606,11 @@ msgstr "Tetikleyici prototipleri güncellendi"
 msgid "Trigger severity"
 msgstr "Tetikleyici önem derecesi"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "Tetikleyici durumu \"TAMAM\""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "Tetikleyici durumu \"Problem\""
 
@@ -17880,7 +17627,7 @@ msgstr "Tetikleyici güncellendi"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17915,7 +17662,7 @@ msgstr "Kırp"
 msgid "Tue"
 msgstr "Sal"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Salı"
 
@@ -17928,7 +17675,7 @@ msgstr "Türkçe (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "İki öğe (\"%1$s\" ve \"%2$s\"), bir ana makine envanter alanını (\"%3$s\") oluşturamaz, bu durum çakışmaya neden olur."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17944,19 +17691,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18008,7 +17755,7 @@ msgstr "Bilgi türü"
 msgid "Types"
 msgstr "Türler"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18029,7 +17776,7 @@ msgstr "BİLİNMEYEN"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18075,12 +17822,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "URL, \"%1$s\" haritası için hem \"name\" hem de \"url\" alanlarına sahip olmalıdır."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URL'ler"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18165,12 +17912,12 @@ msgstr "Engeli kaldır"
 msgid "Unblock selected users?"
 msgstr "Seçilen kullanıcıların bloklaması kaldırılsın mı?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18190,21 +17937,23 @@ msgstr "Birim"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Bilinmeyen"
@@ -18222,7 +17971,7 @@ msgid "Unknown error"
 msgstr "Bilinmeyen hata"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Bilinmeyen ana makine öğesi, seçilen ana makinede böyle bir öğe yok"
@@ -18275,7 +18024,7 @@ msgstr "Şablon ile bağlantıyı kaldır"
 msgid "Unlink from templates"
 msgstr "Şablonlar ile bağlantıyı kaldır"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Sesi Aç"
 
@@ -18306,7 +18055,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "\"%1$s\" eyleminin bir filtre koşulu için desteklenmeyen parametre \"%2$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "\"%1$s\" keşif kuralının bir filtre koşulu için desteklenmeyen parametre \"%2$s\"."
@@ -18316,7 +18065,7 @@ msgstr "\"%1$s\" keşif kuralının bir filtre koşulu için desteklenmeyen para
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "\"%1$s\" eyleminin filtresi için desteklenmeyen parametre \"%2$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "\"%1$s\" keşif kuralının filtresi için desteklenmeyen parametre \"%2$s\"."
@@ -18361,7 +18110,7 @@ msgstr "Açık"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18374,7 +18123,7 @@ msgstr "Açık"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18427,7 +18176,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18445,7 +18194,7 @@ msgstr "Karşıya yükle"
 msgid "Upper level maps"
 msgstr "Daha üst seviye haritalar"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18480,7 +18229,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "Eylemlerde kullanılır"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18495,7 +18244,7 @@ msgstr "Eylemlerde kullanılır"
 msgid "User"
 msgstr "Kullanıcı"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "\"%1$s\" kullanıcısı, kullanıcı grubu olmadan bulunamaz."
@@ -18547,7 +18296,7 @@ msgstr "Kullanıcı eklendi"
 msgid "User agent string"
 msgstr "Kullanıcı aracısı stringi"
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Kullanıcı kendini devre dışı bir gruba veya grafik arayüzü erişimi devre dışı olan bir gruba ekleyemez."
@@ -18567,7 +18316,7 @@ msgid_plural "Users deleted"
 msgstr[0] "Kullanıcı silindi"
 msgstr[1] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18577,27 +18326,27 @@ msgstr[1] ""
 msgid "User group"
 msgstr "Kullanıcı grubu"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Kullanıcı grubu \"%1$s\" halihazırda mevcut."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "\"%1$s\" kullanıcı grubu \"%2$s\" eyleminde kullanılıyor."
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Kullanıcı grubu \"%1$s\", veritabanı çalışmıyor mesajlarını yapılandırmada kullanılır."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "\"%1$s\" kullanıcı grubu \"%2$s\" betiği içinde kullanılmış."
@@ -18631,8 +18380,8 @@ msgstr[1] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18676,14 +18425,14 @@ msgstr "Kullanıcı parolası"
 msgid "User profile"
 msgstr "Kullanıcı profili"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18752,7 +18501,7 @@ msgstr "Kullanıcı güncellendi"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "\"%1$s\" ID'li kullanıcı mevcut değil."
@@ -19068,14 +18817,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19085,7 +18834,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19127,7 +18876,7 @@ msgstr "\"%1$s\" değeri \"grid_show\" parametresi için geçersiz. Seçenekler
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "\"%1$s\" değeri \"grid_show\" parametresi için geçersiz. Seçenekler şunlardır: \"%2$s\"."
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "\"%1$s\" değeri %3$d karakter ve \"%2$s\" alanı için çok uzun . İzin verilen uzunluk %4$d karakter."
@@ -19144,7 +18893,7 @@ msgstr "Değer önbellek istatistikleri. Geçerli kipler şunlardır: total, fre
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Değer eşlemesi"
 
@@ -19187,11 +18936,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "Herhangi bir Windows performans sayacının değeri. Tam sayı, float, string veya metin döndürür (isteğe bağlı olarak)"
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19238,7 +18988,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19325,7 +19075,7 @@ msgstr "Ana makine adı eksikse görünür adı boş olamaz."
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Çar"
@@ -19342,7 +19092,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Uyarı"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19351,7 +19101,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Özür dileriz, hatırlamak için olası maksimum eleman sayısına ulaşıldı."
 
@@ -19367,7 +19117,7 @@ msgstr "Özür dileriz, hatırlamak için olası maksimum eleman sayısına ula�
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web"
 
@@ -19379,7 +19129,7 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Web gözlemleme"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr "Web senaryosu"
 
@@ -19394,27 +19144,27 @@ msgstr "\"%1$s\" web senaryosu, \"%2$s\" sunucusunda halihazırda mevcut."
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "\"%1$s\" web senaryosu zaten var."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "Web senaryosu eklendi"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Web senaryosu silindi"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Web senaryosu devre dışı"
 msgstr[1] "Web senaryoları devre dışı"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Web senaryosu etkin"
 msgstr[1] "Web senaryosları etkin"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "Web senaryosu güncellendi"
 
@@ -19436,7 +19186,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Pts"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Çarşamba"
 
@@ -19447,7 +19197,7 @@ msgstr "Çarşamba"
 msgid "Weekly"
 msgstr "Haftalık"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19463,12 +19213,12 @@ msgstr "Buraya hoş geldiniz"
 msgid "When active"
 msgstr "Aktif olduğunda"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19663,6 +19413,10 @@ msgstr "Y-m-d H:i"
 msgid "Y-m-d H:i:s"
 msgstr "Y-m-d H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr "Y1"
@@ -19724,7 +19478,7 @@ msgstr "Yıllık"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19781,18 +19535,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19804,9 +19552,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Bu işlemi gerçekleştirmek için izniniz yok."
 
@@ -19922,24 +19667,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr "bir boole bekleniyor"
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "bir karakter string bekleniyor"
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19948,37 +19697,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr "bir sayı bekleniyor"
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr "bir sayı çok büyük"
@@ -19999,28 +19748,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr "bir zaman bekleniyor"
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr "bir zaman periyodu bekleniyor"
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr "bir zaman birimi bekleniyor"
@@ -20068,7 +19818,7 @@ msgstr "hepsi"
 msgid "all media"
 msgstr "bütün medyalar"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20076,42 +19826,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "bir dizi bekleniyor"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr "bir dizi veya bir string bekleniyor"
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20121,7 +19866,7 @@ msgid "an empty string is expected"
 msgstr "boş bir string bekleniyor"
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr "çift sayıda onaltılık karakter bekleniyor"
 
@@ -20129,11 +19874,15 @@ msgstr "çift sayıda onaltılık karakter bekleniyor"
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20294,14 +20043,8 @@ msgstr "değiştirilemez"
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20331,19 +20074,11 @@ msgstr "değiştirilemez"
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20363,14 +20098,14 @@ msgstr "değiştirilemez"
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20378,7 +20113,7 @@ msgstr "değiştirilemez"
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "boş olamaz"
@@ -20391,7 +20126,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20425,7 +20160,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "çevrimsel öğe bağımlılığına izin verilmiyor"
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20443,7 +20178,8 @@ msgid "configure"
 msgstr "yapılandır"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20472,7 +20208,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "g"
@@ -20534,7 +20270,7 @@ msgstr "azalan"
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20556,13 +20292,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20588,7 +20324,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20625,6 +20362,10 @@ msgstr "ifade boş"
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20671,7 +20412,7 @@ msgstr "genel temizlik hizmeti ayarları"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "sa"
@@ -20712,6 +20453,11 @@ msgstr "simge"
 msgid "image"
 msgstr "resim"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "içinde"
@@ -20752,15 +20498,19 @@ msgstr "yanlış eleman sayısı"
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "\"%1$s\" yakınında yanlış sözdizimi"
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20788,7 +20538,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr "yanlış adres aralığı \"%1$s\""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr "UTF-8'de geçersiz bayt dizisi"
 
@@ -20817,27 +20567,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr "geçersiz geçmiş depolama süresi"
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr "geçersiz düzenli ifade"
 
@@ -20865,7 +20615,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr "{} içine alınmamış veya hatalı biçimlendirilmiş"
 
@@ -20951,12 +20701,12 @@ msgstr "düşük seviye keşif kuralı"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "dk"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "ay"
@@ -21015,7 +20765,7 @@ msgstr "eşleşmeler"
 msgid "max"
 msgstr "maks"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21055,7 +20805,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr "minimum uzunluk %1$s karakter"
@@ -21082,8 +20832,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21098,27 +20848,14 @@ msgstr "geçerli bir LDAP kullanısı olmak zorunda"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "\"%1$s\" ile \"%2$s\" arasında olmalı"
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21146,6 +20883,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21156,7 +20901,7 @@ msgstr ""
 msgid "name"
 msgstr "ad"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "yeni"
 
@@ -21291,7 +21036,7 @@ msgstr "çıktı"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21326,24 +21071,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21371,11 +21120,11 @@ msgstr ""
 msgid "regular expression"
 msgstr "düzenli ifade"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21387,15 +21136,15 @@ msgstr ""
 msgid "right"
 msgstr "sağ"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21443,7 +21192,7 @@ msgstr ""
 msgid "short description"
 msgstr "kısa tanımlama"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21462,15 +21211,15 @@ msgstr "kısa tanımlama"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr "boş olmalı"
 
@@ -21486,31 +21235,31 @@ msgstr "simge haritalarını göster"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21518,11 +21267,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21538,8 +21287,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21550,7 +21299,7 @@ msgstr ""
 msgid "tag"
 msgstr "etiket"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21559,13 +21308,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "\"%1$s\" şablon ID'si %2$s defa geçti"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21574,20 +21327,20 @@ msgstr "\"%1$s\" şablon ID'si %2$s defa geçti"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "\"%1$s\" parametresi eksik"
@@ -21619,39 +21372,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21665,7 +21418,7 @@ msgstr "tetikleyici"
 msgid "trigger does not allow manual closing"
 msgstr "tetikleyici elle kapatmaya izin vermiyor"
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21677,26 +21430,26 @@ msgstr "tetikleyici prototipi başka bir şablona veya ana makineye taşınamaz"
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr "bağlantılara sahip tetikleyici başka bir şablona veya ana makineye taşınamaz"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "aramak için buraya yazın"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21704,11 +21457,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21725,10 +21478,10 @@ msgstr "beklenmedik anahtar sonu"
 msgid "unexpected end of macro"
 msgstr "beklenmedik makro sonu"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21738,11 +21491,12 @@ msgstr "beklenmedik makro sonu"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr "beklenmedik parametre \"%1$s\""
@@ -21768,8 +21522,8 @@ msgstr "beklenmedik metin \"%1$s\""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21794,6 +21548,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr "desteklenmeyen sürüm numarası"
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21809,7 +21567,7 @@ msgstr "desteklenmeyen sürüm numarası"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21829,11 +21587,11 @@ msgstr "desteklenmeyen sürüm numarası"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "değer"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21851,76 +21609,85 @@ msgstr "\"%1$s\" değeri bulunamadı"
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr "%1$s değeri halihazırda mevcut"
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr "değer çok uzun"
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21932,18 +21699,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr "değer %1$s değerlerinden biri olmalıdır"
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21952,7 +21717,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21965,11 +21730,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21986,7 +21751,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/uk/LC_MESSAGES/frontend.po b/ui/locale/uk/LC_MESSAGES/frontend.po
index 98d3addfb4e..e8e9dd21da2 100644
--- a/ui/locale/uk/LC_MESSAGES/frontend.po
+++ b/ui/locale/uk/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2016-02-09 16:27+0300\n"
 "Last-Translator: Oleksii <oleksii.zagorskyi@zabbix.com>\n"
 "Language-Team: Zabbix translation team\n"
@@ -95,7 +95,7 @@ msgstr[0] "%1$d день"
 msgstr[1] "%1$d дні"
 msgstr[2] "%1$d днів"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -187,7 +187,7 @@ msgstr[2] "%1$s повідомлень"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -203,7 +203,7 @@ msgstr[0] "%1$s з %2$s елемента в стані проблеми"
 msgstr[1] "%1$s з %2$s елементів в стані проблеми"
 msgstr[2] "%1$s з %2$s елементів в стані проблеми"
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -239,7 +239,7 @@ msgstr[2] "залишилось %1$s спроб"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
@@ -247,7 +247,7 @@ msgstr[0] "%1$s секунда"
 msgstr[1] "%1$s секунди"
 msgstr[2] "%1$s секунд"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr "залишилось %1$s символів"
@@ -268,13 +268,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Важливість, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, тільки читання"
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -406,7 +406,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -470,10 +470,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "Доступ заборонено"
@@ -516,7 +512,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Підтверджено"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Підтвердити"
 
@@ -524,7 +520,7 @@ msgstr "Підтвердити"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Підтверджено"
@@ -537,7 +533,7 @@ msgstr "Підтверджені події ПРОБЛЕМА"
 msgid "Acknowledged RESOLVED events"
 msgstr "Підтверджені ВИРІШЕНІ події"
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -564,9 +560,9 @@ msgstr "Підтверджені ВИРІШЕНІ події"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -623,7 +619,7 @@ msgstr "Дія \"%1$s\" вже існує."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "В дії \"%1$s\" не вказано операцій."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -632,7 +628,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Дію додано"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -683,8 +679,8 @@ msgstr "Дію оновлено"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Дії"
@@ -751,7 +747,7 @@ msgstr "Активно до"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -762,7 +758,7 @@ msgstr "Активно до"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -785,9 +781,9 @@ msgstr "Активно до"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -857,7 +853,7 @@ msgstr "Активно до"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Додати"
 
@@ -865,11 +861,11 @@ msgstr "Додати"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "Додати новий віджет"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "Додати підлеглий елемент"
 
@@ -877,7 +873,7 @@ msgstr "Додати підлеглий елемент"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -894,7 +890,7 @@ msgstr "Додати вузел мережі"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "Додати кілька карт"
 
@@ -916,7 +912,7 @@ msgstr "Додати нове заміщення"
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -968,12 +964,12 @@ msgstr ""
 msgid "Add widget"
 msgstr "Додати віджет"
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -983,7 +979,7 @@ msgstr "Додано, %1$s"
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -996,7 +992,7 @@ msgstr "Адміністратор"
 msgid "Administration"
 msgstr "Адміністрування"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -1018,7 +1014,7 @@ msgstr "З віком менше ніж"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1090,7 +1086,7 @@ msgstr "Вирівняти елементи карти"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Все"
 
@@ -1108,7 +1104,7 @@ msgstr "Всі групи"
 msgid "All hosts"
 msgstr "Всі вузли мережі"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Всі посилання повинні мати вказані \"І'мя\" та \"URL-запит\""
 
@@ -1126,7 +1122,7 @@ msgstr "Всі проблеми"
 msgid "All problems if tag values match"
 msgstr "Всі проблеми якщо значення тегів співпадають"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1239,15 +1235,15 @@ msgstr "Помилка програми."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Задіяти"
 
@@ -1265,7 +1261,7 @@ msgstr "Наближається"
 msgid "Apr"
 msgstr "Кві"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Квітень"
 
@@ -1293,7 +1289,7 @@ msgstr "Тип області"
 msgid "Arithmetic"
 msgstr "Арифметика"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1344,7 +1340,7 @@ msgstr "В (час:хвилина)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1353,7 +1349,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1365,6 +1361,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr "Принаймні она група вузлів мережі або вузол мережі має бути вибрано."
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1376,7 +1377,7 @@ msgstr "Має бути створено як мінімум один періо
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1432,7 +1433,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Сер"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Серпень"
 
@@ -1445,7 +1446,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1522,7 +1523,7 @@ msgstr "Авто-вихід"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1537,7 +1538,7 @@ msgstr "Автоматичне призначення іконок"
 msgid "Automatic icon selection"
 msgstr "Автоматичний вибір іконок"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1589,7 +1590,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr "Вісі"
 
@@ -1652,7 +1653,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Заблоковано"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "Блакитна"
 
@@ -1706,11 +1707,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "По нижньому краю"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "Перемістити вперед"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "Перемістити на самий перед"
 
@@ -1736,7 +1737,7 @@ msgstr "CERT"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1781,8 +1782,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1791,7 +1792,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Вираховується автоматично"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr "Календар"
 
@@ -1816,7 +1817,7 @@ msgstr "Зворотній виклик"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1829,8 +1830,8 @@ msgstr "Зворотній виклик"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Скасувати та повернутись"
 
@@ -1860,7 +1861,7 @@ msgstr "Не вдалося додати дію"
 msgid "Cannot add correlation"
 msgstr "Не вдалося додати кореляцію"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1870,7 +1871,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Не вдалося додати залежність від вузла мережі до шаблону."
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1901,8 +1902,8 @@ msgid "Cannot add host prototype"
 msgstr "Не вдалося додати прототип вузла мережі"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Не вдалося додати картинку"
 
@@ -1995,15 +1996,15 @@ msgstr "Не вдалося додати користувача"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Не вдалося додати веб сценарій"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -2023,33 +2024,29 @@ msgstr "Не вдалося прив'язатися до LDAP сервера."
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Не вдалося очистити історію"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Не вдалося клонувати прототипи графіків."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "Не вдалося клонувати прототипи вузлів мережі."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Не вдалося клонувати прототипи елементів даних."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Не вдалося клонувати прототипи тригерів."
 
@@ -2077,7 +2074,7 @@ msgstr[0] "Не вдалося скопіювати графік"
 msgstr[1] "Не вдалося скопіювати графіки"
 msgstr[2] "Не вдалося скопіювати графіки"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "Не вдалося скопіювати елемент даних"
@@ -2131,8 +2128,8 @@ msgstr "Не вдалося створити призначення іконок
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2162,7 +2159,7 @@ msgstr "Не вдалося видалити внутрішнього корис
 msgid "Cannot delete action"
 msgstr "Не вдалося видалити дію"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2235,7 +2232,7 @@ msgstr[0] "Не вдалось видалити вузел мережі тому
 msgstr[1] "Не вдалось видалити вузли мережі тому, що обслуговування \"%1$s\" має містити принаймні один вузел мережі або групу вузлів мережі."
 msgstr[2] "Не вдалось видалити вузли мережі тому, що обслуговування \"%1$s\" має містити принаймні один вузел мережі або групу вузлів мережі."
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2247,11 +2244,11 @@ msgstr[2] "Не вдалось видалити групи вузлів мере
 msgid "Cannot delete host prototypes"
 msgstr "Не вдалося видалити прототипи вузлів мережі"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Не вдалося видалити призначення іконок"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Не вдалося видалити картинку"
 
@@ -2276,7 +2273,7 @@ msgstr "Не вдалося видалити прототип елементів
 msgid "Cannot delete item prototypes"
 msgstr "Не вдалося видалити прототипи елементів даних"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Не вдалося видалити елементи даних"
 
@@ -2310,7 +2307,7 @@ msgstr[0] "Не вдалося видалити проксі"
 msgstr[1] "Не вдалося видалити проксі"
 msgstr[2] "Не вдалося видалити проксі"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2336,7 +2333,7 @@ msgstr[0] "Не вдалося видалити скрипт"
 msgstr[1] "Не вдалося видалити скрипти"
 msgstr[2] "Не вдалося видалити скрипти"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Не вдалося видалити скрипт. Скрипт \"%1$s\" використовується в операції дії \"%2$s\"."
@@ -2353,8 +2350,8 @@ msgstr[0] "Не вдалося видалити послугу"
 msgstr[1] "Не вдалося видалити послугу"
 msgstr[2] "Не вдалося видалити послугу"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2383,7 +2380,7 @@ msgstr "Не вдалося видалити шаблонний прототип
 msgid "Cannot delete templated item."
 msgstr "Не вдалося видалити шаблонний елемент даних."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Не вдалося видалити шаблонні елементи даних."
 
@@ -2439,7 +2436,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Не вдалося видалити веб сценарій"
 
@@ -2479,7 +2476,7 @@ msgstr[0] "Не вдалося дезактивувати вузел мереж�
 msgstr[1] "Не вдалося дезактивувати вузли мережі"
 msgstr[2] "Не вдалося дезактивувати вузли мережі"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Не вдалося дезактивувати елемент даних"
@@ -2515,7 +2512,7 @@ msgstr[0] "Не вдалося дезактивувати тригер"
 msgstr[1] "Не вдалося дезактивувати тригери"
 msgstr[2] "Не вдалося дезактивувати тригери"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Не вдалося відключити веб сценарій"
@@ -2568,7 +2565,7 @@ msgstr[0] "Не вдалося активувати вузел мережі"
 msgstr[1] "Не вдалося активувати вузли мережі"
 msgstr[2] "Не вдалося активувати вузли мережі"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Не вдалося активувати елемент даних"
@@ -2604,7 +2601,7 @@ msgstr[0] "Не вдалося активувати тригер"
 msgstr[1] "Не вдалося активувати тригери"
 msgstr[2] "Не вдалося активувати тригери"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Не вдалося активувати веб сценарій"
@@ -2619,7 +2616,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr "Не вдалося розкрити макроси."
 
@@ -2653,8 +2650,8 @@ msgstr "Не вдалося знайти вузел мережі \"%1$s\" яки
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Не вдалося знайти групу вузлів мережі \"%1$s\" для прототипу вузлів мережі \"%2$s\" правила виявлення \"%3$s\" на \"%4$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2752,24 +2749,20 @@ msgstr "Не вдалося знайти перетворення значень
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Не вдалося знайти перетворення значень \"%1$s\" яке використовується в прототипі елементів даних \"%2$s\" правила виявлення \"%3$s\" на \"%4$s\"."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "Видиме ім'я шаблону не може бути пустим."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2783,7 +2776,7 @@ msgstr[0] "Не вдалося імпортувати шаблон \"%1$s\", п�
 msgstr[1] "Не вдалося імпортувати шаблон \"%1$s\", приєднані шаблони \"%2$s\" не існують."
 msgstr[2] "Не вдалося імпортувати шаблон \"%1$s\", приєднані шаблони \"%2$s\" не існують."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "Не вдалося вставити вираз тригера"
 
@@ -2797,7 +2790,7 @@ msgid "Cannot link template."
 msgstr "Не вдалося приєднати шаблон."
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2830,17 +2823,17 @@ msgstr "Неможливо масово оновити видиме ім'я ша
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Неможливо виконати запит видалення з таблиці \"%1$s\" без виразу where."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Неможливо виконати запит оновлення таблиці \"%1$s\" без значень."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Неможливо виконати запит оновлення таблиці \"%1$s\" без виразу where."
@@ -2867,7 +2860,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Не вдалося прочитати відповідь, перевірте з'єднання з Zabbix сервером \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Не вдалось перейменувати гостьового користувача."
 
@@ -2886,7 +2879,7 @@ msgstr "Не вдалося зберегти віджет \"%1$s\"."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Не вдалося відправити команду, перевірте з'єднання з Zabbix сервером \"%1$s\"."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr "Не вдалося відправити запит"
 
@@ -2926,12 +2919,12 @@ msgstr "Не вдалося задати поля інтентарних дан�
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2951,7 +2944,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Не вдалося від'єднати і очистити веб сценарії."
 
@@ -2964,7 +2957,7 @@ msgstr "Не вдалося від'єднати шаблон"
 msgid "Cannot unlink template."
 msgstr "Не вдалося від'єднати шаблон."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -3017,11 +3010,6 @@ msgstr "Не вдалося оновити \"%1$s\" для виявленого
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "Не вдалося оновити \"%2$s\" у виявленого тригера \"%1$s\"."
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "Не вдалося оновити \"imagetype\" для картинки \"%1$s\"."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -3031,9 +3019,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "Не вдалося оновити виявлений графік."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "Не вдалося оновити виявлену групу вузлів мережі."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -3093,9 +3082,7 @@ msgstr "Не вдалося оновити прототип графіку"
 msgid "Cannot update group"
 msgstr "Не вдалося оновити групу"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Не вдалося оновити групи для виявленого вузла мережі \"%1$s\"."
@@ -3119,13 +3106,13 @@ msgstr[2] "Не вдалося оновити прототипи вузлів м
 msgid "Cannot update hosts"
 msgstr "Не вдалося оновити вузли мережі"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "Не вдалося оновити призначення іконок"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Не вдалося оновити картинку"
 
@@ -3180,12 +3167,12 @@ msgstr "Не вдалося оновити карту мережі"
 msgid "Cannot update proxy"
 msgstr "Не вдалося оновити проксі"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Не вдалося оновити проксі для виявленого вузла мережі \"%1$s\"."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3205,17 +3192,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Не вдалося оновити скрипт"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3292,7 +3279,7 @@ msgstr[2] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Не вдалося оновити веб сценарій"
 
@@ -3392,8 +3379,8 @@ msgid "Character string not included"
 msgstr "Не містить рядок символів"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3508,7 +3495,7 @@ msgstr "Перевіряє швидкодію UDP сервісу. Поверта
 msgid "Checks should be unique."
 msgstr "Перевірки повинні бути унікальними."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3529,7 +3516,7 @@ msgstr "Посилання, утворююче кільце, в шаблонах
 msgid "Circular template linkage is not allowed."
 msgstr "Приєднання шаблону, утворююче кільце, не дозволено."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3550,11 +3537,11 @@ msgstr "Очистити історію та динаміку змін"
 msgid "Clear when unlinking"
 msgstr "Очистити при від'єднанні"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr "Натисніть та тягніть до бажаного розміру."
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr "Клацніть для перегляду або редагування"
 
@@ -3569,7 +3556,7 @@ msgstr "Годинник"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3584,7 +3571,7 @@ msgstr "Годинник"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Клонувати"
 
@@ -3595,8 +3582,8 @@ msgstr "Клонувати"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Закрити"
 
@@ -3607,13 +3594,13 @@ msgstr "Закрити"
 msgid "Close expression constructor"
 msgstr "Закрити конструктор виразу"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Закрити нову подію"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Закрити старі події"
 
@@ -3626,8 +3613,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "Згорнути"
 
@@ -3644,7 +3631,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3710,7 +3697,7 @@ msgstr "Стиснення"
 msgid "Concurrent sessions"
 msgstr "Одночасні сесії"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3721,17 +3708,12 @@ msgstr "Умова"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "Умова \"%2$s\" не використовується в формулі \"%3$s\" для дії \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "Умова \"%2$s\" не використовується в формулі \"%3$s\" для кореляції \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "Умова \"%2$s\" не використовується в формулі \"%3$s\" для правила виявлення \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3741,17 +3723,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "Умову \"%2$s\" яка використовується в формулі \"%3$s\" для дії \"%1$s\" не задано."
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "Умову \"%2$s\", використовувану в формулі \"%3$s\" для кореляції \"%1$s\", не визначено."
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "Умову \"%2$s\" яка використовується в формулі \"%3$s\" для правила виявлення \"%1$s\" не задано."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3767,7 +3744,7 @@ msgstr "Умови"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Налаштування"
 
@@ -3830,7 +3807,7 @@ msgstr "Налаштування вузлів мережі"
 msgid "Configuration of housekeeping"
 msgstr "Налаштування очистки"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Налаштування призначення іконок"
@@ -3937,7 +3914,7 @@ msgstr "Текст підтвердження"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "Вітаємо! Ви успішно встановили веб-інтерфейс Zabbix."
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -4030,7 +4007,7 @@ msgstr "Контактна інформація"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -4090,7 +4067,7 @@ msgstr "Містить"
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr "Керування вмістом"
 
@@ -4129,8 +4106,8 @@ msgstr "Координати"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Копіювати"
 
@@ -4139,12 +4116,11 @@ msgstr "Копіювати"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "Кореляція"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "Кореляція \"%1$s\" вже існує."
@@ -4175,16 +4151,6 @@ msgstr[0] "Кореляцію активовано"
 msgstr[1] "Кореляції активовано"
 msgstr[2] "Кореляції активовано"
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "У кореляції відсутні параметри: %1$s"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "Ім'я кореляції не може бути пустим."
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr "Правило кореляції"
@@ -4193,14 +4159,10 @@ msgstr "Правило кореляції"
 msgid "Correlation updated"
 msgstr "Кореляцію оновлено"
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Не вдалося зберегти картинку!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Кількість"
 
@@ -4264,11 +4226,11 @@ msgstr "Створити кореляцію"
 msgid "Create dashboard"
 msgstr "Створити панель"
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr "Створити залежне правило виявлення"
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr "Створити залежний елемент даних"
 
@@ -4385,7 +4347,7 @@ msgstr "Створити карту мережі"
 msgid "Create media type"
 msgstr "Створити метод повідомлень"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "Створити нові"
 
@@ -4409,7 +4371,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Створити шаблон"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Створити тригер"
 
@@ -4572,7 +4534,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "DNS ім'я"
@@ -4584,11 +4546,11 @@ msgstr "DNS ім'я"
 msgid "Daily"
 msgstr "Щодня"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "Темна"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4609,8 +4571,8 @@ msgstr "Панель \"%1$s\" вже існує."
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr "Панель створено"
 
@@ -4634,9 +4596,9 @@ msgstr "Властивості панелі"
 msgid "Dashboard sharing"
 msgstr "Спільний доступ до панелі"
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr "Панель обновлено"
 
@@ -4660,7 +4622,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr "Панелі"
 
@@ -4688,7 +4650,7 @@ msgstr "Огляд даних"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr "Набір даних"
 
@@ -4830,7 +4792,7 @@ msgstr "День в тиждень"
 msgid "Days"
 msgstr "Днів"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Дебаг"
 
@@ -4844,26 +4806,26 @@ msgstr "Режим діагност."
 msgid "Dec"
 msgstr "Гру"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Грудень"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "По замовчуванню"
 
@@ -4956,7 +4918,7 @@ msgstr "Затримується на"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4980,8 +4942,8 @@ msgstr "Затримується на"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Видалити"
 
@@ -5006,11 +4968,11 @@ msgstr "Видалити та очистити шаблон? (УВАГА: всі
 msgid "Delete current action?"
 msgstr "Видалити поточну дію?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "Видалити потчну кореляцію?"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr "Видалити панель?"
 
@@ -5054,7 +5016,7 @@ msgstr "Видалити прототип елементів даних?"
 msgid "Delete item?"
 msgstr "Видалити елемент даних?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Видалити лінки між обраними елементами?"
 
@@ -5110,7 +5072,7 @@ msgstr "Видалити обрані панелі?"
 msgid "Delete selected discovery rules?"
 msgstr "Видалити вибрані правила виявлення?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Видалити вибрані елементи?"
 
@@ -5215,7 +5177,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "Видалити обрані фігури?"
 
@@ -5259,7 +5221,7 @@ msgstr "Видалити тригер?"
 msgid "Delete web scenario?"
 msgstr "Видалити веб сценарій?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5304,7 +5266,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Залежності"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Залежність"
 
@@ -5312,7 +5274,7 @@ msgstr "Залежність"
 msgid "Dependent item"
 msgstr "Залежний елемент даних"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5322,7 +5284,7 @@ msgstr "Залежить від"
 msgid "Deployment status"
 msgstr "Статус розгортання"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5355,7 +5317,7 @@ msgid "Description"
 msgstr "Опис"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5521,10 +5483,10 @@ msgstr "Дезактивувати вибрані веб сценарії?"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5607,7 +5569,7 @@ msgid "Discovery by proxy"
 msgstr "Виявлення через проксі"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Перевірка виявлення"
 
@@ -5619,7 +5581,7 @@ msgstr "Перевірки виявлення"
 msgid "Discovery list"
 msgstr "Список виявлення"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Об'єкт виявлення"
 
@@ -5651,7 +5613,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5659,12 +5621,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Правило виявлення"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Правило виявлення \"%1$s\" вже існує у \"%2$s\", успадковано з іншого шаблону."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "Правило виявлення \"%1$s\" вже існує у \"%2$s\"."
@@ -5677,7 +5639,7 @@ msgstr "Правило виявлення \"%1$s\" вже існує у \"%2$s\"
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "Правило виявлення \"%1$s\" вже існує."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr "Правило виявлення \"%1$s\" не може бути скопійоване без його майстер елемента даних."
@@ -5722,7 +5684,7 @@ msgstr "Правило виявлення оновлено"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5733,7 +5695,7 @@ msgstr "Правила виявлення"
 msgid "Discovery rules deleted"
 msgstr "Правила виявлення видалено"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Стан виявлення"
@@ -5770,10 +5732,11 @@ msgid "Display stacked graph"
 msgstr "Показати стекований графік"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Відображено %1$s із %2$s знайдених"
@@ -5783,7 +5746,7 @@ msgstr "Відображено %1$s із %2$s знайдених"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "Відображено від %1$s до %2$s з %3$s знайдених"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr "Опції відображення"
 
@@ -5805,7 +5768,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Ви дійсно хочете замінити умовний вираз?"
 
@@ -5861,7 +5824,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Недоступний"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5869,7 +5832,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr "Завантажити конфігураційний файл"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5888,18 +5851,6 @@ msgstr "Креслити"
 msgid "Draw style"
 msgstr "Стиль креслення"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "Дублікат \"%1$s\" значення \"%2$s\" в кореляції \"%3$s\"."
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr "Дублікат \"%1$s\" значення \"%2$s\" в кореляції."
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5912,11 +5863,6 @@ msgstr "Дублікат значення \"%1$s\" для \"name\" у карти
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5968,7 +5914,7 @@ msgstr "Динамічний елемент"
 msgid "Dynamic items"
 msgstr "Динамічні елементи даних"
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Кожнен URL-запит повинен мати унікальне ім'я. Будь ласка переконайтесь що це тільки один URL-запит з таким іменем"
 
@@ -5977,11 +5923,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5995,8 +5941,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Змінити"
 
@@ -6012,11 +5958,11 @@ msgstr "Редагувати карту мережі"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr "Редагувати елемент дерева"
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Редагувати тригер"
 
@@ -6076,21 +6022,17 @@ msgstr "Пустий файл SSL ключа у веб сценарії \"%1$s\"
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "Пустий ID кореляції."
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "Пустий ID формули умови фільтру для дії \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Пустий ID формули умови фільтру для правила виявлення \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "Пустий макрос умови фільтру для правила виявлення \"%1$s\"."
@@ -6106,25 +6048,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr "Пустий тип умови фільтру для дії \"%1$s\"."
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -6134,14 +6070,6 @@ msgstr "Вхідний параметр пустий."
 msgid "Empty map ID."
 msgstr "Пустий ID карти мережі."
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "Пустий ID методу повідомлень."
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Пусті параметри"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6307,7 +6235,7 @@ msgstr "Активувати трапи"
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6318,7 +6246,7 @@ msgstr "Активувати трапи"
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6361,7 +6289,7 @@ msgid "English (en_US)"
 msgstr "Англійська (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6377,7 +6305,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6396,12 +6324,12 @@ msgstr "Дорівнює"
 msgid "Error"
 msgstr "Помилка"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Помилка в запиті пошуку в таблиці \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr "Повідомлення про помилку"
 
@@ -6428,7 +6356,7 @@ msgstr "ID події"
 msgid "Event acknowledged"
 msgstr "Подію підтвержено"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6436,7 +6364,7 @@ msgid "Event correlation"
 msgstr "Кореляція подій"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "Правила кореляції події"
@@ -6471,11 +6399,11 @@ msgstr "Моніторинг журналів подій. Повертає за�
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "Пара тегів події"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Тип події"
 
@@ -6521,15 +6449,10 @@ msgstr "Виключено"
 msgid "Exclude host groups"
 msgstr "Виключити групи вузлів мережі"
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Виконати"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "Помилка виконання SQL [%1$s] у [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6567,7 +6490,7 @@ msgstr "Виконано"
 msgid "Executed script"
 msgstr "Скрипт для виконання"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Підтвердження виконання"
 
@@ -6583,8 +6506,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "Розгорнути"
 
@@ -6705,7 +6628,7 @@ msgstr "Вирази"
 msgid "External check"
 msgstr "Зовнішня перевірка"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "Пт"
@@ -6732,8 +6655,8 @@ msgstr "Помилковий"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6744,26 +6667,26 @@ msgstr "Помилка при створенні панелі"
 msgid "Failed to parse URL."
 msgstr "Помилка при обробці URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr "Помилка при оновленні панелі"
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6771,7 +6694,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Помилка при оновленні шаблону."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6795,7 +6718,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Лют"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Лютий"
 
@@ -6817,10 +6740,9 @@ msgstr "Поле \"%1$s\" не може бути встановлено в NULL.
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6831,13 +6753,6 @@ msgstr "Поле \"%1$s\" є обов'язковим."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "В полі \"%1$s\" відсутнє значення для карти мережі \"%2$s\"."
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "В полі \"%1$s\" відсутнє значення для методу повідомлень \"%2$s\"."
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6856,11 +6771,6 @@ msgstr "Поле \"%1$s\" не ціле число."
 msgid "Field \"%1$s\" is not string."
 msgstr "Поле \"%1$s\" не рядок."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "Поле \"%1$s\" є обов'язковим для методу повідомлень \"%2$s\"."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6875,10 +6785,6 @@ msgstr "Поле \"host\" є обов'язковим."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Формат файлу не підтримується."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6943,7 +6849,8 @@ msgstr "Заповнений регіон"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6968,7 +6875,7 @@ msgstr "Фільтр"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -7020,7 +6927,7 @@ msgstr "Вписати в карту мережі"
 msgid "Fixed"
 msgstr "Фіксоване"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -7071,12 +6978,12 @@ msgstr "Формула"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -7089,7 +6996,7 @@ msgstr "Французька (fr_FR)"
 msgid "Fri"
 msgstr "П'ят"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "П'ятниця"
 
@@ -7200,7 +7107,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "Наданий вираз це не макрос"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr "Глобальний регулярний вираз \"%1$s\" не існує."
@@ -7214,7 +7121,7 @@ msgstr "Глобальне значення"
 msgid "Go back to %1$s"
 msgstr "Повернутись до %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Перейти до"
 
@@ -7252,7 +7159,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7260,7 +7167,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Градієнтна лінія"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7321,7 +7228,7 @@ msgstr[2] "Графіки скопійовано"
 msgid "Graph deleted"
 msgstr "Графік видалено"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7358,8 +7265,8 @@ msgstr "Прототип графіків видалено"
 msgid "Graph prototype updated"
 msgstr "Прототип графіків оновлено"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr "Прототип графіка з ID \"%1$s\" недоступний."
@@ -7393,8 +7300,8 @@ msgstr "Тип графіка"
 msgid "Graph updated"
 msgstr "Графік оновлено"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr "Графік з ID \"%1$s\" недоступний."
@@ -7425,7 +7332,7 @@ msgstr "Графік з іменем \"%1$s\" вже існує в графік�
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Графіки"
 
@@ -7446,12 +7353,12 @@ msgstr "Сітка"
 msgid "Group"
 msgstr "Група"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Групу \"%1$s\" не може бути видалено, так як вона використовується прототипом вузлів мережі."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr "Група \"%1$s\" не може бути видалена, так як вона використовується в умові кореляції."
@@ -7626,11 +7533,11 @@ msgstr "Допомога"
 msgid "Hexadecimal to decimal"
 msgstr "Шістнадцяткове в десяткове"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Прихована"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "Сховати діагностичну інф."
 
@@ -7657,11 +7564,11 @@ msgstr "Ієрархія"
 msgid "High"
 msgstr "Висока"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr "Висококонтрастна темна"
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr "Висококонтрастна світла"
 
@@ -7682,7 +7589,7 @@ msgstr "Підсвічувати весь рядок"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Історія"
 
@@ -7690,11 +7597,15 @@ msgstr "Історія"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Історію очищено"
 
@@ -7737,7 +7648,7 @@ msgstr "Горизонтальний"
 msgid "Horizontal align"
 msgstr "Вирівнювання по горизонталі"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7766,7 +7677,7 @@ msgstr "Вирівнювання по горизонталі"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7781,7 +7692,7 @@ msgstr[2] "Вузли мережі"
 msgid "Host \"%1$s\" already exists."
 msgstr "Вузел мережі \"%1$s\" вже існує."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7789,7 +7700,7 @@ msgstr "Вузел мережі \"%1$s\" вже існує."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "Вузел мережі \"%1$s\" не може бути без групи вузлів мережі."
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7843,7 +7754,7 @@ msgstr[0] "Вузел мережі активовано"
 msgstr[1] "Вузли мережі активовано"
 msgstr[2] "Вузли мережі активовано"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7857,22 +7768,22 @@ msgstr[2] "Вузли мережі активовано"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Група вузлів мережі"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Група вузлів мережі \"%1$s\" вже існує."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "Група вузлів мережі \"%1$s\" не може бути видалена, так як вона використовується в глобальному скрипті."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7885,10 +7796,10 @@ msgstr "Елементи групи вузлів мережі"
 msgid "Host group label type"
 msgstr "Тип ярлика до групи вузлів мережі"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Група вузлів мережі з ID \"%1$s\" недоступна."
@@ -7904,8 +7815,8 @@ msgstr "Група вузлів мережі з ID \"%1$s\" недоступна
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7979,7 +7890,7 @@ msgstr "Ім'я вузла мережі"
 msgid "Host networks"
 msgstr "Мережі вузла мережі"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -8060,7 +7971,7 @@ msgstr "Помилка при оновленні вузла мережі."
 msgid "Host updated"
 msgstr "Вузел мережі оновлено"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr "Вузел мережі з ID \"%1$s\" недоступний."
@@ -8080,7 +7991,7 @@ msgstr "Вузел мережі з таким самим іменем \"%1$s\" �
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Вузел мережі з таким самим видимим іменем \"%1$s\" вже існує."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -8093,7 +8004,7 @@ msgstr "Вузел мережі з таким самим видимим імен
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -8141,7 +8052,7 @@ msgstr "Вузли мережі оновлено"
 msgid "Hours"
 msgstr "Годин"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8181,7 +8092,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IP-адрес"
@@ -8206,7 +8117,7 @@ msgstr "Діапазон IP \"%1$s\" перевищує ліміт адрес \"
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8263,12 +8174,12 @@ msgstr "Виділення іконки"
 msgid "Icon map"
 msgstr "Призначення іконок"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Призначення іконок \"%1$s\" не може бути видалено. Використовується в карті мережі \"%2$s\"."
@@ -8281,18 +8192,18 @@ msgstr "Призначення іконок створено"
 msgid "Icon map deleted"
 msgstr "Призначення іконок видалено"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Призначення іконок оновлено"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "Призначення іконок"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "Іконка з ID \"%1$s\" недоступна."
@@ -8395,23 +8306,20 @@ msgstr "Якщо Ви вважаєте це повідомлення помил�
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Картинка"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "Картинка \"%1$s\" вже існує."
@@ -8420,7 +8328,7 @@ msgstr "Картинка \"%1$s\" вже існує."
 msgid "Image added"
 msgstr "Картинку додано"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Картинку видалено"
 
@@ -8428,18 +8336,12 @@ msgstr "Картинку видалено"
 msgid "Image label type"
 msgstr "Тип ярлика до картинки"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "Помилка завантаження зображення [%1$s] в [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Картинку оновлено"
 
@@ -8534,7 +8436,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8545,13 +8447,13 @@ msgstr "Недоступне обслуговування"
 msgid "Inaccessible map"
 msgstr "Недоступна карта мережі"
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr "Недоступний шаблон"
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr "Недоступний тригер"
 
@@ -8595,7 +8497,7 @@ msgstr "Включити субгрупи"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Статистика вхідного трафіку мережевого інтерфейсу. Повертає ціле число"
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8763,24 +8665,6 @@ msgstr "Некоректна група користувачів для опер
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Некоректний користувач для операції дії. Користувач не існує або ви не маєте до нього доступу."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8835,8 +8719,6 @@ msgstr "Некоректний користувач для операції ді
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Функції передано некоректні параметри."
 
@@ -8862,31 +8744,22 @@ msgstr "Використано некоректні символи в імені
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "Некоректні умови для дії \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "Некоректні умови для правила виявлення \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "Некоректний ID кореляції."
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "Некоректний довільний вираз \"%2$s\" для дії \"%1$s\": %3$s."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "Некоректний довільний вираз \"%2$s\" для кореляції \"%1$s\": %3$s."
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "Некоректний довільний вираз \"%2$s\" для правила виявлення \"%1$s\": %3$s."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8915,7 +8788,7 @@ msgstr "Некоректне значення eventobject."
 msgid "Incorrect eventsource value."
 msgstr "Некоректне значення eventsource."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Некоректне ім'я або значення поля \"%1$s\" в операторі where для таблиці \"%2$s\"."
@@ -8940,22 +8813,17 @@ msgstr "Некоректний завантажуваний файл."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "Некоректний ID формули умови фільтру для дії \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "Некоректний ID формули умови фільтру для правила виявлення \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "Задано некоректний ID формули умови фільтру для кореляції \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "Некоректний макрос умови фільтру для правила виявлення \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8966,7 +8834,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "Некоректний оператор умови фільтру для дії \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "Некоректний оператор умови фільтру для правила виявлення \"%1$s\"."
@@ -8994,8 +8862,6 @@ msgstr "Некоректний номер картинки."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -9057,10 +8923,6 @@ msgstr "Некоректний період сервісу (мінімум 5 х�
 msgid "Incorrect map ID."
 msgstr "Некоректний ID карти мережі."
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "Некоректний ID методу повідомлень."
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -9118,13 +8980,13 @@ msgstr "Некоректний регулярний вираз \"%1$s\": \"%2$s\
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Некоректну відповідь отримано від Zabbix сервера \"%1$s\"."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Некоректний час завершення послуги."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Некоректний час початку послуги."
 
@@ -9177,12 +9039,7 @@ msgstr "Некоректний вираз прототипу тригера. Е�
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "Некоректний тип підрахунку для дії \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "Некоректний тип обчислення для кореляції \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "Некоректний тип підрахунку для правила виявлення \"%1$s\"."
@@ -9228,13 +9085,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9251,60 +9108,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Некоректне значення \"%1$s\" для поля \"%2$s\": має бути між %3$s та %4$s."
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "Значення \"%1$s\" є некоректним для поля дробового числа \"%2$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "Значення \"%1$s\" є некоректним для поля цілого числа \"%2$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Значення \"%1$s\" є некоректним для поля числа без знаку \"%2$s\"."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "Некоректне значення \"%1$s\" в полі \"%2$s\" для кореляції \"%3$s\"."
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "Некоректне значення \"%1$s\" в полі \"%2$s\" для методу повідомлень \"%3$s\"."
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9359,14 +9186,8 @@ msgstr "Некоректне значення для поля \"%1$s\"."
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9476,25 +9297,7 @@ msgstr "Некоректне значення для поля \"%1$s\"."
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9505,7 +9308,7 @@ msgstr "Некоректне значення для поля \"%1$s\"."
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9551,16 +9354,17 @@ msgstr "Некоректне значення для поля \"%1$s\"."
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9569,7 +9373,7 @@ msgstr "Некоректне значення для поля \"%1$s\"."
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "Некоректне значення для поля \"%1$s\": %2$s."
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9657,12 +9461,12 @@ msgstr "Успадковані та теги тригера"
 msgid "Inherited items"
 msgstr "Успадковані елементи даних"
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Вставити"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "Вставити вираз"
 
@@ -9766,7 +9570,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9774,7 +9578,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9785,7 +9589,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Інтервал"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9808,7 +9612,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr "Неправильна умова дії: %1$s."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9840,7 +9644,7 @@ msgstr "Помилкова адреса email у методу повідомле
 msgid "Invalid interval \"%1$s\"."
 msgstr "Неправильний інтервал \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Неправильний ключ \"%1$s\" для правила виявлення \"%2$s\" в \"%3$s\": %4$s."
@@ -9865,27 +9669,29 @@ msgstr "Неправильний ключ \"%1$s\": %2$s."
 msgid "Invalid method parameters."
 msgstr "Неправильні параметри методу."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9911,17 +9717,17 @@ msgstr "Неправильні параметри методу."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9929,8 +9735,8 @@ msgstr "Неправильні параметри методу."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9944,106 +9750,116 @@ msgstr "Неправильні параметри методу."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -10085,43 +9901,38 @@ msgstr "Неправильний код відповіді \"%1$s\"."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -10142,7 +9953,7 @@ msgstr "Неправильний період часу."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Інвентаризація"
 
@@ -10183,7 +9994,7 @@ msgstr "Неможливо виконувати пошук по паролю к�
 msgid "Italian (it_IT)"
 msgstr "Італійська (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10215,7 +10026,7 @@ msgstr "Елемент даних \"%1$s\" не може бути скопійо
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "Елемент даних \"%1$s\" не може заповнювати відсутнє поле під номером \"%2$d\" інвентарних даних вузла мережі. Оберіть з: від 0 (не заповнювати) до %3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10229,7 +10040,7 @@ msgstr "Елемент додано"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "Елемент даних скопійовано"
@@ -10244,14 +10055,14 @@ msgstr "Кількість елементів даних"
 msgid "Item deleted"
 msgstr "Елемент даних видалено"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Елемент даних дезактивовано"
 msgstr[1] "Елементи даних дезактивовано"
 msgstr[2] "Елементи даних дезактивовано"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Елемент даних активовано"
@@ -10262,7 +10073,7 @@ msgstr[2] "Елементи даних активовано"
 msgid "Item in \"not supported\" state"
 msgstr "Елемент даних в стані \"не підтримується\""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "Елемент даних не вибрано"
 
@@ -10271,7 +10082,7 @@ msgstr "Елемент даних не вибрано"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr "Відсутні параметри в попередній обробці елемента даних: %1$s"
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10309,8 +10120,8 @@ msgstr[0] "Прототип елемента даних оновлено"
 msgstr[1] "Прототипи елементів даних оновлено"
 msgstr[2] "Прототипи елементів даних оновлено"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr "Прототип елементів даних з ID \"%1$s\" недоступний."
@@ -10336,7 +10147,7 @@ msgstr "Прототипи елементів даних оновлено"
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10368,8 +10179,8 @@ msgstr "Елемент даних не може бути оновлено. Вк�
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr "Елемент даних не буде оновлено. Інтервал оновлення повинен бути між 1s та 1d. Також може використовуватись запланований/гнучкий інтервал."
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr "Елемент даних з ID \"%1$s\" недоступний."
@@ -10420,11 +10231,11 @@ msgstr "Елемент даних з ключем \"%1$s\" вже існує в
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Елементи даних"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Елементи даних видалено"
 
@@ -10442,7 +10253,7 @@ msgstr "Елементи оновлено"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10467,6 +10278,10 @@ msgstr "Інтерфейси JMX"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10479,7 +10294,7 @@ msgstr "JSON дані"
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr "очікувався JSON рядок"
 
@@ -10497,7 +10312,7 @@ msgstr "JSONPath"
 msgid "Jan"
 msgstr "Січ"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Січень"
 
@@ -10519,7 +10334,7 @@ msgstr "JavaScript"
 msgid "Jul"
 msgstr "Лип"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Липень"
 
@@ -10527,7 +10342,7 @@ msgstr "Липень"
 msgid "Jun"
 msgstr "Чер"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Червень"
 
@@ -10689,22 +10504,6 @@ msgstr[0] "Останній %1$d рік"
 msgstr[1] "Останні %1$d роки"
 msgstr[2] "Останні %1$d років"
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10716,11 +10515,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Остання перевірка"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Графік за останню годину"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Графік за останній місяць"
 
@@ -10758,11 +10557,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Останнє значення"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Графік за останній тиждень"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10771,11 +10570,11 @@ msgstr "Графік за останній тиждень"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Останні дані"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "Останні значення"
 
@@ -10816,7 +10615,7 @@ msgstr "Вісь Y зліва"
 msgid "Left trim"
 msgstr "Обрізати зліва"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr "Легенда"
 
@@ -11097,7 +10896,7 @@ msgstr "Правило низькорівневого виявлення в ст
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "Пн"
@@ -11119,7 +10918,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "MD5 контрольна сума файлу. Повертає рядок символів (MD5 хеш файлу)"
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -11130,12 +10929,12 @@ msgid "Macro"
 msgstr "Макро"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Макрос \"%1$s\" вже існує в \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Макрос \"%1$s\" вже існує."
@@ -11163,7 +10962,7 @@ msgstr "Макроси оновлено"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr "Головний фільтр"
 
@@ -11171,7 +10970,7 @@ msgstr "Головний фільтр"
 msgid "Main navigation"
 msgstr "Головна навігація"
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11254,7 +11053,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11276,13 +11075,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr "Закритий вручну"
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Карта мережі"
 
@@ -11351,7 +11150,7 @@ msgstr "Фігура карти мережі"
 msgid "Map update failed."
 msgstr "Оновлення карти мережі неуспішне."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr "Карта мережі з ID \"%1$s\" недоступна."
@@ -11383,7 +11182,7 @@ msgstr "Карти мереж"
 msgid "Mar"
 msgstr "Бер"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Березень"
 
@@ -11487,7 +11286,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11502,7 +11301,7 @@ msgstr[2] "Максимальний період часу відображенн
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "Перевищено максимальну довжину email адреси у методу повідомлень з ID \"%1$s\"."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Тра"
 
@@ -11517,15 +11316,12 @@ msgstr "Травень"
 msgid "Media"
 msgstr "Метод повідомлення"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Тип засобу передачі"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr "Метод повідомлень \"%1$s\" вже існує."
@@ -11555,11 +11351,6 @@ msgstr[0] "Метод повідомлень активовано"
 msgstr[1] "Методи повідомлень активовано"
 msgstr[2] "Методи повідомлень активовано"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr "В методі повідомлень відсутні параметри: %1$s"
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11589,7 +11380,7 @@ msgstr "Метод повідомлень з ID \"%1$s\" недоступний.
 msgid "Media types"
 msgstr "Методи повідомлень"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11677,7 +11468,7 @@ msgstr "Повідомлення"
 msgid "Method not found."
 msgstr "Метод не знайдено."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11739,7 +11530,7 @@ msgid "Minimum severity"
 msgstr "Мінімальна важливість"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11799,7 +11590,7 @@ msgstr "Режим"
 msgid "Model"
 msgstr "Модель"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11841,7 +11632,7 @@ msgstr[2] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11867,7 +11658,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Пн"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Понеділок"
 
@@ -11907,11 +11698,11 @@ msgstr "Місяць"
 msgid "Monthly"
 msgstr "Щомісяця"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "Знайдено більше співпадінь..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11935,7 +11726,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11948,7 +11739,7 @@ msgstr "Багатократно"
 msgid "Multiple PROBLEM events"
 msgstr "Багатократні події ПРОБЛЕМА"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Вимкнути звук"
 
@@ -12077,11 +11868,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12239,19 +12030,21 @@ msgstr "Нова умова"
 msgid "New dashboard"
 msgstr "Нова панель"
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Новий елемент"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr "Група вузлів нової події"
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr "Значення тегу нової події"
 
@@ -12263,7 +12056,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Новий регулярний вираз"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12271,7 +12064,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Новий період послуги"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12280,7 +12073,7 @@ msgid "New triggers"
 msgstr "Нові тригери"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12298,7 +12091,7 @@ msgstr "Наступний крок"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12327,30 +12120,6 @@ msgstr "Наступний крок"
 msgid "No"
 msgstr "Ні"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "\"%1$s\" не задано для кореляції \"%2$s\"."
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "\"%1$s\" не задано для кореляції."
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12366,11 +12135,6 @@ msgstr "Не вказано \"%1$s\" для графіку."
 msgid "No \"%1$s\" given for map."
 msgstr "Не вказано \"%1$s\" для карти мережі."
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "Не вказано \"%1$s\" для методу повідомлень."
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12378,7 +12142,7 @@ msgstr "Не вказано \"%1$s\" для методу повідомлень.
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "Не вказано \"%2$s\" для умови фільтру в дії \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "Не вказано \"%2$s\" для умови фільтру в правилі виявлення \"%1$s\"."
@@ -12388,7 +12152,7 @@ msgstr "Не вказано \"%2$s\" для умови фільтру в пра�
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "Не вказано \"%2$s\" для фільтру в дії \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "Не вказано \"%2$s\" для фільтру в правилі виявлення \"%1$s\"."
@@ -12405,11 +12169,6 @@ msgstr "Для аутентифікації не вказано ім'я кори
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "Тип умови не задано для кореляції \"%1$s\"."
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12440,7 +12199,7 @@ msgstr "Відсутній інтерфейс по замовчуванню \"%1
 msgid "No details"
 msgstr "Подробиці відсутні"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "ID правил виявлення не вказано."
 
@@ -12476,7 +12235,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "Графіків не додано."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Не вказано ID вузлів мережі."
 
@@ -12506,7 +12265,7 @@ msgstr "Немає картинки"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Інтерфейсу не знайдено"
 
@@ -12540,7 +12299,7 @@ msgstr "Макроси не знайдено."
 msgid "No maps added."
 msgstr "Карти мереж не додано."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "Відповідностей не знайдено"
 
@@ -12548,17 +12307,46 @@ msgstr "Відповідностей не знайдено"
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr "Тип операції не задано для кореляції \"%1$s\"."
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Немає прав доступу до системи."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12566,7 +12354,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12594,19 +12382,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12621,16 +12408,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12650,12 +12443,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12676,27 +12467,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12713,14 +12506,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12729,7 +12522,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Немає прав доступу до запитуваного об'єкту або він не існує!"
 
@@ -12749,7 +12542,7 @@ msgstr "Файл публічного ключа не вказано."
 msgid "No recipients for action operation message."
 msgstr "Немає отримувачів повідомлення в операції дії."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr "Не оновлювати"
 
@@ -12761,7 +12554,7 @@ msgstr "Не вказано скрипт для команди в операці
 msgid "No target selected"
 msgstr "Ціль не обрано"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Ціль не обрано."
 
@@ -12778,7 +12571,7 @@ msgstr "Тригерів не визначено."
 msgid "No value"
 msgstr "Немає значення"
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr "Не логічні атрибути більше не використовуються."
 
@@ -12848,15 +12641,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Забороняється встановлювати пароль для користувача \"гість\"."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12888,7 +12681,7 @@ msgstr "Не успадковані елементи дані"
 msgid "Not supported"
 msgstr "Не підтримується"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Примітка"
@@ -12919,7 +12712,7 @@ msgstr "Повідомити всіх залучених"
 msgid "Nov"
 msgstr "Лис"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "Листопад"
 
@@ -13106,8 +12899,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -13167,13 +12960,13 @@ msgstr "Жов"
 msgid "Octal to decimal"
 msgstr "Вісімкове в десяткове"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Жовтень"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Вимкн"
 
@@ -13181,30 +12974,31 @@ msgstr "Вимкн"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ок"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr "Значення тега старої події"
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "Увімк"
 
@@ -13220,35 +13014,15 @@ msgstr "Один раз"
 msgid "One"
 msgstr "Одна"
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "Один із об'єктів залишився без групи вузлів мережі."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Одноразово"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Однократна недоступність"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Тільки Супер-Адміністратори можуть створювати групи вузлів мережі."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Тільки Супер-Адміністратори можуть створювати методи повідомлень."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Тільки Супер-Адміністратори можуть видаляти методи повідомлень."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Тільки Супер-Адміністратори можуть редагувати методи повідомлень."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Тільки Zabbix агент, SNMPv1, SNMPv2 та SNMPv3 перевірки можуть бути зроблені унікальними."
@@ -13298,10 +13072,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "Тільки супер адміністратори можуть створювати кореляції."
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr "Тільки супер адмін може встановлювати власника панелі."
@@ -13310,15 +13080,11 @@ msgstr "Тільки супер адмін може встановлювати �
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr "Тільки супер адміністратори можуть оновлювати кореляції."
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Підраховуються тригери тільки у вузлів мережі під спостереженням та які залежать від активних елементів даних"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13327,7 +13093,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Інформація про операційну систему. Повертає рядок"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13336,11 +13102,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Операцію не може бути виконано через несанкціонований запит."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Деталі операції"
 
@@ -13362,7 +13128,7 @@ msgstr "Операція не має шаблону для функціонув�
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13371,33 +13137,33 @@ msgstr ""
 msgid "Operations"
 msgstr "Операції"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Оператор"
 
@@ -13506,7 +13272,7 @@ msgstr "Інші параметри налаштувань"
 msgid "Other parameters"
 msgstr "Інші параметри"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Інші"
@@ -13520,7 +13286,7 @@ msgstr "Статистика вихідного трафіку на мереже
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13549,7 +13315,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13738,7 +13504,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13783,7 +13549,7 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "Ідентифікатор PSK"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13806,16 +13572,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Параметр"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "Параметр \"%1$s\" застарів."
@@ -13845,7 +13611,7 @@ msgstr "Батьківські елементи даних"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13862,7 +13628,7 @@ msgstr "Батьківські тригери"
 msgid "Parent web scenarios"
 msgstr "Батьківські веб сценарії"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13874,11 +13640,6 @@ msgstr ""
 msgid "Parse"
 msgstr "Аналіз"
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "Помилка аналізу SQL [%1$s] у [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Помилка розбору"
@@ -13939,7 +13700,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr "Вставити"
 
@@ -13949,15 +13710,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr "Вставити без зовнішніх зв'язків"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -14003,12 +13764,11 @@ msgstr "Виконує DNS запит. Повертає рядок символ�
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Період"
 
@@ -14097,7 +13857,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Будь-ласка, вкажіть ім'я хоста або IP адресу хоста та номер порту Zabbix сервера, а також ім'я інсталяції (опція)."
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Будь-ласка, оберіть два елементи"
 
@@ -14137,7 +13897,7 @@ msgstr "Заповнює поле інвентарних даних вузла �
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14226,7 +13986,7 @@ msgid "Previous month"
 msgstr "Попередній місяць"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14357,7 +14117,7 @@ msgstr "Проблему не подавлено"
 msgid "Problem is suppressed"
 msgstr "Проблему подавлено"
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Проблема на"
 
@@ -14370,21 +14130,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr "Проблему вирішено"
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14398,9 +14154,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Проблеми"
 
@@ -14434,7 +14190,7 @@ msgid "Prometheus to JSON"
 msgstr "Prometheus в JSON"
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "Властивості"
 
@@ -14455,13 +14211,13 @@ msgstr "Наданий URL \"%1$s\" є некоректним."
 msgid "Proxies"
 msgstr "Проксі"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14469,7 +14225,7 @@ msgstr "Проксі"
 msgid "Proxy"
 msgstr "Проксі"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14479,12 +14235,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Проксі \"%1$s\" для вузла мережі \"%2$s\" не існує."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr "Проксі \"%1$s\" використовується дією \"%2$s\"."
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Проксі \"%1$s\" використовується в правилі виявлення \"%2$s\"."
@@ -14578,7 +14334,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14655,10 +14411,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Отримане значення"
@@ -14740,7 +14492,7 @@ msgstr "Прямокутник"
 msgid "Refresh"
 msgstr "Оновити"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr "Період оновлення"
 
@@ -14758,13 +14510,13 @@ msgstr ""
 msgid "Regular"
 msgstr "Звичайні"
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Регулярний вираз"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14798,7 +14550,7 @@ msgstr "Регулярні вирази"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14830,8 +14582,6 @@ msgstr "Віддалена команда"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14852,7 +14602,9 @@ msgstr "Віддалена команда"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14865,7 +14617,7 @@ msgstr "Віддалена команда"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14942,8 +14694,8 @@ msgstr "Віддалена команда"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Видалити"
 
@@ -14983,7 +14735,7 @@ msgstr "Видалити, %1$s"
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -15025,7 +14777,7 @@ msgid "Replace dependencies"
 msgstr "Замінити залежності"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -15080,7 +14832,7 @@ msgstr "Запит тіла"
 msgid "Request body type"
 msgstr "Тип запиту тіла"
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr "Запит успішно відправлено"
 
@@ -15122,8 +14874,8 @@ msgstr "Необхідні коди статусу"
 msgid "Required string"
 msgstr "Необхідна строка"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Скинути"
 
@@ -15156,7 +14908,7 @@ msgstr "Скинути підтвердження"
 msgid "Reset defaults"
 msgstr "Скинути по замовчуванню"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Вирішено"
 
@@ -15222,7 +14974,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Результат"
@@ -15409,12 +15161,12 @@ msgstr "Виконує вказану команду на вузлі мереж�
 msgid "Russian (ru_RU)"
 msgstr "Російська (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "Сб"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "Нд"
@@ -15425,8 +15177,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15463,7 +15215,7 @@ msgstr "Порт SMTP серверу"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15559,12 +15311,12 @@ msgstr "SQL запитів: %1$s (selects: %2$s | executes: %3$s)"
 msgid "SQL query"
 msgstr "SQL запит"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "Помилка при виконанні SQL запиту \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Помилка при виконанні SQL запиту \"%1$s\"."
@@ -15627,7 +15379,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15639,7 +15391,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Суб"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Субота"
 
@@ -15681,7 +15433,7 @@ msgstr "Заплановано"
 msgid "Scheduled check"
 msgstr "Запланована перевірка"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15751,7 +15503,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr "Межі"
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15764,8 +15516,7 @@ msgstr "Межі"
 msgid "Script"
 msgstr "Скрипт"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Скрипт \"%1$s\" уже існує."
@@ -15798,12 +15549,6 @@ msgstr "Назва скрипта"
 msgid "Script parameters"
 msgstr "Параметри скрипта"
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "В кінці параметрів скрипта \"%1$s\" відсутній символ нового рядка для методу повідомлень \"%2$s\"."
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Профілювання скрипта"
@@ -15816,7 +15561,7 @@ msgstr "Скрипт оновлено"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Скрипти"
 
@@ -15886,8 +15631,8 @@ msgid "Security name"
 msgstr "Ім'я безпеки"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15895,7 +15640,7 @@ msgstr "Ім'я безпеки"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Вибрати"
 
@@ -15931,19 +15676,19 @@ msgstr "Вибрані елементи"
 msgid "Selected items only"
 msgstr "Тільки обрані елементи даних"
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "Вибрано, %1$s в позиції %2$d з %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "Вибрано, %1$s, тільки читання, в позиції %2$d з %3$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr "Перемістити назад"
 
@@ -15968,7 +15713,7 @@ msgstr "Надіслати тільки на"
 msgid "Send to"
 msgstr "Надіслати"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr "Перемістити на самий зад"
 
@@ -16001,7 +15746,7 @@ msgstr "Непідтверджені окремо"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "Вересень"
 
@@ -16032,28 +15777,28 @@ msgstr "Сервер (проксі)"
 msgid "Server time"
 msgstr "Час на сервері"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Послуга"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -16063,7 +15808,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "Послугу створено"
 
@@ -16097,16 +15842,16 @@ msgstr "Порт сервісу"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "Час початку послуги має бути меншим за час закінчення."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -16114,11 +15859,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Періоди послуги"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Тип сервісу"
 
@@ -16127,30 +15872,29 @@ msgstr "Тип сервісу"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Послугу оновлено"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Послуги"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "Послуги утворюють кільцеву залежність."
 
@@ -16158,7 +15902,7 @@ msgstr "Послуги утворюють кільцеву залежність.
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -16188,7 +15932,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Встановити режим інвентарних даних вузла мережі"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -16217,7 +15961,7 @@ msgstr "Не вдалося встановити протокол LDAP."
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr "Не вдалося встановити партнерів LDAP в \"Off\"."
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16226,7 +15970,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16282,7 +16026,7 @@ msgstr "Фігура"
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "Спільний доступ"
 
@@ -16424,7 +16168,7 @@ msgstr "Відображувати попередження, якщо Zabbix с�
 msgid "Show working time"
 msgstr "Відображувати робочий час"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Показана"
 
@@ -16533,7 +16277,7 @@ msgstr "Пропущено копіювання графіку \"%1$s\" у ву�
 msgid "Slovak (sk_SK)"
 msgstr "Словацька (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Подрімати"
 
@@ -16579,7 +16323,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Сортування записів за"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Порядок сортування (0->999)"
 
@@ -16653,7 +16397,7 @@ msgstr "Початок в"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16756,15 +16500,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Стан"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Коди станів"
@@ -16794,7 +16542,7 @@ msgstr "Тільки статус"
 msgid "Status problem"
 msgstr "Стан проблеми"
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16842,7 +16590,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16907,7 +16655,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Суб'єкт"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Суб-карта"
 
@@ -16923,7 +16671,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Аудит успіхів"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr "Повідомлення про успіх"
 
@@ -16936,7 +16684,7 @@ msgstr "Сумарна статистика вхідного та вихідно
 msgid "Sun"
 msgstr "Нед"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Неділя"
 
@@ -17028,12 +16776,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Час безперервної роботи системи в секундах (uptime). Повертає ціле число"
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "Чт"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "Вт"
@@ -17060,17 +16808,17 @@ msgstr "ІСТИНА"
 msgid "Table \"%1$s\" does not exist."
 msgstr "Таблиця \"%1$s\" не існує."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "Таблиця \"%1$s\" не має поля з ім'ям \"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Тег"
@@ -17126,7 +16874,7 @@ msgstr "Значення тегу"
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -17186,7 +16934,7 @@ msgstr "Тип цілі"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -17207,7 +16955,7 @@ msgstr "Шаблон"
 msgid "Template \"%1$s\" already exists."
 msgstr "Шаблон \"%1$s\" вже існує."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17231,7 +16979,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Шаблон не може бути приєднано до іншого шаблону більше ніж один раз, навіть через інші шаблони."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17291,7 +17039,7 @@ msgstr "Шаблон із цим самим видимим ім'ям \"%1$s\" в
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17463,7 +17211,7 @@ msgstr "Вузел мережі більше не виявляється та б
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "Вузел мережі більше не виявляється та буде видалений при наступному виконанні правила виявлення."
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
@@ -17471,7 +17219,7 @@ msgstr[0] "Картинка використовується у призначе
 msgstr[1] "Картинка використовується у призначеннях іконок %1$s."
 msgstr[2] "Картинка використовується у призначеннях іконок %1$s."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17537,7 +17285,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr "Це тестове повідомлення від Zabbix"
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Цей місяць"
 
@@ -17545,7 +17293,7 @@ msgstr "Цей місяць"
 msgid "This month so far"
 msgstr "Цей місяць по нині"
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Цей тиждень"
 
@@ -17553,7 +17301,7 @@ msgstr "Цей тиждень"
 msgid "This week so far"
 msgstr "Цей тиждень по нині"
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Цей рік"
 
@@ -17573,7 +17321,7 @@ msgstr "Дедуплікація"
 msgid "Thu"
 msgstr "Чет"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Четвер"
 
@@ -17590,7 +17338,7 @@ msgstr "До"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17623,7 +17371,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Період часу"
 
@@ -17675,12 +17423,11 @@ msgstr "Час виникнення (штамп)"
 msgid "To"
 msgstr "До"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "Для встановлення інтерфейсу вузла мережі виберіть один тип елемента даних для всіх елементів даних"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Сьогодні"
 
@@ -17795,7 +17542,7 @@ msgstr "Період зберігання трендів"
 msgid "Trends"
 msgstr "Динаміка"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17803,7 +17550,7 @@ msgstr "Динаміка"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Тригер"
 
@@ -17907,7 +17654,7 @@ msgstr "Ім'я тригера"
 msgid "Trigger overview"
 msgstr "Огляд тригерів"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17981,11 +17728,11 @@ msgstr "Прототипи тригерів оновлено"
 msgid "Trigger severity"
 msgstr "Важливість тригера"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "Стан тригера \"ОК\""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "Стан тригера \"Проблема\""
 
@@ -18002,7 +17749,7 @@ msgstr "Тригер оновлено"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -18037,7 +17784,7 @@ msgstr "Обрізати"
 msgid "Tue"
 msgstr "Вів"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Вівторок"
 
@@ -18050,7 +17797,7 @@ msgstr "Турецька (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Два елементи даних (\"%1$s\" та \"%2$s\") не можуть заповнювати одне поле \"%3$s\" інвентарних даних вузла мережі, це призвело б до конфлікту."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr "Необхідно вибрати два елемента карти мережі"
 
@@ -18066,19 +17813,19 @@ msgstr "Необхідно вибрати два елемента карти м�
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -18130,7 +17877,7 @@ msgstr "Тип інформації"
 msgid "Types"
 msgstr "Типи"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -18151,7 +17898,7 @@ msgstr "НЕВІДОМО"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -18197,12 +17944,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "URL повинен мати обидва поля \"name\" та \"url\" для карти мережі \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URLи"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18287,12 +18034,12 @@ msgstr "Разблокувати"
 msgid "Unblock selected users?"
 msgstr "Розблокувати вибраних користувачів?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18312,21 +18059,23 @@ msgstr "Одиниця виміру"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Невідомо"
@@ -18344,7 +18093,7 @@ msgid "Unknown error"
 msgstr "Невідома помилка"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Невідомий елемент даних вузла мережі, немає цього елемента в обраному вузлі"
@@ -18397,7 +18146,7 @@ msgstr "Від'єднати від шаблону"
 msgid "Unlink from templates"
 msgstr "Від'єднати від шаблонів"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Увімк. звук"
 
@@ -18429,7 +18178,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "Непідтримуваний параметр \"%2$s\" для дії умови фільтру \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "Непідтримуваний параметр \"%2$s\" для правила виявлення умови фільтру \"%1$s\"."
@@ -18439,7 +18188,7 @@ msgstr "Непідтримуваний параметр \"%2$s\" для прав
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "Непідтримуваний параметр \"%2$s\" для фільтру в дії \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "Непідтримуваний параметр \"%2$s\" для фільтру в правилі виявлення \"%1$s\"."
@@ -18484,7 +18233,7 @@ msgstr "Доступний"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18497,7 +18246,7 @@ msgstr "Доступний"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18550,7 +18299,7 @@ msgstr "Операції оновлення"
 msgid "Update problem"
 msgstr "Оновити проблему"
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18568,7 +18317,7 @@ msgstr "Завантажити"
 msgid "Upper level maps"
 msgstr "Карти верхнього рівня"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18603,7 +18352,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "Використовується в діях"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18618,7 +18367,7 @@ msgstr "Використовується в діях"
 msgid "User"
 msgstr "Користувач"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "Користувач \"%1$s\" не може бути без групи користувачів."
@@ -18670,7 +18419,7 @@ msgstr "Користувача додано"
 msgid "User agent string"
 msgstr "Рядок user agent"
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Користувач не може додати сам себе у відключену групу або в групу з відключеним доступом до Веб-інтерфейсу."
@@ -18691,7 +18440,7 @@ msgstr[0] "Користувача видалено"
 msgstr[1] ""
 msgstr[2] ""
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18701,27 +18450,27 @@ msgstr[2] ""
 msgid "User group"
 msgstr "Група користувачів"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Група користувачів \"%1$s\" вже існує."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "Група користувачів \"%1$s\" використовується в дії \"%2$s\"."
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Група користувачів \"%1$s\" використовується в налаштуваннях відправки повідомлень про недоступність бази даних."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Група користувачів \"%1$s\" використовується в скрипті \"%2$s\"."
@@ -18757,8 +18506,8 @@ msgstr[2] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18802,14 +18551,14 @@ msgstr "Пароль користувача"
 msgid "User profile"
 msgstr "Профіль користувача"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18880,7 +18629,7 @@ msgstr "Дані користувача оновлено"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "Користувач з ID \"%1$s\" недоступний."
@@ -19196,14 +18945,14 @@ msgstr "Валідація"
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -19213,7 +18962,7 @@ msgstr "Валідація"
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19255,7 +19004,7 @@ msgstr "Значення \"%1$s\" є недопустимим для парам�
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "Значення \"%1$s\" є недопустимим для параметра \"grid_show\". Варіанти: \"%2$s\"."
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "Значення \"%1$s\" являється занадто довгим для поля \"%2$s\" - %3$d символів. Допустима довжина %4$d символів."
@@ -19272,7 +19021,7 @@ msgstr "Статистика кешу значень. Допустимі реж�
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Перетворення значення"
 
@@ -19315,11 +19064,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "Значення любого лічильника продуктивності Windows. Повертає ціле число, дробове число, рядок або текст (в залежності від запиту)"
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19366,7 +19116,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19453,7 +19203,7 @@ msgstr "Видиме ім'я не може бути пустим, якщо ім'
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "Ср"
@@ -19470,7 +19220,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Попередження"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19479,7 +19229,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Вибачте, але досягнуто максимум для запам'ятовування елементів."
 
@@ -19495,7 +19245,7 @@ msgstr "Вибачте, але досягнуто максимум для зап
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Веб"
 
@@ -19507,7 +19257,7 @@ msgstr "Веб"
 msgid "Web monitoring"
 msgstr "Веб моніторинг"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr "Веб сценарій"
 
@@ -19522,29 +19272,29 @@ msgstr "Веб сценарій \"%1$s\" вже існує у вузлі мер�
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Веб сценарій \"%1$s\" вже існує."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "Веб сценарій додано"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Веб сценарій видалено"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Веб сценарій дезактивовано"
 msgstr[1] "Веб сценарії дезактивовано"
 msgstr[2] "Веб сценарії дезактивовано"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Веб сценарій активовано"
 msgstr[1] "Веб сценарії активовано"
 msgstr[2] "Веб сценарії активовано"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "Веб сценарій оновлено"
 
@@ -19566,7 +19316,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Сер"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Середа"
 
@@ -19577,7 +19327,7 @@ msgstr "Середа"
 msgid "Weekly"
 msgstr "Щотижня"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19593,12 +19343,12 @@ msgstr "Ласкаво просимо до"
 msgid "When active"
 msgstr "Коли активно"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19793,6 +19543,10 @@ msgstr "d.m.Y H:i"
 msgid "Y-m-d H:i:s"
 msgstr "d.m.Y H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr "Y1"
@@ -19854,7 +19608,7 @@ msgstr "Щороку"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19911,18 +19665,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19934,9 +19682,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "У вас немає повноважень для виконання цієї операції."
 
@@ -20052,24 +19797,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr "очікується логічне значення"
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "очікується рядок символів"
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -20078,37 +19827,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr "очікується макрос низько-рівневого виявлення"
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr "очікується число"
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr "число занадто велике"
@@ -20129,28 +19878,29 @@ msgstr "очікується відносний час"
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr "очікувався час"
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr "очікується період часу"
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr "очікується період часу"
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr "очікується одиниця часу"
@@ -20198,7 +19948,7 @@ msgstr "всі"
 msgid "all media"
 msgstr "всі методи повідомлень"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -20206,42 +19956,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "очікується масив"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr "очікується масив або рядок символів"
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20251,7 +19996,7 @@ msgid "an empty string is expected"
 msgstr "очікувався пустий рядок"
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr "очікується парна кількість шістнадцяткових символів"
 
@@ -20259,11 +20004,15 @@ msgstr "очікується парна кількість шістнадцят�
 msgid "an explicit time is expected"
 msgstr "очікувався чіткий час"
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20424,14 +20173,8 @@ msgstr "неможливо змінити"
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20461,19 +20204,11 @@ msgstr "неможливо змінити"
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20493,14 +20228,14 @@ msgstr "неможливо змінити"
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20508,7 +20243,7 @@ msgstr "неможливо змінити"
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "не може бути пустим"
@@ -20521,7 +20256,7 @@ msgstr "не вдалося конвертувати в JSON, результат
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr "неможливо виконати запит Scroll API, дані могли бути обрізані"
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr "неможливо оновити властивість для шаблонного правила виявлення"
 
@@ -20555,7 +20290,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "кільцева залежність елементів даних не дозволена"
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20573,7 +20308,8 @@ msgid "configure"
 msgstr "налаштувати"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr "містить"
@@ -20602,7 +20338,7 @@ msgstr "count() - Кількість успішно отриманих знач�
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "д"
@@ -20664,7 +20400,7 @@ msgstr "за спаданням"
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20686,13 +20422,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr "не містить"
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr "не дорівнює"
@@ -20718,7 +20454,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20755,6 +20492,10 @@ msgstr "вираз пустий"
 msgid "failed to parse JSON"
 msgstr "не вдалося проаналізувати JSON"
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20801,7 +20542,7 @@ msgstr "глобальних налаштуваннях очистки істо�
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "г"
@@ -20842,6 +20583,11 @@ msgstr "іконка"
 msgid "image"
 msgstr "картинка"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "в"
@@ -20882,15 +20628,19 @@ msgstr "некоректна кількість елементів"
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "некоректний синтаксис біля \"%1$s\""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20918,7 +20668,7 @@ msgstr "недійсний патерн Prometheus"
 msgid "invalid address range \"%1$s\""
 msgstr "неправильний діапазон адрес \"%1$s\""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr "помилкова послідовність байт в UTF-8"
 
@@ -20947,27 +20697,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr "некоректний період зберігання історії"
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr "некоректне ім'я групи вузлів мережі"
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr "некоректне ім'я вузла мережі"
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr "помилковий регулярний вираз"
 
@@ -20995,7 +20745,7 @@ msgstr "більше ніж чи дорівнює"
 msgid "is less than or equals"
 msgstr "менше ніж чи дорівнює"
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr "не обгорнуте в {} або неправильно сформоване"
 
@@ -21081,12 +20831,12 @@ msgstr "правило низькорівневого виявлення"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "хв"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "м"
@@ -21145,7 +20895,7 @@ msgstr "співпадає"
 msgid "max"
 msgstr "макс."
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -21185,7 +20935,7 @@ msgid "min() - Minimum value for period T"
 msgstr "max() - Мінімальне значення за період Т"
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr "мінімальна довжина %1$s символів"
@@ -21212,8 +20962,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "мс"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -21228,27 +20978,14 @@ msgstr "має бути дійсним користувачем LDAP"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "має бути між \"%1$s\" та \"%2$s\""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr "має містити принаймні один макрос низькорівневого виявлення"
 
@@ -21276,6 +21013,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21286,7 +21031,7 @@ msgstr ""
 msgid "name"
 msgstr "назва"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "новий"
 
@@ -21421,7 +21166,7 @@ msgstr "вивід"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21456,24 +21201,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21501,11 +21250,11 @@ msgstr ""
 msgid "regular expression"
 msgstr "регулярний вираз"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21517,15 +21266,15 @@ msgstr ""
 msgid "right"
 msgstr "справа"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21573,7 +21322,7 @@ msgstr ""
 msgid "short description"
 msgstr "короткий опис"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21592,15 +21341,15 @@ msgstr "короткий опис"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr "має бути пустим"
 
@@ -21616,31 +21365,31 @@ msgstr "показати призначення іконок"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21648,11 +21397,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr "sum() - Сума значень за період Т"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21668,8 +21417,8 @@ msgstr "наданий обліковий запис не унікальний"
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21680,7 +21429,7 @@ msgstr "наданий обліковий запис не унікальний"
 msgid "tag"
 msgstr "тег"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21689,13 +21438,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "шаблон з ID \"%1$s\" передано %2$s разів"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21704,20 +21457,20 @@ msgstr "шаблон з ID \"%1$s\" передано %2$s разів"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "параметр \"%1$s\" відсутній"
@@ -21749,39 +21502,39 @@ msgstr "третій"
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr "зсув часу"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr "time() - Поточний час"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr "timeleft() - Час досягнення порогу, вирахуваний на основі періоду Т"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21795,7 +21548,7 @@ msgstr "тригер"
 msgid "trigger does not allow manual closing"
 msgstr "для тригера не дозволено закриття вручну"
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21807,26 +21560,26 @@ msgstr "прототип тригера неможливо перемістит�
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr "тригера зв зв'язками неможливо перемістити в другий шаблон або вузел мережі"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "почніть друкувати для пошуку"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21834,11 +21587,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21855,10 +21608,10 @@ msgstr "неочікуваний кінець ключа"
 msgid "unexpected end of macro"
 msgstr "неочікуваний кінець макросу"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21868,11 +21621,12 @@ msgstr "неочікуваний кінець макросу"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr "неочікуваний параметр \"%1$s\""
@@ -21898,8 +21652,8 @@ msgstr "неочікуваний текст \"%1$s\""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21924,6 +21678,10 @@ msgstr "непідтримуваний суфікс часу"
 msgid "unsupported version number"
 msgstr "непідтримуваний номер версії"
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21939,7 +21697,7 @@ msgstr "непідтримуваний номер версії"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21959,11 +21717,11 @@ msgstr "непідтримуваний номер версії"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "значення"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr "значення \"%1$s\" вже існує"
@@ -21981,76 +21739,87 @@ msgstr "значення \"%1$s\" не знайдено"
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr "значення %1$s вже існує"
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr "значення надто довге"
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -22062,18 +21831,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr "значення має бути одне з %1$s"
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -22082,7 +21849,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -22095,11 +21862,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -22116,7 +21883,7 @@ msgstr "помилковий тип правила виявлення"
 msgid "wrong item type"
 msgstr "помилковий тип елементу даних"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "р"
diff --git a/ui/locale/vi/LC_MESSAGES/frontend.po b/ui/locale/vi/LC_MESSAGES/frontend.po
index 2df012781e2..b44f9b2fea4 100644
--- a/ui/locale/vi/LC_MESSAGES/frontend.po
+++ b/ui/locale/vi/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2021-03-19 18:15+0300\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -93,7 +93,7 @@ msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d ngày"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -171,7 +171,7 @@ msgstr[0] "%1$s tin nhắn "
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -183,7 +183,7 @@ msgid "%1$s of %2$s element in problem state"
 msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "Trạng thái phần tử %1$s của %2$s gặp vấn đề"
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -213,13 +213,13 @@ msgstr[0] "%1$s thử lại "
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s giây"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -238,13 +238,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, Chặt chẽ, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, chỉ đọc"
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -372,7 +372,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -430,10 +430,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "Truy cập bị từ chối"
@@ -476,7 +472,7 @@ msgstr ""
 msgid "Ack"
 msgstr "Ghi nhận"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "Ghi nhận"
 
@@ -484,7 +480,7 @@ msgstr "Ghi nhận"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "Đã ghi nhận"
@@ -497,7 +493,7 @@ msgstr "Sự cố được ghi nhận"
 msgid "Acknowledged RESOLVED events"
 msgstr " Sự kiện được ghi nhận giải quyết"
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -524,9 +520,9 @@ msgstr " Sự kiện được ghi nhận giải quyết"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -583,7 +579,7 @@ msgstr "Hành động \"%1$s\" đã tồn tại."
 msgid "Action \"%1$s\" no operations defined."
 msgstr "Hành động \"%1$s\" không có thao tác được định nghĩa."
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -592,7 +588,7 @@ msgstr ""
 msgid "Action added"
 msgstr "Action được thêm vào"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -639,8 +635,8 @@ msgstr "Hành động đã cập nhật"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "Hành động"
@@ -707,7 +703,7 @@ msgstr "Kích hoạt"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -718,7 +714,7 @@ msgstr "Kích hoạt"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -741,9 +737,9 @@ msgstr "Kích hoạt"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -813,7 +809,7 @@ msgstr "Kích hoạt"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "Add"
 
@@ -821,11 +817,11 @@ msgstr "Add"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "Thêm một ô điều khiển mới"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "Thêm phần tử con"
 
@@ -833,7 +829,7 @@ msgstr "Thêm phần tử con"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -850,7 +846,7 @@ msgstr "Thêm host"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "Thêm nhiều sơ đồ "
 
@@ -872,7 +868,7 @@ msgstr "Ghi đè"
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -924,12 +920,12 @@ msgstr ""
 msgid "Add widget"
 msgstr "Thêm ô điều khiển"
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -939,7 +935,7 @@ msgstr "Đã thêm, %1$s"
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -952,7 +948,7 @@ msgstr "Quản trị"
 msgid "Administration"
 msgstr "Quản trị"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -974,7 +970,7 @@ msgstr "Thời gian ít hơn"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1046,7 +1042,7 @@ msgstr "Sắp xếp phần tử sơ đồ"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "Tất cả"
 
@@ -1064,7 +1060,7 @@ msgstr "Tất cả nhóm"
 msgid "All hosts"
 msgstr "Tất cả máy chủ"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "Tất cả các đường dẫn phải có \"Tên\" và \"URL\""
 
@@ -1082,7 +1078,7 @@ msgstr "Tất cả vấn đề"
 msgid "All problems if tag values match"
 msgstr "Tất cả vấn đề nếu khớp với thẻ giá trị"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1195,15 +1191,15 @@ msgstr "Lỗi ứng dụng."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "Áp dụng"
 
@@ -1221,7 +1217,7 @@ msgstr "Đang tiếp cận"
 msgid "Apr"
 msgstr "Tháng Tư"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "Tháng tư"
 
@@ -1249,7 +1245,7 @@ msgstr "Loại vùng"
 msgid "Arithmetic"
 msgstr "Số học"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1300,7 +1296,7 @@ msgstr "Tại (giờ: phút)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1309,7 +1305,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1321,6 +1317,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr "Ít nhất một nhóm máy chủ hoặc máy chủ phải đượ chọn."
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1332,7 +1333,7 @@ msgstr "Ít nhất một chu kỳ bảo trì phải được thiết lậ
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1388,7 +1389,7 @@ msgstr ""
 msgid "Aug"
 msgstr "Th8"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "Tháng 8"
 
@@ -1401,7 +1402,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1478,7 +1479,7 @@ msgstr "Tự động đăng xuất"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1493,7 +1494,7 @@ msgstr "Tự động vẽ biểu tượng bản đồ"
 msgid "Automatic icon selection"
 msgstr "Tự động lựa chọn biểu tượng"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1545,7 +1546,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr "Trục"
 
@@ -1608,7 +1609,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "Bị khóa"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "Xanh da trời"
 
@@ -1662,11 +1663,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "Dưới"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "Đưa ra phía trước"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "Đặt phía trước"
 
@@ -1692,7 +1693,7 @@ msgstr "CERT"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1737,8 +1738,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1747,7 +1748,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "Tính toán"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr "Lịch"
 
@@ -1772,7 +1773,7 @@ msgstr "Gọi lại"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1785,8 +1786,8 @@ msgstr "Gọi lại"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
@@ -1816,7 +1817,7 @@ msgstr "Không thể thêm hành động"
 msgid "Cannot add correlation"
 msgstr "Không thể thêm liên kết"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1826,7 +1827,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "Không thể thêm quan hệ phụ thuộc từ host đến template"
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1857,8 +1858,8 @@ msgid "Cannot add host prototype"
 msgstr "Không thể thêm kiểu host"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "Không thể thêm hình ảnh"
 
@@ -1949,15 +1950,15 @@ msgstr "Không thể thêm người dùng"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "Không thể thêm web scenario"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1977,33 +1978,29 @@ msgstr "Không thể liên kết với máy chủ LDAP."
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "Không thể xóa lịch sử"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "Không thể sao chép kiểu đồ thị."
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "Không thể sao chép kiểu host."
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "Không thể sao chép kiểu item."
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "Không thể sao chép kiểu trigger."
 
@@ -2029,7 +2026,7 @@ msgid "Cannot copy graph"
 msgid_plural "Cannot copy graphs"
 msgstr[0] "Không thể sao chép đồ thị"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "Không thể sao chép item"
@@ -2079,8 +2076,8 @@ msgstr "Không thể tạo biểu tượng sơ đồ."
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2108,7 +2105,7 @@ msgstr "Không thể xóa người dùng zabbix nội bộ \"%1$s\", thư�
 msgid "Cannot delete action"
 msgstr "Không thể xóa hành động"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2173,7 +2170,7 @@ msgstr[0] ""
 "Không thể xóa máy chủ bởi vì bảo trì \"%1$s\" phải chứa ít nhất một máy chủ hoặc nhóm máy chủ. \n"
 "Không thể xóa máy chủ đã chọn bởi vì bảo trì \"%1$s\" phải chứa ít nhất một máy chủ hoặc một nhóm máy chủ."
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2185,11 +2182,11 @@ msgstr[0] ""
 msgid "Cannot delete host prototypes"
 msgstr "Không thể xóa các kiểu host"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "Không thể xóa biểu tượng sơ đồ"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "Không thể xóa hình ảnh"
 
@@ -2214,7 +2211,7 @@ msgstr "Không thể xóa loại item"
 msgid "Cannot delete item prototypes"
 msgstr "Không thể xóa các loại item"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "Không thể xóa các item"
 
@@ -2242,7 +2239,7 @@ msgid "Cannot delete proxy"
 msgid_plural "Cannot delete proxies"
 msgstr[0] "Không thể xóa proxy"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2262,7 +2259,7 @@ msgid "Cannot delete script"
 msgid_plural "Cannot delete scripts"
 msgstr[0] "Không thể xóa tập lệnh"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "Không thể xóa các tập lệnh. Tập lệnh \"%1$s\" được sử dụng trong hành động thao tác \"%2$s\"."
@@ -2277,8 +2274,8 @@ msgid "Cannot delete service"
 msgid_plural "Cannot delete services"
 msgstr[0] "Không thể xóa dịch vụ"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2307,7 +2304,7 @@ msgstr "Không thể xóa kiểu giao thức đồ thị mẫu."
 msgid "Cannot delete templated item."
 msgstr "Không thể  xóa item mẫu."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "Không thể xóa các item mẫu."
 
@@ -2357,7 +2354,7 @@ msgid "Cannot delete user role"
 msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "Không thể xóa web scenario"
 
@@ -2387,7 +2384,7 @@ msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] "Không thể vô hiệu hóa hostKhông thể vô hiệu hóa các host"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "Không thể vô hiệu hóa itemKhông thể vô hiệu hóa các item"
@@ -2413,7 +2410,7 @@ msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] "Không thể vô hiệu hóa triggerKhông thể vô hiệu hóa các trigger"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "Không thể vô hiệu hóa web scenarioKhông thể vô hiệu hóa các web scenario"
@@ -2454,7 +2451,7 @@ msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] "Không thể kích hoạt hostKhông thể kích hoạt các host"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "Không thể kích hoạt itemKhông thể kích hoạt các item"
@@ -2480,7 +2477,7 @@ msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] "Không thể kích hoạt triggerKhông thể kích hoạt các kiểu trigger"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "Không thể kích hoạt web scenarioKhông thể kích hoạt các web scenario"
@@ -2493,7 +2490,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr "Không thể mở rộng bộ lệnh."
 
@@ -2527,8 +2524,8 @@ msgstr "Không thể tìm thấy host \"%1$s\" được sử dụng trong s
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Không thể tìm thấy nhóm host \"%1$s\" cho kiểu host \"%2$s\" của quy tắc phát hiện \"%3$s\" trên \"%4$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2626,24 +2623,20 @@ msgstr "Không thể tìm thấy giá trị sơ đồ \"%1$s\" được s�
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "Không thể tìm thấy giá trị sơ đồ \"%1$s\"  được sử dụng cho kiểu item \"%2$s\" của quy tắc phát hiện \"%3$s\" trên \"%4$s\"."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "Không thể để trống tên mẫu."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2655,7 +2648,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] "Không thể nhập template \"%1$s\", template được liên kết \"%2$s\" không tồn tại."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "Không thể chèn biểu thức trigger"
 
@@ -2669,7 +2662,7 @@ msgid "Cannot link template."
 msgstr "Không thể kết nối mẫu"
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2700,17 +2693,17 @@ msgstr "Không thể cập nhật hàng loạt tên mẫu có thể nhìn thấy
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "Không thể xóa trạng thái trong bảng \"%1$s\" với điều kiện tại đó."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "Không thể cập nhật trạng thái trong bảng \"%1$s\" với nhiều giá trị."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "Không thể cập nhật trạng thái trong bảng \"%1$s\" với điều kiện tại đó."
@@ -2737,7 +2730,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "Không thể đọc các câu trả lời, kiểm tra kết nối với zabbix server \"%1$s\"."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "Không thể đổi tên người dùng khách."
 
@@ -2756,7 +2749,7 @@ msgstr "Không thể lưu ô điều khiển \"%1$s\"."
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "Không thể gửi lệnh, kiểm tra kết nối đến zabbix server \"%1$s\"."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr "Không thể gửi yêu cầu"
 
@@ -2796,12 +2789,12 @@ msgstr "Không thể đặt lại các trường inventory khi vô hiệu h
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2819,7 +2812,7 @@ msgid "Cannot unblock user"
 msgid_plural "Cannot unblock users"
 msgstr[0] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "Không thể ngắt kết nối hoặc xóa các web scenario."
 
@@ -2832,7 +2825,7 @@ msgstr "Không thể ngắt kết nối tempate"
 msgid "Cannot unlink template."
 msgstr "Không thể kết nối đến mẫu."
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2885,11 +2878,6 @@ msgstr "Không thể cập nhật \"%2$s\" cho item được khám phá \"%1$s\"
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "Không thể cập nhật \"%2$s\" cho một trigger khám phá \"%1$s\"."
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "Không thể cập nhật \"imagetype\" cho ảnh \"%1$s\"."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2899,9 +2887,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "Không thể cập nhật một biểu đồ được phát hiện."
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "Không thể cập nhật một nhóm host được phát hiện."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -2959,9 +2948,7 @@ msgstr "Không thể cập nhật kiểu đồ thị"
 msgid "Cannot update group"
 msgstr "Không thể cập nhật nhóm"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "Không thể cập nhật các nhóm cho host được phát hiện \"%1$s\"."
@@ -2983,13 +2970,13 @@ msgstr[0] "Không thể cập nhật kiểu host"
 msgid "Cannot update hosts"
 msgstr "Không thể cập nhật các host"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "Không thể cập nhật biểu tượng sơ đồ"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "Không thể cập nhật hình ảnh"
 
@@ -3042,12 +3029,12 @@ msgstr "Không thể cập nhật sơ đồ mạng"
 msgid "Cannot update proxy"
 msgstr "Không thể cập nhật proxy"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "Không thể cập nhật proxy cho host được phát hiện \"%1$s\"."
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3067,17 +3054,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "Không thể cập nhật script"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3150,7 +3137,7 @@ msgstr[0] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "Không thể cập nhận web scenario"
 
@@ -3250,8 +3237,8 @@ msgid "Character string not included"
 msgstr "Chuỗi ký tự không bao gồm"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3366,7 +3353,7 @@ msgstr "Kiểm tra performance của dịch vụ UDP. Trả về 0 - Dịch vụ
 msgid "Checks should be unique."
 msgstr "Kiểm tra phải là duy nhất."
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3387,7 +3374,7 @@ msgstr "Thông tư tham khảo cho các template: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "Liên kết thông tư template không được cho phép."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3408,11 +3395,11 @@ msgstr "Xóa lịch sử và phương hướng."
 msgid "Clear when unlinking"
 msgstr "Xóa khi không liên kết"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr "Nhấp và kéo đến kích thước mong muốn."
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3427,7 +3414,7 @@ msgstr "Đồng hồ"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3442,7 +3429,7 @@ msgstr "Đồng hồ"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "Tạo bản sao"
 
@@ -3453,8 +3440,8 @@ msgstr "Tạo bản sao"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "Đóng"
 
@@ -3465,13 +3452,13 @@ msgstr "Đóng"
 msgid "Close expression constructor"
 msgstr "Đóng hàm tạo biểu thức"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "Đóng sự kiện mới"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "Đóng sự kiện cũ"
 
@@ -3484,8 +3471,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "Thu hẹp"
 
@@ -3502,7 +3489,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3568,7 +3555,7 @@ msgstr "Nén"
 msgid "Concurrent sessions"
 msgstr "Các phiên làm việc đồng thời"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3579,17 +3566,12 @@ msgstr "Điều kiện"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "Điều kiện \"%2$s\" không được sử dụng trong công thức \"%3$s\" cho hoạt động \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "Điều kiện \"%2$s\" không được sử dụng trong công thức \"%3$s\" cho liên kết \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "Điều kiện \"%2$s\" không được sử dụng trong công thức \"%3$s\" cho quy tắc khám phá \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3599,17 +3581,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "Điều kiện \"%2$s\" được sử dụng trong công thức \"%3$s\" cho hoạt động \"%1$s\" không xác định"
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "Điều kiện \"%2$s\" được sử dụng trong công thức \"%3$s\" cho liên kết \"%1$s\" không xác định."
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "Điều kiện \"%2$s\" được sử dụng trong công thức \"%3$s\" cho quy tắc khám phá \"%1$s\" không được xác định."
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3625,7 +3602,7 @@ msgstr "Các điều kiện"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "Cấu hình"
 
@@ -3688,7 +3665,7 @@ msgstr "Cấu hình của các host"
 msgid "Configuration of housekeeping"
 msgstr "Cấu hình của housekeeping"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "Cấu hình của biểu tượng bản đồ"
@@ -3795,7 +3772,7 @@ msgstr "Xác nhận văn bản"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "Chúc mừng! Bạn đã cài đặt thành công Zabbix frontend."
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3888,7 +3865,7 @@ msgstr "Liên lạc"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3948,7 +3925,7 @@ msgstr "Chứa"
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr "Nội dung điều khiển"
 
@@ -3987,8 +3964,8 @@ msgstr "Tọa độ"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "Sao chép"
 
@@ -3997,12 +3974,11 @@ msgstr "Sao chép"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "Liên kết"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "Liên kết \"%1$s\" đã tồn tại."
@@ -4027,16 +4003,6 @@ msgid "Correlation enabled"
 msgid_plural "Correlations enabled"
 msgstr[0] "Liên kết đã kích hoạt"
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "Liên kết bị thiếu tham số: %1$s"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "Tên liên kết không thể để trống."
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr "Quy tắc liên kết"
@@ -4045,14 +4011,10 @@ msgstr "Quy tắc liên kết"
 msgid "Correlation updated"
 msgstr "Liên kết được cập nhật"
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "Không thể lưu trữ hình ảnh!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "Đếm"
 
@@ -4116,11 +4078,11 @@ msgstr "Tạo liên kết"
 msgid "Create dashboard"
 msgstr "Tạo bảng điều khiển"
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr "Tạo item phụ thuộc"
 
@@ -4237,7 +4199,7 @@ msgstr "Tạo bản đồ"
 msgid "Create media type"
 msgstr "Tạo media type"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "Tạo mới"
 
@@ -4261,7 +4223,7 @@ msgstr ""
 msgid "Create template"
 msgstr "Tạo template"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "Tạo trigger"
 
@@ -4424,7 +4386,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "TÊN DNS"
@@ -4436,11 +4398,11 @@ msgstr "TÊN DNS"
 msgid "Daily"
 msgstr "Hàng ngày"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "Tối"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4461,8 +4423,8 @@ msgstr "Bảng điều khiển \"%1$s\" đã tồn tại."
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr "Bảng điều khiển đã tạo"
 
@@ -4484,9 +4446,9 @@ msgstr "Thuộc tính bảng điều khiển"
 msgid "Dashboard sharing"
 msgstr "Bảng điều khiển chia sẻ"
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr "Bảng điều khiển được cập nhật"
 
@@ -4510,7 +4472,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr "Bảng điều khiển"
 
@@ -4538,7 +4500,7 @@ msgstr "Tổng quan dữ liệu"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr "Đặt lại dữ liệu"
 
@@ -4680,7 +4642,7 @@ msgstr "Ngày trong tuần "
 msgid "Days"
 msgstr "Các ngày"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "Gỡ lỗi"
 
@@ -4694,26 +4656,26 @@ msgstr "Chế độ gỡ lỗi"
 msgid "Dec"
 msgstr "Dec"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "Tháng 12"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "Mặc định"
 
@@ -4806,7 +4768,7 @@ msgstr "Trễ bởi"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4830,8 +4792,8 @@ msgstr "Trễ bởi"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "Xóa"
 
@@ -4856,11 +4818,11 @@ msgstr "Xóa và xóa bỏ hoàn toàn template hay không? (Cảnh báo:
 msgid "Delete current action?"
 msgstr "Xóa hành động hiện tại?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "Xóa sự liên kết hiện tại?"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr "Xóa bảng điều khiển?"
 
@@ -4904,7 +4866,7 @@ msgstr "Xóa kiểu item?"
 msgid "Delete item?"
 msgstr "Xóa item?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "Xóa liên kết giữa các phần tử được chọn?"
 
@@ -4960,7 +4922,7 @@ msgstr "Xóa bảng điều khiển đã chọn"
 msgid "Delete selected discovery rules?"
 msgstr "Xóa các quy tắc phát hiện được chọn?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "Xóa các phần tử được chọn?"
 
@@ -5065,7 +5027,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "Xóa hình đã chọn?"
 
@@ -5109,7 +5071,7 @@ msgstr "Xóa trigger?"
 msgid "Delete web scenario?"
 msgstr "Xóa web scanario?"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5154,7 +5116,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "Quan hệ phụ thuộc"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "Phụ thuộc"
 
@@ -5162,7 +5124,7 @@ msgstr "Phụ thuộc"
 msgid "Dependent item"
 msgstr "Item phụ thuộc"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5172,7 +5134,7 @@ msgstr "Phụ thuộc vào"
 msgid "Deployment status"
 msgstr "Trạng thái triển khai"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5205,7 +5167,7 @@ msgid "Description"
 msgstr "Mô tả"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5371,10 +5333,10 @@ msgstr "Vô hiệu hóa web scenario đã chọn?"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5457,7 +5419,7 @@ msgid "Discovery by proxy"
 msgstr "Phát hiện bởi proxy"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "Kiểm tra phát hiện"
 
@@ -5469,7 +5431,7 @@ msgstr "Các kiểm tra phát hiện"
 msgid "Discovery list"
 msgstr "Danh sách phát hiện"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "Đối tượng phát hiện"
 
@@ -5501,7 +5463,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5509,12 +5471,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "Quy tắc phát hiện"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "Quy tắc phát hiện \"%1$s\" đã tồn tại trên \"%2$s\", kế thừa từ template khác."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "Quy tắc phát hiện \"%1$s\" đã tồn tại trên \"%2$s\"."
@@ -5527,7 +5489,7 @@ msgstr "Quy tắc phát hiện \"%1$s\" đã tồn tại trên \"%2$s\"."
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "Quy tắc khám phá \"%1$s\" đã tồn tại."
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5566,7 +5528,7 @@ msgstr "Quy tắc phát hiện đã cập nhật"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5577,7 +5539,7 @@ msgstr "Các quy tắc phát hiện"
 msgid "Discovery rules deleted"
 msgstr "Các quy tắc phát hiện đã xóa"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "Trạng thái phát hiện"
@@ -5614,10 +5576,11 @@ msgid "Display stacked graph"
 msgstr "Hiển thị sơ đồ xếp chồng"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "Hiển thị %1$s của %2$s đã tìm được"
@@ -5627,7 +5590,7 @@ msgstr "Hiển thị %1$s của %2$s đã tìm được"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "Hiển thị %1$s đến %2$s của %3$s được tìm thấy"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr "Hiển thị tùy chọn"
 
@@ -5649,7 +5612,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "Bạn có muốn thay thế biểu thức điều kiện không?"
 
@@ -5705,7 +5668,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "Down"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5713,7 +5676,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr "Tải xuống tệp tin cấu hình"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5732,18 +5695,6 @@ msgstr "vẽ"
 msgid "Draw style"
 msgstr "Kiểu dáng thiết kế"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "Tạo bản sao \"%1$s\" giá trị \"%2$s\" cho liên kết\"%3$s\"."
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr "Tạo bản sao \"%1$s\" giá trị \"%2$s\" cho liên kết."
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5756,11 +5707,6 @@ msgstr "Tạo bản sao \"tên\" giá trị \"%1$s\" cho sơ đồ."
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5812,7 +5758,7 @@ msgstr "Item động"
 msgid "Dynamic items"
 msgstr "Item động"
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "Mỗi URL cần có một tên duy nhất. Xin chắc chắn chỉ có một URl có tên"
 
@@ -5821,11 +5767,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5839,8 +5785,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "Chỉnh sửa"
 
@@ -5856,11 +5802,11 @@ msgstr "Chỉnh sửa sơ đồ"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr "Chỉnh sửa phần tử cây"
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "Chỉnh sửa trigger"
 
@@ -5920,21 +5866,17 @@ msgstr "Tệp khóa SSL trống cho web scenario: \"%1$s\"."
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "ID liên kết trống."
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "ID công thức điều kiện lọc trống cho hoạt động \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "ID công thức điều kiện lọc trống cho quy tắc khám phá \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "Macro điều kiện lọc trống cho quy tắc khám phá \"%1$s\"."
@@ -5950,25 +5892,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -5978,14 +5914,6 @@ msgstr "Không có tham số đầu vào."
 msgid "Empty map ID."
 msgstr "ID sơ đồ trống."
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "ID loại phương tiện trống."
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "Tham số rỗng"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6151,7 +6079,7 @@ msgstr "Kích hoạt trap"
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6162,7 +6090,7 @@ msgstr "Kích hoạt trap"
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6205,7 +6133,7 @@ msgid "English (en_US)"
 msgstr "English (en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6221,7 +6149,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6240,12 +6168,12 @@ msgstr "Bằng"
 msgid "Error"
 msgstr "Lỗi"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "Lỗi trong yêu cầu tìm kiếm cho bảng \"%1$s\"."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr "Tin nhắn lỗi"
 
@@ -6272,7 +6200,7 @@ msgstr "ID sự kiện"
 msgid "Event acknowledged"
 msgstr "Sự kiện được tiếp nhận"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6280,7 +6208,7 @@ msgid "Event correlation"
 msgstr "Liên kết sự kiện"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "Quy tắc liên kết sự kiện"
@@ -6315,11 +6243,11 @@ msgstr "Theo dõi log sự kiện. Trả về log"
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "Cặp thẻ sự kiện"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "Kiểu sự kiện"
 
@@ -6363,15 +6291,10 @@ msgstr "Loại trừ"
 msgid "Exclude host groups"
 msgstr "Loại trừ các nhóm máy chủ"
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "Thực hiện"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "Thực hiện lỗi SQL [%1$s] trong [%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6409,7 +6332,7 @@ msgstr "Thực thi"
 msgid "Executed script"
 msgstr "Câu lệnh đã thực hiện"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "Thực hiện xá nhận"
 
@@ -6425,8 +6348,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "Mở rộng"
 
@@ -6547,7 +6470,7 @@ msgstr "Các biểu thức"
 msgid "External check"
 msgstr "Kiểm tra bên ngoài"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6574,8 +6497,8 @@ msgstr "Đã thất bại"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6586,26 +6509,26 @@ msgstr "Không thể tạo bảng điều khiển"
 msgid "Failed to parse URL."
 msgstr "Không thể phân tích cú pháp URL."
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr "Không thể cập nhật bảng điều khiển"
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6613,7 +6536,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "Không thể cập nhật mẫu."
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6637,7 +6560,7 @@ msgstr ""
 msgid "Feb"
 msgstr "Tháng 2"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "Tháng 2"
 
@@ -6659,10 +6582,9 @@ msgstr "Trường \"%1$s\" không thể bị thiết lập là NULL."
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6673,13 +6595,6 @@ msgstr "Trường \"%1$s\" là bắt buộc."
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "Trường \"%1$s\" thiếu giá trị cho sơ đồ \"%2$s\"."
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "Trường \"%1$s\" thiếu giá trị cho phương tiện \"%2$s\"."
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6698,11 +6613,6 @@ msgstr "Trường \"%1$s\" không phải là số nguyên."
 msgid "Field \"%1$s\" is not string."
 msgstr "Trường \"%1$s\" không phải là chuỗi."
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "Trường \"%1$s\" được chuẩn bị cho loại phương tiện \"%2$s\"."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6717,10 +6627,6 @@ msgstr "Trường \"máy chủ\" là bắt buộc."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Định dạng tập tin không được hỗ trợ."
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6785,7 +6691,8 @@ msgstr "Khu vực được tô kín"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6810,7 +6717,7 @@ msgstr "Lọc"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6862,7 +6769,7 @@ msgstr "Ăn khớp với bản đồ"
 msgid "Fixed"
 msgstr "Đã sửa lỗi"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6913,12 +6820,12 @@ msgstr "Công thức"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -6931,7 +6838,7 @@ msgstr "Pháp(fr_FR)"
 msgid "Fri"
 msgstr "Thứ sáu"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "Thứ sáu"
 
@@ -7042,7 +6949,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "Biểu thức đã cho không phải là một macro"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr "Biểu thức chính quy toàn cục \"%1$s\" không tồn tại"
@@ -7056,7 +6963,7 @@ msgstr "Giá trị toàn cục"
 msgid "Go back to %1$s"
 msgstr "Quay trở về %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "Đi tới"
 
@@ -7094,7 +7001,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7102,7 +7009,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "Đường độ dốc"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7161,7 +7068,7 @@ msgstr[0] "Đồ thị được sao chép"
 msgid "Graph deleted"
 msgstr "Đồ thị đã xóa"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7198,8 +7105,8 @@ msgstr "Kiểu đồ thị đã xóa"
 msgid "Graph prototype updated"
 msgstr "Kiểu đồ thị đã được cập nhật"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr "Kiều đồ thị với ID \"%1$s\" không sẵn sàng."
@@ -7233,8 +7140,8 @@ msgstr "Kiểu đồ thị"
 msgid "Graph updated"
 msgstr "Đồ thị được cập nhật"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr "Đồ thị với ID \"%1$s\" không sẵn sàng."
@@ -7265,7 +7172,7 @@ msgstr "Đồ thị với tên \"%1$s\" đã tồn tại trong số các �
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "Đồ thị"
 
@@ -7286,12 +7193,12 @@ msgstr "Grid"
 msgid "Group"
 msgstr "Nhóm"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "Nhóm \"%1$s\" không thể bị xóa, bởi vì nó được sử dụng bởi các kiểu host."
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr "Nhóm \"%1$s\" không thể xóa, bởi vì nó được sử dụng trong một điều kiện tương quan."
@@ -7464,11 +7371,11 @@ msgstr "Trợ giúp"
 msgid "Hexadecimal to decimal"
 msgstr "Thập lục phân đến thập phân"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "Ẩn"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "Ẩn gỡ lỗi"
 
@@ -7495,11 +7402,11 @@ msgstr "Thứ bậc"
 msgid "High"
 msgstr "Cao"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr "Độ tương phản tối"
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr "Độ tương phản sáng"
 
@@ -7520,7 +7427,7 @@ msgstr "Làm nổi bật toàn bộ hàng"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "Lịch sử"
 
@@ -7528,11 +7435,15 @@ msgstr "Lịch sử"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "Lịch sử bị xóa"
 
@@ -7575,7 +7486,7 @@ msgstr "Chiều ngang"
 msgid "Horizontal align"
 msgstr "Sắp xếp theo chiều ngang"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7604,7 +7515,7 @@ msgstr "Sắp xếp theo chiều ngang"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7617,7 +7528,7 @@ msgstr[0] "Host"
 msgid "Host \"%1$s\" already exists."
 msgstr "Host \"%1$s\" đã tồn tại."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7625,7 +7536,7 @@ msgstr "Host \"%1$s\" đã tồn tại."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "Máy chủ \"%1$s\" không thể không có nhóm máy chủ."
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7675,7 +7586,7 @@ msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] "Host được kích hoạtCác host được kích hoạt"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7689,22 +7600,22 @@ msgstr[0] "Host được kích hoạtCác host được kích hoạt"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "Nhóm host"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "Nhóm host \"%1$s\" đã tồn tại."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "`Nhóm host \"%1$s\" không thể bị xóa, bởi bị nó được sử dụng trong một tập lệnh toàn cục."
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7717,10 +7628,10 @@ msgstr "Các phần tử nhóm host"
 msgid "Host group label type"
 msgstr "Kiểu nhãn nhóm host"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "Nhóm máy chủ với ID \"%1$s\" không sẵn sàng."
@@ -7736,8 +7647,8 @@ msgstr "Nhóm máy chủ với ID \"%1$s\" không sẵn sàng."
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7811,7 +7722,7 @@ msgstr "Tên host"
 msgid "Host networks"
 msgstr "Các mạng host"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7890,7 +7801,7 @@ msgstr "Host cập nhật thất bại."
 msgid "Host updated"
 msgstr "Host đã cập nhật"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr "Máy chủ với ID \"%1$s\" không sẵn sàng."
@@ -7910,7 +7821,7 @@ msgstr "Host với cùng một tên \"%1$s\" đã tồn tại."
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "Host với cùng một tên hiển thị \"%1$s\" đã tồn tại."
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -7923,7 +7834,7 @@ msgstr "Host với cùng một tên hiển thị \"%1$s\" đã tồn tại
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -7971,7 +7882,7 @@ msgstr "Các host đã cập nhật"
 msgid "Hours"
 msgstr "Giờ"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8011,7 +7922,7 @@ msgstr "IP"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "Địa chỉ IP"
@@ -8036,7 +7947,7 @@ msgstr "Dải IP \"%1$s\" vượt quá giới hạn địa chỉ \"%2$s\""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8093,12 +8004,12 @@ msgstr "Biểu tượng tô sáng"
 msgid "Icon map"
 msgstr "Biểu tượng bản đồ"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "Biểu tượng bản đồ \"%1$s\" không thể bị xóa. Sử dụng trong bản đồ \"%2$s\"."
@@ -8111,18 +8022,18 @@ msgstr "Biểu tượng bản đồ được tạo"
 msgid "Icon map deleted"
 msgstr "Biểu tượng bản đồ đã xóa"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "Biểu tượng bản đồ được cập nhật"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "Vẽ biểu tượng"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "Biểu tượng với ID \"%1$s\" không sẵn sàng."
@@ -8221,23 +8132,20 @@ msgstr "Nếu bạn nghĩ rằng tin nhắn này là sai, xin vui lòng t
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "Hình ảnh"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "Hình ảnh \"%1$s\" đã tồn tại."
@@ -8246,7 +8154,7 @@ msgstr "Hình ảnh \"%1$s\" đã tồn tại."
 msgid "Image added"
 msgstr "Hình ảnh đã được thêm"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "Hình ảnh đã bị xóa"
 
@@ -8254,18 +8162,12 @@ msgstr "Hình ảnh đã bị xóa"
 msgid "Image label type"
 msgstr "Loại nhãn hình ảnh"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "Lỗi tải hình ảnh [%1$s]  trong [%2$s]."
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "Hình ảnh được cập nhật"
 
@@ -8360,7 +8262,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8371,13 +8273,13 @@ msgstr "Bảo trì không thể tiếp cận"
 msgid "Inaccessible map"
 msgstr "Sơ đồ không thể tiếp cận"
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr "Mẫu không thể tiếp cận"
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr "Trigger không thể tiếp cận"
 
@@ -8421,7 +8323,7 @@ msgstr "Bao gồm các nhóm nhỏ"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "Thống kê lưu lượng truy cập đến interface mạng. Trả về kiểu trigger"
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8589,24 +8491,6 @@ msgstr "Thao tác nhóm người dùng action không chính xác. Nhóm n
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "Thao tác người dùng action không chính xác. Người dùng không tồn tại hoặc bạn không có quyền truy cập vào người dùng này."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8661,8 +8545,6 @@ msgstr "Thao tác người dùng action không chính xác. Người dùn
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "Các đối số không chính xác được thông qua hàm."
 
@@ -8688,31 +8570,22 @@ msgstr "Các ký tự được sử dụng cho tên template \"%1$s\" khôn
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "Điều kiện không chính xác cho hoạt động \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "Điều kiện không chính xác cho quy tắc khám phá \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "ID liên kết không chính xác."
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "Biểu thức tự chọn \"%2$s\" không chính xác cho hoạt động \"%1$s\": %3$s."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "Biểu thức tự chọn \"%2$s\" không chính xác cho liên kết \"%1$s\": %3$s."
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "Biểu thức tự chọn \"%2$s\" không chính xác cho quy tắc khám phá \"%1$s\": %3$s."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8741,7 +8614,7 @@ msgstr "Giá trị đối tượng sự kiện không chính xác."
 msgid "Incorrect eventsource value."
 msgstr "Giá trị nguồn sự kiện không chính xác."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "Trường có tên \"%1$s\" không chính xác hoặc giá trị ở nơi báo cáo đối với bảng \"%2$s\"."
@@ -8766,22 +8639,17 @@ msgstr "Tải lên tập tin không chính xác."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "ID công thức điều kiện bộ lọc không chính xác cho hoạt động \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "ID công thức điều kiện bộ lọc không chính xác cho quy tắc khám phá \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "ID công thức điều kiện bộ lọc không chính xác cho liên kết \"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "Điều kiện lọc macro không chính xác cho quy tắc khám phá \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8792,7 +8660,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "Thao tác điều kiện lọc không chính xác cho hoạt động \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "Thao tác điều kiện lọc không chính xác cho quy tắc khám phá \"%1$s\"."
@@ -8820,8 +8688,6 @@ msgstr "Chỉ số hình ảnh không chính xác."
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8883,10 +8749,6 @@ msgstr "Chu kỳ bảo trì không chính xác (nhỏ nhất là 5 phút)"
 msgid "Incorrect map ID."
 msgstr "ID sơ đồ không chính xác."
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "ID loại phương tiện không chính xác."
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -8944,13 +8806,13 @@ msgstr "Biểu thức chính quy \"%1$s\" không chính xác: \"%2$s\""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "Đáp ứng không chính xác nhận được từ máy chủ Zabbix  \"%1$s\"."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "Thời gian kết thúc dịch vụ không chính xác."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "Thời gian bắt đầu dịch vụ không chính xác."
 
@@ -9003,12 +8865,7 @@ msgstr "Biểu thức trigger không chính xác. Các thành phần biểu th�
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "Loại tính toán không chính xác cho hoạt động \"%1$s\"."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "Loại tính toán không chính xác cho liên kết\"%1$s\"."
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "Loại tính toán không chính xác cho quy tắc khám phá \"%1$s\"."
@@ -9054,13 +8911,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9077,60 +8934,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "Giá trị \"%1$s\" không chính xác đối với trường \"%2$s\": phải nằm giữa \"%3$s\" và \"%4$s\". "
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "Giá trị \"%1$s\" không chính xác đối với trường float \"%2$s\"."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "Giá trị \"%1$s\" không chính xác đối với trường int \"%2$s\"."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "Giá trị \"%1$s\" không chính xác đối với trường unsigned int \"%2$s\". "
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "Giá trị không chính xác \"%1$s\" trong trường \"%2$s\" cho liên kết \"%3$s\"."
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "Giá trị \"%1$s\" không chính xác trong trường \"%2$s\" cho loại phương tiện \"%3$s\"."
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9185,14 +9012,8 @@ msgstr "Giá trị không chính xác cho trường \"%1$s\"."
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9302,25 +9123,7 @@ msgstr "Giá trị không chính xác cho trường \"%1$s\"."
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9331,7 +9134,7 @@ msgstr "Giá trị không chính xác cho trường \"%1$s\"."
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9377,16 +9180,17 @@ msgstr "Giá trị không chính xác cho trường \"%1$s\"."
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9395,7 +9199,7 @@ msgstr "Giá trị không chính xác cho trường \"%1$s\"."
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "Giá trị không chính xác cho trường \"%1$s\": %2$s."
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9483,12 +9287,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "Chèn"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "Chèn biểu thức"
 
@@ -9592,7 +9396,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
@@ -9600,7 +9404,7 @@ msgstr "Internet Explorer"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9611,7 +9415,7 @@ msgstr "Internet Explorer"
 msgid "Interval"
 msgstr "Khoảng thời gian"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9634,7 +9438,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr "Điều kiện hoạt động không hợp lệ: %1$s."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9666,7 +9470,7 @@ msgstr "Địa chỉ email không hợp lệ cho loại phương tiện với ID
 msgid "Invalid interval \"%1$s\"."
 msgstr "Khoảng thời gian \"%1$s\" không hợp lệ."
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "Key \"%1$s\" không hợp lệ đối với quy tắc phát hiện \"%2$s\" trên \"%3$s\": \"%4$s\"."
@@ -9691,27 +9495,29 @@ msgstr "Key \"%1$s\" không hợp lệ: \"%2$s\"."
 msgid "Invalid method parameters."
 msgstr "Phương pháp tham số không hợp lệ."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9737,17 +9543,17 @@ msgstr "Phương pháp tham số không hợp lệ."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9755,8 +9561,8 @@ msgstr "Phương pháp tham số không hợp lệ."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9770,106 +9576,116 @@ msgstr "Phương pháp tham số không hợp lệ."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9911,43 +9727,38 @@ msgstr "Đáp ứng code \"%1$s\" không hợp lệ."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -9968,7 +9779,7 @@ msgstr "Khoảng thời gian không hợp lệ."
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "Kiểm kê"
 
@@ -10009,7 +9820,7 @@ msgstr "Nó không thể tìm kiếm theo mật khẩu người dùng."
 msgid "Italian (it_IT)"
 msgstr "Italian (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10041,7 +9852,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "Item \"%1$s\" không thể gắn vào một quá trình kiểm kê số trường đang bị lỗi \"%2$d\". Các lựa chọn là: từ 0 (Không được gắn vào) đến \"%3$d\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10055,7 +9866,7 @@ msgstr "Item đã được thêm vào"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "Item đã được sao chép"
@@ -10068,12 +9879,12 @@ msgstr "Đếm item"
 msgid "Item deleted"
 msgstr "Item đã bị xóa"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "Item đã bị vô hiệu hóaCác item đã bị vô hiệu hóa"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "Item đã được kích hoạtCác item đã được kích hoạt"
@@ -10082,7 +9893,7 @@ msgstr[0] "Item đã được kích hoạtCác item đã được kích h
 msgid "Item in \"not supported\" state"
 msgstr "Item trong trạng thái \"không được hỗ trợ\""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "Item không được lựa chọn"
 
@@ -10091,7 +9902,7 @@ msgstr "Item không được lựa chọn"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr "Item chuẩn bị xử lí bị thiếu tham số: %1$s"
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10127,8 +9938,8 @@ msgid "Item prototype updated"
 msgid_plural "Item prototypes updated"
 msgstr[0] "Kiểu item đã được cập nhật"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr "Kiểu item với ID \"%1$s\" không sẵn sàng."
@@ -10154,7 +9965,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10186,8 +9997,8 @@ msgstr "Item sẽ không được làm mới. Khoảng thời gian cập nhật
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr "Item sẽ không được làm mới. Khoảng thời gian cập nhật nên nằm giữa 1s và 1d. Cũng có thể sử dụng khoảng thời gian theo lịch trình/ linh hoạt."
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr "Item với ID \"%1$s\" không sẵn sàng."
@@ -10238,11 +10049,11 @@ msgstr "Item với key \"%1$s\" đã tồn tại trên \"%2$s\"."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "Các item"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "Các item đã bị xóa"
 
@@ -10260,7 +10071,7 @@ msgstr "Các item được cập nhật"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10285,6 +10096,10 @@ msgstr "JMX interfaces"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10297,7 +10112,7 @@ msgstr "JSON data"
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr "Chuỗi JSON là được kì vọng"
 
@@ -10315,7 +10130,7 @@ msgstr ""
 msgid "Jan"
 msgstr "Tháng 1"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "Tháng 1"
 
@@ -10337,7 +10152,7 @@ msgstr ""
 msgid "Jul"
 msgstr "Tháng 7"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "Tháng 7"
 
@@ -10345,7 +10160,7 @@ msgstr "Tháng 7"
 msgid "Jun"
 msgstr "Tháng 6"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "Tháng 6"
 
@@ -10495,22 +10310,6 @@ msgid "Last %1$d year"
 msgid_plural "Last %1$d years"
 msgstr[0] "%1$d năm cuối cùng"
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10522,11 +10321,11 @@ msgstr ""
 msgid "Last check"
 msgstr "Lần kiểm tra cuối cùng"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "Đồ thị giờ cuối cuối cùng"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "Đồ thị tháng cuối cùng"
 
@@ -10564,11 +10363,11 @@ msgstr ""
 msgid "Last value"
 msgstr "Giá trị cuối cùng"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "Đồ thị tuần cuối cùng"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10577,11 +10376,11 @@ msgstr "Đồ thị tuần cuối cùng"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "Dữ liệu gần đây nhất"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "Các giá trị gần đây nhất"
 
@@ -10622,7 +10421,7 @@ msgstr "rời khỏi Y"
 msgid "Left trim"
 msgstr "Cắt trái"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr "Lịch sử"
 
@@ -10903,7 +10702,7 @@ msgstr "Quy tắc phát hiện mức độ thấp ở trạng thái \"kh
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -10925,7 +10724,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "Tổng kiểm tra MD5 của tập tin. Trả về chuỗi ký tự (MD5 của tệp)"
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -10936,12 +10735,12 @@ msgid "Macro"
 msgstr "Macro"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "Macro \"%1$s\" đã tồn tại trên \"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "Macro \"%1$s\" đã tồn tại."
@@ -10969,7 +10768,7 @@ msgstr "Các macro được cập nhật"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr "Bộ lọc chính"
 
@@ -10977,7 +10776,7 @@ msgstr "Bộ lọc chính"
 msgid "Main navigation"
 msgstr "Điều hướng chính"
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11060,7 +10859,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11082,13 +10881,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr "Hướng dẫn bị đóng"
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "Bản đồ"
 
@@ -11157,7 +10956,7 @@ msgstr "Hình sơ đồ"
 msgid "Map update failed."
 msgstr "Cập nhật sơ đồ bị lỗi."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr "Sơ đồ với ID \"%1$s\" không sẵn sàng."
@@ -11189,7 +10988,7 @@ msgstr "Các bản đồ"
 msgid "Mar"
 msgstr "Tháng 3"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "Tháng 3"
 
@@ -11293,7 +11092,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11306,7 +11105,7 @@ msgstr[0] "Chu kỳ thời gian tối đa để hiển thị là %1$s ngà
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "Tổng chiều dài tối đa của địa chỉ email vượt quá đối với loại phương tiện có ID \"%1$s\"."
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "Tháng 5"
 
@@ -11321,15 +11120,12 @@ msgstr "Tháng 5"
 msgid "Media"
 msgstr "Media"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "Loại phương tiện"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr "Loại phương tiện \"%1$s\" đã tồn tại."
@@ -11353,11 +11149,6 @@ msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "Loại phương tiện đã được kích hoạtCác loại phương tiện đã được kích hoạt"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr "Loại phương tiện là thiếu tham số: %1$s"
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11387,7 +11178,7 @@ msgstr "Kiểu phương tiện với ID \"%1$s\" là không sẵn sàng."
 msgid "Media types"
 msgstr "Các loại phương tiện"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11475,7 +11266,7 @@ msgstr "Viết tin nhắn"
 msgid "Method not found."
 msgstr "Không tìm thấy giải pháp"
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11537,7 +11328,7 @@ msgid "Minimum severity"
 msgstr "Sự quan trọng tối thiểu"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11595,7 +11386,7 @@ msgstr "Chế độ"
 msgid "Model"
 msgstr "Mô hình"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11629,7 +11420,7 @@ msgstr[0] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11655,7 +11446,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Thứ 2"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "Thứ 2"
 
@@ -11695,11 +11486,11 @@ msgstr "Tháng"
 msgid "Monthly"
 msgstr "Hàng tháng"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "Tìm thấy nhiều kết quả phù hợp hơn..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11723,7 +11514,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11736,7 +11527,7 @@ msgstr "Nhiều"
 msgid "Multiple PROBLEM events"
 msgstr "Nhiều sự kiện có vấn đề"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "Tắt tiếng"
 
@@ -11865,11 +11656,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12027,19 +11818,21 @@ msgstr "Điều kiện mới"
 msgid "New dashboard"
 msgstr "Bảng điều khiển mới"
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "Phần tử mới"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr "Nhóm sự kiện máy chủ mới"
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr "Giá trị thẻ sự kiện mới"
 
@@ -12051,7 +11844,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "Biểu thức chính quy mới"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12059,7 +11852,7 @@ msgstr ""
 msgid "New service time"
 msgstr "Thời gian dịch vụ mới"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12068,7 +11861,7 @@ msgid "New triggers"
 msgstr "Trigger mới"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12086,7 +11879,7 @@ msgstr "Bước tiếp theo"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12115,30 +11908,6 @@ msgstr "Bước tiếp theo"
 msgid "No"
 msgstr "Không"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "Không có \"%1$s\" cho liên kết \"%2$s\"."
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "Không có \"%1$ s\" cho liên kết."
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12154,11 +11923,6 @@ msgstr "\"%1$s\" không được đưa ra cho đồ thị."
 msgid "No \"%1$s\" given for map."
 msgstr "Không có \"%1$s\" cho sơ đồ."
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "Không có \"%1$s\" cho phương tiện."
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12166,7 +11930,7 @@ msgstr "Không có \"%1$s\" cho phương tiện."
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "Không có \"%2$s\" cho điều kiện lọc hoạt động \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "Không có \"%2$s\" cho điều kiện lọc quy tắc khám phá \"%1$s\"."
@@ -12176,7 +11940,7 @@ msgstr "Không có \"%2$s\" cho điều kiện lọc quy tắc khám phá \"%1$s
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "Không có \"%2$s\" cho lọc hoạt động \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "Không có \"%2$s\" cho bộ lọc quy tắc khám phá \"%1$s\"."
@@ -12193,11 +11957,6 @@ msgstr "Không quy định xác thực tên người dùng."
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "Không có loại điều kiện cho liên kết \"%1$s\"."
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12228,7 +11987,7 @@ msgstr "Không có interface mặc định cho kiểu \"%1$s\" trên \"%2$s\"
 msgid "No details"
 msgstr "Không có thông tin chi tiết"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "Không có quy tắc phát hiện các ID cho."
 
@@ -12264,7 +12023,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "Không có đồ thị nào được thêm vào."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "Không có các host ID nhất định."
 
@@ -12294,7 +12053,7 @@ msgstr "Không có hình ảnh"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "Không tìm thấy interface "
 
@@ -12328,7 +12087,7 @@ msgstr "Không tìm thấy macro nào."
 msgid "No maps added."
 msgstr "Bản đồ không được thêm vào."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "Không khớp với kết quả nào "
 
@@ -12336,17 +12095,46 @@ msgstr "Không khớp với kết quả nào "
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr "Không có loại hoạt động nào được đưa ra cho liên kết \"%1$s\"."
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "Không có quyền truy cập hệ thống."
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12354,7 +12142,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12382,19 +12170,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12409,16 +12196,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12438,12 +12231,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12464,27 +12255,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12501,14 +12294,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12517,7 +12310,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "Không có quyền truy cập vào đối tượng được gọi hoặc nó không tồn tại!"
 
@@ -12537,7 +12330,7 @@ msgstr "Không quy định được khóa tập tin công khai."
 msgid "No recipients for action operation message."
 msgstr "Không có người nhận khi gửi nhắn tin."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr "Không làm mới"
 
@@ -12549,7 +12342,7 @@ msgstr "Không quy được script cho thao tác lệnh action."
 msgid "No target selected"
 msgstr "Không có mục tiêu nào được chọn"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "Không có mục tiêu nào được chọn."
 
@@ -12566,7 +12359,7 @@ msgstr "Không xác định được trigger nào."
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr "Không có cờ boolean bị phản đối."
 
@@ -12636,15 +12429,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "Không được phép đặt lại mật khẩu cho người dùng \"guest\"."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12676,7 +12469,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "Không được hỗ trợ"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "Ghi chú"
@@ -12707,7 +12500,7 @@ msgstr "Thống báo tất cả các vấn đề"
 msgid "Nov"
 msgstr "Tháng 11"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "Tháng 11"
 
@@ -12894,8 +12687,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -12955,13 +12748,13 @@ msgstr "Tháng 10"
 msgid "Octal to decimal"
 msgstr "Bát phân đến thập phân"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "Tháng 10"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "Off"
 
@@ -12969,30 +12762,31 @@ msgstr "Off"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "Ok"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr "Giá trị thẻ sự kiện cũ"
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "On"
 
@@ -13008,35 +12802,15 @@ msgstr "Một lần"
 msgid "One"
 msgstr "Một"
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "Một trong các đối tượng rời khỏi một nhóm host."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "Một lần duy nhất"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "Một lần downtime"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "Chỉ các Super Admin mới có thể tạo các nhóm host."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "Chỉ các Super Admin mới có thể tạo các media type."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "Chỉ các Super Admin mới có thể xóa các media type."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "Chỉ các Super Admin mới có thể chỉnh sửa các media type."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "Chỉ có Zabbix agent, SNMPv1, SNMPv2 và SNMPv3 có thể được tạo thành duy nhất."
@@ -13084,10 +12858,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "Chỉ có siêu quản trị viên mới có thể tạo ra mối liên hệ."
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr "Chỉ Siêu Admin mới có thể đăht chủ sở hữu bang điều khiển."
@@ -13096,15 +12866,11 @@ msgstr "Chỉ Siêu Admin mới có thể đăht chủ sở hữu bang điều k
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr "Chỉ Siêu Admin mới có thể cập nhật liên kết."
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "Chỉ các trigger được gán đến các host đã kích hoạt và tùy thuộc vào các item đã kích hoạt mới được tính"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13113,7 +12879,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "Thông tin hệ điều hành. Trả về kiểu string"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13122,11 +12888,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "Thao tác không thể được thực hiện do yêu cầu không được cho phép."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "Chie tiết thao tác"
 
@@ -13148,7 +12914,7 @@ msgstr "Thao tác không có template để hoạt động."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13157,33 +12923,33 @@ msgstr ""
 msgid "Operations"
 msgstr "Các thao tác"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "Người thao tác"
 
@@ -13292,7 +13058,7 @@ msgstr "Cấu hình các tham số khác"
 msgid "Other parameters"
 msgstr "Các tham số khác"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "Khác"
@@ -13306,7 +13072,7 @@ msgstr "Thống kê lưu lượng truy cập đi trên interface. Trả về ki�
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13335,7 +13101,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13524,7 +13290,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13569,7 +13335,7 @@ msgstr "PSK"
 msgid "PSK identity"
 msgstr "Danh tính PSK"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13592,16 +13358,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "Tham số"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "Tham số \"%1$s\" được yêu cầu."
@@ -13631,7 +13397,7 @@ msgstr "Các item gốc"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13648,7 +13414,7 @@ msgstr "Các trigger gốc"
 msgid "Parent web scenarios"
 msgstr "Các web scenario gốc"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13660,11 +13426,6 @@ msgstr ""
 msgid "Parse"
 msgstr "Phân tích"
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "Lỗi Parse SQL [%1$s] trong [%2$s]."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "Lỗi phân tách"
@@ -13725,7 +13486,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr "Dán"
 
@@ -13735,15 +13496,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr "Dán mà không cần liên kết bên ngoài"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13789,12 +13550,11 @@ msgstr "Thực hiện một truy vấn DNS. Trả về chuỗi ký tự với lo
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "Chu kỳ"
 
@@ -13883,7 +13643,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "Vui lòng nhập tên máy chủ hoặc địa chỉ IP máy chủ và số cổng của máy chủ Zabbix, cũng như tên cài đặt (tùy chọn)."
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "Xin vui lòng lựa chọn 2 phần tử"
 
@@ -13923,7 +13683,7 @@ msgstr "Gắn linh kiện vào trường host còn lại"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14012,7 +13772,7 @@ msgid "Previous month"
 msgstr "quay lại tháng trước"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14143,7 +13903,7 @@ msgstr "Vấn đề không được triệt tiêu"
 msgid "Problem is suppressed"
 msgstr "Vấn đề được triệt tiêu"
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "Vấn đề"
 
@@ -14156,21 +13916,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr "Vấn đề được giải quyết"
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14184,9 +13940,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "Các vấn đề"
 
@@ -14220,7 +13976,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "Thuộc tính"
 
@@ -14241,13 +13997,13 @@ msgstr "URL \"%1$s\" được cung cấp không hợp lệ"
 msgid "Proxies"
 msgstr "Proxies"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14255,7 +14011,7 @@ msgstr "Proxies"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14265,12 +14021,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "Proxy \"%1$s\" cho host \"%2$s\" không tồn tại."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr "Proxy \"%1$s\" được sử dụng cho hoạt động \"%2$s\"."
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "Proxy \"%1$s\"  được sử dụng bởi quy tắc phát hiện \"%2$s\"."
@@ -14362,7 +14118,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14439,10 +14195,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "Giá trị nhận được "
@@ -14524,7 +14276,7 @@ msgstr "Hình chữ nhật"
 msgid "Refresh"
 msgstr "làm mới"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr "Làm mới thời gian"
 
@@ -14542,13 +14294,13 @@ msgstr ""
 msgid "Regular"
 msgstr "Chính quy"
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "Biểu thức chính quy"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14580,7 +14332,7 @@ msgstr "Các biểu thức chính quy"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14612,8 +14364,6 @@ msgstr "Lệnh từ xa"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14634,7 +14384,9 @@ msgstr "Lệnh từ xa"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14647,7 +14399,7 @@ msgstr "Lệnh từ xa"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14724,8 +14476,8 @@ msgstr "Lệnh từ xa"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "Gỡ bỏ"
 
@@ -14765,7 +14517,7 @@ msgstr "Xóa, %1$s"
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14807,7 +14559,7 @@ msgid "Replace dependencies"
 msgstr "Thay thế quan hệ phụ thuộc"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14862,7 +14614,7 @@ msgstr "Yêu cầu nội dung"
 msgid "Request body type"
 msgstr "Yêu cầu kiểu nội dung"
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr "Yêu cầu gửi thành công"
 
@@ -14904,8 +14656,8 @@ msgstr "Các mã trạng thái được yêu cầu"
 msgid "Required string"
 msgstr "Chuỗi được yêu cầu"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "Phục hồi"
 
@@ -14938,7 +14690,7 @@ msgstr "Phục hồi xác nhận"
 msgid "Reset defaults"
 msgstr "Phục hồi mặc định"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "Đã giải quyết"
 
@@ -15004,7 +14756,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "Kết quả"
@@ -15191,12 +14943,12 @@ msgstr "Chạy lệnh được chỉ định trên máy chủ. Trả về kết
 msgid "Russian (ru_RU)"
 msgstr "Russian (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15207,8 +14959,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15245,7 +14997,7 @@ msgstr "Cổng máy chủ STMP"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15341,12 +15093,12 @@ msgstr "Đếm SQL: %1$s (chọn: %2$s | thực thi: %3$s)"
 msgid "SQL query"
 msgstr "Truy vấn SQL"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "Thực hiện câu lệnh SQL đã thất bại \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "Thực hiện câu lệnh SQL đã thất bại \"%1$s\"."
@@ -15409,7 +15161,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15421,7 +15173,7 @@ msgstr "Sans-Serif"
 msgid "Sat"
 msgstr "Thứ bảy"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "Thứ bảy"
 
@@ -15463,7 +15215,7 @@ msgstr "Lịch trình"
 msgid "Scheduled check"
 msgstr "Kiểm tra lịch trình"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15527,7 +15279,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr "Phạm vi"
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15540,8 +15292,7 @@ msgstr "Phạm vi"
 msgid "Script"
 msgstr "Script"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "Script \"%1$s\" đã tồn tại."
@@ -15572,12 +15323,6 @@ msgstr "Tên script"
 msgid "Script parameters"
 msgstr "Tiến trình tham số "
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "Tiến trình tham số \"%1$s\" đang thiếu nguồn cấp dữ liệu dòng mới cuối cùng cho loại phương tiện \"%2$s\"."
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "Nội dung chi tiết Script"
@@ -15590,7 +15335,7 @@ msgstr "Script đã được cập nhật"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "Các Script"
 
@@ -15660,8 +15405,8 @@ msgid "Security name"
 msgstr "Tên bảo mật"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15669,7 +15414,7 @@ msgstr "Tên bảo mật"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "Lựa chọn"
 
@@ -15705,19 +15450,19 @@ msgstr "Các phần tử đã chọn"
 msgid "Selected items only"
 msgstr "Chỉ item được chọn"
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "Đã chọn, %1$s ở vị trí %2$d của %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "Đã chọn, %1$s, chỉ đọc, ở vị trí %2$d của %3$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr "Gửi trở lại"
 
@@ -15742,7 +15487,7 @@ msgstr "Chỉ gửi đến"
 msgid "Send to"
 msgstr "Gửi tới"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr "Gửi lại"
 
@@ -15775,7 +15520,7 @@ msgstr "Bị ngăn cách"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "Tháng 9"
 
@@ -15806,28 +15551,28 @@ msgstr "Máy chủ (proxy)"
 msgid "Server time"
 msgstr "thời gian máy chủ"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "Dịch vụ"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15837,7 +15582,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "Dịch vụ được tạo"
 
@@ -15869,16 +15614,16 @@ msgstr "Cổng dịch vụ"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "Thời gian bắt đầu dịch vụ phải ít hơn so với thời gian kết thúc."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -15886,11 +15631,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "Thời gian dịch vụ"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "Kiểu dịch vụ"
 
@@ -15899,30 +15644,29 @@ msgstr "Kiểu dịch vụ"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "Dịch vụ được cập nhật"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "Các dịch vụ"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "Các dịch vụ tạo thành một quan hệ phụ thuộc vòng tròn."
 
@@ -15930,7 +15674,7 @@ msgstr "Các dịch vụ tạo thành một quan hệ phụ thuộc vòng
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -15960,7 +15704,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "Đặt chế độ kiểm kê máy chủ"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -15989,7 +15733,7 @@ msgstr "Cài đặt giao thức LDAP thất bại."
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr "Cài đặt LDAP tham chiếu đến \"Off\" thất bại."
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -15998,7 +15742,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16054,7 +15798,7 @@ msgstr "Hình dạng"
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "Chia sẻ"
 
@@ -16196,7 +15940,7 @@ msgstr "Hiển thị cảnh báo nếu máy chủ Zabbix không hoạt đô�
 msgid "Show working time"
 msgstr "Hiển thị thời gian làm việc"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "Đã hiển thị"
 
@@ -16305,7 +16049,7 @@ msgstr "Sao chép đồ thị \"%1$s\" đến host \"%2$s\" được bỏ qu
 msgid "Slovak (sk_SK)"
 msgstr "Slovak (sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Snooze"
 
@@ -16351,7 +16095,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "Sắp xếp mục bởi"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "Sắp sếp theo thứ tự (0->999)"
 
@@ -16425,7 +16169,7 @@ msgstr "Bắt đầu"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16528,15 +16272,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "Trạng thái"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "Mã trạng thái"
@@ -16566,7 +16314,7 @@ msgstr "Chỉ trạng thái"
 msgid "Status problem"
 msgstr "Trạng thái vấn đề"
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16614,7 +16362,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16679,7 +16427,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "Chủ đề"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "Submap"
 
@@ -16695,7 +16443,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "Kiểm nghiệm thành công"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr "Tin chắn thành công"
 
@@ -16708,7 +16456,7 @@ msgstr "Tổng số thống kê lưu lượng đến và đi trên interface. Tr
 msgid "Sun"
 msgstr "Chủ nhật"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "Chủ nhật"
 
@@ -16800,12 +16548,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "Thời gian chạy hệ thống tính bằng giây. Trả về kiểu integer"
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16832,17 +16580,17 @@ msgstr "TRUE"
 msgid "Table \"%1$s\" does not exist."
 msgstr "Bảng \"%1$s\" không tồn tại."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "Bảng \"%1$s\" Không có trường đươc đặt tên \"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "Tag"
@@ -16898,7 +16646,7 @@ msgstr "Thẻ giá trị"
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -16958,7 +16706,7 @@ msgstr "Kiểu Target"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -16979,7 +16727,7 @@ msgstr "Template"
 msgid "Template \"%1$s\" already exists."
 msgstr "template \"%1$s\" đã tồn tại."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17003,7 +16751,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "Template không thể liên kết được đến template khác nhiều hơn một lần thậm chí thông qua các template khác."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17063,7 +16811,7 @@ msgstr "Template với cùng tên hiển thị \"%1$s\" đã tồn tại. "
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17235,13 +16983,13 @@ msgstr "Host không được phát hiện nữa và sẽ bị xóa trong %
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "Máy chủ không được khám phá nữa và sẽ bị xóa trong lần xử lý khám phá tiếp theo."
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "Hình ảnh được sử dụng trong biểu tượng bản đồ %1$s."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17305,7 +17053,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "Tháng này"
 
@@ -17313,7 +17061,7 @@ msgstr "Tháng này"
 msgid "This month so far"
 msgstr "Tháng này đến nay"
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "Tuần này"
 
@@ -17321,7 +17069,7 @@ msgstr "Tuần này"
 msgid "This week so far"
 msgstr "Tuần này cho đến nay"
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "Năm này"
 
@@ -17341,7 +17089,7 @@ msgstr ""
 msgid "Thu"
 msgstr "Thứ 5"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "Thứ năm"
 
@@ -17358,7 +17106,7 @@ msgstr "Cho tới"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17391,7 +17139,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "Chu kỳ thời gian"
 
@@ -17443,12 +17191,11 @@ msgstr "Nhãn thời gian"
 msgid "To"
 msgstr "To"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "Để thiết lập một host interface chọn một kiểu item duy nhất cho tất cả các item"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "Hôm nay"
 
@@ -17563,7 +17310,7 @@ msgstr "Khuynh hướng chu kỳ lưu trữ dữ liệu"
 msgid "Trends"
 msgstr "Các khuynh hướng "
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17571,7 +17318,7 @@ msgstr "Các khuynh hướng "
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "Trigger"
 
@@ -17669,7 +17416,7 @@ msgstr "Tên trigger"
 msgid "Trigger overview"
 msgstr "Tổng quan các trigger"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17741,11 +17488,11 @@ msgstr "Các kiểu trigger đã được cập nhật"
 msgid "Trigger severity"
 msgstr "Mức độ quan trọng của trigger"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "Trạng thái trigger \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "Trạng thái Trigger \"Problem\""
 
@@ -17762,7 +17509,7 @@ msgstr "Trigger được cập nhật"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17797,7 +17544,7 @@ msgstr "Cắt"
 msgid "Tue"
 msgstr "Thứ ba"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "Thứ ba"
 
@@ -17810,7 +17557,7 @@ msgstr "Turkish (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "Hai item (\"%1$s\" và \"%2$s\") không thể gắn vào một trường host còn lại \"%3$s\", điều này sẽ dẫn đến một cuộc xung đột."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr "Hai phần tử sơ đồ nên được chọn"
 
@@ -17826,19 +17573,19 @@ msgstr "Hai phần tử sơ đồ nên được chọn"
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -17890,7 +17637,7 @@ msgstr "Kiểu thông tin"
 msgid "Types"
 msgstr "Các kiểu"
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -17911,7 +17658,7 @@ msgstr "UNKNOWN"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -17957,12 +17704,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "URL phải có cả trường \"tên\" và \"url\" cho sơ đồ \"%1$s\"."
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URLs"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18047,12 +17794,12 @@ msgstr "Bỏ chặn"
 msgid "Unblock selected users?"
 msgstr "Bỏ chặn các người dùng được lựa chọn?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18072,21 +17819,23 @@ msgstr "Đơn vị"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "Không rõ"
@@ -18104,7 +17853,7 @@ msgid "Unknown error"
 msgstr "Lỗi không rõ"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "Host item không rõ, không có item trong host được lựa chọn"
@@ -18157,7 +17906,7 @@ msgstr "Hủy liên kết từ template"
 msgid "Unlink from templates"
 msgstr "Hủy liên kết từ các template"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "Bật tiếng"
 
@@ -18187,7 +17936,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "Không hỗ trợ tham số \"%2$s\" cho một điều kiện lọc cho hoạt động \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "Tham số không được hỗ trợ \"%2$s\" cho điều kiện lọc của quy tắc khám phá \"%1$s\"."
@@ -18197,7 +17946,7 @@ msgstr "Tham số không được hỗ trợ \"%2$s\" cho điều kiện lọc c
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "Tham số không được hỗ trợ \"%2$s\" cho bộ lọc hoạt động \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "Tham số không được hỗ trợ \"%2$s\" cho bộ lọc quy tắc khám phá \"%1$s\"."
@@ -18242,7 +17991,7 @@ msgstr "Up"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18255,7 +18004,7 @@ msgstr "Up"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18308,7 +18057,7 @@ msgstr "Cập nhật thao tác"
 msgid "Update problem"
 msgstr "Cập nhật vấn đề"
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18326,7 +18075,7 @@ msgstr "Tải lên"
 msgid "Upper level maps"
 msgstr "Các bản đồ ở mức cao hơn"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18361,7 +18110,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "Sử dùng trong các action"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18376,7 +18125,7 @@ msgstr "Sử dùng trong các action"
 msgid "User"
 msgstr "Người dùng"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "Người dùng \"%1$s\" không thể không có nhóm người dùng."
@@ -18428,7 +18177,7 @@ msgstr "Người dùng được thêm vào"
 msgid "User agent string"
 msgstr "Chuỗi người dùng agent"
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "Người dùng không thể thêm chính mình vào một nhóm đã bị vô hiệu hóa hoặc một nhóm tiếp cận với giao diện người dùng."
@@ -18447,7 +18196,7 @@ msgid "User deleted"
 msgid_plural "Users deleted"
 msgstr[0] "Người dùng đã bị xóa"
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18457,27 +18206,27 @@ msgstr[0] "Người dùng đã bị xóa"
 msgid "User group"
 msgstr "Nhóm người dùng"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "Nhóm người dùng \"%1$s\" đã tồn tại."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "Nhóm người dùng \"%1$s\" sử dùn trong hoạt động \"%2$s\"."
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "Nhóm người dùng \"%1$s\" được sử dụng trong cấu hình cho cơ sở dữ liệu tin nhắn không hoạt động."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "Nhóm người dùng \"%1$s\" được sử dụng trong tập lệnh \"%2$s\"."
@@ -18509,8 +18258,8 @@ msgstr[0] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18554,14 +18303,14 @@ msgstr "Mật khẩu người dùng"
 msgid "User profile"
 msgstr "Hồ sơ người dùng"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18628,7 +18377,7 @@ msgstr "Người dùng được cập nhật"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "Người dùng có ID \"%1$s\" không khả dụng."
@@ -18944,14 +18693,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -18961,7 +18710,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19003,7 +18752,7 @@ msgstr "Giá trị \"%1$s\" là không hợp lệ đối với tham số
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "Giá trị \"%1$s\" là không hợp lệ đối với tham số \"grid-align\". Các lựa chọn là: \"%2$s\"."
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "Giá trị \"%1$s\" là quá dài đối với trường \"%2$s\" - %3$d ký tự. Chiều dài cho phép là %4$d ký tự."
@@ -19020,7 +18769,7 @@ msgstr "Thống kê giá trị của cache. Các chế độ hợp lệ l
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "Giá trị bản đồ"
 
@@ -19063,11 +18812,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "Giá trị của bất kỳ bộ đếm hiệu suất Windows. Trả về integer, float, string hoặc text (tùy theo yêu cầu)"
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19114,7 +18864,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19201,7 +18951,7 @@ msgstr "Tên hiển thị không thể bị trống nếu tên host bị lô
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
@@ -19218,7 +18968,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19227,7 +18977,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "Chúng tôi xin lỗi, số lượng tối đa có thể của các phần tử để ghi nhớ đã đạt tới giới hạn."
 
@@ -19243,7 +18993,7 @@ msgstr "Chúng tôi xin lỗi, số lượng tối đa có thể của ca
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web"
 
@@ -19255,7 +19005,7 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Web monitoring"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr "Web scenario"
 
@@ -19270,25 +19020,25 @@ msgstr "Web scenario \"%1$s\" đã tồn tại trên host \"%2$s\"."
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Web scenario \"%1$s\" đã tồn tại."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "Web scenario đã được thêm"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Web scenario đã bị xóa"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Web scenario đã bị vô hiệu hóaCác web scenario đã bị vô hiệu hóa"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Web scenario đã được kích hoạtCác web scenario đã được kích hoạt"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "Web scenario đã cập nhật"
 
@@ -19310,7 +19060,7 @@ msgstr ""
 msgid "Wed"
 msgstr "Thứ 4"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "Thứ tư"
 
@@ -19321,7 +19071,7 @@ msgstr "Thứ tư"
 msgid "Weekly"
 msgstr "Hàng tuần"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19337,12 +19087,12 @@ msgstr "Chào mừng đến với"
 msgid "When active"
 msgstr "Khi hoạt động"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19537,6 +19287,10 @@ msgstr "Y-m-d H:i"
 msgid "Y-m-d H:i:s"
 msgstr "Y-m-d H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr "Y1"
@@ -19598,7 +19352,7 @@ msgstr "Hàng năm"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19655,18 +19409,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19678,9 +19426,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "Bạn không có quyền để thực hiện các thao tác này."
 
@@ -19796,24 +19541,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr "Một boolean được mong đợi "
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "Chuỗi kí tự được mong đợi "
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19822,37 +19571,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr "một số được kì vọng"
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr "một số là quá lớn"
@@ -19873,28 +19622,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr "một thời gian được kì vọng"
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr "một khoảng thời gian được dự kiến"
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr "một khoảng thời gian dự kiến"
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr "một đơn vị thời gian dự kiến"
@@ -19942,7 +19692,7 @@ msgstr "Tất cả"
 msgid "all media"
 msgstr "Tất cả media"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -19950,42 +19700,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "một mảng được mong đợi"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr "một mảng hoặc một chuỗi ký tự được mong đợi"
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -19995,7 +19740,7 @@ msgid "an empty string is expected"
 msgstr "một chuỗi trống dự kiến"
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr "một số lượng chẵn các ký tự thập lục phân được mong đợi"
 
@@ -20003,11 +19748,15 @@ msgstr "một số lượng chẵn các ký tự thập lục phân được mon
 msgid "an explicit time is expected"
 msgstr "một thời gian rõ ràng được dự kiến"
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20168,14 +19917,8 @@ msgstr "Không thể thay đổi"
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20205,19 +19948,11 @@ msgstr "Không thể thay đổi"
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20237,14 +19972,14 @@ msgstr "Không thể thay đổi"
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20252,7 +19987,7 @@ msgstr "Không thể thay đổi"
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "Không thể để trống"
@@ -20265,7 +20000,7 @@ msgstr "không thể chuyển đổi sang JSON, giá trị kết quả quá dài
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr "không thể thực hiện yêu cầu API, dữ liệu có thể bị cắt ngắn"
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20299,7 +20034,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "phụ thuộc item không được phép"
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20317,7 +20052,8 @@ msgid "configure"
 msgstr "cấu hình"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr "bao gồm"
@@ -20346,7 +20082,7 @@ msgstr "Count () - Số lượng giá trị được truy xuất thành công V
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20408,7 +20144,7 @@ msgstr "giảm dần"
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20430,13 +20166,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr "Không bao gồm"
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr "Không bằng"
@@ -20462,7 +20198,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20499,6 +20236,10 @@ msgstr "Biểu thức trống"
 msgid "failed to parse JSON"
 msgstr "thất bại trong việc phân tích JSON"
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20545,7 +20286,7 @@ msgstr "Cài đặt global housekeeping"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20586,6 +20327,11 @@ msgstr "Biểu tượng"
 msgid "image"
 msgstr "Hình ảnh"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "in"
@@ -20626,15 +20372,19 @@ msgstr "số phần tử không chính xác"
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "Cú pháp không chính xác khoảng \"%1$s\""
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20662,7 +20412,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr "phạm vi địa chỉ không hợp lệ \"%1$s\""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr "chuỗi byte không hợp lệ trong UTF-8"
 
@@ -20691,27 +20441,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr "thời gian lưu trữ lịch sử không hợp lệ"
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr "tên máy chủ không hợp lệ"
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr "Tên máy chủ không hợp lệ"
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr "Biểu thức chính quy không hợp lệ"
 
@@ -20739,7 +20489,7 @@ msgstr "lớn hơn hoặc bằng"
 msgid "is less than or equals"
 msgstr "nhỏ hơn hoặc bằng"
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr "không được đính kèm trong {} hoặc không đúng định dạng"
 
@@ -20825,12 +20575,12 @@ msgstr "Quy tắc phát hiện low-level"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20889,7 +20639,7 @@ msgstr "Khớp với"
 msgid "max"
 msgstr "max"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -20929,7 +20679,7 @@ msgid "min() - Minimum value for period T"
 msgstr "min () - Giá trị tối thiểu cho giai đoạn T"
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr "độ dài tối thiểu là ký tự %1$s"
@@ -20956,8 +20706,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "ms"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -20972,27 +20722,14 @@ msgstr "Phải có một người dùng LDAP hợp lệ"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "Phải nằm trong khoảng \"%1$s\" và \"%2$s\""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr "phải chứa ít nhất một macro khám phá cấp thấp"
 
@@ -21020,6 +20757,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21030,7 +20775,7 @@ msgstr ""
 msgid "name"
 msgstr "tên"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "new"
 
@@ -21165,7 +20910,7 @@ msgstr "đầu ra"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21200,24 +20945,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21245,11 +20994,11 @@ msgstr ""
 msgid "regular expression"
 msgstr "biểu thức chính quy"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21261,15 +21010,15 @@ msgstr ""
 msgid "right"
 msgstr "Bên phải "
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21317,7 +21066,7 @@ msgstr ""
 msgid "short description"
 msgstr "Mô tả ngắn"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21336,15 +21085,15 @@ msgstr "Mô tả ngắn"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr "trống"
 
@@ -21360,31 +21109,31 @@ msgstr "Thiết lập biểu tượng bản đồ hiển thị"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21392,11 +21141,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr "tổng() - Tổng giá trị của một khoảng thời gian T"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21412,8 +21161,8 @@ msgstr "thông tin được cung cấp không phải là duy nhất"
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21424,7 +21173,7 @@ msgstr "thông tin được cung cấp không phải là duy nhất"
 msgid "tag"
 msgstr "thẻ"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21433,13 +21182,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "ID template \"%1$s\" được thông qua %2$s lần"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21448,20 +21201,20 @@ msgstr "ID template \"%1$s\" được thông qua %2$s lần"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "Tham số \"%1$s\" bị thiếu"
@@ -21493,39 +21246,39 @@ msgstr "Thứ ba"
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr "thay đổi thời gian"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr "time() - thời gian hiện tại"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr "timeleft () - Thời gian để đạt ngưỡng ước tính dựa trên khoảng thời gian T"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21539,7 +21292,7 @@ msgstr "trigger"
 msgid "trigger does not allow manual closing"
 msgstr "Trigger không cho phép đóng thủ công"
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21551,26 +21304,26 @@ msgstr "mẫu trigger không thể được chuyển sang mẫu hoặc máy ch�
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr "trigger với các liên kết không thể được chuyển đến một mẫu hoặc máy chủ khác"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "Kiểu cần tìm kiếm"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21578,11 +21331,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21599,10 +21352,10 @@ msgstr "Kết thúc key bất thường"
 msgid "unexpected end of macro"
 msgstr "kết thúc bất ngờ của macro"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21612,11 +21365,12 @@ msgstr "kết thúc bất ngờ của macro"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr "tham số bất ngờ \"%1$s\""
@@ -21642,8 +21396,8 @@ msgstr "Văn bản bất ngờ \"%1$s\""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21668,6 +21422,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr "Số phiên bản không được hỗ trợ"
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21683,7 +21441,7 @@ msgstr "Số phiên bản không được hỗ trợ"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21703,11 +21461,11 @@ msgstr "Số phiên bản không được hỗ trợ"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "Giá trị"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21725,76 +21483,83 @@ msgstr "Giá trị \"%1$s\" không được tìm thấy"
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr "Giá trị \"%1$s\" đã tồn tại"
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr "Giá trị quá dài"
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21806,18 +21571,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr "giá trị phải là một trong %1$s"
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21826,7 +21589,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21839,11 +21602,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21860,7 +21623,7 @@ msgstr "phát hiện sai loại quy tắc"
 msgid "wrong item type"
 msgstr "Loại item sai"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/zh_CN/LC_MESSAGES/frontend.po b/ui/locale/zh_CN/LC_MESSAGES/frontend.po
index 969058bc643..00304d037c7 100644
--- a/ui/locale/zh_CN/LC_MESSAGES/frontend.po
+++ b/ui/locale/zh_CN/LC_MESSAGES/frontend.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2016-05-11 02:08+0300\n"
 "Last-Translator: 岂几 <tom3000@126.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -97,7 +97,7 @@ msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d 天"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -175,7 +175,7 @@ msgstr[0] "%1$s 消息"
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -187,7 +187,7 @@ msgid "%1$s of %2$s element in problem state"
 msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] "处于问题状态的 %2$s 元素的 %1$s"
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -217,13 +217,13 @@ msgstr[0] "剩余%1$s 重试次数"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s 秒"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -242,13 +242,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr "%1$s, 严重性, %2$s"
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr "%1$s, 只读"
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -378,7 +378,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -436,10 +436,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr "访问拒绝"
@@ -482,7 +478,7 @@ msgstr ""
 msgid "Ack"
 msgstr "确认"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "确认"
 
@@ -490,7 +486,7 @@ msgstr "确认"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "已确认"
@@ -503,7 +499,7 @@ msgstr "已确认问题事件"
 msgid "Acknowledged RESOLVED events"
 msgstr "确认已解决的事件"
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -530,9 +526,9 @@ msgstr "确认已解决的事件"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -589,7 +585,7 @@ msgstr "动作 \"%1$s\" 已经存在。"
 msgid "Action \"%1$s\" no operations defined."
 msgstr "动作 \"%1$s\" 没有定义操作。"
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -598,7 +594,7 @@ msgstr ""
 msgid "Action added"
 msgstr "动作已添加"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -645,8 +641,8 @@ msgstr "动作已更新"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "动作"
@@ -713,7 +709,7 @@ msgstr "启用直到"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -724,7 +720,7 @@ msgstr "启用直到"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -747,9 +743,9 @@ msgstr "启用直到"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -819,7 +815,7 @@ msgstr "启用直到"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "添加"
 
@@ -827,11 +823,11 @@ msgstr "添加"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr "添加新构件"
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr "添加子节点元素"
 
@@ -839,7 +835,7 @@ msgstr "添加子节点元素"
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -856,7 +852,7 @@ msgstr "添加主机"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr "添加多个拓扑图"
 
@@ -878,7 +874,7 @@ msgstr "添加新的覆盖"
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -930,12 +926,12 @@ msgstr ""
 msgid "Add widget"
 msgstr "添加构件"
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -945,7 +941,7 @@ msgstr "%1$s，已添加"
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -958,7 +954,7 @@ msgstr "管理者"
 msgid "Administration"
 msgstr "管理"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -980,7 +976,7 @@ msgstr "持续时间小于"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1052,7 +1048,7 @@ msgstr "对齐拓扑元素"
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "所有"
 
@@ -1070,7 +1066,7 @@ msgstr "所有组"
 msgid "All hosts"
 msgstr "所有主机"
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "所有的链接应含 特定的名称和URL"
 
@@ -1088,7 +1084,7 @@ msgstr "所有问题"
 msgid "All problems if tag values match"
 msgstr "所有问题如果标签值匹配"
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1201,15 +1197,15 @@ msgstr "应用集 错误."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "应用"
 
@@ -1227,7 +1223,7 @@ msgstr "接近中"
 msgid "Apr"
 msgstr "四月"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "四月"
 
@@ -1255,7 +1251,7 @@ msgstr "区域类型"
 msgid "Arithmetic"
 msgstr "算法"
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1302,7 +1298,7 @@ msgstr "于(时:分)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1311,7 +1307,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1323,6 +1319,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr "至少选择一个主机群组或主机。"
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1334,7 +1335,7 @@ msgstr "必须创建至少一个维护期间."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1390,7 +1391,7 @@ msgstr ""
 msgid "Aug"
 msgstr "八月"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "八月"
 
@@ -1403,7 +1404,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1480,7 +1481,7 @@ msgstr "自动注销"
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1495,7 +1496,7 @@ msgstr "自动的图标映射"
 msgid "Automatic icon selection"
 msgstr "自动的图标选择"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1547,7 +1548,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr "坐标轴"
 
@@ -1610,7 +1611,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "锁定的"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr "蓝"
 
@@ -1664,11 +1665,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "底部"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr "向上一层"
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr "移到上一层"
 
@@ -1694,7 +1695,7 @@ msgstr "CERT"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1739,8 +1740,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1749,7 +1750,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "可计算的"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr "日历"
 
@@ -1774,7 +1775,7 @@ msgstr "回调"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1787,8 +1788,8 @@ msgstr "回调"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "取消"
 
@@ -1818,7 +1819,7 @@ msgstr "无法添加操作"
 msgid "Cannot add correlation"
 msgstr "无法添加关联"
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1828,7 +1829,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "无法添加自主机到模板的依赖"
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1859,8 +1860,8 @@ msgid "Cannot add host prototype"
 msgstr "无法添加主机原型"
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "无法添加图片"
 
@@ -1951,15 +1952,15 @@ msgstr "无法添加用户"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "不能添加web场景"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1979,33 +1980,29 @@ msgstr "无法绑定到 LDAP 服务器。"
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "无法清除历史"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "无法克隆图形原型"
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "无法克隆主机原型。"
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "无法克隆监控项原型"
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "无法克隆触发器原型"
 
@@ -2031,7 +2028,7 @@ msgid "Cannot copy graph"
 msgid_plural "Cannot copy graphs"
 msgstr[0] "无法复制图表"
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] "无法复制监控项"
@@ -2081,8 +2078,8 @@ msgstr "无法创建图标映射"
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2110,7 +2107,7 @@ msgstr "无法删除Zabbix内部用户 \"%1$s\", 试试停用这个用户."
 msgid "Cannot delete action"
 msgstr "无法删除动作"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2173,7 +2170,7 @@ msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one
 msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group."
 msgstr[0] "无法删除主机因为维护 \"%1$s\" 必须包含至少一个主机或一个主机群组。无法删除所选主机因为维护 \"%1$s\" 必须包含至少一个主机或一个主机群组。"
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2183,11 +2180,11 @@ msgstr[0] "无法删除主机群组因为维护 \"%1$s\" 必须包含至少一�
 msgid "Cannot delete host prototypes"
 msgstr "无法删除主机原型"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "无法删除图标映射"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "无法删除图片"
 
@@ -2212,7 +2209,7 @@ msgstr "无法删除监控项目模板"
 msgid "Cannot delete item prototypes"
 msgstr "无法删除监控项目模板"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "无法删除监控项"
 
@@ -2240,7 +2237,7 @@ msgid "Cannot delete proxy"
 msgid_plural "Cannot delete proxies"
 msgstr[0] "无法删除agent代理程序"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2260,7 +2257,7 @@ msgid "Cannot delete script"
 msgid_plural "Cannot delete scripts"
 msgstr[0] "无法删除脚本"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "无法删除脚本. 脚本 \"%1$s\" 用于动作操作 \"%2$s\"。"
@@ -2275,8 +2272,8 @@ msgid "Cannot delete service"
 msgid_plural "Cannot delete services"
 msgstr[0] "无法删除服务"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2305,7 +2302,7 @@ msgstr "无法删除模板的监控项原型。"
 msgid "Cannot delete templated item."
 msgstr "无法删除模板的监控项."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "无法删除模板监控项."
 
@@ -2355,7 +2352,7 @@ msgid "Cannot delete user role"
 msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "无法删除 web 场景"
 
@@ -2385,7 +2382,7 @@ msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] "无法禁用主机"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "无法禁监控项目"
@@ -2411,7 +2408,7 @@ msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] "无法禁用触发器"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "无法禁用 web 场景"
@@ -2452,7 +2449,7 @@ msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] "无法启用主机"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "无法启用监控项目"
@@ -2478,7 +2475,7 @@ msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] "无法启用触发器"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "无法启用Web场景"
@@ -2491,7 +2488,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr "无法扩展宏."
 
@@ -2525,8 +2522,8 @@ msgstr "无法找到主机 \"%1$s\" 用于地图 \"%2$s\"."
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "在 \"%4$s\"上无法针对自动发现规则 \"%3$s\"上的\"%2$s\"主机模板找到主机组 \"%1$s\""
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2624,24 +2621,20 @@ msgstr "无法在 \"%3$s\"上找到由监控项目\"%2$s\" 所引用的数据映
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr "无法在\"%4$s\"上找到由自动发现规则 \"%3$s\"上的 \"%2$s\"监控项目模板所引用的数据映射 \"%1$s\"."
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "模板的显示名称不得为空."
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2653,7 +2646,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] "无法导入模板 \"%1$s\",被关联的模板\"%2$s\"不存在."
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "不能插入触发器表达式"
 
@@ -2667,7 +2660,7 @@ msgid "Cannot link template."
 msgstr "无法链接到模板。"
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2698,17 +2691,17 @@ msgstr "无法批量更新模板的显示名称"
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "不能完成没有where条件的删除描述式在表 \"%1$s\" 上."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "不能完成没有值的更新表达式料表 \"%1$s\" 上."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "不能完成没有条件的更新描述式在表 \"%1$s\" 上."
@@ -2735,7 +2728,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "不能读取响应, 检查与Zabbix服务器 \"%1$s\" 的连接."
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "无法重新命名访客用户."
 
@@ -2754,7 +2747,7 @@ msgstr "无法保存小构件 \"%1$s\" 。"
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "无法发送命令, 检查于Zabbix 服务器 \"%1$s\" 的连接."
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr "无法发送请求"
 
@@ -2794,12 +2787,12 @@ msgstr "无法设置审计字段为已经禁止的审计."
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2817,7 +2810,7 @@ msgid "Cannot unblock user"
 msgid_plural "Cannot unblock users"
 msgstr[0] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr "无法断开和清除 Web 场景."
 
@@ -2830,7 +2823,7 @@ msgstr "无法断开与模板的连接"
 msgid "Cannot unlink template."
 msgstr "无法断开与模板的连接。"
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2883,11 +2876,6 @@ msgstr "无法更新 \"%2$s\"在发现的监控项 \"%1$s\"。"
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr "无法更新 \"%2$s\" 在发现的触发器\"%1$s\"。"
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr "无法对图片\"%1$s\"更新\"图片类型\"."
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2897,9 +2885,10 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr "无法更新一个被自动发现的数据图"
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
-msgstr "无法更新一个被自动发现的主机组."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
+msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
 #, c-format
@@ -2957,9 +2946,7 @@ msgstr "无法更新数据图模板"
 msgid "Cannot update group"
 msgstr "无法更新群组"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr "对于被自动发现的主机\"%1$s\"无法更新其主机组"
@@ -2981,13 +2968,13 @@ msgstr[0] "无法更新主机模板"
 msgid "Cannot update hosts"
 msgstr "无法更新主机"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "无法更新图标映射"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "无法更新图片"
 
@@ -3040,12 +3027,12 @@ msgstr "无法更新网络拓扑图"
 msgid "Cannot update proxy"
 msgstr "无法更新agent代理程序"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr "对于被自动发现的主机 \"%1$s\"无法更新其代理节点"
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3065,17 +3052,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "无法更新脚本"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3148,7 +3135,7 @@ msgstr[0] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr "无法更新 web 场景"
 
@@ -3248,8 +3235,8 @@ msgid "Character string not included"
 msgstr "字符串未包含"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3364,7 +3351,7 @@ msgstr "检查 UDP 服务的性能，当服务 down 时返回 0，否则返回�
 msgid "Checks should be unique."
 msgstr "检查必需是唯一的"
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3385,7 +3372,7 @@ msgstr "模板 %1$s 存在环形引用。"
 msgid "Circular template linkage is not allowed."
 msgstr "不允许环形模板链接."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3406,11 +3393,11 @@ msgstr "清除历史和趋势"
 msgid "Clear when unlinking"
 msgstr "清除当无链接时"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3425,7 +3412,7 @@ msgstr "时钟"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3440,7 +3427,7 @@ msgstr "时钟"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "克隆"
 
@@ -3451,8 +3438,8 @@ msgstr "克隆"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "关闭"
 
@@ -3463,13 +3450,13 @@ msgstr "关闭"
 msgid "Close expression constructor"
 msgstr "关闭表达式构造器"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr "关闭新的事件"
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr "关闭过去的事件"
 
@@ -3482,8 +3469,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr "宕机"
 
@@ -3500,7 +3487,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3566,7 +3553,7 @@ msgstr "压缩"
 msgid "Concurrent sessions"
 msgstr "并发会话"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3577,17 +3564,12 @@ msgstr "条件"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr "对于动作\"%1$s\"条件\"%2$s\"不可以应用于计算式\"%3$s\"中"
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr "在关联\"%1$s\"中，条件\"%2$s\"无法使用公式 \"%3$s\" "
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr "对于自动发现规则\"%1$s\"条件\"%2$s\"不可以应用于计算式\"%3$s\"中"
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3597,17 +3579,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr "对于动作\"%1$s\"应用于计算式 \"%3$s\"中的\"%2$s\"条件未被定义"
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr "在关联项 \"%1$s\" 中 条件 \"%2$s\" 在表达式 \"%3$s\"没有被使用"
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr "对于自动发现规则\"%1$s\"应用于计算表达式 \"%3$s\"中的条件 \"%2$s\"未被定义"
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3623,7 +3600,7 @@ msgstr "条件"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "配置"
 
@@ -3686,7 +3663,7 @@ msgstr "配置主机"
 msgid "Configuration of housekeeping"
 msgstr "管家设置"
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "配置图标映射"
@@ -3793,7 +3770,7 @@ msgstr "确认文字"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr "恩！不错zabbix前端已经配置好了！千山万水第一步！加油，少年！"
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3886,7 +3863,7 @@ msgstr "联系"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3946,7 +3923,7 @@ msgstr "包含"
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr "内容控制"
 
@@ -3985,8 +3962,8 @@ msgstr "座标"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "复制"
 
@@ -3995,12 +3972,11 @@ msgstr "复制"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr "相关性"
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr "关联项 \"%1$s\" 已经存在"
@@ -4025,16 +4001,6 @@ msgid "Correlation enabled"
 msgid_plural "Correlations enabled"
 msgstr[0] "启用关联项"
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr "%1$s找不到关联项参数"
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr "关联项名字不能为空。"
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr "关联规则"
@@ -4043,14 +4009,10 @@ msgstr "关联规则"
 msgid "Correlation updated"
 msgstr "关联项已更新"
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "不能储存图片!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "计数"
 
@@ -4114,11 +4076,11 @@ msgstr "创建关联项"
 msgid "Create dashboard"
 msgstr "创建仪表盘"
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr "创建仪表盘依赖项"
 
@@ -4235,7 +4197,7 @@ msgstr "创建拓扑图"
 msgid "Create media type"
 msgstr "创建媒体类型"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr "创建新的"
 
@@ -4259,7 +4221,7 @@ msgstr ""
 msgid "Create template"
 msgstr "创建模板"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "创建触发器"
 
@@ -4422,7 +4384,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "DNS名称"
@@ -4434,11 +4396,11 @@ msgstr "DNS名称"
 msgid "Daily"
 msgstr "每日"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr "暗色"
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4459,8 +4421,8 @@ msgstr "仪表盘 \"%1$s\" 已经存在。"
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr "仪表盘创建成功。"
 
@@ -4482,9 +4444,9 @@ msgstr "仪表板属性"
 msgid "Dashboard sharing"
 msgstr "共享仪表盘"
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr "更新仪表盘"
 
@@ -4508,7 +4470,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr "仪表盘"
 
@@ -4536,7 +4498,7 @@ msgstr "数据概览"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr "数据设置"
 
@@ -4678,7 +4640,7 @@ msgstr "星期几"
 msgid "Days"
 msgstr "天数"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "调试"
 
@@ -4692,26 +4654,26 @@ msgstr "调试模式"
 msgid "Dec"
 msgstr "十二"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "十二"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "默认"
 
@@ -4804,7 +4766,7 @@ msgstr "被延迟由于"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4828,8 +4790,8 @@ msgstr "被延迟由于"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "删除"
 
@@ -4854,11 +4816,11 @@ msgstr "删除并清除模板? (警告: 所有链接的主机将被清除!)"
 msgid "Delete current action?"
 msgstr "删除目前的动作?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr "删除当前的关联项？"
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr "你确定要删除仪表盘？"
 
@@ -4902,7 +4864,7 @@ msgstr "删除监控项目模板?"
 msgid "Delete item?"
 msgstr "删除监控项?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "删除所选组件间的连接?"
 
@@ -4958,7 +4920,7 @@ msgstr "删除所有的仪表盘？（危险）"
 msgid "Delete selected discovery rules?"
 msgstr "删除所选的发现规则?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "删除所选的元素?"
 
@@ -5063,7 +5025,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr "删除所选形状？"
 
@@ -5107,7 +5069,7 @@ msgstr "删除触发器?"
 msgid "Delete web scenario?"
 msgstr "删除 web 场景？"
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5152,7 +5114,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "依赖关系"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "依赖"
 
@@ -5160,7 +5122,7 @@ msgstr "依赖"
 msgid "Dependent item"
 msgstr "相关项目"
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5170,7 +5132,7 @@ msgstr "依赖于"
 msgid "Deployment status"
 msgstr "部署状态"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5203,7 +5165,7 @@ msgid "Description"
 msgstr "描述"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5369,10 +5331,10 @@ msgstr "禁用所选定的web场景？"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5455,7 +5417,7 @@ msgid "Discovery by proxy"
 msgstr "由agent代理程序自动发现"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "自动发现检查"
 
@@ -5467,7 +5429,7 @@ msgstr "自动发现检查"
 msgid "Discovery list"
 msgstr "自动发现清单"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "自动发现物件"
 
@@ -5499,7 +5461,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5507,12 +5469,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "自动发现规则"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "自动发现规则 \"%1$s\" 已存在于 \"%2$s\", 继承自其它的模板."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr "发现规则\"%1$s\"已存在于 \"%2$s\"."
@@ -5525,7 +5487,7 @@ msgstr "发现规则\"%1$s\"已存在于 \"%2$s\"."
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr "发现规则\"%1$s\"已存在"
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5564,7 +5526,7 @@ msgstr "自动发现规则已更新"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5575,7 +5537,7 @@ msgstr "自动发现规则"
 msgid "Discovery rules deleted"
 msgstr "自动发现规则已删除"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "自动发现状态"
@@ -5612,10 +5574,11 @@ msgid "Display stacked graph"
 msgstr "显示堆叠数据图"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "显示 已自动发现的 %2$s中的%1$s"
@@ -5625,7 +5588,7 @@ msgstr "显示 已自动发现的 %2$s中的%1$s"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr "在 %3$s 中打印 %1$s 到 %2$s "
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr "显示选项"
 
@@ -5647,7 +5610,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "您想要替换条件式表达式吗?"
 
@@ -5703,7 +5666,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "下"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5711,7 +5674,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr "下载配置文件"
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5730,18 +5693,6 @@ msgstr "绘制"
 msgid "Draw style"
 msgstr "绘图风格"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr "复制关联项 \"%3$s\" 中 \"%1$s\" 的值 \"%2$s\" 。"
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr "在关联项中复制\"%1$s\"的值 \"%2$s\""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5754,11 +5705,6 @@ msgstr "拓扑图 %1$s 名字重复。"
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5810,7 +5756,7 @@ msgstr "动态监控项"
 msgid "Dynamic items"
 msgstr "动态监控项"
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "每个URL必须是唯一的. 请确保只有一个被命名的 URL."
 
@@ -5819,11 +5765,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5837,8 +5783,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "编辑"
 
@@ -5854,11 +5800,11 @@ msgstr "编辑拓扑图"
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr "编辑树元素"
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "编辑触发器"
 
@@ -5918,21 +5864,17 @@ msgstr "场景\"%1$s\"配置了空的SSL证书文件"
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr "空的关联ID。"
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr "针对动作\"%1$s\"的过滤器条件表达式ID为空"
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "针对自动发现规则 \"%1$s\"的过滤器条件表达式ID为空"
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr "针对自动发现规则 \"%1$s\"的过滤器条件宏变量为空"
@@ -5948,25 +5890,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -5976,14 +5912,6 @@ msgstr "空的输入参数."
 msgid "Empty map ID."
 msgstr "空的拓扑图ID。"
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr "空的媒介类型ID。"
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "空参数"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6149,7 +6077,7 @@ msgstr "启用trapping"
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6160,7 +6088,7 @@ msgstr "启用trapping"
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6203,7 +6131,7 @@ msgid "English (en_US)"
 msgstr "英语(en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6219,7 +6147,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6238,12 +6166,12 @@ msgstr "等于"
 msgid "Error"
 msgstr "错误"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "查找表请求出现 \"%1$s\"的错误."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr "错误信息"
 
@@ -6270,7 +6198,7 @@ msgstr "事件ID"
 msgid "Event acknowledged"
 msgstr "事件已确认"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6278,7 +6206,7 @@ msgid "Event correlation"
 msgstr "关联项事件"
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr "关联项事件规则"
@@ -6313,11 +6241,11 @@ msgstr "事件日志监控。返回日志"
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr "事件标签对"
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr "事件类型"
 
@@ -6361,15 +6289,10 @@ msgstr "除外"
 msgid "Exclude host groups"
 msgstr "排除主机组"
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "执行"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "执行SQL错误[%1$s]于[%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6407,7 +6330,7 @@ msgstr "已执行"
 msgid "Executed script"
 msgstr "已执行的脚本"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "执行确认"
 
@@ -6423,8 +6346,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr "扩展"
 
@@ -6545,7 +6468,7 @@ msgstr "表达式"
 msgid "External check"
 msgstr "外部检查"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6572,8 +6495,8 @@ msgstr "已失败"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6584,26 +6507,26 @@ msgstr "创建仪表盘失败"
 msgid "Failed to parse URL."
 msgstr "无法解析URL。"
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr "更新仪表盘失败"
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6611,7 +6534,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr "更新模板失败"
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6635,7 +6558,7 @@ msgstr ""
 msgid "Feb"
 msgstr "二月"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "二月"
 
@@ -6657,10 +6580,9 @@ msgstr "字段 \"%1$s\"不能被设置为空"
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6671,13 +6593,6 @@ msgstr "选项\"%1$s\"为必填项"
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr "字段 \"%1$s\" 缺少拓扑图 \"%2$s\" 的值。"
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr "字段 \"%1$s\" 缺少媒体类型 \"%2$s\" 的值。"
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6696,11 +6611,6 @@ msgstr "字段 \"%1$s\" 不是整数"
 msgid "Field \"%1$s\" is not string."
 msgstr "字段 \"%1$s\"不是字符串"
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr "字段 \"%1$s\" 需要媒体类型 \"%2$s\"."
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6715,10 +6625,6 @@ msgstr "字段\"host\"为必填项."
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr "Only super admins can create groups"
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6783,7 +6689,8 @@ msgstr "填满的区域"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6808,7 +6715,7 @@ msgstr "过滤器"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6860,7 +6767,7 @@ msgstr "调整至符合拓扑图"
 msgid "Fixed"
 msgstr "固定的"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6911,12 +6818,12 @@ msgstr "公式"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -6929,7 +6836,7 @@ msgstr "法语 (fr_FR)"
 msgid "Fri"
 msgstr "周五"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "周五"
 
@@ -7041,7 +6948,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "此表达式不是宏"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr "找不到全局正则表达式 \"%1$s\" 。"
@@ -7055,7 +6962,7 @@ msgstr "全局值"
 msgid "Go back to %1$s"
 msgstr "返回 %1$s"
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "到"
 
@@ -7093,7 +7000,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "谷歌 Chrome"
 
@@ -7101,7 +7008,7 @@ msgstr "谷歌 Chrome"
 msgid "Gradient line"
 msgstr "梯度线"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7160,7 +7067,7 @@ msgstr[0] "图表复制"
 msgid "Graph deleted"
 msgstr "图形已删除"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7197,8 +7104,8 @@ msgstr "数据图模板已删除"
 msgid "Graph prototype updated"
 msgstr "数据图模板已更新"
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr "ID为 \"%1$s\" 的聚合图形不可用。"
@@ -7232,8 +7139,8 @@ msgstr "图形类别"
 msgid "Graph updated"
 msgstr "图形已更新"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr "ID为 \"%1$s\" 的图表不可用。"
@@ -7264,7 +7171,7 @@ msgstr "图表名称 \"%1$s\" 已经存在在图表或者图表原型."
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "图形"
 
@@ -7285,12 +7192,12 @@ msgstr "网格"
 msgid "Group"
 msgstr "群组"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr "组\"%1$s\" 不可以被删除，因为它正在被主机模板使用"
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr "\"%1$s\" 组因为他的关联条件无法删除。"
@@ -7464,11 +7371,11 @@ msgstr "帮助"
 msgid "Hexadecimal to decimal"
 msgstr "十六进制到十进制"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "隐藏的"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr "隐藏调试"
 
@@ -7496,11 +7403,11 @@ msgstr "阶"
 msgid "High"
 msgstr "严重"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr "高对比度暗色"
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr "高对比度亮色"
 
@@ -7521,7 +7428,7 @@ msgstr "高亮整行"
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "历史记录"
 
@@ -7529,11 +7436,15 @@ msgstr "历史记录"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "历史已清除"
 
@@ -7576,7 +7487,7 @@ msgstr "横向"
 msgid "Horizontal align"
 msgstr "横向对齐"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7605,7 +7516,7 @@ msgstr "横向对齐"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 msgid "Host"
 msgid_plural "Hosts"
@@ -7618,7 +7529,7 @@ msgstr[0] "主机"
 msgid "Host \"%1$s\" already exists."
 msgstr "主机 \"%1$s\" 已存在."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7626,7 +7537,7 @@ msgstr "主机 \"%1$s\" 已存在."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr "主机 \"%1$s\" 没有设置主机组"
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7676,7 +7587,7 @@ msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] "主机已启用"
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7690,22 +7601,22 @@ msgstr[0] "主机已启用"
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "主机群组"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "主机群组 \"%1$s\" 已存在."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr "主机群组“%1$s”不能被删除，因为它被用于全局脚本"
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7718,10 +7629,10 @@ msgstr "主机群组组件"
 msgid "Host group label type"
 msgstr "主机群组标签类型"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr "ID为 \"%1$s\" 主机组不可用。"
@@ -7737,8 +7648,8 @@ msgstr "ID为 \"%1$s\" 主机组不可用。"
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7812,7 +7723,7 @@ msgstr "主机名称"
 msgid "Host networks"
 msgstr "主机网络"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7891,7 +7802,7 @@ msgstr "主机更新失败."
 msgid "Host updated"
 msgstr "主机已更新"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr "ID为 \"%1$s\" 的主机不可用"
@@ -7911,7 +7822,7 @@ msgstr "主机名称为\"%1$s\"的主机已存在"
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr "显示名称为\"%1$s\" 的主机已经存在"
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -7924,7 +7835,7 @@ msgstr "显示名称为\"%1$s\" 的主机已经存在"
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -7972,7 +7883,7 @@ msgstr "主机已更新"
 msgid "Hours"
 msgstr "时"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8012,7 +7923,7 @@ msgstr "IP地址"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IP地址"
@@ -8037,7 +7948,7 @@ msgstr "IP范围 \"%1$s\" 超出 \"%2$s\" 地址限制"
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8094,12 +8005,12 @@ msgstr "图标高亮"
 msgid "Icon map"
 msgstr "图标映射"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "图标映射\"%1$s\"无法被删除. 已用映射\"%2$s\"中."
@@ -8112,18 +8023,18 @@ msgstr "图标映射已创建"
 msgid "Icon map deleted"
 msgstr "图标映射已删除"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "图标映射已更新"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "图标映射"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr "ID为 \"%1$s\" 的图标不可用。"
@@ -8222,23 +8133,20 @@ msgstr "假如您认为这个信息是错的, 请咨询您的管理员关于如�
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "图片"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr "图片\"%1$s\"已经存在"
@@ -8247,7 +8155,7 @@ msgstr "图片\"%1$s\"已经存在"
 msgid "Image added"
 msgstr "图片已添加"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "图片已删除"
 
@@ -8255,18 +8163,12 @@ msgstr "图片已删除"
 msgid "Image label type"
 msgstr "图片标签类型"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr "图片加载错误[%1$s] in [%2$s]"
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "图片已更新"
 
@@ -8361,7 +8263,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8372,13 +8274,13 @@ msgstr "无法访问的维护"
 msgid "Inaccessible map"
 msgstr "无法访问的拓扑图"
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr "无法访问的模板"
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr "无法访问的触发器"
 
@@ -8422,7 +8324,7 @@ msgstr "包括子组"
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr "网络接口上传流量统计。返回 整数"
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8590,24 +8492,6 @@ msgstr "错误的动作操作用户群组. 用户群组不存在或您没有访�
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "错误的动作操作用户. 用户不存在或您没有访问权."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8662,8 +8546,6 @@ msgstr "错误的动作操作用户. 用户不存在或您没有访问权."
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "函数传入了错误的参数。"
 
@@ -8689,31 +8571,22 @@ msgstr "模板名称\"%1$s\"使用了不正确的名称."
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr "动作\"%1$s\"的条件不正确"
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr "自动发现规则\"%1$s\"的条件不正确."
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr "错误的关联项ID。"
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr "动作\"%1$s\": %3$s自定义的表达式\"%2$s\" 不正确."
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr "在关联项\"%1$s\": %3$s中使用了错误的表达式\"%2$s\"。"
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr "自动发现规则\"%1$s\": %3$s自定义的表达式 \"%2$s\"不正确."
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8742,7 +8615,7 @@ msgstr "错误的事件对象值."
 msgid "Incorrect eventsource value."
 msgstr "错误的事件源的值."
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "不正确的栏位名称\"%1$s\"或用于资料表\"%2$s\"的where描述式的值."
@@ -8767,22 +8640,17 @@ msgstr "错误的文件上传."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr "动作\"%1$s\"的过滤器条件计算式ID不正确."
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr "自动发现规则\"%1$s\"的条件计算式ID不正确."
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr "错误的过滤条件公式给出相关ID \"%1$s\" 。"
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr "自动发现规则\"%1$s\"的过滤器条件宏变量不正确"
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8793,7 +8661,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr "动作\"%1$s\"过滤器条件行为不正确."
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr "自动发现规则\"%1$s\"的过滤器条件行为不正确"
@@ -8821,8 +8689,6 @@ msgstr "错误的图片索引"
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8884,10 +8750,6 @@ msgstr "错误的维护期间(至少要5分钟)"
 msgid "Incorrect map ID."
 msgstr "错误的拓扑图ID"
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr "错误的 媒介类型ID"
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -8945,13 +8807,13 @@ msgstr "不正确的正则表达式 \"%1$s\": \"%2$s\""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr "收到了来自于zabbix服务器\"%1$s\"的错误应答."
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "错误的服务终止时间."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "错误的服务开始时间."
 
@@ -9004,12 +8866,7 @@ msgstr "触发器模板表达式错误。触发器表达式元素不应该同时
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr "动作\"%1$s\"的计算类型不正确."
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr "\"%1$s\"的关联项计算类型错误。"
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr "自动发现规则 \"%1$s\"的计算类型不正确."
@@ -9055,13 +8912,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9078,60 +8935,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr "字段 \"%2$s\"的值 \"%1$s\"不正确:必须在%3$s到%4$s之间"
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "错误的值\"%1$s\"于浮点栏位\"%2$s\"中."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "错误的值\"%1$s\"于整数栏位\"%2$s\"中."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "错误的值\"%1$s\"于无正负的整数栏位\"%2$s\"中."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr "在关联项中\"%3$s\"，\"%2$s\"使用了错误的值\"%1$s\"。"
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr "\"%2$s\" 中 媒体值 \"%3$s\" 的 \"%1$s\" 值错误。"
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9186,14 +9013,8 @@ msgstr "\"%1$s\" 字段的值不正确。"
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9303,25 +9124,7 @@ msgstr "\"%1$s\" 字段的值不正确。"
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9332,7 +9135,7 @@ msgstr "\"%1$s\" 字段的值不正确。"
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9378,16 +9181,17 @@ msgstr "\"%1$s\" 字段的值不正确。"
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9396,7 +9200,7 @@ msgstr "\"%1$s\" 字段的值不正确。"
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr "字段 \"%1$s\": %2$s 值错误。"
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9484,12 +9288,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "插入"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr "插入表达式"
 
@@ -9593,7 +9397,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "IE浏览器"
 
@@ -9601,7 +9405,7 @@ msgstr "IE浏览器"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9612,7 +9416,7 @@ msgstr "IE浏览器"
 msgid "Interval"
 msgstr "间隔"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9635,7 +9439,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr "无效的动作条件：%1$s。"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9667,7 +9471,7 @@ msgstr "媒介类型 ID: \"%1$s\" 的 email 地址无效。"
 msgid "Invalid interval \"%1$s\"."
 msgstr "无效的间隔 \"%1$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr "\"%3$s\"：%4$s上的自动发现规则 \"%2$s\" 引用了不合法的关键字 \"%1$s\"。"
@@ -9692,27 +9496,29 @@ msgstr "不舍法的关键字 \"%1$s\": %2$s"
 msgid "Invalid method parameters."
 msgstr "无效的方法参数."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9738,17 +9544,17 @@ msgstr "无效的方法参数."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9756,8 +9562,8 @@ msgstr "无效的方法参数."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9771,106 +9577,116 @@ msgstr "无效的方法参数."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9912,43 +9728,38 @@ msgstr "无效的响应代码 \"%1$s\"."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -9969,7 +9780,7 @@ msgstr "无效的时间段"
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "资产记录"
 
@@ -10010,7 +9821,7 @@ msgstr "不能查找用户密码."
 msgid "Italian (it_IT)"
 msgstr "意大利语 (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10042,7 +9853,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "监控项\"%1$s\"不能填入一个不存在的主机资产纪录栏位号码\"%2$d\". 选择为: 从0(不填入)到%3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10056,7 +9867,7 @@ msgstr "监控项已添加"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] "监控项复制"
@@ -10069,12 +9880,12 @@ msgstr "监控项数量"
 msgid "Item deleted"
 msgstr "监控项已删除"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] "监控项目被禁用"
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] "监控项目已启用"
@@ -10083,7 +9894,7 @@ msgstr[0] "监控项目已启用"
 msgid "Item in \"not supported\" state"
 msgstr "监控项在“不支持”的状态"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr "项目未被选择"
 
@@ -10092,7 +9903,7 @@ msgstr "项目未被选择"
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr "项目预处理缺少参数：%1$s"
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10128,8 +9939,8 @@ msgid "Item prototype updated"
 msgid_plural "Item prototypes updated"
 msgstr[0] "项目模板已更新"
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr "ID为 \"%1$s\" 的项目原型不可用。"
@@ -10155,7 +9966,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10187,8 +9998,8 @@ msgstr "监控项不会刷新。指定的更新间隔要求至少具有一个灵
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr "监控项不会被刷新。更新间隔应该在 1s 到 1d 之间。还要指定调度/灵活间隔方式。"
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr "ID为 \"%1$s\" 的项目不可用。"
@@ -10239,11 +10050,11 @@ msgstr "键值为 \"%1$s\"的监控项已存在于\"%2$s\" ."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "监控项"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "监控项已删除"
 
@@ -10261,7 +10072,7 @@ msgstr "监控项已更新"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10286,6 +10097,10 @@ msgstr "JMX接口"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10298,7 +10113,7 @@ msgstr "JSON 数据"
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr "预先的JSON字符串"
 
@@ -10316,7 +10131,7 @@ msgstr ""
 msgid "Jan"
 msgstr "一月"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "一月"
 
@@ -10338,7 +10153,7 @@ msgstr ""
 msgid "Jul"
 msgstr "七月"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "七月"
 
@@ -10346,7 +10161,7 @@ msgstr "七月"
 msgid "Jun"
 msgstr "六月"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "六月"
 
@@ -10496,22 +10311,6 @@ msgid "Last %1$d year"
 msgid_plural "Last %1$d years"
 msgstr[0] "还剩 %1$d 年"
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10523,11 +10322,11 @@ msgstr ""
 msgid "Last check"
 msgstr "最近检查记录"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "最近一小时"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "上月图形"
 
@@ -10565,11 +10364,11 @@ msgstr ""
 msgid "Last value"
 msgstr "最新数据"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "上周图形"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10578,11 +10377,11 @@ msgstr "上周图形"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "最新数据"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "最新值"
 
@@ -10623,7 +10422,7 @@ msgstr "左侧 Y 轴"
 msgid "Left trim"
 msgstr "修整左边"
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 #, fuzzy
 msgid "Legend"
 msgstr "图例"
@@ -10905,7 +10704,7 @@ msgstr "低级发现规则在“不支持”状态"
 msgid "M"
 msgstr "M"
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -10927,7 +10726,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr "文件的MD5校验。返回字符串（该文件的MD5哈希值）"
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -10938,12 +10737,12 @@ msgid "Macro"
 msgstr "宏"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "宏\"%1$s\"已存在于\"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "宏\"%1$s\"已存在."
@@ -10971,7 +10770,7 @@ msgstr "宏已更新"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr "主过滤器"
 
@@ -10979,7 +10778,7 @@ msgstr "主过滤器"
 msgid "Main navigation"
 msgstr "主导航栏"
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11062,7 +10861,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11084,13 +10883,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr "手动关闭"
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "拓扑图"
 
@@ -11159,7 +10958,7 @@ msgstr "拓扑图形状"
 msgid "Map update failed."
 msgstr "拓扑图更新失败."
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr "ID为 \"%1$s\" 的地图不可用。"
@@ -11191,7 +10990,7 @@ msgstr "拓扑图"
 msgid "Mar"
 msgstr "三月"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "三月"
 
@@ -11295,7 +11094,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11308,7 +11107,7 @@ msgstr[0] "将要显示的最大时间区间是%1$s天"
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr "email 地址最大长度超出媒体类型 ID: \"%1$s\"。"
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "五月"
 
@@ -11323,15 +11122,12 @@ msgstr "五月"
 msgid "Media"
 msgstr "报警媒介"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "报警媒介类型"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr "媒体类型 \"%1$s\" 已经存在。"
@@ -11355,11 +11151,6 @@ msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "消息介质类型已启用"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr "%1$s 媒体类型缺少参数。"
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11389,7 +11180,7 @@ msgstr "ID为 \"%1$s\" 的媒体类型不可用。"
 msgid "Media types"
 msgstr "报警媒介类型"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11477,7 +11268,7 @@ msgstr "正在发送消息"
 msgid "Method not found."
 msgstr "未发现方法."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11539,7 +11330,7 @@ msgid "Minimum severity"
 msgstr "最小的严重级别"
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11597,7 +11388,7 @@ msgstr "模式"
 msgid "Model"
 msgstr "模型"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11631,7 +11422,7 @@ msgstr[0] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11657,7 +11448,7 @@ msgstr ""
 msgid "Mon"
 msgstr "一"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "周一"
 
@@ -11697,11 +11488,11 @@ msgstr "月"
 msgid "Monthly"
 msgstr "每月"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr "更多匹配发现..."
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11725,7 +11516,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11738,7 +11529,7 @@ msgstr "多重"
 msgid "Multiple PROBLEM events"
 msgstr "多重问题事件"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "静音"
 
@@ -11867,11 +11658,11 @@ msgstr "NTLM"
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12029,19 +11820,21 @@ msgstr "新的触发条件"
 msgid "New dashboard"
 msgstr "新仪表盘"
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "新的组件"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr "新的主机组事件"
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr "新的事件标记值"
 
@@ -12053,7 +11846,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "新的正则表达式"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12061,7 +11854,7 @@ msgstr ""
 msgid "New service time"
 msgstr "新的服务时间"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12070,7 +11863,7 @@ msgid "New triggers"
 msgstr "新触发器"
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12088,7 +11881,7 @@ msgstr "下一步"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12117,30 +11910,6 @@ msgstr "下一步"
 msgid "No"
 msgstr "不"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr "\"%1$s\"没有返回关联项\"%2$s\"。"
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr "\"%1$s\" 没有返回关联项。"
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12156,11 +11925,6 @@ msgstr "图形没有\"%1$s\"."
 msgid "No \"%1$s\" given for map."
 msgstr "\"%1$s\" 在拓扑图中未定义。"
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr "无\"%1$s\" 给与媒体值"
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12168,7 +11932,7 @@ msgstr "无\"%1$s\" 给与媒体值"
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr "动作\"%1$s\"的过滤器条件未配置 \"%2$s\" "
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr "自动发现规则\"%1$s\"的过滤器条件的\"%2$s\"未配置"
@@ -12178,7 +11942,7 @@ msgstr "自动发现规则\"%1$s\"的过滤器条件的\"%2$s\"未配置"
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr "动作 \"%1$s\"的过滤器未配置\"%2$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr "自动发现规则 \"%1$s\"的过滤器未配置\"%2$s\"."
@@ -12195,11 +11959,6 @@ msgstr "没有指定的认证用户名称"
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr "关联项 \"%1$s\" 没有条件类型"
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12230,7 +11989,7 @@ msgstr "在\"%2$s\"上的\"%1$s\"类型无默认接口."
 msgid "No details"
 msgstr "没有细节"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "没有所称的自动发现规则ID"
 
@@ -12266,7 +12025,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr "未添加数据图."
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "没有所知的主机IDs"
 
@@ -12296,7 +12055,7 @@ msgstr "没有图片"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "没有找到接口"
 
@@ -12330,7 +12089,7 @@ msgstr "未发现宏"
 msgid "No maps added."
 msgstr "未添加拓扑图."
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr "没有找到匹配"
 
@@ -12338,17 +12097,46 @@ msgstr "没有找到匹配"
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr "关联项 \"%1$s\" 没有操作类型"
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "没有系统访问权限。"
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12356,7 +12144,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12384,19 +12172,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12411,16 +12198,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12440,12 +12233,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12466,27 +12257,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12503,14 +12296,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12519,7 +12312,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "没有权限退回物件的或其不存在!"
 
@@ -12539,7 +12332,7 @@ msgstr "没有指定的公钥文件"
 msgid "No recipients for action operation message."
 msgstr "没有动作操作信息的收受者。"
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr "没有刷新"
 
@@ -12551,7 +12344,7 @@ msgstr "没有指定给动作操作命令的脚本。"
 msgid "No target selected"
 msgstr "没有选择目标"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "没有已选的目标"
 
@@ -12568,7 +12361,7 @@ msgstr "没有已定义的触发器."
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr "不推荐使用非布尔标志。"
 
@@ -12638,15 +12431,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "不允许设定用户\"guest\"的密码."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12678,7 +12471,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "不支持的"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "备注"
@@ -12709,7 +12502,7 @@ msgstr "通知所有参与者"
 msgid "Nov"
 msgstr "十一"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "十一月"
 
@@ -12896,8 +12689,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -12957,13 +12750,13 @@ msgstr "十月"
 msgid "Octal to decimal"
 msgstr "八进制转十进制"
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "十月"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "关"
 
@@ -12971,30 +12764,31 @@ msgstr "关"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "正常"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr "过去的时间标签值"
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "开"
 
@@ -13010,35 +12804,15 @@ msgstr "一次"
 msgid "One"
 msgstr "壹"
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr "其中的一个对象被留下没有主机组."
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "一次性"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr "单次停机"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "只有超级管理员可以创建主机群组."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "只有超级管理员可以创建报警媒介类型."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "只有超级管理员可以删除报警媒介类型."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "只有超级管理员可以编辑报警媒介类型."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr "只有Zabbix代理, SNMPv1,SNMPv2 和 SNMPv3检查才是独特的."
@@ -13086,10 +12860,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr "只有超级管理员才能创建关联项。"
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr "只有超级管理员才能设置仪表板所有者。"
@@ -13098,15 +12868,11 @@ msgstr "只有超级管理员才能设置仪表板所有者。"
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr "只有超级管理员才能更新关联项。"
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "只计算指派给启用的主机的和相依于启用的项目的触发器"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13115,7 +12881,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr "操作系统信息。返回字符串"
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13124,11 +12890,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "由于未认证的请求, 操作无法完成."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "操作细节"
 
@@ -13150,7 +12916,7 @@ msgstr "操作并无模板来操作."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13159,33 +12925,33 @@ msgstr ""
 msgid "Operations"
 msgstr "操作"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "操作者"
 
@@ -13294,7 +13060,7 @@ msgstr "其它配置参数"
 msgid "Other parameters"
 msgstr "其他参数"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "其它"
@@ -13308,7 +13074,7 @@ msgstr "上行流量统计。返回整数"
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13337,7 +13103,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13526,7 +13292,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13571,7 +13337,7 @@ msgstr "共享密钥（PSK）"
 msgid "PSK identity"
 msgstr "共享密钥一致性"
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13594,16 +13360,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "参数"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr "参数 \"%1$s\" 已被弃用。"
@@ -13633,7 +13399,7 @@ msgstr "上层监控项"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13650,7 +13416,7 @@ msgstr "上层触发器"
 msgid "Parent web scenarios"
 msgstr "上层 web 场景"
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13662,11 +13428,6 @@ msgstr ""
 msgid "Parse"
 msgstr "分析"
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "解析SQL错误[%1$s]于[%2$s]之中."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "解析错误"
@@ -13727,7 +13488,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr "粘贴"
 
@@ -13737,15 +13498,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr "粘贴无外部链接"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13792,12 +13553,11 @@ msgstr "执行DNS查询。返回字符串信息"
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "期间"
 
@@ -13886,7 +13646,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr "请输入主机名或主机IP地址和zabbix服务器的端口号，以及安装的名称（可选）。"
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "请选择两个组件"
 
@@ -13926,7 +13686,7 @@ msgstr "填入主机资产纪录栏位"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14015,7 +13775,7 @@ msgid "Previous month"
 msgstr "上一个月"
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14146,7 +13906,7 @@ msgstr "问题没有被制止"
 msgid "Problem is suppressed"
 msgstr "问题已被制止"
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "问题在"
 
@@ -14159,21 +13919,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr "问题已解决"
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14187,9 +13943,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "问题"
 
@@ -14223,7 +13979,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr "属性"
 
@@ -14244,13 +14000,13 @@ msgstr "提供的 URL \"%1$s\" 无效。"
 msgid "Proxies"
 msgstr "agent代理程序"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14258,7 +14014,7 @@ msgstr "agent代理程序"
 msgid "Proxy"
 msgstr "agent代理程序"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14268,12 +14024,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "主机\"%2$s\"的agent代理程序\"%1$s\"不存在."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr "代理  \"%1$s\" 已被动作 \"%2$s\" 使用。"
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "agent代理程序\"%1$s\"是用在自动发现规则\"%2$s\"上."
@@ -14365,7 +14121,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14442,10 +14198,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "接收到的值"
@@ -14527,7 +14279,7 @@ msgstr "矩形"
 msgid "Refresh"
 msgstr "刷新"
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr "刷新间隔"
 
@@ -14545,13 +14297,13 @@ msgstr ""
 msgid "Regular"
 msgstr "常规"
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "正则表达式"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14583,7 +14335,7 @@ msgstr "正则表达式"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14615,8 +14367,6 @@ msgstr "远程命令"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14637,7 +14387,9 @@ msgstr "远程命令"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14650,7 +14402,7 @@ msgstr "远程命令"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14727,8 +14479,8 @@ msgstr "远程命令"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "移除"
 
@@ -14768,7 +14520,7 @@ msgstr "删除，%1$s"
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14810,7 +14562,7 @@ msgid "Replace dependencies"
 msgstr "替换依赖关系"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14867,7 +14619,7 @@ msgstr "请求正文"
 msgid "Request body type"
 msgstr "请求 body 类型"
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr "请求发送成功"
 
@@ -14909,8 +14661,8 @@ msgstr "要求的状态码"
 msgid "Required string"
 msgstr "要求的字串"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "重设"
 
@@ -14943,7 +14695,7 @@ msgstr "重设确认"
 msgid "Reset defaults"
 msgstr "重设预设"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "已解决"
 
@@ -15009,7 +14761,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "结果"
@@ -15197,12 +14949,12 @@ msgstr "即在主机上指定的命令的执行。返回命令执行结果的文
 msgid "Russian (ru_RU)"
 msgstr "俄语 (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15213,8 +14965,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15251,7 +15003,7 @@ msgstr "SMTP服务器端口"
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15347,12 +15099,12 @@ msgstr "SQL count: %1$s (selects: %2$s | executes: %3$s)"
 msgid "SQL query"
 msgstr "SQL查询"
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "SQL描述式执行已失败: \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "SQL描述式执行已失败: \"%1$s\"."
@@ -15415,7 +15167,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr "STARTTLS(纯文本通信协议扩展)"
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15427,7 +15179,7 @@ msgstr "无衬线字体"
 msgid "Sat"
 msgstr "六"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "周六"
 
@@ -15469,7 +15221,7 @@ msgstr "排程"
 msgid "Scheduled check"
 msgstr "时刻表检查"
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15533,7 +15285,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr "范围"
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15546,8 +15298,7 @@ msgstr "范围"
 msgid "Script"
 msgstr "脚本"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr "脚本\"%1$s\"已经存在."
@@ -15578,12 +15329,6 @@ msgstr "脚本名称"
 msgid "Script parameters"
 msgstr "脚本参数"
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr "脚本参数 \"%1$s\" 没有在上一个换行中找到对应 \"%2$s\" 的媒体类型。"
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "脚本探查器"
@@ -15596,7 +15341,7 @@ msgstr "脚本已更新"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "脚本"
 
@@ -15666,8 +15411,8 @@ msgid "Security name"
 msgstr "安全名称"
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15675,7 +15420,7 @@ msgstr "安全名称"
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "选择"
 
@@ -15711,19 +15456,19 @@ msgstr "所选的组件"
 msgid "Selected items only"
 msgstr "仅选择的监控项"
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr "已选择，%1$s 在 %2$d 位置的 %3$d"
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr "已选择，%1$s，只读，位于 %3$d 的位置 %2$d"
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr "往后发送"
 
@@ -15748,7 +15493,7 @@ msgstr "仅送到"
 msgid "Send to"
 msgstr "收件人"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr "发回"
 
@@ -15781,7 +15526,7 @@ msgstr "分开的"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "九月"
 
@@ -15812,28 +15557,28 @@ msgstr "服务器（代理）"
 msgid "Server time"
 msgstr "服务器时间"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "服务"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15843,7 +15588,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr "服务被创建"
 
@@ -15875,16 +15620,16 @@ msgstr "服务端口"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "服务的开始时间不能晚于截止时间."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -15892,11 +15637,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "服务次数"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "服务类型"
 
@@ -15905,30 +15650,29 @@ msgstr "服务类型"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "服务已更新"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "服务"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "服务形成了一个环."
 
@@ -15936,7 +15680,7 @@ msgstr "服务形成了一个环."
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -15966,7 +15710,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr "设置主机清单模式"
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -15995,7 +15739,7 @@ msgstr "设置 LDAP 协议失败。"
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr "将 LDAP 引用设置为「关闭」失败。"
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -16004,7 +15748,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16060,7 +15804,7 @@ msgstr "形"
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr "分享"
 
@@ -16202,7 +15946,7 @@ msgstr "当Zabbix服务器停机时显示警告"
 msgid "Show working time"
 msgstr "查看工作时间"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "已查看"
 
@@ -16311,7 +16055,7 @@ msgstr "略过复制图片\"%1$s\"到主机\"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "斯洛伐克(sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Snooze"
 
@@ -16357,7 +16101,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr "排序对象以"
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "排序(0->999)"
 
@@ -16431,7 +16175,7 @@ msgstr "开始于"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16534,15 +16278,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "状态"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "状态码"
@@ -16572,7 +16320,7 @@ msgstr "只有状态"
 msgid "Status problem"
 msgstr "状态 问题"
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16620,7 +16368,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16685,7 +16433,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr "主体"
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "子拓扑图"
 
@@ -16701,7 +16449,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "成功审计"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr "成功消息"
 
@@ -16714,7 +16462,7 @@ msgstr "网络接口上传下载的流量总和。返回整数"
 msgid "Sun"
 msgstr "日"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "日"
 
@@ -16806,12 +16554,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr "系统启动时间。返回整数"
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16838,17 +16586,17 @@ msgstr "真"
 msgid "Table \"%1$s\" does not exist."
 msgstr "表\"%1$s\" 不存在."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "表\"%1$s\"不能有栏位名为\"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "标签"
@@ -16904,7 +16652,7 @@ msgstr "标记值"
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -16964,7 +16712,7 @@ msgstr "目标类型"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -16985,7 +16733,7 @@ msgstr "模板"
 msgid "Template \"%1$s\" already exists."
 msgstr "模板 \"%1$s\" 已存在."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17009,7 +16757,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "模板不能重复链接到其它模板, 即使透过其它模板."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17069,7 +16817,7 @@ msgstr "拥有相同显示名称\"%1$s\"的模板已经存在."
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17241,13 +16989,13 @@ msgstr "被发现的主机丢失它将于%1$s (on %2$s at %3$s)后被删除."
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr "被发现的主机丢失它将在下次自动发现规则执行时被删除."
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] "图片被应用于图标映射%1$s上."
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17311,7 +17059,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "本月"
 
@@ -17319,7 +17067,7 @@ msgstr "本月"
 msgid "This month so far"
 msgstr "这个月到目前为止"
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "本周"
 
@@ -17327,7 +17075,7 @@ msgstr "本周"
 msgid "This week so far"
 msgstr "本周到目前为止"
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "本年"
 
@@ -17347,7 +17095,7 @@ msgstr ""
 msgid "Thu"
 msgstr "四"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "周四"
 
@@ -17364,7 +17112,7 @@ msgstr "直到"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17398,7 +17146,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "时间期间"
 
@@ -17450,12 +17198,11 @@ msgstr "时间戳"
 msgid "To"
 msgstr "到"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "要设定一个主机接口, 选择一个单一的监控项类型给所有的监控项"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "今天"
 
@@ -17570,7 +17317,7 @@ msgstr "趋势存储时间"
 msgid "Trends"
 msgstr "趋势"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17578,7 +17325,7 @@ msgstr "趋势"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "触发器"
 
@@ -17676,7 +17423,7 @@ msgstr "触发器名称"
 msgid "Trigger overview"
 msgstr "触发器概览"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17748,11 +17495,11 @@ msgstr "触发器模板已更新"
 msgid "Trigger severity"
 msgstr "触发器示警度"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr "触发器状态 \"OK\""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr "触发器状态\"Problem\""
 
@@ -17769,7 +17516,7 @@ msgstr "触发器已更新"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17804,7 +17551,7 @@ msgstr "修整"
 msgid "Tue"
 msgstr "二"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "周二"
 
@@ -17817,7 +17564,7 @@ msgstr "土耳其语 (tr_TR)"
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "两个项目 (\"%1$s\"和\"%2$s\")不能填入一个主机资产纪录栏位\"%3$s\", 这会造成冲突."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr "应选择两个拓扑元素"
 
@@ -17833,19 +17580,19 @@ msgstr "应选择两个拓扑元素"
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -17897,7 +17644,7 @@ msgstr "信息类型"
 msgid "Types"
 msgstr "类型 "
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -17918,7 +17665,7 @@ msgstr "未知的"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -17964,12 +17711,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr "拓扑图 \"%1$s\" URL、名称为必填项。"
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URLs"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18054,12 +17801,12 @@ msgstr "解锁"
 msgid "Unblock selected users?"
 msgstr "解除锁定所选的用户?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18079,21 +17826,23 @@ msgstr "单位"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "未知的"
@@ -18111,7 +17860,7 @@ msgid "Unknown error"
 msgstr "未知错误"
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "未知的主机监控项, 在所选的主机中没有这样的监控项"
@@ -18164,7 +17913,7 @@ msgstr "自模板断开连接"
 msgid "Unlink from templates"
 msgstr "自模板断开链接"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "取消静音"
 
@@ -18194,7 +17943,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr "动作\"%1$s\"的过滤器条件不支持参数\"%2$s\""
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr "自动发现规则 \"%1$s\"的过滤器条件不支持参数\"%2$s\""
@@ -18204,7 +17953,7 @@ msgstr "自动发现规则 \"%1$s\"的过滤器条件不支持参数\"%2$s\""
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr "动作\"%1$s\"的过滤器不支持参数\"%2$s\"."
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr "自动发现规则\"%1$s\"的过滤器不支持参数\"%2$s\"."
@@ -18249,7 +17998,7 @@ msgstr "上"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18262,7 +18011,7 @@ msgstr "上"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18315,7 +18064,7 @@ msgstr "更新操作"
 msgid "Update problem"
 msgstr "更新问题"
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18333,7 +18082,7 @@ msgstr "上传"
 msgid "Upper level maps"
 msgstr "上层拓扑图"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18368,7 +18117,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "用于动作中"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18383,7 +18132,7 @@ msgstr "用于动作中"
 msgid "User"
 msgstr "用户"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr "用户 \"%1$s\" 不能没有用户组。"
@@ -18435,7 +18184,7 @@ msgstr "添加用户"
 msgid "User agent string"
 msgstr "用户代理字符串"
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "用户不能将自己加进一个取消的群组或已关闭图形接口访问权的群组."
@@ -18454,7 +18203,7 @@ msgid "User deleted"
 msgid_plural "Users deleted"
 msgstr[0] "用户已删除"
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18464,27 +18213,27 @@ msgstr[0] "用户已删除"
 msgid "User group"
 msgstr "用户群组"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr "用户组\"%1$s\"已存在."
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr "用户组 \"%1$s\" 用于 \"%2$s\" 操作。"
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr "用户组\"%1$s\"为接收数据库宕机信息而使用."
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "用户群组\"%1$s\"被用于脚本\"%2$s\"."
@@ -18516,8 +18265,8 @@ msgstr[0] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18561,14 +18310,14 @@ msgstr "用户密码"
 msgid "User profile"
 msgstr "用户基本资料"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18635,7 +18384,7 @@ msgstr "用户已更新"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr "ID为 \"%1$s\" 的用户不可用。"
@@ -18951,14 +18700,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -18968,7 +18717,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19010,7 +18759,7 @@ msgstr "参数 \"grid_show \"的值 \"%1$s \"是无效的. 可用的是: \"%2$s
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr "参数 \"grid_show \"的值 \"%1$s\"是无效的. 可用的是: \"%2$s\""
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "栏位\"%2$s\"的值\"%1$s\"太长 - %3$d字元. 容许的长度是%4$d字符."
@@ -19027,7 +18776,7 @@ msgstr "数值缓存统计。合法的mode参数有：total, free, pfree, used a
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "值映射"
 
@@ -19070,11 +18819,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr "所有Windows计数器值。返回 整形、浮点、字符串、文本"
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19121,7 +18871,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19208,7 +18958,7 @@ msgstr "如果缺少主机名称, 可见的名称不能为空."
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
@@ -19225,7 +18975,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "设置"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19234,7 +18984,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "很抱歉, 已经到了最大的组件数量."
 
@@ -19250,7 +19000,7 @@ msgstr "很抱歉, 已经到了最大的组件数量."
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web监测"
 
@@ -19262,7 +19012,7 @@ msgstr "Web监测"
 msgid "Web monitoring"
 msgstr "Web监测"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr "Web 场景"
 
@@ -19277,25 +19027,25 @@ msgstr "Web 场景 \"%1$s\" 已经存在在主机 \"%2$s\"."
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "Web 场景 \"%1$s\" 已经存在."
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr "Web 场景已添加"
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "Web 场景被被删除"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "Web 场景被禁用"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "Web 场景已启用"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr "Web 场景已更新"
 
@@ -19317,7 +19067,7 @@ msgstr ""
 msgid "Wed"
 msgstr "三"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "周三"
 
@@ -19328,7 +19078,7 @@ msgstr "周三"
 msgid "Weekly"
 msgstr "每周"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19344,12 +19094,12 @@ msgstr "欢迎来到"
 msgid "When active"
 msgstr "当启用时"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19544,6 +19294,10 @@ msgstr "Y/m/d H:i:s"
 msgid "Y-m-d H:i:s"
 msgstr "Y-m-d H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr "Y1"
@@ -19605,7 +19359,7 @@ msgstr "每年"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19662,18 +19416,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19685,9 +19433,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "您没有权限来完成此操作."
 
@@ -19803,24 +19548,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr "预先设定的布尔值"
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr "请在字符串中指定"
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19829,37 +19578,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr "预先设定的数字"
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr "数字过大"
@@ -19880,28 +19629,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr "a 预计时间"
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr "预设时间段"
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr "预计时间范围"
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr "预设时间单位"
@@ -19949,7 +19699,7 @@ msgstr "所有"
 msgid "all media"
 msgstr "所有介质"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -19957,42 +19707,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr "请在阵列中指定"
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr "预设一个数组或一个字符串"
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -20002,7 +19747,7 @@ msgid "an empty string is expected"
 msgstr "请指定一个空字符串"
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr "预设会出现偶数个十六进制字符"
 
@@ -20010,11 +19755,15 @@ msgstr "预设会出现偶数个十六进制字符"
 msgid "an explicit time is expected"
 msgstr "需要一个明确的时间"
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20175,14 +19924,8 @@ msgstr "不能变更"
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20212,19 +19955,11 @@ msgstr "不能变更"
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20244,14 +19979,14 @@ msgstr "不能变更"
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20259,7 +19994,7 @@ msgstr "不能变更"
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr "不能为空"
@@ -20272,7 +20007,7 @@ msgstr "无法转换到 JSON，结果值太长"
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr "无法执行 Scroll API 请求，数据可能会被截断"
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20306,7 +20041,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr "不允许循环项依赖"
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20324,7 +20059,8 @@ msgid "configure"
 msgstr "配置"
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr "包含"
@@ -20353,7 +20089,7 @@ msgstr "count() - 对于周期 T，成功检索的值 V（其满足运算符 O�
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20415,7 +20151,7 @@ msgstr "降"
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20437,13 +20173,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr "不含"
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr "不等于"
@@ -20469,7 +20205,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20506,6 +20243,10 @@ msgstr "表达式为空"
 msgid "failed to parse JSON"
 msgstr "无法解析 JSON"
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20552,7 +20293,7 @@ msgstr "全局管家设置"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20593,6 +20334,11 @@ msgstr "图标"
 msgid "image"
 msgstr "图片"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "在"
@@ -20633,15 +20379,19 @@ msgstr "错误的元素"
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "\"%1$s\"附近语法错误"
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20669,7 +20419,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr "无效地址范围 \"%1$s\""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr "UTF-8中无效的字节排序"
 
@@ -20698,27 +20448,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr "无效的历史数据期间"
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr "无效的主机群组名称"
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr "无效的主机名称"
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr "无效的正则表达式"
 
@@ -20746,7 +20496,7 @@ msgstr "大于等于"
 msgid "is less than or equals"
 msgstr "小于等于"
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr "不包含在{}或格式错误"
 
@@ -20832,12 +20582,12 @@ msgstr "底层发现规则"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20896,7 +20646,7 @@ msgstr "匹配"
 msgid "max"
 msgstr "最大"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -20936,7 +20686,7 @@ msgid "min() - Minimum value for period T"
 msgstr "min() - 周期 T 内的最小值"
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr "最小长度为 %1$s 个字符"
@@ -20963,8 +20713,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "毫秒"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -20979,27 +20729,14 @@ msgstr "必需为一个正确的LDAP用户"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr "必须在 \"%1$s\" 和 \"%2$s\" 之间"
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr "必须包含至少一个底层发现宏"
 
@@ -21027,6 +20764,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21037,7 +20782,7 @@ msgstr ""
 msgid "name"
 msgstr "名字"
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "新"
 
@@ -21172,7 +20917,7 @@ msgstr "输出"
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21207,24 +20952,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21252,11 +21001,11 @@ msgstr ""
 msgid "regular expression"
 msgstr "正则表达式"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21268,15 +21017,15 @@ msgstr ""
 msgid "right"
 msgstr "正确"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21324,7 +21073,7 @@ msgstr ""
 msgid "short description"
 msgstr "简要描述"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21343,15 +21092,15 @@ msgstr "简要描述"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr "可能是空的"
 
@@ -21367,31 +21116,31 @@ msgstr "展示图标映射"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21399,11 +21148,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr "sum() - 周期 T 内的值之和"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21419,8 +21168,8 @@ msgstr "提供的凭据不是唯一的"
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21431,7 +21180,7 @@ msgstr "提供的凭据不是唯一的"
 msgid "tag"
 msgstr "标记"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21440,13 +21189,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "模板ID\"%1$s\"已传送%2$s次"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21455,20 +21208,20 @@ msgstr "模板ID\"%1$s\"已传送%2$s次"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr "找不到参数 \"%1$s\""
@@ -21500,39 +21253,39 @@ msgstr "第三"
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr "时间偏移"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr "time() - 当前时间"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr "timeleft() - 基于周期 T 内达到阈值的时间估计"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21546,7 +21299,7 @@ msgstr "触发器"
 msgid "trigger does not allow manual closing"
 msgstr "触发器不允许手动关闭"
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21558,26 +21311,26 @@ msgstr "触发器原型无法移动到另外一个模板或者主机"
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr "触发器原型以及关联项无法移动到另外一个模板或者主机"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "在此输入搜索"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21585,11 +21338,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21606,10 +21359,10 @@ msgstr "非期望的关键字结束"
 msgid "unexpected end of macro"
 msgstr "宏的结束是不正确"
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21619,11 +21372,12 @@ msgstr "宏的结束是不正确"
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr "\"%1$s\" 参数异常"
@@ -21649,8 +21403,8 @@ msgstr "异常的文本 \"%1$s\""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21675,6 +21429,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr "这个版本已经不被支持"
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21690,7 +21448,7 @@ msgstr "这个版本已经不被支持"
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21710,11 +21468,11 @@ msgstr "这个版本已经不被支持"
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "值"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21732,76 +21490,83 @@ msgstr "值 \"%1$s\" 未找到"
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr "值 %1$s 已存在"
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr "值过长"
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21813,18 +21578,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr "值必须是 %1$s 之一"
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21833,7 +21596,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21846,11 +21609,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21867,7 +21630,7 @@ msgstr "错误的发现规则类型"
 msgid "wrong item type"
 msgstr "错误的监控项类型"
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/locale/zh_TW/LC_MESSAGES/frontend.po b/ui/locale/zh_TW/LC_MESSAGES/frontend.po
index 89832d97df9..10dffc25c53 100644
--- a/ui/locale/zh_TW/LC_MESSAGES/frontend.po
+++ b/ui/locale/zh_TW/LC_MESSAGES/frontend.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Zabbix 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-20 10:47+0300\n"
+"POT-Creation-Date: 2021-10-15 19:55+0300\n"
 "PO-Revision-Date: 2012-11-06 09:39+0300\n"
 "Last-Translator: Yaochiu <brian.huang@primillet.com>\n"
 "Language-Team: Zabbix <info@zabbix.com>\n"
@@ -96,7 +96,7 @@ msgid "%1$d day"
 msgid_plural "%1$d days"
 msgstr[0] "%1$d 天"
 
-#: jsLoader.php:323
+#: jsLoader.php:304
 #, c-format
 msgctxt "screen reader"
 msgid "%1$d matches for %2$s found"
@@ -174,7 +174,7 @@ msgstr[0] ""
 #: include/classes/widgets/CWidgetConfig.php:286
 #: include/classes/widgets/CWidgetConfig.php:287
 #: include/classes/widgets/CWidgetConfig.php:288 include/func.inc.php:2631
-#: jsLoader.php:168 jsLoader.php:169 jsLoader.php:170 jsLoader.php:171
+#: jsLoader.php:149 jsLoader.php:150 jsLoader.php:151 jsLoader.php:152
 #, c-format
 msgid "%1$s minute"
 msgid_plural "%1$s minutes"
@@ -186,7 +186,7 @@ msgid "%1$s of %2$s element in problem state"
 msgid_plural "%1$s of %2$s elements in problem state"
 msgstr[0] ""
 
-#: jsLoader.php:324
+#: jsLoader.php:305
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s preselected, use down,up arrow keys and enter to select"
@@ -216,13 +216,13 @@ msgstr[0] "尚有%1$s次重試"
 #: app/views/administration.user.edit.php:673
 #: include/classes/widgets/CWidgetConfig.php:283
 #: include/classes/widgets/CWidgetConfig.php:284 include/func.inc.php:2638
-#: jsLoader.php:166 jsLoader.php:167
+#: jsLoader.php:147 jsLoader.php:148
 #, c-format
 msgid "%1$s second"
 msgid_plural "%1$s seconds"
 msgstr[0] "%1$s 秒"
 
-#: jsLoader.php:305
+#: jsLoader.php:286
 #, c-format
 msgid "%1$s symbols remaining"
 msgstr ""
@@ -241,13 +241,13 @@ msgctxt "screen reader"
 msgid "%1$s, Severity, %2$s"
 msgstr ""
 
-#: jsLoader.php:318
+#: jsLoader.php:299
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, read only"
 msgstr ""
 
-#: jsLoader.php:361
+#: jsLoader.php:342
 #, c-format
 msgctxt "screen reader"
 msgid "%1$s, selected"
@@ -375,7 +375,7 @@ msgstr ""
 msgid "API methods"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:209
+#: app/controllers/CControllerAuditLogList.php:210
 msgid "API token"
 msgstr ""
 
@@ -433,10 +433,6 @@ msgstr ""
 msgid "Abscissa"
 msgstr ""
 
-#: srv_status.php:149
-msgid "Acceptable SLA"
-msgstr ""
-
 #: include/func.inc.php:1511
 msgid "Access denied"
 msgstr ""
@@ -479,7 +475,7 @@ msgstr ""
 msgid "Ack"
 msgstr "知悉"
 
-#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:328
+#: app/views/popup.acknowledge.edit.php:83 jsLoader.php:309
 msgid "Acknowledge"
 msgstr "知悉"
 
@@ -487,7 +483,7 @@ msgstr "知悉"
 msgid "Acknowledge problems"
 msgstr ""
 
-#: app/views/popup.condition.common.php:685 include/actions.inc.php:2075
+#: app/views/popup.condition.common.php:684 include/actions.inc.php:2075
 #: include/events.inc.php:196
 msgid "Acknowledged"
 msgstr "已知悉"
@@ -500,7 +496,7 @@ msgstr "已知悉問題事件"
 msgid "Acknowledged RESOLVED events"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:208
+#: app/controllers/CControllerAuditLogList.php:209
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/configuration.tags.tab.php:41
 #: app/partials/configuration.valuemap.php:35
@@ -527,9 +523,9 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:134
-#: app/views/popup.service.edit.php:219 app/views/popup.service.edit.php:270
-#: app/views/popup.service.edit.php:287 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:151
+#: app/views/popup.service.edit.php:232 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:297 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:122 app/views/popup.valuemap.edit.php:51
 #: app/views/reports.auditlog.list.php:71
 #: app/views/reports.auditlog.list.php:95 include/actions.inc.php:1827
@@ -586,7 +582,7 @@ msgstr "回應作業 \"%1$s\" 已存在。"
 msgid "Action \"%1$s\" no operations defined."
 msgstr "回應作業 \"%1$s\" 未定義作業"
 
-#: include/classes/api/services/CRole.php:742
+#: include/classes/api/services/CRole.php:761
 #, c-format
 msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -595,7 +591,7 @@ msgstr ""
 msgid "Action added"
 msgstr "動作已新增"
 
-#: include/classes/core/ZBase.php:532
+#: include/classes/core/ZBase.php:497
 #, c-format
 msgid "Action class %1$s must extend %2$s class."
 msgstr ""
@@ -642,8 +638,8 @@ msgstr "動作已更新"
 #: include/classes/screens/CScreenProblem.php:1163
 #: include/classes/screens/CScreenProblem.php:1224 include/events.inc.php:291
 #: include/forms.inc.php:1222 include/views/configuration.action.edit.php:28
-#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:144
-#: jsLoader.php:172 jsLoader.php:187 jsLoader.php:201 jsLoader.php:327
+#: include/views/monitoring.sysmap.list.php:69 jsLoader.php:125
+#: jsLoader.php:153 jsLoader.php:168 jsLoader.php:182 jsLoader.php:308
 #: tr_events.php:182
 msgid "Actions"
 msgstr "動作"
@@ -710,7 +706,7 @@ msgstr "作用中直到"
 #: app/views/administration.userrole.edit.php:381
 #: app/views/administration.user.token.edit.php:84
 #: app/views/configuration.correlation.edit.php:101
-#: app/views/configuration.correlation.edit.php:173
+#: app/views/configuration.correlation.edit.php:175
 #: app/views/configuration.dashboard.edit.php:59
 #: app/views/configuration.discovery.edit.php:83
 #: app/views/configuration.discovery.edit.php:146
@@ -721,7 +717,7 @@ msgstr "作用中直到"
 #: app/views/js/reports.scheduledreport.edit.js.php:133
 #: app/views/monitoring.dashboard.view.php:135
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.condition.common.php:700
+#: app/views/popup.condition.common.php:699
 #: app/views/popup.dashboard.share.edit.php:36
 #: app/views/popup.dashboard.share.edit.php:57
 #: app/views/popup.discovery.check.php:137 app/views/popup.httpstep.php:73
@@ -744,9 +740,9 @@ msgstr "作用中直到"
 #: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.edit.php:43
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:73 app/views/popup.service.edit.php:145
-#: app/views/popup.service.edit.php:230 app/views/popup.service.edit.php:294
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:76 app/views/popup.service.edit.php:158
+#: app/views/popup.service.edit.php:239 app/views/popup.service.edit.php:307
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:113 app/views/popup.triggerwizard.php:147
@@ -816,7 +812,7 @@ msgstr "作用中直到"
 #: include/views/monitoring.sysmap.edit.php:304
 #: include/views/monitoring.sysmap.edit.php:325
 #: include/views/monitoring.sysmap.edit.php:362
-#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:191
+#: include/views/monitoring.sysmap.edit.php:430 jsLoader.php:172
 msgid "Add"
 msgstr "新增"
 
@@ -824,11 +820,11 @@ msgstr "新增"
 msgid "Add (message type limit reached)"
 msgstr ""
 
-#: jsLoader.php:161
+#: jsLoader.php:142
 msgid "Add a new widget"
 msgstr ""
 
-#: jsLoader.php:192
+#: jsLoader.php:173
 msgid "Add child element"
 msgstr ""
 
@@ -836,7 +832,7 @@ msgstr ""
 msgid "Add child service"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:302
+#: app/views/js/popup.service.edit.js.php:493
 msgid "Add child services"
 msgstr ""
 
@@ -853,7 +849,7 @@ msgstr "新增主機"
 msgid "Add missing"
 msgstr ""
 
-#: jsLoader.php:193
+#: jsLoader.php:174
 msgid "Add multiple maps"
 msgstr ""
 
@@ -875,7 +871,7 @@ msgstr ""
 msgid "Add page"
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:325 jsLoader.php:392
+#: app/views/js/popup.service.edit.js.php:523 jsLoader.php:373
 msgid "Add parent services"
 msgstr ""
 
@@ -927,12 +923,12 @@ msgstr ""
 msgid "Add widget"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:353
+#: app/controllers/CControllerAuditLogList.php:354
 #: app/controllers/CControllerPopupImportCompare.php:161
 msgid "Added"
 msgstr ""
 
-#: jsLoader.php:316
+#: jsLoader.php:297
 #, c-format
 msgctxt "screen reader"
 msgid "Added, %1$s"
@@ -942,7 +938,7 @@ msgstr ""
 msgid "Additional rule"
 msgstr ""
 
-#: app/views/popup.service.edit.php:154
+#: app/views/popup.service.edit.php:167
 msgid "Additional rules"
 msgstr ""
 
@@ -955,7 +951,7 @@ msgstr "管理者"
 msgid "Administration"
 msgstr "管理"
 
-#: app/views/popup.service.edit.php:126
+#: app/views/popup.service.edit.php:143
 msgid "Advanced configuration"
 msgstr ""
 
@@ -977,7 +973,7 @@ msgstr "歷時少於"
 msgid "Age less than %1$s"
 msgstr ""
 
-#: app/views/administration.script.list.php:159 include/hosts.inc.php:1270
+#: app/views/administration.script.list.php:159 include/hosts.inc.php:1203
 #: include/items.inc.php:347 include/views/configuration.httpconf.edit.php:96
 #: include/views/js/configuration.host.edit.js.php:175
 msgid "Agent"
@@ -1049,7 +1045,7 @@ msgstr ""
 #: app/views/reports.scheduledreport.list.php:56
 #: include/classes/widgets/forms/CWidgetFormProblemHosts.php:122
 #: include/classes/widgets/forms/CWidgetFormProblemsBySv.php:178
-#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:384
+#: include/views/monitoring.sysmap.edit.php:261 jsLoader.php:365
 msgid "All"
 msgstr "所有"
 
@@ -1067,7 +1063,7 @@ msgstr ""
 msgid "All hosts"
 msgstr ""
 
-#: jsLoader.php:272
+#: jsLoader.php:253
 msgid "All links should have \"Name\" and \"URL\" specified"
 msgstr "所有的連結應含 特定的名稱和URL"
 
@@ -1085,7 +1081,7 @@ msgstr ""
 msgid "All problems if tag values match"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:121
+#: app/controllers/CControllerServiceListGeneral.php:145
 msgid "All services"
 msgstr ""
 
@@ -1198,15 +1194,15 @@ msgstr "應用集 錯誤."
 #: app/views/dashboard.page.properties.edit.php:64
 #: app/views/dashboard.properties.edit.php:92
 #: app/views/monitoring.dashboard.widget.edit.php:38
-#: app/views/popup.maintenance.period.php:189 app/views/popup.services.php:47
+#: app/views/popup.maintenance.period.php:189
 #: include/classes/html/CFilter.php:211 include/classes/html/CFilter.php:298
 #: include/classes/html/CTabFilter.php:96
 #: include/views/js/monitoring.sysmaps.js.php:327
 #: include/views/js/monitoring.sysmaps.js.php:480
 #: include/views/js/monitoring.sysmaps.js.php:604
 #: include/views/js/monitoring.sysmaps.js.php:709
-#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:194
-#: jsLoader.php:307
+#: include/views/js/monitoring.sysmaps.js.php:815 jsLoader.php:175
+#: jsLoader.php:288
 msgid "Apply"
 msgstr "適用"
 
@@ -1224,7 +1220,7 @@ msgstr "接近中"
 msgid "Apr"
 msgstr "四月"
 
-#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:224
+#: include/func.inc.php:103 include/func.inc.php:240 jsLoader.php:205
 msgid "April"
 msgstr "四月"
 
@@ -1252,7 +1248,7 @@ msgstr "區域類型"
 msgid "Arithmetic"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:146
+#: include/classes/helpers/CServiceHelper.php:148
 msgid "As is"
 msgstr ""
 
@@ -1299,7 +1295,7 @@ msgstr "於(時:分)"
 msgid "At least one UI element must be checked."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:471
+#: include/classes/api/services/CRole.php:487
 #, c-format
 msgid "At least one UI element must be enabled for user role \"%1$s\"."
 msgstr ""
@@ -1308,7 +1304,7 @@ msgstr ""
 msgid "At least one action is mandatory."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:608
+#: include/classes/api/services/CUser.php:614
 #: include/classes/api/services/CUser.php:1286
 #, c-format
 msgid "At least one active user must exist with role \"%1$s\"."
@@ -1320,6 +1316,11 @@ msgstr ""
 msgid "At least one host group or host must be selected."
 msgstr ""
 
+#: include/classes/api/services/CHostGroup.php:1088
+#: include/classes/api/services/CHostGroup.php:1245
+msgid "At least one host or template must be specified."
+msgstr ""
+
 #: include/classes/api/services/CMaintenance.php:380
 #: include/classes/api/services/CMaintenance.php:388
 #: include/classes/api/services/CMaintenance.php:635
@@ -1331,7 +1332,7 @@ msgstr "必須創建至少一個維修期間."
 msgid "At least one of MySQL, PostgreSQL or Oracle should be supported."
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:156
+#: app/views/configuration.correlation.edit.php:158
 msgid "At least one operation must be selected."
 msgstr ""
 
@@ -1387,7 +1388,7 @@ msgstr ""
 msgid "Aug"
 msgstr "八月"
 
-#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:228
+#: include/func.inc.php:107 include/func.inc.php:244 jsLoader.php:209
 msgid "August"
 msgstr "八月"
 
@@ -1400,7 +1401,7 @@ msgstr ""
 msgid "AuthN requests"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:210
+#: app/controllers/CControllerAuditLogList.php:211
 #: app/views/administration.authentication.edit.php:324
 #: app/views/administration.authentication.edit.php:334
 #: app/views/administration.mediatype.edit.php:89
@@ -1477,7 +1478,7 @@ msgstr ""
 #: app/partials/popup.operations.php:228
 #: app/views/administration.miscconfig.edit.php:62
 #: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1207
+#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1140
 #: include/views/configuration.host.edit.php:383
 #: include/views/configuration.host.prototype.edit.php:358
 msgid "Automatic"
@@ -1492,7 +1493,7 @@ msgstr "自動的圖示對應"
 msgid "Automatic icon selection"
 msgstr "自動的圖示選擇"
 
-#: app/controllers/CControllerAuditLogList.php:211
+#: app/controllers/CControllerAuditLogList.php:212
 #: app/controllers/CControllerAutoregEdit.php:67
 #: app/views/administration.autoreg.edit.php:29
 #: app/views/administration.autoreg.edit.php:89
@@ -1544,7 +1545,7 @@ msgstr ""
 msgid "Avoid easy-to-guess passwords"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:293
+#: include/classes/widgets/views/widget.svggraph.form.view.php:294
 msgid "Axes"
 msgstr ""
 
@@ -1607,7 +1608,7 @@ msgstr ""
 msgid "Blocked"
 msgstr "封鎖的"
 
-#: include/classes/core/ZBase.php:361
+#: include/classes/core/ZBase.php:355
 msgid "Blue"
 msgstr ""
 
@@ -1661,11 +1662,11 @@ msgstr ""
 msgid "Bottom"
 msgstr "底部"
 
-#: jsLoader.php:264
+#: jsLoader.php:245
 msgid "Bring forward"
 msgstr ""
 
-#: jsLoader.php:263
+#: jsLoader.php:244
 msgid "Bring to front"
 msgstr ""
 
@@ -1691,7 +1692,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1080
+#: include/classes/graph/CSvgGraph.php:1086
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 msgid "CLOSING"
@@ -1736,8 +1737,8 @@ msgstr ""
 msgid "CSV to JSON"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CNewValidator.php:310
 msgid "CUID is expected"
 msgstr ""
 
@@ -1746,7 +1747,7 @@ msgstr ""
 msgid "Calculated"
 msgstr "計算的"
 
-#: jsLoader.php:220
+#: jsLoader.php:201
 msgid "Calendar"
 msgstr ""
 
@@ -1771,7 +1772,7 @@ msgstr "回呼"
 #: app/views/administration.usergroup.edit.php:214
 #: app/views/administration.userrole.edit.php:352
 #: app/views/administration.user.token.edit.php:78
-#: app/views/configuration.correlation.edit.php:167
+#: app/views/configuration.correlation.edit.php:169
 #: app/views/configuration.dashboard.edit.php:67
 #: app/views/configuration.discovery.edit.php:140
 #: app/views/js/administration.audit.settings.edit.js.php:45
@@ -1784,8 +1785,8 @@ msgstr "回呼"
 #: app/views/monitoring.dashboard.view.php:143
 #: app/views/popup.import.compare.php:162
 #: include/classes/html/CButtonCancel.php:25
-#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:195
-#: jsLoader.php:205 jsLoader.php:308 jsLoader.php:380
+#: include/classes/setup/CSetupWizard.php:130 jsLoader.php:176
+#: jsLoader.php:186 jsLoader.php:289 jsLoader.php:361
 msgid "Cancel"
 msgstr "取消"
 
@@ -1815,7 +1816,7 @@ msgstr "無法新增操作"
 msgid "Cannot add correlation"
 msgstr ""
 
-#: jsLoader.php:145
+#: jsLoader.php:126
 #, c-format
 msgid "Cannot add dashboard page: maximum number of %1$d dashboard pages has been added."
 msgstr ""
@@ -1825,7 +1826,7 @@ msgstr ""
 msgid "Cannot add dependency from a host to a template."
 msgstr "無法新增自主機到模板的相依關係"
 
-#: include/classes/api/services/CDiscoveryRule.php:889
+#: include/classes/api/services/CDiscoveryRule.php:885
 #: include/triggers.inc.php:371
 #, c-format
 msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"."
@@ -1856,8 +1857,8 @@ msgid "Cannot add host prototype"
 msgstr ""
 
 #: app/controllers/CControllerImageCreate.php:41
-#: app/controllers/CControllerImageCreate.php:107
-#: app/controllers/CControllerImageCreate.php:131
+#: app/controllers/CControllerImageCreate.php:101
+#: app/controllers/CControllerImageCreate.php:132
 msgid "Cannot add image"
 msgstr "無法新增圖片"
 
@@ -1948,15 +1949,15 @@ msgstr "無法新增用户"
 msgid "Cannot add user group"
 msgstr ""
 
-#: httpconf.php:228
+#: httpconf.php:200
 msgid "Cannot add web scenario"
 msgstr "無法新增網頁檢測"
 
-#: jsLoader.php:146
+#: jsLoader.php:127
 msgid "Cannot add widget: not enough free space on the dashboard."
 msgstr ""
 
-#: jsLoader.php:319
+#: jsLoader.php:300
 msgctxt "screen reader"
 msgid "Cannot be removed"
 msgstr ""
@@ -1976,33 +1977,29 @@ msgstr ""
 msgid "Cannot build expression tree: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:773
+#: include/classes/api/services/CRole.php:792
 msgid "Cannot change the user type of own role."
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:962
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "Cannot clear history"
 msgstr "無法清除歷史"
 
-#: items.php:1070
-msgid "Cannot clear history: at least one of the selected items doesn't belong to any monitored host"
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:2514
+#: include/classes/api/services/CDiscoveryRule.php:2510
 msgid "Cannot clone graph prototypes."
 msgstr "無法克隆圖形原型"
 
-#: include/classes/api/services/CDiscoveryRule.php:2570
+#: include/classes/api/services/CDiscoveryRule.php:2566
 msgid "Cannot clone host prototypes."
 msgstr "無法複製原型主機"
 
-#: include/classes/api/services/CDiscoveryRule.php:2317
-#: include/classes/api/services/CDiscoveryRule.php:2373
-#: include/classes/api/services/CDiscoveryRule.php:2391
+#: include/classes/api/services/CDiscoveryRule.php:2313
+#: include/classes/api/services/CDiscoveryRule.php:2369
+#: include/classes/api/services/CDiscoveryRule.php:2387
 msgid "Cannot clone item prototypes."
 msgstr "無法克隆項目原型"
 
-#: include/classes/api/services/CDiscoveryRule.php:802
+#: include/classes/api/services/CDiscoveryRule.php:798
 msgid "Cannot clone trigger prototypes."
 msgstr "無法克隆觸發器原型"
 
@@ -2028,7 +2025,7 @@ msgid "Cannot copy graph"
 msgid_plural "Cannot copy graphs"
 msgstr[0] ""
 
-#: items.php:1054
+#: items.php:1022
 msgid "Cannot copy item"
 msgid_plural "Cannot copy items"
 msgstr[0] ""
@@ -2078,8 +2075,8 @@ msgstr "無法創建圖示對應"
 msgid "Cannot create scheduled report"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1803
-#: include/classes/api/services/CService.php:1827
+#: include/classes/api/services/CService.php:2324
+#: include/classes/api/services/CService.php:2348
 #, c-format
 msgid "Cannot create service \"%1$s\": %2$s."
 msgstr ""
@@ -2107,7 +2104,7 @@ msgstr "無法刪除Zabbix內部用戶 \"%1$s\", 試試停用那用戶."
 msgid "Cannot delete action"
 msgstr "無法删除動作"
 
-#: include/classes/api/services/CRole.php:357
+#: include/classes/api/services/CRole.php:375
 #, c-format
 msgid "Cannot delete assigned user role \"%1$s\"."
 msgstr ""
@@ -2170,7 +2167,7 @@ msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one
 msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group."
 msgstr[0] ""
 
-#: include/classes/api/services/CHostGroup.php:1598
+#: include/classes/api/services/CHostGroup.php:826
 #, c-format
 msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group."
 msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group."
@@ -2180,11 +2177,11 @@ msgstr[0] ""
 msgid "Cannot delete host prototypes"
 msgstr "無法刪除數筆原型主機"
 
-#: app/controllers/CControllerIconMapDelete.php:64
+#: app/controllers/CControllerIconMapDelete.php:65
 msgid "Cannot delete icon map"
 msgstr "無法刪除圖示對應"
 
-#: app/controllers/CControllerImageDelete.php:69
+#: app/controllers/CControllerImageDelete.php:71
 msgid "Cannot delete image"
 msgstr "無法删除圖片"
 
@@ -2209,7 +2206,7 @@ msgstr "無法刪除原型項目"
 msgid "Cannot delete item prototypes"
 msgstr "無法刪除數筆原型項目"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Cannot delete items"
 msgstr "無法刪除項目"
 
@@ -2237,7 +2234,7 @@ msgid "Cannot delete proxy"
 msgid_plural "Cannot delete proxies"
 msgstr[0] "無法刪除系統代理程式"
 
-#: include/classes/api/services/CRole.php:351
+#: include/classes/api/services/CRole.php:369
 #, c-format
 msgid "Cannot delete readonly user role \"%1$s\"."
 msgstr ""
@@ -2257,7 +2254,7 @@ msgid "Cannot delete script"
 msgid_plural "Cannot delete scripts"
 msgstr[0] "無法删除脚本"
 
-#: include/classes/api/services/CScript.php:999
+#: include/classes/api/services/CScript.php:875
 #, c-format
 msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
 msgstr "無法刪除腳本. 腳本 \"%1$s\" 用於動作操作\"%2$s\"."
@@ -2272,8 +2269,8 @@ msgid "Cannot delete service"
 msgid_plural "Cannot delete services"
 msgstr[0] "無法删除服務"
 
-#: include/classes/api/services/CService.php:464
-#: include/classes/api/services/CService.php:479
+#: include/classes/api/services/CService.php:485
+#: include/classes/api/services/CService.php:500
 #, c-format
 msgid "Cannot delete service \"%1$s\": %2$s."
 msgstr ""
@@ -2302,7 +2299,7 @@ msgstr ""
 msgid "Cannot delete templated item."
 msgstr "無法刪除樣本項目."
 
-#: include/classes/api/services/CDiscoveryRule.php:585
+#: include/classes/api/services/CDiscoveryRule.php:581
 msgid "Cannot delete templated items."
 msgstr "無法刪除模板項目."
 
@@ -2352,7 +2349,7 @@ msgid "Cannot delete user role"
 msgid_plural "Cannot delete user roles"
 msgstr[0] ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Cannot delete web scenario"
 msgstr "無法刪除網頁檢測"
 
@@ -2382,7 +2379,7 @@ msgid "Cannot disable host"
 msgid_plural "Cannot disable hosts"
 msgstr[0] "無法停用主機"
 
-#: items.php:1014
+#: items.php:982
 msgid "Cannot disable item"
 msgid_plural "Cannot disable items"
 msgstr[0] "無法停用項目"
@@ -2409,7 +2406,7 @@ msgid "Cannot disable trigger"
 msgid_plural "Cannot disable triggers"
 msgstr[0] "無法停用觸發器"
 
-#: httpconf.php:446
+#: httpconf.php:418
 msgid "Cannot disable web scenario"
 msgid_plural "Cannot disable web scenarios"
 msgstr[0] "無法停用網頁檢測"
@@ -2450,7 +2447,7 @@ msgid "Cannot enable host"
 msgid_plural "Cannot enable hosts"
 msgstr[0] "無法啟用數筆主機"
 
-#: items.php:1013
+#: items.php:981
 msgid "Cannot enable item"
 msgid_plural "Cannot enable items"
 msgstr[0] "無法啟用項目"
@@ -2477,7 +2474,7 @@ msgid "Cannot enable trigger"
 msgid_plural "Cannot enable triggers"
 msgstr[0] "無法啟用觸發器"
 
-#: httpconf.php:445
+#: httpconf.php:417
 msgid "Cannot enable web scenario"
 msgid_plural "Cannot enable web scenarios"
 msgstr[0] "無法啟用網頁檢測"
@@ -2490,7 +2487,7 @@ msgstr ""
 msgid "Cannot execute script."
 msgstr ""
 
-#: jsLoader.php:275
+#: jsLoader.php:256
 msgid "Cannot expand macros."
 msgstr ""
 
@@ -2524,8 +2521,8 @@ msgstr "無法找到用在拓墣圖\"%2$s\"中的主機\"%1$s\"."
 msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2146
-#: include/classes/api/services/CDiscoveryRule.php:2350
+#: include/classes/api/services/CDiscoveryRule.php:2142
+#: include/classes/api/services/CDiscoveryRule.php:2346
 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:526
 #: include/items.inc.php:701
 #, c-format
@@ -2623,24 +2620,20 @@ msgstr ""
 msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"."
 msgstr ""
 
-#: srv_status.php:179
-msgid "Cannot format tree. Check logic structure in service links."
-msgstr ""
-
 #: include/classes/api/services/CTemplate.php:971
 msgid "Cannot have empty visible template name."
 msgstr "範本的可見名稱不可為空白"
 
-#: include/classes/api/services/CRole.php:574
-#: include/classes/api/services/CRole.php:591
-#: include/classes/api/services/CRole.php:647
-#: include/classes/api/services/CRole.php:664
+#: include/classes/api/services/CRole.php:590
+#: include/classes/api/services/CRole.php:607
+#: include/classes/api/services/CRole.php:666
+#: include/classes/api/services/CRole.php:683
 #, c-format
 msgid "Cannot have non-default \"%2$s\" rule while having \"%3$s\" set to %4$d for user role \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:553
-#: include/classes/api/services/CRole.php:626
+#: include/classes/api/services/CRole.php:569
+#: include/classes/api/services/CRole.php:645
 #, c-format
 msgid "Cannot have non-empty tag value while having empty tag in rule \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -2652,7 +2645,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
 msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
 msgstr[0] ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1472
+#: app/controllers/CControllerPopupTriggerExpr.php:1479
 msgid "Cannot insert trigger expression"
 msgstr "無法插入觸發器表示式"
 
@@ -2666,7 +2659,7 @@ msgid "Cannot link template."
 msgstr "無法連結範本"
 
 #: app/controllers/CControllerModuleEdit.php:106
-#: include/classes/core/ZBase.php:700
+#: include/classes/core/ZBase.php:665
 #, c-format
 msgid "Cannot load module at: %1$s."
 msgid_plural "Cannot load modules at: %1$s."
@@ -2697,17 +2690,17 @@ msgstr "無法大量更新範本的可見名稱"
 msgid "Cannot pass duplicate template IDs for the linkage: %1$s."
 msgstr ""
 
-#: include/classes/db/DB.php:929
+#: include/classes/db/DB.php:958
 #, c-format
 msgid "Cannot perform delete statement on table \"%1$s\" without where condition."
 msgstr "不能完成沒有where條件的刪除(delete)陳述式於資料表 \"%1$s\" 上."
 
-#: include/classes/db/DB.php:642
+#: include/classes/db/DB.php:671
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without values."
 msgstr "不能完成沒有值的更新(update)陳述式於資料表 \"%1$s\" 上."
 
-#: include/classes/db/DB.php:655
+#: include/classes/db/DB.php:684
 #, c-format
 msgid "Cannot perform update statement on table \"%1$s\" without where condition."
 msgstr "不能完成沒有條件的更新(update)陳述式於資料表 \"%1$s\" 上."
@@ -2734,7 +2727,7 @@ msgstr ""
 msgid "Cannot read the response, check connection with the Zabbix server \"%1$s\"."
 msgstr "無法讀取回應，請檢查跟Zabbix主機 \"%1$s\" 的連線"
 
-#: include/classes/api/services/CUser.php:550
+#: include/classes/api/services/CUser.php:556
 msgid "Cannot rename guest user."
 msgstr "無法重新命名訪客用戶."
 
@@ -2753,7 +2746,7 @@ msgstr ""
 msgid "Cannot send command, check connection with Zabbix server \"%1$s\"."
 msgstr "無法傳送指令，請檢查跟Zabbix主機 \"%1$s\" 的連線"
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Cannot send request"
 msgstr ""
 
@@ -2793,12 +2786,12 @@ msgstr ""
 msgid "Cannot set session cookie."
 msgstr ""
 
-#: include/classes/api/services/CService.php:815
+#: include/classes/api/services/CService.php:1324
 #, c-format
 msgid "Cannot specify \"propagation_rule\" parameter without specifying \"propagation_value\" parameter for service \"%1$s\"."
 msgstr ""
 
-#: jsLoader.php:283
+#: jsLoader.php:264
 msgid "Cannot support notification audio for this device."
 msgstr ""
 
@@ -2816,7 +2809,7 @@ msgid "Cannot unblock user"
 msgid_plural "Cannot unblock users"
 msgstr[0] ""
 
-#: include/classes/api/services/CHostGeneral.php:590
+#: include/classes/api/services/CHostGeneral.php:620
 msgid "Cannot unlink and clear Web scenarios."
 msgstr ""
 
@@ -2829,7 +2822,7 @@ msgstr "無法斷連模板"
 msgid "Cannot unlink template."
 msgstr ""
 
-#: include/classes/api/services/CHostGeneral.php:271
+#: include/classes/api/services/CHostGeneral.php:301
 #, c-format
 msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
 msgstr ""
@@ -2882,11 +2875,6 @@ msgstr ""
 msgid "Cannot update \"%2$s\" for a discovered trigger \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:519
-#, c-format
-msgid "Cannot update \"imagetype\" for image \"%1$s\"."
-msgstr ""
-
 #: app/controllers/CControllerTokenUpdate.php:47
 #: app/controllers/CControllerTokenUpdate.php:122
 msgid "Cannot update API token"
@@ -2896,8 +2884,9 @@ msgstr ""
 msgid "Cannot update a discovered graph."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:886
-msgid "Cannot update a discovered host group."
+#: include/classes/api/services/CHostGroup.php:792
+#, c-format
+msgid "Cannot update a discovered host group \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CHttpTest.php:514
@@ -2956,9 +2945,7 @@ msgstr ""
 msgid "Cannot update group"
 msgstr "無法更新群組"
 
-#: include/classes/api/services/CHostGroup.php:1092
-#: include/classes/api/services/CHostGroup.php:1196
-#: include/classes/api/services/CHostGroup.php:1332
+#: include/classes/api/services/CHostGroup.php:1314
 #, c-format
 msgid "Cannot update groups for discovered host \"%1$s\"."
 msgstr ""
@@ -2980,13 +2967,13 @@ msgstr[0] ""
 msgid "Cannot update hosts"
 msgstr "無法更新主機"
 
-#: app/controllers/CControllerIconMapUpdate.php:77
+#: app/controllers/CControllerIconMapUpdate.php:73
 msgid "Cannot update icon map"
 msgstr "無法更新圖示對應"
 
 #: app/controllers/CControllerImageUpdate.php:43
-#: app/controllers/CControllerImageUpdate.php:110
-#: app/controllers/CControllerImageUpdate.php:144
+#: app/controllers/CControllerImageUpdate.php:111
+#: app/controllers/CControllerImageUpdate.php:157
 msgid "Cannot update image"
 msgstr "無法更新圖片"
 
@@ -3039,12 +3026,12 @@ msgstr "無法更新網路拓墣圖"
 msgid "Cannot update proxy"
 msgstr "無法更新系統代理程式"
 
-#: include/classes/api/services/CProxy.php:629
+#: include/classes/api/services/CProxy.php:654
 #, c-format
 msgid "Cannot update proxy for discovered host \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:756
+#: include/classes/api/services/CRole.php:775
 #, c-format
 msgid "Cannot update readonly user role \"%1$s\"."
 msgstr ""
@@ -3064,17 +3051,17 @@ msgstr ""
 msgid "Cannot update script"
 msgstr "無法更新脚本"
 
-#: include/classes/api/services/CScript.php:602
-#: include/classes/api/services/CScript.php:615
-#: include/classes/api/services/CScript.php:628
+#: include/classes/api/services/CScript.php:417
+#: include/classes/api/services/CScript.php:430
+#: include/classes/api/services/CScript.php:443
 #, c-format
 msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CService.php:1740
-#: include/classes/api/services/CService.php:1802
-#: include/classes/api/services/CService.php:1826
-#: include/classes/api/services/CService.php:1861
+#: include/classes/api/services/CService.php:2261
+#: include/classes/api/services/CService.php:2323
+#: include/classes/api/services/CService.php:2347
+#: include/classes/api/services/CService.php:2382
 #, c-format
 msgid "Cannot update service \"%1$s\": %2$s."
 msgstr ""
@@ -3147,7 +3134,7 @@ msgstr[0] ""
 msgid "Cannot update user role"
 msgstr ""
 
-#: httpconf.php:224
+#: httpconf.php:196
 msgid "Cannot update web scenario"
 msgstr ""
 
@@ -3247,8 +3234,8 @@ msgid "Character string not included"
 msgstr "字元字串未包含"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:721
-#: app/controllers/CControllerPopupTriggerExpr.php:907
-#: app/controllers/CControllerPopupTriggerExpr.php:1038
+#: app/controllers/CControllerPopupTriggerExpr.php:914
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
 msgid "Chars"
 msgstr ""
 
@@ -3363,7 +3350,7 @@ msgstr ""
 msgid "Checks should be unique."
 msgstr "檢查必需是唯一的"
 
-#: app/views/popup.service.edit.php:304 app/views/popup.service.edit.php:317
+#: app/views/popup.service.edit.php:342 app/views/popup.service.edit.php:356
 msgid "Child services"
 msgstr ""
 
@@ -3384,7 +3371,7 @@ msgstr "模板中的循環式引用: %1$s."
 msgid "Circular template linkage is not allowed."
 msgstr "循環式模板連結是不允許的."
 
-#: include/classes/core/ZBase.php:526
+#: include/classes/core/ZBase.php:491
 #, c-format
 msgid "Class %1$s not found for action %2$s."
 msgstr ""
@@ -3405,11 +3392,11 @@ msgstr "清除歷史和趨勢"
 msgid "Clear when unlinking"
 msgstr "清除當無連結時"
 
-#: jsLoader.php:162
+#: jsLoader.php:143
 msgid "Click and drag to desired size."
 msgstr ""
 
-#: jsLoader.php:306
+#: jsLoader.php:287
 msgid "Click to view or edit"
 msgstr ""
 
@@ -3424,7 +3411,7 @@ msgstr "Clock"
 #: app/views/administration.regex.edit.php:147
 #: app/views/administration.script.edit.php:284
 #: app/views/administration.userrole.edit.php:362
-#: app/views/configuration.correlation.edit.php:178
+#: app/views/configuration.correlation.edit.php:180
 #: app/views/configuration.discovery.edit.php:155
 #: include/views/configuration.action.edit.php:493
 #: include/views/configuration.graph.edit.php:510
@@ -3439,7 +3426,7 @@ msgstr "Clock"
 #: include/views/configuration.template.edit.php:237
 #: include/views/configuration.trigger.prototype.edit.php:654
 #: include/views/configuration.triggers.edit.php:647
-#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:330
+#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:311
 msgid "Clone"
 msgstr "克隆"
 
@@ -3450,8 +3437,8 @@ msgstr "克隆"
 #: include/views/js/monitoring.sysmaps.js.php:487
 #: include/views/js/monitoring.sysmaps.js.php:611
 #: include/views/js/monitoring.sysmaps.js.php:716
-#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:206
-#: jsLoader.php:285 jsLoader.php:302 jsLoader.php:373
+#: include/views/js/monitoring.sysmaps.js.php:819 jsLoader.php:187
+#: jsLoader.php:266 jsLoader.php:283 jsLoader.php:354
 msgid "Close"
 msgstr "關閉"
 
@@ -3462,13 +3449,13 @@ msgstr "關閉"
 msgid "Close expression constructor"
 msgstr "關閉表示式建構"
 
-#: app/views/configuration.correlation.edit.php:152
-#: include/correlation.inc.php:70
+#: app/views/configuration.correlation.edit.php:154
+#: include/classes/helpers/CCorrelationHelper.php:71
 msgid "Close new event"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:146
-#: include/correlation.inc.php:69
+#: app/views/configuration.correlation.edit.php:148
+#: include/classes/helpers/CCorrelationHelper.php:70
 msgid "Close old events"
 msgstr ""
 
@@ -3481,8 +3468,8 @@ msgid "Close problems"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:55
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:296
-#: jsLoader.php:301
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:277
+#: jsLoader.php:282
 msgid "Collapse"
 msgstr ""
 
@@ -3499,7 +3486,7 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: include/classes/validators/CColorValidator.php:32 jsLoader.php:277
+#: include/classes/validators/CColorValidator.php:32 jsLoader.php:258
 #, c-format
 msgid "Color \"%1$s\" is not correct: expecting hexadecimal color code (6 symbols)."
 msgstr ""
@@ -3565,7 +3552,7 @@ msgstr ""
 msgid "Concurrent sessions"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1495
+#: app/controllers/CControllerPopupTriggerExpr.php:1502
 #: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
 #: app/views/popup.service.statusrule.edit.php:49
 msgid "Condition"
@@ -3576,17 +3563,12 @@ msgstr "條件"
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1273
-#, c-format
-msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1813
+#: include/classes/api/services/CDiscoveryRule.php:1809
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1605
+#: include/classes/api/services/CDiscoveryRule.php:1601
 #, c-format
 msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for override \"%1$s\"."
 msgstr ""
@@ -3596,17 +3578,12 @@ msgstr ""
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for action \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1261
-#, c-format
-msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1812
+#: include/classes/api/services/CDiscoveryRule.php:1808
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1604
+#: include/classes/api/services/CDiscoveryRule.php:1600
 #, c-format
 msgid "Condition \"%2$s\" used in formula \"%3$s\" for override \"%1$s\" is not defined."
 msgstr ""
@@ -3622,7 +3599,7 @@ msgstr "條件"
 #: app/views/search.php:37 app/views/search.php:195 app/views/search.php:275
 #: include/classes/helpers/CMenuHelper.php:221
 #: include/classes/helpers/CRoleHelper.php:283
-#: include/views/inventory.host.view.php:222 jsLoader.php:329
+#: include/views/inventory.host.view.php:222 jsLoader.php:310
 msgid "Configuration"
 msgstr "組態"
 
@@ -3685,7 +3662,7 @@ msgstr "主機的組態"
 msgid "Configuration of housekeeping"
 msgstr ""
 
-#: app/controllers/CControllerIconMapEdit.php:106
+#: app/controllers/CControllerIconMapEdit.php:98
 #: app/controllers/CControllerIconMapList.php:75
 msgid "Configuration of icon mapping"
 msgstr "圖示對應的組態"
@@ -3792,7 +3769,7 @@ msgstr "確認文字"
 msgid "Congratulations! You have successfully installed Zabbix frontend."
 msgstr ""
 
-#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1302
+#: app/views/administration.proxy.edit.php:50 include/hosts.inc.php:1235
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:771
 msgid "Connect to"
@@ -3885,7 +3862,7 @@ msgstr "聯絡"
 #: app/partials/monitoring.host.filter.php:197
 #: app/partials/monitoring.problem.filter.php:178
 #: app/partials/monitoring.problem.filter.php:360
-#: app/views/popup.service.edit.php:89
+#: app/views/popup.service.edit.php:95
 #: include/classes/helpers/CTagFilterFieldHelper.php:69
 #: include/classes/helpers/CTagFilterFieldHelper.php:124
 #: include/classes/widgets/CWidgetHelper.php:491
@@ -3945,7 +3922,7 @@ msgstr ""
 #: include/views/monitoring.overview.items.php:88
 #: include/views/monitoring.overview.triggers.php:124
 #: include/views/monitoring.sysmap.list.php:39 report2.php:175
-#: srv_status.php:173 tr_events.php:207
+#: tr_events.php:207
 msgid "Content controls"
 msgstr ""
 
@@ -3984,8 +3961,8 @@ msgstr "座標"
 #: include/views/configuration.copy.elements.php:77
 #: include/views/configuration.graph.list.php:238
 #: include/views/configuration.item.list.php:307
-#: include/views/configuration.triggers.list.php:343 jsLoader.php:147
-#: jsLoader.php:173 jsLoader.php:269
+#: include/views/configuration.triggers.list.php:343 jsLoader.php:128
+#: jsLoader.php:154 jsLoader.php:250
 msgid "Copy"
 msgstr "複製"
 
@@ -3994,12 +3971,11 @@ msgstr "複製"
 msgid "Copy to clipboard"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:164
+#: app/views/configuration.correlation.edit.php:166
 msgid "Correlation"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:569
-#: include/classes/api/services/CCorrelation.php:765
+#: include/classes/api/services/CCorrelation.php:536
 #, c-format
 msgid "Correlation \"%1$s\" already exists."
 msgstr ""
@@ -4023,16 +3999,6 @@ msgid "Correlation enabled"
 msgid_plural "Correlations enabled"
 msgstr[0] ""
 
-#: include/classes/api/services/CCorrelation.php:539
-#, c-format
-msgid "Correlation is missing parameters: %1$s"
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:548
-#: include/classes/api/services/CCorrelation.php:734
-msgid "Correlation name cannot be empty."
-msgstr ""
-
 #: include/events.inc.php:228
 msgid "Correlation rule"
 msgstr ""
@@ -4041,14 +4007,10 @@ msgstr ""
 msgid "Correlation updated"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:341
-msgid "Could not save image!"
-msgstr "不能儲存圖片!"
-
 #: app/controllers/CControllerPopupTriggerExpr.php:51
 #: app/controllers/CControllerPopupTriggerExpr.php:667
-#: app/controllers/CControllerPopupTriggerExpr.php:850
-#: app/controllers/CControllerPopupTriggerExpr.php:881
+#: app/controllers/CControllerPopupTriggerExpr.php:857
+#: app/controllers/CControllerPopupTriggerExpr.php:888
 msgid "Count"
 msgstr "計數"
 
@@ -4112,11 +4074,11 @@ msgstr ""
 msgid "Create dashboard"
 msgstr ""
 
-#: jsLoader.php:334
+#: jsLoader.php:315
 msgid "Create dependent discovery rule"
 msgstr ""
 
-#: jsLoader.php:333
+#: jsLoader.php:314
 msgid "Create dependent item"
 msgstr ""
 
@@ -4233,7 +4195,7 @@ msgstr "創建拓墣圖"
 msgid "Create media type"
 msgstr "創建示警媒介類型"
 
-#: app/views/popup.import.php:130 jsLoader.php:331
+#: app/views/popup.import.php:130 jsLoader.php:312
 msgid "Create new"
 msgstr ""
 
@@ -4257,7 +4219,7 @@ msgstr ""
 msgid "Create template"
 msgstr "創建模板"
 
-#: include/views/configuration.triggers.list.php:149 jsLoader.php:332
+#: include/views/configuration.triggers.list.php:149 jsLoader.php:313
 msgid "Create trigger"
 msgstr "創建觸發器"
 
@@ -4420,7 +4382,7 @@ msgstr "DNS"
 
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:111
-#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1297
+#: app/views/configuration.discovery.edit.php:124 include/hosts.inc.php:1230
 #: include/views/inventory.host.view.php:79
 msgid "DNS name"
 msgstr "DNS名稱"
@@ -4432,11 +4394,11 @@ msgstr "DNS名稱"
 msgid "Daily"
 msgstr "每日"
 
-#: include/classes/core/ZBase.php:362
+#: include/classes/core/ZBase.php:356
 msgid "Dark"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:213
+#: app/controllers/CControllerAuditLogList.php:214
 #: app/controllers/CControllerDashboardPrint.php:71
 #: app/controllers/CControllerDashboardView.php:138
 #: app/partials/scheduledreport.formgrid.html.php:83
@@ -4457,8 +4419,8 @@ msgstr ""
 msgid "Dashboard \"%1$s\" is used in report \"%2$s\"."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:141
-#: app/controllers/CControllerTemplateDashboardUpdate.php:135
+#: app/controllers/CControllerDashboardUpdate.php:145
+#: app/controllers/CControllerTemplateDashboardUpdate.php:139
 msgid "Dashboard created"
 msgstr ""
 
@@ -4480,9 +4442,9 @@ msgstr ""
 msgid "Dashboard sharing"
 msgstr ""
 
-#: app/controllers/CControllerDashboardShareUpdate.php:89
-#: app/controllers/CControllerDashboardUpdate.php:136
-#: app/controllers/CControllerTemplateDashboardUpdate.php:130
+#: app/controllers/CControllerDashboardShareUpdate.php:94
+#: app/controllers/CControllerDashboardUpdate.php:140
+#: app/controllers/CControllerTemplateDashboardUpdate.php:134
 msgid "Dashboard updated"
 msgstr ""
 
@@ -4506,7 +4468,7 @@ msgstr ""
 #: include/html.inc.php:371 include/views/configuration.template.list.php:121
 #: include/views/configuration.template.list.php:233
 #: include/views/inventory.host.view.php:168
-#: include/views/inventory.host.view.php:172 jsLoader.php:335
+#: include/views/inventory.host.view.php:172 jsLoader.php:316
 msgid "Dashboards"
 msgstr ""
 
@@ -4534,7 +4496,7 @@ msgstr "資料概覽"
 
 #: include/classes/widgets/CWidgetHelper.php:1154
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:34
-#: include/classes/widgets/views/widget.svggraph.form.view.php:290
+#: include/classes/widgets/views/widget.svggraph.form.view.php:291
 msgid "Data set"
 msgstr ""
 
@@ -4676,7 +4638,7 @@ msgstr "週中第幾日"
 msgid "Days"
 msgstr "日數"
 
-#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:364
+#: app/controllers/CControllerPopupMediatypeTestSend.php:172 jsLoader.php:345
 msgid "Debug"
 msgstr "調試"
 
@@ -4690,26 +4652,26 @@ msgstr "調試模式"
 msgid "Dec"
 msgstr "十二"
 
-#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:232
+#: include/func.inc.php:111 include/func.inc.php:248 jsLoader.php:213
 msgid "December"
 msgstr "十二"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:894
-#: app/controllers/CControllerPopupTriggerExpr.php:1051
+#: app/controllers/CControllerPopupTriggerExpr.php:901
+#: app/controllers/CControllerPopupTriggerExpr.php:1058
 msgid "Decimal places"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:148
+#: include/classes/helpers/CServiceHelper.php:150
 msgid "Decrease by"
 msgstr ""
 
 #: app/views/administration.iconmap.edit.php:108
 #: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1312 include/views/configuration.action.edit.php:232
+#: include/hosts.inc.php:1245 include/views/configuration.action.edit.php:232
 #: include/views/inventory.host.view.php:79
 #: include/views/js/monitoring.sysmaps.js.php:145
 #: include/views/js/monitoring.sysmaps.js.php:263
-#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:258
+#: include/views/js/monitoring.sysmaps.js.php:659 jsLoader.php:239
 msgid "Default"
 msgstr "預設"
 
@@ -4802,7 +4764,7 @@ msgstr "延遲因"
 #: app/views/administration.userrole.list.php:127
 #: app/views/administration.user.token.edit.php:92
 #: app/views/administration.user.token.list.php:153
-#: app/views/configuration.correlation.edit.php:179
+#: app/views/configuration.correlation.edit.php:181
 #: app/views/configuration.correlation.list.php:149
 #: app/views/configuration.dashboard.list.php:67
 #: app/views/configuration.discovery.edit.php:156
@@ -4826,8 +4788,8 @@ msgstr "延遲因"
 #: include/views/configuration.template.list.php:283
 #: include/views/configuration.trigger.prototype.list.php:207
 #: include/views/configuration.triggers.list.php:350
-#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:148
-#: jsLoader.php:174 jsLoader.php:336
+#: include/views/monitoring.sysmap.list.php:110 jsLoader.php:129
+#: jsLoader.php:155 jsLoader.php:317
 msgid "Delete"
 msgstr "删除"
 
@@ -4852,11 +4814,11 @@ msgstr "刪除並清除模板? (警告: 所有連結的主機將被清除!)"
 msgid "Delete current action?"
 msgstr "刪除目前的動作?"
 
-#: app/views/configuration.correlation.edit.php:183
+#: app/views/configuration.correlation.edit.php:185
 msgid "Delete current correlation?"
 msgstr ""
 
-#: jsLoader.php:337
+#: jsLoader.php:318
 msgid "Delete dashboard?"
 msgstr ""
 
@@ -4900,7 +4862,7 @@ msgstr ""
 msgid "Delete item?"
 msgstr "刪除項目?"
 
-#: jsLoader.php:274
+#: jsLoader.php:255
 msgid "Delete links between selected elements?"
 msgstr "刪除所選組件間的連結?"
 
@@ -4956,7 +4918,7 @@ msgstr ""
 msgid "Delete selected discovery rules?"
 msgstr "删除所選的探索規則?"
 
-#: jsLoader.php:261
+#: jsLoader.php:242
 msgid "Delete selected elements?"
 msgstr "刪除所選的組件?"
 
@@ -5061,7 +5023,7 @@ msgstr ""
 msgid "Delete selected services?"
 msgstr ""
 
-#: jsLoader.php:262
+#: jsLoader.php:243
 msgid "Delete selected shapes?"
 msgstr ""
 
@@ -5105,7 +5067,7 @@ msgstr "刪除觸發器?"
 msgid "Delete web scenario?"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:356
+#: app/controllers/CControllerAuditLogList.php:357
 msgid "Deleted"
 msgstr ""
 
@@ -5150,7 +5112,7 @@ msgstr ""
 msgid "Dependencies"
 msgstr "相依關係"
 
-#: include/triggers.inc.php:2395
+#: include/triggers.inc.php:2396
 msgid "Dependent"
 msgstr "相依"
 
@@ -5158,7 +5120,7 @@ msgstr "相依"
 msgid "Dependent item"
 msgstr ""
 
-#: app/views/popup.generic.php:303 include/triggers.inc.php:2395
+#: app/views/popup.generic.php:303 include/triggers.inc.php:2396
 #: include/views/configuration.trigger.prototype.list.php:92
 #: include/views/configuration.triggers.list.php:238
 msgid "Depends on"
@@ -5168,7 +5130,7 @@ msgstr "相依於"
 msgid "Deployment status"
 msgstr "佈署狀態"
 
-#: app/controllers/CControllerAuditLogList.php:284
+#: app/controllers/CControllerAuditLogList.php:285
 #: app/partials/hostmacros.list.html.php:37
 #: app/partials/massupdate.macros.tab.php:29
 #: app/partials/scheduledreport.formgrid.html.php:195
@@ -5201,7 +5163,7 @@ msgid "Description"
 msgstr "描述"
 
 #: app/views/administration.mediatype.list.php:82
-#: app/views/js/reports.auditlog.list.js.php:148
+#: app/views/js/reports.auditlog.list.js.php:152
 #: app/views/reports.auditlog.list.php:97
 #: app/views/reports.auditlog.list.php:130 include/blocks.inc.php:525
 #: include/func.inc.php:1601 include/views/configuration.action.edit.php:175
@@ -5367,10 +5329,10 @@ msgstr "停用選取的網頁檢測？"
 #: app/views/popup.massupdate.host.php:102
 #: app/views/popup.massupdate.host.php:187
 #: app/views/reports.scheduledreport.list.php:64 include/discovery.inc.php:108
-#: include/hosts.inc.php:1205 include/html.inc.php:288
+#: include/hosts.inc.php:1138 include/html.inc.php:288
 #: include/httptest.inc.php:48 include/items.inc.php:138
 #: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1868
+#: include/maps.inc.php:325 include/triggers.inc.php:1869
 #: include/users.inc.php:84 include/views/configuration.action.list.php:77
 #: include/views/configuration.action.list.php:129
 #: include/views/configuration.host.discovery.list.php:167
@@ -5453,7 +5415,7 @@ msgid "Discovery by proxy"
 msgstr "由系統代理程式探索"
 
 #: app/controllers/CControllerPopupDiscoveryCheck.php:109
-#: app/views/popup.condition.common.php:421 include/actions.inc.php:53
+#: app/views/popup.condition.common.php:420 include/actions.inc.php:53
 msgid "Discovery check"
 msgstr "探索檢查"
 
@@ -5465,7 +5427,7 @@ msgstr "探索檢查"
 msgid "Discovery list"
 msgstr "探索清單"
 
-#: app/views/popup.condition.common.php:439 include/actions.inc.php:54
+#: app/views/popup.condition.common.php:438 include/actions.inc.php:54
 msgid "Discovery object"
 msgstr "探索物件"
 
@@ -5497,7 +5459,7 @@ msgstr ""
 msgid "Discovery of VMware virtual machines, <url> - VMware service URL. Returns JSON"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:214
+#: app/controllers/CControllerAuditLogList.php:215
 #: app/views/configuration.discovery.edit.php:137
 #: app/views/monitoring.discovery.view.php:50
 #: app/views/monitoring.widget.discovery.view.php:32
@@ -5505,12 +5467,12 @@ msgstr ""
 msgid "Discovery rule"
 msgstr "探索規則"
 
-#: include/classes/api/services/CDiscoveryRule.php:64
+#: include/classes/api/services/CDiscoveryRule.php:60
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template."
 msgstr "探索規則 \"%1$s\"已存在於 \"%2$s\",繼承自其它的模板."
 
-#: include/classes/api/services/CDiscoveryRule.php:65
+#: include/classes/api/services/CDiscoveryRule.php:61
 #, c-format
 msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"."
 msgstr ""
@@ -5523,7 +5485,7 @@ msgstr ""
 msgid "Discovery rule \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:2165
+#: include/classes/api/services/CDiscoveryRule.php:2161
 #, c-format
 msgid "Discovery rule \"%1$s\" cannot be copied without its master item."
 msgstr ""
@@ -5562,7 +5524,7 @@ msgstr "探索規則已更新"
 #: app/controllers/CControllerPopupImportCompare.php:169
 #: app/views/configuration.discovery.edit.php:29
 #: app/views/configuration.discovery.list.php:31
-#: app/views/popup.condition.common.php:469 app/views/popup.import.php:36
+#: app/views/popup.condition.common.php:468 app/views/popup.import.php:36
 #: include/html.inc.php:386
 #: include/views/configuration.host.discovery.edit.php:27
 #: include/views/configuration.host.discovery.list.php:29
@@ -5573,7 +5535,7 @@ msgstr "探索規則"
 msgid "Discovery rules deleted"
 msgstr "探索規則已删除"
 
-#: app/views/popup.condition.common.php:489 include/actions.inc.php:58
+#: app/views/popup.condition.common.php:488 include/actions.inc.php:58
 #: include/classes/widgets/CWidgetConfig.php:48
 msgid "Discovery status"
 msgstr "探索狀態"
@@ -5610,10 +5572,11 @@ msgid "Display stacked graph"
 msgstr "顯示重疊圖表"
 
 #: app/controllers/CControllerHintboxActionlist.php:93
-#: app/views/administration.queue.details.php:85 app/views/search.php:184
+#: app/views/administration.queue.details.php:85
+#: app/views/js/popup.service.edit.js.php:468 app/views/search.php:184
 #: app/views/search.php:268 app/views/search.php:367
 #: include/actions.inc.php:1724 include/actions.inc.php:1796
-#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:376
+#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:357
 #, c-format
 msgid "Displaying %1$s of %2$s found"
 msgstr "顯示 已探索的 %2$s中的%1$s"
@@ -5623,7 +5586,7 @@ msgstr "顯示 已探索的 %2$s中的%1$s"
 msgid "Displaying %1$s to %2$s of %3$s found"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:291
+#: include/classes/widgets/views/widget.svggraph.form.view.php:292
 msgid "Displaying options"
 msgstr ""
 
@@ -5645,7 +5608,7 @@ msgstr ""
 msgid "Do not keep trends"
 msgstr ""
 
-#: jsLoader.php:214 jsLoader.php:338
+#: jsLoader.php:195 jsLoader.php:319
 msgid "Do you wish to replace the conditional expression?"
 msgstr "您想要替換條件式表示式嗎?"
 
@@ -5701,7 +5664,7 @@ msgctxt "discovery status"
 msgid "Down"
 msgstr "下"
 
-#: jsLoader.php:188 jsLoader.php:202
+#: jsLoader.php:169 jsLoader.php:183
 msgid "Download image"
 msgstr ""
 
@@ -5709,7 +5672,7 @@ msgstr ""
 msgid "Download the configuration file"
 msgstr ""
 
-#: app/partials/service.time.row.php:34
+#: app/views/js/popup.service.edit.js.php:227
 #: app/views/popup.service.time.edit.php:47
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Downtime"
@@ -5728,18 +5691,6 @@ msgstr ""
 msgid "Draw style"
 msgstr "繪圖風格"
 
-#: include/classes/api/services/CCorrelation.php:1176
-#: include/classes/api/services/CCorrelation.php:1328
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:556
-#: include/classes/api/services/CCorrelation.php:749
-#, c-format
-msgid "Duplicate \"%1$s\" value \"%2$s\" for correlation."
-msgstr ""
-
 #: include/classes/api/services/CMap.php:614
 #: include/classes/api/services/CMap.php:1076
 #, c-format
@@ -5752,11 +5703,6 @@ msgstr ""
 msgid "Duplicate \"usrgrpid\" \"%1$s\" in user groups for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1191
-#, c-format
-msgid "Duplicate conditions for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CTrigger.php:1142
 #, c-format
 msgid "Duplicate dependencies in trigger \"%1$s\"."
@@ -5808,7 +5754,7 @@ msgstr "動態監控項"
 msgid "Dynamic items"
 msgstr ""
 
-#: jsLoader.php:273
+#: jsLoader.php:254
 msgid "Each URL should have a unique name. Please make sure there is only one URL named"
 msgstr "每個URL必須是唯一的. 請確保僅有一個URL為名."
 
@@ -5817,11 +5763,11 @@ msgid "Each item"
 msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:127
-#: app/partials/service.statusrule.row.php:38
-#: app/partials/service.time.row.php:59
 #: app/views/administration.user.edit.php:357
 #: app/views/js/administration.mediatype.edit.js.php:50
 #: app/views/js/configuration.discovery.edit.js.php:33
+#: app/views/js/popup.service.edit.js.php:191
+#: app/views/js/popup.service.edit.js.php:215
 #: app/views/monitoring.service.list.edit.php:145
 #: app/views/monitoring.service.list.php:114
 #: include/views/configuration.action.edit.php:249
@@ -5835,8 +5781,8 @@ msgstr ""
 #: include/views/configuration.triggers.edit.php:350
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:118
 #: include/views/js/monitoring.sysmaps.js.php:836
-#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:175
-#: jsLoader.php:196
+#: include/views/js/monitoring.sysmaps.js.php:851 jsLoader.php:156
+#: jsLoader.php:177
 msgid "Edit"
 msgstr "編輯"
 
@@ -5852,11 +5798,11 @@ msgstr ""
 msgid "Edit operation"
 msgstr ""
 
-#: jsLoader.php:197
+#: jsLoader.php:178
 msgid "Edit tree element"
 msgstr ""
 
-#: jsLoader.php:339
+#: jsLoader.php:320
 msgid "Edit trigger"
 msgstr "編輯觸發器"
 
@@ -5916,21 +5862,17 @@ msgstr ""
 msgid "Empty color."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:706
-msgid "Empty correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2642
 #, c-format
 msgid "Empty filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1840
+#: include/classes/api/services/CDiscoveryRule.php:1836
 #, c-format
 msgid "Empty filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1832
+#: include/classes/api/services/CDiscoveryRule.php:1828
 #, c-format
 msgid "Empty filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
@@ -5946,25 +5888,19 @@ msgid "Empty filter condition type for action \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CCorrelation.php:523
-#: include/classes/api/services/CCorrelation.php:700
 #: include/classes/api/services/CDRule.php:194
 #: include/classes/api/services/CDRule.php:320
-#: include/classes/api/services/CHostGeneral.php:164
+#: include/classes/api/services/CHostGeneral.php:184
 #: include/classes/api/services/CHostInterface.php:584
 #: include/classes/api/services/CHostInterface.php:628
 #: include/classes/api/services/CHost.php:1319
 #: include/classes/api/services/CHost.php:1850
 #: include/classes/api/services/CHost.php:2075
 #: include/classes/api/services/CHostPrototype.php:1109
-#: include/classes/api/services/CImage.php:448
-#: include/classes/api/services/CImage.php:501
 #: include/classes/api/services/CMaintenance.php:542
 #: include/classes/api/services/CMap.php:563
 #: include/classes/api/services/CMap.php:589
 #: include/classes/api/services/CMap.php:1034
-#: include/classes/api/services/CMediatype.php:182
-#: include/classes/api/services/CMediatype.php:448
 #: include/classes/api/services/CTemplate.php:707
 #: include/classes/api/services/CTrigger.php:798
 msgid "Empty input parameter."
@@ -5974,14 +5910,6 @@ msgstr "空的輸入參數."
 msgid "Empty map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:454
-msgid "Empty media type ID."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:360
-msgid "Empty parameters"
-msgstr "空參數"
-
 #: app/views/administration.mediatype.list.php:167
 #: app/views/administration.module.list.php:123
 #: app/views/administration.token.list.php:200
@@ -6147,7 +6075,7 @@ msgstr ""
 #: app/views/administration.user.token.list.php:60
 #: app/views/administration.user.token.list.php:126
 #: app/views/administration.user.token.view.php:55
-#: app/views/configuration.correlation.edit.php:157
+#: app/views/configuration.correlation.edit.php:159
 #: app/views/configuration.correlation.list.php:56
 #: app/views/configuration.correlation.list.php:119
 #: app/views/configuration.discovery.edit.php:131
@@ -6158,7 +6086,7 @@ msgstr ""
 #: include/html.inc.php:284 include/httptest.inc.php:47
 #: include/items.inc.php:138 include/items.inc.php:141
 #: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1865
+#: include/triggers.inc.php:1866
 #: include/views/configuration.action.edit.php:147
 #: include/views/configuration.action.list.php:76
 #: include/views/configuration.action.list.php:137
@@ -6201,7 +6129,7 @@ msgid "English (en_US)"
 msgstr "英語(en_US)"
 
 #: include/classes/api/services/CGraphGeneral.php:646
-#: include/classes/api/services/CHostGroup.php:757
+#: include/classes/api/services/CHostGroup.php:772
 #: include/classes/api/services/CHostPrototype.php:344
 #: include/classes/api/services/CHttpTest.php:390
 #: include/classes/api/services/CItemGeneral.php:634
@@ -6217,7 +6145,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:196
 #: app/partials/monitoring.problem.filter.php:177
 #: app/partials/monitoring.problem.filter.php:359
-#: app/views/popup.service.edit.php:88
+#: app/views/popup.service.edit.php:94
 #: include/classes/helpers/CTagFilterFieldHelper.php:68
 #: include/classes/helpers/CTagFilterFieldHelper.php:123
 #: include/classes/widgets/CWidgetHelper.php:490
@@ -6236,12 +6164,12 @@ msgstr ""
 msgid "Error"
 msgstr "錯誤"
 
-#: include/db.inc.php:509
+#: include/db.inc.php:518
 #, c-format
 msgid "Error in search request for table \"%1$s\"."
 msgstr "資料表搜尋請求 \"%1$s\"的錯誤."
 
-#: include/func.inc.php:1642 jsLoader.php:216
+#: include/func.inc.php:1642 jsLoader.php:197
 msgid "Error message"
 msgstr ""
 
@@ -6268,7 +6196,7 @@ msgstr "事件ID"
 msgid "Event acknowledged"
 msgstr "事件已知悉"
 
-#: app/controllers/CControllerAuditLogList.php:212
+#: app/controllers/CControllerAuditLogList.php:213
 #: app/views/configuration.correlation.list.php:31
 #: include/classes/helpers/CMenuHelper.php:207
 #: include/classes/helpers/CRoleHelper.php:368
@@ -6276,7 +6204,7 @@ msgid "Event correlation"
 msgstr ""
 
 #: app/controllers/CControllerCorrelationEdit.php:114
-#: app/controllers/CControllerCorrelationList.php:130
+#: app/controllers/CControllerCorrelationList.php:128
 #: app/views/configuration.correlation.edit.php:31
 msgid "Event correlation rules"
 msgstr ""
@@ -6311,11 +6239,11 @@ msgstr ""
 msgid "Event name"
 msgstr ""
 
-#: include/correlation.inc.php:52
+#: include/classes/helpers/CCorrelationHelper.php:55
 msgid "Event tag pair"
 msgstr ""
 
-#: app/views/popup.condition.common.php:615 include/actions.inc.php:63
+#: app/views/popup.condition.common.php:614 include/actions.inc.php:63
 msgid "Event type"
 msgstr ""
 
@@ -6359,15 +6287,10 @@ msgstr "除外"
 msgid "Exclude host groups"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:207
+#: app/controllers/CControllerAuditLogList.php:197 jsLoader.php:188
 msgid "Execute"
 msgstr "執行"
 
-#: include/classes/api/services/CImage.php:224
-#, c-format
-msgid "Execute SQL error [%1$s] in [%2$s]."
-msgstr "執行SQL錯誤[%1$s]於[%2$s]."
-
 #: include/classes/items/CHelpItems.php:409
 msgid "Execute WMI query and return the JSON document with all selected objects"
 msgstr ""
@@ -6405,7 +6328,7 @@ msgstr ""
 msgid "Executed script"
 msgstr "已執行的腳本"
 
-#: jsLoader.php:208
+#: jsLoader.php:189
 msgid "Execution confirmation"
 msgstr "執行確認"
 
@@ -6421,8 +6344,8 @@ msgid "Exists"
 msgstr ""
 
 #: include/classes/html/CCollapsibleUiWidget.php:60
-#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:297
-#: jsLoader.php:300
+#: include/classes/widgets/CWidgetHelper.php:982 jsLoader.php:278
+#: jsLoader.php:281
 msgid "Expand"
 msgstr ""
 
@@ -6543,7 +6466,7 @@ msgstr "表示式"
 msgid "External check"
 msgstr "外在檢查"
 
-#: jsLoader.php:244
+#: jsLoader.php:225
 msgctxt "Friday short"
 msgid "F"
 msgstr "F"
@@ -6570,8 +6493,8 @@ msgstr "已失敗"
 msgid "Failed login"
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:142
-#: app/controllers/CControllerTemplateDashboardUpdate.php:136
+#: app/controllers/CControllerDashboardUpdate.php:146
+#: app/controllers/CControllerTemplateDashboardUpdate.php:140
 #: app/views/js/configuration.dashboard.edit.js.php:155
 #: app/views/js/monitoring.dashboard.view.js.php:219
 msgid "Failed to create dashboard"
@@ -6582,26 +6505,26 @@ msgstr ""
 msgid "Failed to parse URL."
 msgstr ""
 
-#: jsLoader.php:149
+#: jsLoader.php:130
 msgid "Failed to paste dashboard page."
 msgstr ""
 
-#: jsLoader.php:150
+#: jsLoader.php:131
 msgid "Failed to paste widget."
 msgstr ""
 
-#: app/controllers/CControllerDashboardUpdate.php:137
-#: app/controllers/CControllerTemplateDashboardUpdate.php:131
+#: app/controllers/CControllerDashboardUpdate.php:141
+#: app/controllers/CControllerTemplateDashboardUpdate.php:135
 #: app/views/js/configuration.dashboard.edit.js.php:156
 #: app/views/js/monitoring.dashboard.view.js.php:220
 msgid "Failed to update dashboard"
 msgstr ""
 
-#: jsLoader.php:151
+#: jsLoader.php:132
 msgid "Failed to update dashboard page properties."
 msgstr ""
 
-#: jsLoader.php:152
+#: jsLoader.php:133
 msgid "Failed to update dashboard properties."
 msgstr ""
 
@@ -6609,7 +6532,7 @@ msgstr ""
 msgid "Failed to update template."
 msgstr ""
 
-#: jsLoader.php:153
+#: jsLoader.php:134
 msgid "Failed to update widget properties."
 msgstr ""
 
@@ -6633,7 +6556,7 @@ msgstr ""
 msgid "Feb"
 msgstr "二月"
 
-#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:222
+#: include/func.inc.php:101 include/func.inc.php:238 jsLoader.php:203
 msgid "February"
 msgstr "二月"
 
@@ -6655,10 +6578,9 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:325
 #: include/classes/api/services/CDRule.php:528
 #: include/classes/api/services/CDRule.php:538
-#: include/classes/api/services/CHostGroup.php:1003
 #: include/classes/api/services/CHost.php:892
 #: include/classes/api/services/CTemplate.php:950
-#: include/classes/validators/CNewValidator.php:262
+#: include/classes/validators/CNewValidator.php:86
 #: include/validate.inc.php:286
 #, c-format
 msgid "Field \"%1$s\" is mandatory."
@@ -6669,13 +6591,6 @@ msgstr ""
 msgid "Field \"%1$s\" is missing a value for map \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:204
-#: include/classes/api/services/CMediatype.php:546
-#: include/classes/api/services/CMediatype.php:1205
-#, c-format
-msgid "Field \"%1$s\" is missing a value for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:175 include/validate.inc.php:183
 #: include/validate.inc.php:189 include/validate.inc.php:193
 #: include/validate.inc.php:213 include/validate.inc.php:221
@@ -6694,11 +6609,6 @@ msgstr ""
 msgid "Field \"%1$s\" is not string."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:1199
-#, c-format
-msgid "Field \"%1$s\" is required for media type \"%2$s\"."
-msgstr ""
-
 #: include/validate.inc.php:298
 #, c-format
 msgid "Field \"%1$s\" must be missing."
@@ -6713,10 +6623,6 @@ msgstr ""
 msgid "File checksum, calculated by the UNIX cksum algorithm. Returns integer for crc32 (default) and string for md5, sha256"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:570
-msgid "File format is unsupported."
-msgstr ""
-
 #: include/classes/import/readers/CYamlImportReader.php:52
 msgid "File is empty"
 msgstr ""
@@ -6781,7 +6687,8 @@ msgstr "填滿的區域"
 #: app/views/monitoring.latest.view.php:54
 #: app/views/monitoring.service.list.edit.php:72
 #: app/views/monitoring.service.list.php:68
-#: app/views/monitoring.web.view.php:49 app/views/reports.auditlog.list.php:85
+#: app/views/monitoring.web.view.php:49 app/views/popup.service.edit.php:328
+#: app/views/popup.services.php:48 app/views/reports.auditlog.list.php:85
 #: app/views/reports.scheduledreport.list.php:48
 #: hostinventoriesoverview.php:157 include/classes/html/CFilter.php:394
 #: include/classes/widgets/forms/CWidgetFormMap.php:56
@@ -6806,7 +6713,7 @@ msgstr "過濾"
 msgid "Filter properties"
 msgstr ""
 
-#: app/controllers/CControllerServiceListGeneral.php:157
+#: app/controllers/CControllerServiceListGeneral.php:181
 msgid "Filter results"
 msgstr ""
 
@@ -6858,7 +6765,7 @@ msgstr "調整至符合拓墣圖"
 msgid "Fixed"
 msgstr "固定的"
 
-#: include/classes/helpers/CServiceHelper.php:150
+#: include/classes/helpers/CServiceHelper.php:152
 msgid "Fixed status"
 msgstr ""
 
@@ -6909,12 +6816,12 @@ msgstr "公式"
 msgid "Formula missing for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1810
+#: include/classes/api/services/CDiscoveryRule.php:1806
 #, c-format
 msgid "Formula missing for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1601
+#: include/classes/api/services/CDiscoveryRule.php:1597
 #, c-format
 msgid "Formula missing for override \"%1$s\"."
 msgstr ""
@@ -6927,7 +6834,7 @@ msgstr "法語 (fr_FR)"
 msgid "Fri"
 msgstr "週五"
 
-#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:237
+#: include/func.inc.php:123 include/func.inc.php:213 jsLoader.php:218
 msgid "Friday"
 msgstr "週五"
 
@@ -7038,7 +6945,7 @@ msgstr ""
 msgid "Given expression is not a macro"
 msgstr "此表示式不是巨集"
 
-#: include/classes/api/services/CIconMap.php:359
+#: include/classes/api/services/CIconMap.php:366
 #, c-format
 msgid "Global regular expression \"%1$s\" does not exist."
 msgstr ""
@@ -7052,7 +6959,7 @@ msgstr ""
 msgid "Go back to %1$s"
 msgstr ""
 
-#: jsLoader.php:344
+#: jsLoader.php:325
 msgid "Go to"
 msgstr "到"
 
@@ -7090,7 +6997,7 @@ msgstr ""
 msgid "Go to previous page, %1$s"
 msgstr ""
 
-#: include/httptest.inc.php:410
+#: include/httptest.inc.php:414
 msgid "Google Chrome"
 msgstr "Google Chrome"
 
@@ -7098,7 +7005,7 @@ msgstr "Google Chrome"
 msgid "Gradient line"
 msgstr "漸層線"
 
-#: app/controllers/CControllerAuditLogList.php:215
+#: app/controllers/CControllerAuditLogList.php:216
 #: app/partials/monitoring.latest.view.html.php:154
 #: app/views/monitoring.charts.view.php:56
 #: include/classes/macros/CMacrosResolverGeneral.php:1044
@@ -7157,7 +7064,7 @@ msgstr[0] ""
 msgid "Graph deleted"
 msgstr "圖形已删除"
 
-#: app/controllers/CControllerAuditLogList.php:216
+#: app/controllers/CControllerAuditLogList.php:217
 #: app/views/popup.lldoperation.php:53
 #: include/classes/widgets/CWidgetConfig.php:52
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:32
@@ -7194,8 +7101,8 @@ msgstr ""
 msgid "Graph prototype updated"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:485
-#: include/classes/api/services/CDashboardGeneral.php:495
+#: include/classes/api/services/CDashboardGeneral.php:525
+#: include/classes/api/services/CDashboardGeneral.php:535
 #, c-format
 msgid "Graph prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -7229,8 +7136,8 @@ msgstr "圖形類別"
 msgid "Graph updated"
 msgstr "圖形已更新"
 
-#: include/classes/api/services/CDashboardGeneral.php:457
-#: include/classes/api/services/CDashboardGeneral.php:464
+#: include/classes/api/services/CDashboardGeneral.php:497
+#: include/classes/api/services/CDashboardGeneral.php:504
 #, c-format
 msgid "Graph with ID \"%1$s\" is not available."
 msgstr ""
@@ -7261,7 +7168,7 @@ msgstr "名為\"%1$s\"的圖形已經存在於圖形或圖形原型中."
 #: include/views/inventory.host.view.php:158
 #: include/views/inventory.host.view.php:166
 #: include/views/inventory.host.view.php:194
-#: include/views/inventory.host.view.php:217 jsLoader.php:345
+#: include/views/inventory.host.view.php:217 jsLoader.php:326
 msgid "Graphs"
 msgstr "圖形"
 
@@ -7282,12 +7189,12 @@ msgstr "網格"
 msgid "Group"
 msgstr "群組"
 
-#: include/classes/api/services/CHostGroup.php:809
+#: include/classes/api/services/CHostGroup.php:650
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:853
+#: include/classes/api/services/CHostGroup.php:700
 #, c-format
 msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition."
 msgstr ""
@@ -7461,11 +7368,11 @@ msgstr "說明"
 msgid "Hexadecimal to decimal"
 msgstr ""
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:251
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:232
 msgid "Hidden"
 msgstr "隱藏的"
 
-#: jsLoader.php:365
+#: jsLoader.php:346
 msgid "Hide debug"
 msgstr ""
 
@@ -7492,11 +7399,11 @@ msgstr ""
 msgid "High"
 msgstr "嚴重"
 
-#: include/classes/core/ZBase.php:364
+#: include/classes/core/ZBase.php:358
 msgid "High-contrast dark"
 msgstr ""
 
-#: include/classes/core/ZBase.php:363
+#: include/classes/core/ZBase.php:357
 msgid "High-contrast light"
 msgstr ""
 
@@ -7517,7 +7424,7 @@ msgstr ""
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:49
 #: include/forms.inc.php:550 include/views/configuration.item.list.php:89
 #: include/views/configuration.item.prototype.list.php:62 items.php:261
-#: jsLoader.php:346
+#: jsLoader.php:327
 msgid "History"
 msgstr "歷史記錄"
 
@@ -7525,11 +7432,15 @@ msgstr "歷史記錄"
 msgid "History and trends compression"
 msgstr ""
 
-#: items.php:959 items.php:1067
+#: include/classes/api/services/CHistory.php:353
 msgid "History cleanup is not supported if compression is enabled"
 msgstr ""
 
-#: httpconf.php:219 httpconf.php:493 items.php:990 items.php:1116
+#: app/controllers/CControllerAuditLogList.php:198
+msgid "History clear"
+msgstr ""
+
+#: httpconf.php:191 httpconf.php:435 items.php:958 items.php:1038
 msgid "History cleared"
 msgstr "歷史已清除"
 
@@ -7572,7 +7483,7 @@ msgstr "横向"
 msgid "Horizontal align"
 msgstr "横向對齊"
 
-#: app/controllers/CControllerAuditLogList.php:217
+#: app/controllers/CControllerAuditLogList.php:218
 #: app/partials/monitoring.latest.view.html.php:40
 #: app/partials/popup.operations.php:175
 #: app/views/administration.queue.details.php:47
@@ -7601,7 +7512,7 @@ msgstr "横向對齊"
 #: include/views/inventory.host.view.php:214
 #: include/views/js/monitoring.sysmaps.js.php:92
 #: include/views/js/monitoring.sysmaps.js.php:161
-#: include/views/reports.toptriggers.php:83 jsLoader.php:253 jsLoader.php:347
+#: include/views/reports.toptriggers.php:83 jsLoader.php:234 jsLoader.php:328
 #: report2.php:507
 #, fuzzy
 msgid "Host"
@@ -7615,7 +7526,7 @@ msgstr[0] "主機"
 msgid "Host \"%1$s\" already exists."
 msgstr "主機 \"%1$s\" 已存在."
 
-#: include/classes/api/services/CHostGroup.php:1561
+#: include/classes/api/services/CHostGroup.php:1347
 #: include/classes/api/services/CHost.php:958
 #: include/classes/api/services/CHost.php:1897
 #: include/classes/api/services/CHost.php:2130
@@ -7623,7 +7534,7 @@ msgstr "主機 \"%1$s\" 已存在."
 msgid "Host \"%1$s\" cannot be without host group."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:430
+#: include/classes/api/services/CProxy.php:448
 #, c-format
 msgid "Host \"%1$s\" is monitored by proxy \"%2$s\"."
 msgstr ""
@@ -7673,7 +7584,7 @@ msgid "Host enabled"
 msgid_plural "Hosts enabled"
 msgstr[0] ""
 
-#: app/controllers/CControllerAuditLogList.php:218
+#: app/controllers/CControllerAuditLogList.php:219
 #: app/partials/administration.usergroup.grouprights.html.php:29
 #: app/partials/administration.usergroup.tagfilters.html.php:29
 #: app/partials/popup.operations.php:183
@@ -7687,22 +7598,22 @@ msgstr[0] ""
 #: include/views/configuration.hostgroups.edit.php:51
 #: include/views/js/monitoring.sysmaps.js.php:95
 #: include/views/js/monitoring.sysmaps.js.php:102
-#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:256
+#: include/views/js/monitoring.sysmaps.js.php:152 jsLoader.php:237
 #: report2.php:398
 msgid "Host group"
 msgstr "主機群組"
 
-#: include/classes/api/services/CHostGroup.php:707
+#: include/classes/api/services/CHostGroup.php:743
 #, c-format
 msgid "Host group \"%1$s\" already exists."
 msgstr "主機群組 \"%1$s\" 已存在."
 
-#: include/classes/api/services/CHostGroup.php:838
+#: include/classes/api/services/CHostGroup.php:686
 #, c-format
 msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script."
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:795
+#: include/classes/api/services/CHostGroup.php:636
 #, c-format
 msgid "Host group \"%1$s\" is internal and cannot be deleted."
 msgstr ""
@@ -7715,10 +7626,10 @@ msgstr "主機群組組件"
 msgid "Host group label type"
 msgstr "主機群組標示類型"
 
-#: include/classes/api/services/CDashboardGeneral.php:515
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CSettings.php:236
-#: include/classes/api/services/CUserGroup.php:455
+#: include/classes/api/services/CDashboardGeneral.php:555
+#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CSettings.php:242
+#: include/classes/api/services/CUserGroup.php:444
 #, c-format
 msgid "Host group with ID \"%1$s\" is not available."
 msgstr ""
@@ -7734,8 +7645,8 @@ msgstr ""
 #: app/partials/popup.operations.php:199
 #: app/views/monitoring.latest.view.php:56
 #: app/views/monitoring.web.view.php:51
-#: app/views/popup.condition.common.php:102
-#: app/views/popup.condition.common.php:283
+#: app/views/popup.condition.common.php:101
+#: app/views/popup.condition.common.php:282
 #: app/views/popup.massupdate.host.php:46
 #: app/views/popup.massupdate.template.php:48 app/views/search.php:266
 #: hostinventoriesoverview.php:160 include/classes/helpers/CMenuHelper.php:150
@@ -7809,7 +7720,7 @@ msgstr "主機名稱"
 msgid "Host networks"
 msgstr "主機網路"
 
-#: app/controllers/CControllerAuditLogList.php:219
+#: app/controllers/CControllerAuditLogList.php:220
 #: app/views/popup.lldoperation.php:54
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:168
 msgid "Host prototype"
@@ -7888,7 +7799,7 @@ msgstr "主機更新失敗."
 msgid "Host updated"
 msgstr "主機已更新"
 
-#: include/classes/api/services/CDashboardGeneral.php:532
+#: include/classes/api/services/CDashboardGeneral.php:572
 #, c-format
 msgid "Host with ID \"%1$s\" is not available."
 msgstr ""
@@ -7908,7 +7819,7 @@ msgstr ""
 msgid "Host with the same visible name \"%1$s\" already exists."
 msgstr ""
 
-#: app/controllers/CControllerHostView.php:122
+#: app/controllers/CControllerHostView.php:123
 #: app/controllers/CControllerPopupGeneric.php:123
 #: app/controllers/CControllerPopupGeneric.php:147
 #: app/partials/common.filter.item.php:46
@@ -7921,7 +7832,7 @@ msgstr ""
 #: app/views/monitoring.host.view.php:39
 #: app/views/monitoring.latest.view.php:73
 #: app/views/monitoring.web.view.php:70
-#: app/views/popup.condition.common.php:252 app/views/popup.import.php:30
+#: app/views/popup.condition.common.php:251 app/views/popup.import.php:30
 #: app/views/search.php:182 app/views/search.php:210 app/views/search.php:214
 #: include/classes/helpers/CMenuHelper.php:44
 #: include/classes/helpers/CMenuHelper.php:96
@@ -7969,7 +7880,7 @@ msgstr "主機已更新"
 msgid "Hours"
 msgstr "時"
 
-#: app/controllers/CControllerAuditLogList.php:220
+#: app/controllers/CControllerAuditLogList.php:221
 #: app/views/administration.housekeeping.edit.php:29
 #: app/views/administration.housekeeping.edit.php:184
 #: include/classes/helpers/CMenuHelper.php:236 include/html.inc.php:884
@@ -8009,7 +7920,7 @@ msgstr "IP地址"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/configuration.discovery.edit.php:100
 #: app/views/configuration.discovery.edit.php:112
-#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1292
+#: app/views/configuration.discovery.edit.php:125 include/hosts.inc.php:1225
 #: include/maps.inc.php:46 include/views/inventory.host.view.php:79
 msgid "IP address"
 msgstr "IP地址"
@@ -8034,7 +7945,7 @@ msgstr ""
 #: app/views/monitoring.widget.hostavail.view.php:30
 #: app/views/popup.massupdate.host.php:292
 #: include/classes/widgets/views/widget.hostavail.form.view.php:49
-#: include/hosts.inc.php:471 include/hosts.inc.php:1273
+#: include/hosts.inc.php:471 include/hosts.inc.php:1206
 #: include/items.inc.php:350 include/views/configuration.host.edit.php:337
 #: include/views/configuration.host.prototype.edit.php:325
 #: include/views/js/configuration.host.edit.js.php:178
@@ -8091,12 +8002,12 @@ msgstr "圖示標記"
 msgid "Icon map"
 msgstr "圖示對應"
 
-#: include/classes/api/services/CIconMap.php:318
+#: include/classes/api/services/CIconMap.php:323
 #, c-format
 msgid "Icon map \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CIconMap.php:540
+#: include/classes/api/services/CIconMap.php:563
 #, c-format
 msgid "Icon map \"%1$s\" cannot be deleted. Used in map \"%2$s\"."
 msgstr "圖示對應\"%1$s\"無法被刪除. 已用於對應\"%2$s\"中."
@@ -8109,18 +8020,18 @@ msgstr "圖示對應已創建"
 msgid "Icon map deleted"
 msgstr "圖示對應已刪除"
 
-#: app/controllers/CControllerIconMapUpdate.php:65
+#: app/controllers/CControllerIconMapUpdate.php:60
 msgid "Icon map updated"
 msgstr "圖示對應已更新"
 
-#: app/controllers/CControllerAuditLogList.php:221
+#: app/controllers/CControllerAuditLogList.php:222
 #: app/views/administration.iconmap.edit.php:29
 #: app/views/administration.iconmap.list.php:27
 #: include/classes/helpers/CMenuHelper.php:243 include/html.inc.php:887
 msgid "Icon mapping"
 msgstr "圖示對應"
 
-#: include/classes/api/services/CIconMap.php:400
+#: include/classes/api/services/CIconMap.php:409
 #, c-format
 msgid "Icon with ID \"%1$s\" is not available."
 msgstr ""
@@ -8219,23 +8130,20 @@ msgstr "假如您認為這個訊息是錯的, 請諮詢您的管理者關於如�
 msgid "Iframe sandboxing exceptions"
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:149
+#: include/classes/helpers/CServiceHelper.php:151
 msgid "Ignore this service"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:222
+#: app/controllers/CControllerAuditLogList.php:223
 #: app/views/administration.image.edit.php:60
 #: app/views/administration.image.edit.php:66 image.php:26
 #: include/classes/helpers/CMapHelper.php:227 include/maps.inc.php:28
 #: include/maps.inc.php:307 include/views/js/monitoring.sysmaps.js.php:96
-#: jsLoader.php:257
+#: jsLoader.php:238
 msgid "Image"
 msgstr "圖片"
 
-#: include/classes/api/services/CImage.php:468
-#: include/classes/api/services/CImage.php:481
-#: include/classes/api/services/CImage.php:526
-#: include/classes/api/services/CImage.php:544
+#: include/classes/api/services/CImage.php:501
 #, c-format
 msgid "Image \"%1$s\" already exists."
 msgstr ""
@@ -8244,7 +8152,7 @@ msgstr ""
 msgid "Image added"
 msgstr "圖片已新增"
 
-#: app/controllers/CControllerImageDelete.php:62
+#: app/controllers/CControllerImageDelete.php:63
 msgid "Image deleted"
 msgstr "圖片已删除"
 
@@ -8252,18 +8160,12 @@ msgstr "圖片已删除"
 msgid "Image label type"
 msgstr "圖片標示類型"
 
-#: include/classes/api/services/CImage.php:228
-#, c-format
-msgid "Image load error [%1$s] in [%2$s]."
-msgstr ""
-
-#: include/classes/api/services/CImage.php:561
 #: include/classes/helpers/CUploadFile.php:129
 #, c-format
 msgid "Image size must be less than %1$s."
 msgstr ""
 
-#: app/controllers/CControllerImageUpdate.php:135
+#: app/controllers/CControllerImageUpdate.php:147
 msgid "Image updated"
 msgstr "圖片已更新"
 
@@ -8358,7 +8260,7 @@ msgstr ""
 
 #: app/partials/monitoring.host.view.html.php:89
 #: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2020
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2021
 #: include/views/configuration.host.list.php:217
 #: include/views/inventory.host.view.php:40
 msgid "Inaccessible maintenance"
@@ -8369,13 +8271,13 @@ msgstr ""
 msgid "Inaccessible map"
 msgstr ""
 
-#: httpconf.php:723 include/graphs.inc.php:274 include/hosts.inc.php:661
-#: include/httptest.inc.php:218 include/items.inc.php:916
-#: include/triggers.inc.php:2159
+#: httpconf.php:665 include/graphs.inc.php:274 include/hosts.inc.php:661
+#: include/httptest.inc.php:222 include/items.inc.php:916
+#: include/triggers.inc.php:2160
 msgid "Inaccessible template"
 msgstr ""
 
-#: include/triggers.inc.php:2365 include/triggers.inc.php:2373
+#: include/triggers.inc.php:2366 include/triggers.inc.php:2374
 msgid "Inaccessible trigger"
 msgstr ""
 
@@ -8419,7 +8321,7 @@ msgstr ""
 msgid "Incoming traffic statistics on network interface. Returns integer"
 msgstr ""
 
-#: include/classes/api/services/CService.php:853
+#: include/classes/api/services/CService.php:1362
 #, c-format
 msgid "Incompatible \"propagation_rule\" and \"propagation_value\" parameters for service \"%1$s\"."
 msgstr ""
@@ -8587,24 +8489,6 @@ msgstr "不正確的動作操作用戶群組. 用戶群組不存在或您沒有�
 msgid "Incorrect action operation user. User does not exist or you have no access to this user."
 msgstr "不正確的動作操作用戶. 用戶不存在或您沒有存取權."
 
-#: include/classes/api/services/CCorrelation.php:531
-#: include/classes/api/services/CCorrelation.php:545
-#: include/classes/api/services/CCorrelation.php:622
-#: include/classes/api/services/CCorrelation.php:731
-#: include/classes/api/services/CCorrelation.php:828
-#: include/classes/api/services/CCorrelation.php:1012
-#: include/classes/api/services/CCorrelation.php:1026
-#: include/classes/api/services/CCorrelation.php:1047
-#: include/classes/api/services/CCorrelation.php:1061
-#: include/classes/api/services/CCorrelation.php:1081
-#: include/classes/api/services/CCorrelation.php:1102
-#: include/classes/api/services/CCorrelation.php:1119
-#: include/classes/api/services/CCorrelation.php:1139
-#: include/classes/api/services/CCorrelation.php:1151
-#: include/classes/api/services/CCorrelation.php:1212
-#: include/classes/api/services/CCorrelation.php:1246
-#: include/classes/api/services/CCorrelation.php:1296
-#: include/classes/api/services/CCorrelation.php:1311
 #: include/classes/api/services/CDRule.php:206
 #: include/classes/api/services/CDRule.php:348
 #: include/classes/api/services/CDRule.php:542
@@ -8659,8 +8543,6 @@ msgstr "不正確的動作操作用戶. 用戶不存在或您沒有存取權."
 #: include/classes/api/services/CMap.php:1167
 #: include/classes/api/services/CMap.php:1240
 #: include/classes/api/services/CMap.php:1460
-#: include/classes/api/services/CMediatype.php:189
-#: include/classes/api/services/CMediatype.php:485
 msgid "Incorrect arguments passed to function."
 msgstr "不正確的自變數傳給方程式"
 
@@ -8686,31 +8568,22 @@ msgstr ""
 msgid "Incorrect conditions for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1805
+#: include/classes/api/services/CDiscoveryRule.php:1801
 #, c-format
 msgid "Incorrect conditions for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:707
-msgid "Incorrect correlation ID."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2609
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for action \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1217
-#, c-format
-msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1811
+#: include/classes/api/services/CDiscoveryRule.php:1807
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1602
+#: include/classes/api/services/CDiscoveryRule.php:1598
 #, c-format
 msgid "Incorrect custom expression \"%2$s\" for override \"%1$s\": %3$s."
 msgstr ""
@@ -8739,7 +8612,7 @@ msgstr ""
 msgid "Incorrect eventsource value."
 msgstr ""
 
-#: include/classes/db/DB.php:662 include/classes/db/DB.php:936
+#: include/classes/db/DB.php:691 include/classes/db/DB.php:965
 #, c-format
 msgid "Incorrect field \"%1$s\" name or value in where statement for table \"%2$s\"."
 msgstr "不正確的欄位名稱\"%1$s\"或用於資料表\"%2$s\"的where陳述式的值."
@@ -8764,22 +8637,17 @@ msgstr "不正確的檔案上傳."
 msgid "Incorrect filter condition formula ID for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1841
+#: include/classes/api/services/CDiscoveryRule.php:1837
 #, c-format
 msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1250
-#, c-format
-msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1833
+#: include/classes/api/services/CDiscoveryRule.php:1829
 #, c-format
 msgid "Incorrect filter condition macro for discovery rule \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1637
+#: include/classes/api/services/CDiscoveryRule.php:1633
 #, c-format
 msgid "Incorrect filter condition macro for override \"%1$s\"."
 msgstr ""
@@ -8790,7 +8658,7 @@ msgstr ""
 msgid "Incorrect filter condition operator for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1847
+#: include/classes/api/services/CDiscoveryRule.php:1843
 #, c-format
 msgid "Incorrect filter condition operator for discovery rule \"%1$s\"."
 msgstr ""
@@ -8818,8 +8686,6 @@ msgstr "不正確的圖片索引"
 #: include/classes/api/services/CHost.php:964
 #: include/classes/api/services/CHost.php:1879
 #: include/classes/api/services/CHost.php:2116
-#: include/classes/api/services/CImage.php:460
-#: include/classes/api/services/CImage.php:506
 #: include/classes/api/services/CTemplate.php:497
 #: include/classes/api/services/CTemplate.php:674
 #: include/classes/api/services/CTrigger.php:803
@@ -8881,10 +8747,6 @@ msgstr "不正確的維修期間(至少要5分鐘)"
 msgid "Incorrect map ID."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:455
-msgid "Incorrect media type ID."
-msgstr ""
-
 #: include/classes/api/clients/CLocalApiClient.php:79
 #: include/classes/api/services/CSettings.php:93
 #: include/classes/api/services/CUser.php:1637
@@ -8942,13 +8804,13 @@ msgstr ""
 msgid "Incorrect response received from Zabbix server \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:62
-#: app/controllers/CControllerServiceTimeValidate.php:83
+#: app/controllers/CControllerServiceTimeValidate.php:66
+#: app/controllers/CControllerServiceTimeValidate.php:87
 msgid "Incorrect service end time."
 msgstr "不正確的服務終止時間."
 
-#: app/controllers/CControllerServiceTimeValidate.php:53
-#: app/controllers/CControllerServiceTimeValidate.php:75
+#: app/controllers/CControllerServiceTimeValidate.php:57
+#: app/controllers/CControllerServiceTimeValidate.php:79
 msgid "Incorrect service start time."
 msgstr "不正確的服務開始時間."
 
@@ -9001,12 +8863,7 @@ msgstr ""
 msgid "Incorrect type of calculation for action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:628
-#, c-format
-msgid "Incorrect type of calculation for correlation \"%1$s\"."
-msgstr ""
-
-#: include/classes/api/services/CDiscoveryRule.php:1798
+#: include/classes/api/services/CDiscoveryRule.php:1794
 #, c-format
 msgid "Incorrect type of calculation for discovery rule \"%1$s\"."
 msgstr ""
@@ -9052,13 +8909,13 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:605
 #: include/classes/api/services/CItemGeneral.php:525
 #: include/classes/api/services/CItemGeneral.php:2585
-#: include/classes/validators/CNewValidator.php:122
-#: include/classes/validators/CNewValidator.php:135
+#: include/classes/validators/CNewValidator.php:124
+#: include/classes/validators/CNewValidator.php:136
 #: include/classes/validators/CNewValidator.php:148
-#: include/classes/validators/CNewValidator.php:164
-#: include/classes/validators/CNewValidator.php:178
-#: include/classes/validators/CNewValidator.php:198
-#: include/classes/validators/CNewValidator.php:249
+#: include/classes/validators/CNewValidator.php:160
+#: include/classes/validators/CNewValidator.php:172
+#: include/classes/validators/CNewValidator.php:184
+#: include/classes/validators/CNewValidator.php:223
 #: include/validate.inc.php:347
 #, c-format
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field."
@@ -9075,60 +8932,30 @@ msgstr ""
 msgid "Incorrect value \"%1$s\" for \"%2$s\" field: must be between %3$s and %4$s."
 msgstr ""
 
-#: include/classes/db/DB.php:410
+#: include/classes/db/DB.php:413
 #, c-format
 msgid "Incorrect value \"%1$s\" for float field \"%2$s\"."
 msgstr "不正確的值\"%1$s\"於浮點欄位\"%2$s\"中."
 
-#: include/classes/db/DB.php:404
+#: include/classes/db/DB.php:406
 #, c-format
 msgid "Incorrect value \"%1$s\" for int field \"%2$s\"."
 msgstr "不正確的值\"%1$s\"於整數欄位\"%2$s\"中."
 
 #: include/classes/api/services/CMaintenance.php:400
 #: include/classes/api/services/CMaintenance.php:668
-#: include/classes/db/DB.php:398
+#: include/classes/db/DB.php:399
 #, c-format
 msgid "Incorrect value \"%1$s\" for unsigned int field \"%2$s\"."
 msgstr "不正確的值\"%1$s\"於無正負整數欄位\"%2$s\"中."
 
-#: include/classes/api/services/CCorrelation.php:613
-#: include/classes/api/services/CCorrelation.php:633
-#: include/classes/api/services/CCorrelation.php:818
-#: include/classes/api/services/CCorrelation.php:839
-#: include/classes/api/services/CCorrelation.php:1030
-#: include/classes/api/services/CCorrelation.php:1066
-#: include/classes/api/services/CCorrelation.php:1163
-#: include/classes/api/services/CCorrelation.php:1316
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for correlation \"%3$s\"."
-msgstr ""
-
-#: include/classes/api/services/CMediatype.php:245
-#: include/classes/api/services/CMediatype.php:256
-#: include/classes/api/services/CMediatype.php:275
-#: include/classes/api/services/CMediatype.php:291
-#: include/classes/api/services/CMediatype.php:307
-#: include/classes/api/services/CMediatype.php:326
-#: include/classes/api/services/CMediatype.php:366
-#: include/classes/api/services/CMediatype.php:566
-#: include/classes/api/services/CMediatype.php:579
-#: include/classes/api/services/CMediatype.php:598
-#: include/classes/api/services/CMediatype.php:615
-#: include/classes/api/services/CMediatype.php:632
-#: include/classes/api/services/CMediatype.php:652
-#: include/classes/api/services/CMediatype.php:692
-#: include/classes/api/services/CMediatype.php:1181
-#, c-format
-msgid "Incorrect value \"%1$s\" in field \"%2$s\" for media type \"%3$s\"."
-msgstr ""
-
-#: include/classes/validators/CNewValidator.php:123
-#: include/classes/validators/CNewValidator.php:136
+#: include/classes/validators/CNewValidator.php:125
+#: include/classes/validators/CNewValidator.php:137
 #: include/classes/validators/CNewValidator.php:149
-#: include/classes/validators/CNewValidator.php:165
-#: include/classes/validators/CNewValidator.php:199
-#: include/classes/validators/CNewValidator.php:250
+#: include/classes/validators/CNewValidator.php:161
+#: include/classes/validators/CNewValidator.php:173
+#: include/classes/validators/CNewValidator.php:185
+#: include/classes/validators/CNewValidator.php:224
 #: include/validate.inc.php:350
 #, c-format
 msgid "Incorrect value for \"%1$s\" field."
@@ -9183,14 +9010,8 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1862
 #: include/classes/api/services/CAction.php:2856
 #: include/classes/api/services/CConfiguration.php:167
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1869
-#: include/classes/api/services/CDiscoveryRule.php:2283
+#: include/classes/api/services/CDiscoveryRule.php:1865
+#: include/classes/api/services/CDiscoveryRule.php:2279
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:221
@@ -9300,25 +9121,7 @@ msgstr ""
 #: include/classes/api/services/CMap.php:688
 #: include/classes/api/services/CMap.php:1151
 #: include/classes/api/services/CMap.php:1157
-#: include/classes/api/services/CMediatype.php:377
-#: include/classes/api/services/CMediatype.php:387
-#: include/classes/api/services/CMediatype.php:396
-#: include/classes/api/services/CMediatype.php:403
-#: include/classes/api/services/CMediatype.php:412
-#: include/classes/api/services/CMediatype.php:421
-#: include/classes/api/services/CMediatype.php:427
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:704
-#: include/classes/api/services/CMediatype.php:714
-#: include/classes/api/services/CMediatype.php:721
-#: include/classes/api/services/CMediatype.php:730
-#: include/classes/api/services/CMediatype.php:737
-#: include/classes/api/services/CMediatype.php:747
-#: include/classes/api/services/CMediatype.php:756
-#: include/classes/api/services/CMediatype.php:762
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CSettings.php:274
+#: include/classes/api/services/CSettings.php:280
 #: include/classes/api/services/CTemplate.php:450
 #: include/classes/api/services/CTriggerGeneral.php:148
 #: include/classes/api/services/CTriggerGeneral.php:156
@@ -9329,7 +9132,7 @@ msgstr ""
 #: include/classes/api/services/CTriggerGeneral.php:820
 #: include/classes/api/services/CTriggerGeneral.php:827
 #: include/classes/api/services/CTriggerGeneral.php:833
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:2121
 #: include/classes/graphdraw/CLineGraphDraw.php:115
@@ -9375,16 +9178,17 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:91
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
-#: include/classes/validators/CNewValidator.php:107
-#: include/classes/validators/CNewValidator.php:214
-#: include/classes/validators/CNewValidator.php:230
-#: include/classes/validators/CNewValidator.php:273
-#: include/classes/validators/CNewValidator.php:285
-#: include/classes/validators/CNewValidator.php:299
-#: include/classes/validators/CNewValidator.php:312
-#: include/classes/validators/CNewValidator.php:326
-#: include/classes/validators/CNewValidator.php:338
+#: include/classes/validators/CNewValidator.php:103
+#: include/classes/validators/CNewValidator.php:113
+#: include/classes/validators/CNewValidator.php:195
+#: include/classes/validators/CNewValidator.php:207
+#: include/classes/validators/CNewValidator.php:238
+#: include/classes/validators/CNewValidator.php:252
+#: include/classes/validators/CNewValidator.php:269
+#: include/classes/validators/CNewValidator.php:278
+#: include/classes/validators/CNewValidator.php:290
+#: include/classes/validators/CNewValidator.php:300
+#: include/classes/validators/CNewValidator.php:310
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:109
 #: include/classes/widgets/fields/CWidgetFieldNavTree.php:124
 #: include/items.inc.php:2078 include/sounds.inc.php:113
@@ -9393,7 +9197,7 @@ msgstr ""
 msgid "Incorrect value for field \"%1$s\": %2$s."
 msgstr ""
 
-#: include/classes/helpers/CServiceHelper.php:147
+#: include/classes/helpers/CServiceHelper.php:149
 msgid "Increase by"
 msgstr ""
 
@@ -9481,12 +9285,12 @@ msgstr ""
 msgid "Inherited items"
 msgstr ""
 
-#: app/views/popup.triggerexpr.php:238
+#: app/views/popup.triggerexpr.php:239
 msgid "Insert"
 msgstr "插入"
 
 #: include/views/configuration.trigger.prototype.edit.php:136
-#: include/views/configuration.triggers.edit.php:162 jsLoader.php:340
+#: include/views/configuration.triggers.edit.php:162 jsLoader.php:321
 msgid "Insert expression"
 msgstr ""
 
@@ -9590,7 +9394,7 @@ msgstr ""
 msgid "Internal problem recovery"
 msgstr ""
 
-#: include/httptest.inc.php:399
+#: include/httptest.inc.php:403
 msgid "Internet Explorer"
 msgstr "IE瀏覽器"
 
@@ -9598,7 +9402,7 @@ msgstr "IE瀏覽器"
 #: app/views/configuration.discovery.list.php:79
 #: app/views/popup.lldoperation.php:115
 #: app/views/popup.massupdate.item.php:226
-#: app/views/popup.service.edit.php:219 include/forms.inc.php:565
+#: app/views/popup.service.edit.php:232 include/forms.inc.php:565
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.host.discovery.list.php:199
 #: include/views/configuration.httpconf.list.php:136
@@ -9609,7 +9413,7 @@ msgstr "IE瀏覽器"
 msgid "Interval"
 msgstr "間隔"
 
-#: include/classes/api/services/CRole.php:719
+#: include/classes/api/services/CRole.php:738
 #, c-format
 msgid "Invalid API method \"%2$s\" for user role \"%1$s\"."
 msgstr ""
@@ -9632,7 +9436,7 @@ msgstr ""
 msgid "Invalid action condition: %1$s."
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1462
+#: app/controllers/CControllerPopupTriggerExpr.php:1469
 #, c-format
 msgid "Invalid condition: %1$s."
 msgstr ""
@@ -9664,7 +9468,7 @@ msgstr ""
 msgid "Invalid interval \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:66
+#: include/classes/api/services/CDiscoveryRule.php:62
 #, c-format
 msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s."
 msgstr ""
@@ -9689,27 +9493,29 @@ msgstr ""
 msgid "Invalid method parameters."
 msgstr "無效的方法參數."
 
-#: app/controllers/CControllerDashboardUpdate.php:187
-#: app/controllers/CControllerDashboardUpdate.php:196
-#: app/controllers/CControllerDashboardUpdate.php:208
+#: app/controllers/CControllerDashboardUpdate.php:191
+#: app/controllers/CControllerDashboardUpdate.php:200
+#: app/controllers/CControllerDashboardUpdate.php:212
 #: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CAutoregistration.php:160
-#: include/classes/api/services/CDiscoveryRule.php:1649
-#: include/classes/api/services/CDiscoveryRule.php:1669
-#: include/classes/api/services/CDiscoveryRule.php:1682
-#: include/classes/api/services/CDiscoveryRule.php:1701
-#: include/classes/api/services/CDiscoveryRule.php:1712
-#: include/classes/api/services/CDiscoveryRule.php:1724
-#: include/classes/api/services/CDiscoveryRule.php:1732
-#: include/classes/api/services/CDiscoveryRule.php:1743
-#: include/classes/api/services/CDiscoveryRule.php:1755
-#: include/classes/api/services/CDiscoveryRule.php:1889
-#: include/classes/api/services/CDiscoveryRule.php:1975
-#: include/classes/api/services/CDiscoveryRule.php:1992
-#: include/classes/api/services/CDiscoveryRule.php:2010
-#: include/classes/api/services/CDiscoveryRule.php:2018
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CAutoregistration.php:170
+#: include/classes/api/services/CCorrelation.php:723
+#: include/classes/api/services/CCorrelation.php:729
+#: include/classes/api/services/CDiscoveryRule.php:1645
+#: include/classes/api/services/CDiscoveryRule.php:1665
+#: include/classes/api/services/CDiscoveryRule.php:1678
+#: include/classes/api/services/CDiscoveryRule.php:1697
+#: include/classes/api/services/CDiscoveryRule.php:1708
+#: include/classes/api/services/CDiscoveryRule.php:1720
+#: include/classes/api/services/CDiscoveryRule.php:1728
+#: include/classes/api/services/CDiscoveryRule.php:1739
+#: include/classes/api/services/CDiscoveryRule.php:1751
+#: include/classes/api/services/CDiscoveryRule.php:1885
+#: include/classes/api/services/CDiscoveryRule.php:1971
+#: include/classes/api/services/CDiscoveryRule.php:1988
+#: include/classes/api/services/CDiscoveryRule.php:2006
+#: include/classes/api/services/CDiscoveryRule.php:2014
 #: include/classes/api/services/CGraphGeneral.php:626
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostBase.php:522
@@ -9735,17 +9541,17 @@ msgstr "無效的方法參數."
 #: include/classes/api/services/CItemGeneral.php:2607
 #: include/classes/api/services/CItemGeneral.php:2617
 #: include/classes/api/services/CItemGeneral.php:2646
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:682
-#: include/classes/api/services/CProxy.php:693
-#: include/classes/api/services/CProxy.php:699
-#: include/classes/api/services/CProxy.php:737
-#: include/classes/api/services/CProxy.php:754
-#: include/classes/api/services/CProxy.php:767
-#: include/classes/api/services/CProxy.php:773
-#: include/classes/api/services/CProxy.php:782
-#: include/classes/api/services/CProxy.php:794
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:707
+#: include/classes/api/services/CProxy.php:718
+#: include/classes/api/services/CProxy.php:724
+#: include/classes/api/services/CProxy.php:762
+#: include/classes/api/services/CProxy.php:779
+#: include/classes/api/services/CProxy.php:792
+#: include/classes/api/services/CProxy.php:798
+#: include/classes/api/services/CProxy.php:807
+#: include/classes/api/services/CProxy.php:819
 #: include/classes/api/services/CReport.php:194
 #: include/classes/api/services/CReport.php:200
 #: include/classes/api/services/CReport.php:206
@@ -9753,8 +9559,8 @@ msgstr "無效的方法參數."
 #: include/classes/api/services/CReport.php:582
 #: include/classes/api/services/CReport.php:596
 #: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:1025
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:665
 #: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9768,106 +9574,116 @@ msgstr "無效的方法參數."
 #: include/classes/helpers/CDashboardHelper.php:388
 #: include/classes/helpers/CDashboardHelper.php:396
 #: include/classes/helpers/CDashboardHelper.php:406
-#: include/classes/validators/CApiInputValidator.php:318
-#: include/classes/validators/CApiInputValidator.php:323
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:368
-#: include/classes/validators/CApiInputValidator.php:379
-#: include/classes/validators/CApiInputValidator.php:409
-#: include/classes/validators/CApiInputValidator.php:517
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:602
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:641
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:747
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:846
-#: include/classes/validators/CApiInputValidator.php:871
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:996
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1060
-#: include/classes/validators/CApiInputValidator.php:1090
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1162
-#: include/classes/validators/CApiInputValidator.php:1167
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:338
+#: include/classes/validators/CApiInputValidator.php:343
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:388
+#: include/classes/validators/CApiInputValidator.php:399
+#: include/classes/validators/CApiInputValidator.php:429
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:462
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:491
+#: include/classes/validators/CApiInputValidator.php:574
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:659
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:698
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:804
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:903
+#: include/classes/validators/CApiInputValidator.php:928
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1053
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1117
+#: include/classes/validators/CApiInputValidator.php:1122
+#: include/classes/validators/CApiInputValidator.php:1137
+#: include/classes/validators/CApiInputValidator.php:1178
+#: include/classes/validators/CApiInputValidator.php:1223
 #: include/classes/validators/CApiInputValidator.php:1250
 #: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:1299
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1359
-#: include/classes/validators/CApiInputValidator.php:1365
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1403
-#: include/classes/validators/CApiInputValidator.php:1409
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1293
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:1387
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
 #: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1480
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1539
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1572
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1453
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1491
+#: include/classes/validators/CApiInputValidator.php:1497
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1568
+#: include/classes/validators/CApiInputValidator.php:1610
 #: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1634
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1704
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CApiInputValidator.php:1768
-#: include/classes/validators/CApiInputValidator.php:1801
-#: include/classes/validators/CApiInputValidator.php:1892
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:1982
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2019
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2063
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2100
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2143
-#: include/classes/validators/CApiInputValidator.php:2166
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2244
-#: include/classes/validators/CApiInputValidator.php:2254
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2285
-#: include/classes/validators/CApiInputValidator.php:2307
-#: include/classes/validators/CApiInputValidator.php:2327
-#: include/classes/validators/CApiInputValidator.php:2357
-#: include/classes/validators/CApiInputValidator.php:2362
-#: include/classes/validators/CApiInputValidator.php:2398
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1660
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1689
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1722
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1792
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CApiInputValidator.php:1856
+#: include/classes/validators/CApiInputValidator.php:1889
+#: include/classes/validators/CApiInputValidator.php:1980
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2080
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2117
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2161
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2198
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2241
+#: include/classes/validators/CApiInputValidator.php:2264
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2342
+#: include/classes/validators/CApiInputValidator.php:2352
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2383
 #: include/classes/validators/CApiInputValidator.php:2405
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
-#: include/classes/validators/CApiInputValidator.php:2474
-#: include/classes/validators/CApiInputValidator.php:2507
-#: include/classes/validators/CApiInputValidator.php:2514
-#: include/classes/validators/CApiInputValidator.php:2538
-#: include/classes/validators/CApiInputValidator.php:2545
+#: include/classes/validators/CApiInputValidator.php:2425
+#: include/classes/validators/CApiInputValidator.php:2455
+#: include/classes/validators/CApiInputValidator.php:2460
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2503
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
+#: include/classes/validators/CApiInputValidator.php:2572
+#: include/classes/validators/CApiInputValidator.php:2605
+#: include/classes/validators/CApiInputValidator.php:2612
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2643
+#: include/classes/validators/CApiInputValidator.php:2668
+#: include/classes/validators/CApiInputValidator.php:2675
+#: include/classes/validators/CApiInputValidator.php:2703
+#: include/classes/validators/CApiInputValidator.php:2708
 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:130
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:483
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:499
@@ -9909,43 +9725,38 @@ msgstr "無效的回應編碼 \"%1$s\"."
 #: include/classes/import/validators/C42XmlValidator.php:1316
 #: include/classes/import/validators/C44XmlValidator.php:1721
 #: include/classes/import/validators/C44XmlValidator.php:1983
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2137
-#: include/classes/import/validators/C44XmlValidator.php:2179
-#: include/classes/import/validators/C44XmlValidator.php:2240
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C44XmlValidator.php:2139
+#: include/classes/import/validators/C44XmlValidator.php:2181
 #: include/classes/import/validators/C50XmlValidator.php:1864
 #: include/classes/import/validators/C50XmlValidator.php:2126
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2280
-#: include/classes/import/validators/C50XmlValidator.php:2322
-#: include/classes/import/validators/C50XmlValidator.php:2383
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C50XmlValidator.php:2282
+#: include/classes/import/validators/C50XmlValidator.php:2324
 #: include/classes/import/validators/C52XmlValidator.php:1986
 #: include/classes/import/validators/C52XmlValidator.php:2216
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2445
-#: include/classes/import/validators/C52XmlValidator.php:2487
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2581
-#: include/classes/import/validators/C52XmlValidator.php:2587
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2447
+#: include/classes/import/validators/C52XmlValidator.php:2489
+#: include/classes/import/validators/C52XmlValidator.php:2566
+#: include/classes/import/validators/C52XmlValidator.php:2572
 #: include/classes/import/validators/C54XmlValidator.php:2041
 #: include/classes/import/validators/C54XmlValidator.php:2271
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2500
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2594
-#: include/classes/import/validators/C54XmlValidator.php:2600
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2502
+#: include/classes/import/validators/C54XmlValidator.php:2579
+#: include/classes/import/validators/C54XmlValidator.php:2585
 #: include/classes/import/validators/C60XmlValidator.php:2042
 #: include/classes/import/validators/C60XmlValidator.php:2272
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:163
 #: include/classes/import/validators/CXmlValidatorGeneral.php:182
 #: include/classes/import/validators/CXmlValidatorGeneral.php:201
@@ -9966,7 +9777,7 @@ msgstr ""
 #: include/classes/helpers/CMenuHelper.php:103
 #: include/classes/helpers/CRoleHelper.php:278
 #: include/views/configuration.host.edit.php:446
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:348
+#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:329
 msgid "Inventory"
 msgstr "資產記錄"
 
@@ -10007,7 +9818,7 @@ msgstr "以用戶密碼尋找是不可能的."
 msgid "Italian (it_IT)"
 msgstr "意大利語 (it_IT)"
 
-#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerAuditLogList.php:225
 #: app/views/popup.massupdate.item.php:492 app/views/popup.triggerexpr.php:99
 #: app/views/popup.triggerwizard.php:92
 #: include/classes/screens/CScreenHistory.php:268
@@ -10039,7 +9850,7 @@ msgstr ""
 msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d."
 msgstr "項目\"%1$s\"不能填入一個不存在的主機資產紀錄欄位號碼\"%2$d\". 選擇為: 從0(不填入)到%3$d."
 
-#: include/classes/api/services/CDiscoveryRule.php:2284
+#: include/classes/api/services/CDiscoveryRule.php:2280
 #: include/classes/api/services/CItemGeneral.php:2233
 #, c-format
 msgid "Item \"%1$s\" does not exist or you have no access to this item"
@@ -10053,7 +9864,7 @@ msgstr "項目已新增"
 msgid "Item contains user-defined macros with secret values. Values of these macros should be entered manually."
 msgstr ""
 
-#: items.php:1053
+#: items.php:1021
 msgid "Item copied"
 msgid_plural "Items copied"
 msgstr[0] ""
@@ -10066,12 +9877,12 @@ msgstr "項目數量"
 msgid "Item deleted"
 msgstr "項目已刪除"
 
-#: items.php:1011
+#: items.php:979
 msgid "Item disabled"
 msgid_plural "Items disabled"
 msgstr[0] ""
 
-#: items.php:1010
+#: items.php:978
 msgid "Item enabled"
 msgid_plural "Items enabled"
 msgstr[0] ""
@@ -10080,7 +9891,7 @@ msgstr[0] ""
 msgid "Item in \"not supported\" state"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1455
+#: app/controllers/CControllerPopupTriggerExpr.php:1462
 msgid "Item not selected"
 msgstr ""
 
@@ -10089,7 +9900,7 @@ msgstr ""
 msgid "Item pre-processing is missing parameters: %1$s"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:225
+#: app/controllers/CControllerAuditLogList.php:226
 #: app/views/popup.lldoperation.php:51 app/views/popup.massupdate.item.php:492
 #: include/classes/widgets/forms/CWidgetFormGraphPrototype.php:48
 #: include/forms.inc.php:892
@@ -10125,8 +9936,8 @@ msgid "Item prototype updated"
 msgid_plural "Item prototypes updated"
 msgstr[0] ""
 
-#: include/classes/api/services/CDashboardGeneral.php:429
-#: include/classes/api/services/CDashboardGeneral.php:437
+#: include/classes/api/services/CDashboardGeneral.php:469
+#: include/classes/api/services/CDashboardGeneral.php:477
 #, c-format
 msgid "Item prototype with ID \"%1$s\" is not available."
 msgstr ""
@@ -10152,7 +9963,7 @@ msgstr ""
 msgid "Item tags"
 msgstr ""
 
-#: jsLoader.php:370
+#: jsLoader.php:351
 msgid "Item type does not use interface"
 msgstr ""
 
@@ -10184,8 +9995,8 @@ msgstr ""
 msgid "Item will not be refreshed. Update interval should be between 1s and 1d. Also Scheduled/Flexible intervals can be used."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:402
-#: include/classes/api/services/CDashboardGeneral.php:409
+#: include/classes/api/services/CDashboardGeneral.php:442
+#: include/classes/api/services/CDashboardGeneral.php:449
 #, c-format
 msgid "Item with ID \"%1$s\" is not available."
 msgstr ""
@@ -10236,11 +10047,11 @@ msgstr "鍵值為 \"%1$s\"的項目已存在於\"%2$s\" ."
 #: include/views/configuration.template.list.php:118
 #: include/views/configuration.template.list.php:206
 #: include/views/inventory.host.view.php:182
-#: include/views/inventory.host.view.php:215 items.php:1292
+#: include/views/inventory.host.view.php:215 items.php:1214
 msgid "Items"
 msgstr "項目"
 
-#: items.php:1126
+#: items.php:1048
 msgid "Items deleted"
 msgstr "項目已刪除"
 
@@ -10258,7 +10069,7 @@ msgstr "監控項已更新"
 
 #: app/views/monitoring.widget.hostavail.view.php:29
 #: include/classes/widgets/views/widget.hostavail.form.view.php:48
-#: include/hosts.inc.php:468 include/hosts.inc.php:1272
+#: include/hosts.inc.php:468 include/hosts.inc.php:1205
 #: include/items.inc.php:349
 #: include/views/js/configuration.host.edit.js.php:177
 msgid "JMX"
@@ -10283,6 +10094,10 @@ msgstr "JMX介面"
 msgid "JSON"
 msgstr ""
 
+#: include/classes/mvc/CController.php:231
+msgid "JSON array input is expected."
+msgstr ""
+
 #: app/views/popup.massupdate.item.php:95
 #: include/views/configuration.host.discovery.edit.php:272
 #: include/views/configuration.item.edit.php:308
@@ -10295,7 +10110,7 @@ msgstr ""
 msgid "JSON is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:107
+#: include/classes/validators/CNewValidator.php:113
 msgid "JSON string is expected"
 msgstr ""
 
@@ -10313,7 +10128,7 @@ msgstr ""
 msgid "Jan"
 msgstr "一月"
 
-#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:221
+#: include/func.inc.php:100 include/func.inc.php:237 jsLoader.php:202
 msgid "January"
 msgstr "一月"
 
@@ -10335,7 +10150,7 @@ msgstr ""
 msgid "Jul"
 msgstr "七月"
 
-#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:227
+#: include/func.inc.php:106 include/func.inc.php:243 jsLoader.php:208
 msgid "July"
 msgstr "七月"
 
@@ -10343,7 +10158,7 @@ msgstr "七月"
 msgid "Jun"
 msgstr "六月"
 
-#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:226
+#: include/func.inc.php:105 include/func.inc.php:242 jsLoader.php:207
 msgid "June"
 msgstr "六月"
 
@@ -10493,22 +10308,6 @@ msgid "Last %1$d year"
 msgid_plural "Last %1$d years"
 msgstr[0] ""
 
-#: srv_status.php:42
-msgid "Last 24 hours"
-msgstr ""
-
-#: srv_status.php:44
-msgid "Last 30 days"
-msgstr ""
-
-#: srv_status.php:45
-msgid "Last 365 days"
-msgstr ""
-
-#: srv_status.php:43
-msgid "Last 7 days"
-msgstr ""
-
 #: app/views/administration.token.list.php:144
 #: app/views/administration.user.token.list.php:99
 msgid "Last accessed at"
@@ -10520,11 +10319,11 @@ msgstr ""
 msgid "Last check"
 msgstr "最近檢查記錄"
 
-#: jsLoader.php:351
+#: jsLoader.php:332
 msgid "Last hour graph"
 msgstr "最近一小時"
 
-#: jsLoader.php:352
+#: jsLoader.php:333
 msgid "Last month graph"
 msgstr "上月圖形"
 
@@ -10562,11 +10361,11 @@ msgstr ""
 msgid "Last value"
 msgstr "最新數據"
 
-#: jsLoader.php:353
+#: jsLoader.php:334
 msgid "Last week graph"
 msgstr "仩週圖形"
 
-#: app/controllers/CControllerLatestView.php:187
+#: app/controllers/CControllerLatestView.php:189
 #: app/partials/monitoring.host.view.html.php:35
 #: app/partials/monitoring.host.view.html.php:105
 #: app/partials/monitoring.host.view.html.php:111
@@ -10575,11 +10374,11 @@ msgstr "仩週圖形"
 #: include/classes/helpers/CMenuHelper.php:61
 #: include/classes/helpers/CRoleHelper.php:311
 #: include/views/inventory.host.view.php:143
-#: include/views/inventory.host.view.php:149 jsLoader.php:349
+#: include/views/inventory.host.view.php:149 jsLoader.php:330
 msgid "Latest data"
 msgstr "最新數據"
 
-#: jsLoader.php:350
+#: jsLoader.php:331
 msgid "Latest values"
 msgstr "最新數據"
 
@@ -10620,7 +10419,7 @@ msgstr ""
 msgid "Left trim"
 msgstr ""
 
-#: include/classes/widgets/views/widget.svggraph.form.view.php:294
+#: include/classes/widgets/views/widget.svggraph.form.view.php:295
 msgid "Legend"
 msgstr ""
 
@@ -10901,7 +10700,7 @@ msgstr ""
 msgid "M"
 msgstr ""
 
-#: jsLoader.php:240
+#: jsLoader.php:221
 msgctxt "Monday short"
 msgid "M"
 msgstr "M"
@@ -10923,7 +10722,7 @@ msgstr "MD2"
 msgid "MD5 checksum of file. Returns character string (MD5 hash of the file)"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:226
+#: app/controllers/CControllerAuditLogList.php:227
 #: app/partials/hostmacros.inherited.list.html.php:48
 #: app/partials/hostmacros.list.html.php:35
 #: app/partials/massupdate.macros.tab.php:29
@@ -10934,12 +10733,12 @@ msgid "Macro"
 msgstr "巨集"
 
 #: include/classes/api/services/CHostBase.php:577
-#: include/classes/api/services/CUserMacro.php:668
+#: include/classes/api/services/CUserMacro.php:655
 #, c-format
 msgid "Macro \"%1$s\" already exists on \"%2$s\"."
 msgstr "巨集\"%1$s\"已存在於\"%2$s\"."
 
-#: include/classes/api/services/CUserMacro.php:420
+#: include/classes/api/services/CUserMacro.php:411
 #, c-format
 msgid "Macro \"%1$s\" already exists."
 msgstr "巨集\"%1$s\"已存在."
@@ -10967,7 +10766,7 @@ msgstr "巨集已更新"
 #: app/views/monitoring.map.view.php:45
 #: include/views/monitoring.overview.items.php:70
 #: include/views/monitoring.overview.triggers.php:106 report2.php:198
-#: report4.php:124 srv_status.php:161
+#: report4.php:124
 msgid "Main filter"
 msgstr ""
 
@@ -10975,7 +10774,7 @@ msgstr ""
 msgid "Main navigation"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:227
+#: app/controllers/CControllerAuditLogList.php:228
 #: include/classes/helpers/CMenuHelper.php:174
 #: include/classes/helpers/CRoleHelper.php:362
 #: include/views/configuration.maintenance.edit.php:259
@@ -11058,7 +10857,7 @@ msgstr ""
 #: app/partials/popup.operations.php:227
 #: app/views/administration.miscconfig.edit.php:61
 #: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1206
+#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1139
 #: include/views/configuration.host.edit.php:382
 #: include/views/configuration.host.prototype.edit.php:357
 msgid "Manual"
@@ -11080,13 +10879,13 @@ msgstr ""
 msgid "Manually closed"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:228
+#: app/controllers/CControllerAuditLogList.php:229
 #: include/classes/widgets/CWidgetConfig.php:54
 #: include/classes/widgets/forms/CWidgetFormMap.php:41
 #: include/classes/widgets/forms/CWidgetFormMap.php:70 include/maps.inc.php:27
 #: include/views/js/monitoring.sysmaps.js.php:93
 #: include/views/js/monitoring.sysmaps.js.php:208
-#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:254 map.php:25
+#: include/views/monitoring.sysmap.edit.php:317 jsLoader.php:235 map.php:25
 msgid "Map"
 msgstr "拓墣圖"
 
@@ -11155,7 +10954,7 @@ msgstr ""
 msgid "Map update failed."
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:549
+#: include/classes/api/services/CDashboardGeneral.php:589
 #, c-format
 msgid "Map with ID \"%1$s\" is not available."
 msgstr ""
@@ -11187,7 +10986,7 @@ msgstr "拓墣圖"
 msgid "Mar"
 msgstr "三月"
 
-#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:223
+#: include/func.inc.php:102 include/func.inc.php:239 jsLoader.php:204
 msgid "March"
 msgstr "三月"
 
@@ -11291,7 +11090,7 @@ msgid "Maximum required %1$s database version is %2$s."
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:249
-#: include/classes/mvc/CController.php:259
+#: include/classes/mvc/CController.php:312
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:444
 #: include/validate.inc.php:477
 #, c-format
@@ -11304,7 +11103,7 @@ msgstr[0] ""
 msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"."
 msgstr ""
 
-#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:225
+#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:206
 msgid "May"
 msgstr "五月"
 
@@ -11319,15 +11118,12 @@ msgstr "五月"
 msgid "Media"
 msgstr "示警媒介"
 
-#: app/controllers/CControllerAuditLogList.php:229
+#: app/controllers/CControllerAuditLogList.php:230
 #: app/views/administration.mediatype.edit.php:271 report4.php:96
 msgid "Media type"
 msgstr "示警媒介類型"
 
-#: include/classes/api/services/CMediatype.php:214
-#: include/classes/api/services/CMediatype.php:230
-#: include/classes/api/services/CMediatype.php:509
-#: include/classes/api/services/CMediatype.php:521
+#: include/classes/api/services/CMediatype.php:408
 #, c-format
 msgid "Media type \"%1$s\" already exists."
 msgstr ""
@@ -11353,11 +11149,6 @@ msgid "Media type enabled"
 msgid_plural "Media types enabled"
 msgstr[0] "示警媒介類型已啟用"
 
-#: include/classes/api/services/CMediatype.php:197
-#, c-format
-msgid "Media type is missing parameters: %1$s"
-msgstr ""
-
 #: app/controllers/CControllerPopupMediatypeTestSend.php:45
 #: app/controllers/CControllerPopupMediatypeTestSend.php:145
 msgid "Media type test failed."
@@ -11387,7 +11178,7 @@ msgstr ""
 msgid "Media types"
 msgstr "示警媒介類型"
 
-#: include/classes/api/services/CMediatype.php:1149
+#: include/classes/api/services/CMediatype.php:827
 #, c-format
 msgid "Media types used by action \"%1$s\"."
 msgstr ""
@@ -11475,7 +11266,7 @@ msgstr "訊息中"
 msgid "Method not found."
 msgstr "未發現方法."
 
-#: include/httptest.inc.php:395
+#: include/httptest.inc.php:399
 msgid "Microsoft Edge"
 msgstr ""
 
@@ -11537,7 +11328,7 @@ msgid "Minimum severity"
 msgstr ""
 
 #: app/controllers/CControllerTimeSelectorUpdate.php:244
-#: include/classes/mvc/CController.php:252
+#: include/classes/mvc/CController.php:305
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:439
 #: include/validate.inc.php:470
 #, c-format
@@ -11595,7 +11386,7 @@ msgstr "節點"
 msgid "Model"
 msgstr "模型"
 
-#: app/controllers/CControllerAuditLogList.php:230
+#: app/controllers/CControllerAuditLogList.php:231
 #: app/views/administration.module.edit.php:52
 msgid "Module"
 msgstr ""
@@ -11629,7 +11420,7 @@ msgstr[0] ""
 msgid "Module updated: %1$s."
 msgstr ""
 
-#: include/classes/api/services/CRole.php:695
+#: include/classes/api/services/CRole.php:714
 #, c-format
 msgid "Module with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -11655,7 +11446,7 @@ msgstr ""
 msgid "Mon"
 msgstr "一"
 
-#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:233
+#: include/func.inc.php:119 include/func.inc.php:209 jsLoader.php:214
 msgid "Monday"
 msgstr "週一"
 
@@ -11695,11 +11486,11 @@ msgstr "月"
 msgid "Monthly"
 msgstr "每月"
 
-#: include/classes/html/CMultiSelect.php:83 jsLoader.php:312
+#: include/classes/html/CMultiSelect.php:83 jsLoader.php:293
 msgid "More matches found..."
 msgstr ""
 
-#: jsLoader.php:322
+#: jsLoader.php:303
 #, c-format
 msgctxt "screen reader"
 msgid "More than %1$d matches for %2$s found"
@@ -11723,7 +11514,7 @@ msgstr ""
 msgid "Most critical of child services"
 msgstr ""
 
-#: include/httptest.inc.php:405
+#: include/httptest.inc.php:409
 msgid "Mozilla Firefox"
 msgstr "Mozilla Firefox"
 
@@ -11736,7 +11527,7 @@ msgstr ""
 msgid "Multiple PROBLEM events"
 msgstr "多重問題(PROBLEM)事件"
 
-#: jsLoader.php:282
+#: jsLoader.php:263
 msgid "Mute"
 msgstr "靜音"
 
@@ -11865,11 +11656,11 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
 #: app/views/popup.massupdate.trigger.php:98
-#: app/views/popup.service.edit.php:48 app/views/popup.service.edit.php:68
-#: app/views/popup.service.edit.php:134 app/views/popup.service.edit.php:270
-#: app/views/popup.services.php:40 app/views/popup.services.php:58
-#: app/views/popup.tabfilter.edit.php:31 app/views/popup.triggerwizard.php:81
-#: app/views/popup.valuemap.edit.php:103
+#: app/views/popup.service.edit.php:51 app/views/popup.service.edit.php:71
+#: app/views/popup.service.edit.php:151 app/views/popup.service.edit.php:279
+#: app/views/popup.service.edit.php:322 app/views/popup.services.php:41
+#: app/views/popup.services.php:59 app/views/popup.tabfilter.edit.php:31
+#: app/views/popup.triggerwizard.php:81 app/views/popup.valuemap.edit.php:103
 #: app/views/reports.scheduledreport.list.php:49 disc_prototypes.php:44
 #: graphs.php:43 host_discovery.php:50 httpconf.php:42
 #: include/classes/screens/CScreenHttpTest.php:113
@@ -12027,19 +11818,21 @@ msgstr "新的觸發條件"
 msgid "New dashboard"
 msgstr ""
 
-#: jsLoader.php:268
+#: jsLoader.php:249
 msgid "New element"
 msgstr "新的組件"
 
-#: include/correlation.inc.php:51 include/correlation.inc.php:143
+#: include/classes/helpers/CCorrelationHelper.php:54
+#: include/classes/helpers/CCorrelationHelper.php:129
 msgid "New event host group"
 msgstr ""
 
-#: include/correlation.inc.php:50 include/correlation.inc.php:138
+#: include/classes/helpers/CCorrelationHelper.php:53
+#: include/classes/helpers/CCorrelationHelper.php:123
 msgid "New event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:54
+#: include/classes/helpers/CCorrelationHelper.php:57
 msgid "New event tag value"
 msgstr ""
 
@@ -12051,7 +11844,7 @@ msgstr ""
 msgid "New regular expression"
 msgstr "新的正規表示式"
 
-#: app/controllers/CControllerPopupServiceEdit.php:183
+#: app/controllers/CControllerPopupServiceEdit.php:216
 msgid "New service"
 msgstr ""
 
@@ -12059,7 +11852,7 @@ msgstr ""
 msgid "New service time"
 msgstr "新的服務時間"
 
-#: app/views/popup.condition.common.php:121
+#: app/views/popup.condition.common.php:120
 msgid "New tag name"
 msgstr ""
 
@@ -12068,7 +11861,7 @@ msgid "New triggers"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:175
-#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:181
+#: app/views/monitoring.host.dashboard.view.php:112 jsLoader.php:162
 msgid "Next page"
 msgstr ""
 
@@ -12086,7 +11879,7 @@ msgstr ""
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:680
+#: app/views/popup.condition.common.php:679
 #: app/views/popup.lldoperation.php:85 app/views/popup.lldoperation.php:97
 #: app/views/popup.massupdate.item.php:328
 #: app/views/popup.massupdate.item.php:337
@@ -12115,30 +11908,6 @@ msgstr ""
 msgid "No"
 msgstr "不"
 
-#: include/classes/api/services/CCorrelation.php:643
-#: include/classes/api/services/CCorrelation.php:657
-#: include/classes/api/services/CCorrelation.php:858
-#: include/classes/api/services/CCorrelation.php:866
-#: include/classes/api/services/CCorrelation.php:879
-#: include/classes/api/services/CCorrelation.php:895
-#: include/classes/api/services/CCorrelation.php:907
-#: include/classes/api/services/CCorrelation.php:1007
-#: include/classes/api/services/CCorrelation.php:1042
-#: include/classes/api/services/CCorrelation.php:1076
-#: include/classes/api/services/CCorrelation.php:1097
-#: include/classes/api/services/CCorrelation.php:1114
-#: include/classes/api/services/CCorrelation.php:1134
-#: include/classes/api/services/CCorrelation.php:1242
-#: include/classes/api/services/CCorrelation.php:1300
-#, c-format
-msgid "No \"%1$s\" given for correlation \"%2$s\"."
-msgstr ""
-
-#: include/classes/api/services/CCorrelation.php:705
-#, c-format
-msgid "No \"%1$s\" given for correlation."
-msgstr ""
-
 #: include/classes/api/services/CGraphPrototype.php:39
 #, c-format
 msgid "No \"%1$s\" given for graph prototype."
@@ -12154,11 +11923,6 @@ msgstr ""
 msgid "No \"%1$s\" given for map."
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:453
-#, c-format
-msgid "No \"%1$s\" given for media type."
-msgstr ""
-
 #: include/classes/api/services/CAction.php:2655
 #: include/classes/api/services/CAction.php:2781
 #: include/classes/api/services/CAction.php:2975
@@ -12166,7 +11930,7 @@ msgstr ""
 msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1851
+#: include/classes/api/services/CDiscoveryRule.php:1847
 #, c-format
 msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -12176,7 +11940,7 @@ msgstr ""
 msgid "No \"%2$s\" given for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1817
+#: include/classes/api/services/CDiscoveryRule.php:1813
 #, c-format
 msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -12193,11 +11957,6 @@ msgstr "沒有指定的認證用戶名稱"
 msgid "No changes."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1022
-#, c-format
-msgid "No condition type given for correlation \"%1$s\"."
-msgstr ""
-
 #: app/views/configuration.correlation.edit.php:56
 #: include/views/configuration.action.edit.php:56
 msgid "No conditions defined."
@@ -12228,7 +11987,7 @@ msgstr "\"%2$s\"上之\"%1$s\"類型無預設介面."
 msgid "No details"
 msgstr "沒有細節"
 
-#: include/classes/api/services/CDiscoveryRule.php:640
+#: include/classes/api/services/CDiscoveryRule.php:636
 msgid "No discovery rule IDs given."
 msgstr "沒有所稱的探索規則ID"
 
@@ -12264,7 +12023,7 @@ msgstr ""
 msgid "No graphs added."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:643
+#: include/classes/api/services/CDiscoveryRule.php:639
 msgid "No host IDs given."
 msgstr "沒有所知的主機IDs"
 
@@ -12294,7 +12053,7 @@ msgstr "沒有圖片"
 #: app/views/popup.massupdate.item.php:67
 #: include/views/configuration.host.discovery.edit.php:493
 #: include/views/configuration.item.edit.php:546
-#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:369
+#: include/views/configuration.item.prototype.edit.php:533 jsLoader.php:350
 msgid "No interface found"
 msgstr "沒有找到介面"
 
@@ -12328,7 +12087,7 @@ msgstr ""
 msgid "No maps added."
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:82 jsLoader.php:311
+#: include/classes/html/CMultiSelect.php:82 jsLoader.php:292
 msgid "No matches found"
 msgstr ""
 
@@ -12336,17 +12095,46 @@ msgstr ""
 msgid "No new modules discovered"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:1307
-#, c-format
-msgid "No operation type given for correlation \"%1$s\"."
-msgstr ""
-
 #: include/classes/api/services/CUser.php:1550
 #: include/classes/api/services/CUser.php:2054
 msgid "No permissions for system access."
 msgstr "沒有系統存取的許可權"
 
 #: include/classes/api/clients/CLocalApiClient.php:105
+#: include/classes/api/services/CAuthentication.php:88
+#: include/classes/api/services/CAutoregistration.php:87
+#: include/classes/api/services/CCorrelation.php:133
+#: include/classes/api/services/CCorrelation.php:414
+#: include/classes/api/services/CCorrelation.php:460
+#: include/classes/api/services/CHostGroup.php:400
+#: include/classes/api/services/CHousekeeping.php:85
+#: include/classes/api/services/CIconMap.php:157
+#: include/classes/api/services/CIconMap.php:219
+#: include/classes/api/services/CIconMap.php:505
+#: include/classes/api/services/CMediatype.php:179
+#: include/classes/api/services/CMediatype.php:267
+#: include/classes/api/services/CMediatype.php:801
+#: include/classes/api/services/CModule.php:119
+#: include/classes/api/services/CModule.php:172
+#: include/classes/api/services/CModule.php:247
+#: include/classes/api/services/CProxy.php:187
+#: include/classes/api/services/CProxy.php:218
+#: include/classes/api/services/CProxy.php:388
+#: include/classes/api/services/CRegexp.php:48
+#: include/classes/api/services/CRegexp.php:115
+#: include/classes/api/services/CRegexp.php:290
+#: include/classes/api/services/CRegexp.php:375
+#: include/classes/api/services/CRole.php:137
+#: include/classes/api/services/CRole.php:230
+#: include/classes/api/services/CRole.php:345
+#: include/classes/api/services/CScript.php:240
+#: include/classes/api/services/CScript.php:316
+#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CSettings.php:135
+#: include/classes/api/services/CUserGroup.php:176
+#: include/classes/api/services/CUserGroup.php:260
+#: include/classes/api/services/CUserGroup.php:882
+#: include/classes/api/services/CUser.php:258
 #, c-format
 msgid "No permissions to call \"%1$s.%2$s\"."
 msgstr ""
@@ -12354,7 +12142,7 @@ msgstr ""
 #: app/controllers/CControllerChartsView.php:132
 #: app/controllers/CControllerChartsView.php:154
 #: app/controllers/CControllerDashboardPrint.php:96
-#: app/controllers/CControllerDashboardShareUpdate.php:93
+#: app/controllers/CControllerDashboardShareUpdate.php:98
 #: app/controllers/CControllerDashboardView.php:206
 #: app/controllers/CControllerDashboardView.php:254
 #: app/controllers/CControllerHintboxActionlist.php:50
@@ -12382,19 +12170,18 @@ msgstr ""
 #: include/classes/api/services/CAction.php:1863
 #: include/classes/api/services/CAction.php:2872
 #: include/classes/api/services/CConfiguration.php:78
-#: include/classes/api/services/CCorrelation.php:498
-#: include/classes/api/services/CCorrelation.php:680
-#: include/classes/api/services/CCorrelation.php:724
-#: include/classes/api/services/CCorrelation.php:934
+#: include/classes/api/services/CCorrelation.php:497
+#: include/classes/api/services/CCorrelation.php:653
+#: include/classes/api/services/CCorrelation.php:688
 #: include/classes/api/services/CDashboardGeneral.php:77
-#: include/classes/api/services/CDashboardGeneral.php:233
-#: include/classes/api/services/CDashboardGeneral.php:248
+#: include/classes/api/services/CDashboardGeneral.php:274
+#: include/classes/api/services/CDashboardGeneral.php:289
 #: include/classes/api/services/CDashboard.php:343
-#: include/classes/api/services/CDiscoveryRule.php:578
-#: include/classes/api/services/CDiscoveryRule.php:619
-#: include/classes/api/services/CDiscoveryRule.php:655
-#: include/classes/api/services/CDiscoveryRule.php:1770
-#: include/classes/api/services/CDiscoveryRule.php:2044
+#: include/classes/api/services/CDiscoveryRule.php:574
+#: include/classes/api/services/CDiscoveryRule.php:615
+#: include/classes/api/services/CDiscoveryRule.php:651
+#: include/classes/api/services/CDiscoveryRule.php:1766
+#: include/classes/api/services/CDiscoveryRule.php:2040
 #: include/classes/api/services/CDRule.php:190
 #: include/classes/api/services/CDRule.php:316
 #: include/classes/api/services/CDRule.php:343
@@ -12409,16 +12196,22 @@ msgstr ""
 #: include/classes/api/services/CGraphPrototype.php:369
 #: include/classes/api/services/CGraphPrototype.php:457
 #: include/classes/api/services/CGraphPrototype.php:519
+#: include/classes/api/services/CHistory.php:365
 #: include/classes/api/services/CHostBase.php:56
 #: include/classes/api/services/CHostBase.php:533
 #: include/classes/api/services/CHostGeneral.php:66
-#: include/classes/api/services/CHostGroup.php:790
-#: include/classes/api/services/CHostGroup.php:894
+#: include/classes/api/services/CHostGroup.php:598
+#: include/classes/api/services/CHostGroup.php:630
+#: include/classes/api/services/CHostGroup.php:1099
+#: include/classes/api/services/CHostGroup.php:1113
 #: include/classes/api/services/CHostGroup.php:1133
-#: include/classes/api/services/CHostGroup.php:1164
-#: include/classes/api/services/CHostGroup.php:1265
-#: include/classes/api/services/CHostGroup.php:1387
-#: include/classes/api/services/CHostGroup.php:1407
+#: include/classes/api/services/CHostGroup.php:1174
+#: include/classes/api/services/CHostGroup.php:1189
+#: include/classes/api/services/CHostGroup.php:1213
+#: include/classes/api/services/CHostGroup.php:1256
+#: include/classes/api/services/CHostGroup.php:1269
+#: include/classes/api/services/CHostGroup.php:1289
+#: include/classes/api/services/CHostGroup.php:1446
 #: include/classes/api/services/CHostInterface.php:301
 #: include/classes/api/services/CHostInterface.php:321
 #: include/classes/api/services/CHostInterface.php:595
@@ -12438,12 +12231,10 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:602
 #: include/classes/api/services/CHttpTest.php:689
 #: include/classes/api/services/CHttpTest.php:749
-#: include/classes/api/services/CIconMap.php:285
-#: include/classes/api/services/CIconMap.php:528
-#: include/classes/api/services/CImage.php:364
-#: include/classes/api/services/CImage.php:444
-#: include/classes/api/services/CImage.php:497
-#: include/classes/api/services/CImage.php:513
+#: include/classes/api/services/CIconMap.php:279
+#: include/classes/api/services/CIconMap.php:541
+#: include/classes/api/services/CImage.php:361
+#: include/classes/api/services/CImage.php:412
 #: include/classes/api/services/CItemGeneral.php:221
 #: include/classes/api/services/CItemGeneral.php:329
 #: include/classes/api/services/CItemGeneral.php:344
@@ -12464,27 +12255,29 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1611
 #: include/classes/api/services/CMap.php:2056
 #: include/classes/api/services/CMap.php:2118
-#: include/classes/api/services/CMediatype.php:478
-#: include/classes/api/services/CModule.php:214
-#: include/classes/api/services/CModule.php:246
-#: include/classes/api/services/CProxy.php:388
-#: include/classes/api/services/CProxy.php:623
-#: include/classes/api/services/CProxy.php:850
-#: include/classes/api/services/CRegexp.php:339
-#: include/classes/api/services/CRegexp.php:369
+#: include/classes/api/services/CMediatype.php:365
+#: include/classes/api/services/CMediatype.php:817
+#: include/classes/api/services/CModule.php:226
+#: include/classes/api/services/CModule.php:264
+#: include/classes/api/services/CProxy.php:406
+#: include/classes/api/services/CProxy.php:648
+#: include/classes/api/services/CProxy.php:875
+#: include/classes/api/services/CRegexp.php:357
+#: include/classes/api/services/CRegexp.php:392
 #: include/classes/api/services/CReport.php:549
 #: include/classes/api/services/CReport.php:909
-#: include/classes/api/services/CRole.php:314
-#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:540
-#: include/classes/api/services/CScript.php:982
-#: include/classes/api/services/CScript.php:1043
-#: include/classes/api/services/CScript.php:1060
-#: include/classes/api/services/CScript.php:1071
-#: include/classes/api/services/CService.php:389
-#: include/classes/api/services/CService.php:454
-#: include/classes/api/services/CService.php:1713
-#: include/classes/api/services/CService.php:1725
+#: include/classes/api/services/CRole.php:326
+#: include/classes/api/services/CRole.php:363
+#: include/classes/api/services/CScript.php:375
+#: include/classes/api/services/CScript.php:860
+#: include/classes/api/services/CScript.php:920
+#: include/classes/api/services/CScript.php:937
+#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CService.php:410
+#: include/classes/api/services/CService.php:475
+#: include/classes/api/services/CService.php:895
+#: include/classes/api/services/CService.php:2234
+#: include/classes/api/services/CService.php:2246
 #: include/classes/api/services/CTask.php:430
 #: include/classes/api/services/CTask.php:477
 #: include/classes/api/services/CTemplateDashboard.php:289
@@ -12501,14 +12294,14 @@ msgstr ""
 #: include/classes/api/services/CTriggerPrototype.php:515
 #: include/classes/api/services/CTriggerPrototype.php:693
 #: include/classes/api/services/CTriggerPrototype.php:711
-#: include/classes/api/services/CUserGroup.php:326
-#: include/classes/api/services/CUserGroup.php:893
-#: include/classes/api/services/CUserMacro.php:353
-#: include/classes/api/services/CUserMacro.php:463
-#: include/classes/api/services/CUserMacro.php:550
-#: include/classes/api/services/CUserMacro.php:742
-#: include/classes/api/services/CUserMacro.php:804
-#: include/classes/api/services/CUser.php:542
+#: include/classes/api/services/CUserGroup.php:315
+#: include/classes/api/services/CUserGroup.php:921
+#: include/classes/api/services/CUserMacro.php:345
+#: include/classes/api/services/CUserMacro.php:450
+#: include/classes/api/services/CUserMacro.php:537
+#: include/classes/api/services/CUserMacro.php:729
+#: include/classes/api/services/CUserMacro.php:791
+#: include/classes/api/services/CUser.php:548
 #: include/classes/api/services/CUser.php:1245
 #: include/classes/api/services/CUser.php:1773
 #: include/classes/api/services/CValueMap.php:299
@@ -12517,7 +12310,7 @@ msgstr ""
 #: include/classes/helpers/CMapHelper.php:83
 #: include/classes/screens/CScreenHistory.php:140
 #: include/classes/screens/CScreenHttpTestDetails.php:46
-#: include/func.inc.php:1488 items.php:1240
+#: include/func.inc.php:1488 items.php:1162
 msgid "No permissions to referred object or it does not exist!"
 msgstr "沒有所說的物件的許可權或其不存在!"
 
@@ -12537,7 +12330,7 @@ msgstr "沒有指定的公開金鑰檔"
 msgid "No recipients for action operation message."
 msgstr "沒有動作操作訊息的收受者."
 
-#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:176
+#: include/classes/widgets/CWidgetConfig.php:282 jsLoader.php:157
 msgid "No refresh"
 msgstr ""
 
@@ -12549,7 +12342,7 @@ msgstr "沒有指定給動作操作命令的腳本."
 msgid "No target selected"
 msgstr "沒有選擇目標"
 
-#: graphs.php:396 items.php:1058
+#: graphs.php:396 items.php:1026
 msgid "No target selected."
 msgstr "沒有已選的目標"
 
@@ -12566,7 +12359,7 @@ msgstr "沒有已定義的觸發器."
 msgid "No value"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1021
+#: include/classes/validators/CApiInputValidator.php:1078
 msgid "Non-boolean flags are deprecated."
 msgstr ""
 
@@ -12636,15 +12429,15 @@ msgstr ""
 msgid "Not all templates are linked to \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:571
+#: include/classes/api/services/CUser.php:577
 msgid "Not allowed to set language for user \"guest\"."
 msgstr ""
 
-#: include/classes/api/services/CUser.php:563
+#: include/classes/api/services/CUser.php:569
 msgid "Not allowed to set password for user \"guest\"."
 msgstr "不允許設定用戶\"guest\"的密碼."
 
-#: include/classes/api/services/CUser.php:574
+#: include/classes/api/services/CUser.php:580
 msgid "Not allowed to set theme for user \"guest\"."
 msgstr ""
 
@@ -12676,7 +12469,7 @@ msgstr ""
 msgid "Not supported"
 msgstr "不支持的"
 
-#: app/views/popup.service.edit.php:219
+#: app/views/popup.service.edit.php:232
 #: app/views/popup.service.time.edit.php:123
 msgid "Note"
 msgstr "備註"
@@ -12707,7 +12500,7 @@ msgstr ""
 msgid "Nov"
 msgstr "十一"
 
-#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:231
+#: include/func.inc.php:110 include/func.inc.php:247 jsLoader.php:212
 msgid "November"
 msgstr "十一月"
 
@@ -12894,8 +12687,8 @@ msgstr "OEM"
 #: app/views/js/reports.scheduledreport.edit.js.php:77
 #: app/views/monitoring.service.list.edit.php:87
 #: app/views/monitoring.service.list.php:83
-#: app/views/popup.service.edit.php:192 chart4.php:164
-#: include/classes/helpers/CServiceHelper.php:131
+#: app/views/popup.service.edit.php:205 chart4.php:164
+#: include/classes/helpers/CServiceHelper.php:133
 #: include/classes/helpers/CSeverityHelper.php:34
 #: include/classes/screens/CScreenHttpTestDetails.php:100
 #: include/classes/screens/CScreenHttpTestDetails.php:186
@@ -12955,13 +12748,13 @@ msgstr "十月"
 msgid "Octal to decimal"
 msgstr ""
 
-#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:230
+#: include/func.inc.php:109 include/func.inc.php:246 jsLoader.php:211
 msgid "October"
 msgstr "十月"
 
 #: app/views/administration.proxy.list.php:156
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:250
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:231
 msgid "Off"
 msgstr "關"
 
@@ -12969,30 +12762,31 @@ msgstr "關"
 #: app/views/js/popup.massupdate.js.php:415
 #: app/views/js/popup.mediatypetest.edit.js.php:114
 #: app/views/js/popup.scriptexec.js.php:53
-#: app/views/js/reports.auditlog.list.js.php:153
+#: app/views/js/reports.auditlog.list.js.php:157
 #: app/views/monitoring.widget.web.view.php:30
 #: include/views/configuration.triggers.list.php:94
 #: include/views/js/common.item.edit.js.php:334
-#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:381
+#: include/views/js/configuration.httpconf.edit.js.php:103 jsLoader.php:362
 #: report2.php:507
 msgid "Ok"
 msgstr "正常"
 
-#: include/correlation.inc.php:49 include/correlation.inc.php:133
+#: include/classes/helpers/CCorrelationHelper.php:52
+#: include/classes/helpers/CCorrelationHelper.php:117
 msgid "Old event tag name"
 msgstr ""
 
-#: include/correlation.inc.php:53
+#: include/classes/helpers/CCorrelationHelper.php:56
 msgid "Old event tag value"
 msgstr ""
 
-#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:118
 msgid "Old tag name"
 msgstr ""
 
 #: app/views/administration.proxy.list.php:155
 #: include/views/monitoring.sysmap.constructor.php:51
-#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:249
+#: include/views/monitoring.sysmap.constructor.php:61 jsLoader.php:230
 msgid "On"
 msgstr "開"
 
@@ -13008,35 +12802,15 @@ msgstr "一次"
 msgid "One"
 msgstr ""
 
-#: include/classes/api/services/CHostGroup.php:1275
-msgid "One of the objects is left without a host group."
-msgstr ""
-
 #: app/views/popup.maintenance.period.php:75 include/maintenances.inc.php:25
 msgid "One time only"
 msgstr "一次性"
 
-#: app/partials/service.time.row.php:40
+#: app/views/js/popup.service.edit.js.php:229
 #: app/views/popup.service.time.edit.php:48
 msgid "One-time downtime"
 msgstr " 單次停機"
 
-#: include/classes/api/services/CHostGroup.php:719
-msgid "Only Super Admins can create host groups."
-msgstr "只有超級管理員可以創建主機群組."
-
-#: include/classes/api/services/CMediatype.php:178
-msgid "Only Super Admins can create media types."
-msgstr "只有超級管理員可以創建示警媒介類型."
-
-#: include/classes/api/services/CMediatype.php:1139
-msgid "Only Super Admins can delete media types."
-msgstr "只有超級管理員可以刪除示警媒介類型."
-
-#: include/classes/api/services/CMediatype.php:444
-msgid "Only Super Admins can edit media types."
-msgstr "只有超級管理員可以編輯示警媒介類型."
-
 #: include/classes/api/services/CDRule.php:488
 msgid "Only Zabbix agent, SNMPv1, SNMPv2 and SNMPv3 checks can be made unique."
 msgstr ""
@@ -13084,10 +12858,6 @@ msgstr ""
 msgid "Only services without problem tags"
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:519
-msgid "Only super admins can create correlations."
-msgstr ""
-
 #: include/classes/api/services/CDashboard.php:414
 msgid "Only super admins can set dashboard owner."
 msgstr ""
@@ -13096,15 +12866,11 @@ msgstr ""
 msgid "Only super admins can set report owner."
 msgstr ""
 
-#: include/classes/api/services/CCorrelation.php:696
-msgid "Only super admins can update correlations."
-msgstr ""
-
 #: include/blocks.inc.php:561
 msgid "Only triggers assigned to enabled hosts and depending on enabled items are counted"
 msgstr "只計算指派給啟用的主機的和相依於啟用的項目的觸發器"
 
-#: include/httptest.inc.php:417
+#: include/httptest.inc.php:421
 msgid "Opera"
 msgstr "Opera"
 
@@ -13113,7 +12879,7 @@ msgstr "Opera"
 msgid "Operating system information. Returns string"
 msgstr ""
 
-#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:68
+#: app/partials/popup.operations.php:41 app/views/popup.service.edit.php:71
 msgid "Operation"
 msgstr ""
 
@@ -13122,11 +12888,11 @@ msgstr ""
 msgid "Operation \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/mvc/CController.php:164 include/validate.inc.php:308
+#: include/classes/mvc/CController.php:209 include/validate.inc.php:308
 msgid "Operation cannot be performed due to unauthorized request."
 msgstr "由於未認證的請求, 操作無法完成."
 
-#: jsLoader.php:141
+#: jsLoader.php:122
 msgid "Operation details"
 msgstr "操作細節"
 
@@ -13148,7 +12914,7 @@ msgstr "操作並無模板來操作."
 msgid "Operational data"
 msgstr ""
 
-#: app/views/configuration.correlation.edit.php:140
+#: app/views/configuration.correlation.edit.php:142
 #: app/views/configuration.correlation.list.php:77
 #: app/views/popup.lldoverride.php:210
 #: include/views/configuration.action.edit.php:310
@@ -13157,33 +12923,33 @@ msgstr ""
 msgid "Operations"
 msgstr "操作"
 
-#: app/views/popup.condition.common.php:73
-#: app/views/popup.condition.common.php:101
-#: app/views/popup.condition.common.php:120
-#: app/views/popup.condition.common.php:140
-#: app/views/popup.condition.common.php:208
-#: app/views/popup.condition.common.php:220
-#: app/views/popup.condition.common.php:251
-#: app/views/popup.condition.common.php:282
-#: app/views/popup.condition.common.php:293
-#: app/views/popup.condition.common.php:307
-#: app/views/popup.condition.common.php:325
-#: app/views/popup.condition.common.php:357
-#: app/views/popup.condition.common.php:372
-#: app/views/popup.condition.common.php:387
-#: app/views/popup.condition.common.php:420
-#: app/views/popup.condition.common.php:438
-#: app/views/popup.condition.common.php:468
-#: app/views/popup.condition.common.php:488
-#: app/views/popup.condition.common.php:520
-#: app/views/popup.condition.common.php:531
-#: app/views/popup.condition.common.php:549
-#: app/views/popup.condition.common.php:564
-#: app/views/popup.condition.common.php:580
-#: app/views/popup.condition.common.php:601
-#: app/views/popup.condition.common.php:614
-#: app/views/popup.condition.common.php:642
-#: app/views/popup.condition.common.php:684 include/hosts.inc.php:62
+#: app/views/popup.condition.common.php:71
+#: app/views/popup.condition.common.php:100
+#: app/views/popup.condition.common.php:119
+#: app/views/popup.condition.common.php:139
+#: app/views/popup.condition.common.php:207
+#: app/views/popup.condition.common.php:219
+#: app/views/popup.condition.common.php:250
+#: app/views/popup.condition.common.php:281
+#: app/views/popup.condition.common.php:292
+#: app/views/popup.condition.common.php:306
+#: app/views/popup.condition.common.php:324
+#: app/views/popup.condition.common.php:356
+#: app/views/popup.condition.common.php:371
+#: app/views/popup.condition.common.php:386
+#: app/views/popup.condition.common.php:419
+#: app/views/popup.condition.common.php:437
+#: app/views/popup.condition.common.php:467
+#: app/views/popup.condition.common.php:487
+#: app/views/popup.condition.common.php:519
+#: app/views/popup.condition.common.php:530
+#: app/views/popup.condition.common.php:548
+#: app/views/popup.condition.common.php:563
+#: app/views/popup.condition.common.php:579
+#: app/views/popup.condition.common.php:600
+#: app/views/popup.condition.common.php:613
+#: app/views/popup.condition.common.php:641
+#: app/views/popup.condition.common.php:683 include/hosts.inc.php:62
 msgid "Operator"
 msgstr "操作者"
 
@@ -13292,7 +13058,7 @@ msgstr "其它組態參數"
 msgid "Other parameters"
 msgstr "其他参數"
 
-#: include/httptest.inc.php:428
+#: include/httptest.inc.php:432
 #: include/views/configuration.httpconf.edit.php:88
 msgid "Others"
 msgstr "其它"
@@ -13306,7 +13072,7 @@ msgstr ""
 msgid "Output"
 msgstr ""
 
-#: include/classes/api/services/CDashboardGeneral.php:292
+#: include/classes/api/services/CDashboardGeneral.php:333
 #, c-format
 msgid "Overlapping widgets at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\"."
 msgstr ""
@@ -13335,7 +13101,7 @@ msgid "Override with name \"%1$s\" already exists."
 msgstr ""
 
 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:402
-#: include/classes/widgets/views/widget.svggraph.form.view.php:296
+#: include/classes/widgets/views/widget.svggraph.form.view.php:297
 #: include/views/configuration.host.discovery.edit.php:867
 #: include/views/configuration.host.discovery.edit.php:884
 msgid "Overrides"
@@ -13524,7 +13290,7 @@ msgstr "POP"
 
 #: app/views/hintbox.eventlist.php:116
 #: app/views/monitoring.widget.problems.view.php:109
-#: include/classes/graph/CSvgGraph.php:1075
+#: include/classes/graph/CSvgGraph.php:1081
 #: include/classes/screens/CScreenProblem.php:974
 #: include/classes/screens/CScreenProblem.php:1185 include/events.inc.php:376
 #: include/triggers.inc.php:73 include/views/monitoring.overview.items.php:36
@@ -13569,7 +13335,7 @@ msgstr ""
 msgid "PSK identity"
 msgstr ""
 
-#: jsLoader.php:154
+#: jsLoader.php:135
 #, c-format
 msgid "Page %1$d"
 msgstr ""
@@ -13592,16 +13358,16 @@ msgstr ""
 msgid "Parameter"
 msgstr "参數"
 
-#: include/classes/api/services/CUserGroup.php:230
-#: include/classes/api/services/CUserGroup.php:332
+#: include/classes/api/services/CUserGroup.php:236
+#: include/classes/api/services/CUserGroup.php:321
 #: include/classes/api/services/CUser.php:182
 #: include/classes/api/services/CUser.php:189
-#: include/classes/api/services/CUser.php:331
-#: include/classes/api/services/CUser.php:349
-#: include/classes/api/services/CUser.php:486
-#: include/classes/api/services/CUser.php:533
+#: include/classes/api/services/CUser.php:337
+#: include/classes/api/services/CUser.php:355
+#: include/classes/api/services/CUser.php:492
+#: include/classes/api/services/CUser.php:539
 #: include/classes/api/services/CUser.php:1483
-#: include/classes/validators/CApiInputValidator.php:1086
+#: include/classes/validators/CApiInputValidator.php:1174
 #, c-format
 msgid "Parameter \"%1$s\" is deprecated."
 msgstr ""
@@ -13631,7 +13397,7 @@ msgstr "上層項目"
 
 #: app/partials/monitoring.service.list.edit.php:40
 #: app/partials/monitoring.service.list.php:34
-#: app/partials/service.info.php:62 app/views/popup.service.edit.php:57
+#: app/partials/service.info.php:62 app/views/popup.service.edit.php:60
 msgid "Parent services"
 msgstr ""
 
@@ -13648,7 +13414,7 @@ msgstr "上層觸發器"
 msgid "Parent web scenarios"
 msgstr ""
 
-#: include/classes/api/services/CService.php:795
+#: include/classes/api/services/CService.php:1304
 #, c-format
 msgid "Parent-child relation conflict in services \"%1$s\" and \"%2$s\"."
 msgstr ""
@@ -13660,11 +13426,6 @@ msgstr ""
 msgid "Parse"
 msgstr ""
 
-#: include/classes/api/services/CImage.php:218
-#, c-format
-msgid "Parse SQL error [%1$s] in [%2$s]."
-msgstr "解析SQL錯誤[%1$s]於[%2$s]之中."
-
 #: include/classes/core/CJsonRpc.php:171
 msgid "Parse error"
 msgstr "解析錯誤"
@@ -13725,7 +13486,7 @@ msgstr ""
 msgid "Password requirements:"
 msgstr ""
 
-#: jsLoader.php:177 jsLoader.php:270
+#: jsLoader.php:158 jsLoader.php:251
 msgid "Paste"
 msgstr ""
 
@@ -13735,15 +13496,15 @@ msgid "Paste page"
 msgstr ""
 
 #: app/views/js/configuration.dashboard.edit.js.php:210
-#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:155
+#: app/views/js/monitoring.dashboard.view.js.php:276 jsLoader.php:136
 msgid "Paste widget"
 msgstr ""
 
-#: jsLoader.php:271
+#: jsLoader.php:252
 msgid "Paste without external links"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:863
+#: app/controllers/CControllerPopupTriggerExpr.php:870
 #: app/views/monitoring.charts.view.php:107
 msgid "Pattern"
 msgstr ""
@@ -13789,12 +13550,11 @@ msgstr ""
 #: app/partials/scheduledreport.formgrid.html.php:87
 #: app/partials/scheduledreport.table.html.php:42
 #: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:180
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
 #: include/views/configuration.host.discovery.edit.php:584
 #: include/views/configuration.item.edit.php:675
 #: include/views/configuration.item.prototype.edit.php:654
 #: include/views/configuration.maintenance.edit.php:45 report4.php:101
-#: srv_status.php:164
 msgid "Period"
 msgstr "期間"
 
@@ -13883,7 +13643,7 @@ msgstr ""
 msgid "Please enter the host name or host IP address and port number of the Zabbix server, as well as the name of the installation (optional)."
 msgstr ""
 
-#: jsLoader.php:259
+#: jsLoader.php:240
 msgid "Please select two elements"
 msgstr "請選擇兩組件"
 
@@ -13923,7 +13683,7 @@ msgstr "填入主機資產紀錄欄位"
 #: app/views/administration.proxy.edit.php:50
 #: app/views/administration.script.edit.php:163
 #: app/views/popup.itemtestedit.view.php:113
-#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1307
+#: include/classes/setup/CSetupWizard.php:445 include/hosts.inc.php:1240
 #: include/views/configuration.host.list.php:106
 #: include/views/inventory.host.view.php:79 setup.php:62
 msgid "Port"
@@ -14012,7 +13772,7 @@ msgid "Previous month"
 msgstr ""
 
 #: app/views/monitoring.dashboard.view.php:157
-#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:182
+#: app/views/monitoring.host.dashboard.view.php:94 jsLoader.php:163
 msgid "Previous page"
 msgstr ""
 
@@ -14143,7 +13903,7 @@ msgstr ""
 msgid "Problem is suppressed"
 msgstr ""
 
-#: jsLoader.php:280
+#: jsLoader.php:261
 msgid "Problem on"
 msgstr "問題在"
 
@@ -14156,21 +13916,17 @@ msgstr ""
 msgid "Problem resolved"
 msgstr ""
 
-#: app/views/popup.service.edit.php:61 app/views/popup.service.edit.php:286
-#: app/views/popup.services.php:60
+#: app/views/popup.service.edit.php:64 app/views/popup.service.edit.php:296
+#: app/views/popup.services.php:61
 msgid "Problem tags"
 msgstr ""
 
-#: srv_status.php:147
-msgid "Problem time"
-msgstr ""
-
 #: app/views/popup.mediatype.message.php:55
 #: include/classes/helpers/CMediatypeHelper.php:79
 msgid "Problem update"
 msgstr ""
 
-#: app/controllers/CControllerProblemView.php:155
+#: app/controllers/CControllerProblemView.php:151
 #: app/partials/common.filter.trigger.php:48
 #: app/partials/monitoring.host.view.html.php:33
 #: app/partials/monitoring.host.view.html.php:36
@@ -14184,9 +13940,9 @@ msgstr ""
 #: include/classes/widgets/CWidgetConfig.php:58
 #: include/classes/widgets/forms/CWidgetFormProblems.php:35
 #: include/classes/widgets/forms/CWidgetFormTrigOver.php:35
-#: include/classes/widgets/views/widget.svggraph.form.view.php:295
+#: include/classes/widgets/views/widget.svggraph.form.view.php:296
 #: include/views/inventory.host.view.php:151
-#: include/views/inventory.host.view.php:156 jsLoader.php:354 report2.php:507
+#: include/views/inventory.host.view.php:156 jsLoader.php:335 report2.php:507
 msgid "Problems"
 msgstr "問題"
 
@@ -14220,7 +13976,7 @@ msgid "Prometheus to JSON"
 msgstr ""
 
 #: include/views/monitoring.sysmap.list.php:77
-#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:156
+#: include/views/monitoring.sysmap.list.php:78 jsLoader.php:137
 msgid "Properties"
 msgstr ""
 
@@ -14241,13 +13997,13 @@ msgstr ""
 msgid "Proxies"
 msgstr "系統代理程式"
 
-#: app/controllers/CControllerAuditLogList.php:231
+#: app/controllers/CControllerAuditLogList.php:232
 #: app/views/administration.proxy.edit.php:90
 #: app/views/administration.proxy.edit.php:143
 #: app/views/administration.queue.details.php:49
 #: app/views/administration.queue.overview.proxy.php:45
 #: app/views/configuration.discovery.list.php:78
-#: app/views/popup.condition.common.php:521
+#: app/views/popup.condition.common.php:520
 #: app/views/popup.itemtestedit.view.php:238 include/actions.inc.php:62
 #: include/views/configuration.host.list.php:114
 #: include/views/configuration.host.list.php:118
@@ -14255,7 +14011,7 @@ msgstr "系統代理程式"
 msgid "Proxy"
 msgstr "系統代理程式"
 
-#: include/classes/api/services/CProxy.php:581
+#: include/classes/api/services/CProxy.php:606
 #, c-format
 msgid "Proxy \"%1$s\" already exists."
 msgstr ""
@@ -14265,12 +14021,12 @@ msgstr ""
 msgid "Proxy \"%1$s\" for host \"%2$s\" does not exist."
 msgstr "主機\"%2$s\"的系統代理程式\"%1$s\"不存在."
 
-#: include/classes/api/services/CProxy.php:453
+#: include/classes/api/services/CProxy.php:471
 #, c-format
 msgid "Proxy \"%1$s\" is used by action \"%2$s\"."
 msgstr ""
 
-#: include/classes/api/services/CProxy.php:410
+#: include/classes/api/services/CProxy.php:428
 #, c-format
 msgid "Proxy \"%1$s\" is used by discovery rule \"%2$s\"."
 msgstr "系統代理程式\"%1$s\"是用在探索規則\"%2$s\"上."
@@ -14362,7 +14118,7 @@ msgstr ""
 
 #: app/views/hintbox.eventlist.php:100
 #: app/views/monitoring.widget.problems.view.php:93
-#: include/classes/graph/CSvgGraph.php:1071
+#: include/classes/graph/CSvgGraph.php:1077
 #: include/classes/screens/CScreenProblem.php:958
 #: include/classes/screens/CScreenProblem.php:1173 include/events.inc.php:360
 msgid "RESOLVED"
@@ -14439,10 +14195,6 @@ msgstr ""
 msgid "Reads modbus data. Returns various types"
 msgstr ""
 
-#: srv_status.php:146
-msgid "Reason"
-msgstr ""
-
 #: include/actions.inc.php:60
 msgid "Received value"
 msgstr "接收到的值"
@@ -14524,7 +14276,7 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:178
+#: include/classes/widgets/forms/CWidgetForm.php:58 jsLoader.php:159
 msgid "Refresh interval"
 msgstr ""
 
@@ -14542,13 +14294,13 @@ msgstr ""
 msgid "Regular"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:232
+#: app/controllers/CControllerAuditLogList.php:233
 #: app/views/popup.lldoverride.php:101 include/items.inc.php:1803
 #: include/views/configuration.host.discovery.edit.php:687
 msgid "Regular expression"
 msgstr "正規表示式"
 
-#: include/classes/api/services/CRegexp.php:184
+#: include/classes/api/services/CRegexp.php:196
 #, c-format
 msgid "Regular expression \"%1$s\" already exists."
 msgstr ""
@@ -14580,7 +14332,7 @@ msgstr "正規表示式"
 msgid "Related reports"
 msgstr ""
 
-#: jsLoader.php:163
+#: jsLoader.php:144
 msgid "Release to create a widget."
 msgstr ""
 
@@ -14612,8 +14364,6 @@ msgstr "遠端命令"
 #: app/partials/monitoring.problem.filter.php:191
 #: app/partials/monitoring.problem.filter.php:340
 #: app/partials/monitoring.problem.filter.php:373
-#: app/partials/service.statusrule.row.php:41
-#: app/partials/service.time.row.php:62
 #: app/views/administration.iconmap.edit.php:88
 #: app/views/administration.macros.edit.php:76
 #: app/views/administration.mediatype.edit.php:111
@@ -14634,7 +14384,9 @@ msgstr "遠端命令"
 #: app/views/js/popup.massupdate.tmpl.js.php:59
 #: app/views/js/popup.massupdate.tmpl.js.php:96
 #: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:46
+#: app/views/js/popup.service.edit.js.php:194
+#: app/views/js/popup.service.edit.js.php:218
+#: app/views/js/popup.service.edit.js.php:237
 #: app/views/popup.dashboard.share.edit.php:85
 #: app/views/popup.dashboard.share.edit.php:106
 #: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
@@ -14647,7 +14399,7 @@ msgstr "遠端命令"
 #: app/views/popup.massupdate.template.php:54
 #: app/views/popup.massupdate.template.php:136
 #: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
-#: app/views/popup.media.php:110 app/views/popup.service.edit.php:97
+#: app/views/popup.media.php:110 app/views/popup.service.edit.php:104
 #: app/views/popup.valuemap.edit.php:91
 #: include/classes/helpers/CTagFilterFieldHelper.php:82
 #: include/classes/helpers/CTagFilterFieldHelper.php:135
@@ -14724,8 +14476,8 @@ msgstr "遠端命令"
 #: include/views/monitoring.sysmap.constructor.php:34
 #: include/views/monitoring.sysmap.constructor.php:40
 #: include/views/monitoring.sysmap.constructor.php:46
-#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:198
-#: jsLoader.php:267
+#: include/views/monitoring.sysmap.edit.php:292 jsLoader.php:179
+#: jsLoader.php:248
 msgid "Remove"
 msgstr "移除"
 
@@ -14765,7 +14517,7 @@ msgstr ""
 msgid "Removed"
 msgstr ""
 
-#: jsLoader.php:317
+#: jsLoader.php:298
 #, c-format
 msgctxt "screen reader"
 msgid "Removed, %1$s"
@@ -14807,7 +14559,7 @@ msgid "Replace dependencies"
 msgstr "替換相依關係"
 
 #: app/controllers/CControllerPopupTriggerExpr.php:640
-#: app/controllers/CControllerPopupTriggerExpr.php:868
+#: app/controllers/CControllerPopupTriggerExpr.php:875
 msgid "Replacement"
 msgstr ""
 
@@ -14862,7 +14614,7 @@ msgstr ""
 msgid "Request body type"
 msgstr ""
 
-#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1146
+#: host_discovery.php:424 host_discovery.php:780 items.php:952 items.php:1068
 msgid "Request sent successfully"
 msgstr ""
 
@@ -14904,8 +14656,8 @@ msgstr "要求的狀態碼"
 msgid "Required string"
 msgstr "要求的字串"
 
-#: app/views/popup.services.php:49 include/classes/html/CFilter.php:215
-#: include/classes/html/CTabFilter.php:97
+#: app/views/popup.service.edit.php:332 app/views/popup.services.php:50
+#: include/classes/html/CFilter.php:215 include/classes/html/CTabFilter.php:97
 msgid "Reset"
 msgstr "重設"
 
@@ -14938,7 +14690,7 @@ msgstr "重設確認"
 msgid "Reset defaults"
 msgstr "重設預設"
 
-#: jsLoader.php:281
+#: jsLoader.php:262
 msgid "Resolved"
 msgstr "已解決"
 
@@ -15004,7 +14756,7 @@ msgstr ""
 #: app/views/popup.itemtestedit.view.php:326
 #: app/views/popup.itemtestedit.view.php:366
 #: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:216
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
 #: include/classes/debug/CProfiler.php:183
 msgid "Result"
 msgstr "結果"
@@ -15191,12 +14943,12 @@ msgstr ""
 msgid "Russian (ru_RU)"
 msgstr "俄語 (ru_RU)"
 
-#: jsLoader.php:245
+#: jsLoader.php:226
 msgctxt "Saturday short"
 msgid "S"
 msgstr "S"
 
-#: jsLoader.php:246
+#: jsLoader.php:227
 msgctxt "Sunday short"
 msgid "S"
 msgstr "S"
@@ -15207,8 +14959,8 @@ msgstr ""
 
 #: app/partials/monitoring.service.list.edit.php:56
 #: app/partials/monitoring.service.list.php:53
-#: app/partials/service.info.php:72 app/views/popup.service.edit.php:240
-#: app/views/popup.service.edit.php:315 srv_status.php:149
+#: app/partials/service.info.php:72 app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:354
 msgid "SLA"
 msgstr "SLA"
 
@@ -15245,7 +14997,7 @@ msgstr ""
 
 #: app/views/monitoring.widget.hostavail.view.php:28
 #: include/classes/widgets/views/widget.hostavail.form.view.php:47
-#: include/hosts.inc.php:465 include/hosts.inc.php:1271
+#: include/hosts.inc.php:465 include/hosts.inc.php:1204
 #: include/items.inc.php:348
 #: include/views/js/configuration.host.edit.js.php:176
 msgid "SNMP"
@@ -15341,12 +15093,12 @@ msgstr ""
 msgid "SQL query"
 msgstr ""
 
-#: include/classes/db/DB.php:946
+#: include/classes/db/DB.php:975
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\""
 msgstr "SQL陳述式執行已失敗: \"%1$s\""
 
-#: include/classes/db/DB.php:614 include/classes/db/DB.php:673
+#: include/classes/db/DB.php:643 include/classes/db/DB.php:702
 #, c-format
 msgid "SQL statement execution has failed \"%1$s\"."
 msgstr "SQL陳述式執行已失敗: \"%1$s\"."
@@ -15409,7 +15161,7 @@ msgstr ""
 msgid "STARTTLS"
 msgstr ""
 
-#: include/httptest.inc.php:422
+#: include/httptest.inc.php:426
 msgid "Safari"
 msgstr "Safari"
 
@@ -15421,7 +15173,7 @@ msgstr ""
 msgid "Sat"
 msgstr "六"
 
-#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:238
+#: include/func.inc.php:124 include/func.inc.php:214 jsLoader.php:219
 msgid "Saturday"
 msgstr "週六"
 
@@ -15463,7 +15215,7 @@ msgstr "排程"
 msgid "Scheduled check"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:234
+#: app/controllers/CControllerAuditLogList.php:235
 #: app/views/reports.scheduledreport.edit.php:58
 msgid "Scheduled report"
 msgstr ""
@@ -15527,7 +15279,7 @@ msgctxt "selected problems"
 msgid "Scope"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:235
+#: app/controllers/CControllerAuditLogList.php:236
 #: app/views/administration.mediatype.edit.php:218
 #: app/views/administration.script.edit.php:116
 #: app/views/administration.script.edit.php:186
@@ -15540,8 +15292,7 @@ msgstr ""
 msgid "Script"
 msgstr "脚本"
 
-#: include/classes/api/services/CScript.php:320
-#: include/classes/api/services/CScript.php:561
+#: include/classes/api/services/CScript.php:1346
 #, c-format
 msgid "Script \"%1$s\" already exists."
 msgstr ""
@@ -15572,12 +15323,6 @@ msgstr "脚本名稱"
 msgid "Script parameters"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:341
-#: include/classes/api/services/CMediatype.php:667
-#, c-format
-msgid "Script parameters \"%1$s\" are missing the last new line feed for media type \"%2$s\"."
-msgstr ""
-
 #: include/classes/debug/CProfiler.php:145
 msgid "Script profiler"
 msgstr "腳本探查器"
@@ -15590,7 +15335,7 @@ msgstr "脚本已更新"
 #: app/views/administration.script.edit.php:31
 #: app/views/administration.script.list.php:31
 #: include/classes/helpers/CMenuHelper.php:295
-#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:355
+#: include/classes/helpers/CRoleHelper.php:388 jsLoader.php:336
 msgid "Scripts"
 msgstr "脚本"
 
@@ -15660,8 +15405,8 @@ msgid "Security name"
 msgstr ""
 
 #: app/views/monitoring.widget.navtreeitem.edit.php:48
-#: app/views/popup.condition.common.php:404 app/views/popup.generic.php:638
-#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:93
+#: app/views/popup.condition.common.php:403 app/views/popup.generic.php:638
+#: app/views/popup.massupdate.item.php:421 app/views/popup.services.php:94
 #: app/views/popup.triggerexpr.php:76 include/classes/html/CMultiSelect.php:86
 #: include/classes/widgets/CWidgetHelper.php:371
 #: include/views/configuration.graph.edit.php:207
@@ -15669,7 +15414,7 @@ msgstr ""
 #: include/views/configuration.item.edit.php:101
 #: include/views/configuration.item.prototype.edit.php:83
 #: include/views/configuration.item.prototype.edit.php:479
-#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:315
+#: include/views/js/monitoring.sysmaps.js.php:216 jsLoader.php:296
 msgid "Select"
 msgstr "選擇"
 
@@ -15705,19 +15450,19 @@ msgstr "所選的組件"
 msgid "Selected items only"
 msgstr ""
 
-#: jsLoader.php:320
+#: jsLoader.php:301
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:321
+#: jsLoader.php:302
 #, c-format
 msgctxt "screen reader"
 msgid "Selected, %1$s, read only, in position %2$d of %3$d"
 msgstr ""
 
-#: jsLoader.php:265
+#: jsLoader.php:246
 msgid "Send backward"
 msgstr ""
 
@@ -15742,7 +15487,7 @@ msgstr "僅送到"
 msgid "Send to"
 msgstr "收件人"
 
-#: jsLoader.php:266
+#: jsLoader.php:247
 msgid "Send to back"
 msgstr ""
 
@@ -15775,7 +15520,7 @@ msgstr "分開的"
 msgid "Separately"
 msgstr ""
 
-#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:229
+#: include/func.inc.php:108 include/func.inc.php:245 jsLoader.php:210
 msgid "September"
 msgstr "九月"
 
@@ -15806,28 +15551,28 @@ msgstr ""
 msgid "Server time"
 msgstr "伺服器時間"
 
-#: app/controllers/CControllerAuditLogList.php:223
-#: app/controllers/CControllerPopupServiceEdit.php:146
+#: app/controllers/CControllerAuditLogList.php:224
+#: app/controllers/CControllerPopupServiceEdit.php:179
 #: app/views/monitoring.service.list.edit.php:115
 #: app/views/popup.mediatype.message.php:58
-#: app/views/popup.service.edit.php:284 app/views/popup.service.edit.php:314
+#: app/views/popup.service.edit.php:294 app/views/popup.service.edit.php:353
 #: include/actions.inc.php:67 include/actions.inc.php:77
-#: include/classes/helpers/CMediatypeHelper.php:96 srv_status.php:144
+#: include/classes/helpers/CMediatypeHelper.php:96
 msgid "Service"
 msgstr "服務"
 
-#: include/classes/api/services/CService.php:872
+#: include/classes/api/services/CService.php:1381
 #, c-format
 msgid "Service \"%1$s\" acceptable SLA must have no more than 4 digits after the decimal point."
 msgstr ""
 
-#: include/classes/api/services/CService.php:926
-#: include/classes/api/services/CService.php:960
+#: include/classes/api/services/CService.php:1435
+#: include/classes/api/services/CService.php:1469
 #, c-format
 msgid "Service \"%1$s\" cannot have problem tags and children at the same time."
 msgstr ""
 
-#: include/classes/api/services/CService.php:899
+#: include/classes/api/services/CService.php:1408
 #, c-format
 msgid "Service \"%1$s\" cannot show SLA for the selected status calculation rule."
 msgstr ""
@@ -15837,7 +15582,7 @@ msgstr ""
 msgid "Service actions"
 msgstr ""
 
-#: app/controllers/CControllerServiceCreate.php:169
+#: app/controllers/CControllerServiceCreate.php:173
 msgid "Service created"
 msgstr ""
 
@@ -15869,16 +15614,16 @@ msgstr "服務端口"
 msgid "Service recovery"
 msgstr ""
 
-#: app/controllers/CControllerServiceTimeValidate.php:92
-#: include/classes/api/services/CService.php:1085
+#: app/controllers/CControllerServiceTimeValidate.php:96
+#: include/classes/api/services/CService.php:1603
 msgid "Service start time must be less than end time."
 msgstr "服務的開始時間不能晚於截止時間."
 
-#: app/views/popup.condition.common.php:154
+#: app/views/popup.condition.common.php:153
 msgid "Service tag name"
 msgstr ""
 
-#: app/views/popup.condition.common.php:157
+#: app/views/popup.condition.common.php:156
 msgid "Service tag value"
 msgstr ""
 
@@ -15886,11 +15631,11 @@ msgstr ""
 msgid "Service time"
 msgstr ""
 
-#: app/views/popup.service.edit.php:249
+#: app/views/popup.service.edit.php:258
 msgid "Service times"
 msgstr "服務次數"
 
-#: app/views/popup.condition.common.php:565 include/actions.inc.php:56
+#: app/views/popup.condition.common.php:564 include/actions.inc.php:56
 msgid "Service type"
 msgstr "服務類型"
 
@@ -15899,30 +15644,29 @@ msgstr "服務類型"
 msgid "Service update"
 msgstr ""
 
-#: app/controllers/CControllerServiceUpdate.php:185
+#: app/controllers/CControllerServiceUpdate.php:189
 msgid "Service updated"
 msgstr "服務已更新"
 
-#: include/classes/api/services/CRole.php:520
+#: include/classes/api/services/CRole.php:536
 #, c-format
 msgid "Service with ID \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
 
-#: app/controllers/CControllerServiceListEdit.php:191
-#: app/controllers/CControllerServiceListEditRefresh.php:146
-#: app/controllers/CControllerServiceList.php:165
-#: app/controllers/CControllerServiceListRefresh.php:128
+#: app/controllers/CControllerServiceListEdit.php:177
+#: app/controllers/CControllerServiceListEditRefresh.php:151
+#: app/controllers/CControllerServiceList.php:151
+#: app/controllers/CControllerServiceListRefresh.php:133
 #: app/views/administration.housekeeping.edit.php:95
 #: app/views/monitoring.service.list.edit.php:130
 #: app/views/monitoring.service.list.php:105
-#: app/views/popup.condition.common.php:643
+#: app/views/popup.condition.common.php:642
 #: include/classes/helpers/CMenuHelper.php:74
-#: include/classes/helpers/CRoleHelper.php:319 srv_status.php:26
-#: srv_status.php:155
+#: include/classes/helpers/CRoleHelper.php:319
 msgid "Services"
 msgstr "服務"
 
-#: include/classes/api/services/CService.php:1010
+#: include/classes/api/services/CService.php:1528
 msgid "Services form a circular dependency."
 msgstr "服務形成了一個循環式迴圈."
 
@@ -15930,7 +15674,7 @@ msgstr "服務形成了一個循環式迴圈."
 msgid "Services updated"
 msgstr ""
 
-#: include/classes/core/ZBase.php:247 include/classes/core/ZBase.php:503
+#: include/classes/core/ZBase.php:241 include/classes/core/ZBase.php:468
 msgid "Session initialization error."
 msgstr ""
 
@@ -15960,7 +15704,7 @@ msgstr ""
 msgid "Set host inventory mode"
 msgstr ""
 
-#: include/classes/html/CInputSecret.php:80 jsLoader.php:387
+#: include/classes/html/CInputSecret.php:80 jsLoader.php:368
 msgid "Set new value"
 msgstr ""
 
@@ -15989,7 +15733,7 @@ msgstr ""
 msgid "Setting LDAP referrals to \"Off\" failed."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:236
+#: app/controllers/CControllerAuditLogList.php:237
 msgid "Settings"
 msgstr ""
 
@@ -15998,7 +15742,7 @@ msgstr ""
 #: app/partials/monitoring.host.filter.php:118
 #: app/partials/monitoring.problem.filter.php:102
 #: app/views/monitoring.widget.problems.view.php:62
-#: app/views/popup.condition.common.php:221
+#: app/views/popup.condition.common.php:220
 #: app/views/popup.lldoperation.php:227
 #: app/views/popup.massupdate.trigger.php:53
 #: app/views/popup.triggerwizard.php:93
@@ -16054,7 +15798,7 @@ msgstr ""
 msgid "Shared"
 msgstr ""
 
-#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:341
+#: include/views/monitoring.sysmap.edit.php:414 jsLoader.php:322
 msgid "Sharing"
 msgstr ""
 
@@ -16196,7 +15940,7 @@ msgstr "當Zabbix伺服器停機時展示警告"
 msgid "Show working time"
 msgstr "展示工作時間"
 
-#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:252
+#: include/views/monitoring.sysmap.constructor.php:57 jsLoader.php:233
 msgid "Shown"
 msgstr "已展示"
 
@@ -16305,7 +16049,7 @@ msgstr "略過複製圖片\"%1$s\"到主機\"%2$s\"."
 msgid "Slovak (sk_SK)"
 msgstr "斯洛伐克(sk_SK)"
 
-#: jsLoader.php:286
+#: jsLoader.php:267
 msgid "Snooze"
 msgstr "Snooze"
 
@@ -16351,7 +16095,7 @@ msgstr ""
 msgid "Sort entries by"
 msgstr ""
 
-#: app/views/popup.service.edit.php:106
+#: app/views/popup.service.edit.php:113
 msgid "Sort order (0->999)"
 msgstr "排序次(0->999)"
 
@@ -16425,7 +16169,7 @@ msgstr "開始於"
 #: app/views/monitoring.dashboard.view.php:164
 #: app/views/monitoring.dashboard.view.php:232
 #: app/views/monitoring.host.dashboard.view.php:101
-#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:157
+#: app/views/monitoring.host.dashboard.view.php:165 jsLoader.php:138
 msgid "Start slideshow"
 msgstr ""
 
@@ -16528,15 +16272,19 @@ msgstr ""
 #: include/views/configuration.item.list.php:92
 #: include/views/configuration.item.list.php:171
 #: include/views/configuration.triggers.list.php:82
-#: include/views/configuration.triggers.list.php:195 srv_status.php:145
+#: include/views/configuration.triggers.list.php:195
 msgid "Status"
 msgstr "狀態"
 
-#: app/views/popup.service.edit.php:114 app/views/popup.service.edit.php:285
-#: app/views/popup.services.php:59
+#: app/views/popup.service.edit.php:122 app/views/popup.service.edit.php:295
+#: app/views/popup.services.php:60
 msgid "Status calculation rule"
 msgstr ""
 
+#: app/views/popup.service.edit.php:126
+msgid "Status calculation rule and additional rules are only applicable if child services exist."
+msgstr ""
+
 #: include/views/configuration.httpconf.edit.php:206
 msgid "Status codes"
 msgstr "狀態碼"
@@ -16566,7 +16314,7 @@ msgstr "只有狀態"
 msgid "Status problem"
 msgstr ""
 
-#: app/views/popup.service.edit.php:166
+#: app/views/popup.service.edit.php:179
 msgid "Status propagation rule"
 msgstr ""
 
@@ -16614,7 +16362,7 @@ msgstr ""
 #: app/views/monitoring.dashboard.view.php:163
 #: app/views/monitoring.dashboard.view.php:233
 #: app/views/monitoring.host.dashboard.view.php:100
-#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:158
+#: app/views/monitoring.host.dashboard.view.php:166 jsLoader.php:139
 msgid "Stop slideshow"
 msgstr ""
 
@@ -16679,7 +16427,7 @@ msgctxt "encryption certificate"
 msgid "Subject"
 msgstr ""
 
-#: jsLoader.php:356
+#: jsLoader.php:337
 msgid "Submap"
 msgstr "子拓墣圖"
 
@@ -16695,7 +16443,7 @@ msgstr ""
 msgid "Success Audit"
 msgstr "成功審計"
 
-#: include/func.inc.php:1641 jsLoader.php:215
+#: include/func.inc.php:1641 jsLoader.php:196
 msgid "Success message"
 msgstr ""
 
@@ -16708,7 +16456,7 @@ msgstr ""
 msgid "Sun"
 msgstr "日"
 
-#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:239
+#: include/func.inc.php:126 include/func.inc.php:208 jsLoader.php:220
 msgid "Sunday"
 msgstr "日"
 
@@ -16800,12 +16548,12 @@ msgstr ""
 msgid "System uptime in seconds. Returns integer"
 msgstr ""
 
-#: jsLoader.php:243
+#: jsLoader.php:224
 msgctxt "Thursday short"
 msgid "T"
 msgstr "T"
 
-#: jsLoader.php:241
+#: jsLoader.php:222
 msgctxt "Tuesday short"
 msgid "T"
 msgstr "T"
@@ -16832,17 +16580,17 @@ msgstr "真"
 msgid "Table \"%1$s\" does not exist."
 msgstr "資料表\"%1$s\" 不存在."
 
-#: include/classes/db/DB.php:477
+#: include/classes/db/DB.php:497
 #, c-format
 msgid "Table \"%1$s\" doesn't have a field named \"%2$s\"."
 msgstr "資料表\"%1$s\"不能有欄位名為\"%2$s\"."
 
 #: app/controllers/CControllerPopupLldOperation.php:131
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
-#: app/views/popup.condition.common.php:74
-#: app/views/popup.condition.common.php:139
-#: app/views/popup.condition.common.php:308
-#: app/views/popup.condition.common.php:324 include/hosts.inc.php:144
+#: app/views/popup.condition.common.php:72
+#: app/views/popup.condition.common.php:138
+#: app/views/popup.condition.common.php:307
+#: app/views/popup.condition.common.php:323 include/hosts.inc.php:144
 #: include/views/inventory.host.list.php:90
 msgid "Tag"
 msgstr "標簽"
@@ -16898,7 +16646,7 @@ msgstr ""
 #: app/views/popup.massupdate.template.php:149
 #: app/views/popup.massupdate.trigger.php:75
 #: app/views/popup.massupdate.trigger.php:150
-#: app/views/popup.service.edit.php:262 app/views/popup.service.edit.php:316
+#: app/views/popup.service.edit.php:271 app/views/popup.service.edit.php:355
 #: include/blocks.inc.php:735 include/classes/screens/CScreenHttpTest.php:117
 #: include/classes/screens/CScreenProblem.php:839
 #: include/classes/screens/CScreenProblem.php:895
@@ -16958,7 +16706,7 @@ msgstr "目標類型"
 msgid "Telnet"
 msgstr "Telnet"
 
-#: app/controllers/CControllerAuditLogList.php:237
+#: app/controllers/CControllerAuditLogList.php:238
 #: app/views/administration.mediatype.edit.php:281
 #: app/views/popup.massupdate.template.php:147 app/views/search.php:274
 #: include/actions.inc.php:49 include/forms.inc.php:529
@@ -16979,7 +16727,7 @@ msgstr "模板"
 msgid "Template \"%1$s\" already exists."
 msgstr "模板 \"%1$s\" 已存在."
 
-#: include/classes/api/services/CHostGroup.php:1566
+#: include/classes/api/services/CHostGroup.php:1348
 #: include/classes/api/services/CTemplate.php:441
 #: include/classes/api/services/CTemplate.php:1154
 #, c-format
@@ -17003,7 +16751,7 @@ msgstr ""
 msgid "Template cannot be linked to another template more than once even through other templates."
 msgstr "模板不能重複連結到其它模板, 即使透過其它模板."
 
-#: app/controllers/CControllerAuditLogList.php:238
+#: app/controllers/CControllerAuditLogList.php:239
 msgid "Template dashboard"
 msgstr ""
 
@@ -17063,7 +16811,7 @@ msgstr ""
 #: app/controllers/CControllerPopupImportCompare.php:165
 #: app/partials/configuration.filter.items.php:72
 #: app/partials/popup.operations.php:212
-#: app/views/popup.condition.common.php:358 app/views/popup.import.php:31
+#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
 #: app/views/popup.massupdate.host.php:291 app/views/search.php:219
 #: app/views/search.php:223 app/views/search.php:365
 #: include/classes/helpers/CMenuHelper.php:153
@@ -17235,13 +16983,13 @@ msgstr ""
 msgid "The host is not discovered anymore and will be deleted the next time discovery rule is processed."
 msgstr ""
 
-#: include/classes/api/services/CImage.php:383
+#: include/classes/api/services/CImage.php:555
 #, c-format
 msgid "The image is used in icon map %1$s."
 msgid_plural "The image is used in icon maps %1$s."
 msgstr[0] ""
 
-#: include/classes/api/services/CImage.php:409
+#: include/classes/api/services/CImage.php:591
 #, c-format
 msgid "The image is used in map %1$s."
 msgid_plural "The image is used in maps %1$s."
@@ -17305,7 +17053,7 @@ msgstr ""
 msgid "This is the test message from Zabbix"
 msgstr ""
 
-#: include/func.inc.php:2552 srv_status.php:40
+#: include/func.inc.php:2552
 msgid "This month"
 msgstr "本月"
 
@@ -17313,7 +17061,7 @@ msgstr "本月"
 msgid "This month so far"
 msgstr ""
 
-#: include/func.inc.php:2550 srv_status.php:39
+#: include/func.inc.php:2550
 msgid "This week"
 msgstr "本周"
 
@@ -17321,7 +17069,7 @@ msgstr "本周"
 msgid "This week so far"
 msgstr ""
 
-#: include/func.inc.php:2554 srv_status.php:41
+#: include/func.inc.php:2554
 msgid "This year"
 msgstr "本年"
 
@@ -17341,7 +17089,7 @@ msgstr ""
 msgid "Thu"
 msgstr "四"
 
-#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:236
+#: include/func.inc.php:122 include/func.inc.php:212 jsLoader.php:217
 msgid "Thursday"
 msgstr "週四"
 
@@ -17358,7 +17106,7 @@ msgstr "直到"
 #: app/views/popup.itemtestedit.view.php:271
 #: app/views/popup.service.time.edit.php:71
 #: app/views/popup.service.time.edit.php:99
-#: app/views/popup.triggerexpr.php:173 app/views/popup.triggerexpr.php:177
+#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
 #: app/views/reports.auditlog.list.php:90 include/actions.inc.php:1700
 #: include/actions.inc.php:1754 include/actions.inc.php:1827
 #: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17391,7 +17139,7 @@ msgid "Time of proxy last access. Name - proxy name. Valid params are: lastacces
 msgstr ""
 
 #: include/actions.inc.php:51
-#: include/classes/widgets/views/widget.svggraph.form.view.php:292
+#: include/classes/widgets/views/widget.svggraph.form.view.php:293
 msgid "Time period"
 msgstr "時間期間"
 
@@ -17443,12 +17191,11 @@ msgstr "時間戳"
 msgid "To"
 msgstr "到"
 
-#: jsLoader.php:368
+#: jsLoader.php:349
 msgid "To set a host interface select a single item type for all items"
 msgstr "要設定一個主機介面, 選擇一個單一的項目類型給所有的項目"
 
 #: include/classes/screens/CScreenProblem.php:701 include/func.inc.php:2548
-#: srv_status.php:38
 msgid "Today"
 msgstr "今天"
 
@@ -17563,7 +17310,7 @@ msgstr ""
 msgid "Trends"
 msgstr "趨勢"
 
-#: app/controllers/CControllerAuditLogList.php:239
+#: app/controllers/CControllerAuditLogList.php:240
 #: app/controllers/CControllerPopupTriggerWizard.php:282
 #: app/views/popup.massupdate.trigger.php:149 include/actions.inc.php:46
 #: include/classes/graphdraw/CLineGraphDraw.php:472 include/events.inc.php:256
@@ -17571,7 +17318,7 @@ msgstr "趨勢"
 #: include/views/configuration.triggers.edit.php:571
 #: include/views/js/monitoring.sysmaps.js.php:94
 #: include/views/js/monitoring.sysmaps.js.php:792
-#: include/views/reports.toptriggers.php:83 jsLoader.php:255 jsLoader.php:357
+#: include/views/reports.toptriggers.php:83 jsLoader.php:236 jsLoader.php:338
 msgid "Trigger"
 msgstr "觸發器"
 
@@ -17669,7 +17416,7 @@ msgstr "觸發器名稱"
 msgid "Trigger overview"
 msgstr "觸發器概覽"
 
-#: app/controllers/CControllerAuditLogList.php:240
+#: app/controllers/CControllerAuditLogList.php:241
 #: app/views/popup.lldoperation.php:52
 #: app/views/popup.massupdate.trigger.php:149
 #: include/views/configuration.trigger.prototype.edit.php:548
@@ -17741,11 +17488,11 @@ msgstr ""
 msgid "Trigger severity"
 msgstr "觸發器示警度"
 
-#: jsLoader.php:342
+#: jsLoader.php:323
 msgid "Trigger status \"OK\""
 msgstr ""
 
-#: jsLoader.php:343
+#: jsLoader.php:324
 msgid "Trigger status \"Problem\""
 msgstr ""
 
@@ -17762,7 +17509,7 @@ msgstr "觸發器已更新"
 #: app/partials/configuration.filter.items.php:191
 #: app/partials/monitoring.problem.filter.php:74
 #: app/partials/trigoverview.table.top.php:29
-#: app/views/popup.condition.common.php:209 app/views/popup.import.php:37
+#: app/views/popup.condition.common.php:208 app/views/popup.import.php:37
 #: app/views/search.php:128 app/views/search.php:133 app/views/search.php:308
 #: app/views/search.php:313 include/html.inc.php:341
 #: include/views/configuration.host.discovery.list.php:195
@@ -17797,7 +17544,7 @@ msgstr ""
 msgid "Tue"
 msgstr "二"
 
-#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:234
+#: include/func.inc.php:120 include/func.inc.php:210 jsLoader.php:215
 msgid "Tuesday"
 msgstr "週二"
 
@@ -17810,7 +17557,7 @@ msgstr ""
 msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict."
 msgstr "兩個項目 (\"%1$s\"和\"%2$s\")不能填入一個主機資產紀錄欄位\"%3$s\", 這會造成衝突."
 
-#: jsLoader.php:260
+#: jsLoader.php:241
 msgid "Two map elements should be selected"
 msgstr ""
 
@@ -17826,19 +17573,19 @@ msgstr ""
 #: app/views/administration.user.edit.php:296
 #: app/views/configuration.discovery.edit.php:79
 #: app/views/monitoring.widget.actionlog.view.php:35
-#: app/views/popup.condition.common.php:49
-#: app/views/popup.condition.common.php:169
-#: app/views/popup.condition.common.php:658
+#: app/views/popup.condition.common.php:47
+#: app/views/popup.condition.common.php:168
+#: app/views/popup.condition.common.php:657
 #: app/views/popup.dashboard.share.edit.php:123
 #: app/views/popup.generic.php:133 app/views/popup.lldoperation.php:114
 #: app/views/popup.massupdate.item.php:48
 #: app/views/popup.massupdate.item.php:225 app/views/popup.media.php:70
-#: app/views/popup.service.edit.php:219 app/views/popup.triggerwizard.php:47
+#: app/views/popup.service.edit.php:232 app/views/popup.triggerwizard.php:47
 #: app/views/popup.triggerwizard.php:121 app/views/popup.valuemap.edit.php:51
 #: include/classes/widgets/CWidgetHelper.php:50
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:33
 #: include/classes/widgets/forms/CWidgetFormActionLog.php:34
-#: include/hosts.inc.php:99 include/hosts.inc.php:1287
+#: include/hosts.inc.php:99 include/hosts.inc.php:1220
 #: include/views/administration.auditacts.list.php:65
 #: include/views/configuration.graph.edit.php:364
 #: include/views/configuration.host.discovery.edit.php:63
@@ -17890,7 +17637,7 @@ msgstr "數據類型"
 msgid "Types"
 msgstr "類型 "
 
-#: include/classes/api/services/CRole.php:461
+#: include/classes/api/services/CRole.php:478
 #, c-format
 msgid "UI element \"%2$s\" is not available for user role \"%1$s\"."
 msgstr ""
@@ -17911,7 +17658,7 @@ msgstr "未知的"
 #: include/views/configuration.trigger.prototype.edit.php:530
 #: include/views/configuration.triggers.edit.php:557
 #: include/views/js/monitoring.sysmaps.js.php:314
-#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:358
+#: include/views/monitoring.sysmap.edit.php:278 items.php:158 jsLoader.php:339
 msgid "URL"
 msgstr "URL"
 
@@ -17957,12 +17704,12 @@ msgid "URL should have both \"name\" and \"url\" fields for map \"%1$s\"."
 msgstr ""
 
 #: include/views/js/monitoring.sysmaps.js.php:311
-#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:359
+#: include/views/monitoring.sysmap.edit.php:311 jsLoader.php:340
 msgid "URLs"
 msgstr "URLs"
 
-#: include/classes/validators/CApiInputValidator.php:2435
-#: include/classes/validators/CApiInputValidator.php:2441
+#: include/classes/validators/CApiInputValidator.php:2533
+#: include/classes/validators/CApiInputValidator.php:2539
 msgid "UUIDv4 is expected"
 msgstr ""
 
@@ -18047,12 +17794,12 @@ msgstr ""
 msgid "Unblock selected users?"
 msgstr "解除封鎖所選的用戶?"
 
-#: include/classes/core/ZBase.php:606
+#: include/classes/core/ZBase.php:571
 #, c-format
 msgid "Unexpected response for action %1$s."
 msgstr ""
 
-#: app/views/js/popup.service.edit.js.php:383
+#: app/views/js/popup.service.edit.js.php:582
 #: app/views/js/popup.service.statusrule.edit.js.php:104
 #: app/views/js/popup.service.time.edit.js.php:82
 msgid "Unexpected server error."
@@ -18072,21 +17819,23 @@ msgstr "單位"
 #: app/views/monitoring.widget.hostavail.view.php:66
 #: app/views/monitoring.widget.hostavail.view.php:104
 #: app/views/monitoring.widget.web.view.php:30 include/actions.inc.php:118
-#: include/actions.inc.php:1049 include/classes/helpers/CRegexHelper.php:37
+#: include/actions.inc.php:1049
+#: include/classes/helpers/CCorrelationHelper.php:133
+#: include/classes/helpers/CRegexHelper.php:37
 #: include/classes/helpers/CSeverityHelper.php:48
 #: include/classes/html/CHostAvailability.php:79
 #: include/classes/screens/CScreenHttpTestDetails.php:115
-#: include/correlation.inc.php:146 include/discovery.inc.php:115
-#: include/discovery.inc.php:151 include/events.inc.php:45
-#: include/events.inc.php:76 include/graphs.inc.php:37
-#: include/graphs.inc.php:67 include/hosts.inc.php:47 include/hosts.inc.php:74
-#: include/html.inc.php:291 include/httptest.inc.php:41
-#: include/httptest.inc.php:58 include/items.inc.php:45
-#: include/items.inc.php:110 include/items.inc.php:133
-#: include/items.inc.php:167 include/maintenances.inc.php:33
-#: include/maps.inc.php:39 include/triggers.inc.php:83
-#: include/triggers.inc.php:1865 include/users.inc.php:64
-#: include/users.inc.php:87 include/views/configuration.action.edit.php:236
+#: include/discovery.inc.php:115 include/discovery.inc.php:151
+#: include/events.inc.php:45 include/events.inc.php:76
+#: include/graphs.inc.php:37 include/graphs.inc.php:67
+#: include/hosts.inc.php:47 include/hosts.inc.php:74 include/html.inc.php:291
+#: include/httptest.inc.php:41 include/httptest.inc.php:58
+#: include/items.inc.php:45 include/items.inc.php:110
+#: include/items.inc.php:133 include/items.inc.php:167
+#: include/maintenances.inc.php:33 include/maps.inc.php:39
+#: include/triggers.inc.php:83 include/triggers.inc.php:1866
+#: include/users.inc.php:64 include/users.inc.php:87
+#: include/views/configuration.action.edit.php:236
 #: include/views/configuration.triggers.list.php:77
 msgid "Unknown"
 msgstr "未知的"
@@ -18104,7 +17853,7 @@ msgid "Unknown error"
 msgstr ""
 
 #: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1244
+#: app/controllers/CControllerPopupTriggerExpr.php:1251
 #: include/triggers.inc.php:1146
 msgid "Unknown host item, no such item in selected host"
 msgstr "未知的主機項目, 在所選的主機中沒有這樣的項目"
@@ -18157,7 +17906,7 @@ msgstr "自模板斷連"
 msgid "Unlink from templates"
 msgstr "自模板斷連"
 
-#: jsLoader.php:284
+#: jsLoader.php:265
 msgid "Unmute"
 msgstr "開聲音"
 
@@ -18187,7 +17936,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1852
+#: include/classes/api/services/CDiscoveryRule.php:1848
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"."
 msgstr ""
@@ -18197,7 +17946,7 @@ msgstr ""
 msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"."
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1818
+#: include/classes/api/services/CDiscoveryRule.php:1814
 #, c-format
 msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"."
 msgstr ""
@@ -18242,7 +17991,7 @@ msgstr "上"
 #: app/views/administration.usergroup.edit.php:221
 #: app/views/administration.userrole.edit.php:378
 #: app/views/administration.user.token.edit.php:88
-#: app/views/configuration.correlation.edit.php:177
+#: app/views/configuration.correlation.edit.php:179
 #: app/views/configuration.discovery.edit.php:154
 #: app/views/popup.acknowledge.edit.php:115
 #: app/views/popup.dashboard.share.edit.php:155
@@ -18255,7 +18004,7 @@ msgstr "上"
 #: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
 #: app/views/popup.mediatype.message.php:104
 #: app/views/popup.scheduledreport.subscription.php:133
-#: app/views/popup.service.edit.php:339
+#: app/views/popup.service.edit.php:385
 #: app/views/popup.service.statusrule.edit.php:98
 #: app/views/popup.service.time.edit.php:167
 #: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
@@ -18308,7 +18057,7 @@ msgstr ""
 msgid "Update problem"
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:361
+#: app/controllers/CControllerAuditLogList.php:362
 #: app/controllers/CControllerPopupImportCompare.php:160
 msgid "Updated"
 msgstr ""
@@ -18326,7 +18075,7 @@ msgstr "上傳"
 msgid "Upper level maps"
 msgstr "上層拓墣圖"
 
-#: app/partials/service.time.row.php:28
+#: app/views/js/popup.service.edit.js.php:225
 #: app/views/popup.service.time.edit.php:46
 #: include/classes/screens/CScreenDiscovery.php:120
 msgid "Uptime"
@@ -18361,7 +18110,7 @@ msgstr ""
 msgid "Used in actions"
 msgstr "用於動作中"
 
-#: app/controllers/CControllerAuditLogList.php:241
+#: app/controllers/CControllerAuditLogList.php:242
 #: app/partials/js/scheduledreport.subscription.js.php:78
 #: app/partials/popup.operations.php:105
 #: app/views/administration.token.edit.php:51
@@ -18376,7 +18125,7 @@ msgstr "用於動作中"
 msgid "User"
 msgstr "用户"
 
-#: include/classes/api/services/CUserGroup.php:623
+#: include/classes/api/services/CUserGroup.php:612
 #, c-format
 msgid "User \"%1$s\" cannot be without user group."
 msgstr ""
@@ -18428,7 +18177,7 @@ msgstr "新增用户"
 msgid "User agent string"
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:545
+#: include/classes/api/services/CUserGroup.php:534
 #: include/classes/api/services/CUser.php:979
 msgid "User cannot add himself to a disabled group or a group with disabled GUI access."
 msgstr "用戶不能將自己加進一個取消的群組或已取消圖形介面存取權的群組."
@@ -18447,7 +18196,7 @@ msgid "User deleted"
 msgid_plural "Users deleted"
 msgstr[0] "用户已删除"
 
-#: app/controllers/CControllerAuditLogList.php:242
+#: app/controllers/CControllerAuditLogList.php:243
 #: app/partials/js/scheduledreport.subscription.js.php:83
 #: app/partials/popup.operations.php:85
 #: app/views/administration.script.edit.php:242
@@ -18457,27 +18206,27 @@ msgstr[0] "用户已删除"
 msgid "User group"
 msgstr "用户群組"
 
-#: include/classes/api/services/CUserGroup.php:374
+#: include/classes/api/services/CUserGroup.php:363
 #, c-format
 msgid "User group \"%1$s\" already exists."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:949
+#: include/classes/api/services/CUserGroup.php:977
 #, c-format
 msgid "User group \"%1$s\" is report \"%2$s\" recipient."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:914
+#: include/classes/api/services/CUserGroup.php:942
 #, c-format
 msgid "User group \"%1$s\" is used in \"%2$s\" action."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:935
+#: include/classes/api/services/CUserGroup.php:963
 #, c-format
 msgid "User group \"%1$s\" is used in configuration for database down messages."
 msgstr ""
 
-#: include/classes/api/services/CUserGroup.php:927
+#: include/classes/api/services/CUserGroup.php:955
 #, c-format
 msgid "User group \"%1$s\" is used in script \"%2$s\"."
 msgstr "用戶群組\"%1$s\"被用於腳本\"%2$s\"."
@@ -18509,8 +18258,8 @@ msgstr[0] ""
 
 #: include/classes/api/services/CDashboard.php:482
 #: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:901
-#: include/classes/api/services/CSettings.php:249
+#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CSettings.php:255
 #: include/classes/api/services/CUser.php:741
 #, c-format
 msgid "User group with ID \"%1$s\" is not available."
@@ -18554,14 +18303,14 @@ msgstr "用戶密碼"
 msgid "User profile"
 msgstr "用戶基本資料"
 
-#: app/controllers/CControllerAuditLogList.php:243
+#: app/controllers/CControllerAuditLogList.php:244
 #: app/views/administration.user.list.php:110
 #: app/views/administration.userrole.edit.php:386
 #: app/views/administration.userrole.edit.php:388
 msgid "User role"
 msgstr ""
 
-#: include/classes/api/services/CRole.php:396
+#: include/classes/api/services/CRole.php:414
 #, c-format
 msgid "User role \"%1$s\" already exists."
 msgstr ""
@@ -18628,7 +18377,7 @@ msgstr "用户已更新"
 #: include/classes/api/services/CReport.php:405
 #: include/classes/api/services/CToken.php:246
 #: include/classes/api/services/CToken.php:257
-#: include/classes/api/services/CUserGroup.php:412
+#: include/classes/api/services/CUserGroup.php:401
 #, c-format
 msgid "User with ID \"%1$s\" is not available."
 msgstr ""
@@ -18944,14 +18693,14 @@ msgstr ""
 #: app/views/administration.mediatype.edit.php:155
 #: app/views/administration.script.edit.php:65
 #: app/views/monitoring.widget.plaintext.view.php:50
-#: app/views/popup.condition.common.php:141
-#: app/views/popup.condition.common.php:326
-#: app/views/popup.condition.common.php:373
-#: app/views/popup.condition.common.php:388
-#: app/views/popup.condition.common.php:536
-#: app/views/popup.condition.common.php:550
-#: app/views/popup.condition.common.php:581
-#: app/views/popup.condition.common.php:602 app/views/popup.httpstep.php:70
+#: app/views/popup.condition.common.php:140
+#: app/views/popup.condition.common.php:325
+#: app/views/popup.condition.common.php:372
+#: app/views/popup.condition.common.php:387
+#: app/views/popup.condition.common.php:535
+#: app/views/popup.condition.common.php:549
+#: app/views/popup.condition.common.php:580
+#: app/views/popup.condition.common.php:601 app/views/popup.httpstep.php:70
 #: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
 #: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:263
 #: app/views/popup.lldoperation.php:268
@@ -18961,7 +18710,7 @@ msgstr ""
 #: app/views/popup.massupdate.service.php:50
 #: app/views/popup.massupdate.template.php:140
 #: app/views/popup.massupdate.trigger.php:84
-#: app/views/popup.service.edit.php:68 app/views/popup.service.edit.php:270
+#: app/views/popup.service.edit.php:71 app/views/popup.service.edit.php:279
 #: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
 #: include/blocks.inc.php:525 include/classes/graphdraw/CPieGraphDraw.php:309
 #: include/classes/screens/CScreenHistory.php:279
@@ -19003,7 +18752,7 @@ msgstr ""
 msgid "Value \"%1$s\" is invalid for parameter \"grid_show\". Choices are: \"%2$s\"."
 msgstr ""
 
-#: include/classes/db/DB.php:390 include/classes/db/DB.php:419
+#: include/classes/db/DB.php:390 include/classes/db/DB.php:423
 #, c-format
 msgid "Value \"%1$s\" is too long for field \"%2$s\" - %3$d characters. Allowed length is %4$d characters."
 msgstr "欄位\"%2$s\"的值\"%1$s\"太長 - %3$d字元. 容許的長度是%4$d字元."
@@ -19020,7 +18769,7 @@ msgstr ""
 msgid "Value cannot be empty."
 msgstr ""
 
-#: app/controllers/CControllerAuditLogList.php:244
+#: app/controllers/CControllerAuditLogList.php:245
 msgid "Value map"
 msgstr "值對應"
 
@@ -19063,11 +18812,12 @@ msgstr ""
 msgid "Value of any Windows performance counter. Returns integer, float, string or text (depending on the request)"
 msgstr ""
 
-#: include/correlation.inc.php:166
+#: include/classes/helpers/CCorrelationHelper.php:153
 msgid "Value of new event tag"
 msgstr ""
 
-#: include/correlation.inc.php:151 include/correlation.inc.php:159
+#: include/classes/helpers/CCorrelationHelper.php:138
+#: include/classes/helpers/CCorrelationHelper.php:146
 msgid "Value of old event tag"
 msgstr ""
 
@@ -19114,7 +18864,7 @@ msgstr ""
 msgid "Vault authentication token"
 msgstr ""
 
-#: include/classes/core/ZBase.php:234
+#: include/classes/core/ZBase.php:228
 #: include/classes/setup/CSetupWizard.php:902 include/config.inc.php:53
 msgid "Vault connection failed."
 msgstr ""
@@ -19201,7 +18951,7 @@ msgstr "如果缺少主機名稱, 可見的名稱不能是空白."
 msgid "W"
 msgstr ""
 
-#: jsLoader.php:242
+#: jsLoader.php:223
 msgctxt "Wednesday short"
 msgid "W"
 msgstr "W"
@@ -19218,7 +18968,7 @@ msgctxt "setup"
 msgid "Warning"
 msgstr "警示"
 
-#: include/func.inc.php:1643 jsLoader.php:217
+#: include/func.inc.php:1643 jsLoader.php:198
 msgid "Warning message"
 msgstr ""
 
@@ -19227,7 +18977,7 @@ msgstr ""
 msgid "Warning! Unsupported %1$s database server version. Should be at least (%2$s)"
 msgstr ""
 
-#: jsLoader.php:289
+#: jsLoader.php:270
 msgid "We are sorry, the maximum possible number of elements to remember has been reached."
 msgstr "我們很抱歉, 已經到了可記住的最大可能的組件數量."
 
@@ -19243,7 +18993,7 @@ msgstr "我們很抱歉, 已經到了可記住的最大可能的組件數量."
 #: include/views/inventory.host.view.php:136
 #: include/views/inventory.host.view.php:141
 #: include/views/inventory.host.view.php:206
-#: include/views/inventory.host.view.php:219 jsLoader.php:360
+#: include/views/inventory.host.view.php:219 jsLoader.php:341
 msgid "Web"
 msgstr "Web"
 
@@ -19255,7 +19005,7 @@ msgstr "Web"
 msgid "Web monitoring"
 msgstr "Web監測"
 
-#: app/controllers/CControllerAuditLogList.php:233
+#: app/controllers/CControllerAuditLogList.php:234
 msgid "Web scenario"
 msgstr ""
 
@@ -19270,25 +19020,25 @@ msgstr "主機 \"%2$s\" 上已有網頁監測情境 \"%1$s\" 了。"
 msgid "Web scenario \"%1$s\" already exists."
 msgstr "網頁監測情境 \"%1$s\" 已存在了。"
 
-#: httpconf.php:227
+#: httpconf.php:199
 msgid "Web scenario added"
 msgstr ""
 
-#: httpconf.php:179 httpconf.php:502
+#: httpconf.php:179 httpconf.php:444
 msgid "Web scenario deleted"
 msgstr "網頁監測情境已刪除"
 
-#: httpconf.php:443
+#: httpconf.php:415
 msgid "Web scenario disabled"
 msgid_plural "Web scenarios disabled"
 msgstr[0] "網頁監測情境已停用"
 
-#: httpconf.php:442
+#: httpconf.php:414
 msgid "Web scenario enabled"
 msgid_plural "Web scenarios enabled"
 msgstr[0] "網頁監測情境已啟用"
 
-#: httpconf.php:223
+#: httpconf.php:195
 msgid "Web scenario updated"
 msgstr ""
 
@@ -19310,7 +19060,7 @@ msgstr ""
 msgid "Wed"
 msgstr "三"
 
-#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:235
+#: include/func.inc.php:121 include/func.inc.php:211 jsLoader.php:216
 msgid "Wednesday"
 msgstr "週三"
 
@@ -19321,7 +19071,7 @@ msgstr "週三"
 msgid "Weekly"
 msgstr "每週"
 
-#: app/views/popup.service.edit.php:204
+#: app/views/popup.service.edit.php:217
 msgid "Weight"
 msgstr ""
 
@@ -19337,12 +19087,12 @@ msgstr ""
 msgid "When active"
 msgstr "當作用中時"
 
-#: include/classes/api/services/CDashboardGeneral.php:305
+#: include/classes/api/services/CDashboardGeneral.php:346
 #, c-format
 msgid "Widget at X:%3$d, Y:%4$d on page #%2$d of dashboard \"%1$s\" is out of bounds."
 msgstr ""
 
-#: jsLoader.php:184
+#: jsLoader.php:165
 msgid "Widget is too small for the specified number of columns and rows."
 msgstr ""
 
@@ -19537,6 +19287,10 @@ msgstr "Y-m-d H:i"
 msgid "Y-m-d H:i:s"
 msgstr "Y-m-d H:i:s"
 
+#: include/translateDefines.inc.php:37
+msgid "Y-n-d"
+msgstr ""
+
 #: include/views/js/monitoring.sysmaps.js.php:446
 msgid "Y1"
 msgstr ""
@@ -19598,7 +19352,7 @@ msgstr "每年"
 #: app/views/hintbox.eventlist.php:178 app/views/hintbox.eventlist.php:182
 #: app/views/monitoring.widget.problems.view.php:264
 #: app/views/monitoring.widget.problems.view.php:268
-#: app/views/popup.condition.common.php:681
+#: app/views/popup.condition.common.php:680
 #: app/views/popup.lldoperation.php:84 app/views/popup.lldoperation.php:96
 #: app/views/popup.massupdate.item.php:327
 #: app/views/popup.massupdate.item.php:336
@@ -19655,18 +19409,12 @@ msgid "You did not specify targets for action operation global script \"%1$s\"."
 msgstr ""
 
 #: include/classes/api/services/CAuditLog.php:73
-#: include/classes/api/services/CCorrelation.php:481
 #: include/classes/api/services/CHost.php:848
 #: include/classes/api/services/CHost.php:913
-#: include/classes/api/services/CIconMap.php:185
-#: include/classes/api/services/CIconMap.php:256
 #: include/classes/api/services/CMaintenance.php:535
 #: include/classes/api/services/CMaintenance.php:956
 #: include/classes/api/services/CMaintenance.php:967
 #: include/classes/api/services/CModule.php:48
-#: include/classes/api/services/CScript.php:269
-#: include/classes/api/services/CScript.php:512
-#: include/classes/api/services/CScript.php:965
 #: include/classes/api/services/CTask.php:49
 #: include/classes/api/services/CTask.php:247
 #: include/classes/api/services/CTemplate.php:477
@@ -19678,9 +19426,6 @@ msgstr ""
 #: include/classes/api/services/CToken.php:313
 #: include/classes/api/services/CToken.php:414
 #: include/classes/api/services/CToken.php:448
-#: include/classes/api/services/CUserMacro.php:271
-#: include/classes/api/services/CUserMacro.php:331
-#: include/classes/api/services/CUserMacro.php:447
 msgid "You do not have permission to perform this operation."
 msgstr "您沒有許可權來完成此操作."
 
@@ -19796,24 +19541,28 @@ msgstr ""
 msgid "[Wrong value for month: \"%1$s\" ]"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2143
+#: include/classes/validators/CApiInputValidator.php:2241
 msgid "a DNS name is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:996
+#: include/classes/validators/CApiInputValidator.php:1053
 msgid "a boolean is expected"
 msgstr ""
 
+#: include/classes/validators/CNewValidator.php:300
+msgid "a boolean value is expected"
+msgstr ""
+
 #: include/classes/api/services/CUser.php:908
 #: include/classes/import/validators/CXmlValidatorGeneral.php:269
 #: include/classes/validators/CActionCondValidator.php:186
-#: include/classes/validators/CApiInputValidator.php:318
+#: include/classes/validators/CApiInputValidator.php:338
 #: include/classes/validators/CEventCorrCondValidator.php:91
-#: include/classes/validators/CNewValidator.php:326
+#: include/classes/validators/CNewValidator.php:290
 msgid "a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2357
+#: include/classes/validators/CApiInputValidator.php:2455
 msgid "a date in YYYY-MM-DD format is expected"
 msgstr ""
 
@@ -19822,37 +19571,37 @@ msgid "a digit"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:125
-#: include/classes/validators/CApiInputValidator.php:747
+#: include/classes/validators/CApiInputValidator.php:804
 msgid "a floating point value is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:410
-#: include/classes/validators/CNewValidator.php:313
+#: include/classes/validators/CApiInputValidator.php:430
+#: include/classes/validators/CNewValidator.php:279
 msgid "a hexadecimal color code (6 symbols) is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1601
+#: include/classes/validators/CApiInputValidator.php:1689
 msgid "a low-level discovery macro is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1480
+#: include/classes/validators/CApiInputValidator.php:1568
 #: include/validate.inc.php:194
 msgid "a number has too many fractional digits"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:950
-#: include/classes/validators/CApiInputValidator.php:1459
-#: include/classes/validators/CApiInputValidator.php:2166
+#: include/classes/validators/CApiInputValidator.php:1007
+#: include/classes/validators/CApiInputValidator.php:1547
+#: include/classes/validators/CApiInputValidator.php:2264
 #: include/validate.inc.php:175
 msgid "a number is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:607
-#: include/classes/validators/CApiInputValidator.php:646
-#: include/classes/validators/CApiInputValidator.php:960
-#: include/classes/validators/CApiInputValidator.php:1468
-#: include/classes/validators/CApiInputValidator.php:1475
-#: include/classes/validators/CApiInputValidator.php:1768
+#: include/classes/validators/CApiInputValidator.php:664
+#: include/classes/validators/CApiInputValidator.php:703
+#: include/classes/validators/CApiInputValidator.php:1017
+#: include/classes/validators/CApiInputValidator.php:1556
+#: include/classes/validators/CApiInputValidator.php:1563
+#: include/classes/validators/CApiInputValidator.php:1856
 #: include/validate.inc.php:183 include/validate.inc.php:189
 msgid "a number is too large"
 msgstr ""
@@ -19873,28 +19622,29 @@ msgstr ""
 msgid "a special character"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2327
+#: include/classes/validators/CApiInputValidator.php:2425
 msgid "a string, number or null value is expected"
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:273
+#: include/classes/validators/CNewValidator.php:238
 msgid "a time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1668
-#: include/classes/validators/CNewValidator.php:285
+#: include/classes/validators/CApiInputValidator.php:1756
+#: include/classes/validators/CNewValidator.php:252
 msgid "a time period is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1634
+#: include/classes/validators/CApiInputValidator.php:1722
 #: include/validate.inc.php:221
 msgid "a time range is expected"
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:94
 #: app/controllers/CControllerPopupLldOperation.php:154
-#: include/classes/validators/CApiInputValidator.php:1757
-#: include/classes/validators/CNewValidator.php:552
+#: include/classes/validators/CApiInputValidator.php:1845
+#: include/classes/validators/CNewValidator.php:265
+#: include/classes/validators/CNewValidator.php:496
 #: include/validate.inc.php:213 include/validate.inc.php:594
 msgid "a time unit is expected"
 msgstr ""
@@ -19942,7 +19692,7 @@ msgstr "所有"
 msgid "all media"
 msgstr "所有媒體"
 
-#: include/classes/validators/CApiInputValidator.php:2063
+#: include/classes/validators/CApiInputValidator.php:2161
 msgid "an IP address is expected"
 msgstr ""
 
@@ -19950,42 +19700,37 @@ msgstr ""
 #: include/classes/api/services/CDRule.php:481
 #: include/classes/api/services/CItemGeneral.php:2542
 #: include/classes/api/services/CItemGeneral.php:2564
-#: include/classes/import/validators/C44XmlValidator.php:2093
-#: include/classes/import/validators/C44XmlValidator.php:2113
-#: include/classes/import/validators/C44XmlValidator.php:2240
-#: include/classes/import/validators/C50XmlValidator.php:2236
-#: include/classes/import/validators/C50XmlValidator.php:2256
-#: include/classes/import/validators/C50XmlValidator.php:2383
-#: include/classes/import/validators/C52XmlValidator.php:2401
-#: include/classes/import/validators/C52XmlValidator.php:2421
-#: include/classes/import/validators/C52XmlValidator.php:2548
-#: include/classes/import/validators/C52XmlValidator.php:2587
-#: include/classes/import/validators/C54XmlValidator.php:2456
-#: include/classes/import/validators/C54XmlValidator.php:2476
-#: include/classes/import/validators/C54XmlValidator.php:2561
-#: include/classes/import/validators/C54XmlValidator.php:2600
-#: include/classes/import/validators/C60XmlValidator.php:2457
-#: include/classes/import/validators/C60XmlValidator.php:2477
-#: include/classes/import/validators/C60XmlValidator.php:2562
-#: include/classes/import/validators/C60XmlValidator.php:2601
+#: include/classes/import/validators/C44XmlValidator.php:2095
+#: include/classes/import/validators/C44XmlValidator.php:2115
+#: include/classes/import/validators/C50XmlValidator.php:2238
+#: include/classes/import/validators/C50XmlValidator.php:2258
+#: include/classes/import/validators/C52XmlValidator.php:2403
+#: include/classes/import/validators/C52XmlValidator.php:2423
+#: include/classes/import/validators/C52XmlValidator.php:2572
+#: include/classes/import/validators/C54XmlValidator.php:2458
+#: include/classes/import/validators/C54XmlValidator.php:2478
+#: include/classes/import/validators/C54XmlValidator.php:2585
+#: include/classes/import/validators/C60XmlValidator.php:2459
+#: include/classes/import/validators/C60XmlValidator.php:2479
+#: include/classes/import/validators/C60XmlValidator.php:2586
 #: include/classes/import/validators/CXmlValidatorGeneral.php:283
-#: include/classes/validators/CApiInputValidator.php:555
-#: include/classes/validators/CApiInputValidator.php:687
-#: include/classes/validators/CApiInputValidator.php:785
-#: include/classes/validators/CApiInputValidator.php:904
-#: include/classes/validators/CApiInputValidator.php:1052
-#: include/classes/validators/CApiInputValidator.php:1250
-#: include/classes/validators/CApiInputValidator.php:1294
-#: include/classes/validators/CApiInputValidator.php:2474
+#: include/classes/validators/CApiInputValidator.php:612
+#: include/classes/validators/CApiInputValidator.php:744
+#: include/classes/validators/CApiInputValidator.php:842
+#: include/classes/validators/CApiInputValidator.php:961
+#: include/classes/validators/CApiInputValidator.php:1109
+#: include/classes/validators/CApiInputValidator.php:1338
+#: include/classes/validators/CApiInputValidator.php:1382
+#: include/classes/validators/CApiInputValidator.php:2572
 msgid "an array is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1135
-#: include/classes/validators/CApiInputValidator.php:1205
+#: include/classes/validators/CApiInputValidator.php:1223
+#: include/classes/validators/CApiInputValidator.php:1293
 msgid "an array or a character string is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:2307
+#: include/classes/validators/CApiInputValidator.php:2405
 msgid "an array or object is expected"
 msgstr ""
 
@@ -19995,7 +19740,7 @@ msgid "an empty string is expected"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1798
-#: include/classes/validators/CApiInputValidator.php:1168
+#: include/classes/validators/CApiInputValidator.php:1256
 msgid "an even number of hexadecimal characters is expected"
 msgstr ""
 
@@ -20003,11 +19748,15 @@ msgstr ""
 msgid "an explicit time is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:602
+#: include/classes/api/services/CCorrelation.php:730
+msgid "an identifier is not defined in the formula"
+msgstr ""
+
+#: include/classes/validators/CApiInputValidator.php:659
 msgid "an integer is expected"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:641
+#: include/classes/validators/CApiInputValidator.php:698
 msgid "an unsigned integer is expected"
 msgstr ""
 
@@ -20168,14 +19917,8 @@ msgstr ""
 #: app/controllers/CControllerUsergroupTagfilterAdd.php:47
 #: app/controllers/CControllerUserUpdateGeneral.php:111
 #: include/classes/api/services/CAction.php:1793
-#: include/classes/api/services/CAutoregistration.php:153
-#: include/classes/api/services/CCorrelation.php:1052
-#: include/classes/api/services/CCorrelation.php:1087
-#: include/classes/api/services/CCorrelation.php:1108
-#: include/classes/api/services/CCorrelation.php:1125
-#: include/classes/api/services/CCorrelation.php:1144
-#: include/classes/api/services/CCorrelation.php:1158
-#: include/classes/api/services/CDiscoveryRule.php:1993
+#: include/classes/api/services/CAutoregistration.php:163
+#: include/classes/api/services/CDiscoveryRule.php:1989
 #: include/classes/api/services/CDRule.php:210
 #: include/classes/api/services/CDRule.php:216
 #: include/classes/api/services/CDRule.php:326
@@ -20205,19 +19948,11 @@ msgstr ""
 #: include/classes/api/services/CMapElement.php:106
 #: include/classes/api/services/CMapElement.php:125
 #: include/classes/api/services/CMapElement.php:163
-#: include/classes/api/services/CMediatype.php:378
-#: include/classes/api/services/CMediatype.php:397
-#: include/classes/api/services/CMediatype.php:413
-#: include/classes/api/services/CMediatype.php:489
-#: include/classes/api/services/CMediatype.php:705
-#: include/classes/api/services/CMediatype.php:731
-#: include/classes/api/services/CMediatype.php:748
-#: include/classes/api/services/CMediatype.php:800
-#: include/classes/api/services/CProxy.php:700
-#: include/classes/api/services/CProxy.php:774
+#: include/classes/api/services/CProxy.php:725
+#: include/classes/api/services/CProxy.php:799
 #: include/classes/api/services/CTriggerGeneral.php:794
 #: include/classes/api/services/CTriggerGeneral.php:827
-#: include/classes/api/services/CUserGroup.php:473
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/api/services/CUser.php:759
 #: include/classes/api/services/CUser.php:919
 #: include/classes/import/CConfigurationImport.php:744
@@ -20237,14 +19972,14 @@ msgstr ""
 #: include/classes/validators/CActionCondValidator.php:176
 #: include/classes/validators/CActionCondValidator.php:182
 #: include/classes/validators/CActionCondValidator.php:192
-#: include/classes/validators/CApiInputValidator.php:328
-#: include/classes/validators/CApiInputValidator.php:560
-#: include/classes/validators/CApiInputValidator.php:692
-#: include/classes/validators/CApiInputValidator.php:790
-#: include/classes/validators/CApiInputValidator.php:909
-#: include/classes/validators/CApiInputValidator.php:955
-#: include/classes/validators/CApiInputValidator.php:1255
-#: include/classes/validators/CApiInputValidator.php:1299
+#: include/classes/validators/CApiInputValidator.php:348
+#: include/classes/validators/CApiInputValidator.php:617
+#: include/classes/validators/CApiInputValidator.php:749
+#: include/classes/validators/CApiInputValidator.php:847
+#: include/classes/validators/CApiInputValidator.php:966
+#: include/classes/validators/CApiInputValidator.php:1012
+#: include/classes/validators/CApiInputValidator.php:1343
+#: include/classes/validators/CApiInputValidator.php:1387
 #: include/classes/validators/CEventCorrCondValidator.php:55
 #: include/classes/validators/CEventCorrCondValidator.php:61
 #: include/classes/validators/CEventCorrCondValidator.php:67
@@ -20252,7 +19987,7 @@ msgstr ""
 #: include/classes/validators/CEventCorrCondValidator.php:80
 #: include/classes/validators/CEventCorrCondValidator.php:87
 #: include/classes/validators/CEventCorrCondValidator.php:96
-#: include/classes/validators/CNewValidator.php:97
+#: include/classes/validators/CNewValidator.php:103
 #: include/validate.inc.php:330
 msgid "cannot be empty"
 msgstr ""
@@ -20265,7 +20000,7 @@ msgstr ""
 msgid "cannot perform Scroll API request, data could be truncated"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1976
+#: include/classes/api/services/CDiscoveryRule.php:1972
 msgid "cannot update property for templated discovery rule"
 msgstr ""
 
@@ -20299,7 +20034,7 @@ msgstr ""
 msgid "circular item dependency is not allowed"
 msgstr ""
 
-#: jsLoader.php:292
+#: jsLoader.php:273
 msgid "color"
 msgstr ""
 
@@ -20317,7 +20052,8 @@ msgid "configure"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:66 include/actions.inc.php:26
-#: include/correlation.inc.php:33 include/views/inventory.host.list.php:69
+#: include/classes/helpers/CCorrelationHelper.php:36
+#: include/views/inventory.host.list.php:69
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:171
 msgid "contains"
 msgstr ""
@@ -20346,7 +20082,7 @@ msgstr ""
 msgid "countunique() - The number of unique values"
 msgstr ""
 
-#: include/func.inc.php:579 jsLoader.php:211
+#: include/func.inc.php:579 jsLoader.php:192
 msgctxt "day short"
 msgid "d"
 msgstr "d"
@@ -20408,7 +20144,7 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1539
+#: include/classes/validators/CApiInputValidator.php:1627
 msgid "directory cannot be empty"
 msgstr ""
 
@@ -20430,13 +20166,13 @@ msgid "discovery rule \"%1$s\" on host \"%2$s\" is not monitored"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:67 include/actions.inc.php:27
-#: include/correlation.inc.php:34
+#: include/classes/helpers/CCorrelationHelper.php:37
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:172
 msgid "does not contain"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:65 include/actions.inc.php:25
-#: include/correlation.inc.php:32
+#: include/classes/helpers/CCorrelationHelper.php:35
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:170
 msgid "does not equal"
 msgstr ""
@@ -20462,7 +20198,8 @@ msgid "e() - Returns Euler's number"
 msgstr ""
 
 #: app/views/popup.lldoperation.php:64 app/views/popup.valuemap.edit.php:78
-#: include/actions.inc.php:24 include/correlation.inc.php:31
+#: include/actions.inc.php:24
+#: include/classes/helpers/CCorrelationHelper.php:34
 #: include/views/inventory.host.list.php:70
 #: include/views/js/configuration.host.discovery.edit.overr.js.php:169
 msgid "equals"
@@ -20499,6 +20236,10 @@ msgstr ""
 msgid "failed to parse JSON"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:2675
+msgid "file format is unsupported"
+msgstr ""
+
 #: app/controllers/CControllerPopupTriggerExpr.php:579
 msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
 msgstr ""
@@ -20545,7 +20286,7 @@ msgstr "清除數據之全域設定"
 msgid "graph pattern"
 msgstr ""
 
-#: include/func.inc.php:580 jsLoader.php:212
+#: include/func.inc.php:580 jsLoader.php:193
 msgctxt "hour short"
 msgid "h"
 msgstr "h"
@@ -20586,6 +20327,11 @@ msgstr "圖示"
 msgid "image"
 msgstr "圖片"
 
+#: include/classes/validators/CApiInputValidator.php:2669
+#, c-format
+msgid "image size must be less than %1$s"
+msgstr ""
+
 #: include/actions.inc.php:28
 msgid "in"
 msgstr "在"
@@ -20626,15 +20372,19 @@ msgstr ""
 msgid "incorrect expression starting from \"%1$s\""
 msgstr ""
 
+#: include/classes/api/services/CCorrelation.php:723
+msgid "incorrect number of conditions"
+msgstr ""
+
 #: include/classes/parsers/CParser.php:118
 #, c-format
 msgid "incorrect syntax near \"%1$s\""
 msgstr "接近 \"%1$s\\ 處語法錯誤"
 
-#: include/classes/validators/CExpressionValidator.php:123
-#: include/classes/validators/CExpressionValidator.php:147
-#: include/classes/validators/CExpressionValidator.php:164
-#: include/classes/validators/CExpressionValidator.php:194
+#: include/classes/validators/CExpressionValidator.php:140
+#: include/classes/validators/CExpressionValidator.php:156
+#: include/classes/validators/CExpressionValidator.php:172
+#: include/classes/validators/CExpressionValidator.php:197
 #, c-format
 msgid "incorrect usage of function \"%1$s\""
 msgstr ""
@@ -20662,7 +20412,7 @@ msgstr ""
 msgid "invalid address range \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:323
+#: include/classes/validators/CApiInputValidator.php:343
 msgid "invalid byte sequence in UTF-8"
 msgstr ""
 
@@ -20691,27 +20441,27 @@ msgstr ""
 msgid "invalid history storage period"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1359
+#: include/classes/validators/CApiInputValidator.php:1447
 msgid "invalid host group name"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1403
+#: include/classes/validators/CApiInputValidator.php:1491
 msgid "invalid host name"
 msgstr ""
 
 #: include/classes/validators/CHistFunctionValidator.php:80
-#: include/classes/validators/CMathFunctionValidator.php:72
+#: include/classes/validators/CMathFunctionValidator.php:86
 #, c-format
 msgid "invalid number of parameters in function \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:117
-#: include/classes/validators/CApiInputValidator.php:2405
+#: include/classes/validators/CApiInputValidator.php:2503
 msgid "invalid range expression"
 msgstr ""
 
 #: app/controllers/CControllerPopupValueMapUpdate.php:105
-#: include/classes/validators/CApiInputValidator.php:1704
+#: include/classes/validators/CApiInputValidator.php:1792
 msgid "invalid regular expression"
 msgstr ""
 
@@ -20739,7 +20489,7 @@ msgstr ""
 msgid "is less than or equals"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1982
+#: include/classes/validators/CApiInputValidator.php:2080
 msgid "is not enclosed in {} or is malformed"
 msgstr ""
 
@@ -20825,12 +20575,12 @@ msgstr "低階探索規則"
 msgid "ltrim() - Remove specified characters from the beginning of a string"
 msgstr ""
 
-#: include/func.inc.php:581 jsLoader.php:138 jsLoader.php:213 jsLoader.php:377
+#: include/func.inc.php:581 jsLoader.php:119 jsLoader.php:194 jsLoader.php:358
 msgctxt "minute short"
 msgid "m"
 msgstr "m"
 
-#: include/func.inc.php:578 jsLoader.php:210
+#: include/func.inc.php:578 jsLoader.php:191
 msgctxt "month short"
 msgid "m"
 msgstr "m"
@@ -20889,7 +20639,7 @@ msgstr "符合的"
 msgid "max"
 msgstr "最大"
 
-#: include/classes/api/services/CSettings.php:271
+#: include/classes/api/services/CSettings.php:277
 msgid "max period is less than time filter default period"
 msgstr ""
 
@@ -20929,7 +20679,7 @@ msgid "min() - Minimum value for period T"
 msgstr ""
 
 #: include/classes/api/services/CHost.php:1804
-#: include/classes/validators/CApiInputValidator.php:1162
+#: include/classes/validators/CApiInputValidator.php:1250
 #, c-format
 msgid "minimum length is %1$s characters"
 msgstr ""
@@ -20956,8 +20706,8 @@ msgctxt "millisecond short"
 msgid "ms"
 msgstr "毫秒"
 
-#: include/classes/validators/CApiInputValidator.php:2430
-#: include/classes/validators/CApiInputValidator.php:2508
+#: include/classes/validators/CApiInputValidator.php:2528
+#: include/classes/validators/CApiInputValidator.php:2606
 #, c-format
 msgid "must be %1$s characters long"
 msgstr ""
@@ -20972,27 +20722,14 @@ msgstr "必需為一個正確的LDAP用戶"
 msgid "must be at least %1$d characters long"
 msgstr ""
 
-#: include/classes/api/services/CMediatype.php:388
-#: include/classes/api/services/CMediatype.php:404
-#: include/classes/api/services/CMediatype.php:422
-#: include/classes/api/services/CMediatype.php:428
-#: include/classes/api/services/CMediatype.php:715
-#: include/classes/api/services/CMediatype.php:722
-#: include/classes/api/services/CMediatype.php:738
-#: include/classes/api/services/CMediatype.php:757
-#: include/classes/api/services/CMediatype.php:763
-#, c-format
-msgid "must be between \"%1$s\" and \"%2$s\""
-msgstr ""
-
 #: app/views/administration.authentication.edit.php:56
 #: app/views/administration.user.edit.php:134
 #: include/classes/validators/CPasswordComplexityValidator.php:88
 msgid "must contain at least one digit"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:1366
-#: include/classes/validators/CApiInputValidator.php:1410
+#: include/classes/validators/CApiInputValidator.php:1454
+#: include/classes/validators/CApiInputValidator.php:1498
 msgid "must contain at least one low-level discovery macro"
 msgstr ""
 
@@ -21020,6 +20757,14 @@ msgstr ""
 msgid "must not contain user's name, surname or username"
 msgstr ""
 
+#: include/translateDefines.inc.php:38
+msgid "n-d"
+msgstr ""
+
+#: include/translateDefines.inc.php:36
+msgid "n-d H:i"
+msgstr ""
+
 #: include/views/configuration.host.discovery.edit.php:182
 #: include/views/configuration.host.discovery.edit.php:320
 #: include/views/configuration.item.edit.php:218
@@ -21030,7 +20775,7 @@ msgstr ""
 msgid "name"
 msgstr ""
 
-#: include/classes/html/CMultiSelect.php:85 jsLoader.php:314
+#: include/classes/html/CMultiSelect.php:85 jsLoader.php:295
 msgid "new"
 msgstr "新的"
 
@@ -21165,7 +20910,7 @@ msgstr ""
 msgid "path/to/secret"
 msgstr ""
 
-#: include/classes/html/CMacroValue.php:139 jsLoader.php:388
+#: include/classes/html/CMacroValue.php:139 jsLoader.php:369
 msgid "path/to/secret:key"
 msgstr ""
 
@@ -21200,24 +20945,28 @@ msgstr ""
 msgid "rand() - A random integer value"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1822
+#: app/controllers/CControllerPopupTriggerExpr.php:847
+msgid "rate() - Returns per-second average rate for monotonically increasing counters"
+msgstr ""
+
+#: include/classes/api/services/CService.php:2343
 #, c-format
 msgid "read-write access to the child service \"%1$s\" is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:476
+#: include/classes/api/services/CService.php:497
 #, c-format
 msgid "read-write access to the child service \"%1$s\" must be retained"
 msgstr ""
 
-#: include/classes/api/services/CService.php:463
-#: include/classes/api/services/CService.php:1739
-#: include/classes/api/services/CService.php:1799
+#: include/classes/api/services/CService.php:484
+#: include/classes/api/services/CService.php:2260
+#: include/classes/api/services/CService.php:2320
 msgid "read-write access to the service is required"
 msgstr ""
 
-#: include/classes/api/services/CService.php:1798
-#: include/classes/api/services/CService.php:1860
+#: include/classes/api/services/CService.php:2319
+#: include/classes/api/services/CService.php:2381
 msgid "read-write access to the service must be retained"
 msgstr ""
 
@@ -21245,11 +20994,11 @@ msgstr ""
 msgid "regular expression"
 msgstr "正則表示式"
 
-#: app/controllers/CControllerPopupTriggerExpr.php:847
+#: app/controllers/CControllerPopupTriggerExpr.php:854
 msgid "repeat() - Returns a string composed of value repeated count times"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:860
+#: app/controllers/CControllerPopupTriggerExpr.php:867
 msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
 msgstr ""
 
@@ -21261,15 +21010,15 @@ msgstr ""
 msgid "right"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:878
+#: app/controllers/CControllerPopupTriggerExpr.php:885
 msgid "right() - Returns the rightmost count characters"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:891
+#: app/controllers/CControllerPopupTriggerExpr.php:898
 msgid "round() - Rounds a value to decimal places"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:904
+#: app/controllers/CControllerPopupTriggerExpr.php:911
 msgid "rtrim() - Removes specified characters from the end of a string"
 msgstr ""
 
@@ -21317,7 +21066,7 @@ msgstr ""
 msgid "short description"
 msgstr "簡述"
 
-#: include/classes/api/services/CAutoregistration.php:160
+#: include/classes/api/services/CAutoregistration.php:170
 #: include/classes/api/services/CHost.php:1811
 #: include/classes/api/services/CHost.php:1817
 #: include/classes/api/services/CHost.php:1826
@@ -21336,15 +21085,15 @@ msgstr "簡述"
 #: include/classes/api/services/CItemGeneral.php:2528
 #: include/classes/api/services/CMaintenance.php:502
 #: include/classes/api/services/CMaintenance.php:724
-#: include/classes/api/services/CMediatype.php:793
-#: include/classes/api/services/CProxy.php:651
 #: include/classes/api/services/CProxy.php:676
-#: include/classes/api/services/CProxy.php:783
-#: include/classes/api/services/CProxy.php:795
+#: include/classes/api/services/CProxy.php:701
+#: include/classes/api/services/CProxy.php:808
+#: include/classes/api/services/CProxy.php:820
 #: include/classes/api/services/CTriggerGeneral.php:800
 #: include/classes/api/services/CTriggerGeneral.php:833
 #: include/classes/api/services/CValueMap.php:583
 #: include/classes/validators/CActionCondValidator.php:146
+#: include/classes/validators/CApiInputValidator.php:1117
 msgid "should be empty"
 msgstr ""
 
@@ -21360,31 +21109,31 @@ msgstr "展示圖示對應"
 msgid "sign in as guest"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:917
+#: app/controllers/CControllerPopupTriggerExpr.php:924
 msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:924
+#: app/controllers/CControllerPopupTriggerExpr.php:931
 msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:938
 msgid "sinh() - The hyperbolic sine of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:945
 msgid "skewness() - Measures the asymmetry of the probability distribution"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:952
 msgid "sqrt() - Square root of a value"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:959
 msgid "stddevpop() - Population standard deviation"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:966
 msgid "stddevsamp() - Sample standard deviation"
 msgstr ""
 
@@ -21392,11 +21141,11 @@ msgstr ""
 msgid "sum"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:973
 msgid "sum() - Sum of values of a period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:980
 msgid "sumofsquares() - The sum of squares"
 msgstr ""
 
@@ -21412,8 +21161,8 @@ msgstr ""
 #: app/views/administration.usergroup.edit.php:182
 #: app/views/administration.userrole.edit.php:170
 #: app/views/administration.userrole.edit.php:211
-#: app/views/popup.service.edit.php:84
-#: include/classes/api/services/CUserGroup.php:473
+#: app/views/popup.service.edit.php:89
+#: include/classes/api/services/CUserGroup.php:462
 #: include/classes/helpers/CTagFilterFieldHelper.php:63
 #: include/classes/helpers/CTagFilterFieldHelper.php:117
 #: include/classes/widgets/CWidgetHelper.php:506
@@ -21424,7 +21173,7 @@ msgstr ""
 msgid "tag"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:987
 msgid "tan() - The tangent of a value"
 msgstr ""
 
@@ -21433,13 +21182,17 @@ msgstr ""
 msgid "template ID \"%1$s\" is passed %2$s times"
 msgstr "模板ID\"%1$s\"已傳送%2$s次"
 
-#: app/controllers/CControllerDashboardUpdate.php:188
-#: app/controllers/CControllerDashboardUpdate.php:197
-#: app/controllers/CControllerDashboardUpdate.php:209
-#: include/classes/api/services/CAutoregistration.php:147
-#: include/classes/api/services/CDiscoveryRule.php:1650
-#: include/classes/api/services/CDiscoveryRule.php:2011
-#: include/classes/api/services/CDiscoveryRule.php:2019
+#: include/classes/validators/CApiInputValidator.php:2708
+msgid "the last new line feed is missing"
+msgstr ""
+
+#: app/controllers/CControllerDashboardUpdate.php:192
+#: app/controllers/CControllerDashboardUpdate.php:201
+#: app/controllers/CControllerDashboardUpdate.php:213
+#: include/classes/api/services/CAutoregistration.php:157
+#: include/classes/api/services/CDiscoveryRule.php:1646
+#: include/classes/api/services/CDiscoveryRule.php:2007
+#: include/classes/api/services/CDiscoveryRule.php:2015
 #: include/classes/api/services/CHostBase.php:523
 #: include/classes/api/services/CHost.php:1907
 #: include/classes/api/services/CHost.php:2140
@@ -21448,20 +21201,20 @@ msgstr "模板ID\"%1$s\"已傳送%2$s次"
 #: include/classes/api/services/CHostPrototype.php:1688
 #: include/classes/api/services/CHostPrototype.php:1700
 #: include/classes/api/services/CHttpTest.php:744
-#: include/classes/api/services/CProxy.php:683
-#: include/classes/api/services/CProxy.php:694
-#: include/classes/api/services/CProxy.php:768
+#: include/classes/api/services/CProxy.php:708
+#: include/classes/api/services/CProxy.php:719
+#: include/classes/api/services/CProxy.php:793
 #: include/classes/api/services/CReport.php:195
 #: include/classes/api/services/CReport.php:577
 #: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:1025
+#: include/classes/api/services/CScript.php:902
 #: include/classes/api/services/CTemplate.php:451
 #: include/classes/api/services/CValueMap.php:578
 #: include/classes/helpers/CDashboardHelper.php:369
 #: include/classes/helpers/CDashboardHelper.php:390
 #: include/classes/helpers/CDashboardHelper.php:398
 #: include/classes/helpers/CDashboardHelper.php:408
-#: include/classes/validators/CApiInputValidator.php:1091
+#: include/classes/validators/CApiInputValidator.php:1179
 #, c-format
 msgid "the parameter \"%1$s\" is missing"
 msgstr ""
@@ -21493,39 +21246,39 @@ msgstr ""
 msgid "third parameter is expected"
 msgstr ""
 
-#: include/classes/api/services/CSettings.php:267
+#: include/classes/api/services/CSettings.php:273
 msgid "time filter default period exceeds the max period"
 msgstr ""
 
-#: jsLoader.php:293
+#: jsLoader.php:274
 msgid "time shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:994
 msgid "time() - Current time"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:993
+#: app/controllers/CControllerPopupTriggerExpr.php:1000
 msgid "timeleft() - Time to reach threshold estimated based on period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1000
+#: app/controllers/CControllerPopupTriggerExpr.php:1007
 msgid "trendavg() - Average value of a period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1014
 msgid "trendcount() - Number of successfully retrieved values for period T"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1021
 msgid "trendmax() - Maximum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1028
 msgid "trendmin() - Minimum value for period T with exact period shift"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1035
 msgid "trendsum() - Sum of values of a period T with exact period shift"
 msgstr ""
 
@@ -21539,7 +21292,7 @@ msgstr "觸發器"
 msgid "trigger does not allow manual closing"
 msgstr ""
 
-#: include/classes/validators/CExpressionValidator.php:100
+#: include/classes/validators/CExpressionValidator.php:116
 msgid "trigger expression must contain at least one /host/key reference"
 msgstr ""
 
@@ -21551,26 +21304,26 @@ msgstr ""
 msgid "trigger with linkages cannot be moved to another template or host"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1042
 msgid "trim() - Remove specified characters from the beginning and the end of a string"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1048
+#: app/controllers/CControllerPopupTriggerExpr.php:1055
 msgid "truncate() - Truncates a value to decimal places"
 msgstr ""
 
 #: app/partials/layout.htmlpage.aside.php:74
-#: include/classes/html/CMultiSelect.php:84 jsLoader.php:313
+#: include/classes/html/CMultiSelect.php:84 jsLoader.php:294
 msgid "type here to search"
 msgstr "於此輸入搜尋條件"
 
-#: include/classes/validators/CApiInputValidator.php:2019
+#: include/classes/validators/CApiInputValidator.php:2117
 msgid "unacceptable URL"
 msgstr ""
 
-#: include/classes/import/validators/C44XmlValidator.php:2180
-#: include/classes/import/validators/C50XmlValidator.php:2323
-#: include/classes/import/validators/C52XmlValidator.php:2488
+#: include/classes/import/validators/C44XmlValidator.php:2182
+#: include/classes/import/validators/C50XmlValidator.php:2325
+#: include/classes/import/validators/C52XmlValidator.php:2490
 #: include/classes/import/validators/CXmlValidatorGeneral.php:298
 #, c-format
 msgid "unexpected constant \"%1$s\""
@@ -21578,11 +21331,11 @@ msgstr ""
 
 #: include/classes/export/CConfigurationExportBuilder.php:119
 #: include/classes/import/converters/CConstantImportConverter.php:60
-#: include/classes/import/validators/C44XmlValidator.php:2138
-#: include/classes/import/validators/C50XmlValidator.php:2281
-#: include/classes/import/validators/C52XmlValidator.php:2446
-#: include/classes/import/validators/C54XmlValidator.php:2501
-#: include/classes/import/validators/C60XmlValidator.php:2502
+#: include/classes/import/validators/C44XmlValidator.php:2140
+#: include/classes/import/validators/C50XmlValidator.php:2283
+#: include/classes/import/validators/C52XmlValidator.php:2448
+#: include/classes/import/validators/C54XmlValidator.php:2503
+#: include/classes/import/validators/C60XmlValidator.php:2504
 #, c-format
 msgid "unexpected constant value \"%1$s\""
 msgstr ""
@@ -21599,10 +21352,10 @@ msgstr "鍵值有非預期的結尾"
 msgid "unexpected end of macro"
 msgstr ""
 
-#: include/classes/api/services/CDiscoveryRule.php:1670
-#: include/classes/api/services/CDiscoveryRule.php:1702
-#: include/classes/api/services/CDiscoveryRule.php:1725
-#: include/classes/api/services/CDiscoveryRule.php:1744
+#: include/classes/api/services/CDiscoveryRule.php:1666
+#: include/classes/api/services/CDiscoveryRule.php:1698
+#: include/classes/api/services/CDiscoveryRule.php:1721
+#: include/classes/api/services/CDiscoveryRule.php:1740
 #: include/classes/api/services/CGraphGeneral.php:627
 #: include/classes/api/services/CGraphGeneral.php:749
 #: include/classes/api/services/CHostPrototype.php:325
@@ -21612,11 +21365,12 @@ msgstr ""
 #: include/classes/api/services/CHttpTest.php:539
 #: include/classes/api/services/CItemGeneral.php:604
 #: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:1031
+#: include/classes/api/services/CScript.php:908
 #: include/classes/api/services/CTemplate.php:668
 #: include/classes/api/services/CTriggerGeneral.php:666
 #: include/classes/api/services/CValueMap.php:432
-#: include/classes/validators/CApiInputValidator.php:1061
+#: include/classes/validators/CApiInputValidator.php:1123
+#: include/classes/validators/CApiInputValidator.php:1138
 #, c-format
 msgid "unexpected parameter \"%1$s\""
 msgstr ""
@@ -21642,8 +21396,8 @@ msgstr ""
 #: include/classes/api/services/CItemGeneral.php:1622
 #: include/classes/api/services/CItemGeneral.php:1648
 #: include/classes/api/services/CItemGeneral.php:1685
-#: include/classes/api/services/CProxy.php:738
-#: include/classes/api/services/CProxy.php:755
+#: include/classes/api/services/CProxy.php:763
+#: include/classes/api/services/CProxy.php:780
 #: include/classes/api/services/CTriggerGeneral.php:821
 #, c-format
 msgid "unexpected value \"%1$s\""
@@ -21668,6 +21422,10 @@ msgstr ""
 msgid "unsupported version number"
 msgstr ""
 
+#: include/classes/validators/CApiInputValidator.php:491
+msgid "uppercase identifier expected"
+msgstr ""
+
 #: app/partials/configuration.tags.tab.php:67
 #: app/partials/monitoring.host.filter.php:57
 #: app/partials/monitoring.host.filter.php:206
@@ -21683,7 +21441,7 @@ msgstr ""
 #: app/views/js/popup.valuemap.edit.js.php:31
 #: app/views/js/popup.valuemap.edit.js.php:32
 #: app/views/popup.itemtestedit.view.php:83
-#: app/views/popup.service.edit.php:95
+#: app/views/popup.service.edit.php:102
 #: include/classes/helpers/CTagFilterFieldHelper.php:78
 #: include/classes/helpers/CTagFilterFieldHelper.php:131
 #: include/classes/html/CMacroValue.php:131
@@ -21703,11 +21461,11 @@ msgstr ""
 #: include/views/js/configuration.httpconf.edit.js.php:73
 #: include/views/js/configuration.maintenance.edit.js.php:37
 #: include/views/js/configuration.maintenance.edit.js.php:61
-#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:389
+#: include/views/js/item.preprocessing.js.php:416 jsLoader.php:370
 msgid "value"
 msgstr "值"
 
-#: include/classes/api/services/CDiscoveryRule.php:1890
+#: include/classes/api/services/CDiscoveryRule.php:1886
 #, c-format
 msgid "value \"%1$s\" already exists"
 msgstr ""
@@ -21725,76 +21483,83 @@ msgstr ""
 #: app/controllers/CControllerPopupValueMapUpdate.php:137
 #: include/classes/api/services/CValueMap.php:575
 #: include/classes/api/services/CValueMap.php:587
-#: include/classes/validators/CApiInputValidator.php:1802
-#: include/classes/validators/CApiInputValidator.php:1892
+#: include/classes/validators/CApiInputValidator.php:1890
+#: include/classes/validators/CApiInputValidator.php:1980
 #, c-format
 msgid "value %1$s already exists"
 msgstr ""
 
 #: include/classes/api/services/CTriggerGeneral.php:1773
 #: include/classes/api/services/CTriggerGeneral.php:1793
-#: include/classes/validators/CApiInputValidator.php:355
-#: include/classes/validators/CApiInputValidator.php:523
-#: include/classes/validators/CApiInputValidator.php:1174
-#: include/classes/validators/CApiInputValidator.php:1304
-#: include/classes/validators/CApiInputValidator.php:1350
-#: include/classes/validators/CApiInputValidator.php:1393
-#: include/classes/validators/CApiInputValidator.php:1447
-#: include/classes/validators/CApiInputValidator.php:1522
-#: include/classes/validators/CApiInputValidator.php:1565
-#: include/classes/validators/CApiInputValidator.php:1596
-#: include/classes/validators/CApiInputValidator.php:1627
-#: include/classes/validators/CApiInputValidator.php:1661
-#: include/classes/validators/CApiInputValidator.php:1695
-#: include/classes/validators/CApiInputValidator.php:1741
-#: include/classes/validators/CApiInputValidator.php:1977
-#: include/classes/validators/CApiInputValidator.php:2009
-#: include/classes/validators/CApiInputValidator.php:2051
-#: include/classes/validators/CApiInputValidator.php:2093
-#: include/classes/validators/CApiInputValidator.php:2132
-#: include/classes/validators/CApiInputValidator.php:2181
-#: include/classes/validators/CApiInputValidator.php:2234
-#: include/classes/validators/CApiInputValidator.php:2278
-#: include/classes/validators/CApiInputValidator.php:2398
-#: include/classes/validators/CApiInputValidator.php:2538
+#: include/classes/validators/CApiInputValidator.php:375
+#: include/classes/validators/CApiInputValidator.php:455
+#: include/classes/validators/CApiInputValidator.php:486
+#: include/classes/validators/CApiInputValidator.php:580
+#: include/classes/validators/CApiInputValidator.php:1262
+#: include/classes/validators/CApiInputValidator.php:1392
+#: include/classes/validators/CApiInputValidator.php:1438
+#: include/classes/validators/CApiInputValidator.php:1481
+#: include/classes/validators/CApiInputValidator.php:1535
+#: include/classes/validators/CApiInputValidator.php:1610
+#: include/classes/validators/CApiInputValidator.php:1653
+#: include/classes/validators/CApiInputValidator.php:1684
+#: include/classes/validators/CApiInputValidator.php:1715
+#: include/classes/validators/CApiInputValidator.php:1749
+#: include/classes/validators/CApiInputValidator.php:1783
+#: include/classes/validators/CApiInputValidator.php:1829
+#: include/classes/validators/CApiInputValidator.php:2075
+#: include/classes/validators/CApiInputValidator.php:2107
+#: include/classes/validators/CApiInputValidator.php:2149
+#: include/classes/validators/CApiInputValidator.php:2191
+#: include/classes/validators/CApiInputValidator.php:2230
+#: include/classes/validators/CApiInputValidator.php:2279
+#: include/classes/validators/CApiInputValidator.php:2332
+#: include/classes/validators/CApiInputValidator.php:2376
+#: include/classes/validators/CApiInputValidator.php:2496
+#: include/classes/validators/CApiInputValidator.php:2636
+#: include/classes/validators/CApiInputValidator.php:2703
 msgid "value is too long"
 msgstr ""
 
 #: include/classes/api/services/CReport.php:207
 #: include/classes/api/services/CReport.php:603
+#: include/classes/validators/CApiInputValidator.php:561
+#: include/classes/validators/CApiInputValidator.php:903
 #, c-format
 msgid "value must be %1$s"
-msgstr ""
+msgid_plural "value must be one of %1$s"
+msgstr[0] ""
 
-#: include/classes/validators/CApiInputValidator.php:2363
+#: include/classes/validators/CApiInputValidator.php:2461
 #, c-format
 msgid "value must be between \"%1$s\" and \"%2$s\""
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:514
+#: include/classes/validators/CApiInputValidator.php:571
 msgid "value must be empty"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:511
+#: include/classes/validators/CApiInputValidator.php:566
 #, c-format
-msgid "value must be empty or one of %1$s"
-msgstr ""
+msgid "value must be empty or %1$s"
+msgid_plural "value must be empty or one of %1$s"
+msgstr[0] ""
 
-#: include/classes/validators/CNewValidator.php:230
+#: include/classes/validators/CNewValidator.php:208
 #, c-format
 msgid "value must be no greater than \"%1$s\""
 msgstr ""
 
-#: include/classes/validators/CNewValidator.php:214
+#: include/classes/validators/CNewValidator.php:196
 #, c-format
 msgid "value must be no less than \"%1$s\""
 msgstr ""
 
 #: app/controllers/CControllerPopupHttpStep.php:101
-#: include/classes/api/services/CDiscoveryRule.php:1683
-#: include/classes/api/services/CDiscoveryRule.php:1714
-#: include/classes/api/services/CDiscoveryRule.php:1734
-#: include/classes/api/services/CDiscoveryRule.php:1756
+#: include/classes/api/services/CDiscoveryRule.php:1679
+#: include/classes/api/services/CDiscoveryRule.php:1710
+#: include/classes/api/services/CDiscoveryRule.php:1730
+#: include/classes/api/services/CDiscoveryRule.php:1752
 #: include/classes/api/services/CEvent.php:780
 #: include/classes/api/services/CHost.php:923
 #: include/classes/api/services/CHost.php:1969
@@ -21806,18 +21571,16 @@ msgstr ""
 #: include/classes/api/services/CMap.php:1158
 #: include/classes/api/services/CReport.php:201
 #: include/classes/api/services/CReport.php:597
-#: include/classes/import/validators/C52XmlValidator.php:2582
-#: include/classes/import/validators/C54XmlValidator.php:2595
-#: include/classes/import/validators/C60XmlValidator.php:2596
-#: include/classes/validators/CApiInputValidator.php:508
-#: include/classes/validators/CApiInputValidator.php:847
-#: include/classes/validators/CNewValidator.php:545
+#: include/classes/import/validators/C52XmlValidator.php:2567
+#: include/classes/import/validators/C54XmlValidator.php:2580
+#: include/classes/import/validators/C60XmlValidator.php:2581
+#: include/classes/validators/CNewValidator.php:489
 #: include/validate.inc.php:587
 #, c-format
 msgid "value must be one of %1$s"
 msgstr ""
 
-#: include/classes/validators/CApiInputValidator.php:872
+#: include/classes/validators/CApiInputValidator.php:929
 #, c-format
 msgid "value must be within the range of %1$s"
 msgstr ""
@@ -21826,7 +21589,7 @@ msgstr ""
 msgid "value of first parameter is too long"
 msgstr ""
 
-#: include/correlation.inc.php:154
+#: include/classes/helpers/CCorrelationHelper.php:141
 msgid "value of new event tag"
 msgstr ""
 
@@ -21839,11 +21602,11 @@ msgstr ""
 msgid "value of third parameter must be one of %1$s"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1061
+#: app/controllers/CControllerPopupTriggerExpr.php:1068
 msgid "varpop() - Population variance"
 msgstr ""
 
-#: app/controllers/CControllerPopupTriggerExpr.php:1068
+#: app/controllers/CControllerPopupTriggerExpr.php:1075
 msgid "varsamp() - Sample variance"
 msgstr ""
 
@@ -21860,7 +21623,7 @@ msgstr ""
 msgid "wrong item type"
 msgstr ""
 
-#: include/func.inc.php:577 jsLoader.php:209
+#: include/func.inc.php:577 jsLoader.php:190
 msgctxt "year short"
 msgid "y"
 msgstr "y"
diff --git a/ui/overview.php b/ui/overview.php
deleted file mode 100644
index 0d085e046fb..00000000000
--- a/ui/overview.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/*
-** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**/
-
-
-require_once dirname(__FILE__).'/include/config.inc.php';
-require_once dirname(__FILE__).'/include/hosts.inc.php';
-require_once dirname(__FILE__).'/include/triggers.inc.php';
-require_once dirname(__FILE__).'/include/items.inc.php';
-
-$page['title'] = _('Overview');
-$page['file'] = 'overview.php';
-$page['type'] = detect_page_type(PAGE_TYPE_HTML);
-$page['scripts'] = ['layout.mode.js', 'multiselect.js', 'monitoring.overview.js', 'class.tagfilteritem.js'];
-$page['web_layout_mode'] = CViewHelper::loadLayoutMode();
-
-define('ZBX_PAGE_DO_REFRESH', 1);
-define('SHOW_TRIGGERS', 0);
-define('SHOW_DATA', 1);
-
-require_once dirname(__FILE__).'/include/page_header.php';
-
-// VAR	TYPE	OPTIONAL	FLAGS	VALIDATION	EXCEPTION
-$fields = [
-	'view_style'  => [T_ZBX_INT, O_OPT, P_SYS, IN(STYLE_LEFT.','.STYLE_TOP),	null],
-	'type'        => [T_ZBX_INT, O_OPT, P_SYS, IN(SHOW_TRIGGERS.','.SHOW_DATA), null],
-	// filter
-	'filter_rst' =>			[T_ZBX_STR, O_OPT, P_SYS,	null,		null],
-	'filter_set' =>			[T_ZBX_STR, O_OPT, P_SYS,	null,		null],
-	'filter_groupids' =>	[T_ZBX_INT, O_OPT, null,	DB_ID,		null],
-	'filter_hostids' =>		[T_ZBX_INT, O_OPT, null,	DB_ID,		null],
-	'filter_evaltype' =>	[T_ZBX_INT, O_OPT, null,	IN([TAG_EVAL_TYPE_AND_OR, TAG_EVAL_TYPE_OR]), null],
-	'filter_tags' =>		[T_ZBX_STR, O_OPT, null,	null,		null],
-	'show_triggers' =>		[T_ZBX_INT, O_OPT, null,	null,		null],
-	'ack_status' =>			[T_ZBX_INT, O_OPT, P_SYS,	null,		null],
-	'show_severity' =>		[T_ZBX_INT, O_OPT, P_SYS,	null,		null],
-	'show_suppressed' =>	[T_ZBX_INT, O_OPT, null,	null,		null],
-	'status_change_days' =>	[T_ZBX_INT, O_OPT, null,	BETWEEN(1, DAY_IN_YEAR * 2), null],
-	'status_change' =>		[T_ZBX_INT, O_OPT, null,	null,		null],
-	'txt_select' =>			[T_ZBX_STR, O_OPT, null,	null,		null],
-	'inventory' =>			[T_ZBX_STR, O_OPT, null,	null,		null]
-];
-check_fields($fields);
-
-if (hasRequest('filter_set')) {
-	CProfile::update('web.overview.filter.show_triggers', getRequest('show_triggers', TRIGGERS_OPTION_RECENT_PROBLEM),
-		PROFILE_TYPE_INT
-	);
-	CProfile::update('web.overview.filter.show_suppressed', getRequest('show_suppressed', ZBX_PROBLEM_SUPPRESSED_FALSE),
-		PROFILE_TYPE_INT
-	);
-	CProfile::update('web.overview.filter.show_severity', getRequest('show_severity', TRIGGER_SEVERITY_NOT_CLASSIFIED),
-		PROFILE_TYPE_INT
-	);
-	CProfile::update('web.overview.filter.txt_select', getRequest('txt_select'), PROFILE_TYPE_STR);
-	CProfile::update('web.overview.filter.status_change', getRequest('status_change', 0), PROFILE_TYPE_INT);
-	CProfile::update('web.overview.filter.status_change_days', getRequest('status_change_days', 14),
-		PROFILE_TYPE_INT
-	);
-
-	// ack status
-	CProfile::update('web.overview.filter.ack_status', getRequest('ack_status', 0), PROFILE_TYPE_INT);
-
-	// update host inventory filter
-	$inventoryFields = [];
-	$inventoryValues = [];
-	foreach (getRequest('inventory', []) as $field) {
-		if ($field['value'] === '') {
-			continue;
-		}
-
-		$inventoryFields[] = $field['field'];
-		$inventoryValues[] = $field['value'];
-	}
-	CProfile::updateArray('web.overview.filter.inventory.field', $inventoryFields, PROFILE_TYPE_STR);
-	CProfile::updateArray('web.overview.filter.inventory.value', $inventoryValues, PROFILE_TYPE_STR);
-	CProfile::updateArray('web.overview.filter.groupids', getRequest('filter_groupids', []), PROFILE_TYPE_ID);
-	CProfile::updateArray('web.overview.filter.hostids', getRequest('filter_hostids', []), PROFILE_TYPE_ID);
-
-	$filter_tags = ['tags' => [], 'values' => [], 'operators' => []];
-	foreach (getRequest('filter_tags', []) as $filter_tag) {
-		if ($filter_tag['tag'] === '' && $filter_tag['value'] === '') {
-			continue;
-		}
-
-		$filter_tags['tags'][] = $filter_tag['tag'];
-		$filter_tags['values'][] = $filter_tag['value'];
-		$filter_tags['operators'][] = $filter_tag['operator'];
-	}
-
-	CProfile::update('web.overview.filter.evaltype', getRequest('filter_evaltype', TAG_EVAL_TYPE_AND_OR),
-		PROFILE_TYPE_INT
-	);
-	CProfile::updateArray('web.overview.filter.tags.tag', $filter_tags['tags'], PROFILE_TYPE_STR);
-	CProfile::updateArray('web.overview.filter.tags.value', $filter_tags['values'], PROFILE_TYPE_STR);
-	CProfile::updateArray('web.overview.filter.tags.operator', $filter_tags['operators'], PROFILE_TYPE_INT);
-}
-elseif (hasRequest('filter_rst')) {
-	DBStart();
-	CProfile::delete('web.overview.filter.show_triggers');
-	CProfile::delete('web.overview.filter.show_suppressed');
-	CProfile::delete('web.overview.filter.ack_status');
-	CProfile::delete('web.overview.filter.show_severity');
-	CProfile::delete('web.overview.filter.txt_select');
-	CProfile::delete('web.overview.filter.status_change');
-	CProfile::delete('web.overview.filter.status_change_days');
-	CProfile::deleteIdx('web.overview.filter.inventory.field');
-	CProfile::deleteIdx('web.overview.filter.inventory.value');
-	CProfile::deleteIdx('web.overview.filter.groupids');
-	CProfile::deleteIdx('web.overview.filter.hostids');
-	CProfile::delete('web.overview.filter.evaltype');
-	CProfile::deleteIdx('web.overview.filter.tags.tag');
-	CProfile::deleteIdx('web.overview.filter.tags.value');
-	CProfile::deleteIdx('web.overview.filter.tags.operator');
-	DBend();
-}
-
-$type = getRequest('type', SHOW_TRIGGERS);
-
-// overview style
-if (hasRequest('view_style')) {
-	CProfile::update('web.overview.view_style', getRequest('view_style'), PROFILE_TYPE_INT);
-}
-
-/*
- * Display
- */
-$data = [
-	'type' => $type,
-	'view_style' => CProfile::get('web.overview.view_style', STYLE_TOP),
-	'profileIdx' => 'web.overview.filter',
-	'active_tab' => CProfile::get('web.overview.filter.active', 1),
-	'db_hosts' => [],
-	'db_triggers' => [],
-	'dependencies' => [],
-	'triggers_by_name' => [],
-	'hosts_by_name' => [],
-	'exceeded_limit' => false,
-	'filter' => [
-		'hostids' => CProfile::getArray('web.overview.filter.hostids', []),
-		'groupids' => CProfile::getArray('web.overview.filter.groupids', []),
-		'show_suppressed' => CProfile::get('web.overview.filter.show_suppressed', ZBX_PROBLEM_SUPPRESSED_FALSE),
-		'evaltype' => CProfile::get('web.overview.filter.evaltype', TAG_EVAL_TYPE_AND_OR),
-		'tags' => []
-	]
-];
-
-foreach (CProfile::getArray('web.overview.filter.tags.tag', []) as $i => $tag) {
-	$data['filter']['tags'][] = [
-		'tag' => $tag,
-		'value' => CProfile::get('web.overview.filter.tags.value', null, $i),
-		'operator' => CProfile::get('web.overview.filter.tags.operator', null, $i)
-	];
-}
-
-// fetch trigger data
-if ($type == SHOW_TRIGGERS) {
-	// filter data
-	$data['filter'] += [
-		'showTriggers' => CProfile::get('web.overview.filter.show_triggers', TRIGGERS_OPTION_RECENT_PROBLEM),
-		'ackStatus' => CProfile::get('web.overview.filter.ack_status', 0),
-		'showSeverity' => CProfile::get('web.overview.filter.show_severity', TRIGGER_SEVERITY_NOT_CLASSIFIED),
-		'statusChange' => CProfile::get('web.overview.filter.status_change', 0),
-		'statusChangeDays' => CProfile::get('web.overview.filter.status_change_days', 14),
-		'txtSelect' => CProfile::get('web.overview.filter.txt_select', ''),
-		'inventory' => []
-	];
-
-	foreach (CProfile::getArray('web.overview.filter.inventory.field', []) as $i => $field) {
-		$data['filter']['inventory'][] = [
-			'field' => $field,
-			'value' => CProfile::get('web.overview.filter.inventory.value', null, $i)
-		];
-	}
-
-	$trigger_options = [
-		'search' => ($data['filter']['txtSelect'] !== '') ? ['description' => $data['filter']['txtSelect']] : null,
-		'only_true' => ($data['filter']['showTriggers'] == TRIGGERS_OPTION_RECENT_PROBLEM) ? true : null,
-		'filter' => [
-			'value' => ($data['filter']['showTriggers'] == TRIGGERS_OPTION_IN_PROBLEM) ? TRIGGER_VALUE_TRUE : null
-		],
-		'skipDependent' => ($data['filter']['showTriggers'] == TRIGGERS_OPTION_ALL) ? null : true
-	];
-
-	$problem_options = [
-		'tags' => $data['filter']['tags'] ? $data['filter']['tags'] : null,
-		'evaltype' => $data['filter']['evaltype'] ? $data['filter']['evaltype'] : TAG_EVAL_TYPE_AND_OR,
-		'show_recent' => ($data['filter']['showTriggers'] == TRIGGERS_OPTION_RECENT_PROBLEM) ? true : null,
-		'show_suppressed' => $data['filter']['show_suppressed'],
-		'acknowledged' => ($data['filter']['ackStatus'] == EXTACK_OPTION_UNACK) ? false : null,
-		'min_severity' => $data['filter']['showSeverity'],
-		'time_from' => $data['filter']['statusChange'] ? (time() - $data['filter']['statusChangeDays'] * SEC_PER_DAY) : null
-	];
-
-	$data['filter']['groups'] = $data['filter']['groupids']
-		? CArrayHelper::renameObjectsKeys(API::HostGroup()->get([
-			'output' => ['groupid', 'name'],
-			'groupids' => $data['filter']['groupids'],
-			'preservekeys' => true
-		]), ['groupid' => 'id'])
-		: [];
-
-	$groupids = $data['filter']['groups'] ? getSubGroups(array_keys($data['filter']['groups'])) : [];
-
-	$data['filter']['hosts'] = $data['filter']['hostids']
-		? CArrayHelper::renameObjectsKeys(API::Host()->get([
-			'output' => ['hostid', 'name'],
-			'hostids' => $data['filter']['hostids'],
-			'monitored_hosts' => true,
-			'with_monitored_triggers' => true,
-			'preservekeys' => true
-		]), ['hostid' => 'id'])
-		: [];
-
-	unset($data['filter']['groupids'], $data['filter']['hostids']);
-
-	$host_options = [];
-	if ($data['filter']['inventory']) {
-		$host_options['searchInventory'] = [];
-		foreach ($data['filter']['inventory'] as $field) {
-			$host_options['searchInventory'][$field['field']][] = $field['value'];
-		}
-	}
-	if ($data['filter']['hosts']) {
-		$host_options['hostids'] = array_keys($data['filter']['hosts']);
-	}
-
-	$data['allowed'] = [
-		'add_comments' => CWebUser::checkAccess(CRoleHelper::ACTIONS_ADD_PROBLEM_COMMENTS),
-		'change_severity' => CWebUser::checkAccess(CRoleHelper::ACTIONS_CHANGE_SEVERITY),
-		'acknowledge' => CWebUser::checkAccess(CRoleHelper::ACTIONS_ACKNOWLEDGE_PROBLEMS),
-		'close' => CWebUser::checkAccess(CRoleHelper::ACTIONS_CLOSE_PROBLEMS)
-	];
-
-	[$data['db_hosts'], $data['db_triggers'], $data['dependencies'], $data['triggers_by_name'], $data['hosts_by_name'],
-		$data['exceeded_limit']
-	] = getTriggersOverviewData($groupids, $host_options, $trigger_options, $problem_options);
-
-	$data['config'] = [
-		'blink_period' => CSettingsHelper::get(CSettingsHelper::BLINK_PERIOD)
-	];
-
-	if (!$data['filter']['tags']) {
-		$data['filter']['tags'] = [[
-			'tag' => '',
-			'value' => '',
-			'operator' => TAG_OPERATOR_LIKE
-		]];
-	}
-
-	// Render view.
-	echo (new CView('monitoring.overview.triggers', $data))->getOutput();
-}
-// Fetch item data.
-else {
-	$data['filter']['groups'] = $data['filter']['groupids']
-		? CArrayHelper::renameObjectsKeys(API::HostGroup()->get([
-			'output' => ['groupid', 'name'],
-			'groupids' => $data['filter']['groupids'],
-			'preservekeys' => true
-		]), ['groupid' => 'id'])
-		: [];
-
-	$data['filter']['hosts'] = $data['filter']['hostids']
-		? CArrayHelper::renameObjectsKeys(API::Host()->get([
-			'output' => ['hostid', 'name'],
-			'hostids' => $data['filter']['hostids'],
-			'preservekeys' => true
-		]), ['hostid' => 'id'])
-		: [];
-
-	unset($data['filter']['groupids'], $data['filter']['hostids']);
-
-	$groupids = $data['filter']['groups'] ? getSubGroups(array_keys($data['filter']['groups'])) : null;
-	$hostids = $data['filter']['hosts'] ? array_keys($data['filter']['hosts']) : null;
-
-	[$data['items'], $data['hosts'], $data['has_hidden_data']] = getDataOverview($groupids, $hostids, $data['filter']);
-
-	if (!$data['filter']['tags']) {
-		$data['filter']['tags'] = [[
-			'tag' => '',
-			'value' => '',
-			'operator' => TAG_OPERATOR_LIKE
-		]];
-	}
-
-	// Render view.
-	echo (new CView('monitoring.overview.items', $data))->getOutput();
-}
-
-require_once dirname(__FILE__).'/include/page_footer.php';
diff --git a/ui/srv_status.php b/ui/srv_status.php
deleted file mode 100644
index 8549206d669..00000000000
--- a/ui/srv_status.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/*
-** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**/
-
-
-require_once dirname(__FILE__).'/include/config.inc.php';
-require_once dirname(__FILE__).'/include/triggers.inc.php';
-require_once dirname(__FILE__).'/include/services.inc.php';
-
-$page['title'] = _('Services');
-$page['file'] = 'srv_status.php';
-$page['scripts'] = ['layout.mode.js', 'srv_status.js'];
-
-define('ZBX_PAGE_DO_REFRESH', 1);
-
-if (!getRequest('serviceid') || !getRequest('showgraph')) {
-	$page['web_layout_mode'] = CViewHelper::loadLayoutMode();
-}
-require_once dirname(__FILE__).'/include/page_header.php';
-
-$periods = [
-	'today' => _('Today'),
-	'week' => _('This week'),
-	'month' => _('This month'),
-	'year' => _('This year'),
-	24 => _('Last 24 hours'),
-	24 * 7 => _('Last 7 days'),
-	24 * 30 => _('Last 30 days'),
-	24 * DAY_IN_YEAR => _('Last 365 days')
-];
-
-// VAR	TYPE	OPTIONAL	FLAGS	VALIDATION	EXCEPTION
-$fields = [
-	'serviceid' =>	[T_ZBX_INT, O_OPT, P_SYS|P_NZERO, DB_ID,	null],
-	'showgraph' =>	[T_ZBX_INT, O_OPT, P_SYS,	IN('1'),		'isset({serviceid})'],
-	'period' =>		[T_ZBX_STR, O_OPT, P_SYS,	IN('"'.implode('","', array_keys($periods)).'"'),	null]
-];
-check_fields($fields);
-
-if (isset($_REQUEST['serviceid']) && isset($_REQUEST['showgraph'])) {
-	$service = API::Service()->get([
-		'output' => ['serviceid'],
-		'serviceids' => getRequest('serviceid')
-	]);
-	$service = reset($service);
-
-	if ($service) {
-		$table = (new CDiv())
-			->addClass(ZBX_STYLE_TABLE_FORMS_CONTAINER)
-			->addClass(ZBX_STYLE_CENTER)
-			->addItem(new CImg('chart5.php?serviceid='.$service['serviceid'].url_param('path')))
-			->show();
-	}
-	else {
-		access_deny();
-	}
-}
-else {
-	$period = getRequest('period', 7 * 24);
-	$period_end = time();
-
-	switch ($period) {
-		case 'today':
-			$period_start = mktime(0, 0, 0, date('n'), date('j'), date('Y'));
-			break;
-		case 'week':
-			$period_start = strtotime('last sunday');
-			break;
-		case 'month':
-			$period_start = mktime(0, 0, 0, date('n'), 1, date('Y'));
-			break;
-		case 'year':
-			$period_start = mktime(0, 0, 0, 1, 1, date('Y'));
-			break;
-		case 24:
-		case 24 * 7:
-		case 24 * 30:
-		case 24 * DAY_IN_YEAR:
-			$period_start = $period_end - ($period * 3600);
-			break;
-	}
-
-	// fetch services
-	$services = API::Service()->get([
-		'output' => ['name', 'serviceid', 'showsla', 'goodsla', 'algorithm', 'sortorder'],
-		'selectParent' => ['serviceid'],
-		'selectDependencies' => ['servicedownid', 'soft', 'linkid'],
-		'selectTrigger' => ['description', 'triggerid', 'expression'],
-		'preservekeys' => true
-	]);
-
-	sortServices($services);
-
-	// expand trigger descriptions
-	$triggers = zbx_objectValues(
-		array_filter($services, function($service) { return (bool) $service['trigger']; }), 'trigger'
-	);
-	$triggers = CMacrosResolverHelper::resolveTriggerNames(zbx_toHash($triggers, 'triggerid'));
-
-	foreach ($services as &$service) {
-		if ($service['trigger']) {
-			$service['trigger'] = $triggers[$service['trigger']['triggerid']];
-		}
-	}
-	unset($service);
-
-	// fetch sla
-	$slaData = API::Service()->getSla([
-		'intervals' => [[
-			'from' => $period_start,
-			'to' => $period_end
-		]]
-	]);
-	// expand problem trigger descriptions
-	foreach ($slaData as &$serviceSla) {
-		foreach ($serviceSla['problems'] as &$problemTrigger) {
-			$problemTrigger['description'] = $triggers[$problemTrigger['triggerid']]['description'];
-		}
-		unset($problemTrigger);
-	}
-	unset($serviceSla);
-
-	$treeData = [];
-	createServiceMonitoringTree($services, $slaData, $period, $treeData);
-	$tree = new CServiceTree('service_status_tree',
-		$treeData,
-		[
-			'caption' => _('Service'),
-			'status' => _('Status'),
-			'reason' => _('Reason'),
-			'sla' => (new CColHeader(_('Problem time')))->setColSpan(2),
-			'sla2' => null,
-			'sla3' => _('SLA').' / '._('Acceptable SLA')
-		]
-	);
-
-	if ($tree) {
-		(new CWidget())
-			->setTitle(_('Services'))
-			->setWebLayoutMode($page['web_layout_mode'])
-			->setControls(new CList([
-				(new CForm('get'))
-					->setName('srv_status')
-					->cleanItems()
-					->setAttribute('aria-label', _('Main filter'))
-					->addItem((new CList())
-						->addItem([
-							new CLabel(_('Period'), 'label-period'),
-							(new CDiv())->addClass(ZBX_STYLE_FORM_INPUT_MARGIN),
-							(new CSelect('period'))
-								->setFocusableElementId('label-period')
-								->setValue($period)
-								->addOptions(CSelect::createOptionsFromArray($periods))
-						])
-					),
-				(new CTag('nav', true, get_icon('kioskmode', ['mode' => $page['web_layout_mode']])))
-					->setAttribute('aria-label', _('Content controls'))
-			]))
-			->addItem($tree->getHTML())
-			->show();
-	}
-	else {
-		error(_('Cannot format tree. Check logic structure in service links.'));
-	}
-}
-
-require_once dirname(__FILE__).'/include/page_footer.php';
diff --git a/ui/tests/api_json/testConfiguration.php b/ui/tests/api_json/testConfiguration.php
index 4330af869d4..3c7c939a5d9 100644
--- a/ui/tests/api_json/testConfiguration.php
+++ b/ui/tests/api_json/testConfiguration.php
@@ -45,7 +45,7 @@ class testConfiguration extends CAPITest {
 					],
 					'format' => ''
 				],
-				'expected_error' => 'Invalid parameter "/format": value must be one of yaml, xml, json, raw.'
+				'expected_error' => 'Invalid parameter "/format": value must be one of "yaml", "xml", "json", "raw".'
 			],
 			[
 				'export' => [
@@ -56,7 +56,7 @@ class testConfiguration extends CAPITest {
 					],
 					'format' => 'æų'
 				],
-				'expected_error' => 'Invalid parameter "/format": value must be one of yaml, xml, json, raw.'
+				'expected_error' => 'Invalid parameter "/format": value must be one of "yaml", "xml", "json", "raw".'
 			],
 			// Check unexpected parameter.
 			[
@@ -291,7 +291,7 @@ class testConfiguration extends CAPITest {
 					],
 					'source' => '{"zabbix_export":{"version":"3.2","date":"2016-12-09T07:29:55Z"}}'
 				],
-				'expected_error' => 'Invalid parameter "/format": value must be one of yaml, xml, json.'
+				'expected_error' => 'Invalid parameter "/format": value must be one of "yaml", "xml", "json".'
 			],
 			[
 				'import' => [
@@ -303,7 +303,7 @@ class testConfiguration extends CAPITest {
 					],
 					'source' => '{"zabbix_export":{"version":"3.2","date":"2016-12-09T07:29:55Z"}}'
 				],
-				'expected_error' => 'Invalid parameter "/format": value must be one of yaml, xml, json.'
+				'expected_error' => 'Invalid parameter "/format": value must be one of "yaml", "xml", "json".'
 			],
 			[
 				'import' => [
@@ -860,21 +860,21 @@ class testConfiguration extends CAPITest {
 								</groups>
 								</zabbix_export>',
 				'sql' => 'select * from hstgrp where name=\'API host group xml import as non Super Admin\'',
-				'expected_error' => 'Only Super Admins can create host groups.'
+				'expected_error' => 'No permissions to call "hostgroup.create".'
 			],
 			[
 				'format' => 'json',
 				'parameter' => 'groups',
 				'source' => '{"zabbix_export":{"version":"3.2","date":"2016-12-09T12:29:57Z","groups":[{"name":"API host group json import as non Super Admin"}]}}',
 				'sql' => 'select * from hstgrp where name=\'API host group json import as non Super Admin\'',
-				'expected_error' => 'Only Super Admins can create host groups.'
+				'expected_error' => 'No permissions to call "hostgroup.create".'
 			],
 			[
 				'format' => 'yaml',
 				'parameter' => 'groups',
 				'source' => "---\nzabbix_export:\n  version: \"4.0\"\n  date: \"2020-08-03T12:41:17Z\"\n  groups:\n  - name: API host group yaml import as non Super Admin\n...\n",
 				'sql' => 'select * from hstgrp where name=\'API host group yaml import as non Super Admin\'',
-				'expected_error' => 'Only Super Admins can create host groups.'
+				'expected_error' => 'No permissions to call "hostgroup.create".'
 			]
 		];
 	}
diff --git a/ui/tests/api_json/testHost.php b/ui/tests/api_json/testHost.php
index e427b670c81..842272593c3 100644
--- a/ui/tests/api_json/testHost.php
+++ b/ui/tests/api_json/testHost.php
@@ -198,7 +198,7 @@ class testHost extends CAPITest {
 
 	public static function dataHostFieldPresence() {
 		return [
-			'Check if {"ouput": "extend"} includes "inventory_mode" and excludes write-only properties' => [
+			'Check if {"output": "extend"} includes "inventory_mode" and excludes write-only properties' => [
 				'request' => [
 					'output' => 'extend',
 					'hostids' => ['99013']
diff --git a/ui/tests/api_json/testHostGroup.php b/ui/tests/api_json/testHostGroup.php
index 32da3082ce3..c15bbe4c5ed 100644
--- a/ui/tests/api_json/testHostGroup.php
+++ b/ui/tests/api_json/testHostGroup.php
@@ -254,7 +254,7 @@ class testHostGroup extends CAPITest {
 					'name' => 'API updated discovered group'
 					]
 				],
-				'expected_error' => 'Cannot update a discovered host group.'
+				'expected_error' => 'Cannot update a discovered host group "API discovery group {#HV.NAME}".'
 			],
 			// Check successfully update.
 			[
diff --git a/ui/tests/api_json/testHostPrototype.php b/ui/tests/api_json/testHostPrototype.php
index 605fd45de11..aebba8917d7 100644
--- a/ui/tests/api_json/testHostPrototype.php
+++ b/ui/tests/api_json/testHostPrototype.php
@@ -55,7 +55,7 @@ class testHostPrototype extends CAPITest {
 				],
 				'expected_error' => null
 			],
-			'inherit interfaces wiht empty interfaces' => [
+			'inherit interfaces with empty interfaces' => [
 				'request' => [
 					[
 						'ruleid' => 40066,
diff --git a/ui/tests/api_json/testJSONRPC.php b/ui/tests/api_json/testJSONRPC.php
index ebd8fbf233e..de5ef65ebe5 100644
--- a/ui/tests/api_json/testJSONRPC.php
+++ b/ui/tests/api_json/testJSONRPC.php
@@ -102,7 +102,7 @@ class testJSONRPC extends CAPITest {
 					'error' => [
 						'code' => -32600,
 						'message' => 'Invalid request.',
-						'data' => 'Invalid parameter "/jsonrpc": value must be one of 2.0.'
+						'data' => 'Invalid parameter "/jsonrpc": value must be "2.0".'
 					],
 					'id' => null
 				]
diff --git a/ui/tests/api_json/testServices.php b/ui/tests/api_json/testServices.php
index 12bb86ca065..7c4618801b2 100644
--- a/ui/tests/api_json/testServices.php
+++ b/ui/tests/api_json/testServices.php
@@ -4871,8 +4871,7 @@ class testServices extends CAPITest {
 					'selectAlarms' => ''
 				],
 				'expected' => [
-					'error' => 'Invalid parameter "/selectAlarms": value must be one of '.
-						implode(', ', [API_OUTPUT_EXTEND, API_OUTPUT_COUNT]).'.',
+					'error' => 'Invalid parameter "/selectAlarms": value must be one of "extend", "count".',
 					'result' => []
 				]
 			],
@@ -4922,7 +4921,7 @@ class testServices extends CAPITest {
 					'selectAlarms' => ['']
 				],
 				'expected' => [
-					'error' => 'Invalid parameter "/selectAlarms/1": value must be one of clock, value.',
+					'error' => 'Invalid parameter "/selectAlarms/1": value must be one of "clock", "value".',
 					'result' => []
 				]
 			],
@@ -4952,8 +4951,7 @@ class testServices extends CAPITest {
 					'selectChildren' => ''
 				],
 				'expected' => [
-					'error' => 'Invalid parameter "/selectChildren": value must be one of '.
-						implode(', ', [API_OUTPUT_EXTEND, API_OUTPUT_COUNT]).'.',
+					'error' => 'Invalid parameter "/selectChildren": value must be one of "extend", "count".',
 					'result' => []
 				]
 			],
@@ -5003,7 +5001,7 @@ class testServices extends CAPITest {
 					'selectChildren' => ['']
 				],
 				'expected' => [
-					'error' => 'Invalid parameter "/selectChildren/1": value must be one of serviceid, name, status, algorithm, showsla, goodsla, sortorder, weight, propagation_rule, propagation_value, readonly.',
+					'error' => 'Invalid parameter "/selectChildren/1": value must be one of "serviceid", "name", "status", "algorithm", "showsla", "goodsla", "sortorder", "weight", "propagation_rule", "propagation_value", "readonly".',
 					'result' => []
 				]
 			],
@@ -5033,8 +5031,7 @@ class testServices extends CAPITest {
 					'selectParents' => ''
 				],
 				'expected' => [
-					'error' => 'Invalid parameter "/selectParents": value must be one of '.
-						implode(', ', [API_OUTPUT_EXTEND, API_OUTPUT_COUNT]).'.',
+					'error' => 'Invalid parameter "/selectParents": value must be one of "extend", "count".',
 					'result' => []
 				]
 			],
@@ -5084,7 +5081,7 @@ class testServices extends CAPITest {
 					'selectParents' => ['']
 				],
 				'expected' => [
-					'error' => 'Invalid parameter "/selectParents/1": value must be one of serviceid, name, status, algorithm, showsla, goodsla, sortorder, weight, propagation_rule, propagation_value, readonly.',
+					'error' => 'Invalid parameter "/selectParents/1": value must be one of "serviceid", "name", "status", "algorithm", "showsla", "goodsla", "sortorder", "weight", "propagation_rule", "propagation_value", "readonly".',
 					'result' => []
 				]
 			],
@@ -5114,8 +5111,7 @@ class testServices extends CAPITest {
 					'selectProblemTags' => ''
 				],
 				'expected' => [
-					'error' => 'Invalid parameter "/selectProblemTags": value must be one of '.
-						implode(', ', [API_OUTPUT_EXTEND, API_OUTPUT_COUNT]).'.',
+					'error' => 'Invalid parameter "/selectProblemTags": value must be one of "extend", "count".',
 					'result' => []
 				]
 			],
@@ -5165,7 +5161,7 @@ class testServices extends CAPITest {
 					'selectProblemTags' => ['']
 				],
 				'expected' => [
-					'error' => 'Invalid parameter "/selectProblemTags/1": value must be one of tag, operator, value.',
+					'error' => 'Invalid parameter "/selectProblemTags/1": value must be one of "tag", "operator", "value".',
 					'result' => []
 				]
 			],
@@ -5195,8 +5191,7 @@ class testServices extends CAPITest {
 					'selectStatusRules' => ''
 				],
 				'expected' => [
-					'error' => 'Invalid parameter "/selectStatusRules": value must be one of '.
-						implode(', ', [API_OUTPUT_EXTEND, API_OUTPUT_COUNT]).'.',
+					'error' => 'Invalid parameter "/selectStatusRules": value must be one of "extend", "count".',
 					'result' => []
 				]
 			],
@@ -5246,7 +5241,7 @@ class testServices extends CAPITest {
 					'selectStatusRules' => ['']
 				],
 				'expected' => [
-					'error' => 'Invalid parameter "/selectStatusRules/1": value must be one of type, limit_value, limit_status, new_status.',
+					'error' => 'Invalid parameter "/selectStatusRules/1": value must be one of "type", "limit_value", "limit_status", "new_status".',
 					'result' => []
 				]
 			],
@@ -5276,8 +5271,7 @@ class testServices extends CAPITest {
 					'selectTags' => ''
 				],
 				'expected' => [
-					'error' => 'Invalid parameter "/selectTags": value must be one of '.
-						implode(', ', [API_OUTPUT_EXTEND, API_OUTPUT_COUNT]).'.',
+					'error' => 'Invalid parameter "/selectTags": value must be one of "extend", "count".',
 					'result' => []
 				]
 			],
@@ -5327,7 +5321,7 @@ class testServices extends CAPITest {
 					'selectTags' => ['']
 				],
 				'expected' => [
-					'error' => 'Invalid parameter "/selectTags/1": value must be one of tag, value.',
+					'error' => 'Invalid parameter "/selectTags/1": value must be one of "tag", "value".',
 					'result' => []
 				]
 			],
@@ -5357,8 +5351,7 @@ class testServices extends CAPITest {
 					'selectTimes' => ''
 				],
 				'expected' => [
-					'error' => 'Invalid parameter "/selectTimes": value must be one of '.
-						implode(', ', [API_OUTPUT_EXTEND, API_OUTPUT_COUNT]).'.',
+					'error' => 'Invalid parameter "/selectTimes": value must be one of "extend", "count".',
 					'result' => []
 				]
 			],
@@ -5408,7 +5401,7 @@ class testServices extends CAPITest {
 					'selectTimes' => ['']
 				],
 				'expected' => [
-					'error' => 'Invalid parameter "/selectTimes/1": value must be one of type, ts_from, ts_to, note.',
+					'error' => 'Invalid parameter "/selectTimes/1": value must be one of "type", "ts_from", "ts_to", "note".',
 					'result' => []
 				]
 			]
diff --git a/ui/tests/api_json/testTriggerValidation.php b/ui/tests/api_json/testTriggerValidation.php
index 81b30a46bbd..a5911af687b 100644
--- a/ui/tests/api_json/testTriggerValidation.php
+++ b/ui/tests/api_json/testTriggerValidation.php
@@ -292,7 +292,7 @@ class testTriggerValidation extends CAPITest {
 				],
 				'expected_error' => 'Incorrect value for field "recovery_expression": cannot be empty.'
 			],
-			'Trigger with invalid recovery exporession #1' => [
+			'Trigger with invalid recovery expression #1' => [
 				'triggers' => [
 					[
 						'description' => 'Trigger with expected recovery exporession',
@@ -303,7 +303,7 @@ class testTriggerValidation extends CAPITest {
 				],
 				'expected_error' => 'Invalid parameter "/1/recovery_expression": a character string is expected.'
 			],
-			'Trigger with invalid recovery exporession #2' => [
+			'Trigger with invalid recovery expression #2' => [
 				'triggers' => [
 					[
 						'description' => 'Trigger with expected recovery exporession',
diff --git a/ui/tests/api_json/testUsers.php b/ui/tests/api_json/testUsers.php
index 03c3eea842a..825f70c37fa 100644
--- a/ui/tests/api_json/testUsers.php
+++ b/ui/tests/api_json/testUsers.php
@@ -831,9 +831,7 @@ class testUsers extends CAPITest {
 					],
 					'lang' => '123456'
 				],
-				'expected_error' => 'Invalid parameter "/1/lang": value must be one of default, en_US, bg_BG, ca_ES, zh_CN, '
-				. 'zh_TW, cs_CZ, nl_NL, fi_FI, fr_FR, ka_GE, de_DE, el_GR, he_IL, hu_HU, id_ID, it_IT, ko_KR, ja_JP, lv_LV, '
-				. 'lt_LT, nb_NO, fa_IR, pl_PL, pt_BR, pt_PT, ro_RO, ru_RU, sk_SK, es_ES, sv_SE, tr_TR, uk_UA, vi_VN.'
+				'expected_error' => 'Invalid parameter "/1/lang": value must be one of "default", "en_US", "bg_BG", "ca_ES", "zh_CN", "zh_TW", "cs_CZ", "nl_NL", "fi_FI", "fr_FR", "ka_GE", "de_DE", "el_GR", "he_IL", "hu_HU", "id_ID", "it_IT", "ko_KR", "ja_JP", "lv_LV", "lt_LT", "nb_NO", "fa_IR", "pl_PL", "pt_BR", "pt_PT", "ro_RO", "ru_RU", "sk_SK", "es_ES", "sv_SE", "tr_TR", "uk_UA", "vi_VN".'
 			],
 			// Check user properties, theme.
 			[
@@ -845,7 +843,7 @@ class testUsers extends CAPITest {
 					],
 					'theme' => ''
 				],
-				'expected_error' => 'Invalid parameter "/1/theme": value must be one of default, blue-theme, dark-theme, hc-light, hc-dark.'
+				'expected_error' => 'Invalid parameter "/1/theme": value must be one of "default", "blue-theme", "dark-theme", "hc-light", "hc-dark".'
 			],
 			[
 				'user' => [
@@ -856,7 +854,7 @@ class testUsers extends CAPITest {
 					],
 					'theme' => 'classic'
 				],
-				'expected_error' => 'Invalid parameter "/1/theme": value must be one of default, blue-theme, dark-theme, hc-light, hc-dark.'
+				'expected_error' => 'Invalid parameter "/1/theme": value must be one of "default", "blue-theme", "dark-theme", "hc-light", "hc-dark".'
 			],
 			[
 				'user' => [
@@ -867,7 +865,7 @@ class testUsers extends CAPITest {
 					],
 					'theme' => 'originalblue'
 				],
-				'expected_error' => 'Invalid parameter "/1/theme": value must be one of default, blue-theme, dark-theme, hc-light, hc-dark.'
+				'expected_error' => 'Invalid parameter "/1/theme": value must be one of "default", "blue-theme", "dark-theme", "hc-light", "hc-dark".'
 			],
 			// Check user properties, type.
 			[
diff --git a/ui/tests/general/function_DBclose.php b/ui/tests/general/function_DBclose.php
index e30cb8177e0..ced1f4085e1 100644
--- a/ui/tests/general/function_DBclose.php
+++ b/ui/tests/general/function_DBclose.php
@@ -30,6 +30,6 @@ class function_DBclose extends CTest {
 	public function test_DBcloseOfClosedDatabase() {
 		DBconnect($error);
 		DBclose();
-		$this->assertFalse(DBclose(), 'Chuck Norris: DBclose() must return False if the datbase is already closed');
+		$this->assertFalse(DBclose(), 'Chuck Norris: DBclose() must return False if the database is already closed');
 	}
 }
diff --git a/ui/tests/include/web/CElementQuery.php b/ui/tests/include/web/CElementQuery.php
index 5f6ce05068f..62a6bb917d0 100644
--- a/ui/tests/include/web/CElementQuery.php
+++ b/ui/tests/include/web/CElementQuery.php
@@ -25,7 +25,7 @@ require_once dirname(__FILE__).'/CElementCollection.php';
 require_once dirname(__FILE__).'/CElementFilter.php';
 require_once dirname(__FILE__).'/elements/CNullElement.php';
 require_once dirname(__FILE__).'/elements/CFormElement.php';
-require_once dirname(__FILE__).'/elements/CFluidFormElement.php';
+require_once dirname(__FILE__).'/elements/CGridFormElement.php';
 require_once dirname(__FILE__).'/elements/CCheckboxFormElement.php';
 require_once dirname(__FILE__).'/elements/CTableElement.php';
 require_once dirname(__FILE__).'/elements/CTableRowElement.php';
diff --git a/ui/tests/include/web/CastableTrait.php b/ui/tests/include/web/CastableTrait.php
index 145d0df2f43..df5f7489b6e 100644
--- a/ui/tests/include/web/CastableTrait.php
+++ b/ui/tests/include/web/CastableTrait.php
@@ -101,14 +101,14 @@ trait CastableTrait {
 	}
 
 	/**
-	 * Cast object to Fluid form element.
+	 * Cast object to Grid form element.
 	 *
 	 * @param array $options    additional casting options
 	 *
-	 * @return CFluidFormElement
+	 * @return CGridFormElement
 	 */
-	public function asFluidForm($options = []) {
-		return $this->cast(CFluidFormElement::class, $options);
+	public function asGridForm($options = []) {
+		return $this->cast(CGridFormElement::class, $options);
 	}
 
 	/**
diff --git a/ui/tests/include/web/elements/CFormElement.php b/ui/tests/include/web/elements/CFormElement.php
index 7b8dad68199..81d008d3f47 100644
--- a/ui/tests/include/web/elements/CFormElement.php
+++ b/ui/tests/include/web/elements/CFormElement.php
@@ -46,6 +46,22 @@ class CFormElement extends CElement {
 	protected $filter = null;
 
 	/**
+	 * @inheritdoc
+	 */
+	public static function createInstance(RemoteWebElement $element, $options = []) {
+		$instance = parent::createInstance($element, $options);
+
+		if (get_class($instance) !== CGridFormElement::class) {
+			$grid = $instance->query('xpath:.//div[contains(@class, "form-grid")]')->one(false);
+			if ($grid->isValid() && !$grid->parents('xpath:*[contains(@class, "table-forms-td-right")]')->exists()) {
+				return $instance->asGridForm($options);
+			}
+		}
+
+		return $instance;
+	}
+
+	/**
 	 * Get filter.
 	 *
 	 * @return CElementFilter
diff --git a/ui/tests/include/web/elements/CFluidFormElement.php b/ui/tests/include/web/elements/CGridFormElement.php
index 94f0822c1a1..8ae5383beb1 100644
--- a/ui/tests/include/web/elements/CFluidFormElement.php
+++ b/ui/tests/include/web/elements/CGridFormElement.php
@@ -23,9 +23,9 @@ require_once 'vendor/autoload.php';
 require_once dirname(__FILE__).'/CFormElement.php';
 
 /**
- * Fluid form element.
+ * Grid form element.
  */
-class CFluidFormElement extends CFormElement {
+class CGridFormElement extends CFormElement {
 
 	const TABLE_FORM = 'div[contains(@class, "form-grid")]';
 	const TABLE_FORM_FIELD = 'following-sibling::div[1]';
diff --git a/ui/tests/include/web/elements/CMultifieldTableElement.php b/ui/tests/include/web/elements/CMultifieldTableElement.php
index a68b2585d23..4a60cbec732 100644
--- a/ui/tests/include/web/elements/CMultifieldTableElement.php
+++ b/ui/tests/include/web/elements/CMultifieldTableElement.php
@@ -56,6 +56,13 @@ class CMultifieldTableElement extends CTableElement {
 	protected $names;
 
 	/**
+	 * Field mapping aliases.
+	 *
+	 * @var array
+	 */
+	protected $aliases = [];
+
+	/**
 	 * Get field mapping.
 	 *
 	 * @return array
@@ -197,10 +204,21 @@ class CMultifieldTableElement extends CTableElement {
 				$name = $label;
 			}
 
+			$aliases = [];
+			if ($name !== $label) {
+				$aliases[] = $label;
+			}
+			$aliases[] = $i;
+
 			if (!empty($this->names) && array_key_exists($name, $this->names)) {
+				$aliases[] = $name;
 				$name = $this->names[$name];
 			}
 
+			foreach ($aliases as $alias) {
+				$this->aliases[$alias] = $name;
+			}
+
 			$result[$label] = [
 				'name' => $name,
 				'class' => get_class($element),
@@ -333,9 +351,11 @@ class CMultifieldTableElement extends CTableElement {
 	public function updateRow($index, $values) {
 		$controls = $this->getRowControls($this->getRow($index));
 		foreach ($values as $name => $value) {
-			if (array_key_exists($name, $controls)) {
+			$field = (array_key_exists($name, $this->aliases)) ? $this->aliases[$name] : $name;
+
+			if (array_key_exists($field, $controls)) {
 				try {
-					$controls[$name]->fill($value);
+					$controls[$field]->fill($value);
 				}
 				catch (\Exception $e1) {
 					if (!($e1 instanceof UnrecognizedExceptionException)
@@ -345,7 +365,7 @@ class CMultifieldTableElement extends CTableElement {
 
 					try {
 						$controls = $this->getRowControls($this->getRow($index));
-						$controls[$name]->fill($value);
+						$controls[$field]->fill($value);
 					}
 					catch (\Exception $e2) {
 						throw $e1;
@@ -410,7 +430,9 @@ class CMultifieldTableElement extends CTableElement {
 
 		foreach ($this->getValue() as $index => $values) {
 			foreach ($fields as $name => $value) {
-				if (array_key_exists($name, $values) && $values[$name] === $value) {
+				$field = (array_key_exists($name, $this->aliases)) ? $this->aliases[$name] : $name;
+
+				if (array_key_exists($field, $values) && $values[$field] === $value) {
 					$indices[] = $index;
 					break;
 				}
@@ -551,10 +573,12 @@ class CMultifieldTableElement extends CTableElement {
 			}
 
 			$controls = $this->getRowControls($row, $headers);
-			foreach ($expected[$id] as $field => $value) {
+			foreach ($expected[$id] as $name => $value) {
+				$field = (array_key_exists($name, $this->aliases)) ? $this->aliases[$name] : $name;
+
 				if (!array_key_exists($field, $controls)) {
 					if ($raise_exception) {
-						throw new Exception('Expected field "'.$field.'" is not present in multifield element row.');
+						throw new Exception('Expected field "'.$name.'" is not present in multifield element row.');
 					}
 
 					return false;
@@ -567,7 +591,7 @@ class CMultifieldTableElement extends CTableElement {
 				}
 				catch (Exception $exception) {
 					if ($raise_exception) {
-						CExceptionHelper::setMessage($exception, 'Multifield element value for field "'.$field.
+						CExceptionHelper::setMessage($exception, 'Multifield element value for field "'.$name.
 								'['.$id.']" is invalid: '.$exception->getMessage()
 						);
 					}
diff --git a/ui/tests/include/web/elements/CWidgetElement.php b/ui/tests/include/web/elements/CWidgetElement.php
index 4ff1d97de4c..6680e7af026 100644
--- a/ui/tests/include/web/elements/CWidgetElement.php
+++ b/ui/tests/include/web/elements/CWidgetElement.php
@@ -75,9 +75,19 @@ class CWidgetElement extends CElement {
 	 * @return CFormElement
 	 */
 	public function edit() {
-		$this->query('xpath:.//button[@class="btn-widget-edit"]')->waitUntilPresent()->one()->click(true);
+		// Edit can sometimes fail so we have to retry this operation.
+		for ($i = 0; $i < 2; $i++) {
+			$this->query('xpath:.//button[@class="btn-widget-edit"]')->waitUntilPresent()->one()->click(true);
 
-		return $this->query('xpath://div[@data-dialogueid="widget_properties"]//form')->waitUntilVisible()->asForm()->one();
+			try {
+				return $this->query('xpath://div[@data-dialogueid="widget_properties"]//form')->waitUntilVisible()->asForm()->one();
+			}
+			catch (\Exception $e) {
+				if ($i === 1) {
+					throw $e;
+				}
+			}
+		}
 	}
 
 	/**
diff --git a/ui/tests/integration/IntegrationTests.php b/ui/tests/integration/IntegrationTests.php
index 63fb42e9ab9..5ec057f88e5 100644
--- a/ui/tests/integration/IntegrationTests.php
+++ b/ui/tests/integration/IntegrationTests.php
@@ -29,6 +29,7 @@ require_once dirname(__FILE__).'/testGraphLinking.php';
 require_once dirname(__FILE__).'/testEscalations.php';
 require_once dirname(__FILE__).'/testComplexServiceStatus.php';
 require_once dirname(__FILE__).'/testServiceRoles.php';
+require_once dirname(__FILE__).'/testExpressionMacros.php';
 
 class IntegrationTests {
 	public static function suite() {
@@ -44,6 +45,7 @@ class IntegrationTests {
 		$suite->addTestSuite('testEscalations');
 		$suite->addTestSuite('testComplexServiceStatus');
 		$suite->addTestSuite('testServiceRoles');
+		$suite->addTestSuite('testExpressionMacros');
 
 		return $suite;
 	}
diff --git a/ui/tests/integration/testExpressionMacros.php b/ui/tests/integration/testExpressionMacros.php
new file mode 100644
index 00000000000..80899ed2d14
--- /dev/null
+++ b/ui/tests/integration/testExpressionMacros.php
@@ -0,0 +1,268 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+**/
+
+require_once dirname(__FILE__).'/../include/CIntegrationTest.php';
+
+/**
+ * Test suite for expression macros
+ *
+ * @required-components server
+ * @configurationDataProvider serverConfigurationProvider
+ * @backup items,actions,triggers
+ * @hosts test_macros
+ */
+class testExpressionMacros extends CIntegrationTest {
+
+	private static $hostid;
+	private static $triggerid;
+	private static $trigger_actionid;
+	private static $alert_response;
+	private static $event_response;
+
+	const TRAPPER_ITEM_NAME = 'trap';
+	const HOST_NAME = 'test_macros';
+	const MESSAGE_PREFIX = 'message with expression macro: ';
+	const SUBJECT_PREFIX = 'subject with expression macro: ';
+	const EVENT_PREFIX = 'event name with expression macro: ';
+
+	/**
+	 * @inheritdoc
+	 */
+	public function prepareData() {
+		// Create host "test_macros".
+		$response = $this->call('host.create', [
+			'host' => self::HOST_NAME,
+			'interfaces' => [
+				[
+					'type' => 1,
+					'main' => 1,
+					'useip' => 1,
+					'ip' => '127.0.0.1',
+					'dns' => '',
+					'port' => $this->getConfigurationValue(self::COMPONENT_AGENT, 'ListenPort')
+				]
+			],
+			'groups' => [
+				[
+					'groupid' => 4
+				]
+			]
+		]);
+
+		$this->assertArrayHasKey('hostids', $response['result']);
+		$this->assertArrayHasKey(0, $response['result']['hostids']);
+		self::$hostid = $response['result']['hostids'][0];
+
+		// Get host interface ids.
+		$response = $this->call('host.get', [
+			'output' => ['host'],
+			'hostids' => [self::$hostid],
+			'selectInterfaces' => ['interfaceid']
+		]);
+
+		$this->assertArrayHasKey(0, $response['result']);
+		$this->assertArrayHasKey('interfaces', $response['result'][0]);
+		$this->assertArrayHasKey(0, $response['result'][0]['interfaces']);
+
+		// Create trapper item
+		$response = $this->call('item.create', [
+			'hostid' => self::$hostid,
+			'name' => self::TRAPPER_ITEM_NAME,
+			'key_' => self::TRAPPER_ITEM_NAME,
+			'type' => ITEM_TYPE_TRAPPER,
+			'value_type' => ITEM_VALUE_TYPE_UINT64
+		]);
+		$this->assertArrayHasKey('itemids', $response['result']);
+		$this->assertEquals(1, count($response['result']['itemids']));
+
+		// Create trigger
+		$response = $this->call('trigger.create', [
+			'description' => 'trigger_trap',
+			'expression' => 'last(/'.self::HOST_NAME.'/'.self::TRAPPER_ITEM_NAME.')<>3',
+			'event_name' => self::EVENT_PREFIX.'{?last(//'.self::TRAPPER_ITEM_NAME.')}'
+		]);
+		$this->assertArrayHasKey('triggerids', $response['result']);
+		$this->assertEquals(1, count($response['result']['triggerids']));
+		self::$triggerid = $response['result']['triggerids'][0];
+
+		// Create trigger action
+		$response = $this->call('action.create', [
+			'esc_period' => '1m',
+			'eventsource' => EVENT_SOURCE_TRIGGERS,
+			'status' => 0,
+			'filter' => [
+				'conditions' => [
+					[
+						'conditiontype' => CONDITION_TYPE_TRIGGER,
+						'operator' => CONDITION_OPERATOR_EQUAL,
+						'value' => self::$triggerid
+					]
+				],
+				'evaltype' => CONDITION_EVAL_TYPE_AND_OR
+			],
+			'name' => 'action_trigger_trap',
+			'operations' => [
+				[
+					'esc_period' => 0,
+					'esc_step_from' => 1,
+					'esc_step_to' => 1,
+					'evaltype' => 0,
+					'operationtype' => OPERATION_TYPE_MESSAGE,
+					'opmessage' => [
+						'default_msg' => 0,
+						'mediatypeid' => 1,
+						'subject' => self::SUBJECT_PREFIX.'{?last(//'.self::TRAPPER_ITEM_NAME.')}',
+						'message' => self::MESSAGE_PREFIX.'{?last(/'.self::HOST_NAME.'/'.self::TRAPPER_ITEM_NAME.')}'
+					],
+					'opmessage_grp' => [
+						['usrgrpid' => 7]
+					]
+				],
+				[
+					'esc_period' => 0,
+					'esc_step_from' => 2,
+					'esc_step_to' => 2,
+					'evaltype' => 0,
+					'operationtype' => OPERATION_TYPE_MESSAGE,
+					'opmessage' => [
+						'default_msg' => 0,
+						'mediatypeid' => 4,
+						'subject' => self::SUBJECT_PREFIX.'{?first(//'.self::TRAPPER_ITEM_NAME.',1h)}',
+						'message' => self::MESSAGE_PREFIX.'{?first(/{HOST.HOST}/'.self::TRAPPER_ITEM_NAME.',1h)}'
+					],
+					'opmessage_grp' => [
+						['usrgrpid' => 7]
+					]
+				]
+			],
+			'pause_suppressed' => 0,
+			'recovery_operations' => [
+				[
+					'evaltype' => 0,
+					'operationtype' => OPERATION_TYPE_MESSAGE,
+					'opmessage' => [
+						'default_msg' => 0,
+						'mediatypeid' => 0,
+						'subject' => self::SUBJECT_PREFIX.'{?last(//'.self::TRAPPER_ITEM_NAME.')}',
+						'message' => self::MESSAGE_PREFIX.'{?last(//'.self::TRAPPER_ITEM_NAME.',#2)}'
+					],
+					'opmessage_grp' => [
+						['usrgrpid' => 7]
+					]
+				]
+			]
+		]);
+		$this->assertArrayHasKey('actionids', $response['result']);
+		$this->assertEquals(1, count($response['result']['actionids']));
+		self::$trigger_actionid = $response['result']['actionids'][0];
+
+		return true;
+	}
+
+	/**
+	 * Component configuration provider.
+	 *
+	 * @return array
+	 */
+	public function serverConfigurationProvider() {
+		return [
+			self::COMPONENT_SERVER => [
+				'DebugLevel' => 4,
+				'LogFileSize' => 20,
+				'AllowUnsupportedDBVersions' => 1
+			]
+		];
+	}
+
+	/**
+	 * Get data
+	 *
+	 * @backup alerts,events,history_uint
+	 */
+	public function testExpressionMacros_getData() {
+		$this->sendSenderValue(self::HOST_NAME, self::TRAPPER_ITEM_NAME, 3);
+		$this->sendSenderValue(self::HOST_NAME, self::TRAPPER_ITEM_NAME, 2);
+
+		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'In escalation_execute()', true);
+		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of escalation_execute()', true, 10, 3);
+
+		self::$event_response = $this->callUntilDataIsPresent('event.get', [
+			'hostids' => [self::$hostid]
+		], 5, 2);
+		$this->assertCount(1, self::$event_response['result']);
+
+		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'In escalation_execute()', true, 95, 3);
+		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of escalation_execute()', true, 10, 3);
+
+		$this->sendSenderValue(self::HOST_NAME, self::TRAPPER_ITEM_NAME, 3);
+
+		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'In escalation_recover()', true);
+		$this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of escalation_recover()', true, 10, 3);
+
+		self::$alert_response = $this->callUntilDataIsPresent('alert.get', [
+			'actionids' => [self::$trigger_actionid],
+			'sortfield' => 'alertid'
+		], 5, 2);
+		$this->assertCount(3, self::$alert_response['result']);
+	}
+
+	/**
+	 * Test expression macro in problem message
+	 */
+	public function testExpressionMacros_checkProblemMessage() {
+		$this->assertEquals(self::MESSAGE_PREFIX.'2', self::$alert_response['result'][0]['message']);
+	}
+
+	/**
+	 * Test expression macro with empty hostname
+	 */
+	public function testExpressionMacros_checkEmptyHostname() {
+		$this->assertEquals(self::SUBJECT_PREFIX.'2', self::$alert_response['result'][0]['subject']);
+	}
+
+	/**
+	 * Test expression macro in function with argument
+	 */
+	public function testExpressionMacros_checkFunctionArgument() {
+		$this->assertEquals(self::SUBJECT_PREFIX.'3', self::$alert_response['result'][1]['subject']);
+	}
+
+	/**
+	 * Test expression macro with {HOST.HOST} macro
+	 */
+	public function testExpressionMacros_checkHostMacro() {
+		$this->assertEquals(self::MESSAGE_PREFIX.'3', self::$alert_response['result'][1]['message']);
+	}
+
+	/**
+	 * Test expression macro in recovery message
+	 */
+	public function testExpressionMacros_checkRecoveryMessage() {
+		$this->assertEquals(self::SUBJECT_PREFIX.'3', self::$alert_response['result'][2]['subject']);
+		$this->assertEquals(self::MESSAGE_PREFIX.'2', self::$alert_response['result'][2]['message']);
+	}
+
+	/**
+	 * Test expression macro in event name
+	 */
+	public function testExpressionMacros_checkEventName() {
+		$this->assertEquals(self::EVENT_PREFIX.'2', self::$event_response['result'][0]['name']);
+	}
+}
diff --git a/ui/tests/selenium/SeleniumTests.php b/ui/tests/selenium/SeleniumTests.php
index 6bd6e05c852..b938a4af47c 100644
--- a/ui/tests/selenium/SeleniumTests.php
+++ b/ui/tests/selenium/SeleniumTests.php
@@ -22,7 +22,6 @@ require_once dirname(__FILE__).'/testGeneric.php';
 require_once dirname(__FILE__).'/testGraphAxis.php';
 require_once dirname(__FILE__).'/testPageDashboard.php';
 require_once dirname(__FILE__).'/testPageDashboardWidgets.php';
-require_once dirname(__FILE__).'/testPageOverview.php';
 require_once dirname(__FILE__).'/testPageLatestData.php';
 require_once dirname(__FILE__).'/testPageWeb.php';
 require_once dirname(__FILE__).'/testPageProblems.php';
@@ -232,7 +231,6 @@ class SeleniumTests {
 		$suite->addTestSuite('testPageMassUpdateItemPrototypes');
 		$suite->addTestSuite('testPageMonitoringHosts');
 		$suite->addTestSuite('testPageNetworkDiscovery');
-		$suite->addTestSuite('testPageOverview');
 /*
 		$suite->addTestSuite('testPageQueueDetails');
 		$suite->addTestSuite('testPageQueueOverview');
diff --git a/ui/tests/selenium/common/testCalculatedFormula.php b/ui/tests/selenium/common/testCalculatedFormula.php
index 67f66010505..186ef01215d 100644
--- a/ui/tests/selenium/common/testCalculatedFormula.php
+++ b/ui/tests/selenium/common/testCalculatedFormula.php
@@ -934,7 +934,7 @@ class testCalculatedFormula extends CWebTest {
 				[
 					'expected' => TEST_BAD,
 					'formula' => 'item_count(1)',
-					'error' => 'Invalid parameter "/1/params": incorrect expression starting from "item_count(1)".'
+					'error' => 'Invalid parameter "/1/params": incorrect usage of function "item_count".'
 				]
 			],
 			// cot() function validation.
diff --git a/ui/tests/selenium/common/testFormAdministrationGeneral.php b/ui/tests/selenium/common/testFormAdministrationGeneral.php
index 632f7a6b8eb..a000a0e0dc1 100644
--- a/ui/tests/selenium/common/testFormAdministrationGeneral.php
+++ b/ui/tests/selenium/common/testFormAdministrationGeneral.php
@@ -113,7 +113,7 @@ class testFormAdministrationGeneral extends CWebTest {
 		switch ($action) {
 			case 'Reset defaults':
 				if ($other) {
-					// In Other parameters form these fields have no default value, so can be filled with anyting.
+					// In Other parameters form these fields have no default value, so can be filled with anything.
 					$form->checkValue(
 						[
 							'Group for discovered hosts' => [],
diff --git a/ui/tests/selenium/common/testFormFilter.php b/ui/tests/selenium/common/testFormFilter.php
index 5ad6e07b853..6736f7524dd 100644
--- a/ui/tests/selenium/common/testFormFilter.php
+++ b/ui/tests/selenium/common/testFormFilter.php
@@ -78,7 +78,7 @@ class testFormFilter extends CWebTest {
 				}
 
 				// Checking that dropdown/popup tab works.
-				$dropdown = $this->query('class:btn-widget-expand')->asPopupButton()->one();
+				$dropdown = $this->query('class:btn-widget-expand')->asPopupButton()->waitUntilClickable()->one();
 				$dropdown->fill($data['filter']['Name']);
 				$this->assertEquals($data['filter']['Name'], $filter_container->getSelectedTabName());
 				break;
diff --git a/ui/tests/selenium/common/testMassUpdateItems.php b/ui/tests/selenium/common/testMassUpdateItems.php
index 51b040a1550..b4d0f445c4e 100644
--- a/ui/tests/selenium/common/testMassUpdateItems.php
+++ b/ui/tests/selenium/common/testMassUpdateItems.php
@@ -1718,7 +1718,7 @@ class testMassUpdateItems extends CWebTest{
 							]
 						]
 					],
-					'details' => 'Invalid parameter "/1/tags/1/tag": cannot be empty.'
+					'details' => 'Invalid parameter "/1/tags/2/tag": cannot be empty.'
 				]
 			],
 			// TODO: Uncomment this case when ZBX-19263 is fixed.
diff --git a/ui/tests/selenium/dashboard/testDashboardGraphWidget.php b/ui/tests/selenium/dashboard/testDashboardGraphWidget.php
index bafd8a59b7a..313c1e1d2ed 100644
--- a/ui/tests/selenium/dashboard/testDashboardGraphWidget.php
+++ b/ui/tests/selenium/dashboard/testDashboardGraphWidget.php
@@ -1554,7 +1554,7 @@ class testDashboardGraphWidget extends CWebTest {
 		$form->submit();
 		$this->saveGraphWidget(CTestArrayHelper::get($data, 'main_fields.Name', 'Graph'));
 
-		// Check valuse in created widget.
+		// Check values in created widget.
 		if (CTestArrayHelper::get($data, 'check_form', false)) {
 			$this->openGraphWidgetConfiguration(CTestArrayHelper::get($data, 'main_fields.Name', 'Graph'));
 			$this->checkWidgetForm($data);
@@ -1848,7 +1848,7 @@ class testDashboardGraphWidget extends CWebTest {
 		COverlayDialogElement::ensureNotPresent();
 		$this->saveGraphWidget(CTestArrayHelper::get($data, 'main_fields.Name', 'Test cases for update'));
 
-		// Check valuse in updated widget.
+		// Check values in updated widget.
 		if (CTestArrayHelper::get($data, 'check_form', false)) {
 			$this->openGraphWidgetConfiguration(CTestArrayHelper::get($data, 'main_fields.Name', 'Test cases for update'));
 			$this->checkWidgetForm($data);
diff --git a/ui/tests/selenium/dashboard/testDashboardProblemsBySeverityWidget.php b/ui/tests/selenium/dashboard/testDashboardProblemsBySeverityWidget.php
index 3f7e4002d27..f632f65f7c8 100644
--- a/ui/tests/selenium/dashboard/testDashboardProblemsBySeverityWidget.php
+++ b/ui/tests/selenium/dashboard/testDashboardProblemsBySeverityWidget.php
@@ -885,7 +885,7 @@ class testDashboardProblemsBySeverityWidget extends CWebTest {
 					]
 				]
 			],
-			// Host groups: Show all problems that have 2 speciffic tags, one of them contains a speciffic value.
+			// Host groups: Show all problems that have 2 specific tags, one of them contains a specific value.
 			[
 				[
 					'widget to update' => 'Reference widget 15',
@@ -904,7 +904,7 @@ class testDashboardProblemsBySeverityWidget extends CWebTest {
 					]
 				]
 			],
-			// Host groups: Show all problems that have at least one of 2 speciffic tags, one of them contains a value.
+			// Host groups: Show all problems that have at least one of 2 specific tags, one of them contains a value.
 			[
 				[
 					'widget to update' => 'Reference widget 16',
@@ -970,7 +970,7 @@ class testDashboardProblemsBySeverityWidget extends CWebTest {
 					]
 				]
 			],
-			// Host groups: 2 tags with Or operator, both of them equal to speciffic values.
+			// Host groups: 2 tags with Or operator, both of them equal to specific values.
 			[
 				[
 					'widget to update' => 'Reference widget 19',
@@ -1046,7 +1046,7 @@ class testDashboardProblemsBySeverityWidget extends CWebTest {
 					]
 				]
 			],
-			// Totals: Show all problems that have 2 speciffic tags, one of them contains a speciffic value.
+			// Totals: Show all problems that have 2 specific tags, one of them contains a specific value.
 			[
 				[
 					'widget to update' => 'Reference widget 23',
@@ -1064,7 +1064,7 @@ class testDashboardProblemsBySeverityWidget extends CWebTest {
 					]
 				]
 			],
-			// Totals: Show all problems that have at least one of 2 speciffic tags, one of them contains a value.
+			// Totals: Show all problems that have at least one of 2 specific tags, one of them contains a value.
 			[
 				[
 					'widget to update' => 'Reference widget 24',
@@ -1125,7 +1125,7 @@ class testDashboardProblemsBySeverityWidget extends CWebTest {
 					]
 				]
 			],
-			// Totals: 2 tags with Or operator, both of them equal to speciffic values.
+			// Totals: 2 tags with Or operator, both of them equal to specific values.
 			[
 				[
 					'widget to update' => 'Reference widget 27',
@@ -1179,7 +1179,7 @@ class testDashboardProblemsBySeverityWidget extends CWebTest {
 				[
 					'widget to update' => 'Totals reference widget 2',
 					'fields' => [
-						'Name' => 'Totals: Display only unacknowledged problems with operational data withour timeline',
+						'Name' => 'Totals: Display only unacknowledged problems with operational data without timeline',
 						'Problem display' => 'Unacknowledged only',
 						'Show operational data' => 'Separately',
 						'Show timeline' => false
@@ -1632,7 +1632,7 @@ class testDashboardProblemsBySeverityWidget extends CWebTest {
 
 	/*
 	 * This function checks problem details hintbox content for Host "ЗАББИКС Сервер" and severity "Average".
-	 * Only the number of problems and the values for one speciffic problem are checked.
+	 * Only the number of problems and the values for one specific problem are checked.
 	 */
 	private function checkPopupContent($data, $widget, $show){
 		$expected_popup = [
diff --git a/ui/tests/selenium/dashboard/testFormTemplateDashboards.php b/ui/tests/selenium/dashboard/testFormTemplateDashboards.php
index 15245468c64..888cefdb5a0 100644
--- a/ui/tests/selenium/dashboard/testFormTemplateDashboards.php
+++ b/ui/tests/selenium/dashboard/testFormTemplateDashboards.php
@@ -21,6 +21,7 @@
 require_once dirname(__FILE__).'/../../include/CWebTest.php';
 require_once dirname(__FILE__).'/../../include/helpers/CDataHelper.php';
 require_once dirname(__FILE__).'/../behaviors/CMessageBehavior.php';
+use Facebook\WebDriver\Exception\UnexpectedAlertOpenException;
 
 /**
  * @backup dashboard, hosts
@@ -567,7 +568,7 @@ class testFormTemplateDashboards extends CWebTest {
 	 */
 	public function testFormTemplateDashboards_SimpleUpdate() {
 		$sql = 'SELECT * FROM widget w INNER JOIN dashboard_page dp ON dp.dashboard_pageid=w.dashboard_pageid '.
-				'INNER JOIN dashboard d ON d.dashboardid=dp.dashboardid';
+				'INNER JOIN dashboard d ON d.dashboardid=dp.dashboardid ORDER BY w.widgetid';
 		$old_hash = CDBHelper::getHash($sql);
 
 		$this->page->login()->open('zabbix.php?action=template.dashboard.edit&dashboardid='.self::$dashboardid_with_widgets);
@@ -582,7 +583,7 @@ class testFormTemplateDashboards extends CWebTest {
 	 */
 	public function testFormTemplateDashboards_Cancel() {
 		$sql = 'SELECT * FROM widget w INNER JOIN dashboard_page dp ON dp.dashboard_pageid=w.dashboard_pageid '.
-				'INNER JOIN dashboard d ON d.dashboardid=dp.dashboardid';
+				'INNER JOIN dashboard d ON d.dashboardid=dp.dashboardid ORDER BY w.widgetid';
 		$old_hash = CDBHelper::getHash($sql);
 		$fields = [
 			'Name' => 'Cancel dashboard update',
@@ -995,7 +996,15 @@ class testFormTemplateDashboards extends CWebTest {
 	 * @dataProvider getWidgetsCreateData
 	 */
 	public function testFormTemplateDashboards_CreateWidget($data) {
-		$this->page->login()->open('zabbix.php?action=template.dashboard.edit&dashboardid='.self::$empty_dashboardid);
+		try {
+			$this->page->login()->open('zabbix.php?action=template.dashboard.edit&dashboardid='.self::$empty_dashboardid);
+		}
+		catch (UnexpectedAlertOpenException $e) {
+			// Sometimes previous test leaves dashboard edit page open.
+			$this->page->acceptAlert();
+			$this->page->login()->open('zabbix.php?action=template.dashboard.edit&dashboardid='.self::$empty_dashboardid);
+		}
+
 		$this->query('button:Add')->one()->waitUntilClickable()->click();
 		$form = COverlayDialogElement::find()->asForm()->one()->waitUntilVisible();
 
@@ -1205,6 +1214,8 @@ class testFormTemplateDashboards extends CWebTest {
 			}
 
 			$this->assertEquals($created_values, $reopened_form->getFields()->asValues());
+
+			$this->closeDialogue();
 		}
 	}
 }
diff --git a/ui/tests/selenium/data/data_test.sql b/ui/tests/selenium/data/data_test.sql
index 4a3eaf9d3b4..f2eda0c1fc6 100644
--- a/ui/tests/selenium/data/data_test.sql
+++ b/ui/tests/selenium/data/data_test.sql
@@ -1952,7 +1952,7 @@ INSERT INTO trigger_tag (triggertagid, tag, value, triggerid) VALUES (145, 'TagT
 INSERT INTO triggers (triggerid, description, expression, value, priority, state, lastchange, comments) VALUES (100064, 'Fifth trigger for tag filtering (no tags)', '{100064}>0', 0, 5, 0, '0', '');
 INSERT INTO functions (functionid, itemid, triggerid, name, parameter) VALUES (100064, 99090, 100064, 'last', '$');
 
--- testPageMonitoringOverview
+-- testDashboardHostAvailabilityWidget
 INSERT INTO hstgrp (groupid, name, internal) VALUES (50011, 'Group to check Overview', 0);
 INSERT INTO hstgrp (groupid, name, internal) VALUES (50012, 'Another group to check Overview', 0);
 INSERT INTO hosts (hostid, host, name, status, description) VALUES (50011, '1_Host_to_check_Monitoring_Overview', '1_Host_to_check_Monitoring_Overview', 0, '');
diff --git a/ui/tests/selenium/preprocessing/testFormPreprocessingLowLevelDiscovery.php b/ui/tests/selenium/preprocessing/testFormPreprocessingLowLevelDiscovery.php
index e1818450ce4..2531b1585e2 100644
--- a/ui/tests/selenium/preprocessing/testFormPreprocessingLowLevelDiscovery.php
+++ b/ui/tests/selenium/preprocessing/testFormPreprocessingLowLevelDiscovery.php
@@ -287,7 +287,7 @@ class testFormPreprocessingLowLevelDiscovery extends testFormPreprocessing {
 	/**
 	 * Add preprocessing steps to templated LLD for cloning.
 	 */
-	public function prepareСloneTemplatedLLDPreprocessing() {
+	public function prepareCloneTemplatedLLDPreprocessing() {
 		CDataHelper::call('discoveryrule.update', [
 			'itemid' => '15011',
 			'preprocessing' => self::CLONE_PREPROCESSING
@@ -295,7 +295,7 @@ class testFormPreprocessingLowLevelDiscovery extends testFormPreprocessing {
 	}
 
 	/**
-	 * @onBefore prepareСloneTemplatedLLDPreprocessing
+	 * @onBefore prepareCloneTemplatedLLDPreprocessing
 	 */
 	public function testFormPreprocessingLowLevelDiscovery_CloneTemplatedLLD() {
 		$link = 'host_discovery.php?form=update&context=host&itemid='.self::INHERITANCE_LLDID;
diff --git a/ui/tests/selenium/roles/testFormUserRoles.php b/ui/tests/selenium/roles/testFormUserRoles.php
index 20307dfe947..32f4e04f764 100644
--- a/ui/tests/selenium/roles/testFormUserRoles.php
+++ b/ui/tests/selenium/roles/testFormUserRoles.php
@@ -626,7 +626,7 @@ class testFormUserRoles extends CWebTest {
 						'User type' => 'Super admin',
 						'Default access to new modules' => false,
 						'API methods' => 'Deny list',
-						'Monitoring' => ['Overview', 'Maps'],
+						'Monitoring' => ['Maps'],
 						'Reports' => [],
 						'Create and edit dashboards' => false
 					],
@@ -649,7 +649,7 @@ class testFormUserRoles extends CWebTest {
 		$this->page->login()->open('zabbix.php?action=userrole.edit&roleid=1');
 		$this->page->assertTitle('Configuration of user roles');
 		$this->page->assertHeader('User roles');
-		$form = $this->query('id:userrole-form')->waitUntilPresent()->asFluidForm()->one();
+		$form = $this->query('id:userrole-form')->waitUntilPresent()->asForm()->one();
 		$this->assertEquals(255, $form->getField('Name')->getAttribute('maxlength'));
 		$this->assertEquals($roles, $this->query('id:user-type')->one()->asZDropdown()->getOptions()->asText());
 
@@ -686,15 +686,14 @@ class testFormUserRoles extends CWebTest {
 		}
 	}
 
-	// TODO: Uncomment after ZBXNEXT-2406 will be fixed.
-//	public function testFormUserRoles_SimpleUpdate() {
-//		$hash_before = CDBHelper::getHash(self::ROLE_SQL);
-//		$this->page->login()->open('zabbix.php?action=userrole.list');
-//		$this->query('link', 'Admin role')->one()->click();
-//		$this->query('button:Update')->one()->click();
-//		$this->assertMessage(TEST_GOOD, 'User role updated');
-//		$this->assertEquals($hash_before, CDBHelper::getHash(self::ROLE_SQL));
-//	}
+	public function testFormUserRoles_SimpleUpdate() {
+		$hash_before = CDBHelper::getHash(self::ROLE_SQL);
+		$this->page->login()->open('zabbix.php?action=userrole.list');
+		$this->query('link', 'Admin role')->one()->click();
+		$this->query('button:Update')->one()->click();
+		$this->assertMessage(TEST_GOOD, 'User role updated');
+		$this->assertEquals($hash_before, CDBHelper::getHash(self::ROLE_SQL));
+	}
 
 	public static function getUpdateData() {
 		return [
@@ -849,7 +848,7 @@ class testFormUserRoles extends CWebTest {
 
 	public function testFormUserRoles_Clone() {
 		$this->page->login()->open('zabbix.php?action=userrole.edit&roleid=2');
-		$form = $this->query('id:userrole-form')->waitUntilReady()->asFluidForm()->one();
+		$form = $this->query('id:userrole-form')->waitUntilReady()->asForm()->one();
 		$values = $form->getFields()->asValues();
 		$role_name = $values['Name'];
 		$this->query('button:Clone')->one()->click();
@@ -898,7 +897,7 @@ class testFormUserRoles extends CWebTest {
 		foreach(['userrole.edit', 'userrole.edit&roleid=2'] as $link) {
 			$hash_before = CDBHelper::getHash(self::ROLE_SQL);
 			$this->page->login()->open('zabbix.php?action='.$link);
-			$form = $this->query('id:userrole-form')->waitUntilPresent()->asFluidForm()->one();
+			$form = $this->query('id:userrole-form')->waitUntilPresent()->asForm()->one();
 			$form->fill(['Name' => 'cancellation_name_user']);
 			$this->query('button:Cancel')->one()->click();
 			$this->assertEquals($hash_before, CDBHelper::getHash(self::ROLE_SQL));
@@ -912,7 +911,7 @@ class testFormUserRoles extends CWebTest {
 		$this->page->userLogin('super_role_check', 'test5678');
 		$this->page->open('zabbix.php?action=userrole.list')->waitUntilReady();
 		$this->query('link:super_role')->one()->click();
-		$form = $this->query('id:userrole-form')->waitUntilPresent()->asFluidForm()->one();
+		$form = $this->query('id:userrole-form')->waitUntilPresent()->asForm()->one();
 		$this->assertEquals('User cannot change the user type of own role.',
 				$this->query('xpath://input[@id="type"]/following::span')->one()->getText()
 		);
@@ -927,7 +926,7 @@ class testFormUserRoles extends CWebTest {
 		foreach ([true, false] as $enable_modules) {
 			$modules = ['4th Module', '5th Module'];
 			$this->page->open('zabbix.php?action=userrole.edit&roleid=2')->waitUntilReady();
-			$form = $this->query('id:userrole-form')->waitUntilPresent()->asFluidForm()->one();
+			$form = $this->query('id:userrole-form')->waitUntilPresent()->asForm()->one();
 			if ($enable_modules === true) {
 				$this->assertTrue($form->query('xpath://label[text()="No enabled modules found."]')->one()->isDisplayed());
 				$this->page->open('zabbix.php?action=module.list')->waitUntilReady();
@@ -960,7 +959,7 @@ class testFormUserRoles extends CWebTest {
 				$hash_before = CDBHelper::getHash(self::ROLE_SQL);
 			}
 		}
-		$form = $this->query('id:userrole-form')->waitUntilPresent()->asFluidForm()->one();
+		$form = $this->query('id:userrole-form')->waitUntilPresent()->asForm()->one();
 		$form->fill($data['fields']);
 
 		if (array_key_exists('api_methods', $data)) {
@@ -989,7 +988,7 @@ class testFormUserRoles extends CWebTest {
 				$this->page->login()->open('zabbix.php?action=userrole.edit&roleid='.$id);
 			}
 
-			$form = $this->query('id:userrole-form')->waitUntilPresent()->asFluidForm()->one();
+			$form = $this->query('id:userrole-form')->waitUntilPresent()->asForm()->one();
 
 			if (array_key_exists('space', $data)) {
 				$data['fields']['Name'] = trim($data['fields']['Name']);
diff --git a/ui/tests/selenium/roles/testUserRolesPermissions.php b/ui/tests/selenium/roles/testUserRolesPermissions.php
index d63fa3d1444..7156b18e8bd 100644
--- a/ui/tests/selenium/roles/testUserRolesPermissions.php
+++ b/ui/tests/selenium/roles/testUserRolesPermissions.php
@@ -315,13 +315,6 @@ class testUserRolesPermissions extends CWebTest {
 	 */
 	public function testUserRolesPermissions_ProblemsActionsAll() {
 		$problem = 'Test trigger with tag';
-		$context_before = [
-			'Problems',
-			'Acknowledge',
-			'Configuration',
-			'Webhook url for all',
-			'1_item'
-		];
 		$actions = [
 			'Add problem comments' => false,
 			'Change severity' => false,
@@ -352,22 +345,9 @@ class testUserRolesPermissions extends CWebTest {
 						->one()->isAttributePresent('onclick'));
 			}
 
-			// Overview page.
-			$this->page->open('overview.php?type=0')->waitUntilReady();
-			$this->query('class:list-table')->asTable()->one()->findRow('Triggers', '1_trigger_Disaster')
-					->getColumn('1_Host_to_check_Monitoring_Overview')->query('xpath://td[@class="disaster-bg cursor-pointer"]')
-					->one()->click();
-			$this->page->waitUntilReady();
-
-			$popup = CPopupMenuElement::find()->waitUntilVisible()->one();
 			if ($action_status) {
-				$this->assertTrue($popup->hasItems($context_before));
 				$this->changeRoleRule($actions);
 			}
-			else {
-				$context_after = array_values(array_diff($context_before, ['Acknowledge']));
-				$this->assertTrue($popup->hasItems($context_after));
-			}
 		}
 	}
 
@@ -914,7 +894,6 @@ class testUserRolesPermissions extends CWebTest {
 					'displayed_ui' => [
 						'Dashboard',
 						'Hosts',
-						'Overview',
 						'Latest data',
 						'Maps',
 						'Discovery',
@@ -930,7 +909,6 @@ class testUserRolesPermissions extends CWebTest {
 					'displayed_ui' => [
 						'Dashboard',
 						'Problems',
-						'Overview',
 						'Latest data',
 						'Maps',
 						'Discovery',
@@ -942,28 +920,11 @@ class testUserRolesPermissions extends CWebTest {
 			[
 				[
 					'section' => 'Monitoring',
-					'page' => 'Overview',
-					'displayed_ui' => [
-						'Dashboard',
-						'Problems',
-						'Hosts',
-						'Latest data',
-						'Maps',
-						'Discovery',
-						'Services'
-					],
-					'link' => ['overview.php']
-				]
-			],
-			[
-				[
-					'section' => 'Monitoring',
 					'page' => 'Latest data',
 					'displayed_ui' => [
 						'Dashboard',
 						'Problems',
 						'Hosts',
-						'Overview',
 						'Maps',
 						'Discovery',
 						'Services'
@@ -979,7 +940,6 @@ class testUserRolesPermissions extends CWebTest {
 						'Dashboard',
 						'Problems',
 						'Hosts',
-						'Overview',
 						'Latest data',
 						'Discovery',
 						'Services'
@@ -995,7 +955,6 @@ class testUserRolesPermissions extends CWebTest {
 						'Dashboard',
 						'Problems',
 						'Hosts',
-						'Overview',
 						'Latest data',
 						'Maps',
 						'Services'
@@ -1011,7 +970,6 @@ class testUserRolesPermissions extends CWebTest {
 						'Dashboard',
 						'Problems',
 						'Hosts',
-						'Overview',
 						'Latest data',
 						'Maps',
 						'Discovery'
@@ -1088,7 +1046,6 @@ class testUserRolesPermissions extends CWebTest {
 					'displayed_ui' => [
 						'Problems',
 						'Hosts',
-						'Overview',
 						'Latest data',
 						'Maps',
 						'Discovery',
@@ -1101,7 +1058,6 @@ class testUserRolesPermissions extends CWebTest {
 					'button' => 'Hosts',
 					'displayed_ui' => [
 						'Hosts',
-						'Overview',
 						'Latest data',
 						'Maps',
 						'Discovery',
@@ -1145,7 +1101,7 @@ class testUserRolesPermissions extends CWebTest {
 			}
 			else {
 				$this->checkLinks(['zabbix.php?action=dashboard.view'], $data['button']);
-				$this->changeRoleRule(['Monitoring' => ['Dashboard', 'Problems', 'Hosts', 'Overview', 'Latest data', 'Maps',
+				$this->changeRoleRule(['Monitoring' => ['Dashboard', 'Problems', 'Hosts', 'Latest data', 'Maps',
 						'Discovery', 'Services']]
 				);
 			}
@@ -1212,7 +1168,7 @@ class testUserRolesPermissions extends CWebTest {
 	 */
 	private function changeRoleRule($action) {
 		$this->page->open('zabbix.php?action=userrole.edit&roleid='.self::$super_roleid)->waitUntilReady();
-		$this->query('id:userrole-form')->waitUntilPresent()->asFluidForm()->one()->fill($action)->submit();
+		$this->query('id:userrole-form')->waitUntilPresent()->asForm()->one()->fill($action)->submit();
 		$this->page->waitUntilReady();
 		$this->assertMessage(TEST_GOOD, 'User role updated');
 	}
diff --git a/ui/tests/selenium/scheduledReports/testFormScheduledReport.php b/ui/tests/selenium/scheduledReports/testFormScheduledReport.php
index 8626ff2397f..411e9bed664 100644
--- a/ui/tests/selenium/scheduledReports/testFormScheduledReport.php
+++ b/ui/tests/selenium/scheduledReports/testFormScheduledReport.php
@@ -73,7 +73,7 @@ class testFormScheduledReport extends CWebTest {
 	public function testFormScheduledReport_Layout() {
 		$this->page->login()->open('zabbix.php?action=scheduledreport.list');
 		$this->query('button:Create report')->waitUntilClickable()->one()->click();
-		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asFluidForm()->one();
+		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asForm()->one();
 
 		$this->checkFormLayout($form);
 	}
@@ -84,7 +84,7 @@ class testFormScheduledReport extends CWebTest {
 		$this->query('id:dashboard-actions')->one()->waitUntilClickable()->click();
 		CPopupMenuElement::find()->waitUntilVisible()->one()->select('Create new report');
 		$overlay = COverlayDialogElement::find()->waitUntilReady()->one();
-		$form = $overlay->query('id:scheduledreport-form')->waitUntilVisible()->asFluidForm()->one();
+		$form = $overlay->query('id:scheduledreport-form')->waitUntilVisible()->asForm()->one();
 		$this->assertFalse($form->query('button:Test')->one(false)->isValid());
 
 		$this->checkFormLayout($form, 'Zabbix server health');
@@ -139,7 +139,7 @@ class testFormScheduledReport extends CWebTest {
 			}
 
 			$subscription_overlay = COverlayDialogElement::find()->all()->last()->waitUntilReady();
-			$overlay_form = $subscription_overlay->query('id:subscription-form')->waitUntilVisible()->asFluidForm()->one();
+			$overlay_form = $subscription_overlay->query('id:subscription-form')->waitUntilVisible()->asForm()->one();
 			$overlay_form->checkValue((is_array($type)) ? $type : ['Generate report by' => 'Current user']);
 
 			$buttons = (is_array($type)) ? ['Update', 'Cancel'] : ['Add', 'Cancel'];
@@ -172,7 +172,7 @@ class testFormScheduledReport extends CWebTest {
 		$this->assertEquals('Exclude', $row->getColumn('Status')->getText());
 		$row->getColumn('Recipient')->query('tag:a')->one()->click();
 		$subscription_overlay = COverlayDialogElement::find()->all()->last()->waitUntilReady();
-		$overlay_form = $subscription_overlay->query('id:subscription-form')->waitUntilVisible()->asFluidForm()->one();
+		$overlay_form = $subscription_overlay->query('id:subscription-form')->waitUntilVisible()->asForm()->one();
 		$overlay_form->checkValue(['Status' => 'Exclude']);
 		$subscription_overlay->query('class:overlay-close-btn')->one()->click()->waitUntilNotVisible();
 
@@ -1075,7 +1075,7 @@ class testFormScheduledReport extends CWebTest {
 	public function testFormScheduledReport_Clone($data) {
 		$this->page->login()->open('zabbix.php?action=scheduledreport.edit&reportid='.
 				CDataHelper::get('ScheduledReports.reportids.'.self::TEST_REPORT_NAME));
-		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asFluidForm()->one();
+		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asForm()->one();
 
 		// Get field values from form.
 		$form->fill($data['fields']);
@@ -1175,7 +1175,7 @@ class testFormScheduledReport extends CWebTest {
 		}
 
 		// Change report data to make sure that the changes are not saved to the database after cancellation.
-		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asFluidForm()->one();
+		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asForm()->one();
 		$form->fill(['Name' => $new_name, 'Message' => 'cancel test']);
 		$this->fillSubscriptions($subscriptions);
 
@@ -1274,7 +1274,7 @@ class testFormScheduledReport extends CWebTest {
 			$url = 'zabbix.php?action=scheduledreport.edit';
 		}
 		$this->page->login()->open($url);
-		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asFluidForm()->one();
+		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asForm()->one();
 		$form->fill(CTestArrayHelper::get($data, 'fields', []));
 		$this->query('button:Test')->waitUntilClickable()->one()->click();
 		COverlayDialogElement::find()->waitUntilReady()->one();
@@ -1313,7 +1313,7 @@ class testFormScheduledReport extends CWebTest {
 			$old_hash = $this->getHash();
 		}
 
-		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asFluidForm()->one();
+		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asForm()->one();
 		$form->fill($data['fields']);
 
 		if (CTestArrayHelper::get($data, 'Start time', false)) {
@@ -1373,7 +1373,7 @@ class testFormScheduledReport extends CWebTest {
 				$this->query('link', $name)->waitUntilClickable()->one()->click();
 			}
 			$this->page->waitUntilReady();
-			$form_page = $this->query('id:scheduledreport-form')->waitUntilVisible()->asFluidForm()->one();
+			$form_page = $this->query('id:scheduledreport-form')->waitUntilVisible()->asForm()->one();
 
 			if (CTestArrayHelper::get($data, 'fields.Repeat on') === []) {
 				unset($data['fields']['Repeat on']);
@@ -1396,7 +1396,7 @@ class testFormScheduledReport extends CWebTest {
 	 */
 	private function fillSubscriptions($data) {
 		foreach (CTestArrayHelper::get($data, 'Subscriptions', []) as $i => $subscriber) {
-			$report_form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asFluidForm()->one();
+			$report_form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asForm()->one();
 			$container = $report_form->getField('Subscriptions')->asTable();
 
 			$action = CTestArrayHelper::get($subscriber, 'action', USER_ACTION_ADD);
@@ -1415,7 +1415,7 @@ class testFormScheduledReport extends CWebTest {
 					unset($subscriber['index']);
 				}
 				$overlay = COverlayDialogElement::find()->all()->last()->waitUntilReady();
-				$form = $overlay->query('id:subscription-form')->waitUntilVisible()->asFluidForm()->one();
+				$form = $overlay->query('id:subscription-form')->waitUntilVisible()->asForm()->one();
 				if (array_key_exists('fields', $subscriber)) {
 					$form->fill($subscriber['fields']);
 				}
@@ -1447,7 +1447,7 @@ class testFormScheduledReport extends CWebTest {
 	 */
 	private function checkSubscriptions($subscriptions) {
 		foreach ($subscriptions as $i => $subscriber) {
-			$report_form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asFluidForm()->one();
+			$report_form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asForm()->one();
 			$table = $report_form->getField('Subscriptions')->asTable();
 
 			$action = CTestArrayHelper::get($subscriber, 'action', USER_ACTION_ADD);
diff --git a/ui/tests/selenium/scheduledReports/testScheduledReportPermissions.php b/ui/tests/selenium/scheduledReports/testScheduledReportPermissions.php
index 22b2204a00a..a752c9488c9 100644
--- a/ui/tests/selenium/scheduledReports/testScheduledReportPermissions.php
+++ b/ui/tests/selenium/scheduledReports/testScheduledReportPermissions.php
@@ -307,7 +307,7 @@ class testScheduledReportPermissions extends CWebTest {
 
 		// Check the report form.
 		$this->query('link', $report)->one()->click();
-		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asFluidForm()->one();
+		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asForm()->one();
 		foreach ($form->getLabels()->asText() as $label) {
 			if ($label === 'Owner') {
 				$form->checkValue(['Owner' => $owner]);
@@ -440,7 +440,7 @@ class testScheduledReportPermissions extends CWebTest {
 		$this->page->userLogin('admin report permissions', 'xibbaz123');
 		$this->page->open('zabbix.php?action=scheduledreport.list')->waitUntilReady();
 		$this->query('link', $report)->waitUntilClickable()->one()->click();
-		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asFluidForm()->one();
+		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asForm()->one();
 		$form->checkValue($before['fields']);
 		$this->assertTableData($before['Subscriptions'], 'id:subscriptions-table');
 
@@ -566,7 +566,7 @@ class testScheduledReportPermissions extends CWebTest {
 		$this->page->userLogin($data['alias'], $data['password']);
 		$this->page->open('zabbix.php?action=scheduledreport.list')->waitUntilReady();
 		$this->query('link', $report)->waitUntilClickable()->one()->click();
-		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asFluidForm()->one();
+		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asForm()->one();
 		$form->fill(['Dashboard' => 'Global view']);
 		$form->submit();
 		$overlay = COverlayDialogElement::find()->waitUntilReady()->one();
@@ -610,7 +610,7 @@ class testScheduledReportPermissions extends CWebTest {
 		$this->page->userLogin($data['alias'], $data['password']);
 		$this->page->open('zabbix.php?action=scheduledreport.list')->waitUntilReady();
 		$this->page->query('button:Create report')->waitUntilClickable()->one()->click();
-		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asFluidForm()->one();
+		$form = $this->query('id:scheduledreport-form')->waitUntilVisible()->asForm()->one();
 		$form->checkValue(['Owner' => $data['alias']]);
 		// TODO: check why not working $form->getField('Owner')->isEnabled($state)
 		$this->assertTrue($form->getField('Owner')->query('xpath://div[@class="selected"]/ul')->one()->isEnabled($state));
@@ -620,7 +620,7 @@ class testScheduledReportPermissions extends CWebTest {
 		$this->query('id:dashboard-actions')->waitUntilClickable()->one()->click();
 		CPopupMenuElement::find()->waitUntilVisible()->one()->select('Create new report');
 		$overlay = COverlayDialogElement::find()->waitUntilReady()->one();
-		$form = $overlay->query('id:scheduledreport-form')->waitUntilVisible()->asFluidForm()->one();
+		$form = $overlay->query('id:scheduledreport-form')->waitUntilVisible()->asForm()->one();
 		$form->checkValue(['Owner' => $data['alias']]);
 		$this->assertTrue($form->getField('Owner')->query('xpath://div[@class="selected"]/ul')->one()->isEnabled($state));
 	}
diff --git a/ui/tests/selenium/testFormAction.php b/ui/tests/selenium/testFormAction.php
index daaac68a569..5e71a3fc632 100644
--- a/ui/tests/selenium/testFormAction.php
+++ b/ui/tests/selenium/testFormAction.php
@@ -20,6 +20,8 @@
 
 
 require_once dirname(__FILE__).'/../include/CLegacyWebTest.php';
+require_once dirname(__FILE__).'/../include/helpers/CDataHelper.php';
+require_once dirname(__FILE__).'/behaviors/CMessageBehavior.php';
 
 define('ACTION_GOOD', 0);
 define('ACTION_BAD', 1);
@@ -27,232 +29,386 @@ define('ACTION_BAD', 1);
 use Facebook\WebDriver\WebDriverBy;
 
 /**
- * @backup actions
+ * @backup actions, profiles
+ *
+ * @onBefore prepareServiceActionData
  */
 class testFormAction extends CLegacyWebTest {
 
 	private $event_sources = [
 		EVENT_SOURCE_TRIGGERS => 'Trigger actions',
+		EVENT_SOURCE_SERVICE => 'Service actions',
 		EVENT_SOURCE_DISCOVERY => 'Discovery actions',
 		EVENT_SOURCE_AUTOREGISTRATION => 'Autoregistration actions',
 		EVENT_SOURCE_INTERNAL => 'Internal actions'
 	];
 
+	/**
+	 * Id of the action to be used for Simple update and Clone scenarios.
+	 *
+	 * @var integer
+	 */
+	protected static $actionid;
+
+	/**
+	 * Name of the action to be used for Simple update and Clone scenarios.
+	 *
+	 * @var integer
+	 */
+	protected static $action_name = 'Service action';
+
+	/**
+	 * Attach MessageBehavior to the test.
+	 *
+	 * @return array
+	 */
+	public function getBehaviors() {
+		return [
+			'class' => CMessageBehavior::class
+		];
+	}
+
+	/**
+	 * Function creates Service actions.
+	 */
+	public function prepareServiceActionData() {
+		$response = CDataHelper::call('action.create', [
+			[
+				'name' => self::$action_name,
+				'eventsource' => 4,
+				'status' => '0',
+				'esc_period' => '1h',
+				'filter' => [
+					'evaltype' => 0,
+					'conditions' => [
+						[
+							'conditiontype' => 28,
+							'operator' => 2,
+							'value' => 'Service name'
+						],
+						[
+							'conditiontype' => 25,
+							'operator' => 2,
+							'value' => 'Service tag name'
+						]
+					]
+				],
+				'operations' => [
+					[
+						'operationtype' => 0,
+						'esc_period' => 0,
+						'esc_step_from' => 1,
+						'esc_step_to' => 1,
+						'evaltype' => 0,
+						'opmessage' => [
+							'default_msg' => 1,
+							'mediatypeid' => 0
+						],
+						'opmessage_usr' => [
+							[
+								'userid' => 1
+							]
+						]
+					]
+				],
+				'recovery_operations' => [
+					[
+						'operationtype' => 11,
+						'opmessage' => [
+							'default_msg' => 0,
+							'subject' => 'Subject',
+							'message' => 'Message',
+							'mediatypeid' => 0
+						]
+					]
+				],
+				'update_operations' => [
+					[
+						'operationtype' => 0,
+						'opmessage' => [
+							'default_msg' => 1,
+							'mediatypeid' => 1
+						],
+						'opmessage_grp' => [
+							[
+								'usrgrpid' => 7
+							]
+						]
+					]
+				]
+			]
+		]);
+
+
+		$this->assertArrayHasKey('actionids', $response);
+		self::$actionid = $response['actionids'][0];
+
+		CDataHelper::call('service.create', [
+			[
+				'name' => 'Reference service',
+				'algorithm' => 1,
+				'showsla' => 0,
+				'sortorder' => 1
+			]
+		]);
+	}
+
 	public static function layout() {
 		return [
 			[
 				[
-					'eventsource' => 'Triggers',
+					'eventsource' => EVENT_SOURCE_TRIGGERS,
 					'recovery_msg' => true,
 					'acknowledge_msg' => true
 				]
 			],
 			[
 				[
-					'eventsource' => 'Triggers',
+					'eventsource' => EVENT_SOURCE_TRIGGERS,
 					'new_operation_operationtype' => 'Send message'
 				]
 			],
 			[
 				[
-					'eventsource' => 'Triggers',
+					'eventsource' => EVENT_SOURCE_TRIGGERS,
 					'new_operation_operationtype' => 'Send message',
 					'new_operation_opmessage_custom_msg' => 'unchecked'
 				]
 			],
 			[
 				[
-					'eventsource' => 'Triggers',
+					'eventsource' => EVENT_SOURCE_TRIGGERS,
 					'new_operation_operationtype' => 'Send message',
 					'add_opcondition' => true
 				]
 			],
 			[
 				[
-					'eventsource' => 'Triggers',
+					'eventsource' => EVENT_SOURCE_TRIGGERS,
+					'check_operationtype' => true,
 					'new_operation_operationtype' => 'Reboot',
 					'add_opcondition' => true
 				]
 			],
 			[
-				['eventsource' => 'Triggers', 'evaltype' => 'And']
+				['eventsource' => EVENT_SOURCE_TRIGGERS, 'evaltype' => 'And']
 			],
 			[
-				['eventsource' => 'Triggers', 'evaltype' => 'Or']
+				['eventsource' => EVENT_SOURCE_TRIGGERS, 'evaltype' => 'Or']
 			],
 			[
-				['eventsource' => 'Triggers', 'new_condition_conditiontype' => 'Tag name']
+				['eventsource' => EVENT_SOURCE_TRIGGERS, 'new_condition_conditiontype' => 'Tag name']
 			],
 			[
-				['eventsource' => 'Triggers', 'new_condition_conditiontype' => 'Tag value']
+				['eventsource' => EVENT_SOURCE_TRIGGERS, 'new_condition_conditiontype' => 'Tag value']
 			],
 			[
-				['eventsource' => 'Triggers', 'new_condition_conditiontype' => 'Host group']
+				['eventsource' => EVENT_SOURCE_TRIGGERS, 'new_condition_conditiontype' => 'Host group']
 			],
 			[
-				['eventsource' => 'Triggers', 'new_condition_conditiontype' => 'Template']
+				['eventsource' => EVENT_SOURCE_TRIGGERS, 'new_condition_conditiontype' => 'Template']
 			],
 			[
-				['eventsource' => 'Triggers', 'new_condition_conditiontype' => 'Host']
+				['eventsource' => EVENT_SOURCE_TRIGGERS, 'new_condition_conditiontype' => 'Host']
 			],
 			[
-				['eventsource' => 'Triggers', 'new_condition_conditiontype' => 'Trigger']
+				['eventsource' => EVENT_SOURCE_TRIGGERS, 'new_condition_conditiontype' => 'Trigger']
 			],
 			[
-				['eventsource' => 'Triggers', 'new_condition_conditiontype' => 'Trigger name']
+				['eventsource' => EVENT_SOURCE_TRIGGERS, 'new_condition_conditiontype' => 'Trigger name']
 			],
 			[
-				['eventsource' => 'Triggers', 'new_condition_conditiontype' => 'Trigger severity']
+				['eventsource' => EVENT_SOURCE_TRIGGERS, 'new_condition_conditiontype' => 'Trigger severity']
 			],
 			[
-				['eventsource' => 'Triggers', 'new_condition_conditiontype' => 'Time period']
+				['eventsource' => EVENT_SOURCE_TRIGGERS, 'new_condition_conditiontype' => 'Time period']
 			],
 			[
-				['eventsource' => 'Triggers', 'new_condition_conditiontype' => 'Problem is suppressed']
+				['eventsource' => EVENT_SOURCE_TRIGGERS, 'new_condition_conditiontype' => 'Problem is suppressed']
 			],
 			[
-				['eventsource' => 'Discovery']
+				[
+					'eventsource' => EVENT_SOURCE_SERVICE,
+					'recovery_msg' => true,
+					'acknowledge_msg' => true
+				]
+			],
+			[
+				[
+					'eventsource' => EVENT_SOURCE_SERVICE,
+					'new_operation_operationtype' => 'Send message'
+				]
+			],
+			[
+				[
+					'eventsource' => EVENT_SOURCE_SERVICE,
+					'new_operation_operationtype' => 'Send message',
+					'new_operation_opmessage_custom_msg' => 'unchecked'
+				]
+			],
+			[
+				[
+					'eventsource' => EVENT_SOURCE_SERVICE,
+					'check_operationtype' => true,
+					'new_operation_operationtype' => 'Reboot'
+				]
+			],
+			[
+				['eventsource' => EVENT_SOURCE_SERVICE, 'new_condition_conditiontype' => 'Service']
+			],
+			[
+				['eventsource' => EVENT_SOURCE_SERVICE, 'new_condition_conditiontype' => 'Service name']
+			],
+			[
+				['eventsource' => EVENT_SOURCE_SERVICE, 'new_condition_conditiontype' => 'Service tag name']
 			],
 			[
-				['eventsource' => 'Discovery', 'new_condition_conditiontype' => 'Host IP']
+				['eventsource' => EVENT_SOURCE_SERVICE, 'new_condition_conditiontype' => 'Service tag value']
 			],
 			[
-				['eventsource' => 'Discovery', 'new_condition_conditiontype' => 'Service type']
+				['eventsource' => EVENT_SOURCE_DISCOVERY]
 			],
 			[
-				['eventsource' => 'Discovery', 'new_condition_conditiontype' => 'Service port']
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_condition_conditiontype' => 'Host IP']
 			],
 			[
-				['eventsource' => 'Discovery', 'new_condition_conditiontype' => 'Discovery rule']
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_condition_conditiontype' => 'Service type']
 			],
 			[
-				['eventsource' => 'Discovery', 'new_condition_conditiontype' => 'Discovery check']
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_condition_conditiontype' => 'Service port']
 			],
 			[
-				['eventsource' => 'Discovery', 'new_condition_conditiontype' => 'Discovery object']
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_condition_conditiontype' => 'Discovery rule']
 			],
 			[
-				['eventsource' => 'Discovery', 'new_condition_conditiontype' => 'Discovery status']
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_condition_conditiontype' => 'Discovery check']
 			],
 			[
-				['eventsource' => 'Discovery', 'new_condition_conditiontype' => 'Uptime/Downtime']
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_condition_conditiontype' => 'Discovery object']
 			],
 			[
-				['eventsource' => 'Discovery', 'new_condition_conditiontype' => 'Received value']
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_condition_conditiontype' => 'Discovery status']
 			],
 			[
-				['eventsource' => 'Discovery', 'new_condition_conditiontype' => 'Proxy']
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_condition_conditiontype' => 'Uptime/Downtime']
+			],
+			[
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_condition_conditiontype' => 'Received value']
+			],
+			[
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_condition_conditiontype' => 'Proxy']
 			],
 			[
 				[
-					'eventsource' => 'Discovery',
+					'eventsource' => EVENT_SOURCE_DISCOVERY,
 					'new_operation_operationtype' => 'Send message'
 				]
 			],
 			[
 				[
-					'eventsource' => 'Discovery',
+					'eventsource' => EVENT_SOURCE_DISCOVERY,
 					'new_operation_operationtype' => 'Send message',
 					'new_operation_opmessage_custom_msg' => 'unchecked'
 				]
 			],
 			[
 				[
-					'eventsource' => 'Discovery',
+					'eventsource' => EVENT_SOURCE_DISCOVERY,
 					'new_operation_operationtype' => 'Reboot'
 				]
 			],
 			[
-				['eventsource' => 'Discovery', 'new_operation_operationtype' => 'Add host']
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'check_operationtype' => true, 'new_operation_operationtype' => 'Add host']
 			],
 			[
-				['eventsource' => 'Discovery', 'new_operation_operationtype' => 'Remove host']
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_operation_operationtype' => 'Remove host']
 			],
 			[
-				['eventsource' => 'Discovery', 'new_operation_operationtype' => 'Add to host group']
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_operation_operationtype' => 'Add to host group']
 			],
 			[
-				['eventsource' => 'Discovery', 'new_operation_operationtype' => 'Remove from host group']
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_operation_operationtype' => 'Remove from host group']
 			],
 			[
-				['eventsource' => 'Discovery', 'new_operation_operationtype' => 'Link to template']
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_operation_operationtype' => 'Link to template']
 			],
 			[
-				['eventsource' => 'Discovery', 'new_operation_operationtype' => 'Unlink from template']
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_operation_operationtype' => 'Unlink from template']
 			],
 			[
-				['eventsource' => 'Discovery', 'new_operation_operationtype' => 'Enable host']
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_operation_operationtype' => 'Enable host']
 			],
 			[
-				['eventsource' => 'Discovery', 'new_operation_operationtype' => 'Disable host']
+				['eventsource' => EVENT_SOURCE_DISCOVERY, 'new_operation_operationtype' => 'Disable host']
 			],
 			[
-				['eventsource' => 'Autoregistration']
+				['eventsource' => EVENT_SOURCE_AUTOREGISTRATION]
 			],
 			[
-				['eventsource' => 'Autoregistration', 'new_condition_conditiontype' => 'Host name']
+				['eventsource' => EVENT_SOURCE_AUTOREGISTRATION, 'new_condition_conditiontype' => 'Host name']
 			],
 			[
-				['eventsource' => 'Autoregistration', 'new_condition_conditiontype' => 'Proxy']
+				['eventsource' => EVENT_SOURCE_AUTOREGISTRATION, 'new_condition_conditiontype' => 'Proxy']
 			],
 			[
-				['eventsource' => 'Autoregistration', 'new_condition_conditiontype' => 'Host metadata']
+				['eventsource' => EVENT_SOURCE_AUTOREGISTRATION, 'new_condition_conditiontype' => 'Host metadata']
 			],
 			[
 				[
-					'eventsource' => 'Autoregistration',
+					'eventsource' => EVENT_SOURCE_AUTOREGISTRATION,
 					'new_operation_operationtype' => 'Send message'
 				]
 			],
 			[
 				[
-					'eventsource' => 'Autoregistration',
+					'eventsource' => EVENT_SOURCE_AUTOREGISTRATION,
 					'new_operation_operationtype' => 'Send message',
 					'new_operation_opmessage_custom_msg' => 'unchecked'
 				]
 			],
 			[
-				['eventsource' => 'Autoregistration', 'new_operation_operationtype' => 'Add host']
+				['eventsource' => EVENT_SOURCE_AUTOREGISTRATION, 'check_operationtype' => true, 'new_operation_operationtype' => 'Add host']
 			],
 			[
-				['eventsource' => 'Autoregistration', 'new_operation_operationtype' => 'Add to host group']
+				['eventsource' => EVENT_SOURCE_AUTOREGISTRATION, 'new_operation_operationtype' => 'Add to host group']
 			],
 			[
-				['eventsource' => 'Autoregistration', 'new_operation_operationtype' => 'Link to template']
+				['eventsource' => EVENT_SOURCE_AUTOREGISTRATION, 'new_operation_operationtype' => 'Link to template']
 			],
 			[
-				['eventsource' => 'Autoregistration', 'new_operation_operationtype' => 'Disable host']
+				['eventsource' => EVENT_SOURCE_AUTOREGISTRATION, 'new_operation_operationtype' => 'Disable host']
 			],
 			[
-				['eventsource' => 'Internal']
+				['eventsource' => EVENT_SOURCE_INTERNAL]
 			],
 			[
-				['eventsource' => 'Internal', 'recovery_msg' => true]
+				['eventsource' => EVENT_SOURCE_INTERNAL, 'recovery_msg' => true]
 			],
 			[
-				['eventsource' => 'Internal', 'new_condition_conditiontype' => 'Tag name']
+				['eventsource' => EVENT_SOURCE_INTERNAL, 'new_condition_conditiontype' => 'Tag name']
 			],
 			[
-				['eventsource' => 'Internal', 'new_condition_conditiontype' => 'Tag value']
+				['eventsource' => EVENT_SOURCE_INTERNAL, 'new_condition_conditiontype' => 'Tag value']
 			],
 			[
-				['eventsource' => 'Internal', 'new_condition_conditiontype' => 'Event type']
+				['eventsource' => EVENT_SOURCE_INTERNAL, 'new_condition_conditiontype' => 'Event type']
 			],
 			[
-				['eventsource' => 'Internal', 'new_condition_conditiontype' => 'Host group']
+				['eventsource' => EVENT_SOURCE_INTERNAL, 'new_condition_conditiontype' => 'Host group']
 			],
 			[
-				['eventsource' => 'Internal', 'new_condition_conditiontype' => 'Template']
+				['eventsource' => EVENT_SOURCE_INTERNAL, 'new_condition_conditiontype' => 'Template']
 			],
 			[
-				['eventsource' => 'Internal', 'new_condition_conditiontype' => 'Host']
+				['eventsource' => EVENT_SOURCE_INTERNAL, 'new_condition_conditiontype' => 'Host']
 			],
 			[
-				['eventsource' => 'Internal', 'new_operation_operationtype' => 'Send message']
+				['eventsource' => EVENT_SOURCE_INTERNAL, 'new_operation_operationtype' => 'Send message']
 			],
 			[
 				[
-					'eventsource' => 'Internal',
+					'eventsource' => EVENT_SOURCE_INTERNAL,
+					'check_operationtype' => true,
 					'new_operation_operationtype' => 'Send message',
 					'new_operation_opmessage_custom_msg' => 'unchecked'
 				]
@@ -265,31 +421,14 @@ class testFormAction extends CLegacyWebTest {
 	 */
 	public function testFormAction_CheckLayout($data) {
 		$eventsource = $data['eventsource'];
-		switch ($eventsource) {
-			case 'Triggers':
-				$this->zbxTestLogin('actionconf.php?eventsource='.EVENT_SOURCE_TRIGGERS.'&form=Create+action');
-				break;
-			case 'Discovery':
-				$this->zbxTestLogin('actionconf.php?eventsource='.EVENT_SOURCE_DISCOVERY.'&form=Create+action');
-				break;
-			case 'Autoregistration':
-				$this->zbxTestLogin('actionconf.php?eventsource='.EVENT_SOURCE_AUTOREGISTRATION.'&form=Create+action');
-				break;
-			case 'Internal';
-				$this->zbxTestLogin('actionconf.php?eventsource='.EVENT_SOURCE_INTERNAL.'&form=Create+action');
-				break;
-			default:
-				$this->zbxTestLogin('actionconf.php?eventsource='.EVENT_SOURCE_TRIGGERS.'&form=Create+action');
-				break;
-		}
 
+		$this->zbxTestLogin('actionconf.php?eventsource='.$eventsource.'&form=Create+action');
 		$this->zbxTestCheckTitle('Configuration of actions');
 		$this->zbxTestTextPresent(['Action', 'Operations']);
 
 		$this->zbxTestTextPresent('Name');
 		$this->zbxTestAssertVisibleId('name');
 		$this->zbxTestAssertAttribute('//input[@id="name"]', 'maxlength', 255);
-		$this->zbxTestAssertAttribute('//input[@id="name"]', 'size', 20);
 		$this->zbxTestAssertAttribute('//input[@id="name"]', 'autofocus');
 
 		$this->zbxTestTextPresent('Enabled');
@@ -315,7 +454,7 @@ class testFormAction extends CLegacyWebTest {
 			$evaltype = $data['evaltype'];
 		}
 
-		if ($eventsource == 'Triggers' && array_key_exists('evaltype', $data)) {
+		if ($eventsource == EVENT_SOURCE_TRIGGERS && array_key_exists('evaltype', $data)) {
 			$this->zbxTestTextPresent('Type of calculation');
 			$this->zbxTestAssertElementPresentId('evaltype');
 			$this->zbxTestDropdownHasOptions('evaltype', [
@@ -345,7 +484,7 @@ class testFormAction extends CLegacyWebTest {
 				'Label', 'Name', 'Action'
 		]);
 
-		if ($eventsource == 'Triggers' && array_key_exists('evaltype', $data)) {
+		if ($eventsource == EVENT_SOURCE_TRIGGERS && array_key_exists('evaltype', $data)) {
 			$this->zbxTestAssertElementText('//tr[@id="conditions_0"]/td[2]', 'Trigger name contains TEST1');
 			$this->zbxTestAssertElementText('//tr[@id="conditions_1"]/td[2]', 'Trigger name contains TEST2');
 			$this->zbxTestAssertElementPresentXpath('//button[@name="remove" and @onclick="javascript: removeCondition(0);"]');
@@ -370,7 +509,7 @@ class testFormAction extends CLegacyWebTest {
 		$new_condition_conditiontype = $this->zbxTestGetSelectedLabel('condition_type');
 
 		switch ($eventsource) {
-			case 'Triggers':
+			case EVENT_SOURCE_TRIGGERS:
 				$this->zbxTestDropdownHasOptions('condition_type', [
 						'Tag name',
 						'Tag value',
@@ -384,7 +523,15 @@ class testFormAction extends CLegacyWebTest {
 						'Problem is suppressed'
 				]);
 				break;
-			case 'Discovery':
+			case EVENT_SOURCE_SERVICE:
+				$this->zbxTestDropdownHasOptions('condition_type', [
+						'Service',
+						'Service name',
+						'Service tag name',
+						'Service tag value'
+				]);
+				break;
+			case EVENT_SOURCE_DISCOVERY:
 				$this->zbxTestDropdownHasOptions('condition_type', [
 						'Host IP',
 						'Service type',
@@ -398,14 +545,14 @@ class testFormAction extends CLegacyWebTest {
 						'Proxy'
 				]);
 				break;
-			case 'Autoregistration':
+			case EVENT_SOURCE_AUTOREGISTRATION:
 				$this->zbxTestDropdownHasOptions('condition_type', [
 						'Host name',
 						'Proxy',
 						'Host metadata'
 				]);
 				break;
-			case 'Internal':
+			case EVENT_SOURCE_INTERNAL:
 				$this->zbxTestDropdownHasOptions('condition_type', [
 						'Tag name',
 						'Tag value',
@@ -424,6 +571,8 @@ class testFormAction extends CLegacyWebTest {
 		switch ($new_condition_conditiontype) {
 			case 'Tag name':
 			case 'Tag value':
+			case 'Service tag name':
+			case 'Service tag value':
 				$this->zbxTestTextPresent([
 					'equals',
 					'does not equal',
@@ -437,6 +586,7 @@ class testFormAction extends CLegacyWebTest {
 			case 'Trigger':
 			case 'Host IP':
 			case 'Service type':
+			case 'Service':
 			case 'Discovery rule':
 			case 'Discovery check':
 			case 'Proxy':
@@ -446,6 +596,7 @@ class testFormAction extends CLegacyWebTest {
 				]);
 				break;
 			case 'Trigger name':
+			case 'Service name':
 			case 'Host name':
 			case 'Host metadata':
 				$this->zbxTestTextPresent([
@@ -500,6 +651,9 @@ class testFormAction extends CLegacyWebTest {
 		switch ($new_condition_conditiontype) {
 			case 'Tag name':
 			case 'Tag value':
+			case 'Service tag name':
+			case 'Service tag value':
+			case 'Service name':
 			case 'Trigger name':
 			case 'Time period':
 			case 'Host IP':
@@ -519,6 +673,9 @@ class testFormAction extends CLegacyWebTest {
 			case 'Tag name':
 			case 'Tag value':
 			case 'Trigger name':
+			case 'Service tag name':
+			case 'Service tag value':
+			case 'Service name':
 			case 'Time period':
 			case 'Host IP':
 			case 'Received value':
@@ -529,7 +686,6 @@ class testFormAction extends CLegacyWebTest {
 				break;
 			case 'Uptime/Downtime':
 				$this->zbxTestAssertAttribute('//input[@id="value"]', 'maxlength', 15);
-				$this->zbxTestAssertAttribute('//input[@id="value"]', 'size', 20);
 				break;
 		}
 
@@ -537,6 +693,9 @@ class testFormAction extends CLegacyWebTest {
 			case 'Tag name':
 			case 'Tag value':
 			case 'Trigger name':
+			case 'Service tag name':
+			case 'Service tag value':
+			case 'Service name':
 			case 'Received value':
 			case 'Host name':
 			case 'Host metadata':
@@ -558,6 +717,7 @@ class testFormAction extends CLegacyWebTest {
 
 		switch ($new_condition_conditiontype) {
 			case 'Host group':
+			case 'Service':
 			case 'Template':
 			case 'Host':
 			case 'Trigger':
@@ -663,7 +823,6 @@ class testFormAction extends CLegacyWebTest {
 			case 'Discovery check':
 				$this->zbxTestAssertElementPresentXpath('//input[@id=\'dcheck\']');
 				$this->zbxTestAssertAttribute('//input[@id=\'dcheck\']', 'maxlength', 255);
-				$this->zbxTestAssertAttribute('//input[@id=\'dcheck\']', 'size', 20);
 				$this->zbxTestAssertAttribute('//input[@id=\'dcheck\']', 'readonly');
 				$this->zbxTestAssertElementPresentXpath('//button[@id=\'btn1\']');
 				$this->zbxTestAssertElementText('//button[@id=\'btn1\']', 'Select');
@@ -684,31 +843,37 @@ class testFormAction extends CLegacyWebTest {
 		$operations_field = $form->getField('Operations')->asTable();
 
 		switch ($eventsource) {
-			case 'Triggers':
+			case EVENT_SOURCE_TRIGGERS:
+			case EVENT_SOURCE_SERVICE:
 				$this->assertEquals('1h', $form->getField('Default operation step duration')->getValue());
 				$this->zbxTestAssertVisibleId('esc_period');
 				$this->zbxTestAssertAttribute('//input[@id=\'esc_period\']', 'maxlength', 255);
-				$this->zbxTestAssertAttribute('//input[@id=\'esc_period\']', 'size', 20);
 
 				$this->assertEquals($operations_field->getHeadersText(), ['Steps', 'Details', 'Start in', 'Duration', 'Action']);
-				$this->assertTrue($form->getField('Pause operations for suppressed problems')->getValue());
+
+				if ($eventsource === EVENT_SOURCE_TRIGGERS) {
+					$this->assertTrue($form->getField('Pause operations for suppressed problems')->getValue());
+				}
+				else {
+					$this->assertFalse($form->query('id:pause_suppresed')->one(false)->isValid());
+				}
+
 				$recovery_field = $form->getField('Recovery operations')->asTable();
 				$this->assertEquals($recovery_field->getHeadersText(), ['Details', 'Action']);
 				$update_field = $form->getField('Update operations')->asTable();
 				$this->assertEquals($update_field->getHeadersText(), ['Details', 'Action']);
 				break;
-			case 'Discovery':
-			case 'Autoregistration':
+			case EVENT_SOURCE_DISCOVERY:
+			case EVENT_SOURCE_AUTOREGISTRATION:
 				$this->zbxTestTextNotPresent(['Default operation step duration', 'Pause operations for suppressed problems',
 					'Recovery operations', 'Update operations']);
 				$this->zbxTestAssertElementNotPresentId('esc_period');
 				$this->zbxTestAssertElementNotPresentId('pause_suppressed');
 				break;
-			case 'Internal':
+			case EVENT_SOURCE_INTERNAL:
 				$this->assertEquals('1h', $form->getField('Default operation step duration')->getValue());
 				$this->zbxTestAssertVisibleId('esc_period');
 				$this->zbxTestAssertAttribute('//input[@id=\'esc_period\']', 'maxlength', 255);
-				$this->zbxTestAssertAttribute('//input[@id=\'esc_period\']', 'size', 20);
 
 				$this->assertEquals($operations_field->getHeadersText(), ['Steps', 'Details', 'Start in', 'Duration', 'Action']);
 				$recovery_field = $form->getField('Recovery operations')->asTable();
@@ -722,45 +887,20 @@ class testFormAction extends CLegacyWebTest {
 			$new_operation_operationtype = $data['new_operation_operationtype'];
 			$operations_field->query('button:Add')->one()->click();
 			COverlayDialogElement::find()->one()->waitUntilReady();
-			switch ($eventsource) {
-				case 'Triggers':
-				case 'Discovery':
-				case 'Autoregistration':
-					$this->zbxTestWaitUntilElementPresent(webDriverBy::id('operationtype'));
-					$this->zbxTestDropdownSelectWait('operation-type-select', $new_operation_operationtype);
-					COverlayDialogElement::find()->one()->waitUntilReady();
-					break;
-				case 'Internal':
-					$this->zbxTestTextPresent('Send message');
-					break;
+
+			if ($eventsource === EVENT_SOURCE_INTERNAL) {
+				$this->zbxTestTextPresent('Send message');
+			}
+			else {
+				$this->zbxTestWaitUntilElementPresent(webDriverBy::id('operationtype'));
+				$this->zbxTestDropdownSelectWait('operation-type-select', $new_operation_operationtype);
+				COverlayDialogElement::find()->one()->waitUntilReady();
 			}
 		}
 		else {
 			$new_operation_operationtype = null;
 		}
 
-		if (isset($data['new_operation_opcommand_type'])) {
-			$new_operation_opcommand_type = $data['new_operation_opcommand_type'];
-			$this->zbxTestDropdownSelect('operation[opcommand][type]', $new_operation_opcommand_type);
-		}
-		elseif ($new_operation_operationtype == 'Remote command') {
-			$new_operation_opcommand_type = $this->zbxTestGetSelectedLabel('operation[opcommand][type]');
-		}
-		else {
-			$new_operation_opcommand_type = null;
-		}
-
-		if (isset($data['new_operation_opcommand_authtype'])) {
-			$new_operation_opcommand_authtype = $data['new_operation_opcommand_authtype'];
-			$this->zbxTestDropdownSelect('operation[opcommand][authtype]', $new_operation_opcommand_authtype);
-		}
-		elseif ($new_operation_opcommand_type == 'SSH') {
-			$new_operation_opcommand_authtype = $this->zbxTestGetSelectedLabel('operation[opcommand][authtype]');
-		}
-		else {
-			$new_operation_opcommand_authtype = null;
-		}
-
 		if (isset($data['new_operation_opmessage_custom_msg'])) {
 			$new_operation_opmessage_custom_msg = $data['new_operation_opmessage_custom_msg'];
 			$this->assertFalse($this->zbxTestCheckboxSelected('operation_opmessage_default_msg'));
@@ -774,7 +914,7 @@ class testFormAction extends CLegacyWebTest {
 		}
 
 		if (isset($data['add_opcondition'])) {
-			$this->zbxTestClickXpathWait('//tr[@id="operation-condition-list-footer"]//button[text()="Add"]');
+			$this->query('xpath://tr[@id="operation-condition-list-footer"]//button[text()="Add"]')->one()->click(true);
 			$this->page->query('xpath://div[contains(@class, "overlay-dialogue modal")][2]')
 					->asOverlayDialog()->waitUntilReady();
 			$add_opcondition = $data['add_opcondition'];
@@ -783,26 +923,28 @@ class testFormAction extends CLegacyWebTest {
 			$add_opcondition = null;
 		}
 
-		if ($new_operation_operationtype != null && $eventsource == 'Triggers' || $eventsource == 'Internal') 	{
+		if ($eventsource === EVENT_SOURCE_SERVICE) {
+			$this->assertFalse($this->query('id:operation-condition-list')->one(false)->isValid());
+		}
+
+		if ($new_operation_operationtype != null
+				&& in_array($eventsource, [EVENT_SOURCE_TRIGGERS, EVENT_SOURCE_SERVICE, EVENT_SOURCE_INTERNAL])) {
 			switch ($new_operation_operationtype) {
 				case 'Send message':
 				case 'Reboot':
 					$this->zbxTestTextPresent('Steps');
 					$this->zbxTestAssertVisibleId('operation_esc_step_from');
 					$this->zbxTestAssertAttribute('//input[@id=\'operation_esc_step_from\']', 'maxlength', 5);
-					$this->zbxTestAssertAttribute('//input[@id=\'operation_esc_step_from\']', 'size', 20);
 					$this->zbxTestAssertAttribute('//input[@id=\'operation_esc_step_from\']', 'value', 1);
 
 					$this->zbxTestTextPresent('(0 - infinitely)');
 					$this->zbxTestAssertVisibleId('operation_esc_step_to');
 					$this->zbxTestAssertAttribute('//input[@id=\'operation_esc_step_to\']', 'maxlength', 5);
-					$this->zbxTestAssertAttribute('//input[@id=\'operation_esc_step_to\']', 'size', 20);
 					$this->zbxTestAssertAttribute('//input[@id=\'operation_esc_step_to\']', 'value', 1);
 
 					$this->zbxTestTextPresent(['Step duration', '(0 - use action default)']);
 					$this->zbxTestAssertVisibleId('operation_esc_period');
 					$this->zbxTestAssertAttribute('//input[@id=\'operation_esc_period\']', 'maxlength', 255);
-					$this->zbxTestAssertAttribute('//input[@id=\'operation_esc_period\']', 'size', 20);
 					$this->zbxTestAssertAttribute('//input[@id=\'operation_esc_period\']', 'value', 0);
 					break;
 				}
@@ -813,7 +955,7 @@ class testFormAction extends CLegacyWebTest {
 				$this->zbxTestAssertElementNotPresentId('operation_esc_period');
 			}
 
-		if (isset($data['new_operation_operationtype']) && $eventsource != 'Internal') {
+		if (isset($data['new_operation_operationtype']) && $eventsource != EVENT_SOURCE_INTERNAL) {
 			$this->zbxTestTextPresent('Operations');
 			$this->zbxTestAssertVisibleXpath('//z-select[@id=\'operation-type-select\']');
 		}
@@ -821,52 +963,40 @@ class testFormAction extends CLegacyWebTest {
 			$this->zbxTestAssertElementNotPresentXpath('//z-select[@id=\'operation-type-select\']');
 		}
 
-		if (isset($data['operationtype'])) {
+		if (isset($data['check_operationtype']) && $eventsource === EVENT_SOURCE_INTERNAL) {
+			$this->assertFalse($this->query('id:operation-type-select')->one(false)->isValid());
+			$this->assertTrue($this->query('xpath://label[text()="Operation"]/../../div[text()="Send message"]')->one()->isValid());
+		}
+		elseif (isset($data['check_operationtype'])) {
+			$options = $this->query('id:operation-type-select')->asZDropdown()->one();
 			switch ($eventsource) {
-				case 'Triggers':
-				$this->zbxTestDropdownHasOptions('operationtype', [
-						'Send message',
-						'Remote command'
-				]);
+				case EVENT_SOURCE_TRIGGERS:
+				case EVENT_SOURCE_SERVICE:
+					$this->assertEquals($options->getOptions()->asText(), ['Send message', 'Reboot', 'Selenium script']);
 					break;
-				case 'Discovery':
-				$this->zbxTestDropdownHasOptions('operationtype', [
-						'Send message',
-						'Remote command',
-						'Add host',
-						'Remove host',
-						'Add to host group',
-						'Remove from host group',
-						'Link to template',
-						'Unlink from template',
-						'Enable host',
-						'Disable host'
-				]);
-					break;
-				case 'Autoregistration':
-				$this->zbxTestDropdownHasOptions('operationtype', [
-						'Send message',
-						'Remote command',
-						'Add host',
-						'Add to host group',
-						'Link to template',
-						'Disable host'
-				]);
-					break;
-			}
-		}
 
-		if (isset($data['operationtype'])) {
-			switch ($eventsource) {
-				case 'Triggers':
-				case 'Discovery':
-				case 'Autoregistration':
-					$this->zbxTestDropdownAssertSelected('new_operation[operationtype]', $new_operation_operationtype);
+				case EVENT_SOURCE_DISCOVERY:
+				case EVENT_SOURCE_AUTOREGISTRATION:
+					$this->assertEquals($options->getOptions()->asText(), [
+							'Send message',
+							'Add host',
+							'Remove host',
+							'Add to host group',
+							'Remove from host group',
+							'Link to template',
+							'Unlink from template',
+							'Enable host',
+							'Disable host',
+							'Set host inventory mode',
+							'Reboot',
+							'Selenium script'
+					]);
 					break;
 			}
+			$this->assertEquals($new_operation_operationtype, $options->getValue());
 		}
 
-		if ($new_operation_operationtype === 'Reboot') {
+		if ($new_operation_operationtype === 'Reboot' && $eventsource !== EVENT_SOURCE_SERVICE) {
 			$this->zbxTestTextPresent(['Target list', 'Current host', 'Host', 'Host group']);
 			$this->query('id:operation-command-chst')->one()->isSelected(false);
 			$this->zbxTestAssertVisibleId('operation_opcommand_hst__hostid');
@@ -923,7 +1053,6 @@ class testFormAction extends CLegacyWebTest {
 				$this->zbxTestTextPresent('Subject');
 				$this->zbxTestAssertVisibleId('operation_opmessage_subject');
 				$this->zbxTestAssertAttribute('//input[@id=\'operation_opmessage_subject\']', 'maxlength', 255);
-				$this->zbxTestAssertAttribute('//input[@id=\'operation_opmessage_subject\']', 'size', 20);
 
 				$this->zbxTestTextPresent('Message');
 				$this->zbxTestAssertVisibleId('operation_opmessage_message');
@@ -935,10 +1064,8 @@ class testFormAction extends CLegacyWebTest {
 				break;
 		}
 
-		if ($eventsource == 'Triggers' && $new_operation_operationtype != null) {
-			$this->zbxTestTextPresent([
-				'Conditions', 'Label', 'Name', 'Action'
-			]);
+		if ($eventsource == EVENT_SOURCE_TRIGGERS && $new_operation_operationtype != null) {
+			$this->zbxTestTextPresent(['Conditions', 'Label', 'Name', 'Action']);
 
 			if ($add_opcondition == null) {
 				$this->zbxTestAssertVisibleXpath('//div[@id="operationTab"]//button[text()="Add"]');
@@ -968,179 +1095,6 @@ class testFormAction extends CLegacyWebTest {
 			$this->zbxTestAssertElementNotPresentXpath('//tr[@id="operation-condition-list-footer"]');
 		}
 
-		if ($new_operation_opcommand_type != null) {
-			$this->zbxTestTextPresent('Type');
-			$this->query('xpath://z-select[@name="operation[opcommand][type]"]')->waitUntilVisible();
-			$this->zbxTestDropdownAssertSelected('operation[opcommand][type]', $new_operation_opcommand_type);
-			$this->zbxTestDropdownHasOptions('operation[opcommand][type]', [
-					'IPMI',
-					'Custom script',
-					'SSH',
-					'Telnet',
-					'Global script'
-			]);
-		}
-		else {
-			$this->zbxTestAssertElementNotPresentXpath('//z-select[@name="operation[opcommand][type]"]');
-		}
-
-		if ($new_operation_opcommand_type == 'Custom script') {
-			$this->zbxTestTextPresent([
-				'Execute on', 'Zabbix agent', 'Zabbix server']
-			);
-			$this->zbxTestAssertElementPresentXpath('//input[@id=\'operation_opcommand_execute_on_0\']');
-			$this->assertTrue($this->zbxTestCheckboxSelected('operation_opcommand_execute_on_0'));
-			$this->zbxTestAssertElementPresentXpath('//input[@id=\'operation_opcommand_execute_on_1\']');
-		}
-		else {
-			$this->zbxTestAssertElementNotPresentXpath('//input[@id=\'operation_opcommand_execute_on_0\']');
-			$this->zbxTestAssertElementNotPresentXpath('//input[@id=\'operation_opcommand_execute_on_1\']');
-		}
-
-		switch ($new_operation_opcommand_type) {
-			case 'Custom script':
-			case 'SSH':
-			case 'Telnet':
-				$this->zbxTestTextPresent('Commands');
-				$this->zbxTestAssertVisibleXpath('//textarea[@id=\'operation_opcommand_command\']');
-				$this->zbxTestAssertAttribute('//*[@id=\'operation_opcommand_command\']', 'rows', 7);
-				break;
-			case 'IPMI':
-				$this->zbxTestTextPresent('Commands');
-				$this->zbxTestAssertVisibleXpath('//input[@id=\'operation_opcommand_command_ipmi\']');
-				break;
-			default:
-				$this->zbxTestAssertElementNotPresentXpath('//textarea[@id=\'operation_opcommand_command\']');
-				break;
-		}
-
-		if ($new_operation_opcommand_type == 'IPMI') {
-			$this->zbxTestTextPresent('Commands');
-			$this->zbxTestAssertVisibleXpath('//input[@id="operation_opcommand_command_ipmi"]');
-			$this->zbxTestAssertAttribute('//*[@id="operation_opcommand_command_ipmi"]', 'maxlength', 255);
-			$this->zbxTestAssertAttribute('//*[@id="operation_opcommand_command_ipmi"]', 'size', 20);
-			$this->zbxTestAssertElementValue('operation_opcommand_command_ipmi', '');
-		}
-		else {
-			$this->zbxTestAssertElementNotPresentXpath('//input[@id="operation_opcommand_command_ipmi"]');
-		}
-
-		switch ($new_operation_opcommand_type) {
-			case 'SSH':
-				$this->zbxTestTextPresent('Authentication method');
-				$this->zbxTestAssertVisibleXpath('//z-select[@name="operation[opcommand][authtype]"]');
-				$this->zbxTestDropdownHasOptions('operation[opcommand][authtype]', [
-						'Password',
-						'Public key'
-				]);
-				$this->zbxTestDropdownAssertSelected('operation[opcommand][authtype]',
-						$new_operation_opcommand_authtype
-				);
-				break;
-			case 'IPMI':
-			case 'Custom script':
-			case 'Telnet':
-			case 'Global script':
-				$this->zbxTestAssertElementNotPresentXpath('//z-select[@name="operation[opcommand][authtype]"]');
-				break;
-			default:
-				$this->zbxTestAssertElementNotPresentXpath('//label[@for="operation_opcommand_authtype" and text()="Authentication method"]');
-				break;
-		}
-
-		switch ($new_operation_opcommand_type) {
-			case 'SSH':
-			case 'Telnet':
-				$this->zbxTestTextPresent('User name');
-				$this->zbxTestAssertVisibleXpath('//input[@id=\'operation_opcommand_username\']');
-				$this->zbxTestAssertAttribute('//*[@id=\'operation_opcommand_username\']', 'maxlength', 255);
-				$this->zbxTestAssertAttribute('//*[@id=\'operation_opcommand_username\']', 'size', 20);
-				$this->zbxTestAssertElementValue('operation_opcommand_username', '');
-				break;
-			case 'IPMI':
-			case 'Custom script':
-			case 'Global script':
-				$this->zbxTestAssertElementNotPresentXpath('//input[@id=\'operation_opcommand_username\']');
-				break;
-			default:
-				$this->zbxTestAssertElementNotPresentXpath('//label[@for="operation_opcommand_username" and text()="User name"]');
-				break;
-		}
-
-		switch ($new_operation_opcommand_authtype) {
-			case 'Password':
-				$this->zbxTestTextPresent('Password');
-				$this->zbxTestAssertVisibleXpath('//input[@id=\'operation_opcommand_password\']');
-				$this->zbxTestAssertAttribute('//*[@id=\'operation_opcommand_password\']', 'maxlength', 255);
-				$this->zbxTestAssertAttribute('//*[@id=\'operation_opcommand_password\']', 'size', 20);
-				$this->zbxTestAssertElementValue('operation_opcommand_password', '');
-
-				$this->zbxTestAssertNotVisibleId('opcommand_passphrase');
-
-				$this->zbxTestAssertNotVisibleId('operation_opcommand_publickey');
-				$this->zbxTestAssertNotVisibleId('operation_opcommand_privatekey');
-				break;
-			case 'Public key':
-				$this->zbxTestTextPresent('Key passphrase');
-				$this->zbxTestAssertVisibleXpath('//input[@id=\'opcommand_passphrase\']');
-				$this->zbxTestAssertAttribute('//*[@id=\'opcommand_passphrase\']', 'maxlength', 255);
-				$this->zbxTestAssertAttribute('//*[@id=\'opcommand_passphrase\']', 'size', 20);
-				$this->zbxTestAssertElementValue('opcommand_passphrase', '');
-
-				$this->zbxTestAssertNotVisibleXpath('//input[@id=\'operation_opcommand_password\']');
-
-				$this->zbxTestTextPresent('Public key file');
-				$this->zbxTestAssertVisibleXpath('//input[@id=\'operation_opcommand_publickey\']');
-				$this->zbxTestAssertAttribute('//*[@id=\'operation_opcommand_publickey\']', 'maxlength', 255);
-				$this->zbxTestAssertAttribute('//*[@id=\'operation_opcommand_publickey\']', 'size', 20);
-				$this->zbxTestAssertElementValue('operation_opcommand_publickey', '');
-
-				$this->zbxTestTextPresent('Private key file');
-				$this->zbxTestAssertVisibleXpath('//input[@id=\'operation_opcommand_privatekey\']');
-				$this->zbxTestAssertAttribute('//*[@id=\'operation_opcommand_privatekey\']', 'maxlength', 255);
-				$this->zbxTestAssertAttribute('//*[@id=\'operation_opcommand_privatekey\']', 'size', 20);
-				$this->zbxTestAssertElementValue('operation_opcommand_privatekey', '');
-				break;
-			default:
-				if ($new_operation_opcommand_type != null) {
-					$this->zbxTestAssertElementNotPresentXpath('//li[@id="operation-command-pubkey"]//input[@id="operation_opcommand_publickey"]');
-					$this->zbxTestAssertElementNotPresentXpath('//li[@id="operation-command-privatekey"]//input[@id="operation_opcommand_privatekey"]');
-					$this->zbxTestAssertElementNotPresentXpath('//li[@id="operation-command-passphrase"]//input[@id="opcommand_passphrase"]');
-				}
-				else {
-					$this->zbxTestAssertElementNotPresentXpath('//input[@id=\'operation_opcommand_password\']');
-					$this->zbxTestAssertElementNotPresentXpath('//input[@id=\'opcommand_passphrase\']');
-					$this->zbxTestAssertElementNotPresentXpath('//input[@id=\'operation_opcommand_publickey\']');
-					$this->zbxTestAssertElementNotPresentXpath('//input[@id=\'operation_opcommand_privatekey\']');
-				}
-				break;
-		}
-
-		switch ($new_operation_opcommand_type) {
-			case 'SSH':
-			case 'Telnet':
-				$this->zbxTestTextPresent('Port');
-				$this->zbxTestAssertVisibleXpath('//input[@id=\'operation_opcommand_port\']');
-				$this->zbxTestAssertAttribute('//input[@id=\'operation_opcommand_port\']', 'maxlength', 255);
-				$this->zbxTestAssertAttribute('//input[@id=\'operation_opcommand_port\']', 'size', 20);
-				$this->zbxTestAssertElementValue('operation_opcommand_port', '');
-				break;
-			default:
-				$this->zbxTestAssertElementNotPresentXpath('//input[@id=\'operation_opcommand_port\']');
-				break;
-		}
-
-		if ($new_operation_opcommand_type == 'Global script') {
-			$this->zbxTestAssertVisibleXpath('//input[@id=\'operation_opcommand_script\']');
-			$this->zbxTestAssertAttribute('//*[@id=\'operation_opcommand_script\']', 'maxlength', 255);
-			$this->zbxTestAssertAttribute('//*[@id=\'operation_opcommand_script\']', 'size', 20);
-			$this->zbxTestAssertAttribute('//*[@id=\'operation_opcommand_script\']', 'readonly');
-			$this->zbxTestAssertElementValue('operation_opcommand_script', '');
-		}
-		else {
-			$this->zbxTestAssertElementNotPresentXpath('//input[@id=\'operation_opcommand_script\']');
-		}
-
 		switch ($new_operation_operationtype) {
 			case 'Add to host group':
 			case 'Remove from host group':
@@ -1190,10 +1144,11 @@ class testFormAction extends CLegacyWebTest {
 		COverlayDialogElement::find()->one()->waitUntilReady();
 		$operation_details = $this->query('name:popup.operation')->asForm()->one();
 		// Check available operation types depending on event source and the selected operation type.
-		$message_types = ($eventsource === 'Triggers')
-			? ['Send message', 'Reboot', 'Selenium script']
-			: ['Send message', 'Notify all involved'];
-		$this->zbxTestDropdownHasOptions('operation-type-select', $message_types);
+		$message_types = ($eventsource === EVENT_SOURCE_INTERNAL)
+			? ['Send message', 'Notify all involved']
+			: ['Send message', 'Notify all involved', 'Reboot', 'Selenium script'];
+		$this->assertEquals($message_types, $operation_details->query('id:operation-type-select')
+				->asZDropdown()->one()->getOptions()->asText());
 		$this->assertEquals('Send message', $operation_details->getField('Operation')->getValue());
 		// Make sure that Custom message is unchecked and that message related fields are not visible.
 		$this->assertFalse($operation_details->getField('Custom message')->getValue());
@@ -1209,37 +1164,35 @@ class testFormAction extends CLegacyWebTest {
 		return CDBHelper::getDataProvider('SELECT name, eventsource FROM actions');
 	}
 
+	public static function updateServiceAction() {
+		return [
+			[
+				[
+						'name' => self::$action_name,
+						'eventsource' => '4'
+				]
+			]
+		];
+	}
+
 	/**
 	 * @dataProvider update
+	 * @dataProvider updateServiceAction
 	 */
 	public function testFormAction_SimpleUpdate($data) {
 		$name = $data['name'];
 		$eventsource = $data['eventsource'];
 
 		if ($name == 'Auto discovery. Linux servers.') {
-			$sqlActions = "SELECT actionid,name,eventsource,evaltype,status FROM actions ORDER BY actionid";
+			$sqlActions = 'SELECT actionid, name, eventsource, evaltype, status FROM actions ORDER BY actionid';
 		}
 		else {
-			$sqlActions = "SELECT * FROM actions ORDER BY actionid";
+			$sqlActions = 'SELECT * FROM actions ORDER BY actionid';
 		}
 		$oldHashActions = CDBHelper::getHash($sqlActions);
 
 		$this->zbxTestLogin('actionconf.php');
-		switch ($eventsource) {
-			case EVENT_SOURCE_TRIGGERS:
-				$this->query('id:page-title-general')->asPopupButton()->one()->select('Trigger actions');
-				break;
-			case EVENT_SOURCE_DISCOVERY:
-				$this->query('id:page-title-general')->asPopupButton()->one()->select('Discovery actions');
-				break;
-			case EVENT_SOURCE_AUTOREGISTRATION:
-				$this->query('id:page-title-general')->asPopupButton()->one()->select('Autoregistration actions');
-				break;
-			case EVENT_SOURCE_INTERNAL;
-				$this->query('id:page-title-general')->asPopupButton()->one()->select('Internal actions');
-				break;
-		}
-
+		$this->query('id:page-title-general')->asPopupButton()->one()->select($this->event_sources[$eventsource]);
 		$this->zbxTestClickLinkTextWait($name);
 		$this->zbxTestClickWait('update');
 		$this->zbxTestCheckTitle('Configuration of actions');
@@ -1257,147 +1210,251 @@ class testFormAction extends CLegacyWebTest {
 
 	public static function create() {
 		return [
-			[[
-				'expected' => ACTION_GOOD,
-				'eventsource' => EVENT_SOURCE_TRIGGERS,
-				'name' => 'TestFormAction Triggers 001',
-				'esc_period' => '123',
-				'conditions' => [
-					[
-						'type' => 'Trigger name',
-						'value' => 'trigger'
+			[
+				[
+					'expected' => ACTION_GOOD,
+					'eventsource' => EVENT_SOURCE_TRIGGERS,
+					'name' => 'TestFormAction Triggers 001',
+					'esc_period' => '123',
+					'conditions' => [
+						[
+							'Type' => 'Trigger name',
+							'Value' => 'trigger'
+						],
+						[
+							'Type' => 'Trigger severity',
+							'Severity' => 'Warning'
+						],
+						[
+							'Type' => 'Tag name',
+							'Operator' => 'does not contain',
+							'Tag' => 'Does not contain Tag'
+						]
 					],
-					[
-						'type' => 'Trigger severity',
-						'value' => 'Warning'
+					'expected conditions' => [
+						'A' => 'Tag name does not contain Does not contain Tag',
+						'B' => 'Trigger severity equals Warning',
+						'C' => 'Trigger name contains trigger'
 					],
-					[
-						'type' => 'Tag name',
-						'operator' => 'does not contain',
-						'value' => 'Does not contain Tag'
+					'operations' => [
+						[
+							'type' => 'Send message',
+							'media' => 'Email'
+						],
+						[
+							'type' => 'Reboot'
+						]
 					]
-				],
-				'operations' => [
-					[
-						'type' => 'Send message',
-						'media' => 'Email'
+				]
+			],
+			[
+				[
+					'expected' => ACTION_BAD,
+					'eventsource' => EVENT_SOURCE_TRIGGERS,
+					'name' => '',
+					'esc_period' => '123',
+					'errors' => [
+						'Incorrect value for field "Name": cannot be empty.'
+					]
+				]
+			],
+			[
+				[
+					'expected' => ACTION_GOOD,
+					'eventsource' => EVENT_SOURCE_DISCOVERY,
+					'name' => 'TestFormAction Discovery 001',
+					'conditions' => [
+						[
+							'Type' => 'Service type',
+							'Service type' => 'FTP'
+						],
+						[
+							'Type' => 'Received value',
+							'Operator' => 'does not contain',
+							'Value' => 'Received value'
+						]
 					],
-					[
-						'type' => 'Reboot'
+					'expected conditions' => [
+						'A' => 'Received value does not contain Received value',
+						'B' => 'Service type equals FTP'
+					],
+					'operations' => [
+						[
+							'type' => 'Send message',
+							'media' => 'Email'
+						],
+						[
+							'type' => 'Reboot'
+						]
 					]
 				]
-			]],
-			[[
-				'expected' => ACTION_BAD,
-				'eventsource' => EVENT_SOURCE_TRIGGERS,
-				'name' => '',
-				'esc_period' => '123',
-				'errors' => [
-						'Page received incorrect data',
+			],
+			[
+				[
+					'expected' => ACTION_BAD,
+					'eventsource' => EVENT_SOURCE_DISCOVERY,
+					'name' => '',
+					'errors' => [
 						'Incorrect value for field "Name": cannot be empty.'
+					]
 				]
-			]],
-			[[
-				'expected' => ACTION_GOOD,
-				'eventsource' => EVENT_SOURCE_DISCOVERY,
-				'name' => 'TestFormAction Discovery 001',
-				'conditions' => [
-					[
-						'type' => 'Service type',
-						'value' => 'FTP'
+			],
+			[
+				[
+					'expected' => ACTION_GOOD,
+					'eventsource' => EVENT_SOURCE_AUTOREGISTRATION,
+					'name' => 'TestFormAction Autoregistration 001',
+					'conditions' => [
+						[
+							'Type' => 'Host name',
+							'Value' => 'Zabbix'
+						],
+						[
+							'Type' => 'Host metadata',
+							'Operator'=> 'does not contain',
+							'Value' => 'Zabbix'
+						]
 					],
-					[
-						'type' => 'Received value',
-						'operator' => 'does not contain',
-						'value' => 'Received value'
-					]
-				],
-				'operations' => [
-					[
-						'type' => 'Send message',
-						'media' => 'Email'
+					'expected conditions' => [
+						'A' => 'Host metadata does not contain Zabbix',
+						'B' => 'Host name contains Zabbix'
 					],
-					[
-						'type' => 'Reboot'
+					'operations' => [
+						[
+							'type' => 'Send message',
+							'media' => 'Email'
+						],
+						[
+							'type' => 'Reboot'
+						]
 					]
 				]
-			]],
-			[[
-				'expected' => ACTION_BAD,
-				'eventsource' => EVENT_SOURCE_DISCOVERY,
-				'name' => '',
-				'errors' => [
-						'Page received incorrect data',
+			],
+			[
+				[
+					'expected' => ACTION_BAD,
+					'eventsource' => EVENT_SOURCE_AUTOREGISTRATION,
+					'name' => '',
+					'errors' => [
 						'Incorrect value for field "Name": cannot be empty.'
+					]
 				]
-			]],
-			[[
-				'expected' => ACTION_GOOD,
-				'eventsource' => EVENT_SOURCE_AUTOREGISTRATION,
-				'name' => 'TestFormAction Autoregistration 001',
-				'conditions' => [
-					[
-						'type' => 'Host name',
-						'value' => 'Zabbix'
+			],
+			[
+				[
+					'expected' => ACTION_GOOD,
+					'eventsource' => EVENT_SOURCE_INTERNAL,
+					'name' => 'TestFormAction Internal 001',
+					'esc_period' => '123',
+					'conditions' => [
+						[
+							'Type' => 'Event type',
+							'Event type' => 'Trigger in "unknown" state'
+						],
+						[
+							'Type' => 'Tag name',
+							'Operator' => 'does not contain',
+							'Tag' => 'Does not contain Tag'
+						]
 					],
-					[
-						'type' => 'Host metadata',
-						'operator'=> 'does not contain',
-						'value' => 'Zabbix'
-					]
-				],
-				'operations' => [
-					[
-						'type' => 'Send message',
-						'media' => 'Email'
+					'expected conditions' => [
+						'A' => 'Tag name does not contain Does not contain Tag',
+						'B' => 'Event type equals Trigger in "unknown" state'
 					],
-					[
-						'type' => 'Reboot'
+					'operations' => [
+						[
+							'type' => 'Send message',
+							'media' => 'Email'
+						]
+					],
+					'expected operations' => [
+						'Send message to users: Admin (Zabbix Administrator) via Email'
 					]
 				]
-			]],
-			[[
-				'expected' => ACTION_BAD,
-				'eventsource' => EVENT_SOURCE_AUTOREGISTRATION,
-				'name' => '',
-				'errors' => [
-						'Page received incorrect data',
+			],
+			[
+				[
+					'expected' => ACTION_BAD,
+					'eventsource' => EVENT_SOURCE_INTERNAL,
+					'name' => '',
+					'esc_period' => '123',
+					'errors' => [
 						'Incorrect value for field "Name": cannot be empty.'
+					]
 				]
-			]],
-			[[
-				'expected' => ACTION_GOOD,
-				'eventsource' => EVENT_SOURCE_INTERNAL,
-				'name' => 'TestFormAction Internal 001',
-				'esc_period' => '123',
-				'conditions' => [
-					[
-						'type' => 'Event type',
-						'value' => 'Trigger in "unknown" state'
+			],
+			[
+				[
+					'expected' => ACTION_GOOD,
+					'eventsource' => EVENT_SOURCE_SERVICE,
+					'name' => 'Test Service for Create operation',
+					'esc_period' => '666',
+					'conditions' => [
+						[
+							'Type' => 'Service',
+							'Operator' => 'does not equal',
+							'Services' => 'Reference service'
+						],
+						[
+							'Type' => 'Service name',
+							'Value' => 'Part of service name'
+						],
+						[
+							'Type' => 'Service tag name',
+							'Operator' => 'contains',
+							'Tag' => 'Service tag name'
+						],
+						[
+							'Type' => 'Service tag value',
+							'Tag' => 'Service tag',
+							'Operator' => 'does not contain',
+							'Value' => 'Service tag value'
+						]
 					],
-					[
-						'type' => 'Tag name',
-						'operator' => 'does not contain',
-						'value' => 'Does not contain Tag'
-					]
-				],
-				'operations' => [
-					[
-						'type' => 'Send message',
-						'media' => 'Email'
+					'expected conditions' => [
+						'A' => 'Service name contains Part of service name',
+						'B' => 'Service does not equal Reference service',
+						'C' => 'Value of tag Service tag does not contain Service tag value',
+						'D' => 'Tag name contains Service tag name'
+					],
+					'operations' => [
+						[
+							'type' => 'Send message',
+							'user_group' => 'Selenium user group'
+						],
+						[
+							'type' => 'Reboot'
+						]
+					],
+					'expected operations' => [
+						'Send message to user groups: Selenium user group via all media',
+						'Run script "Reboot" on Zabbix server'
 					]
 				]
-			]],
-			[[
-				'expected' => ACTION_BAD,
-				'eventsource' => EVENT_SOURCE_INTERNAL,
-				'name' => '',
-				'esc_period' => '123',
-				'errors' => [
-						'Page received incorrect data',
+			],
+			[
+				[
+					'expected' => ACTION_BAD,
+					'eventsource' => EVENT_SOURCE_SERVICE,
+					'name' => '',
+					'esc_period' => '666',
+					'errors' => [
 						'Incorrect value for field "Name": cannot be empty.'
+					]
 				]
-			]]
+			],
+			[
+				[
+					'expected' => ACTION_BAD,
+					'eventsource' => EVENT_SOURCE_SERVICE,
+					'name' => 'No operations action',
+					'esc_period' => '666',
+					'error_title' => 'Cannot add action',
+					'errors' => [
+						'Action "No operations action" no operations defined.'
+					]
+				]
+			]
 		];
 	}
 
@@ -1409,145 +1466,106 @@ class testFormAction extends CLegacyWebTest {
 		$this->zbxTestCheckTitle('Configuration of actions');
 		$this->zbxTestCheckHeader('Actions');
 
-		if (isset($data['name'])){
-			$this->zbxTestInputTypeOverwrite('name', $data['name']);
-			$this->zbxTestAssertElementValue('name', $data['name']);
-		}
-
-			$conditionCount = 0;
+		$action_form = $this->query('id:action-form')->asForm()->one();
+		$action_form->getField('Name')->fill($data['name']);
 
-		if (isset($data['conditions'])) {
+		if (array_key_exists('conditions', $data)) {
 			foreach ($data['conditions'] as $condition) {
-				$this->zbxTestClickXpathWait('//button[text()="Add" and contains(@onclick, "popup.condition.actions")]');
-				$this->zbxTestWaitUntilElementVisible(WebDriverBy::id('condition-type'));
-				$this->zbxTestDropdownSelectWait('condition_type', $condition['type']);
-				COverlayDialogElement::find()->one()->waitUntilReady();
-				switch ($condition['type']) {
-					case 'Host name':
-					case 'Host metadata':
-					case 'Trigger name':
-					case 'Tag name':
-						if (array_key_exists('operator', $condition)) {
-							$this->zbxTestClickXpathWait('//label[text()="'.$condition['operator'].'"]');
-						}
-						$this->zbxTestInputTypeWait('value', $condition['value']);
-						$this->zbxTestClickXpath("//div[@class='overlay-dialogue-footer']//button[text()='Add']");
-						switch($condition['type']){
-							case 'Host name':
-								$this->zbxTestAssertElementText('//tr[@id="conditions_'.$conditionCount.'"]/td[2]', 'Host name contains '.$condition['value']);
-								$conditionCount++;
-								break;
-							case 'Host metadata':
-								$this->zbxTestAssertElementText('//tr[@id="conditions_'.$conditionCount.'"]/td[2]', 'Host metadata does not contain '.$condition['value']);
-								$conditionCount++;
-								break;
-							case 'Trigger name':
-								$this->zbxTestAssertElementText("//tr[@id='conditions_".$conditionCount."']/td[2]", 'Trigger name contains '.$condition['value']);
-								$conditionCount++;
-								break;
-							case 'Tag':
-								$this->zbxTestAssertElementText("//tr[@id='conditions_".$conditionCount."']/td[2]", 'Tag does not contain '.$condition['value']);
-								$conditionCount++;
-								break;
-						}
-						break;
-					case 'Received value':
-						$this->zbxTestDropdownSelect('operator', $condition['operator']);
-						$this->zbxTestInputTypeWait('value', $condition['value']);
-						$this->zbxTestClickXpath("//div[@class='overlay-dialogue-footer']//button[text()='Add']");
-
-						$this->zbxTestAssertElementText('//tr[@id="conditions_'.$conditionCount.'"]/td[2]', 'Received value does not contain '.$condition['value']);
-						$conditionCount++;
-						break;
-					case 'Trigger severity':
-						$this->zbxTestClickXpathWait('//label[text()="'.$condition['value'].'"]');
-						$this->zbxTestClickXpath("//div[@class='overlay-dialogue-footer']//button[text()='Add']");
-
-						$this->zbxTestAssertElementText('//tr[@id="conditions_'.$conditionCount.'"]/td[2]', 'Trigger severity equals '.$condition['value']);
-						$conditionCount++;
-						break;
-					case 'Event type':
-					case 'Service type':
-						$this->zbxTestDropdownSelectWait('value', $condition['value']);
-						$this->zbxTestClickXpath("//div[@class='overlay-dialogue-footer']//button[text()='Add']");
-						switch($condition['type']){
-							case 'Service type':
-								$this->zbxTestAssertElementText('//tr[@id="conditions_'.$conditionCount.'"]/td[2]', 'Service type equals '.$condition['value']);
-								$conditionCount++;
-								break;
-							case 'Event type':
-								$this->zbxTestAssertElementText('//tr[@id="conditions_'.$conditionCount.'"]/td[2]', 'Event type equals '.$condition['value']);
-								$conditionCount++;
-								break;
-						}
-						break;
-				}
+				$action_form->query('xpath:.//table[@id="conditionTable"]//button[text()="Add"]')->one()->click();
+
+				COverlayDialogElement::find()->waitUntilVisible()->one();
+				$condition_form = $this->query('id:popup.condition')->asForm()->one();
+				$condition_form->fill($condition);
+				$condition_form->submit();
 			}
 		}
 
 		if (isset($data['operations'])) {
-			$this->page->waitUntilReady();
-			$this->zbxTestTabSwitch('Operations');
+			$action_form->selectTab('Operations');
 
 			foreach ($data['operations'] as $operation) {
-				$this->zbxTestClickXpathWait('//div[@id="operationTab"]//button[text()="Add"]');
-				$this->zbxTestWaitUntilElementVisible(WebDriverBy::xpath('//div[@class="overlay-dialogue-footer"]//button[text()="Add"]'));
-			if ($data['eventsource']!= EVENT_SOURCE_INTERNAL){
-				$this->zbxTestDropdownSelectWait('operation-type-select', $operation['type']);
-			}
-				switch ($operation['type']) {
-					case 'Send message':
-						$this->zbxTestClickXpath('//tr[@id="operation-message-user-groups-footer"]//button');
-						$this->zbxTestLaunchOverlayDialog('User groups');
-						$this->zbxTestCheckboxSelect('all_records');
-						$this->zbxTestClickXpath('//div[@class="overlay-dialogue-footer"]//button[text()="Select"]');
-
-						$this->zbxTestClickXpath('//tr[@id="operation-message-users-footer"]//button');
-						$this->zbxTestLaunchOverlayDialog('Users');
-						$this->zbxTestCheckboxSelect('all_records');
-						$this->zbxTestClickXpath('//div[@class="overlay-dialogue-footer"]//button[text()="Select"]');
-
-						$this->zbxTestDropdownSelect('operation[opmessage][mediatypeid]', $operation['media']);
-						break;
-					case 'Reboot':
-						$this->zbxTestCheckboxSelect('operation-command-chst');
-						break;
+				$action_form->query('xpath:.//table[@id="op-table"]//button[text()="Add"]')->one()->click();
+
+				COverlayDialogElement::find()->waitUntilVisible()->one();
+				$operation_form = $this->query('id:popup.operation')->asForm()->one();
+
+				if ($data['eventsource'] !== EVENT_SOURCE_INTERNAL) {
+					$operation_form->getField('Operation')->fill($operation['type']);
+				}
+
+				if ($operation['type'] === 'Send message') {
+					if (array_key_exists('user_group', $operation)) {
+						$field = 'Send to user groups';
+						$value = $operation['user_group'];
+					}
+					else {
+						$field = 'Send to users';
+						$value = 'Admin';
+					}
+					$operation_form->getField($field)->query('button:Add')->one()->click();
+					$list = COverlayDialogElement::find()->all()->last();
+					$list->query('link', $value)->waitUntilClickable()->one()->click();
 				}
-				$this->zbxTestClickXpathWait('//div[@class="overlay-dialogue-footer"]//button[text()="Add"]');
-				$this->zbxTestWaitUntilElementVisible(WebDriverBy::id('operations_0'));
+				elseif ($data['eventsource'] !== EVENT_SOURCE_SERVICE) {
+					$operation_form->query('id:operation-command-chst')->asCheckbox()->waitUntilVisible()->one()->check();
+				}
+
+				if (array_key_exists('media', $operation)) {
+					$operation_form->getField('Send only to')->fill($operation['media']);
+				}
+
+				$operation_form->submit();
+				COverlayDialogElement::ensureNotPresent();
 			}
-			COverlayDialogElement::ensureNotPresent();
-		}
 
-		if (isset($data['esc_period'])){
-			$this->zbxTestTabSwitch('Operations');
-			$this->zbxTestInputTypeOverwrite('esc_period', $data['esc_period']);
-			// Fire onchange event.
-			$this->webDriver->executeScript('var event = document.createEvent("HTMLEvents");'.
-				'event.initEvent("change", false, true);'.
-				'document.getElementById("esc_period").dispatchEvent(event);'
-			);
-			$this->zbxTestWaitForPageToLoad();
+			if (array_key_exists('esc_period', $data)) {
+				$action_form->getField('Default operation step duration')->fill($data['esc_period']);
+			}
 		}
-		$this->zbxTestWaitUntilElementNotVisible(WebDriverBy::xpath('//div[contains(@class, "overlay-dialogue modal")]'));
-		$this->query('xpath://button[@id="add"]')->waitUntilClickable()->one()->click();
-		switch ($data['expected']) {
-			case ACTION_GOOD:
-				$this->zbxTestCheckTitle('Configuration of actions');
-
-				$this->zbxTestCheckHeader($this->event_sources[$data['eventsource']]);
-				$this->zbxTestTextNotPresent(['Page received incorrect data', 'Cannot add action']);
-				$this->zbxTestWaitUntilMessageTextPresent('msg-good', 'Action added');
-				$sql = "SELECT actionid FROM actions WHERE name='".$data['name']."'";
-				$this->assertEquals(1, CDBHelper::getCount($sql), 'Action has not been created in the DB.');
-				break;
 
-			case ACTION_BAD:
-				$this->zbxTestCheckTitle('Configuration of actions');
-				$this->zbxTestCheckHeader('Actions');
-				$this->zbxTestWaitUntilMessageTextPresent('msg-bad', 'Page received incorrect data');
-				$this->zbxTestTextPresent($data['errors']);
-				break;
+		$action_form->submit();
+		$sql = 'SELECT actionid FROM actions WHERE name='.zbx_dbstr($data['name']);
+
+		if ($data['expected'] === ACTION_GOOD) {
+			$this->page->waitUntilReady();
+			$this->assertMessage(TEST_GOOD, 'Action added');
+			$this->assertEquals(1, CDBHelper::getCount($sql), 'Action has not been created in the DB.');
+
+			$this->query('link', $data['name'])->waitUntilClickable()->one()->click();
+			$this->page->waitUntilReady();
+
+			if (array_key_exists('conditions', $data)) {
+				$condition_table = $this->query('id:conditionTable')->waitUntilVisible()->asTable()->one();
+
+				foreach($data['expected conditions'] as $label => $result) {
+					$this->assertEquals($result, $condition_table->findRow('Label', $label)->getColumn('Name')->getText());
+				}
+			}
+
+			if (array_key_exists('operations', $data)) {
+				$expected_operations = [
+					'Send message to users: Admin (Zabbix Administrator) via Email',
+					'Run script "Reboot" on current host'
+				];
+				if (array_key_exists('expected operations', $data)) {
+					$expected_operations = $data['expected operations'];
+				}
+				$action_form->invalidate();
+				$action_form->selectTab('Operations');
+				$operations_table = $this->query('id:op-table')->waitUntilVisible()->asTable()->one();
+
+				$saved_operations = [];
+				$row_count = count($expected_operations);
+				for ($i = 0; $i < $row_count; $i++) {
+					$saved_operations[] = $operations_table->getRow($i)->getColumn('Details')->getText();
+				}
+				$this->assertEquals($expected_operations, $saved_operations);
+			}
+		}
+		else {
+			$title = CTestArrayHelper::get($data, 'error_title', 'Page received incorrect data');
+			$this->assertMessage(TEST_BAD, $title, $data['errors']);
+			$this->assertEquals(0, CDBHelper::getCount($sql), 'Action has not been created in the DB.');
 		}
 	}
 
@@ -1557,7 +1575,7 @@ class testFormAction extends CLegacyWebTest {
 
 		$this->zbxTestInputTypeWait('name', 'action test');
 
-// adding conditions
+		// adding conditions
 		$this->zbxTestClickXpathWait('//button[text()="Add" and contains(@onclick, "popup.condition.actions")]');
 		$this->zbxTestLaunchOverlayDialog('New condition');
 		$this->zbxTestDropdownSelectWait('condition_type', 'Trigger name');
@@ -1580,7 +1598,7 @@ class testFormAction extends CLegacyWebTest {
 		$this->zbxTestClickXpath("//div[@class='overlay-dialogue-footer']//button[text()='Add']");
 		$this->zbxTestAssertElementText("//tr[@id='conditions_2']/td[2]", 'Tag name equals zabbix');
 
-// adding operations
+		// adding operations
 		$this->zbxTestTabSwitch('Operations');
 		$this->zbxTestClickXpathWait('//div[@id="operationTab"]//button[text()="Add"]');
 
@@ -1605,10 +1623,10 @@ class testFormAction extends CLegacyWebTest {
 		$this->zbxTestWaitUntilElementVisible(WebDriverBy::xpath('//div[@class="overlay-dialogue-footer"]//button[text()="Add"]'));
 		$this->zbxTestDropdownSelectWait('operation-type-select', 'Reboot');
 
-// add target current host
+		// add target current host
 		$this->zbxTestCheckboxSelect('operation-command-chst');
 
-// add target host Zabbix server
+		// add target host Zabbix server
 		$this->zbxTestClickButtonMultiselect('operation_opcommand_hst__hostid');
 		$this->zbxTestLaunchOverlayDialog('Hosts');
 		$this->zbxTestClickButtonMultiselect('popup_host_group');
@@ -1616,7 +1634,7 @@ class testFormAction extends CLegacyWebTest {
 		$this->query('link:Zabbix servers')->one()->waitUntilClickable()->click();
 
 		$this->zbxTestClickLinkTextWait('Simple form test host');
-// add target group Zabbix servers
+		// add target group Zabbix servers
 		$this->zbxTestClickButtonMultiselect('operation_opcommand_grp__groupid');
 		$this->zbxTestLaunchOverlayDialog('Host groups');
 		$this->zbxTestClickLinkTextWait('Zabbix servers');
@@ -1677,4 +1695,28 @@ class testFormAction extends CLegacyWebTest {
 		$sql = "SELECT actionid FROM actions WHERE name='action test'";
 		$this->assertEquals(1, CDBHelper::getCount($sql), 'Action has not been created in the DB.');
 	}
+
+	public function testFormAction_Clone() {
+		$id = self::$actionid;
+		$sql = 'SELECT a.eventsource, a.evaltype, a.status, a.esc_period, a.formula, a.pause_suppressed, '.
+				'c.conditiontype, c.operator, c.value, c.value2, '.
+				'o.operationtype, o.esc_period, o.esc_step_from, o.esc_step_to, o.evaltype, o.recovery '.
+				'FROM actions a '.
+				'INNER JOIN conditions c ON c.actionid = a.actionid '.
+				'INNER JOIN operations o on o.actionid = c.actionid '.
+				'WHERE a.actionid='.zbx_dbstr($id).' ORDER BY o.operationid';
+
+		$original_hash = CDBHelper::getHash($sql);
+
+		$this->page->login()->open('actionconf.php?eventsource=4&form=update&actionid='.$id)->waitUntilReady();
+		$this->query('button:Clone')->waitUntilClickable()->one()->click();
+
+		$form = $this->query('id:action-form')->asForm()->one();
+		$form->getField('Name')->fill(self::$action_name.' Clone');
+		$form->submit();
+		$this->assertMessage(TEST_GOOD, 'Action added');
+
+		$id = CDBHelper::getValue('SELECT actionid FROM actions WHERE name='.zbx_dbstr(self::$action_name.' Clone'));
+		$this->assertEquals($original_hash, CDBHelper::getHash($sql));
+	}
 }
diff --git a/ui/tests/selenium/testFormAdministrationDMProxies.php b/ui/tests/selenium/testFormAdministrationDMProxies.php
index 795d6623727..4ae19e8b207 100644
--- a/ui/tests/selenium/testFormAdministrationDMProxies.php
+++ b/ui/tests/selenium/testFormAdministrationDMProxies.php
@@ -103,7 +103,7 @@ class testFormAdministrationDMProxies extends CLegacyWebTest {
 				'proxy123.zabbix.com',
 				11051,
 				0,
-				['Cannot add proxy', 'Invalid IP address "wrong ip".']
+				['Cannot add proxy', 'Invalid parameter "/1/interface/ip": an IP address is expected.']
 			],
 			[
 				PROXY_BAD,
@@ -113,7 +113,7 @@ class testFormAdministrationDMProxies extends CLegacyWebTest {
 				'proxy123.zabbix.com',
 				11051,
 				0,
-				['Cannot add proxy', 'Incorrect characters used for proxy name']
+				['Cannot add proxy', 'Invalid parameter "/1/host": invalid host name.']
 			],
 			[
 				PROXY_BAD,
@@ -123,7 +123,7 @@ class testFormAdministrationDMProxies extends CLegacyWebTest {
 				'proxy123.zabbix.com',
 				11051,
 				0,
-				['Cannot add proxy', 'Incorrect characters used for proxy name "Прокси".']
+				['Cannot add proxy', 'Invalid parameter "/1/host": invalid host name.']
 			],
 			[
 				PROXY_BAD,
@@ -133,7 +133,7 @@ class testFormAdministrationDMProxies extends CLegacyWebTest {
 				'proxy123.zabbix.com',
 				0,
 				'port',
-				['Cannot add proxy', 'Incorrect interface port "port" provided.']
+				['Cannot add proxy', 'Invalid parameter "/1/interface/port": an integer is expected.']
 			],
 			[PROXY_BAD,
 				'Active proxy 1',
@@ -151,7 +151,7 @@ class testFormAdministrationDMProxies extends CLegacyWebTest {
 				'proxy123.zabbix.com',
 				0,
 				'$PROXY_PORT',
-				['Cannot add proxy', 'Incorrect interface port "$PROXY_PORT" provided.']
+				['Cannot add proxy', 'Invalid parameter "/1/interface/port": an integer is expected.']
 			],
 			[PROXY_BAD,
 				'New passive proxy with wrong IP macro',
@@ -160,7 +160,7 @@ class testFormAdministrationDMProxies extends CLegacyWebTest {
 				'proxy123.zabbix.com',
 				0,
 				11051,
-				['Cannot add proxy', 'Invalid IP address "$PROXY_IP".']
+				['Cannot add proxy', 'Invalid parameter "/1/interface/ip": an IP address is expected.']
 			]
 		];
 	}
diff --git a/ui/tests/selenium/testFormAdministrationGeneralGUI.php b/ui/tests/selenium/testFormAdministrationGeneralGUI.php
index 092ec4589c0..52ead104eab 100644
--- a/ui/tests/selenium/testFormAdministrationGeneralGUI.php
+++ b/ui/tests/selenium/testFormAdministrationGeneralGUI.php
@@ -437,7 +437,7 @@ class testFormAdministrationGeneralGUI extends testFormAdministrationGeneral {
 					]
 				]
 			],
-			// Invalid sting values.
+			// Invalid string values.
 			[
 				[
 					'expected' => TEST_BAD,
@@ -938,15 +938,6 @@ class testFormAdministrationGeneralGUI extends testFormAdministrationGeneral {
 			[
 				[
 					'field' =>  [
-						'Max number of columns and rows in overview tables' => '5'
-					],
-					'link' => 'overview.php',
-					'row_count' => 6		// Plus 1 info row in table.
-				]
-			],
-			[
-				[
-					'field' =>  [
 						'Max count of elements to show inside table cell' => '2'
 					],
 					'link' => 'templates.php?filter_name=cisco',
diff --git a/ui/tests/selenium/testFormAdministrationGeneralOtherParams.php b/ui/tests/selenium/testFormAdministrationGeneralOtherParams.php
index 89861518c18..976ab46824c 100644
--- a/ui/tests/selenium/testFormAdministrationGeneralOtherParams.php
+++ b/ui/tests/selenium/testFormAdministrationGeneralOtherParams.php
@@ -437,7 +437,7 @@ class testFormAdministrationGeneralOtherParams extends testFormAdministrationGen
 					]
 				]
 			],
-			// Invalid sting values.
+			// Invalid string values.
 			[
 				[
 					'expected' => TEST_BAD,
diff --git a/ui/tests/selenium/testFormAdministrationMediaTypeWebhook.php b/ui/tests/selenium/testFormAdministrationMediaTypeWebhook.php
index 5e72b671301..6c3ab544ce2 100644
--- a/ui/tests/selenium/testFormAdministrationMediaTypeWebhook.php
+++ b/ui/tests/selenium/testFormAdministrationMediaTypeWebhook.php
@@ -38,7 +38,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 						'Type' => 'Webhook',
 						'Script' => ' '
 					],
-					'error_message' => 'Invalid parameter "/2/script": cannot be empty.'
+					'error_message' => 'Invalid parameter "/1/script": cannot be empty.'
 				]
 			],
 			// Attepmt to add a webhook media type with a name that is already taken.
@@ -77,7 +77,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 							'Value' => '{BLANK.NAME}'
 						]
 					],
-					'error_message' => 'Invalid parameter "/2/parameters/6/name": cannot be empty.'
+					'error_message' => 'Invalid parameter "/1/parameters/6/name": cannot be empty.'
 				]
 			],
 			// Attempt to add a webhook without specifying the script field.
@@ -87,7 +87,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 						'Name' => 'Webhook with empty script field',
 						'Type' => 'Webhook'
 					],
-					'error_message' => 'Invalid parameter "/2/script": cannot be empty.'
+					'error_message' => 'Invalid parameter "/1/script": cannot be empty.'
 				]
 			],
 			// Attempt to add a webhook with timeout equal to zero.
@@ -99,7 +99,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 						'Script' => 'Zero timeout',
 						'Timeout' => '0'
 					],
-					'error_message' => 'Invalid parameter "/2/timeout": value must be one of 1-60.'
+					'error_message' => 'Invalid parameter "/1/timeout": value must be one of 1-60.'
 				]
 			],
 			// Attempt to add a webhook with too large timeout.
@@ -111,7 +111,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 						'Script' => 'Large timeout',
 						'Timeout' => '61s'
 					],
-					'error_message' => 'Invalid parameter "/2/timeout": value must be one of 1-60.'
+					'error_message' => 'Invalid parameter "/1/timeout": value must be one of 1-60.'
 				]
 			],
 			// Attempt to add a webhook with too large timeout #2.
@@ -123,7 +123,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 						'Script' => 'Large timeout',
 						'Timeout' => '2m'
 					],
-					'error_message' => 'Invalid parameter "/2/timeout": value must be one of 1-60.'
+					'error_message' => 'Invalid parameter "/1/timeout": value must be one of 1-60.'
 				]
 			],
 			// Attempt to add a webhook with a string in the timeout field.
@@ -135,7 +135,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 						'Script' => 'String in timeout',
 						'Timeout' => '30seconds'
 					],
-					'error_message' => 'Invalid parameter "/2/timeout": a time unit is expected.'
+					'error_message' => 'Invalid parameter "/1/timeout": a time unit is expected.'
 				]
 			],
 			// Attempt to add a webhook with empty menu entry name.
@@ -148,7 +148,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 						'Include event menu entry' => true,
 						'Menu entry URL' => 'https://zabbix.com/{EVENT.TAGS."Returned value"}'
 					],
-					'error_message' => 'Incorrect value for field "event_menu_name": cannot be empty.'
+					'error_message' => 'Invalid parameter "/1/event_menu_name": cannot be empty.'
 				]
 			],
 			// Attempt to add a webhook with empty menu entry URL.
@@ -161,7 +161,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 						'Include event menu entry' => true,
 						'Menu entry name' => '{EVENT.TAGS."Returned tag"}'
 					],
-					'error_message' => 'Incorrect value for field "event_menu_url": cannot be empty.'
+					'error_message' => 'Invalid parameter "/1/event_menu_url": cannot be empty.'
 				]
 			],
 			// Attempt to add a webhook with empty Attempts field.
@@ -175,7 +175,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 					'options' => [
 						'Attempts' => ''
 					],
-					'error_message' => 'Incorrect value for field "maxattempts": must be between "1" and "100".'
+					'error_message' => 'Invalid parameter "/1/maxattempts": value must be one of 1-100.'
 				]
 			],
 			// Attempt to add a webhook with 0 in Attempts field.
@@ -189,7 +189,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 					'options' => [
 						'Attempts' => '0'
 					],
-					'error_message' => 'Incorrect value for field "maxattempts": must be between "1" and "100".'
+					'error_message' => 'Invalid parameter "/1/maxattempts": value must be one of 1-100.'
 				]
 			],
 			// Attempt to add a webhook with too much Attempts.
@@ -203,7 +203,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 					'options' => [
 						'Attempts' => '101'
 					],
-					'error_message' => 'Incorrect value for field "maxattempts": must be between "1" and "100".'
+					'error_message' => 'Invalid parameter "/1/maxattempts": value must be one of 1-100.'
 				]
 			],
 			// Attempt to add a webhook with empty Attempt interval field.
@@ -218,7 +218,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 						'Attempts' => '5',
 						'Attempt interval' => ''
 					],
-					'error_message' => 'Incorrect value for field "attempt_interval": cannot be empty.'
+					'error_message' => 'Invalid parameter "/1/attempt_interval": cannot be empty.'
 				]
 			],
 			// Attempt to add a webhook with Attempt interval out of range.
@@ -233,7 +233,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 						'Attempts' => '5',
 						'Attempt interval' => '3601'
 					],
-					'error_message' => 'Incorrect value for field "attempt_interval": must be between "0" and "3600".'
+					'error_message' => 'Invalid parameter "/1/attempt_interval": value must be one of 0-3600.'
 				]
 			],
 			// Attempt to add a webhook with custom concurrent sessions number out of range.
@@ -251,7 +251,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 					'concurrent_sessions' => [
 						'Custom' => '101'
 					],
-					'error_message' => 'Incorrect value for field "maxsessions": must be between "0" and "100".'
+					'error_message' => 'Invalid parameter "/1/maxsessions": value must be one of 0-100.'
 				]
 			],
 			// Adding a parameter with a blank name to the media type.
@@ -330,7 +330,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 						'Include event menu entry' => true,
 						'Menu entry URL' => '{EVENT.TAGS.Address}'
 					],
-					'error_message' => 'Incorrect value for field "event_menu_name": cannot be empty.'
+					'error_message' => 'Invalid parameter "/1/event_menu_name": cannot be empty.'
 				]
 			],
 			// Add a menu entry name without a menu entry URL.
@@ -343,7 +343,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 						'Include event menu entry' => true,
 						'Menu entry name' => '{EVENT.TAGS."Returned tag"}'
 					],
-					'error_message' => 'Incorrect value for field "event_menu_url": cannot be empty.'
+					'error_message' => 'Invalid parameter "/1/event_menu_url": cannot be empty.'
 				]
 			],
 			// Remove the value of the attempts field.
@@ -357,7 +357,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 					'options' => [
 						'Attempts' => ''
 					],
-					'error_message' => 'Incorrect value for field "maxattempts": must be between "1" and "100".'
+					'error_message' => 'Invalid parameter "/1/maxattempts": value must be one of 1-100.'
 				]
 			],
 			// Set the value of Attempts field to 0.
@@ -371,7 +371,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 					'options' => [
 						'Attempts' => '0'
 					],
-					'error_message' => 'Incorrect value for field "maxattempts": must be between "1" and "100".'
+					'error_message' => 'Invalid parameter "/1/maxattempts": value must be one of 1-100.'
 				]
 			],
 			// Set the value of Attempts field too high.
@@ -385,7 +385,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 					'options' => [
 						'Attempts' => '101'
 					],
-					'error_message' => 'Incorrect value for field "maxattempts": must be between "1" and "100".'
+					'error_message' => 'Invalid parameter "/1/maxattempts": value must be one of 1-100.'
 				]
 			],
 			// Set the value of Attempts field to some string.
@@ -399,7 +399,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 					'options' => [
 						'Attempts' => 'five'
 					],
-					'error_message' => 'Incorrect value for field "maxattempts": must be between "1" and "100".'
+					'error_message' => 'Invalid parameter "/1/maxattempts": value must be one of 1-100.'
 				]
 			],
 			// Remove the value of the attempt interval field.
@@ -414,7 +414,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 						'Attempts' => '1',
 						'Attempt interval' => ''
 					],
-					'error_message' => 'Incorrect value for field "attempt_interval": cannot be empty.'
+					'error_message' => 'Invalid parameter "/1/attempt_interval": cannot be empty.'
 				]
 			],
 			// Set a value of the attempt interval that is out of range.
@@ -429,7 +429,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 						'Attempts' => '5',
 						'Attempt interval' => '3601'
 					],
-					'error_message' => 'Incorrect value for field "attempt_interval": must be between "0" and "3600".'
+					'error_message' => 'Invalid parameter "/1/attempt_interval": value must be one of 0-3600.'
 				]
 			],
 			// Set a string value in the attempt interval field.
@@ -444,7 +444,7 @@ class testFormAdministrationMediaTypeWebhook extends CWebTest {
 						'Attempts' => '5',
 						'Attempt interval' => '10seconds'
 					],
-					'error_message' => 'Incorrect value for field "attempt_interval": must be between "0" and "3600".'
+					'error_message' => 'Invalid parameter "/1/attempt_interval": a time unit is expected.'
 				]
 			],
 			// Removing the name of a webhook media type.
diff --git a/ui/tests/selenium/testFormAdministrationMediaTypes.php b/ui/tests/selenium/testFormAdministrationMediaTypes.php
index 39c5aa45277..e8ce8aa99e2 100644
--- a/ui/tests/selenium/testFormAdministrationMediaTypes.php
+++ b/ui/tests/selenium/testFormAdministrationMediaTypes.php
@@ -350,7 +350,7 @@ class testFormAdministrationMediaTypes extends CLegacyWebTest {
 					'type' => 'Email',
 					'name' => 'Email with zero attempt',
 					'attempts' => 0,
-					'error' => 'Incorrect value for field "maxattempts": must be between "1" and "100".'
+					'error' => 'Invalid parameter "/1/maxattempts": value must be one of 1-100.'
 				]
 			],
 			[
@@ -359,7 +359,7 @@ class testFormAdministrationMediaTypes extends CLegacyWebTest {
 					'type' => 'Email',
 					'name' => 'Email with empty attempt',
 					'attempts' => '',
-					'error' => 'Incorrect value for field "maxattempts": must be between "1" and "100".'
+					'error' => 'Invalid parameter "/1/maxattempts": value must be one of 1-100.'
 				]
 			],
 			[
@@ -368,7 +368,7 @@ class testFormAdministrationMediaTypes extends CLegacyWebTest {
 					'type' => 'Email',
 					'name' => 'Email with 101 attempts',
 					'attempts' => 101,
-					'error' => 'Incorrect value for field "maxattempts": must be between "1" and "100".'
+					'error' => 'Invalid parameter "/1/maxattempts": value must be one of 1-100.'
 				]
 			],
 			[
@@ -377,7 +377,7 @@ class testFormAdministrationMediaTypes extends CLegacyWebTest {
 					'name' => 'Email attempts with symbols',
 					'type' => 'Email',
 					'attempts' => 'æų',
-					'error' => 'Incorrect value for field "maxattempts": must be between "1" and "100".',
+					'error' => 'Invalid parameter "/1/maxattempts": value must be one of 1-100.',
 					'jenkins' => true
 				]
 			],
@@ -387,7 +387,7 @@ class testFormAdministrationMediaTypes extends CLegacyWebTest {
 					'name' => 'Email attempts with symbols',
 					'type' => 'Email',
 					'attempts' => '☺',
-					'error' => 'Incorrect value for field "maxattempts": must be between "1" and "100".',
+					'error' => 'Invalid parameter "/1/maxattempts": value must be one of 1-100.',
 					'jenkins' => true
 				]
 			],
@@ -398,7 +398,7 @@ class testFormAdministrationMediaTypes extends CLegacyWebTest {
 					'type' => 'Email',
 					'name' => 'Email with 3601s in interval',
 					'interval' => '3601s',
-					'error' => 'Incorrect value for field "attempt_interval": must be between "0" and "3600".'
+					'error' => 'Invalid parameter "/1/attempt_interval": value must be one of 0-3600.'
 				]
 			],
 			[
@@ -407,7 +407,7 @@ class testFormAdministrationMediaTypes extends CLegacyWebTest {
 					'type' => 'Email',
 					'name' => 'Email with 3601 in interval',
 					'interval' => '3601',
-					'error' => 'Incorrect value for field "attempt_interval": must be between "0" and "3600".'
+					'error' => 'Invalid parameter "/1/attempt_interval": value must be one of 0-3600.'
 				]
 			],
 			[
@@ -416,7 +416,7 @@ class testFormAdministrationMediaTypes extends CLegacyWebTest {
 					'type' => 'Email',
 					'name' => 'Email with 61m in interval',
 					'interval' => '61m',
-					'error' => 'Incorrect value for field "attempt_interval": must be between "0" and "3600".'
+					'error' => 'Invalid parameter "/1/attempt_interval": value must be one of 0-3600.'
 				]
 			],
 			[
@@ -425,7 +425,7 @@ class testFormAdministrationMediaTypes extends CLegacyWebTest {
 					'type' => 'Email',
 					'name' => 'Email with 2h in inerval',
 					'interval' => '2h',
-					'error' => 'Incorrect value for field "attempt_interval": must be between "0" and "3600".'
+					'error' => 'Invalid parameter "/1/attempt_interval": value must be one of 0-3600.'
 				]
 			],
 			[
@@ -434,7 +434,7 @@ class testFormAdministrationMediaTypes extends CLegacyWebTest {
 					'type' => 'Email',
 					'name' => 'Email with symbols in interval',
 					'interval' => '1msms',
-					'error' => 'Incorrect value for field "attempt_interval": must be between "0" and "3600".'
+					'error' => 'Invalid parameter "/1/attempt_interval": a time unit is expected.'
 				]
 			],
 			[
@@ -443,7 +443,7 @@ class testFormAdministrationMediaTypes extends CLegacyWebTest {
 					'type' => 'Email',
 					'name' => 'Email with symbols in interval',
 					'interval' => '☺',
-					'error' => 'Incorrect value for field "attempt_interval": must be between "0" and "3600".'
+					'error' => 'Invalid parameter "/1/attempt_interval": a time unit is expected.'
 				]
 			],
 			[
@@ -452,7 +452,7 @@ class testFormAdministrationMediaTypes extends CLegacyWebTest {
 					'type' => 'Email',
 					'name' => 'Email with -1s interval',
 					'interval' => '-1s',
-					'error' => 'Incorrect value for field "attempt_interval": must be between "0" and "3600".'
+					'error' => 'Invalid parameter "/1/attempt_interval": value must be one of 0-3600.'
 				]
 			],
 			[
@@ -461,7 +461,7 @@ class testFormAdministrationMediaTypes extends CLegacyWebTest {
 					'type' => 'Email',
 					'name' => 'Email with -1 interval',
 					'interval' => -1,
-					'error' => 'Incorrect value for field "attempt_interval": must be between "0" and "3600".'
+					'error' => 'Invalid parameter "/1/attempt_interval": value must be one of 0-3600.'
 				]
 			],
 			// maxsessions validation
@@ -472,7 +472,7 @@ class testFormAdministrationMediaTypes extends CLegacyWebTest {
 					'name' => 'Email with 101 in custom sessions',
 					'sessions' => 'Custom',
 					'maxsessions' => '101',
-					'error' => 'Incorrect value for field "maxsessions": must be between "0" and "100".'
+					'error' => 'Invalid parameter "/1/maxsessions": value must be one of 0-100.'
 				]
 			],
 			// Successfully create media type with different options
diff --git a/ui/tests/selenium/testFormEventCorrelation.php b/ui/tests/selenium/testFormEventCorrelation.php
index d311dba5a94..6595f7647c6 100644
--- a/ui/tests/selenium/testFormEventCorrelation.php
+++ b/ui/tests/selenium/testFormEventCorrelation.php
@@ -111,16 +111,9 @@ class testFormEventCorrelation extends CLegacyWebTest {
 			],
 			[
 				[
-					'name' => 'Event correlation for update',
-					'error_header' => 'Cannot add correlation',
-					'error_message' => 'Correlation "Event correlation for update" already exists.'
-				]
-			],
-			[
-				[
 					'name' => 'Without conditions',
 					'error_header' => 'Cannot add correlation',
-					'error_message' => 'No "conditions" given for correlation "Without conditions".'
+					'error_message' => 'Invalid parameter "/1/filter/conditions": cannot be empty.'
 				]
 			],
 			[
@@ -128,7 +121,7 @@ class testFormEventCorrelation extends CLegacyWebTest {
 					'name' => 'Without operation',
 					'tag' => 'tag name',
 					'error_header' => 'Cannot add correlation',
-					'error_message' => 'No "operations" given for correlation "Without operation".'
+					'error_message' => 'Invalid parameter "/1/operations": cannot be empty.'
 				]
 			]
 		];
@@ -551,7 +544,7 @@ class testFormEventCorrelation extends CLegacyWebTest {
 						['select_tag' => 'New event tag name', 'tag_name' => 'Test tag2' ]
 					],
 					'formula'=> '',
-					'error_message' => 'Incorrect custom expression "" for correlation "Test create with empty expression": expression is empty.'
+					'error_message' => 'Invalid parameter "/1/filter/formula": cannot be empty.'
 				]
 			],
 			[
@@ -563,7 +556,7 @@ class testFormEventCorrelation extends CLegacyWebTest {
 						['select_tag' => 'Old event tag value', 'tag_name' => 'Test tag3', 'operator' => 'contains','value' => 'Value']
 					],
 					'formula'=> 'A or B',
-					'error_message' => 'Condition "C" is not used in formula "A or B" for correlation "Test create with missing argument".'
+					'error_message' => 'Invalid parameter "/1/operations": cannot be empty.'
 				]
 			],
 			[
@@ -575,7 +568,7 @@ class testFormEventCorrelation extends CLegacyWebTest {
 						['select_tag' => 'Old event tag value', 'tag_name' => 'Test tag3', 'operator' => 'contains','value' => 'Value']
 					],
 					'formula'=> '(A or B) and (C or D)',
-					'error_message' => 'Condition "D" used in formula "(A or B) and (C or D)" for correlation "Test create with extra argument" is not defined.'
+					'error_message' => 'Invalid parameter "/1/operations": cannot be empty.'
 				]
 			],
 			[
@@ -587,7 +580,7 @@ class testFormEventCorrelation extends CLegacyWebTest {
 						['select_tag' => 'Old event tag value', 'tag_name' => 'Test tag3', 'operator' => 'contains','value' => 'Value']
 					],
 					'formula'=> 'Wrong formula',
-					'error_message' => 'Incorrect custom expression "Wrong formula" for correlation "Test create with wrong formula": check expression starting from "Wrong formula".'
+					'error_message' => 'Invalid parameter "/1/filter/formula": check expression starting from "Wrong formula".'
 				]
 			],
 			[
@@ -598,7 +591,7 @@ class testFormEventCorrelation extends CLegacyWebTest {
 						['select_tag' => 'New event tag name', 'tag_name' => 'Test tag2' ]
 					],
 					'formula'=> 'A and Not B',
-					'error_message' => 'Incorrect custom expression "A and Not B" for correlation "Check case sensitive of operator in formula": check expression starting from "Not B".'
+					'error_message' => 'Invalid parameter "/1/filter/formula": check expression starting from "Not B".'
 				]
 			],
 			[
@@ -609,7 +602,7 @@ class testFormEventCorrelation extends CLegacyWebTest {
 						['select_tag' => 'New event tag name', 'tag_name' => 'Test tag2' ]
 					],
 					'formula'=> 'NOT A and not B',
-					'error_message' => 'Incorrect custom expression "NOT A and not B" for correlation "Check case sensitive of first operator in formula": check expression starting from " A and not B".'
+					'error_message' => 'Invalid parameter "/1/filter/formula": check expression starting from " A and not B".'
 				]
 			],
 			[
@@ -620,7 +613,7 @@ class testFormEventCorrelation extends CLegacyWebTest {
 						['select_tag' => 'New event tag name', 'tag_name' => 'Test tag2' ]
 					],
 					'formula'=> 'not A not B',
-					'error_message' => 'Incorrect custom expression "not A not B" for correlation "Test create with only NOT in formula": check expression starting from " not B".'
+					'error_message' => 'Invalid parameter "/1/filter/formula": check expression starting from " not B".'
 				]
 			]
 		];
diff --git a/ui/tests/selenium/testFormHost.php b/ui/tests/selenium/testFormHost.php
index dfec909680f..7cfaad25483 100644
--- a/ui/tests/selenium/testFormHost.php
+++ b/ui/tests/selenium/testFormHost.php
@@ -1075,7 +1075,7 @@ class testFormHost extends CWebTest {
 				]
 			],
 			// Successful host form update.
-			// Add defualt interface values.
+			// Add default interface values.
 			[
 				[
 					'expected' => TEST_GOOD,
diff --git a/ui/tests/selenium/testFormLowLevelDiscoveryOverrides.php b/ui/tests/selenium/testFormLowLevelDiscoveryOverrides.php
index f96972342cc..5363e305e3c 100644
--- a/ui/tests/selenium/testFormLowLevelDiscoveryOverrides.php
+++ b/ui/tests/selenium/testFormLowLevelDiscoveryOverrides.php
@@ -2010,7 +2010,7 @@ class testFormLowLevelDiscoveryOverrides extends CWebTest {
 				}
 				unset($condition);
 
-				// Check that Fiters are filled correctly.
+				// Check that Filters are filled correctly.
 				$filters_table = $override_overlay->query('id:overrides_filters')->asMultifieldTable()->one();
 				$mapping = $this->setFiltersTableMapping($filters_table);
 				$filters_table->setFieldMapping($mapping)->checkValue($override['Filters']['filter_conditions']);
diff --git a/ui/tests/selenium/testFormSetup.php b/ui/tests/selenium/testFormSetup.php
index efa0c23d838..67d7e1c3df4 100644
--- a/ui/tests/selenium/testFormSetup.php
+++ b/ui/tests/selenium/testFormSetup.php
@@ -195,7 +195,7 @@ class testFormSetup extends CWebTest {
 				$this->assertFalse($form->getField($field_name)->isVisible());
 			}
 
-			// Check layout when "Store credetials in" is set to "HashiCorp Vault".
+			// Check layout when "Store credentials in" is set to "HashiCorp Vault".
 			$credentials_field->select('HashiCorp Vault');
 			$form->invalidate();
 			foreach (['User', 'Password'] as $field_name) {
diff --git a/ui/tests/selenium/testGeneric.php b/ui/tests/selenium/testGeneric.php
index 2728b804d2b..02fa80dd89d 100644
--- a/ui/tests/selenium/testGeneric.php
+++ b/ui/tests/selenium/testGeneric.php
@@ -30,13 +30,6 @@ class testGeneric extends CLegacyWebTest {
 			// monitoring
 			['zabbix.php?action=dashboard.view',					'Dashboard'],
 
-			['overview.php',												'Overview [refreshed every 30 sec.]'],
-			['overview.php?form_refresh=1&groupid=0&type=0&view_style=0',	'Overview [refreshed every 30 sec.]'],
-
-			['overview.php?form_refresh=1&groupid=0&type=0&view_style=1',	'Overview [refreshed every 30 sec.]'],
-			['overview.php?form_refresh=1&groupid=0&type=1&view_style=0',	'Overview [refreshed every 30 sec.]'],
-			['overview.php?form_refresh=1&groupid=0&type=1&view_style=1',	'Overview [refreshed every 30 sec.]'],
-
 			['zabbix.php?action=web.view',					'Web monitoring'],
 			['zabbix.php?action=latest.view',	'Latest data'],
 
diff --git a/ui/tests/selenium/testPageAdministrationGeneralModules.php b/ui/tests/selenium/testPageAdministrationGeneralModules.php
index 53aef3a39d2..9e0dbb77db8 100644
--- a/ui/tests/selenium/testPageAdministrationGeneralModules.php
+++ b/ui/tests/selenium/testPageAdministrationGeneralModules.php
@@ -578,7 +578,7 @@ class testPageAdministrationGeneralModules extends CWebTest {
 		foreach ($module['menu_entries'] as $entry) {
 			$check_entry = CTestArrayHelper::get($module, 'top_menu_entry', $entry['name']);
 			$this->assertEquals(0, $this->query($xpath.$check_entry.'"]')->count());
-			// In case if module meny entry leads to an existing view, don't check that menu entry URL isn't available.
+			// In case if module many entry leads to an existing view, don't check that menu entry URL isn't available.
 			if (CTestArrayHelper::get($entry, 'check_disabled', true)) {
 				$this->page->open('zabbix.php?action='.$entry['action'])->waitUntilReady();
 				$message = CMessageElement::find()->one();
@@ -634,7 +634,7 @@ class testPageAdministrationGeneralModules extends CWebTest {
 			else {
 				$this->changeModuleStatusFromPage($module['module_name'], 'Enabled');
 			}
-			// Check message and confirm that changes, made by the module, were revered.
+			// Check message and confirm that changes, made by the module, were reversed.
 			$message = $from_form ? 'Module updated: ' : 'Module disabled: ';
 			$this->assertMessage(TEST_GOOD, $message.$module['module_name'].'.');
 			$this->assertModuleDisabled($module);
diff --git a/ui/tests/selenium/testPageApiTokensAdministrationGeneral.php b/ui/tests/selenium/testPageApiTokensAdministrationGeneral.php
index 5075a2d96c4..0469b49311e 100644
--- a/ui/tests/selenium/testPageApiTokensAdministrationGeneral.php
+++ b/ui/tests/selenium/testPageApiTokensAdministrationGeneral.php
@@ -37,7 +37,7 @@ class testPageApiTokensAdministrationGeneral extends testPageApiTokens {
 	public static function prepareTokenData() {
 		self::$timestamp = time() + 172800;
 
-		$responce = CDataHelper::call('token.create', [
+		$response = CDataHelper::call('token.create', [
 			[
 				'name' => 'Admin: future token for admin',
 				'userid' => 1,
@@ -99,7 +99,7 @@ class testPageApiTokensAdministrationGeneral extends testPageApiTokens {
 
 		// Update token "Last accessed" timestamp to be different for each token.
 		$i = 1;
-		foreach ($responce['tokenids'] as $tokenid) {
+		foreach ($response['tokenids'] as $tokenid) {
 			DBexecute('UPDATE token SET lastaccess='.(1609452001+$i).' WHERE tokenid='.$tokenid);
 			$i++;
 		}
diff --git a/ui/tests/selenium/testPageLowLevelDiscovery.php b/ui/tests/selenium/testPageLowLevelDiscovery.php
index 1929e4213e5..210c79bf968 100644
--- a/ui/tests/selenium/testPageLowLevelDiscovery.php
+++ b/ui/tests/selenium/testPageLowLevelDiscovery.php
@@ -239,7 +239,7 @@ class testPageLowLevelDiscovery extends CWebTest {
 	public function testPageLowLevelDiscovery_CheckNow($data) {
 		$context = array_key_exists('template', $data) ? '&context=template' : '&context=host';
 		$this->page->login()->open('host_discovery.php?filter_set=1&filter_hostids%5B0%5D='.$data['hostid'].$context);
-		// Enabe all LLDs, so Check now can be send successfully.
+		// Enable all LLDs, so Check now can be send successfully.
 		$this->massChangeStatus('Enable');
 		$this->selectTableRows($data['names'], 'Name', $this->selector);
 
diff --git a/ui/tests/selenium/testPageOverview.php b/ui/tests/selenium/testPageOverview.php
deleted file mode 100644
index b3f379b6c51..00000000000
--- a/ui/tests/selenium/testPageOverview.php
+++ /dev/null
@@ -1,678 +0,0 @@
-<?php
-/*
-** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-**/
-
-require_once dirname(__FILE__).'/../include/CLegacyWebTest.php';
-require_once dirname(__FILE__).'/traits/FilterTrait.php';
-
-use Facebook\WebDriver\WebDriverBy;
-
-/**
- * @backup problem
- */
-class testPageOverview extends CLegacyWebTest {
-
-	use FilterTrait;
-
-	// Check that no real host or template names displayed
-	public function testPageOverview_NoHostNames() {
-		$this->zbxTestLogin('overview.php');
-		$this->zbxTestCheckTitle('Overview [refreshed every 30 sec.]');
-		$this->zbxTestCheckHeader('Trigger overview');
-		$this->zbxTestCheckNoRealHostnames();
-	}
-
-	public function getFilterData() {
-		return [
-			// Overview check with type 'Triggers'.
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'view_style' => 'Left',
-					'filter' => [],
-					'result_hosts' => [
-						'1_Host_to_check_Monitoring_Overview', '3_Host_to_check_Monitoring_Overview',
-						'4_Host_to_check_Monitoring_Overview', 'Host for triggers filtering'
-					],
-					'result_triggers' => [
-						'1_trigger_Average', '1_trigger_Disaster', '1_trigger_High',
-						'1_trigger_Not_classified', '1_trigger_Warning', '2_trigger_Information',
-						'3_trigger_Average', '4_trigger_Average', 'Inheritance trigger with tags'
-					]
-				]
-			],
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Another group to check Overview'
-					],
-					'result_hosts' => [
-						'4_Host_to_check_Monitoring_Overview'
-					],
-					'result_triggers' => [
-						'4_trigger_Average'
-					]
-				]
-			],
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'view_style' => 'Top',
-					'filter' => [
-						'Host groups' => 'Group to check Overview'
-					],
-					'result_hosts' => [
-						'1_Host_to_check_Monitoring_Overview', '3_Host_to_check_Monitoring_Overview'
-					],
-					'result_triggers' => [
-						'1_trigger_Not_classified', '1_trigger_Warning', '1_trigger_Average', '1_trigger_High',
-						'1_trigger_Disaster', '2_trigger_Information', '3_trigger_Average'
-					]
-				]
-			],
-			// Severity option in filter.
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'view_style' => 'Left',
-					'filter' => [
-						'Host groups' => 'Group to check Overview',
-						'Minimum severity' => 'Information'
-					],
-					'result_hosts' => [
-						'1_Host_to_check_Monitoring_Overview', '3_Host_to_check_Monitoring_Overview'
-					],
-					'result_triggers' => [
-						'1_trigger_Warning', '1_trigger_Average', '1_trigger_High',	'1_trigger_Disaster',
-						'2_trigger_Information', '3_trigger_Average'
-					]
-				]
-			],
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'view_style' => 'Top',
-					'filter' => [
-						'Host groups' => 'Group to check Overview',
-						'Minimum severity' => 'Warning'
-					],
-					'result_hosts' => [
-						'1_Host_to_check_Monitoring_Overview', '3_Host_to_check_Monitoring_Overview'
-					],
-					'result_triggers' => [
-						'1_trigger_Warning', '1_trigger_Average', '1_trigger_High', '1_trigger_Disaster',
-						'3_trigger_Average'
-					]
-				]
-			],
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Group to check Overview',
-						'Minimum severity' => 'Average'
-					],
-					'result_hosts' => [
-						'1_Host_to_check_Monitoring_Overview', '3_Host_to_check_Monitoring_Overview'
-					],
-					'result_triggers' => [
-						'1_trigger_Average', '1_trigger_High', '1_trigger_Disaster', '3_trigger_Average'
-					]
-				]
-			],
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Group to check Overview',
-						'Minimum severity' => 'High'
-					],
-					'result_hosts' => [
-						'1_Host_to_check_Monitoring_Overview'
-					],
-					'result_triggers' => [
-						'1_trigger_High', '1_trigger_Disaster'
-					]
-				]
-			],
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Group to check Overview',
-						'Minimum severity' => 'Disaster'
-					],
-					'result_hosts' => [
-						'1_Host_to_check_Monitoring_Overview'
-					],
-					'result_triggers' => [
-						'1_trigger_Disaster'
-					]
-				]
-			],
-			// Name option in filter.
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Group to check Overview',
-						'Name' => 'Warning'
-					],
-					'result_hosts' => [
-						'1_Host_to_check_Monitoring_Overview'
-					],
-					'result_triggers' => [
-						'1_trigger_Warning'
-					]
-				]
-			],
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Group to check Overview',
-						'Name' => '2_'
-					],
-					'result_hosts' => [
-						'1_Host_to_check_Monitoring_Overview'
-					],
-					'result_triggers' => [
-						'2_trigger_Information'
-					]
-				]
-			],
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Group to check Overview',
-						'Name' => 'Trigger-map-test-zbx6840'
-					]
-				]
-			],
-			// Show unacknowledged only option in filter.
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Group to check Overview',
-						'Show unacknowledged only' => true
-					],
-					'result_hosts' => [
-						'1_Host_to_check_Monitoring_Overview'
-					],
-					'result_triggers' => [
-						'1_trigger_Not_classified', '1_trigger_Warning', '1_trigger_Average', '1_trigger_High',
-						'1_trigger_Disaster'
-					]
-				]
-			],
-			// Host inventory option in filter.
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Group to check Overview'
-					],
-					'inventories' => [
-						'inventory_field' => 'Notes',
-						'inventory_value' => 'Notes'
-					],
-					'result_hosts' => [
-						'3_Host_to_check_Monitoring_Overview'
-					],
-					'result_triggers' => [
-						'3_trigger_Average'
-					]
-				]
-			],
-			// Age less than option in filter.
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Group to check Overview'
-					],
-					'age' => '1'
-				]
-			],
-			// All filter options.
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Group to check Overview',
-						'Minimum severity' => 'Average',
-						'Show' => 'Any',
-						'Name' => '3_'
-					],
-					'tags' => [
-						['name' => 'DataBase', 'value' => 'Oracle', 'operator' => 'Equals']
-					],
-					'age' => '365',
-					'inventories' => [
-						'inventory_field' => 'Notes',
-						'inventory_value' => 'Notes'
-					],
-					'result_hosts' => [
-						'3_Host_to_check_Monitoring_Overview'
-					],
-					'result_triggers' => [
-						'3_trigger_Average', '3_trigger_Disaster'
-					]
-				]
-			],
-			// Triggers status option in filter.
-			// Make trigger in problem state.
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Group to check Overview',
-						'Show' => 'Recent problems'
-					],
-					'problem' => ['3_trigger_Disaster' => TRIGGER_VALUE_TRUE],
-					'result_hosts' => [
-						'1_Host_to_check_Monitoring_Overview', '3_Host_to_check_Monitoring_Overview'
-					],
-					'result_triggers' => [
-						'1_trigger_Average', '1_trigger_Disaster', '1_trigger_High', '1_trigger_Not_classified',
-						'1_trigger_Warning', '2_trigger_Information', '3_trigger_Average', '3_trigger_Disaster'
-					]
-				]
-			],
-			// This test case depends from previous case, trigger should be in problem state.
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Group to check Overview',
-						'Show' => 'Problems'
-					],
-					'result_hosts' => [
-						'1_Host_to_check_Monitoring_Overview', '3_Host_to_check_Monitoring_Overview'
-					],
-					'result_triggers' => [
-						'1_trigger_Average', '1_trigger_Disaster', '1_trigger_High', '1_trigger_Not_classified',
-						'1_trigger_Warning', '2_trigger_Information', '3_trigger_Average', '3_trigger_Disaster'
-					]
-				]
-			],
-			// Make trigger in resolved state.
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Group to check Overview',
-						'Show' => 'Problems'
-					],
-					'problem' => ['3_trigger_Disaster' => TRIGGER_VALUE_FALSE],
-					'result_hosts' => [
-						'1_Host_to_check_Monitoring_Overview', '3_Host_to_check_Monitoring_Overview'
-					],
-					'result_triggers' => [
-						'1_trigger_Average', '1_trigger_Disaster', '1_trigger_High', '1_trigger_Not_classified',
-						'1_trigger_Warning', '2_trigger_Information', '3_trigger_Average'
-					]
-				]
-			],
-			// This test case depends from previous case, trigger should be resolved.
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Group to check Overview',
-						'Show' => 'Recent problems'
-					],
-					'result_hosts' => [
-						'1_Host_to_check_Monitoring_Overview', '3_Host_to_check_Monitoring_Overview'
-					],
-					'result_triggers' => [
-						'1_trigger_Average', '1_trigger_Disaster', '1_trigger_High', '1_trigger_Not_classified',
-						'1_trigger_Warning', '2_trigger_Information', '3_trigger_Average', '3_trigger_Disaster'
-					]
-				]
-			],
-			// Overview check with type 'Data'.
-			[
-				[
-					'general_filter' => 'Data overview',
-					'view_style' => 'Top',
-					'filter' => [
-						'Host groups' => 'Another group to check Overview'
-					],
-					'result_hosts' => [
-						'4_Host_to_check_Monitoring_Overview'
-					],
-					'result_items' => [
-						'4_item'
-					]
-				]
-			],
-			[
-				[
-					'general_filter' => 'Data overview',
-					'view_style' => 'Left',
-					'filter' => [
-						'Host groups' => 'Group to check Overview'
-					],
-					'result_hosts' => [
-						'1_Host_to_check_Monitoring_Overview', '3_Host_to_check_Monitoring_Overview'
-					],
-					'result_items' => [
-						'1_item', '2_item', '3_item'
-					]
-				]
-			],
-			[
-				[
-					'general_filter' => 'Data overview',
-					'filter' => [
-						'Host groups' => 'Group to check Overview'
-					],
-					'tags' => [
-						['name' => 'DataBase', 'value' => 'mysql', 'operator' => 'Contains']
-					],
-					'result_hosts' => [
-						'1_Host_to_check_Monitoring_Overview'
-					],
-					'result_items' => [
-						'1_item'
-					]
-				]
-			],
-			[
-				[
-					'general_filter' => 'Data overview',
-					'tags' => [
-						['name' => 'DataBase', 'value' => 'Oracle', 'operator' => 'Equals']
-					],
-					'result_hosts' => [
-						'3_Host_to_check_Monitoring_Overview'
-					],
-					'result_items' => [
-						'3_item'
-					]
-				]
-			],
-			// Show suppressed problems with type Triggers.
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Host group for suppression',
-						'Show suppressed problems' => true
-					],
-					'result_hosts' => [
-						'Host for suppression'
-					],
-					'result_triggers' => [
-						'Trigger_for_suppression'
-					]
-				]
-			],
-			// Do not show suppressed problems with type Triggers.
-			[
-				[
-					'general_filter' => 'Trigger overview',
-					'filter' => [
-						'Host groups' => 'Host group for suppression'
-					]
-				]
-			],
-			// Check suppressed problems with type Data.
-			[
-				[
-					'general_filter' => 'Data overview',
-					'filter' => [
-						'Host groups' => 'Host group for suppression',
-						'Show suppressed problems' => true
-					],
-					'result_hosts' => [
-						'Host for suppression'
-					],
-					'result_items' => [
-						'Trapper_for_suppression'
-					]
-				]
-			],
-			[
-				[
-					'general_filter' => 'Data overview',
-					'filter' => [
-						'Host groups' => 'Host group for suppression'
-					],
-					'result_hosts' => [
-						'Host for suppression'
-					],
-					'result_items' => [
-						'Trapper_for_suppression'
-					]
-				]
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider getFilterData
-	 */
-	public function testPageOverview_CheckFilterResults($data) {
-		$this->zbxTestLogin('overview.php');
-		$this->zbxTestClickButtonText('Reset');
-		$this->zbxTestWaitForPageToLoad();
-
-		$this->query('id:page-title-general')->asPopupButton()->one()->select($data['general_filter']);
-
-		// Main filter options.
-		if (array_key_exists('view_style', $data)) {
-			$view_style = $data['view_style'];
-			$this->zbxTestDropdownSelectWait('view_style', $view_style);
-			$this->zbxTestWaitForPageToLoad();
-		}
-		else {
-			$view_style = $this->zbxTestGetSelectedLabel('view_style');
-		}
-		$filter = $this->query('name:zbx_filter')->asForm()->one();
-		$filter->query('button:Reset')->one()->click();
-		$filter->fill(CTestArrayHelper::get($data, 'filter', []));
-		$this->setTags(CTestArrayHelper::get($data, 'tags', []));
-
-		if (array_key_exists('age', $data)) {
-			$this->zbxTestCheckboxSelect('status_change');
-			$this->zbxTestInputTypeOverwrite('status_change_days', $data['age']);
-		}
-
-		if (array_key_exists('inventories', $data)) {
-			foreach ($data['inventories'] as $key => $value) {
-				switch ($key) {
-					case 'inventory_field':
-						$this->zbxTestDropdownSelect('inventory[0][field]', $value);
-						break;
-					case 'inventory_value':
-						$this->zbxTestInputType('inventory_0_value', $value);
-						break;
-				}
-			}
-		}
-
-		// Make trigger in problem or resolved state.
-		if (array_key_exists('problem', $data)) {
-			foreach ($data['problem'] as $trigger => $state) {
-				CDBHelper::setTriggerProblem($trigger, $state);
-			}
-		}
-
-		// Wait till table id will change after filter apply.
-		$tabel_id = $this->zbxTestGetAttributeValue('//table[@class="list-table"]', 'id');
-		$this->zbxTestClickButtonText('Apply');
-		$this->zbxTestWaitForPageToLoad();
-		$this->zbxTestWaitUntilElementPresent(WebDriverBy::xpath('//table[@class="list-table"][not(@id="'.$tabel_id.'")]'));
-
-		// Check  the result in frontend.
-		$this->zbxTestCheckHeader($data['general_filter']);
-		$this->zbxTestDropdownAssertSelected('view_style', $view_style);
-		if (!array_key_exists('result_hosts', $data)) {
-			$this->zbxTestWaitUntilElementVisible(WebDriverBy::xpath('//tr[@class="nothing-to-show"]'));
-			$this->zbxTestAssertElementPresentXpath('//tr[@class="nothing-to-show"]/td[text()="No data found."]');
-		}
-		elseif ($data['general_filter'] === 'Trigger overview') {
-			// Check output for host location as 'Top'.
-			if ($view_style === 'Top') {
-				$this->zbxTestAssertElementPresentXpath('//th[text()="Triggers"]');
-				$this->checkResultsInTable($view_style, $data['result_hosts'], $data['result_triggers']);
-			}
-			// Check output for host location as 'Left'.
-			else {
-				$this->zbxTestAssertElementPresentXpath('//th[text()="Hosts"]');
-				$this->checkResultsInTable($view_style, $data['result_triggers'], $data['result_hosts']);
-			}
-		}
-		elseif ($data['general_filter'] === 'Data overview') {
-			if ($view_style === 'Top') {
-				$this->zbxTestAssertElementPresentXpath('//th[text()="Items"]');
-				$this->checkResultsInTable($view_style, $data['result_hosts'], $data['result_items']);
-			}
-			else {
-				$this->zbxTestAssertElementPresentXpath('//th[text()="Hosts"]');
-				$this->checkResultsInTable($view_style, $data['result_items'], $data['result_hosts']);
-			}
-
-			// Suppressed trigger contains background color.
-			if (CTestArrayHelper::get($data, 'filter.Show suppressed problems')) {
-				$this->zbxTestAssertElementPresentXpath('//table[@class="list-table"]//td[contains(@class, "-bg")]');
-			}
-		}
-	}
-
-	private function checkResultsInTable($location, $thead, $tbody) {
-		foreach ($thead as $column) {
-			$this->zbxTestAssertElementPresentXpath('//th//div[@class="vertical_rotation_inner"][text()="'.$column.'"]');
-		}
-		foreach ($tbody as $row) {
-			if ($location === 'Top') {
-				$this->zbxTestAssertElementPresentXpath('//table[@class="list-table"]//th[1][text()="'.$row.'"]');
-			}
-			else {
-				$this->zbxTestAssertElementPresentXpath('//table[@class="list-table"]//th[1]/a[text()="'.$row.'"]');
-			}
-		}
-
-		// Count rows and columns to compare with expected number of results.
-		$columns = $this->webDriver->findElements(WebDriverBy::xpath('//th//div[@class="vertical_rotation_inner"]'));
-		$rows = $this->webDriver->findElements(WebDriverBy::xpath('//table[@class="list-table"]//tbody//th[@class="nowrap"]'));
-		$this->assertEquals(count($thead), count($columns));
-		$this->assertEquals(count($tbody), count($rows));
-	}
-
-	public function getMenuPopup() {
-		return [
-			[
-				[
-					'type' => 'Trigger overview',
-					'links' => [
-						'zabbix.php?action=problem.view&filter_name=&triggerids',
-						'triggers.php?form=update&triggerid',
-						'action=showgraph&itemid'
-					],
-					'links_text' => [
-						'Problems',
-						'Acknowledge',
-						'Configuration',
-						'Trigger URL',
-						'Webhook url for all',
-						'1_item'
-					]
-				]
-			],
-			[
-				[
-					'type' => 'Data overview',
-					'links' => [
-						'action=showgraph&to=now&from=now-1h',
-						'action=showgraph&to=now&from=now-7d',
-						'action=showgraph&to=now&from=now-1M',
-						'action=showvalues&to=now&from=now-1h'
-					],
-					'links_text' => ['Last hour graph', 'Last week graph', 'Last month graph', 'Latest values']
-				]
-			]
-		];
-	}
-
-	/**
-	 * @dataProvider getMenuPopup
-	 */
-	public function testPageOverview_MenuPopupLinks($data) {
-		$this->zbxTestLogin('overview.php?type=0');
-		$this->zbxTestCheckHeader('Trigger overview');
-		$this->query('button:Reset')->one()->click();
-		// Select group and type, then open context menu.
-		$this->query('id:page-title-general')->asPopupButton()->one()->select($data['type']);
-		$this->zbxTestWaitForPageToLoad();
-		$this->zbxTestCheckHeader($data['type']);
-		$this->zbxTestClickXpathWait('//tbody//td[contains(@class, "cursor-pointer")]');
-		$this->zbxTestWaitUntilElementPresent(WebDriverBy::xpath('//ul[contains(@class, "menu-popup")]//a'));
-
-		// Check context menu links text and url.
-		$this->zbxTestAssertElementPresentXpath('//ul[contains(@class, "menu-popup")]//h3[text()="History"]');
-		if ($data['type'] === 'Triggers') {
-			$this->zbxTestAssertElementPresentXpath('//ul[contains(@class, "menu-popup")]//h3[text()="Trigger"]');
-		}
-
-		$get_links_text = [];
-		$elements = $this->webDriver->findElements(WebDriverBy::xpath('//ul[contains(@class, "menu-popup")]//a'));
-		foreach ($elements as $element) {
-			$get_links_text[] = $element->getText();
-		}
-		$this->assertEquals($data['links_text'], $get_links_text);
-
-		foreach ($data['links'] as $link) {
-			$this->zbxTestAssertElementPresentXpath('//ul[contains(@class, "menu-popup")]//a[contains(@href, "'.$link.'")]');
-		}
-	}
-
-	public function testPageOverview_FullScreenKioskMode() {
-		try {
-			$this->zbxTestLogin('overview.php?type=0');
-			$this->zbxTestCheckHeader('Trigger overview');
-			$this->zbxTestAssertElementPresentXpath("//header");
-			$this->zbxTestAssertAttribute("//button[contains(@class, 'btn-kiosk')]", 'title', 'Kiosk mode');
-			$this->zbxTestClickXpathWait("//button[contains(@class, 'btn-kiosk')]");
-			$this->zbxTestWaitForPageToLoad();
-			$this->zbxTestWaitUntilElementPresent(WebDriverBy::xpath('//button[@title="Normal view"]'));
-			$this->zbxTestAssertElementNotPresentXpath("//header");
-			$this->zbxTestAssertElementNotPresentXpath("//div[@class='header-title']");
-			$this->zbxTestAssertAttribute("//button[contains(@class, 'btn-min')]", 'title', 'Normal view');
-
-			$this->query('class:btn-min')->one()->forceClick();
-			$this->zbxTestWaitForPageToLoad();
-			$this->zbxTestWaitUntilElementPresent(WebDriverBy::xpath("//button[contains(@class, 'btn-kiosk')]"));
-			$this->zbxTestAssertAttribute("//button[contains(@class, 'btn-kiosk')]", 'title', 'Kiosk mode');
-			$this->zbxTestAssertElementPresentXpath("//header");
-			$this->zbxTestAssertElementPresentXpath("//header[@class='header-title']");
-		}
-		catch (Exception $e) {
-			// Reset fullscreen/kiosk mode.
-			$this->zbxTestLogin('overview.php?fullscreen=0');
-			$this->zbxTestCheckHeader('Trigger overview');
-			throw $e;
-		}
-	}
-}
diff --git a/ui/tests/selenium/testPageReportsAudit.php b/ui/tests/selenium/testPageReportsAudit.php
index 203e060b475..583f224705e 100644
--- a/ui/tests/selenium/testPageReportsAudit.php
+++ b/ui/tests/selenium/testPageReportsAudit.php
@@ -31,6 +31,7 @@ class testPageReportsAudit extends CLegacyWebTest {
 		2 /* CAudit::ACTION_DELETE */ => 'Delete',
 		7 /* CAudit::ACTION_EXECUTE */ => 'Execute',
 		9 /* CAudit::ACTION_LOGIN_FAILED */ => 'Failed login',
+		10 /* CAudit::ACTION_HISTORY_CLEAR */ => 'History clear',
 		8 /* CAudit::ACTION_LOGIN_SUCCESS */ => 'Login',
 		4 /* CAudit::ACTION_LOGOUT */ => 'Logout',
 		1 /* CAudit::ACTION_UPDATE */ => 'Update'
@@ -88,7 +89,7 @@ class testPageReportsAudit extends CLegacyWebTest {
 
 	public static function auditActions() {
 		return [
-			['action' => 3 /* CAudit::ACTION_LOGIN */, 'resourcetype' => 0 /* CAudit::RESOURCE_USER */],
+			['action' => 8 /* CAudit::ACTION_LOGIN */, 'resourcetype' => 0 /* CAudit::RESOURCE_USER */],
 			['action' => 4 /* CAudit::ACTION_LOGOUT */, 'resourcetype' => 0 /* CAudit::RESOURCE_USER */],
 			['action' => 0 /* CAudit::ACTION_ADD */, 'resourcetype' => 0 /* CAudit::RESOURCE_USER */],
 			['action' => 1 /* CAudit::ACTION_UPDATE */, 'resourcetype' => 0 /* CAudit::RESOURCE_USER */],
@@ -187,29 +188,33 @@ class testPageReportsAudit extends CLegacyWebTest {
 
 				case 'Discovery rule':
 				case 'Host':
-					$this->assertEquals(['Execute', 'Failed login', 'Login', 'Logout'], $disabled);
+					$this->assertEquals(['Execute', 'Failed login','History clear', 'Login', 'Logout'], $disabled);
 					break;
 
+				case 'Image':
 				case 'Event correlation':
-					$this->assertEquals(['All', 'Delete'], $enabled);
+					$this->assertEquals(['All', 'Add', 'Delete', 'Update'], $enabled);
 					break;
 
 				case 'Housekeeping':
-				case 'Image':
 				case 'Settings':
 					$this->assertEquals(['All', 'Update'], $enabled);
 					break;
 
 				case 'Script':
-					$this->assertEquals(['Failed login', 'Login', 'Logout'], $disabled);
+					$this->assertEquals(['Failed login', 'History clear', 'Login', 'Logout'], $disabled);
 					break;
 
 				case 'User':
-					$this->assertEquals(['Execute'], $disabled);
+					$this->assertEquals(['Execute', 'History clear'], $disabled);
 					break;
 
-				default:
+				case 'Item':
 					$this->assertEquals(['Execute', 'Failed login', 'Login', 'Logout'], $disabled);
+					break;
+
+				default:
+					$this->assertEquals(['Execute', 'Failed login', 'History clear', 'Login', 'Logout'], $disabled);
 			}
 		}
 	}
@@ -237,8 +242,11 @@ class testPageReportsAudit extends CLegacyWebTest {
 		$this->assertEquals('Macros updated', $message->getTitle());
 
 		// Check Audit record about global macro update.
-		$this->page->open('zabbix.php?action=auditlog.list');
-		$this->query('button:Reset')->waitUntilVisible()->one()->click();
+		// TODO after ZBX-19918 fix: remove line with long auditlog link and uncomment 2 lines below.
+//		$this->page->open('zabbix.php?action=auditlog.list');
+//		$this->query('button:Reset')->waitUntilVisible()->one()->click();
+		$this->page->open('zabbix.php?action=auditlog.list&from=now-1h&to=now&filter_resourcetype='.
+				'-1&filter_resourceid=11&filter_action=-1&filter_recordsetid=&filter_set=1');
 		$rows = $this->query('class:list-table')->asTable()->one()->getRows();
 		// Get first row data.
 		$row = $rows->get(0);
diff --git a/ui/tests/selenium/testPageTemplates.php b/ui/tests/selenium/testPageTemplates.php
index cb9a2d82caf..467996c2cf2 100644
--- a/ui/tests/selenium/testPageTemplates.php
+++ b/ui/tests/selenium/testPageTemplates.php
@@ -67,6 +67,11 @@ class testPageTemplates extends CLegacyWebTest {
 	 * @dataProvider allTemplates
 	 */
 	public function testPageTemplates_SimpleUpdate($template) {
+		// TODO: Remove the below if condition along with its content when ZBX-20020 is merged
+		if ($template['name'] === 'Cisco UCS Manager SNMP') {
+			return;
+		}
+
 		$host = $template['host'];
 		$name = $template['name'];
 
diff --git a/ui/tests/selenium/testPageTriggerUrl.php b/ui/tests/selenium/testPageTriggerUrl.php
index 3578ab1b87b..fda65e7a0b6 100644
--- a/ui/tests/selenium/testPageTriggerUrl.php
+++ b/ui/tests/selenium/testPageTriggerUrl.php
@@ -105,91 +105,10 @@ class testPageTriggerUrl extends CWebTest {
 		$this->checkTriggerUrl(false, $data);
 	}
 
-	/**
-	 * @dataProvider getTriggerLinkData
-	 * Check trigger url on Overview page.
-	 */
-	public function testPageTriggerUrl_OverviewPage($data) {
-		$this->page->login()->open('overview.php');
-
-		$table = $this->query('class:list-table')->asTable()->one();
-		// Get row of trigger "1_trigger_Not_classified".
-		$row = $table->findRow('Triggers', $data['trigger']);
-
-		// Open trigger context menu.
-		$row->query('xpath://td[contains(@class, "'.$data['background'].'")]')->one()->click();
-		$this->checkTriggerUrl(true, $data);
-	}
-
-	/**
-	 * Check resolved trigger context menu on overview page, when {EVENT.ID} macro can't be resolved.
-	 *
-	 * @onAfter resetFilter
-	 */
-	public function testPageTriggerUrl_OverviewPageResolvedTrigger() {
-		$filter = [
-			'Show' => 'Any',
-			'Name' => '1_trigger_Average'
-		];
-
-		// Make trigger in resolved state.
-		CDBHelper::setTriggerProblem($filter['Name'], TRIGGER_VALUE_FALSE);
-		$this->page->login()->open('overview.php');
-		// Apply filter options.
-		$form = $this->query('xpath://form[@name="zbx_filter"]')->asForm()->one();
-		$form->fill($filter);
-		$form->submit();
-		$this->page->waitUntilReady();
-
-		$table = $this->query('class:list-table')->asTable()->one();
-		// Get row of trigger "1_trigger_Average".
-		$row = $table->findRow('Triggers', '1_trigger_Average');
-
-		// Open trigger context menu.
-		$row->query('xpath://td[contains(@class, "normal-bg")]')->one()->click();
-		$popup = CPopupMenuElement::find()->waitUntilVisible()->one();
-
-		// Make sure trigger url not visible, when EVENT.ID macro can't be resolved.
-		$this->assertEquals(['TRIGGER', 'HISTORY'], $popup->getTitles()->asText());
-	}
-
 	public function resetFilter() {
 		DBexecute('DELETE FROM profiles WHERE idx LIKE \'%web.overview.filter%\'');
 	}
 
-	/*
-	 * Check resolved trigger context menu on overview page, if trigger url without {EVENT.ID} macro.
-	 */
-	public function testPageTriggerUrl_OverviewPageTriggerWithoutEventId() {
-		$url = 'triggers.php?form=update&triggerid=100039&context=host';
-		$filter = [
-			'Show' => 'Any',
-			'Name' => '3_trigger_Disaster'
-		];
-
-		$this->page->login()->open('overview.php');
-		// Apply filter options.
-		$form = $this->query('xpath://form[@name="zbx_filter"]')->asForm()->one();
-		$form->fill($filter);
-		$form->submit();
-		$this->page->waitUntilReady();
-
-		$table = $this->query('class:list-table')->asTable()->one();
-		// Get row of trigger "3_trigger_Disaster".
-		$row = $table->findRow('Triggers', '3_trigger_Disaster');
-
-		// Open trigger context menu.
-		$row->query('xpath://td[contains(@class, "normal-bg")]')->one()->click();
-		$popup = CPopupMenuElement::find()->waitUntilVisible()->one();
-
-		// Make sure trigger url is visible.
-		$this->assertTrue($popup->hasTitles(['TRIGGER', 'LINKS', 'HISTORY']));
-		$popup->fill('Trigger URL');
-		// Check opened page.
-		$this->assertEquals('Triggers', $this->query('tag:h1')->waitUntilVisible()->one()->getText());
-		$this->assertContains($url, $this->page->getCurrentUrl());
-	}
-
 	/**
 	 * @dataProvider getTriggerLinkData
 	 * Check trigger url on Event details page.
diff --git a/ui/tests/selenium/testSidebarMenu.php b/ui/tests/selenium/testSidebarMenu.php
index a1b51b38c7b..6e444897586 100644
--- a/ui/tests/selenium/testSidebarMenu.php
+++ b/ui/tests/selenium/testSidebarMenu.php
@@ -44,17 +44,6 @@ class testSidebarMenu extends CWebTest {
 			[
 				[
 					'section' => 'Monitoring',
-					'page' => 'Overview',
-					'third_level' =>
-					[
-						'Trigger overview',
-						'Data overview'
-					]
-				]
-			],
-			[
-				[
-					'section' => 'Monitoring',
 					'page' => 'Latest data'
 				]
 			],
@@ -348,7 +337,7 @@ class testSidebarMenu extends CWebTest {
 			// Checking that collapsed, hidden sidemenu appears on clicking.
 			$this->query('xpath://aside[@class="sidebar is-'.$view.' is-opened"]')->one()->waitUntilVisible();
 
-			// Returning standart sidemenu view clicking on unhide, expand button.
+			// Returning standard sidemenu view clicking on unhide, expand button.
 			$this->query('button', $unhide)->one()->waitUntilClickable()->click();
 			$this->assertTrue($this->query('class:sidebar')->one()->isVisible());
 		}
diff --git a/ui/tests/selenium/testTimezone.php b/ui/tests/selenium/testTimezone.php
index 87632337778..0867b06b55c 100644
--- a/ui/tests/selenium/testTimezone.php
+++ b/ui/tests/selenium/testTimezone.php
@@ -91,7 +91,7 @@ class testTimezone extends CWebTest {
 	 * @dataProvider getUserSettingsData
 	 *
 	 * Change timezones for user, from user setting. Check that time for user displayed correctly according
-	 * to choosed timezone.
+	 * to chosen timezone.
 	 */
 	public function testTimezone_UserSettings($data) {
 		// Set system timezone.
@@ -184,7 +184,7 @@ class testTimezone extends CWebTest {
 	 * @dataProvider getCreateUsersData
 	 *
 	 * Create users with different timezones and check that time displayed for them correctly, according
-	 * to choosed timezone.
+	 * to chosen timezone.
 	 */
 	public function testTimezone_CreateUsers($data) {
 		$this->page->userLogin('Admin', 'zabbix');
diff --git a/ui/tests/selenium/testUrlParameters.php b/ui/tests/selenium/testUrlParameters.php
index 3ec99af792f..f2893de433d 100644
--- a/ui/tests/selenium/testUrlParameters.php
+++ b/ui/tests/selenium/testUrlParameters.php
@@ -382,41 +382,6 @@ class testUrlParameters extends CLegacyWebTest {
 				]
 			],
 			[
-				'title' => 'Overview [refreshed every 30 sec.]',
-				'check_server_name' => true,
-				'server_name_on_page' => true,
-				'test_cases' => [
-					[
-						'url' => 'overview.php?groupid=4&type=0',
-						'text_present' => 'Overview'
-					],
-					[
-						'url' => 'overview.php?groupid=abc&type=abc',
-						'text_not_present' => 'Overview',
-						'text_present' => [
-							'Zabbix has received an incorrect request.',
-							'Field "type" is not integer.'
-						]
-					],
-					[
-						'url' => 'overview.php?groupid=&type=',
-						'text_not_present' => 'Overview',
-						'text_present' => [
-							'Zabbix has received an incorrect request.',
-							'Field "type" is not integer.'
-						]
-					],
-					[
-						'url' => 'overview.php?groupid=-1&type=-1',
-						'text_not_present' => 'Overview',
-						'text_present' => [
-							'Zabbix has received an incorrect request.',
-							'Incorrect value "-1" for "type" field.'
-						]
-					]
-				]
-			],
-			[
 				'title' => 'Details of web scenario',
 				'check_server_name' => true,
 				'server_name_on_page' => true,
diff --git a/ui/tests/selenium/testUrlUserPermissions.php b/ui/tests/selenium/testUrlUserPermissions.php
index 4b59d668c43..f6731964525 100644
--- a/ui/tests/selenium/testUrlUserPermissions.php
+++ b/ui/tests/selenium/testUrlUserPermissions.php
@@ -50,26 +50,6 @@ class testUrlUserPermissions extends CLegacyWebTest {
 				]
 			]],
 			[[
-				'url' => 'overview.php',
-				'title' =>	'Overview [refreshed every 30 sec.]',
-				'header' =>	'Trigger overview',
-				'users' => [
-					'guest' => true,
-					'user-zabbix' => true,
-					'admin-zabbix' => true
-				]
-			]],
-			[[
-				'url' => 'overview.php?form_refresh=1&groupid=0&type=0&view_style=0',
-				'title' =>	'Overview [refreshed every 30 sec.]',
-				'header' =>	'Trigger overview',
-				'users' => [
-					'guest' => true,
-					'user-zabbix' => true,
-					'admin-zabbix' => true
-				]
-			]],
-			[[
 				'url' => 'zabbix.php?action=web.view',
 				'title' =>	'Web monitoring',
 				'header' =>	'Web monitoring',
diff --git a/ui/tests/selenium/users/testFormUser.php b/ui/tests/selenium/users/testFormUser.php
index f30dcfe924e..d1388601a44 100644
--- a/ui/tests/selenium/users/testFormUser.php
+++ b/ui/tests/selenium/users/testFormUser.php
@@ -1008,7 +1008,7 @@ class testFormUser extends CWebTest {
 		try {
 			$this->page->logout();
 
-			// Atempt to sign in with old password.
+			// Attempt to sign in with old password.
 			$this->page->userLogin($data['username'],$data['old_password']);
 			$message = $this->query('class:red')->one()->getText();
 			$this->assertEquals($message, $data['error_message']);
diff --git a/ui/tests/selenium/users/testFormUserMedia.php b/ui/tests/selenium/users/testFormUserMedia.php
index 949d3d244e4..d99f4f8a4c4 100644
--- a/ui/tests/selenium/users/testFormUserMedia.php
+++ b/ui/tests/selenium/users/testFormUserMedia.php
@@ -241,7 +241,7 @@ class testFormUserMedia extends CWebTest {
 					'error_message' => 'Incorrect value for field "period": a time period is expected'
 				]
 			],
-			// When active value is set to a speciffic moment.
+			// When active value is set to a specific moment.
 			[
 				[
 					'expected' => TEST_BAD,
diff --git a/ui/tests/selenium/users/testFormUserPermissions.php b/ui/tests/selenium/users/testFormUserPermissions.php
index e110ce76d42..f36da155341 100644
--- a/ui/tests/selenium/users/testFormUserPermissions.php
+++ b/ui/tests/selenium/users/testFormUserPermissions.php
@@ -289,11 +289,11 @@ class testFormUserPermissions extends CWebTest {
 		$form->checkValue($data['before']);
 
 		$this->page->open('zabbix.php?action=userrole.edit&roleid='.self::$admin_roleid);
-		$fluid_form = $this->query('id:userrole-form')->waitUntilPresent()->asFluidForm()->one();
+		$role_form = $this->query('id:userrole-form')->waitUntilPresent()->asForm()->one();
 
 		$update_field = (array_key_exists('User type', $data['before'])) ? $data['after'] : $data['change'];
-		$fluid_form->fill($update_field);
-		$fluid_form->submit();
+		$role_form->fill($update_field);
+		$role_form->submit();
 
 		$this->page->open('zabbix.php?action=user.edit&userid='.self::$admin_user);
 		$form->selectTab('Permissions');
@@ -320,7 +320,7 @@ class testFormUserPermissions extends CWebTest {
 			// Select UI elements from $fields. Other elements from report, will be disabled.
 			if ($status === 'status-green') {
 				$this->page->open('zabbix.php?action=userrole.edit&roleid='.self::$admin_roleid);
-				$form = $this->query('id:userrole-form')->waitUntilPresent()->asFluidForm()->one();
+				$form = $this->query('id:userrole-form')->waitUntilPresent()->asForm()->one();
 				$form->fill($fields);
 				$form->submit();
 				$this->page->open('zabbix.php?action=user.edit&userid='.self::$admin_user);
@@ -368,7 +368,7 @@ class testFormUserPermissions extends CWebTest {
 
 					// User role page.
 					$this->page->open('zabbix.php?action=userrole.edit&roleid='.self::$admin_roleid);
-					$form = $this->query('id:userrole-form')->waitUntilPresent()->asFluidForm()->one();
+					$form = $this->query('id:userrole-form')->waitUntilPresent()->asForm()->one();
 
 					// API gets disabled.
 					if ($api_status_field === 'Disabled') {
@@ -377,9 +377,8 @@ class testFormUserPermissions extends CWebTest {
 					else {
 						// Change Deny to Allow list and add request. Now they became green on permission page.
 						$form->fill(['API methods' => 'Allow list']);
-						$form->waitUntilReady();
-						$this->query('xpath:(//div[@class="multiselect-control"])[3]')->asMultiselect()
-								->one()->fill(['host.create', 'host.delete']);
+						$this->query('xpath:(//div[@class="multiselect-control"])[3]')->asMultiselect()->one()
+								->setFillMode(CMultiselectElement::MODE_SELECT_MULTIPLE)->fill(['host.create', 'host.delete']);
 					}
 					$form->submit();
 					$this->page->open('zabbix.php?action=user.edit&userid='.self::$admin_user);
@@ -465,7 +464,7 @@ class testFormUserPermissions extends CWebTest {
 			if ($enable_modules) {
 				$this->assertEquals('status-green', $this->query($selector.'"4"]')->one()->getAttribute('class'));
 				$this->page->open('zabbix.php?action=userrole.edit&roleid='.self::$admin_roleid);
-				$form = $this->query('id:userrole-form')->waitUntilPresent()->asFluidForm()->one();
+				$form = $this->query('id:userrole-form')->waitUntilPresent()->asForm()->one();
 				$form->getField('4th Module')->uncheck();
 				$form->submit();
 			}
diff --git a/ui/tests/unit/include/classes/import/CImportDataAdapterTest.php b/ui/tests/unit/include/classes/import/CImportDataAdapterTest.php
index a17a070dd4c..015a848eacc 100644
--- a/ui/tests/unit/include/classes/import/CImportDataAdapterTest.php
+++ b/ui/tests/unit/include/classes/import/CImportDataAdapterTest.php
@@ -1913,22 +1913,34 @@ class CImportDataAdapterTest extends TestCase {
 				'smtp_server' => 'mail.example.com',
 				'smtp_helo' => 'example.com',
 				'smtp_email' => 'zabbix@example.com',
-				'parameters' => ''
+				'parameters' => []
 			] + $defaults,
 			[
-				'name' => 'Script',
+				'name' => 'Script without parameters',
 				'type' => (string) CXmlConstantValue::MEDIA_TYPE_SCRIPT,
 				'exec_path' => 'script.sh',
 				'exec_params' => ''
 			] + $defaults,
 			[
+				'name' => 'Script with parameters',
+				'type' => (string) CXmlConstantValue::MEDIA_TYPE_SCRIPT,
+				'exec_path' => 'script.sh',
+				'exec_params' => "100\n200\n300\n"
+			] + $defaults,
+			[
 				'name' => 'SMS',
 				'type' => (string) CXmlConstantValue::MEDIA_TYPE_SMS,
 				'gsm_modem' => '/dev/ttyS0',
-				'parameters' => ''
+				'parameters' => []
+			] + $defaults,
+			[
+				'name' => 'Webhook without parameters',
+				'type' => (string) CXmlConstantValue::MEDIA_TYPE_WEBHOOK,
+				'parameters' => [],
+				'script' => 'return true;'
 			] + $defaults,
 			[
-				'name' => 'Webhook',
+				'name' => 'Webhook with parameters',
 				'type' => (string) CXmlConstantValue::MEDIA_TYPE_WEBHOOK,
 				'parameters' => [
 					[
@@ -4271,7 +4283,7 @@ class CImportDataAdapterTest extends TestCase {
 			->setStrict(true)
 			->validate($source, '/');
 
-		foreach (['1.0', '2.0', '3.0', '3.2', '3.4', '4.0', '4.2', '4.4', '5.0', '5.2'] as $version) {
+		foreach (['1.0', '2.0', '3.0', '3.2', '3.4', '4.0', '4.2', '4.4', '5.0', '5.2', '5.4'] as $version) {
 			if ($source['zabbix_export']['version'] !== $version) {
 				continue;
 			}
diff --git a/ui/tests/unit/include/classes/import/xml/mediatype.xml b/ui/tests/unit/include/classes/import/xml/mediatype.xml
index 48d4315f4e9..1eeed0817a9 100644
--- a/ui/tests/unit/include/classes/import/xml/mediatype.xml
+++ b/ui/tests/unit/include/classes/import/xml/mediatype.xml
@@ -11,17 +11,32 @@
 			<smtp_email>zabbix@example.com</smtp_email>
 		</media_type>
 		<media_type>
-			<name>Script</name>
+			<name>Script without parameters</name>
 			<type>SCRIPT</type>
 			<script_name>script.sh</script_name>
 		</media_type>
 		<media_type>
+			<name>Script with parameters</name>
+			<type>SCRIPT</type>
+			<script_name>script.sh</script_name>
+			<parameters>
+				<parameter>100</parameter>
+				<parameter>200</parameter>
+				<parameter>300</parameter>
+			</parameters>
+		</media_type>
+		<media_type>
 			<name>SMS</name>
 			<type>SMS</type>
 			<gsm_modem>/dev/ttyS0</gsm_modem>
 		</media_type>
 		<media_type>
-			<name>Webhook</name>
+			<name>Webhook without parameters</name>
+			<type>WEBHOOK</type>
+			<script>return true;</script>
+		</media_type>
+		<media_type>
+			<name>Webhook with parameters</name>
 			<type>WEBHOOK</type>
 			<parameters>
 				<parameter>
diff --git a/ui/tests/unit/include/classes/validators/CApiInputValidatorTest.php b/ui/tests/unit/include/classes/validators/CApiInputValidatorTest.php
index 90f21bee816..bb3cd3eb561 100644
--- a/ui/tests/unit/include/classes/validators/CApiInputValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CApiInputValidatorTest.php
@@ -202,6 +202,104 @@ class CApiInputValidatorTest extends TestCase {
 				'Invalid parameter "/1/color": invalid byte sequence in UTF-8.'
 			],
 			[
+				['type' => API_COND_FORMULA],
+				'A and B',
+				'/1/formula',
+				'A and B'
+			],
+			[
+				['type' => API_COND_FORMULA],
+				'(A and B) or C',
+				'/1/formula',
+				'(A and B) or C'
+			],
+			[
+				['type' => API_COND_FORMULA],
+				'A and',
+				'/1/formula',
+				'Invalid parameter "/1/formula": check expression starting from "d".'
+			],
+			[
+				['type' => API_COND_FORMULA],
+				'',
+				'/1/formula',
+				'Invalid parameter "/1/formula": cannot be empty.'
+			],
+			[
+				['type' => API_COND_FORMULA],
+				[],
+				'/1/formula',
+				'Invalid parameter "/1/formula": a character string is expected.'
+			],
+			[
+				['type' => API_COND_FORMULA],
+				true,
+				'/1/formula',
+				'Invalid parameter "/1/formula": a character string is expected.'
+			],
+			[
+				['type' => API_COND_FORMULA],
+				null,
+				'/1/formula',
+				'Invalid parameter "/1/formula": a character string is expected.'
+			],
+			[
+				['type' => API_COND_FORMULA],
+				// broken UTF-8 byte sequence
+				"\xd1".'12345',
+				'/1/formula',
+				'Invalid parameter "/1/formula": invalid byte sequence in UTF-8.'
+			],
+			[
+				['type' => API_COND_FORMULAID],
+				'A',
+				'/1/formulaid',
+				'A'
+			],
+			[
+				['type' => API_COND_FORMULAID],
+				'ABCD',
+				'/1/formulaid',
+				'ABCD'
+			],
+			[
+				['type' => API_COND_FORMULAID],
+				'Ab',
+				'/1/formulaid',
+				'Invalid parameter "/1/formulaid": uppercase identifier expected.'
+			],
+			[
+				['type' => API_COND_FORMULAID],
+				'',
+				'/1/formulaid',
+				'Invalid parameter "/1/formulaid": cannot be empty.'
+			],
+			[
+				['type' => API_COND_FORMULAID],
+				[],
+				'/1/formulaid',
+				'Invalid parameter "/1/formulaid": a character string is expected.'
+			],
+			[
+				['type' => API_COND_FORMULAID],
+				true,
+				'/1/formulaid',
+				'Invalid parameter "/1/formulaid": a character string is expected.'
+			],
+			[
+				['type' => API_COND_FORMULAID],
+				null,
+				'/1/formulaid',
+				'Invalid parameter "/1/formulaid": a character string is expected.'
+			],
+			[
+				['type' => API_COND_FORMULAID],
+				// broken UTF-8 byte sequence
+				"\xd1".'12345',
+				'/1/formulaid',
+				'Invalid parameter "/1/formulaid": invalid byte sequence in UTF-8.'
+			],
+			[
 				['type' => API_STRING_UTF8, 'length' => 16],
 				'Zabbix server',
 				'/1/name',
@@ -272,7 +370,7 @@ class CApiInputValidatorTest extends TestCase {
 				['type' => API_STRING_UTF8, 'in' => 'xml,json'],
 				'XML',
 				'/1/name',
-				'Invalid parameter "/1/name": value must be one of xml, json.'
+				'Invalid parameter "/1/name": value must be one of "xml", "json".'
 			],
 			[
 				['type' => API_STRING_UTF8, 'in' => '\\,,.'],
@@ -375,7 +473,7 @@ class CApiInputValidatorTest extends TestCase {
 				['type' => API_STRINGS_UTF8, 'in' => 'hostid,name'],
 				['hostid', 'host'],
 				'/output',
-				'Invalid parameter "/output/2": value must be one of hostid, name.'
+				'Invalid parameter "/output/2": value must be one of "hostid", "name".'
 			],
 			[
 				['type' => API_STRINGS_UTF8, 'in' => 'hostid,name', 'uniq' => true],
@@ -393,7 +491,31 @@ class CApiInputValidatorTest extends TestCase {
 				['type' => API_STRINGS_UTF8, 'in' => '\\,,.,/,'],
 				['abc', '.', '/', ''],
 				'/output',
-				'Invalid parameter "/output/1": value must be empty or one of ,, ., /.'
+				'Invalid parameter "/output/1": value must be empty or one of ",", ".", "/".'
+			],
+			[
+				['type' => API_STRINGS_UTF8, 'in' => ''],
+				['abc'],
+				'/output',
+				'Invalid parameter "/output/1": value must be empty.'
+			],
+			[
+				['type' => API_STRINGS_UTF8, 'in' => 'a'],
+				['abc'],
+				'/output',
+				'Invalid parameter "/output/1": value must be "a".'
+			],
+			[
+				['type' => API_STRINGS_UTF8, 'in' => 'a,b'],
+				['abc'],
+				'/output',
+				'Invalid parameter "/output/1": value must be one of "a", "b".'
+			],
+			[
+				['type' => API_STRINGS_UTF8, 'in' => 'a,b,'],
+				['abc'],
+				'/output',
+				'Invalid parameter "/output/1": value must be empty or one of "a", "b".'
 			],
 			[
 				['type' => API_INT32],
@@ -1233,7 +1355,7 @@ class CApiInputValidatorTest extends TestCase {
 				['type' => API_OBJECT, 'fields' => []],
 				['host' => 'Zabbix server'],
 				'/',
-				'Invalid parameter "/": unexpected parameter "host".'
+				'Invalid parameter "/": should be empty.'
 			],
 			[
 				['type' => API_OBJECT, 'fields' => [
@@ -1460,7 +1582,7 @@ class CApiInputValidatorTest extends TestCase {
 				['type' => API_OBJECTS, 'fields' => []],
 				[['host' => 'Zabbix server']],
 				'/',
-				'Invalid parameter "/1": unexpected parameter "host".'
+				'Invalid parameter "/1": should be empty.'
 			],
 			[
 				['type' => API_OBJECTS, 'flags' => API_ALLOW_UNEXPECTED, 'fields' => []],
@@ -1735,6 +1857,83 @@ class CApiInputValidatorTest extends TestCase {
 				['type' => API_OBJECTS, 'fields' => [
 					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
 					'value' =>	['type' => API_MULTIPLE, 'flags' => API_REQUIRED, 'rules' => [
+						['if' => ['field' => 'type', 'in' => '1,2'], 'type' => API_INT32],
+						['if' => ['field' => 'type', 'in' => '3,4'], 'type' => API_STRING_UTF8],
+						['else' => true, 'type' => API_BOOLEAN]
+					]]
+				]],
+				[
+					['type' => '1', 'value' => '-5'],
+					['type' => '2', 'value' => '125'],
+					['type' => '3', 'value' => 'text'],
+					['type' => '4', 'value' => 'text3'],
+					['type' => '7', 'value' => true]
+				],
+				'/',
+				[
+					['type' => 1, 'value' => -5],
+					['type' => 2, 'value' => 125],
+					['type' => 3, 'value' => 'text'],
+					['type' => 4, 'value' => 'text3'],
+					['type' => 7, 'value' => true]
+				]
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'rules' => [
+						['if' => ['field' => 'type', 'in' => '1,2'], 'flags' => API_REQUIRED, 'type' => API_INT32],
+						['else' => true, 'type' => API_UNEXPECTED]
+					]]
+				]],
+				[
+					['type' => '1', 'value' => '-5'],
+					['type' => '2', 'value' => '125'],
+					['type' => '7', 'value' => '123']
+				],
+				'/',
+				'Invalid parameter "/3": unexpected parameter "value".'
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'rules' => [
+						['if' => ['field' => 'type', 'in' => '1,2'], 'flags' => API_REQUIRED, 'type' => API_INT32],
+						['else' => true, 'type' => API_UNEXPECTED]
+					]]
+				]],
+				[
+					['type' => '1', 'value' => '-5'],
+					['type' => '2'],
+					['type' => '7']
+				],
+				'/',
+				'Invalid parameter "/2": the parameter "value" is missing.'
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'rules' => [
+						['if' => ['field' => 'type', 'in' => '1,2'], 'flags' => API_REQUIRED, 'type' => API_INT32],
+						['else' => true, 'type' => API_UNEXPECTED]
+					]]
+				]],
+				[
+					['type' => '1', 'value' => '-5'],
+					['type' => '2', 'value' => '125'],
+					['type' => '7']
+				],
+				'/',
+				[
+					['type' => 1, 'value' => -5],
+					['type' => 2, 'value' => 125],
+					['type' => 7]
+				]
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'flags' => API_REQUIRED, 'rules' => [
 						['if' => ['field' => 'type', 'in' => '1,2'], 'type' => API_INT32]
 					]]
 				]],
@@ -1761,6 +1960,210 @@ class CApiInputValidatorTest extends TestCase {
 			],
 			[
 				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'rules' => [
+						['if' => ['field' => 'type', 'in' => '1,2'], 'type' => API_INT32]
+					]]
+				]],
+				[
+					['type' => '1'],
+					['type' => '2']
+				],
+				'/',
+				[
+					['type' => 1],
+					['type' => 2]
+				]
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'default' => '5', 'rules' => [
+						['if' => ['field' => 'type', 'in' => '1,2'], 'type' => API_INT32]
+					]]
+				]],
+				[
+					['type' => '1'],
+					['type' => '2']
+				],
+				'/',
+				[
+					['type' => 1, 'value' => 5],
+					['type' => 2, 'value' => 5]
+				]
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'rules' => [
+						['if' => ['field' => 'type', 'in' => '1,2'], 'type' => API_INT32, 'flags' => API_REQUIRED]
+					]]
+				]],
+				[
+					['type' => '1']
+				],
+				'/',
+				'Invalid parameter "/1": the parameter "value" is missing.'
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'rules' => [
+						['if' => ['field' => 'type', 'in' => '1,2'], 'type' => API_INT32],
+						['if' => ['field' => 'type', 'in' => '3'], 'type' => API_INT32, 'flags' => API_REQUIRED]
+					]]
+				]],
+				[
+					['type' => '1'],
+					['type' => '3']
+				],
+				'/',
+				'Invalid parameter "/2": the parameter "value" is missing.'
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'flags' => API_REQUIRED, 'rules' => [
+						['if' => ['field' => 'type', 'in' => '3'], 'type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY]
+					]]
+				]],
+				[
+					['type' => '3']
+				],
+				'/',
+				'Invalid parameter "/1": the parameter "value" is missing.'
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'flags' => API_REQUIRED, 'rules' => [
+						['if' => ['field' => 'type', 'in' => '3'], 'type' => API_STRING_UTF8, 'flags' => API_NOT_EMPTY]
+					]]
+				]],
+				[
+					['type' => '3', 'value' => '']
+				],
+				'/',
+				'Invalid parameter "/1/value": cannot be empty.'
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'default' => 1, 'rules' => [
+						['if' => ['field' => 'type', 'in' => '1,2'], 'type' => API_INT32],
+						['if' => ['field' => 'type', 'in' => '3'], 'type' => API_STRING_UTF8, 'default' => 'def']
+					]]
+				]],
+				[
+					['type' => '1'],
+					['type' => '2', 'value' => '125'],
+					['type' => '3']
+				],
+				'/',
+				[
+					['type' => 1, 'value' => 1],
+					['type' => 2, 'value' => 125],
+					['type' => 3, 'value' => 'def']
+				]
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'rules' => [
+						['if' => ['field' => 'type', 'in' => '1:2'], 'type' => API_STRING_UTF8, 'in' => 'a,b'],
+						['if' => ['field' => 'type', 'in' => '3'], 'type' => API_STRING_UTF8, 'in' => '']
+					]]
+				]],
+				[
+					['type' => '1', 'value' => 'a'],
+					['type' => '2', 'value' => 'b'],
+					['type' => '3', 'value' => 'c']
+				],
+				'/',
+				'Invalid parameter "/3/value": value must be empty.'
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'rules' => [
+						['if' => ['field' => 'type', 'in' => '1:2'], 'type' => API_STRING_UTF8, 'in' => 'a,'],
+						['if' => ['field' => 'type', 'in' => '3'], 'type' => API_STRING_UTF8, 'in' => 'c']
+					]]
+				]],
+				[
+					['type' => '1', 'value' => 'a'],
+					['type' => '2', 'value' => 'b'],
+					['type' => '3', 'value' => 'c']
+				],
+				'/',
+				'Invalid parameter "/2/value": value must be empty or "a".'
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'rules' => [
+						['if' => ['field' => 'type', 'in' => '1:2'], 'type' => API_STRING_UTF8, 'in' => 'a,b'],
+						['if' => ['field' => 'type', 'in' => '3'], 'type' => API_STRING_UTF8, 'in' => 'd,e,f']
+					]]
+				]],
+				[
+					['type' => '1', 'value' => 'a'],
+					['type' => '2', 'value' => 'b'],
+					['type' => '3', 'value' => 'c']
+				],
+				'/',
+				'Invalid parameter "/3/value": value must be one of "d", "e", "f".'
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'rules' => [
+						['if' => ['field' => 'type', 'in' => '1:2'], 'type' => API_STRING_UTF8, 'in' => 'a,b'],
+						['if' => ['field' => 'type', 'in' => '3'], 'type' => API_STRING_UTF8, 'in' => 'd,e,f,']
+					]]
+				]],
+				[
+					['type' => '1', 'value' => 'a'],
+					['type' => '2', 'value' => 'b'],
+					['type' => '3', 'value' => 'c']
+				],
+				'/',
+				'Invalid parameter "/3/value": value must be empty or one of "d", "e", "f".'
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'rules' => [
+						['if' => ['field' => 'type', 'in' => '1:2'], 'type' => API_INT32, 'in' => '1'],
+						['if' => ['field' => 'type', 'in' => '3'], 'type' => API_INT32, 'in' => '2,3']
+					]]
+				]],
+				[
+					['type' => '1', 'value' => '1'],
+					['type' => '2', 'value' => '2'],
+					['type' => '3', 'value' => '3']
+				],
+				'/',
+				'Invalid parameter "/2/value": value must be 1.'
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'type' =>	['type' => API_INT32, 'flags' => API_REQUIRED, 'in' => '1:9'],
+					'value' =>	['type' => API_MULTIPLE, 'rules' => [
+						['if' => ['field' => 'type', 'in' => '1:2'], 'type' => API_INT32, 'in' => '1,2'],
+						['if' => ['field' => 'type', 'in' => '3'], 'type' => API_INT32, 'in' => '4:6']
+					]]
+				]],
+				[
+					['type' => '1', 'value' => '1'],
+					['type' => '2', 'value' => '2'],
+					['type' => '3', 'value' => '3']
+				],
+				'/',
+				'Invalid parameter "/3/value": value must be one of 4-6.'
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
 					'host' =>	['type' => API_H_NAME, 'flags' => API_REQUIRED],
 					'name' =>	['type' => API_STRING_UTF8, 'default_source' => 'host']
 				]],
@@ -2908,7 +3311,7 @@ class CApiInputValidatorTest extends TestCase {
 				['type' => API_OUTPUT],
 				'count',
 				'/output',
-				'Invalid parameter "/output": value must be one of extend.'
+				'Invalid parameter "/output": value must be "extend".'
 			],
 			[
 				['type' => API_OUTPUT, 'flags' => API_ALLOW_COUNT],
@@ -2920,13 +3323,13 @@ class CApiInputValidatorTest extends TestCase {
 				['type' => API_OUTPUT],
 				'',
 				'/output',
-				'Invalid parameter "/output": value must be one of extend.'
+				'Invalid parameter "/output": value must be "extend".'
 			],
 			[
 				['type' => API_OUTPUT, 'flags' => API_ALLOW_COUNT],
 				'',
 				'/output',
-				'Invalid parameter "/output": value must be one of extend, count.'
+				'Invalid parameter "/output": value must be one of "extend", "count".'
 			],
 			[
 				['type' => API_OUTPUT],
@@ -2981,7 +3384,7 @@ class CApiInputValidatorTest extends TestCase {
 				['type' => API_OUTPUT, 'in' => 'hostid,name'],
 				['hostid', 'host'],
 				'/output',
-				'Invalid parameter "/output/2": value must be one of hostid, name.'
+				'Invalid parameter "/output/2": value must be one of "hostid", "name".'
 			],
 			[
 				['type' => API_OUTPUT, 'in' => 'hostid,name'],
@@ -3108,13 +3511,13 @@ class CApiInputValidatorTest extends TestCase {
 				['type' => API_SORTORDER],
 				'',
 				'/sortorder',
-				'Invalid parameter "/sortorder": value must be one of ASC, DESC.'
+				'Invalid parameter "/sortorder": value must be one of "ASC", "DESC".'
 			],
 			[
 				['type' => API_SORTORDER],
 				['asc'],
 				'/sortorder',
-				'Invalid parameter "/sortorder/1": value must be one of ASC, DESC.'
+				'Invalid parameter "/sortorder/1": value must be one of "ASC", "DESC".'
 			],
 			[
 				['type' => API_SORTORDER],
@@ -4326,6 +4729,96 @@ class CApiInputValidatorTest extends TestCase {
 				null,
 				'/',
 				'Invalid parameter "/": a character string is expected.'
+			],
+			[
+				['type' => API_IMAGE],
+				null,
+				'/',
+				'Invalid parameter "/": a character string is expected.'
+			],
+			[
+				['type' => API_IMAGE],
+				1,
+				'/',
+				'Invalid parameter "/": a character string is expected.'
+			],
+			[
+				['type' => API_IMAGE],
+				true,
+				'/',
+				'Invalid parameter "/": a character string is expected.'
+			],
+			[
+				['type' => API_IMAGE],
+				"test",
+				'/',
+				'Invalid parameter "/": file format is unsupported.'
+			],
+			[
+				['type' => API_IMAGE],
+				"iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAigAAAIoAAXhZTqAAAAB3RJTUUH4AsMCTElZR7X8QAAAAZiS0dEAAAAAAAA+UO7fwAAAQFJREFUSMdjYBgFQxWERq5Z/e61blZoyJp17z7o+dHP4ug1q969MFINDVuz5t3bd8KhoUD63bsLQHr9uw/G6bSz2G/N2nfPjZSBPgZZLACx+P9/VPrd+dBgYMi8N06jnsWBQB8/M5LHbzEKvRrokLNAfSuADkki32KQT17qZoANJs5ibA45B3T4ynfv9ZaR7oAooA/e6CUC4xpk0E2SHQBKI+/ezwsNB0WJ/nryQyJmzfJ3r4zLoA65QZwD3s8BJtb1796bXKJeWoA4pAKvQ96+nwAM8rXvXpucpF1uQA2Rm1CLJwLLhZXvnpvsomdBtBKYRrYB43jVu1f6c0eL5iELABMWPRgtjy4PAAAALnpUWHRkYXRlOmNyZWF0ZQAAeNozMjA00zU01DU0CjGwtDKxtDI21zYwsDIwAABB6wUWx8+KcAAAAC56VFh0ZGF0ZTptb2RpZnkAAHjaMzIwNNM1NNQ1NAoxsLQysbQyNtc2MLAyMAAAQesFFu7wIvgAAABqelRYdHN2ZzpiYXNlLXVyaQAAeNoFwQEOgyAMBdAT4Z/TLLjbVCykCVBDEa7ve1Ey/wEMaphzQoJWC/p0WNdGiUH3DQlaERszbCRYoZzdJVS0Xi6xFu5Ngjvzw2778uEp0sf7ff0dfrGRXmVvI9Or/wAOAAAAAElFTkSuQmCC",
+				'/',
+				base64_decode("iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAigAAAIoAAXhZTqAAAAB3RJTUUH4AsMCTElZR7X8QAAAAZiS0dEAAAAAAAA+UO7fwAAAQFJREFUSMdjYBgFQxWERq5Z/e61blZoyJp17z7o+dHP4ug1q969MFINDVuz5t3bd8KhoUD63bsLQHr9uw/G6bSz2G/N2nfPjZSBPgZZLACx+P9/VPrd+dBgYMi8N06jnsWBQB8/M5LHbzEKvRrokLNAfSuADkki32KQT17qZoANJs5ibA45B3T4ynfv9ZaR7oAooA/e6CUC4xpk0E2SHQBKI+/ezwsNB0WJ/nryQyJmzfJ3r4zLoA65QZwD3s8BJtb1796bXKJeWoA4pAKvQ96+nwAM8rXvXpucpF1uQA2Rm1CLJwLLhZXvnpvsomdBtBKYRrYB43jVu1f6c0eL5iELABMWPRgtjy4PAAAALnpUWHRkYXRlOmNyZWF0ZQAAeNozMjA00zU01DU0CjGwtDKxtDI21zYwsDIwAABB6wUWx8+KcAAAAC56VFh0ZGF0ZTptb2RpZnkAAHjaMzIwNNM1NNQ1NAoxsLQysbQyNtc2MLAyMAAAQesFFu7wIvgAAABqelRYdHN2ZzpiYXNlLXVyaQAAeNoFwQEOgyAMBdAT4Z/TLLjbVCykCVBDEa7ve1Ey/wEMaphzQoJWC/p0WNdGiUH3DQlaERszbCRYoZzdJVS0Xi6xFu5Ngjvzw2778uEp0sf7ff0dfrGRXmVvI9Or/wAOAAAAAElFTkSuQmCC")
+			],
+			[
+				['type' => API_EXEC_PARAMS],
+				null,
+				'/1/exec_params',
+				'Invalid parameter "/1/exec_params": a character string is expected.'
+			],
+			[
+				['type' => API_EXEC_PARAMS],
+				true,
+				'/1/exec_params',
+				'Invalid parameter "/1/exec_params": a character string is expected.'
+			],
+			[
+				['type' => API_EXEC_PARAMS],
+				1,
+				'/1/exec_params',
+				'Invalid parameter "/1/exec_params": a character string is expected.'
+			],
+			[
+				['type' => API_EXEC_PARAMS],
+				[],
+				'/1/exec_params',
+				'Invalid parameter "/1/exec_params": a character string is expected.'
+			],
+			[
+				['type' => API_EXEC_PARAMS],
+				'',
+				'/1/exec_params',
+				''
+			],
+			[
+				['type' => API_EXEC_PARAMS, 'flags' => API_NOT_EMPTY],
+				'',
+				'/1/exec_params',
+				'Invalid parameter "/1/exec_params": cannot be empty.'
+			],
+			[
+				['type' => API_EXEC_PARAMS, 'length' => 2],
+				'abc',
+				'/1/exec_params',
+				'Invalid parameter "/1/exec_params": value is too long.'
+			],
+			[
+				['type' => API_EXEC_PARAMS],
+				'abc',
+				'/1/exec_params',
+				'Invalid parameter "/1/exec_params": the last new line feed is missing.'
+			],
+			[
+				['type' => API_EXEC_PARAMS],
+				'ab'."\n".'c',
+				'/1/exec_params',
+				'Invalid parameter "/1/exec_params": the last new line feed is missing.'
+			],
+			[
+				['type' => API_EXEC_PARAMS],
+				'abc'."\n",
+				'/1/exec_params',
+				'abc'."\n"
 			]
 		];
 	}
@@ -4721,6 +5214,48 @@ class CApiInputValidatorTest extends TestCase {
 				'/',
 				false,
 				'Invalid parameter "/tags/2": value (tag, operator, value)=(tag, 0, ) already exists.'
+			],
+			[
+				['type' => API_OBJECT, 'fields' => [
+					'tags' => ['type' => API_MULTIPLE, 'rules' => [
+						['else' => true, 'type' => API_OBJECTS, 'uniq' => [['tag', 'operator', 'value']], 'fields' => [
+							'tag'		=> ['type' => API_STRING_UTF8],
+							'operator'	=> ['type' => API_INT32],
+							'value'		=> ['type' => API_STRING_UTF8]
+						]]
+					]]
+				]],
+				[
+					'tags' => [
+						['tag' => 'tag', 'operator' => 0, 'value' => ''],
+						['tag' => 'tag', 'operator' => 0, 'value' => '']
+					]
+				],
+				'/',
+				false,
+				'Invalid parameter "/tags/2": value (tag, operator, value)=(tag, 0, ) already exists.'
+			],
+			[
+				['type' => API_OBJECTS, 'fields' => [
+					'tags' => ['type' => API_MULTIPLE, 'rules' => [
+						['else' => true, 'type' => API_OBJECTS, 'uniq' => [['tag', 'operator', 'value']], 'fields' => [
+							'tag'		=> ['type' => API_STRING_UTF8],
+							'operator'	=> ['type' => API_INT32],
+							'value'		=> ['type' => API_STRING_UTF8]
+						]]
+					]]
+				]],
+				[
+					[
+						'tags' => [
+							['tag' => 'tag', 'operator' => 0, 'value' => ''],
+							['tag' => 'tag', 'operator' => 0, 'value' => '']
+						]
+					]
+				],
+				'/',
+				false,
+				'Invalid parameter "/1/tags/2": value (tag, operator, value)=(tag, 0, ) already exists.'
 			]
 		];
 	}
diff --git a/ui/tests/unit/include/classes/validators/CExpressionValidatorTest.php b/ui/tests/unit/include/classes/validators/CExpressionValidatorTest.php
index c896cc2d6ab..a71b1811f7f 100644
--- a/ui/tests/unit/include/classes/validators/CExpressionValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CExpressionValidatorTest.php
@@ -34,6 +34,8 @@ class CExpressionValidatorTest extends TestCase {
 			['min(avg_foreach(/host/key, 1))', ['calculated' => true], ['rc' => true, 'error' => null]],
 			['sum(avg_foreach(/host/key, 1))', ['calculated' => true], ['rc' => true, 'error' => null]],
 
+			['histogram_quantile(1, bucket_rate_foreach(/host/key, 1))', ['calculated' => true], ['rc' => true, 'error' => null]],
+
 			['avg(count_foreach(/host/key, 1))', ['calculated' => true], ['rc' => true, 'error' => null]],
 			['count(count_foreach(/host/key, 1))', ['calculated' => true], ['rc' => true, 'error' => null]],
 			['max(count_foreach(/host/key, 1))', ['calculated' => true], ['rc' => true, 'error' => null]],
@@ -88,6 +90,8 @@ class CExpressionValidatorTest extends TestCase {
 
 			// Unknown function in trigger expression.
 			['avg_foreach(/host/key)', [], ['rc' => false, 'error' => 'unknown function "avg_foreach"']],
+			['bucket_percentile(/host/key)', [], ['rc' => false, 'error' => 'unknown function "bucket_percentile"']],
+			['bucket_rate_foreach(/host/key)', [], ['rc' => false, 'error' => 'unknown function "bucket_rate_foreach"']],
 			['count_foreach(/host/key)', [], ['rc' => false, 'error' => 'unknown function "count_foreach"']],
 			['exists_foreach(/host/key)', [], ['rc' => false, 'error' => 'unknown function "exists_foreach"']],
 			['item_count(/host/key)', [], ['rc' => false, 'error' => 'unknown function "item_count"']],
@@ -98,6 +102,7 @@ class CExpressionValidatorTest extends TestCase {
 
 			// Not aggregated.
 			['avg_foreach(/host/key, 1)', ['calculated' => true], ['rc' => false, 'error' => 'incorrect usage of function "avg_foreach"']],
+			['bucket_rate_foreach(/host/key, 1)', ['calculated' => true], ['rc' => false, 'error' => 'incorrect usage of function "bucket_rate_foreach"']],
 			['count_foreach(/host/key, 1)', ['calculated' => true], ['rc' => false, 'error' => 'incorrect usage of function "count_foreach"']],
 			['exists_foreach(/host/key)', ['calculated' => true], ['rc' => false, 'error' => 'incorrect usage of function "exists_foreach"']],
 			['last_foreach(/host/key, 1)', ['calculated' => true], ['rc' => false, 'error' => 'incorrect usage of function "last_foreach"']],
@@ -139,7 +144,9 @@ class CExpressionValidatorTest extends TestCase {
 			['foo(/host/item)', [], ['rc' => false, 'error' => 'unknown function "foo"']],
 			['abs(/host/item)', [], ['rc' => false, 'error' => 'incorrect usage of function "abs"']],
 			['foo(1, 2, 3)', [], ['rc' => false, 'error' => 'unknown function "foo"']],
-			['change(1, 2, 3)', [], ['rc' => false, 'error' => 'incorrect usage of function "change"']]
+			['change(1, 2, 3)', [], ['rc' => false, 'error' => 'incorrect usage of function "change"']],
+			['count(123)', [], ['rc' => false, 'error' => 'incorrect usage of function "count"']],
+			['avg(bucket_rate_foreach(/host/*, 1))', ['calculated' => true], ['rc' => false, 'error' => 'incorrect usage of function "bucket_rate_foreach"']]
 		];
 	}
 
diff --git a/ui/tests/unit/include/classes/validators/CHistFunctionValidatorTest.php b/ui/tests/unit/include/classes/validators/CHistFunctionValidatorTest.php
index 7e82b605da0..34121276103 100644
--- a/ui/tests/unit/include/classes/validators/CHistFunctionValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CHistFunctionValidatorTest.php
@@ -72,6 +72,17 @@ class CHistFunctionValidatorTest extends TestCase {
 			['avg(/host/key, 3551w)', [], ['rc' => false, 'error' => 'invalid second parameter in function "avg"']],
 			['avg(/host/key, #256,)', [], ['rc' => false, 'error' => 'invalid number of parameters in function "avg"']],
 
+			['bucket_percentile(/host/key)', ['calculated' => true], ['rc' => false, 'error' => 'mandatory parameter is missing in function "bucket_percentile"']],
+			['bucket_percentile(/host/key, 1h)', ['calculated' => true], ['rc' => false, 'error' => 'mandatory parameter is missing in function "bucket_percentile"']],
+			['bucket_percentile(/host/key, 1h, 101)', ['calculated' => true], ['rc' => false, 'error' => 'invalid third parameter in function "bucket_percentile"']],
+			['bucket_percentile(/host/key, 1h, 50)', ['calculated' => true], ['rc' => true, 'error' => null]],
+			['bucket_percentile(/host/key, 1h:now-24h, 50)', ['calculated' => true], ['rc' => false, 'error' => 'invalid second parameter in function "bucket_percentile"']],
+
+			['bucket_rate_foreach(/host/key[*])', ['calculated' => true], ['rc' => false, 'error' => 'mandatory parameter is missing in function "bucket_rate_foreach"']],
+			['bucket_rate_foreach(/host/key[*], 1h, 0)', ['calculated' => true], ['rc' => false, 'error' => 'invalid third parameter in function "bucket_rate_foreach"']],
+			['bucket_rate_foreach(/host/key[*], 1h)', ['calculated' => true], ['rc' => true, 'error' => null]],
+			['bucket_rate_foreach(/host/key[*], 1h, 1)', ['calculated' => true], ['rc' => true, 'error' => null]],
+
 			['change(/host/key)', [], ['rc' => true, 'error' => null]],
 			['change(/host/key,)', [], ['rc' => false, 'error' => 'invalid number of parameters in function "change"']],
 
@@ -472,6 +483,11 @@ class CHistFunctionValidatorTest extends TestCase {
 			['percentile(/host/key, 1s, "{$MACRO}{#LLDMACRO}")', ['usermacros' => true, 'lldmacros' => true], ['rc' => true, 'error' => null]],
 			['percentile(/host/key, #256, 5,)', [], ['rc' => false, 'error' => 'invalid number of parameters in function "percentile"']],
 
+			['rate(/host/key)=1', [], ['rc' => false, 'error' => 'mandatory parameter is missing in function "rate"']],
+			['rate(/host/key, 1h)=1', [], ['rc' => true, 'error' => null]],
+			['rate(/host/key, 1h:now/h-1h)=1', [], ['rc' => true, 'error' => null]],
+			['rate(/host/key, 1h, 1)=1', [], ['rc' => false, 'error' => 'invalid number of parameters in function "rate"']],
+
 			['skewness(/host/key)', [], ['rc' => false, 'error' => 'mandatory parameter is missing in function "skewness"']],
 			['skewness(/host/key,)', [], ['rc' => false, 'error' => 'invalid second parameter in function "skewness"']],
 			['skewness(/host/key,0)', [], ['rc' => false, 'error' => 'invalid second parameter in function "skewness"']],
diff --git a/ui/tests/unit/include/classes/validators/CMathFunctionValidatorTest.php b/ui/tests/unit/include/classes/validators/CMathFunctionValidatorTest.php
index 62609812a13..31d8d307ef0 100644
--- a/ui/tests/unit/include/classes/validators/CMathFunctionValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CMathFunctionValidatorTest.php
@@ -162,6 +162,15 @@ class CMathFunctionValidatorTest extends TestCase {
 			['floor(1)', ['rc' => true, 'error' => null]],
 			['floor(1, 1)', ['rc' => false, 'error' => 'invalid number of parameters in function "floor"']],
 
+			['histogram_quantile()', ['rc' => false, 'error' => 'invalid number of parameters in function "histogram_quantile"']],
+			['histogram_quantile(1)', ['rc' => false, 'error' => 'invalid number of parameters in function "histogram_quantile"']],
+			['histogram_quantile(1, 1)', ['rc' => true, 'error' => null]],
+			['histogram_quantile(1, 1, 1)', ['rc' => false, 'error' => 'invalid number of parameters in function "histogram_quantile"']],
+			['histogram_quantile(1, 1, 1, 1)', ['rc' => false, 'error' => 'invalid number of parameters in function "histogram_quantile"']],
+			['histogram_quantile(1, 1, 1, 1, 1)', ['rc' => true, 'error' => null]],
+			['histogram_quantile(1, 1, 1, 1, 1, 1)', ['rc' => false, 'error' => 'invalid number of parameters in function "histogram_quantile"']],
+			['histogram_quantile(1, 1, 1, 1, 1, 1, 1)', ['rc' => true, 'error' => null]],
+
 			['in()', ['rc' => false, 'error' => 'invalid number of parameters in function "in"']],
 			['in(1)', ['rc' => false, 'error' => 'invalid number of parameters in function "in"']],
 			['in(1, 1)', ['rc' => true, 'error' => null]],